Merge remote-tracking branch 'sc2/merge-v1.5.4-1' into sc

Change-Id: Idc08fd88297d8e1f5211908217e32b93fb6df693

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt

CHANGES.md

@@ -1,3 +1,64 @@
+Changes in Element v1.5.4 (2022-10-19)
+======================================
+
+Features ✨
+----------
+ - Add WYSIWYG editor, under a lab flag. ([#7288](https://github.com/vector-im/element-android/issues/7288))
+ - New Device management, can be enabled in the labs settings.
+ - Voice broadcast can be enabled in the labs settings (recording is possible only on Android 10 and up).
+
+Bugfixes 🐛
+----------
+ - Fix wrong mic button direction to cancel on RTL languages ([#5968](https://github.com/vector-im/element-android/issues/5968))
+ - Handle properly when getUser returns null - prefer using getUserOrDefault ([#7372](https://github.com/vector-im/element-android/issues/7372))
+ - [Device Management] Long session names not handled well ([#7310](https://github.com/vector-im/element-android/issues/7310))
+ - Fix editing formatted messages with plain text editor ([#7359](https://github.com/vector-im/element-android/issues/7359))
+
+In development 🚧
+----------------
+ - [Device Management] Save "matrix_client_information" events on login/registration ([#7257](https://github.com/vector-im/element-android/issues/7257))
+ - [Device management] Add lab flag for the feature ([#7336](https://github.com/vector-im/element-android/issues/7336))
+ - [Device management] Add lab flag for matrix client info account data event ([#7344](https://github.com/vector-im/element-android/issues/7344))
+ - [Device Management] Redirect to the new screen everywhere when lab flag is on ([#7374](https://github.com/vector-im/element-android/issues/7374))
+ - [Device Management] Show correct device type icons ([#7277](https://github.com/vector-im/element-android/issues/7277))
+ - [Device Management] Render extended device info ([#7294](https://github.com/vector-im/element-android/issues/7294))
+ - [Device management] Improve the parsing for OS of Desktop/Web sessions ([#7321](https://github.com/vector-im/element-android/issues/7321))
+ - [Device management] Hide the IP address and last activity date on current session ([#7324](https://github.com/vector-im/element-android/issues/7324))
+ - [Device management] Update the unknown verification status icon ([#7327](https://github.com/vector-im/element-android/issues/7327))
+ - [Voice Broadcast] Add the "io.element.voice_broadcast_info" state event with a minimalist timeline widget ([#7273](https://github.com/vector-im/element-android/issues/7273))
+ - [Voice Broadcast] Aggregate state events in the timeline ([#7283](https://github.com/vector-im/element-android/issues/7283))
+ - [Voice Broadcast] Record and send non aggregated voice messages to the room ([#7363](https://github.com/vector-im/element-android/issues/7363))
+ - [Voice Broadcast] Start listening to a voice broadcast ([#7387](https://github.com/vector-im/element-android/issues/7387))
+ - [Voice Broadcast] Enable the feature (behind a lab flag and only for Android 10 and up) ([#7393](https://github.com/vector-im/element-android/issues/7393))
+ - [Voice Broadcast] Add additional data in events ([#7397](https://github.com/vector-im/element-android/issues/7397))
+ - Implements MSC3881: Parses `enabled` and `device_id` fields from updated Pusher API ([#7217](https://github.com/vector-im/element-android/issues/7217))
+ - Adds pusher toggle setting to device manager v2 ([#7261](https://github.com/vector-im/element-android/issues/7261))
+ - Implement QR Code Login UI ([#7338](https://github.com/vector-im/element-android/issues/7338))
+ - Implements client-side of local notification settings event ([#7300](https://github.com/vector-im/element-android/issues/7300))
+ - Links "Enable Notifications for this session" setting to enabled value in pusher ([#7281](https://github.com/vector-im/element-android/issues/7281))
+
+SDK API changes ⚠️
+------------------
+ - Stop using `original_event` field from `/relations` endpoint ([#7282](https://github.com/vector-im/element-android/issues/7282))
+ - Add `formattedText` or similar optional parameters in several methods:
+  * RelationService:
+  	* editTextMessage
+  	* editReply
+  	* replyToMessage
+  * SendService:
+  	* sendQuotedTextMessage
+  This allows us to send any HTML formatted text message without needing to rely on automatic Markdown > HTML translation. All these new parameters have a `null` value by default, so previous calls to these API methods remain compatible. ([#7288](https://github.com/vector-im/element-android/issues/7288))
+ - Add support for `m.login.token` auth during QR code based sign in ([#7358](https://github.com/vector-im/element-android/issues/7358))
+ - Allow getting the formatted or plain text body of a message for the fun `TimelineEvent.getTextEditableContent()`. ([#7359](https://github.com/vector-im/element-android/issues/7359))
+
+Other changes
+-------------
+ - Refactor TimelineFragment, split it into MessageComposerFragment and VoiceRecorderFragment. ([#7285](https://github.com/vector-im/element-android/issues/7285))
+ - Dependency to arrow has been removed. Please use `org.matrix.android.sdk.api.util.Optional` instead. ([#7335](https://github.com/vector-im/element-android/issues/7335))
+ - Update WYSIWYG editor designs. ([#7354](https://github.com/vector-im/element-android/issues/7354))
+ - Update WYSIWYG library to v0.2.1. ([#7384](https://github.com/vector-im/element-android/issues/7384))
+
+
 Changes in Element v1.5.2 (2022-10-05)
 ======================================
 

build.gradle

@@ -28,12 +28,12 @@ buildscript {
         classpath 'com.google.gms:google-services:4.3.14'
         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 "com.likethesalad.android:stem-plugin:2.2.3"
         classpath 'org.owasp:dependency-check-gradle:7.2.1'
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.10"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.20"
         classpath "org.jetbrains.kotlinx:kotlinx-knit:0.4.0"
         classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.3'
-        classpath 'app.cash.paparazzi:paparazzi-gradle-plugin:1.0.0'
+        classpath 'app.cash.paparazzi:paparazzi-gradle-plugin:1.1.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -44,6 +44,8 @@ plugins {
     id "org.jlleitschuh.gradle.ktlint" version "11.0.0"
     // Detekt
     id "io.gitlab.arturbosch.detekt" version "1.21.0"
+    // Ksp
+    id "com.google.devtools.ksp" version "1.7.20-1.0.6"
 
     // Dependency Analysis
     id 'com.autonomousapps.dependency-analysis' version "1.13.1"
@@ -146,6 +148,9 @@ allprojects {
             // To have XML report for Danger
             reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.CHECKSTYLE)
         }
+        filter {
+            exclude { element -> element.file.path.contains("$buildDir/generated/") }
+        }
         disabledRules = [
                 // TODO Re-enable these 4 rules after reformatting project
                 "indent",
@@ -327,3 +332,35 @@ ext.initScreenshotTests = { project ->
         }
     }
 }
+
+// Workaround to have KSP generated Kotlin code available in the IDE (for code completion)
+// Ref: https://github.com/airbnb/epoxy/releases/tag/5.0.0beta02
+subprojects { project ->
+    afterEvaluate {
+        if (project.hasProperty("android")) {
+            android {
+                if (it instanceof com.android.build.gradle.LibraryExtension) {
+                    libraryVariants.all { variant ->
+                        def outputFolder = new File("build/generated/ksp/${variant.name}/kotlin")
+                        if (outputFolder.exists()) {
+                            variant.addJavaSourceFoldersToModel(outputFolder)
+                            android.sourceSets.getAt(variant.name).java {
+                                srcDir(outputFolder)
+                            }
+                        }
+                    }
+                } else if (it instanceof com.android.build.gradle.AppExtension) {
+                    applicationVariants.all { variant ->
+                        def outputFolder = new File("build/generated/ksp/${variant.name}/kotlin")
+                        if (outputFolder.exists()) {
+                            variant.addJavaSourceFoldersToModel(outputFolder)
+                            android.sourceSets.getAt(variant.name).java {
+                                srcDir(outputFolder)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

dependencies.gradle

@@ -1,35 +1,34 @@
 ext.versions = [
 
         'minSdk'            : 21,
-        'compileSdk'        : 32,
+        'compileSdk'        : 33,
-        'targetSdk'         : 32,
+        'targetSdk'         : 33,
         'sourceCompat'      : JavaVersion.VERSION_11,
         'targetCompat'      : JavaVersion.VERSION_11,
 ]
 
-def gradle = "7.2.2"
+def gradle = "7.3.1"
 // Ref: https://kotlinlang.org/releases.html
 def kotlin = "1.7.20"
 def kotlinCoroutines = "1.6.4"
 def dagger = "2.44"
 def appDistribution = "16.0.0-beta04"
 def retrofit = "2.9.0"
-def arrow = "0.8.2"
 def markwon = "4.6.2"
 def moshi = "1.14.0"
 def lifecycle = "2.5.1"
 def flowBinding = "1.2.0"
-def flipper = "0.164.0"
+def flipper = "0.171.1"
-def epoxy = "4.6.2"
+def epoxy = "5.0.0"
-def mavericks = "2.7.0"
+def mavericks = "3.0.1"
-def glide = "4.14.1"
+def glide = "4.14.2"
 def bigImageViewer = "1.8.1"
 def jjwt = "0.11.5"
 // Temporary version to unblock #6929. Once 0.16.0 is released we should use it, and revert
 // the whole commit which set version 0.16.0-SNAPSHOT
 def vanniktechEmoji = "0.16.0-SNAPSHOT"
 
-def sentry = "6.4.1"
+def sentry = "6.4.3"
 
 def fragment = "1.5.3"
 
@@ -52,12 +51,12 @@ ext.libs = [
                 'coroutinesTest'          : "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinCoroutines"
         ],
         androidx    : [
-                'activity'                : "androidx.activity:activity:1.5.1",
+                'activity'                : "androidx.activity:activity-ktx:1.6.0",
                 'appCompat'               : "androidx.appcompat:appcompat:1.5.1",
                 'biometric'               : "androidx.biometric:biometric:1.1.0",
-                'core'                    : "androidx.core:core-ktx:1.8.0",
+                'core'                    : "androidx.core:core-ktx:1.9.0",
                 'recyclerview'            : "androidx.recyclerview:recyclerview:1.2.1",
-                'exifinterface'           : "androidx.exifinterface:exifinterface:1.3.3",
+                'exifinterface'           : "androidx.exifinterface:exifinterface:1.3.4",
                 'fragmentKtx'             : "androidx.fragment:fragment-ktx:$fragment",
                 'fragmentTesting'         : "androidx.fragment:fragment-testing:$fragment",
                 'constraintLayout'        : "androidx.constraintlayout:constraintlayout:2.1.4",
@@ -88,7 +87,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.56"
+                'phonenumber'             : "com.googlecode.libphonenumber:libphonenumber:8.12.57"
         ],
         dagger      : [
                 'dagger'                  : "com.google.dagger:dagger:$dagger",
@@ -103,6 +102,7 @@ ext.libs = [
         ],
         element     : [
                 'opusencoder'             : "io.element.android:opusencoder:1.1.0",
+                'wysiwyg'                 : "io.element.android:wysiwyg:0.2.1"
         ],
         squareup    : [
                 'moshi'                  : "com.squareup.moshi:moshi:$moshi",
@@ -115,10 +115,6 @@ ext.libs = [
         rx          : [
                 'rxKotlin'               : "io.reactivex.rxjava2:rxkotlin:2.4.0"
         ],
-        arrow       : [
-                'core'                   : "io.arrow-kt:arrow-core:$arrow",
-                'instances'              : "io.arrow-kt:arrow-instances-core:$arrow"
-        ],
         markwon     : [
                 'core'                   : "io.noties.markwon:core:$markwon",
                 'extLatex'               : "io.noties.markwon:ext-latex:$markwon",

dependencies_groups.gradle

@@ -85,6 +85,7 @@ ext.groups = [
                         'com.google',
                         'com.google.android',
                         'com.google.api.grpc',
+                        'com.google.auto',
                         'com.google.auto.service',
                         'com.google.auto.value',
                         'com.google.code.findbugs',
@@ -102,6 +103,7 @@ ext.groups = [
                         'com.googlecode.json-simple',
                         'com.googlecode.libphonenumber',
                         'com.ibm.icu',
+                        'com.intellij',
                         'com.jakewharton.android.repackaged',
                         'com.jakewharton.timber',
                         'com.kgurgul.flipper',
@@ -133,7 +135,6 @@ ext.groups = [
                         'commons-io',
                         'commons-logging',
                         'info.picocli',
-                        'io.arrow-kt',
                         'io.element.android',
                         'io.github.davidburstrom.contester',
                         'io.github.detekt.sarif4k',
@@ -147,6 +148,7 @@ ext.groups = [
                         'io.netty',
                         'io.noties.markwon',
                         'io.opencensus',
+                        'io.perfmark',
                         'io.reactivex.rxjava2',
                         'io.realm',
                         'io.sentry',
@@ -177,6 +179,7 @@ ext.groups = [
                         'org.apache.httpcomponents',
                         'org.apache.sanselan',
                         'org.bouncycastle',
+                        'org.ccil.cowan.tagsoup',
                         'org.checkerframework',
                         'org.codehaus',
                         'org.codehaus.groovy',

docs/unit_testing.md

@@ -314,7 +314,7 @@ class ViewModelTest {
     private var initialState = ViewState.Empty
 
     @get:Rule
-    val mvrxTestRule = MvRxTestRule(testDispatcher = UnconfinedTestDispatcher())
+    val mavericksTestRule = MavericksTestRule(testDispatcher = UnconfinedTestDispatcher())
 
     @Test
     fun `when handling MyAction, then emits Loading and Content states`() {

library/attachment-viewer/build.gradle

@@ -18,6 +18,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
+    namespace "im.vector.lib.attachmentviewer"
 
     compileSdk versions.compileSdk
 

library/attachment-viewer/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="im.vector.lib.attachmentviewer" />
+<manifest />

library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt

@@ -316,10 +316,6 @@ abstract class AttachmentViewerActivity : AppCompatActivity(), AttachmentEventLi
                     }
                     return false
                 }
-
-                override fun onDoubleTap(e: MotionEvent?): Boolean {
-                    return super.onDoubleTap(e)
-                }
             })
 
     override fun onEvent(event: AttachmentEvents) {

library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt

@@ -96,31 +96,27 @@ class SwipeToDismissHandler(
                 .setDuration(ANIMATION_DURATION)
                 .setInterpolator(AccelerateInterpolator())
                 .setUpdateListener { onSwipeViewMove(swipeView.translationY, translationLimit) }
-                .setAnimatorListener(onAnimationEnd = {
+                .setAnimatorEndListener {
                     if (translationTo != 0f) {
                         onDismiss()
                     }
 
                     // remove the update listener, otherwise it will be saved on the next animation execution:
                     swipeView.animate().setUpdateListener(null)
-                })
+                }
                 .start()
     }
 }
 
-internal fun ViewPropertyAnimator.setAnimatorListener(
+private fun ViewPropertyAnimator.setAnimatorEndListener(
-        onAnimationEnd: ((Animator?) -> Unit)? = null,
+        onAnimationEnd: () -> Unit,
-        onAnimationStart: ((Animator?) -> Unit)? = null
+) = setListener(
-) = this.setListener(
         object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animation: Animator?) {
+            override fun onAnimationEnd(animation: Animator) {
-                onAnimationEnd?.invoke(animation)
+                onAnimationEnd()
             }
+        }
+)
 
-            override fun onAnimationStart(animation: Animator?) {
+private val View.hitRect: Rect
-                onAnimationStart?.invoke(animation)
+    get() = Rect().also { getHitRect(it) }
-            }
-        })
-
-internal val View?.hitRect: Rect
-    get() = Rect().also { this?.getHitRect(it) }

library/core-utils/build.gradle

@@ -20,6 +20,8 @@ plugins {
 }
 
 android {
+    namespace "im.vector.lib.core.utils"
+
     compileSdk versions.compileSdk
     defaultConfig {
         minSdk versions.minSdk

library/core-utils/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="im.vector.lib.core.utils" />
+<manifest />

library/core-utils/src/main/java/im/vector/lib/core/utils/compat/Compat.kt

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.lib.core.utils.compat
+
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.content.pm.ResolveInfo
+import android.os.Build
+import android.os.Bundle
+import android.os.Parcelable
+import java.io.Serializable
+
+inline fun <reified T> Intent.getParcelableExtraCompat(key: String): T? = when {
+    Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> getParcelableExtra(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getParcelableExtra(key) as? T?
+}
+
+inline fun <reified T : Parcelable> Intent.getParcelableArrayListExtraCompat(key: String): ArrayList<T>? = when {
+    Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> getParcelableArrayListExtra(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getParcelableArrayListExtra<T>(key)
+}
+
+inline fun <reified T> Bundle.getParcelableCompat(key: String): T? = when {
+    Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> getParcelable(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getParcelable(key) as? T?
+}
+
+inline fun <reified T : Serializable> Bundle.getSerializableCompat(key: String): T? = when {
+    Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> getSerializable(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getSerializable(key) as? T?
+}
+
+inline fun <reified T : Serializable> Intent.getSerializableExtraCompat(key: String): T? = when {
+    Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> getSerializableExtra(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getSerializableExtra(key) as? T?
+}
+
+fun PackageManager.queryIntentActivitiesCompat(data: Intent, flags: Int): List<ResolveInfo> {
+    return when {
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> queryIntentActivities(
+                data,
+                PackageManager.ResolveInfoFlags.of(flags.toLong())
+        )
+        else -> @Suppress("DEPRECATION") queryIntentActivities(data, flags)
+    }
+}
+
+fun PackageManager.resolveActivityCompat(data: Intent, flags: Int): ResolveInfo? {
+    return when {
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> resolveActivity(
+                data,
+                PackageManager.ResolveInfoFlags.of(flags.toLong())
+        )
+        else -> @Suppress("DEPRECATION") resolveActivity(data, flags)
+    }
+}

library/external/dialpad/build.gradle

@@ -2,6 +2,8 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
+    namespace "com.android.dialer.dialpadview"
+
     compileSdk versions.compileSdk
 
     defaultConfig {

library/external/dialpad/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.android.dialer.dialpadview" />
+<manifest />

library/external/dialpad/src/main/java/com/android/dialer/dialpadview/DialpadView.java

@@ -103,6 +103,7 @@ public class DialpadView extends LinearLayout {
 
   @Override
   protected void onFinishInflate() {
+    super.onFinishInflate();
     setupKeypad();
     mDigits = (EditText) findViewById(R.id.digits);
     mDelete = (ImageButton) findViewById(R.id.deleteButton);
@@ -201,14 +202,6 @@ public class DialpadView extends LinearLayout {
     zero.setLongHoverContentDescription(resources.getText(R.string.description_image_button_plus));
   }
 
-  private Drawable getDrawableCompat(Context context, int id) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      return context.getDrawable(id);
-    } else {
-      return context.getResources().getDrawable(id);
-    }
-  }
-
   public void setShowVoicemailButton(boolean show) {
     View view = findViewById(R.id.dialpad_key_voicemail);
     if (view != null) {

library/external/jsonviewer/build.gradle

@@ -2,6 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'com.google.devtools.ksp'
 
 buildscript {
     repositories {
@@ -17,6 +18,8 @@ buildscript {
 }
 
 android {
+    namespace "org.billcarsonfr.jsonviewer"
+
     compileSdk versions.compileSdk
 
     defaultConfig {
@@ -51,7 +54,7 @@ dependencies {
     implementation libs.androidx.recyclerview
 
     implementation libs.airbnb.epoxy
-    kapt libs.airbnb.epoxyProcessor
+    ksp libs.airbnb.epoxyProcessor
 
     implementation libs.airbnb.mavericks
     // Span utils

library/external/jsonviewer/src/main/AndroidManifest.xml

@@ -1 +1 @@
-<manifest package="org.billcarsonfr.jsonviewer" />
+<manifest />

library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerDialog.kt

@@ -23,6 +23,7 @@ import android.view.ViewGroup
 import android.view.WindowManager
 import androidx.fragment.app.DialogFragment
 import com.airbnb.mvrx.Mavericks
+import im.vector.lib.core.utils.compat.getParcelableCompat
 
 class JSonViewerDialog : DialogFragment() {
 
@@ -36,16 +37,17 @@ class JSonViewerDialog : DialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val args: JSonViewerFragmentArgs = arguments?.getParcelable(Mavericks.KEY_ARG) ?: return
+        val args: JSonViewerFragmentArgs = arguments?.getParcelableCompat(Mavericks.KEY_ARG) ?: return
         if (savedInstanceState == null) {
             childFragmentManager.beginTransaction()
                     .replace(
-                            R.id.fragmentContainer, JSonViewerFragment.newInstance(
+                            R.id.fragmentContainer,
-                            args.jsonString,
+                            JSonViewerFragment.newInstance(
-                            args.defaultOpenDepth,
+                                    args.jsonString,
-                            true,
+                                    args.defaultOpenDepth,
-                            args.styleProvider
+                                    true,
-                    )
+                                    args.styleProvider
+                            )
                     )
                     .commitNow()
         }

library/external/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerFragment.kt

@@ -28,6 +28,7 @@ import com.airbnb.mvrx.Mavericks
 import com.airbnb.mvrx.MavericksView
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import im.vector.lib.core.utils.compat.getParcelableCompat
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
@@ -53,7 +54,7 @@ class JSonViewerFragment : Fragment(), MavericksView {
             container: ViewGroup?,
             savedInstanceState: Bundle?
     ): View? {
-        val args: JSonViewerFragmentArgs? = arguments?.getParcelable(Mavericks.KEY_ARG)
+        val args: JSonViewerFragmentArgs? = arguments?.getParcelableCompat(Mavericks.KEY_ARG)
         val inflate =
                 if (args?.wrap == true) {
                     inflater.inflate(R.layout.fragment_jv_recycler_view_wrap, container, false)
@@ -62,7 +63,7 @@ class JSonViewerFragment : Fragment(), MavericksView {
                 }
         recyclerView = inflate.findViewById(R.id.jvRecyclerView)
         recyclerView.layoutManager =
-                LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+                LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
         recyclerView.setController(epoxyController)
         epoxyController.setStyle(args?.styleProvider)
         registerForContextMenu(recyclerView)

library/multipicker/build.gradle

@@ -19,6 +19,8 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
 
 android {
+    namespace "im.vector.lib.multipicker"
+
     compileSdk versions.compileSdk
 
     defaultConfig {
@@ -35,9 +37,19 @@ android {
         }
     }
 
+    compileOptions {
+        sourceCompatibility versions.sourceCompat
+        targetCompatibility versions.targetCompat
+    }
+
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 dependencies {
+    implementation project(":library:core-utils")
+
     api libs.androidx.activity
     implementation libs.androidx.exifinterface
     implementation libs.androidx.core

library/multipicker/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="im.vector.lib.multipicker">
 
     <application>
         <provider

library/multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt

@@ -16,6 +16,7 @@
 
 package im.vector.lib.multipicker
 
+import android.annotation.SuppressLint
 import android.content.ContentResolver
 import android.content.Context
 import android.content.Intent
@@ -34,6 +35,7 @@ class ContactPicker : Picker<MultiPickerContactType>() {
      * Call this function from onActivityResult(int, int, Intent).
      * Returns selected contact or empty list if user did not select any contacts.
      */
+    @SuppressLint("Recycle")
     override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerContactType> {
         val contactList = mutableListOf<MultiPickerContactType>()
 

library/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt

@@ -22,6 +22,9 @@ import android.content.pm.PackageManager
 import android.content.pm.ResolveInfo
 import android.net.Uri
 import androidx.activity.result.ActivityResultLauncher
+import im.vector.lib.core.utils.compat.getParcelableArrayListExtraCompat
+import im.vector.lib.core.utils.compat.getParcelableExtraCompat
+import im.vector.lib.core.utils.compat.queryIntentActivitiesCompat
 
 /**
  * Abstract class to provide all types of Pickers.
@@ -45,13 +48,13 @@ abstract class Picker<T> {
 
         val uriList = mutableListOf<Uri>()
         if (data.action == Intent.ACTION_SEND) {
-            (data.getParcelableExtra(Intent.EXTRA_STREAM) as? Uri)?.let { uriList.add(it) }
+            data.getParcelableExtraCompat<Uri>(Intent.EXTRA_STREAM)?.let { uriList.add(it) }
         } else if (data.action == Intent.ACTION_SEND_MULTIPLE) {
-            val extraUriList: List<Uri>? = data.getParcelableArrayListExtra(Intent.EXTRA_STREAM)
+            val extraUriList: List<Uri>? = data.getParcelableArrayListExtraCompat(Intent.EXTRA_STREAM)
             extraUriList?.let { uriList.addAll(it) }
         }
 
-        val resInfoList: List<ResolveInfo> = context.packageManager.queryIntentActivities(data, PackageManager.MATCH_DEFAULT_ONLY)
+        val resInfoList: List<ResolveInfo> = context.packageManager.queryIntentActivitiesCompat(data, PackageManager.MATCH_DEFAULT_ONLY)
         uriList.forEach {
             for (resolveInfo in resInfoList) {
                 val packageName: String = resolveInfo.activityInfo.packageName
@@ -91,6 +94,7 @@ abstract class Picker<T> {
         } else if (dataUri != null) {
             selectedUriList.add(dataUri)
         } else {
+            @Suppress("DEPRECATION")
             data?.extras?.get(Intent.EXTRA_STREAM)?.let {
                 (it as? List<*>)?.filterIsInstance<Uri>()?.let { uriList ->
                     selectedUriList.addAll(uriList)

library/ui-strings/build.gradle

@@ -5,6 +5,8 @@ plugins {
 }
 
 android {
+    namespace "im.vector.lib.strings"
+
     compileSdk versions.compileSdk
     defaultConfig {
         minSdk versions.minSdk

library/ui-strings/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="im.vector.lib.strings" />
+<manifest />

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <string name="notice_room_invite_no_invitee">%s-nin dəvəti</string>
     <string name="notice_room_invite">%1$s dəvət etdi %2$s</string>
     <string name="notice_room_invite_you">%1$s sizi dəvət etdi</string>
@@ -27,37 +26,22 @@
     <string name="notice_room_visibility_shared">bütün otaq üzvləri.</string>
     <string name="notice_room_visibility_world_readable">hər kəs.</string>
     <string name="notice_room_update">%s bu otağı təkmilləşdirdi.</string>
-
-
     <string name="notice_avatar_changed_too">(avatar da dəyişdirilib)</string>
     <string name="notice_room_name_removed">%1$s otaq adını sildi</string>
     <string name="notice_room_topic_removed">%1$s otaq mövzusunu sildi</string>
     <string name="notice_room_third_party_invite">%1$s otağa qoşulmaq üçün %2$s dəvətnamə göndərdi</string>
     <string name="notice_room_third_party_revoked_invite">%1$s otağa qoşulmaq üçün %2$s dəvətini ləğv etdi</string>
     <string name="notice_room_third_party_registered_invite">%1$s %2$s üçün dəvəti qəbul etdi</string>
-
     <string name="notice_crypto_unable_to_decrypt">** Şifrəni aça bilmir: %s **</string>
     <string name="notice_crypto_error_unknown_inbound_session_id">Göndərənin cihazı bu mesaj üçün açarları bizə göndərməyib.</string>
-
     <string name="unable_to_send_message">Mesaj göndərmək olmur</string>
-
-
     <string name="matrix_error">Matris xətası</string>
-
-
     <string name="encrypted_message">Şifrəli mesaj</string>
-
     <string name="medium_email">Elektron poçt ünvanı</string>
     <string name="medium_phone_number">Telefon nömrəsi</string>
-
     <string name="room_displayname_room_invite">Otağa dəvət</string>
-
     <string name="room_displayname_two_members">%1$s və %2$s</string>
-
-
-
     <string name="room_displayname_empty_room">Boş otaq</string>
-
     <string name="initial_sync_start_importing_account">İlkin sinxronizasiya:
 \nHesab idxal olunur…</string>
     <string name="initial_sync_start_importing_account_crypto">İlkin sinxronizasiya:
@@ -72,9 +56,7 @@
 \nTərk olunmuş otaqların idxalı</string>
     <string name="initial_sync_start_importing_account_data">İlkin sinxronizasiya:
 \nHesab məlumatlarının idxalı</string>
-
     <string name="event_status_sending_message">Mesaj göndərilir…</string>
-
     <string name="notice_room_invite_no_invitee_with_reason">%1$s-nin dəvəti. Səbəb: %2$s</string>
     <string name="notice_room_invite_with_reason">%1$s dəvət olunmuş %2$s. Səbəb: %3$s</string>
     <string name="notice_room_invite_you_with_reason">%1$s sizi dəvət etdi. Səbəb: %2$s</string>
@@ -86,4 +68,5 @@
     <string name="notice_room_ban_with_reason">%1$s blokladı %2$s. Səbəb: %3$s</string>
     <string name="notice_room_third_party_registered_invite_with_reason">%1$s %2$s üçün dəvəti qəbul etdi. Səbəb: %3$s</string>
     <string name="notice_room_withdraw_with_reason">%1$s %2$s dəvətini geri götürdü. Səbəb: %3$s</string>
+    <string name="notice_room_created_by_you">Otağ yaratdınız</string>
 </resources>

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

@@ -891,7 +891,7 @@
     <string name="room_participants_remove_reason">Motiu de l\'expulsió</string>
     <string name="room_participants_remove_title">Expulsa usuari</string>
     <string name="login_signin_sso">Continua amb SSO</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Per a la teva pròpia privadesa, ${app_name} només admet l\'enviament del \"hash\" de correus electrònics i números de telèfon.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Per a la teva pròpia privadesa, ${app_name} només admet l\'enviament del \'hash\' d\'adreces de correu electrònic i números de telèfon.</string>
     <string name="command_description_discard_session_not_handled">Només admès en sales xifrades</string>
     <string name="encryption_unknown_algorithm_tile_description">El xifrat que utilitza aquesta sala no és compatible</string>
     <string name="login_registration_not_supported">L\'aplicació no ha pogut crear un compte en aquest servidor.
@@ -978,7 +978,7 @@
     <string name="login_error_ssl_other">Error SSL.</string>
     <string name="call_failed_no_connection">La trucada d\'${app_name} ha fallat</string>
     <string name="login_reset_password_on">Restableix la contrasenya a %1$s</string>
-    <string name="login_login_with_email_error">Aquest correu electrònic no està associat amb cap compte.</string>
+    <string name="login_login_with_email_error">Aquesta adreça de correu electrònic no està associada a cap compte.</string>
     <string name="login_registration_disabled">Ho sentim, aquest servidor no accepta comptes nous.</string>
     <string name="login_sso_error_message">S\'ha produït un error en carregar la pàgina: %1$s (%2$d)</string>
     <string name="login_server_url_form_common_notice">Introdueix l\'adreça del servidor que vulguis utilitzar</string>
@@ -1002,10 +1002,10 @@
     <string name="settings_discovery_consent_action_give_consent">Dóna consentiment</string>
     <string name="settings_discovery_consent_action_revoke">Revoca el meu consentiment</string>
     <string name="settings_discovery_consent_title">Envia correus i números de telèfon</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">T\'hem enviat un correu de confirmació a %s, primer revisa el correu i fes clic a l\'enllaç de confirmació</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Hem enviat un correu electrònic a %s, primer revisa el correu i fes clic a l\'enllaç de confirmació</string>
-    <string name="settings_discovery_confirm_mail">T\'hem enviat un correu de confirmació a %s, revisa\'l i fes clic a l\'enllaç de confirmació</string>
+    <string name="settings_discovery_confirm_mail">Hem enviat un correu electrònic a %s, revisa\'l i fes clic a l\'enllaç de confirmació</string>
     <string name="settings_discovery_no_msisdn">Les opcions de descobriment apareixeran quan hagis afegit un número de telèfon.</string>
-    <string name="settings_discovery_no_mails">Les opcions de descobriment apareixeran quan hagis afegit un correu.</string>
+    <string name="settings_discovery_no_mails">Les opcions de descobriment apareixeran quan hagis afegit una adreça de correu electrònic.</string>
     <string name="disconnect_identity_server">Desconnecta el servidor d\'identitat</string>
     <string name="add_identity_server">Configura el servidor d\'identitat</string>
     <string name="change_identity_server">Canvia el servidor d\'identitat</string>
@@ -1100,7 +1100,7 @@
     <string name="room_settings_alias_subtitle">Revisa i gestiona les adreces d\'aquesta sala i la seva visibilitat al directori de sales.</string>
     <string name="room_settings_alias_title">Adreces de la sala</string>
     <string name="room_settings_room_access_title">Accés a la sala</string>
-    <string name="settings_emails_and_phone_numbers_summary">Gestiona els correus i els números de telèfon vinculats amb el teu compte de Matrix</string>
+    <string name="settings_emails_and_phone_numbers_summary">Gestiona les adreces de correu electrònic i els números de telèfon vinculats amb el teu compte de Matrix</string>
     <string name="settings_emails_and_phone_numbers_title">Correus i números de telèfon</string>
     <string name="disabled_integration_dialog_content">Activa \'Permet integracions\' a la configuració per poder fer això.</string>
     <string name="disabled_integration_dialog_title">Les integracions estan desactivades</string>
@@ -1154,7 +1154,7 @@
     <string name="error_threepid_auth_failed">Assegura\'t de que has clicat a l\'enllaç del correu que t\'hem enviat.</string>
     <string name="settings_remove_three_pid_confirmation_content">Elimina %s\?</string>
     <string name="settings_phone_numbers">Números de telèfon</string>
-    <string name="settings_emails_empty">No s\'ha afegit cap correu electrònic al teu compte</string>
+    <string name="settings_emails_empty">No s\'ha afegit cap adreça de correu electrònic al teu compte</string>
     <string name="settings_phone_number_empty">No s\'ha afegit cap número de telèfon al teu compte</string>
     <string name="search_banned_user_hint">Filtra usuaris vetats</string>
     <string name="room_settings_topic_hint">Tema</string>
@@ -1200,7 +1200,7 @@
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_device_name">session_name:</string>
     <string name="push_gateway_item_push_key">push_key:</string>
-    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="push_gateway_item_app_id">ID d\'aplicació:</string>
     <string name="alert_push_are_disabled_description">Revisa la configuració per activar les notificacions</string>
     <string name="settings_troubleshoot_test_push_notification_content">Estàs veient la notificació! Clica\'m!</string>
     <string name="member_banned_by">Vetat per %1$s</string>
@@ -1249,7 +1249,7 @@
     <string name="room_list_quick_actions_settings">Configuració</string>
     <string name="message_ignore_user">Ignora usuari</string>
     <string name="rotate_and_crop_screen_title">Gira i retalla</string>
-    <string name="login_set_email_notice">Estableix un correu per a la recuperació del compte. Posterior i opcionalment, pots permetre que els usuaris que coneixes et puguin trobar a partir del correu electrònic.</string>
+    <string name="login_set_email_notice">Estableix una adreça de correu electrònic per recuperar el teu compte. Posterior i opcionalment, pots permetre que els usuaris que coneixes et puguin trobar a partir d\'aquesta adreça.</string>
     <string name="login_set_msisdn_submit">Següent</string>
     <string name="login_set_msisdn_optional_hint">Número de telèfon (opcional)</string>
     <string name="login_set_msisdn_mandatory_hint">Número de telèfon</string>
@@ -1262,7 +1262,7 @@
     <string name="autodiscover_well_known_error">No s\'ha pogut trobar un servidor local vàlid. Comprova l\'identificador</string>
     <string name="settings_agree_to_terms">Accepta els termes de servei del servidor d\'identitat (%s) per poder ser trobat mitjançant l\'adreça de correu electrònic o el número de telèfon.</string>
     <string name="settings_discovery_enter_identity_server">Introdueix l\'URL d\'un servidor d\'identitat</string>
-    <string name="settings_discovery_consent_notice_on">Has donat el teu consentiment per poder enviar correus electrònics i números de telèfon a aquest servidor d\'identitat per trobar altres usuaris dels teus contactes.</string>
+    <string name="settings_discovery_consent_notice_on">Has donat el teu consentiment per poder enviar adreces de correu electrònic i números de telèfon a aquest servidor d\'identitat per trobar altres usuaris dels teus contactes.</string>
     <string name="settings_discovery_msisdn_title">Números de telèfon perquè et trobin</string>
     <string name="settings_discovery_disconnect_identity_server_info">Si et desconnectes del servidor d\'identitat no podràs ser trobat per altres usuaris ni convidar-los mitjançant el correu electrònic o el número de telèfon.</string>
     <string name="settings_discovery_emails_title">Correus electrònics perquè et puguin trobar</string>
@@ -1611,7 +1611,7 @@
     <string name="login_reset_password_mail_confirmation_notice_2">Fes clic a l\'enllaç per confirmar la nova contrasenya. Quan hagis anat a l\'enllaç que conté, fes clic a sota.</string>
     <string name="login_reset_password_mail_confirmation_notice">S\'ha enviat un correu de verificació a %1$s.</string>
     <string name="login_reset_password_mail_confirmation_title">Revisa la teva safata d\'entrada</string>
-    <string name="login_reset_password_error_not_found">Aquest correu no està vinculat amb cap compte</string>
+    <string name="login_reset_password_error_not_found">Aquesta adreça de correu electrònic no està vinculada a cap compte</string>
     <string name="login_reset_password_warning_submit">Continua</string>
     <string name="login_reset_password_warning_title">Atenció!</string>
     <string name="login_reset_password_password_hint">Nova contrasenya</string>
@@ -2120,8 +2120,8 @@
     <string name="create_spaces_invite_public_header_desc">Assegura\'t que les persones adequades tinguin accés a %s. Pots convidar-ne més després.</string>
     <string name="create_spaces_make_sure_access">Assegura\'t que les persones adequades tinguin accés a %s.</string>
     <string name="send_images_and_video_with_original_size">Envia multimèdia a mida real</string>
-    <string name="identity_server_consent_dialog_content_3">Per descobrir contactes existents, s\'ha d\'enviar informació de contacte (correus i números de telèfon) al servidor d\'identitat utilitzat. Es fa un \'hash\' de les dades abans d\'enviar-les per privacitat.</string>
+    <string name="identity_server_consent_dialog_content_3">Per descobrir contactes existents, s\'ha d\'enviar informació de contacte (adreces de correu electrònic i números de telèfon) al servidor d\'identitat utilitzat. Es fa un \'hash\' de les dades abans d\'enviar-les per privacitat.</string>
-    <string name="identity_server_consent_dialog_title_2">Envia correus i números de telèfon a %s</string>
+    <string name="identity_server_consent_dialog_title_2">Envia adreces de correu electrònic i números de telèfon a %s</string>
     <string name="settings_discovery_consent_notice_off_2">Els teus contactes són privats. Per descobrir els usuaris dels teus contactes, necessitem permís per enviar informació dels contactes al servidor d\'identitat que estiguis utilitzant.</string>
     <string name="send_feedback_space_info">Estàs utilitzant una versió beta dels espais. Els teus comentaris ajudaran a les properes versions. S\'anotaran la teva plataforma i nom d\'usuari per poder utilitzar els teus comentaris tant bé com puguem.</string>
     <string name="room_settings_room_access_restricted_description">Qualsevol a un espai amb aquesta sala podrà trobar-la i unir-s\'hi. Només els administradors d\'aquesta sala poden afegir-la a un espai.</string>
@@ -2150,7 +2150,7 @@
     <string name="location_activity_title_static_sharing">Comparteix ubicació</string>
     <string name="restart_the_application_to_apply_changes">Reinicia l\'aplicació per aplicar els canvis.</string>
     <string name="labs_enable_latex_maths">Activa format matemàtic amb LaTeX</string>
-    <string name="link_this_email_settings_link">Enllaça aquest correu amb el teu compte</string>
+    <string name="link_this_email_settings_link">Enllaça aquesta adreça de correu electrònic al teu compte</string>
     <string name="audio_message_file_size">(%1$s)</string>
     <string name="audio_message_reply_content">%1$s (%2$s)</string>
     <string name="error_audio_message_unable_to_play">No s\'ha pogut reproduir %1$s</string>
@@ -2438,7 +2438,7 @@
     <string name="settings_notification_other">Altres</string>
     <string name="settings_notification_mentions_and_keywords">Mencions i paraules clau</string>
     <string name="settings_notification_default">Notificacions per defecte</string>
-    <string name="settings_notification_emails_no_emails">Per rebre notificacions per correu, has d\'associar un correu electrònic amb el teu compte de Matrix</string>
+    <string name="settings_notification_emails_no_emails">Per rebre notificacions per correu, has d\'associar una adreça de correu electrònic al teu compte de Matrix</string>
     <string name="shortcut_disabled_reason_sign_out">S\'ha tancat la sessió!</string>
     <string name="shortcut_disabled_reason_room_left">La sala ha estat abandonada!</string>
     <string name="room_settings_none">Cap</string>
@@ -2616,7 +2616,6 @@
     <string name="home_layout_preferences_sort_by">Ordena per</string>
     <string name="home_layout_preferences_recents">Mostra recents</string>
     <string name="home_layout_preferences_filters">Mostra filtres</string>
-    <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>
     <string name="device_manager_other_sessions_description_verified">Verificada · Última activitat %1$s</string>
@@ -2710,4 +2709,40 @@
     <string name="device_manager_current_session_title">Sessió actual</string>
     <string name="labs_enable_new_app_layout_summary">SchildiChat simplificat amb pestanyes opcionals</string>
     <string name="labs_enable_new_app_layout_title">Activa la nova visualització</string>
+    <string name="device_manager_learn_more_sessions_inactive">Les sessions inactives son sessions que no has utilitzat durant un temps, però continuen rebent claus de xifrat.
+\n
+\nL\'eliminació de sessions inactives millora la seguretat i el rendiment, i et pot ajudar a identificar sessions noves sospitoses.</string>
+    <string name="device_manager_session_overview_signout">Tanca aquesta sessió</string>
+    <string name="command_description_devtools">Obre la pantalla d\'eines per a desenvolupadors</string>
+    <string name="device_manager_learn_more_session_rename">Els usuaris dels xats directes i sales al les quals t\'hagis unit poden veure la llista completa de les teves sessions.
+\n
+\nAixò els pot proporcionar més confiança de que realment parlen amb tu però, poden veure el nom de sessió que introdueixis.</string>
+    <string name="device_manager_learn_more_sessions_verified">Les sessions verificades son sessions en què has iniciat sessió amb les teves credencials i s\'han verificat utilitzant una frase de seguretat o mitjançant la verificació creuada.
+\n
+\nAixò vol dir que contenen claus de xifrat dels teus missatges anteriors i confirmen als altres usuaris amb qui parles, que aquestes sessions son realment teves.</string>
+    <string name="device_manager_learn_more_sessions_unverified">Les sessions no verificades son sessions en què has iniciat sessió amb les teves credencials però s\'hi ha fet una verificació creuada.
+\n
+\nAssegura\'t que reconeixes aquestes sessions especialment, ja que podrien representar un ús no autoritzat del teu compte.</string>
+    <string name="device_manager_learn_more_session_rename_title">Canvi de nom de sessions</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Sessions verificades</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Sessions no verificades</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Sessions inactives</string>
+    <string name="device_manager_session_rename_warning">Tingues en compte que els noms de sessió son visibles per les persones amb qui parlis.</string>
+    <string name="device_manager_session_rename_description">Els noms de sessió personalitzats et permeten identificar els teus dispositius més fàcilment.</string>
+    <string name="device_manager_session_rename_edit_hint">Nom de la sessió</string>
+    <string name="device_manager_session_rename">Canvia el nom de la sessió</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">No verificada · Sessió actual</string>
+    <string name="key_authenticity_not_guaranteed">L\'autenticitat d\'aquest missatge xifrat no ha pogut ser garantida en aquest dispositiu.</string>
+    <string name="command_description_table_flip">Afegeix (╯°□°）╯︵ ┻━┻ abans d\'un missatge de text</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ Hi ha dispositius no verificats en aquesta sala, no podran desxifrat els missatges que enviïs.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">No enviïs mai missatges xifrats a sessions no verificades d\'aquesta sala.</string>
+    <string name="action_got_it">D\'acord</string>
+    <string name="attachment_type_voice_broadcast">Transmissió de veu</string>
+    <string name="tooltip_attachment_voice_broadcast">Inicia una transmissió de veu</string>
+    <string name="settings_security_incognito_keyboard_summary">Sol·licita que no es desi cap dada personalitzada del teclat en funció del que escrius a les converses (per exemple l\'historial d\'escriptura o el diccionari). Tingues en compte que alguns teclats poden no respectar aquesta configuració.</string>
+    <string name="settings_security_incognito_keyboard_title">Teclat incògnit</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Has activat el xifrat a només en sessions verificades a totes les sales, a Configuració &gt; Seguretat.</string>
+    <string name="device_manager_verification_status_unknown">Estat de verificació desconegut</string>
+    <string name="login_scan_qr_code">Escaneja codi QR</string>
+    <string name="push_gateway_item_device_id">ID de sessió:</string>
 </resources>

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

@@ -648,8 +648,8 @@
     <string name="encryption_import_room_keys">Import klíčů místností</string>
     <string name="encryption_import_room_keys_summary">Import klíčů z místního souboru</string>
     <string name="encryption_import_import">Import</string>
-    <string name="encryption_never_send_to_unverified_devices_title">Šifruj pouze do ověřených relací</string>
+    <string name="encryption_never_send_to_unverified_devices_title">Šifrovat pouze do ověřených relací</string>
-    <string name="encryption_never_send_to_unverified_devices_summary">Nikdy neposílejte šifrované zprávy do neověřených relací z této relace.</string>
+    <string name="encryption_never_send_to_unverified_devices_summary">Nikdy neposílat šifrované zprávy do neověřených relací z této relace.</string>
     <string name="encryption_information_not_verified">Není ověřeno</string>
     <string name="encryption_information_verified">Potvrzeno</string>
     <string name="encryption_information_unknown_ip">neznámá ip</string>
@@ -962,10 +962,10 @@
     <string name="settings_push_rules">Push pravidla</string>
     <string name="settings_push_rules_no_rules">Žádná push pravidla nejsou definována</string>
     <string name="settings_push_gateway_no_pushers">Žádné push brány nejsou registrovány</string>
-    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="push_gateway_item_app_id">ID aplikace:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
+    <string name="push_gateway_item_push_key">Klíč push:</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
+    <string name="push_gateway_item_app_display_name">Zobrazovaný název aplikace:</string>
-    <string name="push_gateway_item_device_name">session_name:</string>
+    <string name="push_gateway_item_device_name">Název relace:</string>
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Formát:</string>
     <string name="preference_voice_and_video">Hlas a video</string>
@@ -1011,7 +1011,7 @@
     <string name="settings_discovery_no_msisdn">Volby pro nalezení se ukážou, jakmile doplníte telefonní číslo.</string>
     <string name="settings_discovery_disconnect_identity_server_info">Odpojení od serveru identit bude znamenat, že Vás jiní uživatelé nebudou moci najít a Vy nebudete moci pozvat druhé pomocí emailu nebo telefonního čísla.</string>
     <string name="settings_discovery_msisdn_title">Telefonní čísla pro nalezení</string>
-    <string name="settings_discovery_confirm_mail">Poslali jsme Vám potvrzovací email na %s, podívejte se do emailu a klikněte na protvrzovací odkaz</string>
+    <string name="settings_discovery_confirm_mail">Poslali jsme vám email na %s, podívejte se do něj a klikněte na protvrzovací odkaz</string>
     <string name="settings_discovery_enter_identity_server">Zadejte URL serveru pro identity</string>
     <string name="settings_discovery_bad_identity_server">Nemohl jsem se spojit se serverem pro identity</string>
     <string name="settings_discovery_please_enter_server">Prosím, zadejte url serveru pro identity</string>
@@ -1079,12 +1079,12 @@
     <string name="no_ignored_users">Neignorujete žádné uživatele</string>
     <string name="help_long_click_on_room_for_more_options">Více možností po dlouhém stisku na místnost</string>
     <string name="room_join_rules_public">%1$s učinil místnost veřejnou pro kohokoli znalého odkazu.</string>
-    <string name="room_join_rules_invite">%1$s nastavil místnost jen pro pozvané.</string>
+    <string name="room_join_rules_invite">%1$s nastavil místnost jako pouze pro pozvané.</string>
     <string name="timeline_unread_messages">Nepřečtené zprávy</string>
     <string name="login_splash_title">Je to Vaše konverzace. Vlastněte ji.</string>
     <string name="login_splash_text1">Chatujte s lidmi přímo nebo ve skupinách</string>
     <string name="login_splash_text2">Udržujte konverzace soukromé pomocí šifrování</string>
-    <string name="login_splash_text3">Rozšiřte a upravte si svůj zážitek</string>
+    <string name="login_splash_text3">Rozšiřte a upravte si možnosti</string>
     <string name="login_splash_submit">Můžeme začít</string>
     <string name="login_server_title">Vybrat server</string>
     <string name="login_server_text">Jako email, účty mají jeden domov, ačkoli můžete mluvit s kýmkoli</string>
@@ -1136,7 +1136,7 @@
 \n
 \nZastavit proces změny hesla\?</string>
     <string name="login_set_email_title">Nastavit emailovou adresu</string>
-    <string name="login_set_email_notice">Nastavte emailovou adresu pro obnově svého účtu. Později můžete volitelně dovolit lidem, které znáte, aby Vás podle emailu nalezli.</string>
+    <string name="login_set_email_notice">Nastavte e-mailovou adresu pro obnovení účtu. Později můžete volitelně povolit svým známým, aby vás podle této adresy nalezli.</string>
     <string name="login_set_email_mandatory_hint">Email</string>
     <string name="login_set_email_optional_hint">Email (volitelné)</string>
     <string name="login_set_email_submit">Dále</string>
@@ -1218,7 +1218,7 @@
     <string name="settings_developer_mode_fail_fast_summary">${app_name} může spadnout častěji, když se objeví neočekávané chyby</string>
     <string name="command_description_shrug">Předsune ¯\\_(ツ)_/¯ do textové zprávy</string>
     <string name="create_room_encryption_title">Zapnout šifrování</string>
-    <string name="create_room_encryption_description">Jakmile zapnuto, šifrování nelze vypnout.</string>
+    <string name="create_room_encryption_description">Po zapnutí šifrování ho není možné vypnout.</string>
     <string name="login_error_threepid_denied">Vaše emailová doména není autorizována registrovat se na tomto serveru</string>
     <string name="verification_conclusion_warning">Nedůvěryhodné přihlášení</string>
     <string name="verification_sas_match">Shodují se</string>
@@ -1297,15 +1297,15 @@
     <string name="verification_conclusion_ok_self_notice">Vaše nová relace je nyní ověřena. Má přístup k Vašim zašifrovaným zprávám a ostatní uživatelé ji uvidi jako důvěryhodnou.</string>
     <string name="encryption_information_cross_signing_state">Křížové podepisování</string>
     <string name="encryption_information_dg_xsigning_complete">Křížové podpisování je zapnuto.
-\nPrivátní klíče v zařízení.</string>
+\nSoukromé klíče v zařízení.</string>
     <string name="encryption_information_dg_xsigning_trusted">Křížové podpisování je zapnuto
 \nKlíče jsou důvěryhodné.
-\nPrivátní klíče nejsou známy</string>
+\nSoukromé klíče nejsou známy</string>
     <string name="encryption_information_dg_xsigning_not_trusted">Křížové podpisování je zapnuto.
 \nKlíče nejsou důvěryhodné</string>
     <string name="encryption_information_dg_xsigning_disabled">Křížové podpisování není zapnuto</string>
     <string name="settings_active_sessions_list">Aktivní relace</string>
-    <string name="settings_active_sessions_show_all">Ukázat všechny relace</string>
+    <string name="settings_active_sessions_show_all">Zobrazit všechny relace</string>
     <string name="settings_active_sessions_manage">Správa relací</string>
     <string name="settings_active_sessions_signout_device">Odhlásit se z této relace</string>
     <string name="settings_failed_to_get_crypto_device_info">Žádná kryptografická informace není k dispozici</string>
@@ -1440,7 +1440,7 @@
     <string name="event_redacted">Zpráva smazána</string>
     <string name="settings_show_redacted">Ukázat odstraněné zprávy</string>
     <string name="settings_show_redacted_summary">Zobrazit zástupný symbol za odstraněné zprávy</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Poslali jsme Vám potvrzovací email na %s, podívejte se nejdříve do emailu a klikněte na protvrzovací odkaz</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Poslali jsme vám email na %s, podívejte se nejdříve do emailu a klikněte na protvrzovací odkaz</string>
     <string name="settings_text_message_sent_wrong_code">Ověřovací kód není správný.</string>
     <string name="uploads_media_title">MÉDIA</string>
     <string name="uploads_media_no_result">V této místnosti nejsou žádná média</string>
@@ -2019,20 +2019,20 @@
     <string name="create_space_error_empty_field_space_name">Dejte prostoru jméno a pokračujte.</string>
     <string name="create_spaces_details_public_header">Doplňte nějaké podrobnosti, aby zaujal. Můžete je kdykoli změnit.</string>
     <string name="activity_create_space_title">Vytvořit prostor</string>
-    <string name="space_type_private_desc">Pouze na pozvání, nejlepší pro Vás nebo týmy</string>
+    <string name="space_type_private_desc">Pouze na pozvání, nejlepší pro vás nebo týmy</string>
-    <string name="space_type_private">Privátní</string>
+    <string name="space_type_private">Soukromý</string>
     <string name="space_type_public_desc">Otevřený pro všechny, nejlepší pro komunity</string>
     <string name="space_type_public">Veřejný</string>
-    <string name="create_spaces_private_teammates">Privátní prostor pro Vás a Vaše kolegy</string>
+    <string name="create_spaces_private_teammates">Soukromý prostor pro vás a vaše kolegy</string>
     <string name="create_spaces_me_and_teammates">Já a kolegové</string>
-    <string name="create_spaces_organise_rooms">Privátní prostor k organizaci Vašich místností</string>
+    <string name="create_spaces_organise_rooms">Soukromý prostor pro uspořádání vašich místností</string>
     <string name="create_spaces_just_me">Jen já</string>
     <string name="create_spaces_make_sure_access">Ujistěte se, že ti správní lidé mají přístup do %s.</string>
     <string name="create_spaces_who_are_you_working_with">S kým pracujete\?</string>
     <string name="create_spaces_join_info_help">Ke vstupu do existujícího prostoru potřebujete pozvání.</string>
     <string name="create_spaces_you_can_change_later">Můžete změnit později</string>
     <string name="create_spaces_choose_type_label">Jaký typ prostoru chcete vytvořit\?</string>
-    <string name="your_private_space">Váš privátní prostor</string>
+    <string name="your_private_space">Váš soukromý prostor</string>
     <string name="your_public_space">Váš veřejný prostor</string>
     <string name="add_space">Přidat prostor</string>
     <string name="command_description_leave_room">Opustit místnost s daným id (nebo nynější místnost pokud prázdné)</string>
@@ -2044,7 +2044,7 @@
     <string name="room_settings_room_access_public_description">Kdokoliv může místnost najít a připojit se do ní</string>
     <string name="room_settings_room_access_public_title">Veřejný</string>
     <string name="room_settings_room_access_private_description">Pouze pozvaní mohou místnost najít a vstoupit do ní</string>
-    <string name="room_settings_room_access_private_title">Privátní</string>
+    <string name="room_settings_room_access_private_title">Soukromý</string>
     <string name="room_settings_room_access_entry_unknown">Neznámé nastavení přístupu (%s)</string>
     <string name="room_settings_room_access_entry_knock">Každý může na místnost zaklepat, členové pak mohou přijmout či odmítnout</string>
     <string name="room_settings_guest_access_title">Dovolit hostům vstoupit</string>
@@ -2165,7 +2165,7 @@
     <string name="spaces_which_can_access">Prostory, které mají přístup</string>
     <string name="allow_space_member_to_find_and_access">Umožněte členům prostoru ho najít a zpřístupnit.</string>
     <string name="room_create_member_of_space_name_can_join">Členové prostoru %s mohou vyhledávat, prohlížet a připojovat se.</string>
-    <string name="room_settings_room_access_private_invite_only_title">Soukromý (pouze pro pozvané)</string>
+    <string name="room_settings_room_access_private_invite_only_title">Soukromý (jen pro pozvané)</string>
     <string name="denied_permission_voice_message">Chcete-li odesílat hlasové zprávy, povolte oprávnění mikrofonu.</string>
     <string name="settings_room_upgrades">Aktualizace místnosti</string>
     <string name="settings_messages_by_bot">Zprávy od bota</string>
@@ -2650,7 +2650,6 @@
 \nTento domovský server nemusí být nakonfigurován pro zobrazování map.</string>
     <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="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="device_manager_sessions_other_title">Ostatní relace</string>
     <string name="settings_sessions_list">Relace</string>
@@ -2764,4 +2763,100 @@
     <string name="labs_enable_deferred_dm_title">Povolit odložené přímé zprávy</string>
     <string name="labs_enable_new_app_layout_summary">Zjednodušený SchildiChat s volitelnými kartami</string>
     <string name="labs_enable_new_app_layout_title">Povolit nový vzhled</string>
+    <string name="device_manager_learn_more_session_rename">Ostatní uživatelé v přímých zprávách a místnostech, ke kterým se připojíte, si mohou prohlédnout úplný seznam vašich relací.
+\n
+\nTo jim poskytuje jistotu, že s vámi skutečně mluví, ale také to znamená, že mohou vidět název relace, který zde zadáte.</string>
+    <string name="device_manager_learn_more_session_rename_title">Přejmenování relací</string>
+    <string name="device_manager_learn_more_sessions_verified">Ověřené relace se přihlásily pomocí vašich přihlašovacích údajů a poté byly ověřeny buď pomocí vaší zabezpečené přístupové fráze, nebo křížovým ověřením.
+\n
+\nTo znamená, že uchovávají šifrovací klíče pro vaše předchozí zprávy a potvrzují ostatním uživatelům, se kterými komunikujete, že tyto relace jste skutečně vy.</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Ověřené relace</string>
+    <string name="device_manager_learn_more_sessions_unverified">Neověřené relace jsou relace, které se přihlásily pomocí vašich přihlašovacích údajů, ale nebyly křížově ověřeny.
+\n
+\nMěli byste si být obzvláště jisti, že tyto relace rozpoznáte, protože by mohly představovat neoprávněné použití vašeho účtu.</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Neověřené relace</string>
+    <string name="device_manager_learn_more_sessions_inactive">Neaktivní relace jsou relace, které jste po určitou dobu nepoužili, ale nadále dostávají šifrovací klíče.
+\n
+\nOdstranění neaktivních relací zvyšuje zabezpečení a výkon a usnadňuje identifikaci podezřelé nové relace.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Neaktivní relace</string>
+    <string name="device_manager_session_rename_warning">Uvědomte si, že jména relací jsou viditelná i pro osoby, se kterými komunikujete.</string>
+    <string name="device_manager_session_rename_description">Vlastní názvy relací vám pomohou snadněji rozpoznat vaše zařízení.</string>
+    <string name="device_manager_session_rename_edit_hint">Název relace</string>
+    <string name="device_manager_session_rename">Přejmenovat relaci</string>
+    <string name="device_manager_session_overview_signout">Odhlásit se z této relace</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Neověřeno · Vaše aktuální relace</string>
+    <string name="tooltip_attachment_voice_broadcast">Zahájit hlasové vysílání</string>
+    <string name="key_authenticity_not_guaranteed">Pravost této šifrované zprávy nelze v tomto zařízení zaručit.</string>
+    <string name="settings_security_incognito_keyboard_summary">Požadujte, aby klávesnice neaktualizovala žádné personalizované údaje, jako je historie psaní a slovník, na základě toho, co jste napsali v konverzacích. Upozorňujeme, že některé klávesnice nemusí toto nastavení respektovat.</string>
+    <string name="settings_security_incognito_keyboard_title">Inkognito klávesnice</string>
+    <string name="command_description_table_flip">Přidá znaky (╯°□°）╯︵ ┻━┻ před zprávy ve formátu obyčejného textu</string>
+    <string name="attachment_type_voice_broadcast">Hlasové vysílání</string>
+    <string name="command_description_devtools">Otevřít nástroje pro vývojáře</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 V nastavení zabezpečení jste povolili šifrování pouze do ověřených relací pro všechny místnosti.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ V této místnosti jsou neověřená zařízení, která nebudou schopna dešifrovat odeslané zprávy.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Nikdy neodesílat šifrované zprávy do neověřených relací v této místnosti.</string>
+    <string name="action_got_it">Rozumím</string>
+    <string name="rich_text_editor_format_underline">Použít podtržení</string>
+    <string name="rich_text_editor_format_strikethrough">Použít přeškrtnutí</string>
+    <string name="rich_text_editor_format_bold">Použít tučný text</string>
+    <string name="rich_text_editor_format_italic">Použít kurzívu</string>
+    <string name="labs_enable_client_info_recording_summary">Zaznamenávat název, verzi a url pro snadnější rozpoznání relací ve správci relací.</string>
+    <string name="labs_enable_client_info_recording_title">Povolit záznamenávání informací o klientu</string>
+    <string name="labs_enable_session_manager_summary">Získejte lepší přehled a kontrolu nad všemi relacemi.</string>
+    <string name="labs_enable_session_manager_title">Použít nový správce relací</string>
+    <string name="device_manager_session_details_device_operating_system">Operační systém</string>
+    <string name="device_manager_session_details_device_model">Model</string>
+    <string name="device_manager_session_details_device_browser">Prohlížeč</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">Verze</string>
+    <string name="device_manager_session_details_application_name">Název</string>
+    <string name="device_manager_session_details_application">Aplikace</string>
+    <string name="device_manager_push_notifications_description">Přijímat push oznámení v této relaci.</string>
+    <string name="device_manager_push_notifications_title">Push oznámení</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Ověřením aktuální relace zjistíte stav ověření této relace.</string>
+    <string name="device_manager_verification_status_unknown">Neznámý stav ověření</string>
+    <string name="push_gateway_item_enabled">Zapnuto:</string>
+    <string name="push_gateway_item_device_id">ID relace:</string>
+    <string name="error_check_network">Něco se pokazilo. Zkontrolujte prosím síťové připojení a zkuste to znovu.</string>
+    <string name="grant_permission">Udělit oprávnění</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} potřebuje oprávnění k zobrazování oznámení.
+\nUdělte prosím toto oprávnění.</string>
+    <string name="permissions_rationale_msg_notification">${app_name} potřebuje oprávnění k zobrazování oznámení. Oznámení mohou zobrazovat vaše zprávy, pozvánky atd.
+\n
+\nPro zobrazování oznámení povolte přístup na dalších vyskakovacích oknech.</string>
+    <string name="labs_enable_rich_text_editor_summary">Vyzkoušejte rozšířený textový editor (textový režim již brzy)</string>
+    <string name="labs_enable_rich_text_editor_title">Povolit rozšířený textový editor</string>
+    <string name="qr_code_login_confirm_security_code_description">Ujistěte se, že znáte původ tohoto kódu. Propojením zařízení poskytnete někomu plný přístup ke svému účtu.</string>
+    <string name="qr_code_login_confirm_security_code">Potvrdit</string>
+    <string name="qr_code_login_try_again">Zkuste to znovu</string>
+    <string name="qr_code_login_status_no_match">Neshoduje se\?</string>
+    <string name="qr_code_login_signing_in">Probíhá přihlašování</string>
+    <string name="qr_code_login_connecting_to_device">Připojování k zařízení</string>
+    <string name="qr_code_login_scan_qr_code_button">Naskenujte QR kód</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Přihlašování na mobilním zařízením\?</string>
+    <string name="qr_code_login_show_qr_code_button">Zobrazit QR kód na tomto zařízení</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Vyberte možnost \"Naskenovat QR kód\"</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Začněte na přihlašovací obrazovce</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Vyberte možnost \"Přihlásit se pomocí QR kódu\"</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Začněte na přihlašovací obrazovce</string>
+    <string name="qr_code_login_new_device_instruction_3">Vyberte možnost \"Zobrazit QR kód na tomto zařízení\"</string>
+    <string name="qr_code_login_new_device_instruction_2">Přejděte do Nastavení -&gt; Zabezpečení a soukromí -&gt; Zobrazit všechny relace</string>
+    <string name="qr_code_login_new_device_instruction_1">Otevřete ${app_name} na vašem druhém zařízení</string>
+    <string name="qr_code_login_header_failed_denied_description">Žádost byla na druhém zařízení zamítnuta.</string>
+    <string name="qr_code_login_header_failed_timeout_description">Propojení nebylo dokončeno v požadovaném čase.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Propojení s tímto zařízením není podporováno.</string>
+    <string name="qr_code_login_header_failed_title">Neúspěšné připojení</string>
+    <string name="qr_code_login_header_connected_description">Zkontrolujte vaše přihlášené zařízení, měl by se zobrazit níže uvedený kód. Zkontrolujte, zda níže uvedený kód odpovídá danému zařízení:</string>
+    <string name="qr_code_login_header_connected_title">Zabezpečené připojení navázáno</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Pomocí odhlášeného zařízení naskenujte níže uvedený QR kód.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Pomocí přihlášeného zařízení naskenujte níže uvedený QR kód:</string>
+    <string name="qr_code_login_header_show_qr_code_title">Přihlásit se pomocí QR kódu</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Pomocí fotoaparátu na tomto zařízení naskenujte QR kód zobrazený na druhém zařízení:</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Naskenovat QR kód</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Pomocí tohoto zařízení se můžete přihlásit do mobilního nebo webového zařízení pomocí QR kódu. Můžete to provést dvěma způsoby:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Přihlásit se pomocí QR kódu</string>
+    <string name="login_scan_qr_code">Naskenovat QR kód</string>
 </resources>

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

@@ -40,9 +40,9 @@
     <string name="room_displayname_two_members">%1$s und %2$s</string>
     <string name="room_displayname_empty_room">Leerer Raum</string>
     <string name="notice_room_update">%s hat diesen Raum aufgewertet.</string>
-    <string name="event_status_sending_message">Sende eine Nachricht…</string>
+    <string name="event_status_sending_message">Sende eine Nachricht …</string>
     <string name="initial_sync_start_importing_account">Erste Synchronisation:
-\nImportiere Benutzerkonto…</string>
+\nImportiere Benutzerkonto …</string>
     <string name="initial_sync_start_importing_account_crypto">Erste Synchronisation:
 \nImportiere Kryptoschlüssel</string>
     <string name="initial_sync_start_importing_account_rooms">Erste Synchronisation:
@@ -300,11 +300,11 @@
     <string name="compression_opt_list_large">Groß</string>
     <string name="compression_opt_list_medium">Mittel</string>
     <string name="compression_opt_list_small">Klein</string>
-    <string name="call_connecting">Verbindungsaufbau…</string>
+    <string name="call_connecting">Verbindungsaufbau …</string>
     <string name="call_ended">Anruf beendet</string>
     <string name="incoming_video_call">Eingehender Videoanruf</string>
     <string name="incoming_voice_call">Eingehender Sprachanruf</string>
-    <string name="call_in_progress">Anruf aktiv…</string>
+    <string name="call_in_progress">Anruf aktiv …</string>
     <string name="call_error_user_not_responding">Die Gegenseite hat den Anruf nicht angenommen.</string>
     <string name="permissions_rationale_popup_title">Information</string>
     <string name="permissions_rationale_msg_record_audio">${app_name} benötigt die Berechtigung, auf dein Mikrofon zugreifen zu können, um (Sprach-)Anrufe tätigen zu können.</string>
@@ -329,9 +329,9 @@
     <string name="room_participants_action_mention">Erwähnen</string>
     <string name="room_participants_power_level_prompt">Du wirst diese Änderung nicht rückgängig machen können, da die Person dieselbe Berechtigungsstufe wie du erhalten wird.
 \nBist du sicher\?</string>
-    <string name="room_one_user_is_typing">%s schreibt…</string>
+    <string name="room_one_user_is_typing">%s tippt …</string>
-    <string name="room_two_users_are_typing">%1$s und %2$s schreiben…</string>
+    <string name="room_two_users_are_typing">%1$s und %2$s tippen …</string>
-    <string name="room_many_users_are_typing">%1$s, %2$s und andere schreiben…</string>
+    <string name="room_many_users_are_typing">%1$s, %2$s und andere tippen …</string>
     <string name="room_do_not_have_permission_to_post">Du bist nicht berechtigt, in diesen Raum zu schreiben.</string>
     <string name="ssl_trust">Vertrauen</string>
     <string name="ssl_do_not_trust">Nicht vertrauen</string>
@@ -431,7 +431,7 @@
     <string name="encryption_import_room_keys_summary">Schlüssel aus lokaler Datei importieren</string>
     <string name="encryption_import_import">Importieren</string>
     <string name="encryption_never_send_to_unverified_devices_title">Nur zu verifizierten Sitzungen verschlüsseln</string>
-    <string name="encryption_never_send_to_unverified_devices_summary">Von dieser Sitzung aus keine verschlüsselten Nachrichten an nicht-verifizierte Sitzungen senden.</string>
+    <string name="encryption_never_send_to_unverified_devices_summary">Niemals verschlüsselte Nachrichten von dieser Sitzung zu unverifizierten Sitzungen senden.</string>
     <string name="encryption_information_not_verified">Nicht verifiziert</string>
     <string name="encryption_information_verified">Verifiziert</string>
     <string name="encryption_information_verify">Bestätigen</string>
@@ -495,7 +495,7 @@
     <string name="notification_off">Aus</string>
     <string name="notification_noisy">Laut</string>
     <string name="encrypted_message">Verschlüsselte Nachricht</string>
-    <string name="loading">Lädt…</string>
+    <string name="loading">Lädt …</string>
     <string name="start_voice_call_prompt_msg">Sicher, dass du einen Sprachanruf starten möchtest\?</string>
     <string name="start_video_call_prompt_msg">Sicher, dass du einen Videoanruf starten möchtest\?</string>
     <string name="room_participants_ban_prompt_msg">Die Verbannung einer Person entfernt sie aus diesem Raum und hindert sie am erneuten Beitritt.</string>
@@ -628,7 +628,7 @@
     <string name="action_accept">Akzeptieren</string>
     <string name="auth_accept_policies">Bitte lese und akzeptiere die Richtlinien dieses Homeservers:</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">Tests ausführen</string>
-    <string name="settings_troubleshoot_diagnostic_running_status">Läuft… (%1$d von %2$d)</string>
+    <string name="settings_troubleshoot_diagnostic_running_status">Läuft … (%1$d von %2$d)</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Einer oder mehrere Tests sind fehlgeschlagen. Versuche vorgeschlagene Lösung(en).</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Einer oder mehrere Tests sind fehlgeschlagen. Bitte sende einen Fehlerbericht, damit dies untersucht werden kann.</string>
     <string name="settings_troubleshoot_test_system_settings_title">Systemeinstellungen.</string>
@@ -646,7 +646,7 @@
     <string name="settings_troubleshoot_test_device_settings_failed">Benachrichtigungen sind für diese Sitzung nicht aktiviert.
 \nBitte überprüfe die Einstellungen für ${app_name}.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Aktiviere</string>
-    <string name="settings_troubleshoot_test_play_services_failed">${app_name} benutzt Google-Play-Dienste um Push-Nachrichten zu übermitteln, doch scheinen sie nicht korrekt konfiguriert zu sein:
+    <string name="settings_troubleshoot_test_play_services_failed">${app_name} benutzt Google-Play-Dienste, um Push-Nachrichten zu übermitteln, allerdings scheint dies nicht korrekt konfiguriert zu sein:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Repariere Play-Dienste</string>
     <string name="settings_troubleshoot_test_fcm_title">Firebase-Token</string>
@@ -679,7 +679,7 @@
     <string name="settings_troubleshoot_test_battery_failed">Wenn ein Benutzer ein abgestecktes Gerät mit ausgeschaltetem Bildschirm eine Weile nicht bewegt, wechselt es in den Bereitschaftsmodus. Dies hindert Apps daran, auf das Netzwerk zuzugreifen und verzögert die Ausführung von Aufgaben, Synchronisierungen und Standard-Alarmen.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignoriere Optimierungen</string>
     <string name="no_valid_google_play_services_apk">Keine validen Google-Play-Dienste gefunden. Benachrichtigungen könnten nicht richtig funktionieren.</string>
-    <string name="video_call_in_progress">Videogespräch aktiv…</string>
+    <string name="video_call_in_progress">Videogespräch aktiv …</string>
     <string name="title_activity_keys_backup_setup">Schlüsselsicherung</string>
     <string name="title_activity_keys_backup_restore">Schlüsselsicherung verwenden</string>
     <string name="action_skip">Überspringen</string>
@@ -692,7 +692,7 @@
     <string name="settings_noisy_notifications_preferences">Laute Benachrichtigungen einstellen</string>
     <string name="settings_call_notifications_preferences">Anrufbenachrichtigung einstellen</string>
     <string name="settings_silent_notifications_preferences">Stumme Benachrichtigungen einstellen</string>
-    <string name="settings_system_preferences_summary">LED-Farbe, Vibration, Ton usw. wählen</string>
+    <string name="settings_system_preferences_summary">Wähle LED-Farbe, Vibration, Ton …</string>
     <string name="notification_silent">Stumm</string>
     <string name="passphrase_empty_error_message">Bitte eine Passphrase eingeben</string>
     <string name="passphrase_passphrase_too_weak">Passphrase ist zu schwach</string>
@@ -703,16 +703,16 @@
     <string name="keys_backup_setup_step3_copy_button_title">Wiederherstellungsschlüssel speichern</string>
     <string name="keys_backup_setup_step3_save_button_title">Sichere als Datei</string>
     <string name="keys_backup_setup_step3_please_make_copy">Bitte mache eine Kopie</string>
-    <string name="keys_backup_setup_step3_share_intent_chooser_title">Wiederherstellungsschlüssel teilen mit…</string>
+    <string name="keys_backup_setup_step3_share_intent_chooser_title">Wiederherstellungsschlüssel teilen mit …</string>
     <string name="recovery_key">Wiederherstellungsschlüssel</string>
     <string name="unexpected_error">Unerwarteter Fehler</string>
     <string name="keys_backup_setup_skip_title">Bist du sicher\?</string>
     <string name="keys_backup_restore_key_enter_hint">Wiederherstellungsschlüssel eingeben</string>
-    <string name="keys_backup_restoring_waiting_message">Stelle Backup wieder her:</string>
+    <string name="keys_backup_restoring_waiting_message">Stelle Sicherung wieder her:</string>
     <string name="keys_backup_unlock_button">Historie entschlüsseln</string>
     <string name="keys_backup_settings_restore_backup_button">Von Sicherung wiederherstellen</string>
-    <string name="keys_backup_settings_delete_backup_button">Sicherung löschen</string>
+    <string name="keys_backup_settings_delete_backup_button">Lösche Sicherung</string>
-    <string name="keys_backup_settings_deleting_backup">Lösche Sicherung…</string>
+    <string name="keys_backup_settings_deleting_backup">Lösche Sicherung …</string>
     <string name="keys_backup_settings_delete_confirm_title">Lösche Sicherung</string>
     <string name="settings_notification_by_event">Präferenz der Benachrichtigungen nach Ereignis</string>
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
@@ -722,13 +722,13 @@
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
 \nDieser Fehler ist außerhalb von ${app_name} passiert. Es gibt kein Google-Konto auf dem Gerät. Bitte füge ein Google-Konto hinzu.</string>
     <string name="settings_cryptography_manage_keys">Verwaltung der Kryptoschlüssel</string>
-    <string name="encryption_settings_manage_message_recovery_summary">Schlüssel-Sicherung verwalten</string>
+    <string name="encryption_settings_manage_message_recovery_summary">Schlüsselsicherung verwalten</string>
     <string name="keys_backup_setup_step1_description">Nachrichten in verschlüsselten Räumen sind mit Ende-zu-Ende-Verschlüsselung gesichert. Nur du und der Empfänger haben die Schlüssel um diese Nachrichten zu lesen.
 \n
 \nSichere deine Schlüssel, um sie nicht zu verlieren.</string>
     <string name="keys_backup_setup_step3_generating_key_status">Wiederherstellungsschlüssel aus Passphrase generieren. Dies kann mehrere Sekunden brauchen.</string>
     <string name="keys_backup_setup_skip_msg">Du verlierst möglicherweise den Zugang zu deinen Nachrichten, wenn du dich abmeldest oder das Gerät verlierst.</string>
-    <string name="keys_backup_restore_is_getting_backup_version">Rufe Backup-Version ab…</string>
+    <string name="keys_backup_restore_is_getting_backup_version">Rufe Sicherungsversion ab …</string>
     <string name="keys_backup_restore_with_passphrase">Nutze deine Wiederherstellungs-Passphrase, um deinen verschlüsselten Nachrichtenverlauf lesen zu können</string>
     <string name="keys_backup_restore_use_recovery_key">nutze deinen Wiederherstellungsschlüssel</string>
     <string name="keys_backup_restore_with_passphrase_helper_with_link">Wenn du deine Wiederherstellungspassphrase nicht weist, kannst du %s.</string>
@@ -762,11 +762,11 @@
     <string name="sign_out_bottom_sheet_warning_backing_up">Schlüssel-Sicherung wird durchgeführt. Wenn du dich jetzt abmeldest, gehen deine verschlüsselten Nachrichten verloren.</string>
     <string name="sign_out_bottom_sheet_warning_backup_not_active">Schlüsselsicherung sollte bei allen Sitzungen aktiviert sein, um den Verlust verschlüsselter Nachrichten zu verhindern.</string>
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">Ich möchte meine verschlüsselten Nachrichten nicht</string>
-    <string name="sign_out_bottom_sheet_backing_up_keys">Sichere Schlüssel…</string>
+    <string name="sign_out_bottom_sheet_backing_up_keys">Sichere Schlüssel …</string>
-    <string name="are_you_sure">Sicher\?</string>
+    <string name="are_you_sure">Bist du sicher\?</string>
     <string name="backup">Sicherung</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Alle verschlüsselten Nachrichten gehen verloren, wenn Du dich abmeldest ohne die Schlüssel gesichert zu haben.</string>
-    <string name="action_sign_out_confirmation_simple">Wirklich abmelden\?</string>
+    <string name="action_sign_out_confirmation_simple">Bist du sicher, dass du dich abmelden möchtest\?</string>
     <string name="encryption_message_recovery">Wiederherstellung verschlüsselter Nachrichten</string>
     <string name="error_empty_field_enter_user_name">Bitte gib einen Benutzernamen ein.</string>
     <string name="keys_backup_setup">Richte Schlüsselsicherung ein</string>
@@ -783,25 +783,25 @@
     <string name="keys_backup_setup_step3_text_line1">Deine Schlüssel wurden gesichert.</string>
     <string name="keys_backup_setup_step3_text_line2">Dein Wiederherstellungsschlüssel ist ein Sicherungsnetz - du kannst es benutzen um den Zugriff auf deine verschlüsselten Nachrichten wiederherzustellen, falls du deine Passphrase vergisst.
 \nVerwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie einem Passwortmanager (oder Safe)</string>
-    <string name="keys_backup_setup_step3_text_line2_no_passphrase">Bewahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort auf, wie z.B. einem Passwortmanager (oder Tresor) auf</string>
+    <string name="keys_backup_setup_step3_text_line2_no_passphrase">Bewahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie einem Passwortmanager (oder Safe) auf</string>
     <string name="keys_backup_setup_step3_button_title_no_passphrase">Ich habe eine Kopie angefertigt</string>
     <string name="keys_backup_setup_step3_share_recovery_file">Teilen</string>
     <string name="keys_backup_banner_recover_line1">Verliere nie wieder verschlüsselte Nachrichten</string>
     <string name="keys_backup_banner_recover_line2">Benutze Schlüsselsicherung</string>
     <string name="keys_backup_banner_update_line1">Neue sichere Schlüssel für Nachrichten</string>
     <string name="keys_backup_banner_update_line2">Verwalte Schlüsselsicherung</string>
-    <string name="keys_backup_banner_in_progress">Sichere Schlüssel…</string>
+    <string name="keys_backup_banner_in_progress">Sichere deine Schlüssel. Dies könnte einige Minuten dauern …</string>
     <string name="keys_backup_info_keys_all_backup_up">Alle Schlüssel sind gesichert</string>
     <plurals name="keys_backup_info_keys_backing_up">
-        <item quantity="one">Sichere %d Schlüssel…</item>
+        <item quantity="one">Sichere einen Schlüssel …</item>
-        <item quantity="other">Sichere %d Schlüssel…</item>
+        <item quantity="other">Sichere %d Schlüssel …</item>
     </plurals>
     <string name="keys_backup_info_title_version">Version</string>
     <string name="keys_backup_info_title_algorithm">Algorithmus</string>
     <string name="keys_backup_info_title_signature">Signatur</string>
-    <string name="keys_backup_restoring_computing_key_waiting_message">Berechne Wiederherstellungsschlüssel…</string>
+    <string name="keys_backup_restoring_computing_key_waiting_message">Berechne Wiederherstellungsschlüssel …</string>
-    <string name="keys_backup_restoring_downloading_backup_waiting_message">Lade Schlüssel herunter…</string>
+    <string name="keys_backup_restoring_downloading_backup_waiting_message">Lade Schlüssel herunter …</string>
-    <string name="keys_backup_restoring_importing_keys_waiting_message">Importiere Schlüssel…</string>
+    <string name="keys_backup_restoring_importing_keys_waiting_message">Importiere Schlüssel …</string>
     <string name="action_ignore">Ignorieren</string>
     <string name="auth_login_sso">Mit Single-Sign-On anmelden</string>
     <string name="settings_send_message_with_enter">Nachricht mit Eingabetaste senden</string>
@@ -870,7 +870,7 @@
     <string name="error_no_network">Kein Netzwerk. Bitte überprüfe deine Internetverbindung.</string>
     <string name="action_change">Ändern</string>
     <string name="change_room_directory_network">Netzwerk wechseln</string>
-    <string name="please_wait">Bitte warten…</string>
+    <string name="please_wait">Bitte warten …</string>
     <string name="room_preview_no_preview">Für diesen Raum kann keine Vorschau angezeigt werden</string>
     <string name="fab_menu_create_room">Räume</string>
     <string name="fab_menu_create_chat">Direktnachrichten</string>
@@ -902,9 +902,9 @@
     <string name="send_suggestion_report_placeholder">Beschreibe hier deine Anmerkung</string>
     <string name="settings_labs_show_hidden_events_in_timeline">Versteckte Ereignisse in der Zeitleiste anzeigen</string>
     <string name="bottom_action_people_x">Direktnachrichten</string>
-    <string name="send_file_step_idle">Warten…</string>
+    <string name="send_file_step_idle">Warten …</string>
-    <string name="send_file_step_encrypting_thumbnail">Miniaturbild wird verschlüsselt…</string>
+    <string name="send_file_step_encrypting_thumbnail">Vorschaubild wird verschlüsselt …</string>
-    <string name="send_file_step_encrypting_file">Datei wird verschlüsselt…</string>
+    <string name="send_file_step_encrypting_file">Verschlüssle Datei …</string>
     <string name="edited_suffix">(bearbeitet)</string>
     <string name="message_edits">Nachrichtenbearbeitung</string>
     <string name="no_message_edits_found">Keine Änderungen gefunden</string>
@@ -912,7 +912,7 @@
     <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>
-    <string name="creating_direct_room">Raum erstellen…</string>
+    <string name="creating_direct_room">Erstelle Raum …</string>
     <string name="message_view_edit_history">Bearbeitungsverlauf anzeigen</string>
     <string name="import_e2e_keys_from_file">E2E-Schlüssel aus der Datei \"%1$s\" importieren.</string>
     <string name="send_suggestion_sent">Vielen Dank, der Vorschlag wurde erfolgreich gesendet</string>
@@ -947,7 +947,7 @@
     <string name="add_identity_server">Identitäts-Server konfigurieren</string>
     <string name="change_identity_server">Identitäts-Server ändern</string>
     <string name="settings_discovery_emails_title">Auffindbare E-Mail-Adressen</string>
-    <string name="settings_discovery_no_mails">Erkennungsoptionen werden angezeigt, sobald du eine E-Mail hinzugefügt hast.</string>
+    <string name="settings_discovery_no_mails">Entdeckungsoptionen werden angezeigt, sobald du eine E-Mail-Adresse hinzugefügt hast.</string>
     <string name="settings_discovery_enter_identity_server">Gib eine Identitäts-Server-Adresse ein</string>
     <string name="settings_discovery_bad_identity_server">Konnte keine Verbindung zum Homeserver herstellen</string>
     <string name="login_error_no_homeserver_found">Dies ist keine Adresse eines Matrixservers</string>
@@ -997,13 +997,13 @@
     <string name="error_terms_not_accepted">Bitte erneut versuchen, nachdem du die Nutzungsbedingungen deines Heim-Servers 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>
+    <string name="settings_discovery_no_msisdn">Entdeckungsoptionen werden angezeigt, sobald du eine Telefonnummer hinzugefügt hast.</string>
-    <string name="settings_discovery_confirm_mail">Wir haben dir eine Bestätigungsmail an %s gesendet. Prüfe dein Postfach und klicke auf den Bestätigungslink</string>
+    <string name="settings_discovery_confirm_mail">Wir haben eine E-Mail an %s gesendet. Prüfe deine E-Mails und klicke auf den Bestätigungslink</string>
     <string name="error_network_timeout">Es sieht aus, als würde der Server zu viel Zeit benötigen, um zu antworten. Der Grund kann eine schlechte Verbindung oder ein Fehler mit dem Server sein. Bitte versuche es später erneut.</string>
     <string name="send_attachment">Anhang senden</string>
     <string name="a11y_open_drawer">Navigationsmenü öffnen</string>
     <string name="a11y_create_menu_open">Raumerstellungsmenü öffnen</string>
-    <string name="a11y_create_menu_close">Schließe das Raumerstellungsmenü…</string>
+    <string name="a11y_create_menu_close">Schließe das Raumerstellungsmenü …</string>
     <string name="a11y_create_direct_message">Erstelle eine neue Direktnachricht</string>
     <string name="a11y_create_room">Erstelle einen neuen Raum</string>
     <string name="a11y_close_keys_backup_banner">Schließe Key-Backup-Einblendung</string>
@@ -1022,7 +1022,7 @@
     <string name="attachment_type_sticker">Sticker</string>
     <string name="report_content_spam">Es ist Spam</string>
     <string name="report_content_inappropriate">Es ist unangebracht</string>
-    <string name="report_content_custom">Benutzerdefinierte Meldung…</string>
+    <string name="report_content_custom">Benutzerdefinierte Meldung …</string>
     <string name="report_content_custom_title">Diesen Inhalt melden</string>
     <string name="report_content_custom_hint">Meldegrund</string>
     <string name="report_content_custom_submit">MELDEN</string>
@@ -1067,7 +1067,7 @@
     <string name="settings_discovery_disconnect_with_bound_pid">Du teilst deine E-Mail-Adressen oder Telefonnummern momentan auf dem Identitäts-Server %1$s. Du wirst dich erneut mit %2$s verbinden müssen, um mit dem Teilen aufzuhören.</string>
     <string name="settings_agree_to_terms">Stimme den Nutzungsbedingungen des Identitäts-Servers (%s) zu, um per E-Mail-Adresse oder Telefonnummer auffindbar zu sein zu können.</string>
     <string name="error_handling_incoming_share">Zu teilende Daten nicht verarbeitbar</string>
-    <string name="login_splash_text3">Erweitere und individualisiere dein Benutzererlebnis</string>
+    <string name="login_splash_text3">Erweitere und personalisiere deine Erfahrung</string>
     <string name="login_connect_to">Mit %1$s verbinden</string>
     <string name="login_connect_to_modular">Mit Element Matrix Services verbinden</string>
     <string name="login_connect_to_a_custom_server">Mit einem anderen Server verbinden</string>
@@ -1082,14 +1082,14 @@
     <string name="login_registration_not_supported">Die Anwendung kann kein neues Benutzerkonto auf diesem Server erstellen.
 \n
 \nMöchtest du dich mit einer Web-Anwendung anmelden\?</string>
-    <string name="login_login_with_email_error">Diese E-Mail-Adresse ist mit keinem Benutzerkonto verknüpft.</string>
+    <string name="login_login_with_email_error">Diese E-Mail-Adresse ist mit keinem Konto verknüpft.</string>
     <string name="login_reset_password_on">Passwort auf %1$s zurücksetzen</string>
     <string name="login_reset_password_email_hint">E-Mail</string>
     <string name="login_reset_password_password_hint">Neues Passwort</string>
     <string name="login_reset_password_warning_title">Achtung!</string>
     <string name="login_reset_password_warning_content">Eine Änderung deines Passworts wird alle Ende-zu-Ende-Schlüssel zurücksetzen. Dein verschlüsselter Verlauf wird dadurch unlesbar. Richte die Schlüsselsicherung ein oder exportiere deine Raumschlüssel aus einer anderen Sitzung, bevor du dein Passwort zurücksetzt.</string>
     <string name="login_reset_password_warning_submit">Fortfahren</string>
-    <string name="login_reset_password_error_not_found">Diese E-Mail-Adresse ist mit keinem Benutzerkonto verknüpft</string>
+    <string name="login_reset_password_error_not_found">Diese E-Mail-Adresse ist mit keinem Konto verknüpft</string>
     <string name="login_reset_password_mail_confirmation_title">Prüfe deinen Posteingang</string>
     <string name="login_reset_password_mail_confirmation_notice">Eine Bestätigungsmail wurde an %1$s versendet.</string>
     <string name="login_reset_password_mail_confirmation_notice_2">Klicke auf den Link um dein neues Passwort zu bestätigen. Sobald du dem enthaltenen Link gefolgt bist, klicke unten.</string>
@@ -1133,7 +1133,7 @@
     <string name="login_reset_password_submit">Weiter</string>
     <string name="login_reset_password_success_notice_2">Du wurdest von allen Sitzungen abgemeldet und erhältst keine Push-Benachrichtigungen mehr. Um Benachrichtigungen wieder zu aktivieren, melde dich auf jedem Gerät erneut an.</string>
     <string name="login_reset_password_cancel_confirmation_title">Warnung</string>
-    <string name="login_set_email_notice">Lege eine E-Mail-Adresse fest, um dein Konto wiederherzustellen. Später kannst du optional zulassen, dass Personen dich anhand dieser E-Mail-Adresse entdecken.</string>
+    <string name="login_set_email_notice">Lege eine E-Mail-Adresse fest, um dein Konto wiederherzustellen. Später kannst du optional zulassen, dass Personen dich anhand dieser E-Mail-Adresse entdecken können.</string>
     <string name="login_set_email_submit">Weiter</string>
     <string name="login_set_msisdn_title">Lege Telefonnummer fest</string>
     <string name="login_set_msisdn_notice">Lege eine Telefonnummer fest, damit Personen dich anhand dieser entdecken können.</string>
@@ -1149,8 +1149,8 @@
     <string name="login_a11y_captcha_container">Bitte löse das Captcha</string>
     <string name="login_error_outdated_homeserver_title">Veralteter Homeserver</string>
     <plurals name="login_error_limit_exceeded_retry_after">
-        <item quantity="one">Es wurden zu viele Anfragen gesendet. Versuche es erneut in %1$d Sekunde…</item>
+        <item quantity="one">Es wurden zu viele Anfragen gesendet. Versuche es erneut in %1$d Sekunde …</item>
-        <item quantity="other">Es wurden zu viele Anfragen gesendet. Versuche es erneut in %1$d Sekunden…</item>
+        <item quantity="other">Es wurden zu viele Anfragen gesendet. Versuche es erneut in %1$d Sekunden …</item>
     </plurals>
     <string name="seen_by">Gesehen von</string>
     <string name="signed_out_title">Du bist abgemeldet</string>
@@ -1181,7 +1181,7 @@
 \nBitte zuerst die Daten löschen und dann erneut anmelden.</string>
     <string name="permalink_malformed">matrix.to-Link fehlerhaft</string>
     <string name="bug_report_error_too_short">Die Beschreibung ist zu kurz</string>
-    <string name="notification_initial_sync">Initiale Synchronisierung…</string>
+    <string name="notification_initial_sync">Initiale Synchronisierung …</string>
     <string name="settings_advanced_settings">Erweiterte Einstellungen</string>
     <string name="settings_developer_mode">Entwicklermodus</string>
     <string name="settings_developer_mode_summary">Der Entwicklermodus aktiviert versteckte Funktionen und kann die Anwendung weniger stabil machen. Nur für Entwickler!</string>
@@ -1192,7 +1192,7 @@
     <string name="settings">Einstellungen</string>
     <string name="devices_current_device">Aktuelle Sitzung</string>
     <string name="devices_other_devices">Andere Sitzungen</string>
-    <string name="autocomplete_limited_results">Zeigt nur die ersten Ergebnisse, gib mehr Buchstaben ein…</string>
+    <string name="autocomplete_limited_results">Zeigt nur die ersten Ergebnisse, gib weitere Zeichen ein …</string>
     <string name="settings_developer_mode_fail_fast_title">Ausfallsicher</string>
     <string name="settings_developer_mode_fail_fast_summary">${app_name} kann häufiger abstürzen, wenn ein unerwarteter Fehler auftritt</string>
     <string name="command_description_shrug">Stellt einer Klartextnachricht ¯\\_(ツ)_/¯ voran</string>
@@ -1213,9 +1213,9 @@
     <string name="sent_an_image">Bild.</string>
     <string name="sent_an_audio_file">Audio</string>
     <string name="sent_a_file">Datei</string>
-    <string name="verification_request_waiting">Warten…</string>
+    <string name="verification_request_waiting">Warte …</string>
     <string name="verification_request_other_cancelled">%s brach ab</string>
-    <string name="verification_request_you_cancelled">Du hast abgebrochen</string>
+    <string name="verification_request_you_cancelled">Du brachst ab</string>
     <string name="verification_request_other_accepted">%s hat akzeptiert</string>
     <string name="verification_request_you_accepted">Du hast akzeptiert</string>
     <string name="verification_sent">Verifizierung gesendet</string>
@@ -1228,7 +1228,7 @@
     <string name="verification_no_scan_emoji_title">Verifizieren via Emoji-Vergleich</string>
     <string name="verification_verify_user">%s verifizieren</string>
     <string name="verification_verified_user">%s verifiziert</string>
-    <string name="verification_request_waiting_for">Warte auf %s…</string>
+    <string name="verification_request_waiting_for">Warte auf %s …</string>
     <string name="room_profile_not_encrypted_subtitle">Nachrichten in diesem Raum sind nicht Ende-zu-Ende-verschlüsselt.</string>
     <string name="room_profile_encrypted_subtitle">Nachrichten in diesem Raum sind Ende-zu-Ende-verschlüsselt.
 \n
@@ -1244,7 +1244,7 @@
     </plurals>
     <string name="room_profile_section_more_uploads">Hochgeladene Dateien</string>
     <string name="room_profile_section_more_leave">Raum verlassen</string>
-    <string name="room_profile_leaving_room">Verlasse den Raum…</string>
+    <string name="room_profile_leaving_room">Verlasse den Raum …</string>
     <string name="room_member_power_level_admins">Administratoren</string>
     <string name="room_member_power_level_moderators">Moderatoren</string>
     <string name="room_member_power_level_custom">Benutzerdefiniert</string>
@@ -1262,7 +1262,7 @@
     <string name="command_description_rainbow_emote">Sendet das angegebene Emote in Regenbogenfarben</string>
     <string name="settings_category_timeline">Zeitleiste</string>
     <string name="settings_category_composer">Nachrichteneditor</string>
-    <string name="room_settings_enable_encryption">Ende-zu-Ende-Verschlüsselung aktivieren…</string>
+    <string name="room_settings_enable_encryption">Aktiviere Ende-zu-Ende-Verschlüsselung …</string>
     <string name="room_settings_enable_encryption_dialog_title">Verschlüsselung aktivieren\?</string>
     <string name="room_settings_enable_encryption_dialog_content">Nach der Aktivierung kann die Verschlüsselung für den Raum nicht deaktiviert werden. Nachrichten können nicht vom Server gesehen werden, nur von den Teilnehmenden des Raums. Möglicherweise funktionieren danach einige Bots und Bridges nicht mehr ordnungsgemäß.</string>
     <string name="room_settings_enable_encryption_dialog_submit">Verschlüsselung aktivieren</string>
@@ -1284,7 +1284,7 @@
     <string name="settings_active_sessions_list">Aktive Sitzungen</string>
     <string name="settings_active_sessions_show_all">Alle Sitzungen anzeigen</string>
     <string name="settings_active_sessions_manage">Sitzungen verwalten</string>
-    <string name="settings_active_sessions_signout_device">Diese Sitzung abmelden</string>
+    <string name="settings_active_sessions_signout_device">Von dieser Sitzung abmelden</string>
     <string name="settings_failed_to_get_crypto_device_info">Keine kryptografischen Informationen verfügbar</string>
     <string name="settings_active_sessions_verified_device_desc">Diese Sitzung ist für sichere Kommunikation vertrauenswürdig, da du sie überprüft hast:</string>
     <string name="settings_active_sessions_unverified_device_desc">Verifiziere diese Sitzung, um sie als vertrauenswürdig zu markieren, und gewähren ihr Zugriff auf verschlüsselte Nachrichten. Wenn du dich nicht bei dieser Sitzung angemeldet hast, ist dein Konto möglicherweise gefährdet:</string>
@@ -1316,7 +1316,7 @@
     <string name="verification_cannot_access_other_session">Nutze eine Wiederherstellungsmethode</string>
     <string name="verification_use_passphrase">Wenn du auf keine existierende Sitzung zugreifen kannst</string>
     <string name="enter_secret_storage_invalid">Kann keine Geheimnisse im Speicher finden</string>
-    <string name="message_action_item_redact">Entfernen…</string>
+    <string name="message_action_item_redact">Entferne …</string>
     <string name="share_confirm_room">Möchtest du diesen Anhang an %1$s senden\?</string>
     <plurals name="send_images_with_original_size">
         <item quantity="one">Sende Bild in Originalgröße</item>
@@ -1385,13 +1385,13 @@
     <string name="encryption_enabled">Verschlüsselung aktiviert</string>
     <string name="encryption_enabled_tile_description">Nachrichten in diesem Raum sind Ende-zu-Ende-verschlüsselt. Erfahre mehr und verifiziere Benutzer in deren Profil.</string>
     <string name="encryption_unknown_algorithm_tile_description">Die Verschlüsselung in diesem Raum wird nicht unterstützt</string>
-    <string name="qr_code_scanned_verif_waiting">Warte auf %s…</string>
+    <string name="qr_code_scanned_verif_waiting">Warte auf %s …</string>
     <string name="settings_troubleshoot_title">Fehlerbehebung</string>
     <string name="room_created_summary_item">%s hat den Raum erstellt und konfiguriert.</string>
     <string name="qr_code_scanned_self_verif_notice">Fast geschafft! Zeigt das andere Gerät ein Häkchen an\?</string>
-    <string name="qr_code_scanned_verif_waiting_notice">Fast geschafft! Warte auf Bestätigung…</string>
+    <string name="qr_code_scanned_verif_waiting_notice">Fast geschafft! Warte auf Bestätigung …</string>
     <string name="settings_messages_in_e2e_one_to_one">Verschlüsselte Direktnachrichten</string>
-    <string name="room_message_placeholder">Nachricht…</string>
+    <string name="room_message_placeholder">Nachricht …</string>
     <string name="security_prompt_text">Verifiziere dich und andere, um eure Unterhaltungen zu schützen</string>
     <string name="bootstrap_enter_recovery">Gib zum Fortfahren deinen %s ein</string>
     <string name="use_file">Datei benutzen</string>
@@ -1411,7 +1411,7 @@
     <string name="bootstrap_migration_backup_recovery_key">Schlüsselbackup-Wiederherstellungsschlüssel</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 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="change_password_summary">Lege ein neues Kontopasswort fest …</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 eine andere Matrix-Anwendung, die Quersignierung unterstützt</string>
     <string name="app_desktop_web">${app_name} Web
 \n${app_name} Desktop</string>
@@ -1445,7 +1445,7 @@
     <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
     <string name="add_members_to_room">Mitglieder hinzufügen</string>
     <string name="invite_users_to_room_action_invite">EINLADEN</string>
-    <string name="inviting_users_to_room">Benutzer werden eingeladen…</string>
+    <string name="inviting_users_to_room">Lade Benutzer ein …</string>
     <string name="invite_users_to_room_title">Personen einladen</string>
     <string name="invitation_sent_to_one_user">Einladung gesendet an %1$s</string>
     <string name="invitations_sent_to_two_users">Einladungen gesendet an %1$s und %2$s</string>
@@ -1495,11 +1495,11 @@
     <string name="room_participants_ban_reason">Grund für den Bann</string>
     <string name="room_participants_unban_title">Bann des Benutzers aufheben</string>
     <string name="room_participants_unban_prompt_msg">Das Aufheben des Bannes wird dem Benutzer erlauben, dem Raum wieder beizutreten.</string>
-    <string name="settings_secure_backup_section_title">Sicheres Backup</string>
+    <string name="settings_secure_backup_section_title">Verschlüsselte Sicherung</string>
-    <string name="settings_secure_backup_setup">Backup einrichten</string>
+    <string name="settings_secure_backup_setup">Sicherung einrichten</string>
-    <string name="settings_secure_backup_reset">Backup zurücksetzen</string>
+    <string name="settings_secure_backup_reset">Sicherung zurücksetzen</string>
     <string name="settings_secure_backup_enter_to_setup">Auf diesem Gerät einrichten</string>
-    <string name="settings_secure_backup_section_info">Verlust verschlüsselter Nachrichten und Daten verhindern, indem die Schlüssel für die Entschlüsselung auf dem Server gesichert werden.</string>
+    <string name="settings_secure_backup_section_info">Verhindere, den Zugriff auf verschlüsselte Nachrichten und Daten zu verlieren, indem du die Verschlüsselungs-Schlüssel auf deinem Server sicherst.</string>
     <string name="reset_secure_backup_title">Generiere einen neuen Sicherheitsschlüssel oder setze eine neue Sicherheitspassphrase für dein existierendes Backup.</string>
     <string name="reset_secure_backup_warning">Dieses wird deinen aktuellen Schlüssel oder deine aktuelle Phrase ersetzen.</string>
     <string name="disabled_integration_dialog_title">Integrationen sind deaktiviert</string>
@@ -1512,14 +1512,14 @@
     <string name="active_widget_view_action">ANSICHT</string>
     <string name="active_widgets_title">Aktive Widgets</string>
     <string name="recovery_key_export_saved">Der Sicherheitsschlüssel ist gespeichert worden.</string>
-    <string name="secure_backup_banner_setup_line1">Backup</string>
+    <string name="secure_backup_banner_setup_line1">Verschlüsselte Sicherung</string>
     <string name="secure_backup_banner_setup_line2">Absicherung gegen den Verlust verschlüsselter Nachrichten</string>
-    <string name="secure_backup_setup">Richte Backup ein</string>
+    <string name="secure_backup_setup">Sicherung einrichten</string>
     <string name="event_redacted">Nachricht entfernt</string>
     <string name="settings_show_redacted">Gelöschte Nachrichten zeigen</string>
     <string name="settings_show_redacted_summary">Zeigt einen Platzhalter für gelöschte Nachrichten an</string>
     <string name="labs_show_unread_notifications_as_tab">Dedizierten Tab für ungelesene Nachrichten zur Hauptansicht hinzufügen</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Wir haben dir eine Bestätigungsmail an %s gesendet. Bitte prüfe deine E-Mails und klicke auf den Bestätigungslink</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Wir haben eine E-Mail an %s gesendet. Bitte prüfe deine E-Mails und klicke auf den Bestätigungslink</string>
     <string name="settings_text_message_sent_wrong_code">Der Verifizierungscode ist nicht korrekt.</string>
     <string name="uploads_media_title">MEDIEN</string>
     <string name="uploads_media_no_result">Es gibt in diesem Raum keine Medien</string>
@@ -1534,7 +1534,7 @@
     <string name="login_server_url_form_common_notice">Gib die Adresse des Servers ein, den du benutzen möchtest</string>
     <string name="login_connect_using_matrix_id_submit">Einloggen mit Matrix-ID</string>
     <string name="login_signin_matrix_id_title">Einloggen mit Matrix-ID</string>
-    <string name="login_signin_matrix_id_notice">Wenn du einen Account auf einem Homeserver eingerichtet hast, benutze deine Matrix-ID (z.B. @benutzer:domain.com) und Passwort.</string>
+    <string name="login_signin_matrix_id_notice">Falls du ein Konto auf einem Heim-Server eingerichtet hast, verwende nachstehend deine Matrix-ID (z. B. @benutzer:domain.com) und dein Passwort.</string>
     <string name="login_signin_matrix_id_hint">Matrix-ID</string>
     <string name="login_signin_matrix_id_password_notice">Wenn du dein Passwort nicht weißt, gehe zurück um es zurücksetzen zu lassen.</string>
     <string name="login_signin_matrix_id_error_invalid_matrix_id">Dies ist keine gültige Benutzerkennung. Erwartetes Format: \'@benutzer:homeserver.org\'</string>
@@ -1547,20 +1547,20 @@
     <string name="bootstrap_info_text_2">Gib eine Sicherheitsphrase ein, die nur du kennst. Diese wird benutzt um deine Daten auf dem Server geheim zu halten.</string>
     <string name="bootstrap_cancel_text">Wenn du jetzt abbrichst und den Zugriff zu deinen Sitzungen verlierst, kannst du verschlüsselte Nachrichten und Daten verlieren.
 \n
-\nDu kannst auch ein Backup einrichten und deine Schlüssel in den Einstellungen verwalten.</string>
+\nDu kannst auch eine Sicherung einrichten und deine Schlüssel in den Einstellungen verwalten.</string>
     <string name="room_created_summary_item_by_you">Du hast den Raum erstellt und konfiguriert.</string>
     <string name="auth_invalid_login_deactivated_account">Dieser Account ist deaktiviert worden.</string>
     <string name="error_saving_media_file">Konnte Mediendatei nicht speichern</string>
     <string name="choose_locale_current_locale_title">Aktuelle Sprache</string>
     <string name="choose_locale_other_locales_title">Andere verfügbare Sprachen</string>
-    <string name="choose_locale_loading_locales">Lade verfügbare Sprachen…</string>
+    <string name="choose_locale_loading_locales">Lade verfügbare Sprachen …</string>
     <string name="open_terms_of">Öffne AGBs von %s</string>
     <string name="disconnect_identity_server_dialog_content">Verbindung zu Identitäts-Server %s trennen\?</string>
     <string name="identity_server_error_outdated_identity_server">Dieser Identitäts-Server ist veraltet. ${app_name} unterstützt nur API V2.</string>
     <string name="identity_server_error_outdated_home_server">Diese Operation ist nicht möglich. Der Homeserver ist veraltet.</string>
     <string name="identity_server_error_no_identity_server_configured">Bitte konfiguriere zuerst einen Identitäts-Server.</string>
     <string name="identity_server_error_terms_not_signed">Bitte akzeptiere zuerst die AGB des Identitäts-Servers in den Einstellungen.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Deiner Privatsphäre wegen unterstützt ${app_name} nur das Senden gehashter E-Mail-Adressen und Telefonnummern.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Deiner Privatsphäre wegen unterstützt ${app_name} nur das Senden von E-Mail-Adressen und Telefonnummern als Streuwert (Hash).</string>
     <string name="identity_server_error_binding_error">Die Assoziierung ist fehlgeschlagen.</string>
     <string name="identity_server_error_no_current_binding_error">Für diese Kennung gibt es aktuell keine Zuordnung.</string>
     <string name="identity_server_set_default_notice">Dein Heim-Server (%1$s) schlägt %2$s als Identitäts-Server vor</string>
@@ -1575,14 +1575,14 @@
     <string name="a11y_unmute_microphone">Aktiviere Mikrophon</string>
     <string name="a11y_stop_camera">Stoppe Kamera</string>
     <string name="a11y_start_camera">Starte Kamera</string>
-    <string name="bottom_sheet_setup_secure_backup_title">Backup</string>
+    <string name="bottom_sheet_setup_secure_backup_title">Verschlüsselte Sicherung</string>
-    <string name="bottom_sheet_setup_secure_backup_subtitle">Verlust verschlüsselter Nachrichten und Daten verhindern, indem die Schlüssel für die Entschlüsselung am Server gesichert werden.</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">Verhindere, den Zugriff auf verschlüsselte Nachrichten und Daten zu verlieren, indem du die Verschlüsselungs-Schlüssel auf deinem Server sicherst.</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_title">Sicherheitsschlüssel benutzen</string>
-    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Generiere einen Sicherheitsschlüssel, welcher z.B. in einem Passwortmanager oder in einem Tresor sicher aufbewahrt werden sollte.</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Generiere einen Sicherheitsschlüssel, den du in einem Passwort-Manager oder Tresor sicher aufbewahren solltest.</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Eine Sicherheitsphrase benutzen</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Gib eine geheime Phrase ein, die nur du kennst und generiere einen Schlüssel als Backup.</string>
     <string name="bottom_sheet_save_your_recovery_key_title">Speichere deinen Sicherheitsschlüssel</string>
-    <string name="bottom_sheet_save_your_recovery_key_content">Bewahre deinen Sicherheitsschlüssel irgendwo sicher auf, wie z.B. in einem Passwortmanager oder in einem Tresor.</string>
+    <string name="bottom_sheet_save_your_recovery_key_content">Bewahre deinen Sicherheitsschlüssel in einem Passwort-Manager oder Tresor sicher auf.</string>
     <string name="set_a_security_phrase_title">Sicherheitsphrase setzen</string>
     <string name="set_a_security_phrase_notice">Gib eine Sicherheitsphrase ein, welche nur du kennst und deine Daten auf dem Server geheim halten soll.</string>
     <string name="set_a_security_phrase_hint">Sicherheitsphrase</string>
@@ -1602,7 +1602,7 @@
     <string name="disclaimer_negative_button">VERSTANDEN</string>
     <string name="disclaimer_positive_button">MEHR ERFAHREN</string>
     <string name="save_recovery_key_chooser_hint">Speichere Wiederherstellungsschlüssel in</string>
-    <string name="loading_contact_book">Ermittle deine Kontakte…</string>
+    <string name="loading_contact_book">Ermittle deine Kontakte …</string>
     <string name="empty_contact_book">Deine Kontaktliste ist leer</string>
     <string name="contacts_book_title">Kontaktliste</string>
     <string name="three_pid_revoke_invite_dialog_title">Einladung zurücknehmen</string>
@@ -1654,12 +1654,12 @@
     <string name="auth_msisdn_already_defined">Diese Telefonnummer ist bereits registriert.</string>
     <string name="settings_phone_number_empty">Deinem Konto wurde keine Telefonnummer hinzugefügt</string>
     <string name="settings_emails">E-Mail-Adressen</string>
-    <string name="settings_emails_empty">Deinem Konto wurde keine E-Mail hinzugefügt</string>
+    <string name="settings_emails_empty">Deinem Konto wurde keine E-Mail-Adresse hinzugefügt</string>
     <string name="settings_phone_numbers">Telefonnummern</string>
     <string name="settings_remove_three_pid_confirmation_content">%s entfernen\?</string>
     <string name="error_threepid_auth_failed">Stelle sicher, dass du auf den Link in der E-Mail geklickt hast, die wir dir gesendet haben.</string>
     <string name="settings_emails_and_phone_numbers_title">E-Mail und Telefon</string>
-    <string name="settings_emails_and_phone_numbers_summary">Verwalte E-Mails und Telefonnummern, die mit deinem Matrix-Konto verknüpft sind</string>
+    <string name="settings_emails_and_phone_numbers_summary">Verwalte E-Mail-Adressen und Telefonnummern, die mit deinem Matrix-Konto verknüpft sind</string>
     <string name="settings_text_message_sent_hint">Code</string>
     <string name="login_msisdn_notice">Verwende das internationale Format (Telefonnummer muss mit \'+\' beginnen)</string>
     <string name="confirm_your_identity_quad_s">Bestätige deine Identität, indem du dieses Login verifizierst, um Zugriff auf verschlüsselte Nachrichten zu erhalten.</string>
@@ -1777,7 +1777,7 @@
     <string name="user_code_info_text">Teile diesen Code, damit andere ihn einlesen und mit dir schreiben können.</string>
     <string name="user_code_share">Meinen Code teilen</string>
     <string name="user_code_my_code">Mein Code</string>
-    <string name="user_code_scan">Scanne einen QR-Code</string>
+    <string name="user_code_scan">QR-Code einlesen</string>
     <string name="not_a_valid_qr_code">Das ist kein korrekter QR-Code von Matrix</string>
     <string name="invite_friends_rich_title">🔐️ Komm mit zu ${app_name}</string>
     <string name="invite_friends_text">Hey, schreibe mit mir auf ${app_name}: %s</string>
@@ -1790,7 +1790,7 @@
     <string name="this_is_the_beginning_of_room_no_name">Das ist der Anfang dieser Konversation.</string>
     <string name="this_is_the_beginning_of_room">Das ist der Anfang von %s.</string>
     <string name="room_settings_enable_encryption_no_permission">Du hast nicht die nötigen Berechtigungen, um die Verschlüsselung in diesem Raum zu aktivieren.</string>
-    <string name="create_room_in_progress">Erstelle Raum…</string>
+    <string name="create_room_in_progress">Erstelle Raum …</string>
     <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>
@@ -1810,7 +1810,7 @@
     <string name="room_alias_local_address_empty">Dieser Raum hat keine lokalen Adressen</string>
     <string name="room_alias_local_address_subtitle">Füge Adressen für diesen Raum hinzu, damit andere Nutzer ihn auf %1$s finden können</string>
     <string name="room_alias_local_address_title">Lokale Adresse</string>
-    <string name="room_alias_address_hint">Neue öffentliche Adresse (z.B. #alias:server)</string>
+    <string name="room_alias_address_hint">Neue öffentliche Adresse (z. B. #alias:server)</string>
     <string name="room_alias_address_empty">Noch keine weiteren öffentlichen Adressen vorhanden.</string>
     <string name="room_alias_address_empty_can_add">Noch keine weiteren öffentlichen Adressen vorhanden, füge unten eine hinzu.</string>
     <string name="room_alias_delete_confirmation">Die Adresse \"%1$s\" löschen\?</string>
@@ -1926,9 +1926,9 @@
     <string name="room_settings_room_version_title">Raum-Version</string>
     <string name="dialog_edit_hint">Neuer Wert</string>
     <string name="initial_sync_start_downloading">Erste Synchronisation:
-\nLade Daten herunter…</string>
+\nLade Daten herunter …</string>
     <string name="initial_sync_start_server_computing">Erste Synchronisation:
-\nWarte auf Serverantwort…</string>
+\nWarte auf Antwort vom Server …</string>
     <string name="event_status_a11y_sent">Gesendet</string>
     <string name="settings_category_room_directory">Raumverzeichnis</string>
     <string name="action_switch">Wechseln</string>
@@ -1988,13 +1988,13 @@
     <string name="space_type_public_desc">Offen für Jeden. Am Besten für Communities</string>
     <string name="create_spaces_private_teammates">Ein privater Space für meine Teamkameraden und mich</string>
     <string name="create_spaces_me_and_teammates">Meine Teamkameraden und ich</string>
-    <string name="create_spaces_organise_rooms">Ein privater Space um deine Räume zu organisieren</string>
+    <string name="create_spaces_organise_rooms">Ein privater Space zum Organisieren deiner Räume</string>
     <string name="create_spaces_join_info_help">Um einem bereits existierenden Space beizutreten, benötigst du eine Einladung.</string>
     <string name="your_private_space">Dein privater Space</string>
     <string name="your_public_space">Dein öffentlicher Space</string>
     <string name="command_description_join_space">Betrete einen Space mit der angegebenen ID</string>
     <string name="create_space_topic_hint">Beschreibung</string>
-    <string name="create_spaces_loading_message">Erzeuge Space …</string>
+    <string name="create_spaces_loading_message">Erstelle Space …</string>
     <string name="create_spaces_default_public_random_room_name">Ohne Thema</string>
     <string name="create_spaces_default_public_room_name">Allgemein</string>
     <string name="activity_create_space_title">Einen Space erstellen</string>
@@ -2028,7 +2028,7 @@
     </plurals>
     <string name="error_file_too_big_simple">Die Datei ist zu groß.</string>
     <string name="send_file_step_compressing_video">Video wird komprimiert (%d%%)</string>
-    <string name="send_file_step_compressing_image">Bild wird komprimiert…</string>
+    <string name="send_file_step_compressing_image">Komprimiere Bild …</string>
     <string name="use_as_default_and_do_not_ask_again">Als Standard festsetzen und nicht mehr fragen</string>
     <string name="option_always_ask">Jedes Mal fragen</string>
     <string name="directory_add_a_new_server_prompt">Gib den Namen eines neuen Servers ein, den du erkunden möchtest.</string>
@@ -2129,7 +2129,7 @@
         <item quantity="one">Verpasster Sprachanruf</item>
         <item quantity="other">%d verpasste Sprachanrufe</item>
     </plurals>
-    <string name="hs_client_url">Heim-Server API URL</string>
+    <string name="hs_client_url">Heim-Server-API-Adresse</string>
     <string name="denied_permission_voice_message">Um Sprachnachrichten zu senden, erlaube bitte Zugriff aufs Mikrofon.</string>
     <string name="denied_permission_camera">Um fortzufahren, erlaube bitte in den Systemeinstellungen Zugriff auf die Kamera.</string>
     <string name="denied_permission_generic">Für diese Aktion fehlen einige Berechtigungen, bitte erlaube diese in den Systemeinstellungen.</string>
@@ -2140,7 +2140,7 @@
     <string name="other_spaces_or_rooms_you_might_not_know">Andere Spaces oder Räume die du kennst</string>
     <string name="space_you_know_that_contains_this_room">Spaces mit diesem Raum und dir als Mitglied</string>
     <string name="room_settings_mention_and_keyword_only">Nur Erwähnungen und Schlüsselwörter</string>
-    <string name="call_remove_jitsi_widget_progress">Auflegen…</string>
+    <string name="call_remove_jitsi_widget_progress">Auflegen …</string>
     <string name="audio_call_with_participant">Sprachanruf mit %s</string>
     <string name="video_call_with_participant">Videoanruf mit %s</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">Alle beigetretenen Räume werden auf der Startseite angezeigt.</string>
@@ -2163,7 +2163,7 @@
     <string name="call_ended_invite_timeout_title">Nicht erreicht</string>
     <string name="call_ended_user_busy_description">Die angerufene Person ist beschäftigt.</string>
     <string name="call_ended_user_busy_title">Person beschäftigt</string>
-    <string name="call_ringing">Klingeln…</string>
+    <string name="call_ringing">Klingeln …</string>
     <string name="spaces">Spaces</string>
     <string name="call_tile_video_missed">Verpasster Videoanruf</string>
     <string name="call_tile_voice_missed">Verpasster Sprachanruf</string>
@@ -2184,7 +2184,7 @@
     <string name="space_leave_prompt_msg_with_name">Willst du %s wirklich verlassen\?</string>
     <string name="invite_by_username_or_mail">Mit Benutzername oder E-Mail einladen</string>
     <string name="command_description_add_to_space">Zum ausgewählten Space hinzufügen</string>
-    <string name="create_space_in_progress">Erstelle Space…</string>
+    <string name="create_space_in_progress">Erstelle Space …</string>
     <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>
@@ -2193,7 +2193,7 @@
     <string name="room_settings_space_access_title">Zugriff</string>
     <string name="room_settings_access_rules_pref_dialog_title">Wer hat Zugriff\?</string>
     <string name="settings_notification_emails_enable_for_email">Benachrichtigungen per Email für %s aktivieren</string>
-    <string name="settings_notification_emails_no_emails">Um Benachrichtigungen per E-Mail zu empfangen, musst du einen E-Mail-Adresse hinzufügen</string>
+    <string name="settings_notification_emails_no_emails">Um Benachrichtigungen per E-Mail zu empfangen, musst du eine E-Mail-Adresse hinzufügen</string>
     <string name="settings_notification_emails_category">Emailbenachrichtigungen</string>
     <string name="room_permissions_upgrade_the_space">Space upgraden</string>
     <string name="room_permissions_change_space_name">Namen vom Space ändern</string>
@@ -2239,7 +2239,7 @@
     <string name="create_poll_question_hint">Frage oder Thema</string>
     <string name="create_poll_question_title">Abstimmungsthema oder Frage</string>
     <string name="create_poll_title">Abstimmung erstellen</string>
-    <string name="attachment_type_poll">Abstimmung</string>
+    <string name="attachment_type_poll">Umfrage</string>
     <string name="open_discovery_settings">Auffindungseinstellungen öffnen</string>
     <string name="shortcut_disabled_reason_sign_out">Sitzung abgemeldet!</string>
     <string name="shortcut_disabled_reason_room_left">Raum verlassen!</string>
@@ -2247,7 +2247,7 @@
     <string name="login_error_homeserver_from_url_not_found">Es konnte kein Heim-Server mit der Adresse %s gefunden werden. Bitte überprüfe die Adresse oder wähle den Heim-Server manuell.</string>
     <string name="space_add_space_to_any_space_you_manage">Untergeordneten Space hinzufügen.</string>
     <string name="identity_server_consent_dialog_content_question">Bist du dir wirklich sicher, dass du diese Informationen senden willst\?</string>
-    <string name="identity_server_consent_dialog_title_2">E-Mail-Adressen und Telefonnummern an %s senden</string>
+    <string name="identity_server_consent_dialog_title_2">E-Mail-Adressen und Telefonnummern an %s übermitteln</string>
     <string name="action_not_now">Nicht jetzt</string>
     <string name="notification_listening_for_notifications">Auf Benachrichtigungen warten</string>
     <string name="legals_third_party_notices">Externe Bibliotheken</string>
@@ -2294,13 +2294,13 @@
     <string name="labs_auto_report_uisi_desc">Das System sendet automatisch Protokolle, wenn ein Fehler bei der Entschlüsselung auftritt</string>
     <string name="labs_auto_report_uisi">Entschlüsselungsfehler automatisch melden.</string>
     <string name="discovery_section">Auffindbarkeit (%s)</string>
-    <string name="discovery_invite">Per E-Mail einladen, finde deine Kontakte und mehr…</string>
+    <string name="discovery_invite">Lade per E-Mail ein, finde deine Kontakte und mehr …</string>
     <string name="finish_setting_up_discovery">Schließe die Konfiguration des Auffindbarkeitsdienstes ab.</string>
     <string name="create_space_identity_server_info_none">Du verwendest derzeit keinen Identitäts-Server. Um Team-Mitglieder einzuladen und für sie auffindbar zu sein, konfiguriere zunächst einen.</string>
     <string name="login_splash_already_have_account">Ich habe bereits ein Konto</string>
     <string name="ftue_auth_carousel_encrypted_title">Sichere Kommunikation.</string>
     <string name="ftue_auth_carousel_secure_title">Besitze deine Unterhaltungen.</string>
-    <string name="identity_server_consent_dialog_content_3">Um bestehende Kontakte ermitteln zu können, musst du Kontaktinformationen (E-Mail-Adressen und Telefonnummern) an deinen Identitäts-Server übermitteln. Wir verschlüsseln deine Daten vor der Übermittlung, um den Datenschutz gewährleisten zu können.</string>
+    <string name="identity_server_consent_dialog_content_3">Um bestehende Kontakte ermitteln zu können, musst du Kontaktinformationen (E-Mail-Adressen und Telefonnummern) an deinen Identitäts-Server übermitteln. Deine Daten werden als Streuwert (Hash) übermittelt, um den Datenschutz zu gewährleisten.</string>
     <string name="settings_discovery_consent_notice_off_2">Deine Kontakte sind privat. Um unter deinen Kontakten Matrix-Nutzer finden zu können, benötigen wir deine Erlaubnis, Kontaktinformationen an deinen Identitäts-Server zu übermitteln.</string>
     <string name="legals_no_policy_provided">Dieser Server stellt keine Richtlinie bereit.</string>
     <string name="legals_identity_server_title">Richtlinie deines Identitäts-Servers</string>
@@ -2399,13 +2399,13 @@
         <item quantity="other">%d Server-ACLs geändert</item>
     </plurals>
     <string name="location_share_live_stop">Beenden</string>
-    <string name="location_share_live_enabled">Live-Standort aktiviert</string>
+    <string name="location_share_live_enabled">Echtzeit-Standort aktiviert</string>
     <string name="a11y_location_share_option_pinned_icon">Standort teilen</string>
     <string name="location_share_option_pinned">Diesen Standort teilen</string>
     <string name="location_share_option_user_current">Meinen Standort teilen</string>
     <string name="a11y_location_share_option_user_current_icon">Meinen Standort teilen</string>
-    <string name="a11y_location_share_option_user_live_icon">Live-Standort teilen</string>
+    <string name="a11y_location_share_option_user_live_icon">Echtzeit-Standort freigeben</string>
-    <string name="location_share_option_user_live">Live-Standort teilen</string>
+    <string name="location_share_option_user_live">Echtzeit-Standort teilen</string>
     <string name="threads_notice_migration_title">Threads nähern sich der Beta 🎉</string>
     <string name="action_disable">Deaktivieren</string>
     <string name="beta">BETA</string>
@@ -2415,14 +2415,14 @@
     <string name="threads_beta_enable_notice_title">Threads Beta</string>
     <string name="call_start_screen_sharing">Bildschirm teilen</string>
     <string name="action_try_it_out">Probiere es aus</string>
-    <string name="location_share_live_until">Live bis %1$s</string>
+    <string name="location_share_live_until">Echtzeit bis %1$s</string>
     <string name="unifiedpush_getdistributors_dialog_title">Wähle Deine Benachrichtigungsmethode</string>
-    <string name="labs_enable_live_location_summary">Vorläufige Implementierung: Standorte bleiben im Nachrichtenverlauf von Räumen erhalten</string>
+    <string name="labs_enable_live_location_summary">Vorläufige Implementierung: Standorte verbleiben im Raumverlauf</string>
     <string name="push_gateway_item_profile_tag">Profil-Tag:</string>
     <string name="time_unit_hour_short">h</string>
-    <string name="live_location_labs_promotion_switch_title">Standortfreigabe aktivieren</string>
+    <string name="live_location_labs_promotion_switch_title">Aktiviere Standortfreigabe</string>
     <string name="live_location_labs_promotion_description">Bitte beachte: Dies ist eine experimentelle Funktion, die eine temporäre Implementierung nutzt. Das bedeutet, dass du deinen Standortverlauf nicht löschen kannst und erfahrene Nutzer ihn sehen können, selbst wenn du deinen Live-Standort nicht mehr mit diesem Raum teilst.</string>
-    <string name="live_location_labs_promotion_title">Live-Standortfreigabe</string>
+    <string name="live_location_labs_promotion_title">Echtzeit-Standortfreigabe</string>
     <string name="settings_troubleshoot_test_current_gateway">Aktuelles Gateway: %s</string>
     <string name="settings_troubleshoot_test_current_gateway_title">Gateway</string>
     <string name="settings_troubleshoot_test_current_endpoint_failed">Kann den Endpunkt nicht finden.</string>
@@ -2443,17 +2443,17 @@
     <string name="screen_sharing_notification_description">Bildschirmfreigabe ist in Arbeit</string>
     <string name="screen_sharing_notification_title">${app_name} Bildschirmfreigabe</string>
     <string name="live_location_bottom_sheet_last_updated_at">Aktualisiert vor %1$s</string>
-    <string name="labs_enable_live_location">Aktiviere Live-Standortfreigabe</string>
+    <string name="labs_enable_live_location">Aktiviere Echtzeit-Standortfreigabe</string>
     <string name="live_location_sharing_notification_description">Standortfreigabe ist in Arbeit</string>
-    <string name="live_location_sharing_notification_title">${app_name} Live-Standort</string>
+    <string name="live_location_sharing_notification_title">${app_name} Echtzeit-Standort</string>
     <string name="location_share_live_remaining_time">%1$s übrig</string>
-    <string name="location_share_live_view">Live-Standort anzeigen</string>
+    <string name="location_share_live_view">Echtzeit-Standort anzeigen</string>
-    <string name="location_share_live_ended">Live-Standort beendet</string>
+    <string name="location_share_live_ended">Echtzeit-Standort beendet</string>
-    <string name="location_share_live_started">Live-Standort laden…</string>
+    <string name="location_share_live_started">Lade Echtzeit-Standort …</string>
     <string name="location_share_live_select_duration_option_3">8 Stunden</string>
     <string name="location_share_live_select_duration_option_2">1 Stunde</string>
     <string name="location_share_live_select_duration_option_1">15 Minuten</string>
-    <string name="location_share_live_select_duration_title">Teile Deinen Live-Standort für</string>
+    <string name="location_share_live_select_duration_title">Gebe deinen Echtzeit-Standort frei für</string>
     <string name="a11y_location_share_locate_button">Auf aktuellen Standort zoomen</string>
     <string name="a11y_location_share_pin_on_map">Pin des ausgewählten Ortes auf der Karte</string>
     <string name="audio_message_file_size">(%1$s)</string>
@@ -2507,7 +2507,7 @@
     <string name="settings_security_pin_code_use_biometrics_error">Die biometrische Authentifizierung konnte nicht aktiviert werden.</string>
     <string name="auth_biometric_key_invalidated_message">Die biometrische Authentifizierung wurde deaktiviert, weil kürzlich eine neue biometrische Authentifizierungsmethode hinzugefügt wurde. Du kannst sie in den Einstellungen wieder aktivieren.</string>
     <string name="error_forbidden_digits_only_username">Der Heim-Server akzeptiert keine Benutzernamen, die nur aus Ziffern bestehen.</string>
-    <string name="sent_live_location">teilten ihren Live-Standort</string>
+    <string name="sent_live_location">Teilte den eigenen Echtzeit-Standort</string>
     <string name="ftue_personalize_skip_this_step">Schritt überspringen</string>
     <string name="ftue_personalize_submit">Speichern und fortfahren</string>
     <string name="ftue_personalize_complete_subtitle">Öffne die Einstellungen jederzeit um dein Profil zu aktualisieren</string>
@@ -2545,7 +2545,7 @@
     <string name="permalink_unsupported_groups">Kann Link nicht öffnen: Communities wurden durch Spaces ersetzt</string>
     <string name="labs_enable_msc3061_share_history">MSC3061: Raumschlüssel für vorherige Nachrichten teilen</string>
     <string name="labs_enable_msc3061_share_history_desc">Beim Einladen in einen Raum mit sichtbarem Verlauf wird der verschlüsselte Verlauf sichtbar sein.</string>
-    <string name="live_location_description">Live-Standort</string>
+    <string name="live_location_description">Echtzeit-Standort</string>
     <plurals name="room_removed_messages">
         <item quantity="one">%d Nachricht gelöscht</item>
         <item quantity="other">%d Nachrichten gelöscht</item>
@@ -2553,10 +2553,10 @@
     <string name="labs_enable_element_call_permission_shortcuts">Keine Element-Call-Berechtigungsabfragen</string>
     <string name="labs_enable_element_call_permission_shortcuts_summary">Bestätige automatisch Element-Call-Widgets und erlaube Kamera- und Mikrofonzugriff</string>
     <string name="create_room_action_go">Los</string>
-    <string name="ftue_auth_create_account_edit_server_selection">ändern</string>
+    <string name="ftue_auth_create_account_edit_server_selection">Bearbeiten</string>
-    <string name="ftue_auth_create_account_sso_section_header">oder</string>
+    <string name="ftue_auth_create_account_sso_section_header">Oder</string>
-    <string name="ftue_auth_sign_in_choose_server_header">Der Ort, an dem deine Gespräche stattfinden</string>
+    <string name="ftue_auth_sign_in_choose_server_header">Der zukünftige Ort deiner Gespräche</string>
-    <string name="ftue_auth_create_account_choose_server_header">Das zukünftige Zuhause für deine Gespräche</string>
+    <string name="ftue_auth_create_account_choose_server_header">Der zukünftige Ort deiner Gespräche</string>
     <string name="font_size_use_system">Systemstandard nutzen</string>
     <string name="font_size_section_auto">Automatisch festlegen</string>
     <string name="font_size_title">Schriftgröße wählen</string>
@@ -2568,7 +2568,7 @@
     <string name="ftue_auth_login_username_entry">Nutzername / E-Mail-Adresse / Telefonnummer</string>
     <string name="ftue_auth_create_account_title">Erstelle dein Konto</string>
     <string name="ftue_auth_choose_server_entry_hint">Server-URL</string>
-    <string name="ftue_auth_choose_server_subtitle">Wie lautet die Adresse deines Servers\? Das wird eine Art Zuhause für deine Daten</string>
+    <string name="ftue_auth_choose_server_subtitle">Wie lautet die Adresse deines Servers\? Dies ist eine Art Zuhause für all deine Daten</string>
     <string name="ftue_auth_choose_server_sign_in_subtitle">Wie lautet die Adresse deines Servers\?</string>
     <string name="ftue_auth_create_account_password_entry_footer">Muss 8 oder mehr Zeichen umfassen</string>
     <string name="ftue_auth_choose_server_title">Wähle deinen Server</string>
@@ -2586,7 +2586,6 @@
     <string name="room_list_filter_unreads">Ungelesene</string>
     <string name="room_list_filter_people">Personen</string>
     <string name="send_your_first_msg_to_invite">Schreibe deine erste Nachricht, um %s zur Unterhaltung einzuladen</string>
-    <string name="device_manager_settings_active_sessions_show_all">Alle Sitzungen anzeigen (V2, in Arbeit)</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="device_manager_sessions_other_title">Andere Sitzungen</string>
     <string name="settings_sessions_list">Sitzungen</string>
@@ -2601,9 +2600,9 @@
     <string name="crosssigning_cannot_verify_this_session_desc">Du wirst deinen verschlüsselten Nachrichtenverlauf nicht abrufen können. Um neu zu beginnen, setze deine Sicherung und Verifizierungsschlüssel zurück.</string>
     <string name="crosssigning_cannot_verify_this_session">Verifizierung dieses Gerätes nicht möglich</string>
     <string name="updating_your_data">Aktualisiere deine Daten …</string>
-    <string name="live_location_share_location_item_share">Standort teilen</string>
+    <string name="live_location_share_location_item_share">Standort freigeben</string>
-    <string name="live_location_not_enough_permission_dialog_description">Du musst die Berechtigung erhalten, um deinen Live-Standort mit diesem Raum zu teilen.</string>
+    <string name="live_location_not_enough_permission_dialog_description">Du benötigst die entsprechenden Berechtigungen, um deinen Echtzeit-Standort in diesem Raum freizugeben.</string>
-    <string name="live_location_not_enough_permission_dialog_title">Dir fehlt die Berechtigung, deinen Live-Standort teilen zu dürfen</string>
+    <string name="live_location_not_enough_permission_dialog_title">Dir fehlt die Berechtigung, deinen Echtzeit-Standort freigeben zu dürfen</string>
     <string name="ftue_auth_password_reset_confirmation">Passwort zurückgesetzt</string>
     <string name="ftue_auth_phone_confirmation_resend_code">Code erneut schicken</string>
     <string name="ftue_auth_phone_confirmation_subtitle">Ein Code wurde an %s gesendet</string>
@@ -2666,7 +2665,7 @@
     <string name="device_manager_session_details_title">Sitzungsdetails</string>
     <string name="device_manager_other_sessions_clear_filter">Filter zurücksetzen</string>
     <string name="device_manager_other_sessions_no_inactive_sessions_found">Keine inaktiven Sitzungen gefunden.</string>
-    <string name="device_manager_other_sessions_no_unverified_sessions_found">Keine nicht verifizierten Sitzungen gefunden.</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">Keine unverifizierten Sitzungen gefunden.</string>
     <string name="device_manager_other_sessions_no_verified_sessions_found">Keine verifizierten Sitzungen gefunden.</string>
     <plurals name="device_manager_other_sessions_recommendation_description_inactive">
         <item quantity="one">Erwäge, dich aus alten (ein Tag oder mehr), nicht mehr verwendeten Sitzungen abzumelden.</item>
@@ -2707,6 +2706,102 @@
     <string name="device_manager_verification_status_detail_current_session_unverified">Verifiziere deine aktuelle Sitzung für besonders sichere Kommunikation.</string>
     <string name="device_manager_verification_status_detail_current_session_verified">Deine aktuelle Sitzung ist für sichere Kommunikation bereit.</string>
     <string name="device_manager_view_details">Details anzeigen</string>
-    <string name="device_manager_verification_status_detail_other_session_unverified">Für bestmögliche Sicherheit und Zuverlässigkeit verifiziere diese Sitzungen oder melde dich von ihr ab.</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">Für bestmögliche Sicherheit und Zuverlässigkeit verifiziere diese Sitzung oder melde sie ab.</string>
-    <string name="device_manager_other_sessions_recommendation_description_verified">Für die bestmögliche Sicherheit, melde dich von allen Sitzungen ab, die du nicht erkennst oder nicht mehr benutzt.</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">Für bestmögliche Sicherheit, melde dich von allen Sitzungen ab, die du nicht erkennst oder benutzt.</string>
+    <string name="device_manager_learn_more_session_rename">Andere Nutzer in Direktnachrichten und Räumen, in denen du dich befindest, können eine vollständige Liste deiner Sitzungen einsehen.
+\n
+\nDies gibt ihnen die Sicherheit, dass sie auch wirklich mit dir kommunizieren. Allerdings bedeutet es auch, dass sie die Sitzungsnamen sehen können, die du hier angibst.</string>
+    <string name="device_manager_learn_more_sessions_verified">Verifizierte Sitzungen wurden mit deinen Daten angemeldet und anschließend mit deiner Sicherheitspassphrase oder durch Quersignierung verifiziert.
+\n
+\nDies bedeutet, dass sie die Verschlüsselungs-Schlüssel für deine bisherigen Nachrichten besitzen und anderen Nutzern bestätigen können, dass diese Sitzungen tatsächlich von dir stammen.</string>
+    <string name="device_manager_learn_more_session_rename_title">Sitzungen umbenennen</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Verifizierte Sitzungen</string>
+    <string name="device_manager_learn_more_sessions_unverified">Nicht verifizierte Sitzungen sind jene, die angemeldet, aber nicht quer signiert sind.
+\n
+\nDu solltest besonders sicherstellen, dass du diese Sitzungen erkennst, da sie auf eine nicht autorisierte Nutzung deines Kontos hindeuten könnten.</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Nicht verifizierte Sitzungen</string>
+    <string name="device_manager_learn_more_sessions_inactive">Inaktive Sitzungen sind jene, die du einige Zeit nicht mehr verwendet hast, die aber weiterhin Verschlüsselungs-Schlüssel erhalten.
+\n
+\nDas Löschen von inaktiven Sitzungen verbessert Sicherheit und Leistung, und hilft dir zu erkennen, ob eine neue Sitzung verdächtig ist.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Inaktive Sitzungen</string>
+    <string name="device_manager_session_rename_warning">Sei dir bitte bewusst, dass Sitzungsnamen auch für Personen, mit denen du kommunizierst, sichtbar sind.</string>
+    <string name="device_manager_session_rename_description">Individuelle Sitzungsnamen können dir helfen, deine Geräte einfacher zu erkennen.</string>
+    <string name="device_manager_session_rename_edit_hint">Sitzungsname</string>
+    <string name="device_manager_session_rename">Sitzung umbenennen</string>
+    <string name="device_manager_session_overview_signout">Von dieser Sitzung abmelden</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Nicht verifiziert · Deine aktuelle Sitzung</string>
+    <string name="tooltip_attachment_voice_broadcast">Beginne eine Sprachübertragung</string>
+    <string name="key_authenticity_not_guaranteed">Die Echtheit dieser verschlüsselten Nachricht kann auf diesem Gerät nicht garantiert werden.</string>
+    <string name="settings_security_incognito_keyboard_summary">Tastatur auffordern, keine personalisierten Daten, z. B. den Tippverlauf und Wörterbücher, basierend auf deinen Konversationen zu aktualisieren. Beachte, dass einige Tastaturen diese Einstellung ignorieren werden.</string>
+    <string name="settings_security_incognito_keyboard_title">Inkognito-Tastatur</string>
+    <string name="command_description_table_flip">Stellt (╯°□°）╯︵ ┻━┻ einer Klartextnachricht voran</string>
+    <string name="attachment_type_voice_broadcast">Sprachübertragung</string>
+    <string name="command_description_devtools">Öffne die Entwicklungswerkzeuge</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Du hast in den Sicherheitseinstellungen aktiviert, dass Verschlüsselung in allen Räumen ausschließlich für verifizierte Sitzungen erlaubt ist.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ Es befinden sich nicht verifizierte Geräte in diesem Raum. Sie werden deine Nachrichten nicht entschlüsseln können.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Niemals verschlüsselte Nachrichten zu unverifizierten Sitzungen in diesem Raum senden.</string>
+    <string name="action_got_it">Verstanden</string>
+    <string name="labs_enable_rich_text_editor_summary">Probiere den Rich-Text-Editor aus (bald auch mit Plain-Text-Modus)</string>
+    <string name="labs_enable_rich_text_editor_title">Aktiviere Rich-Text-Editor</string>
+    <string name="device_manager_session_details_device_browser">Browser</string>
+    <string name="rich_text_editor_format_strikethrough">Durchgestrichen formatieren</string>
+    <string name="rich_text_editor_format_italic">Kursiv formatieren</string>
+    <string name="rich_text_editor_format_bold">Fett formatieren</string>
+    <string name="rich_text_editor_format_underline">Unterstrichen formatieren</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} benötigt die Berechtigung zur Anzeige von Benachrichtigungen.
+\nBitte gewähre diese Berechtigung.</string>
+    <string name="labs_enable_client_info_recording_summary">Bezeichnung, Version und URL der Anwendung registrieren, damit diese Sitzung in der Sitzungsverwaltung besser erkennbar ist.</string>
+    <string name="labs_enable_client_info_recording_title">Anwendungsinformationen erfassen</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="labs_enable_session_manager_summary">Bessere Übersicht und Kontrolle über all deine Sitzungen.</string>
+    <string name="labs_enable_session_manager_title">Aktiviere neue Sitzungsverwaltung</string>
+    <string name="device_manager_session_details_device_operating_system">Betriebssystem</string>
+    <string name="device_manager_session_details_device_model">Modell</string>
+    <string name="device_manager_session_details_application_version">Version</string>
+    <string name="device_manager_session_details_application_name">Name</string>
+    <string name="device_manager_session_details_application">Anwendung</string>
+    <string name="device_manager_push_notifications_description">Erhalte Push-Benachrichtigungen in dieser Sitzung.</string>
+    <string name="device_manager_push_notifications_title">Push-Benachrichtigungen</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Verifiziere deine aktuelle Sitzung, um den Verifizierungsstatus dieser Sitzung anzuzeigen.</string>
+    <string name="device_manager_verification_status_unknown">Unbekannter Verifizierungsstatus</string>
+    <string name="push_gateway_item_device_id">Sitzungs-ID:</string>
+    <string name="push_gateway_item_enabled">Aktiviert:</string>
+    <string name="error_check_network">Etwas ist schiefgelaufen. Bitte überprüfe deine Internetverbindung und versuche es erneut.</string>
+    <string name="grant_permission">Berechtigung geben</string>
+    <string name="permissions_rationale_msg_notification">${app_name} braucht die Berechtigung, um Benachrichtigungen anzuzeigen. Benachrichtigungen können deine Nachrichten, Einladungen etc. anzeigen.
+\n
+\nBitte erlaube den Zugriff im nächsten Dialog, damit Benachrichtigungen angezeigt werden können.</string>
+    <string name="qr_code_login_confirm_security_code_description">Bitte vergewissere dich, dass du den Ursprung dieses Codes kennst. Durch Verbindung neuer Geräte gewährst du vollen Zugriff auf dein Konto.</string>
+    <string name="qr_code_login_confirm_security_code">Bestätigen</string>
+    <string name="qr_code_login_try_again">Erneut versuchen</string>
+    <string name="qr_code_login_status_no_match">Keine Übereinstimmung\?</string>
+    <string name="qr_code_login_signing_in">Du wirst angemeldet</string>
+    <string name="qr_code_login_connecting_to_device">Verbinde mit Gerät</string>
+    <string name="qr_code_login_scan_qr_code_button">QR-Code einlesen</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Mobiles Gerät anmelden\?</string>
+    <string name="qr_code_login_show_qr_code_button">QR-Code auf diesem Gerät anzeigen</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Wähle „QR-Code einlesen“</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Beginne auf dem Anmeldebildschirm</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Wähle „Mit QR-Code anmelden“</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Beginne auf dem Anmeldebildschirm</string>
+    <string name="qr_code_login_new_device_instruction_3">Wähle \'QR-Code auf diesem Gerät anzeigen\'</string>
+    <string name="qr_code_login_new_device_instruction_2">Gehe zu Einstellungen -&gt; Sicherheit und Privatsphäre -&gt; Alle Sitzungen anzeigen</string>
+    <string name="qr_code_login_new_device_instruction_1">Öffne ${app_name} auf deinem anderen Gerät</string>
+    <string name="qr_code_login_header_failed_denied_description">Die Anfrage wurde auf dem anderen Gerät abgelehnt.</string>
+    <string name="qr_code_login_header_failed_timeout_description">Die Verbindung konnte nicht in der erforderlichen Zeit hergestellt werden.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Verbindung mit diesem Gerät nicht unterstützt.</string>
+    <string name="qr_code_login_header_failed_title">Verbindung fehlgeschlagen</string>
+    <string name="qr_code_login_header_connected_description">Überprüfe dein angemeldetes Gerät. Der unten gezeigte Code sollte angezeigt werden. Bestätige, dass beide Codes übereinstimmen:</string>
+    <string name="qr_code_login_header_connected_title">Sichere Verbindung hergestellt</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Lese den unten angezeigten QR-Code mit deinem nicht angemeldeten Gerät ein.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Benutze dein angemeldetes Gerät um den unten angezeigten QR-Code einzulesen:</string>
+    <string name="qr_code_login_header_show_qr_code_title">Mit QR-Code anmelden</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Benutze die Kamera auf diesem Gerät um den vom anderen Gerät angezeigten QR-Code zu scannen:</string>
+    <string name="qr_code_login_header_scan_qr_code_title">QR-Code scannen</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Du kannst dieses Gerät benutzen um ein anderes Gerät per QR-Code anzumelden. Dafür gibt es zwei Wege:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Mit QR-Code anmelden</string>
+    <string name="login_scan_qr_code">QR-Code scannen</string>
 </resources>

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

@@ -2548,7 +2548,6 @@
     <string name="a11y_device_manager_device_type_desktop">Escritorio</string>
     <string name="a11y_device_manager_device_type_web">Web</string>
     <string name="a11y_device_manager_device_type_mobile">Móvil</string>
-    <string name="device_manager_settings_active_sessions_show_all">Mostrar todas las sesiones (V2, WIP)</string>
     <string name="labs_enable_element_call_permission_shortcuts_summary">Auto aprovar widgets de Element Call y dar permisos de cámara y micrófono</string>
     <plurals name="room_removed_messages">
         <item quantity="one">%d mensaje borrado</item>

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

@@ -1158,10 +1158,10 @@
     <string name="settings_push_rules">Tõuketeavituste reeglid</string>
     <string name="settings_push_rules_no_rules">Tõuketeavituste reegleid pole kirjeldatud</string>
     <string name="settings_push_gateway_no_pushers">Tõuketeavituste võrguväravaid pole registreeritud</string>
-    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="push_gateway_item_app_id">Rakenduse ID:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
+    <string name="push_gateway_item_push_key">Tõuketeenuse võti:</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
+    <string name="push_gateway_item_app_display_name">Rakenduse kuvatav nimi:</string>
-    <string name="push_gateway_item_device_name">session_name:</string>
+    <string name="push_gateway_item_device_name">Sessiooni nimi:</string>
     <string name="push_gateway_item_url">URL:</string>
     <string name="push_gateway_item_format">Vorming:</string>
     <string name="preference_voice_and_video">Heli ja video</string>
@@ -1197,8 +1197,8 @@
     <string name="settings_discovery_disconnect_identity_server_info">Isikutuvastusserveri kasutamise lõpetamine tähendab, et sa ei ole leitav teiste kasutajate poolt ega sulle ei saa telefoninumbri või e-posti aadressi alusel kutset saata. Küll aga saab kutset saata Matrix\'i kasutajatunnuse alusel.</string>
     <string name="settings_discovery_msisdn_title">Leitavad telefoninumbrid</string>
     <string name="labs_show_unread_notifications_as_tab">Lisa avaekraanile eraldi sakk lugemata teavituste jaoks.</string>
-    <string name="settings_discovery_confirm_mail">Saatsime kinnituskirja e-posti aadressile %s. Palun vaata oma kirju ja klõpsi selles kirjas leiduvat linki</string>
+    <string name="settings_discovery_confirm_mail">Saatsime kirja e-posti aadressile %s. Palun vaata oma kirju ja klõpsi selles kirjas leiduvat linki</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Saatsime kinnituskirja e-posti aadressile %s. Esmalt palun vaata oma kirju ja klõpsi selles kirjas leiduvat linki</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Saatsime kirja e-posti aadressile %s. Esmalt palun vaata oma kirju ja klõpsi selles kirjas leiduvat linki</string>
     <string name="settings_agree_to_terms">Selleks, et sind võiks leida e-posti aadressi või telefoninumbri alusel, nõustu isikutuvastusserveri (%s) kasutustingimustega.</string>
     <string name="labs_allow_extended_logging">Lülita sisse detailsete logide salvestamine.</string>
     <string name="no_ignored_users">Sa parasjagu ei eira ühtegi kasutajat</string>
@@ -1336,7 +1336,7 @@
     <string name="disconnect_identity_server_dialog_content">Kas katkestame ühenduse isikutuvastusserveriga %s\?</string>
     <string name="identity_server_error_no_identity_server_configured">Palun esmalt seadista isikutuvastusserver.</string>
     <string name="identity_server_error_terms_not_signed">Palun esmalt nõustu seadistustes isikutuvastusserveri kasutustingimustega.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Sinu privaatsuse nimel saadab ${app_name} e-posti aadressid ja telefoninumbrid serverisse vaid räsituna.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Sinu privaatsuse nimel saadab ${app_name} e-posti aadressid ja telefoninumbrid serverisse vaid räsidena.</string>
     <string name="identity_server_error_binding_error">Seoste loomine ei õnnestunud.</string>
     <string name="identity_server_error_no_current_binding_error">Selle tunnusega ei ole hetkel ühtegi seost.</string>
     <string name="identity_server_set_default_notice">Sinu koduserver (%1$s) soovitab kasutada sinu isikutuvastusserverina %2$s teenust</string>
@@ -1778,7 +1778,7 @@
     <string name="not_a_valid_qr_code">See ei ole korralik Matrix\'i QR-kood</string>
     <string name="settings_discovery_consent_action_give_consent">Nõustu</string>
     <string name="settings_discovery_consent_action_revoke">Tühista minu nõusolek</string>
-    <string name="settings_discovery_consent_notice_on">Selleks, et leida Matrixikasutajaid oma kontaktide hulgast, oled sa andnud nõusoleku saata e-posti aadresse ja telefoninumbreid sellele isikutuvastusserverile.</string>
+    <string name="settings_discovery_consent_notice_on">Selleks, et leida Matrixikasutajaid oma kontaktide hulgast, oled sa andnud nõusoleku e-posti aadresside ja telefoninumbrite saatmiseks sellele isikutuvastusserverile.</string>
     <string name="settings_discovery_consent_title">Saada e-posti aadresse ja telefoninumbreid</string>
     <string name="direct_room_user_list_suggestions_title">Soovitused</string>
     <string name="direct_room_user_list_known_title">Tuttavad kasutajad</string>
@@ -2211,7 +2211,7 @@
     <string name="room_settings_space_access_title">Ligipääs siia kogukonda</string>
     <string name="room_settings_access_rules_pref_dialog_title">Kes pääsevad ligi siia jututuppa\?</string>
     <string name="settings_notification_emails_enable_for_email">Saada teavitusi %s e-posti aadressile</string>
-    <string name="settings_notification_emails_no_emails">Kui soovi e-posti teel saada teavitusi, siis palun seosta oma e-posti aadress oma Matrix\'i kasutajakontoga</string>
+    <string name="settings_notification_emails_no_emails">Kui soovid e-posti teel saada teavitusi, siis palun seosta oma e-posti aadress oma Matrix\'i kasutajakontoga</string>
     <string name="settings_notification_emails_category">E-posti teel saadetavad teavitused</string>
     <string name="room_permissions_upgrade_the_space">Uuenda kogukonda</string>
     <string name="room_permissions_change_space_name">Muuda kogukonna nime</string>
@@ -2591,7 +2591,6 @@
 \nSee koduserver ei pruugi olla seadistatud kuvama kaarte.</string>
     <string name="a11y_open_settings">Ava seadistused</string>
     <string name="all_chats">Kõik vestlused</string>
-    <string name="device_manager_settings_active_sessions_show_all">Näita kõiki sessioone (V2, WIP)</string>
     <string name="device_manager_sessions_other_description">Parima turvalisuse nimel verifitseeri kõik oma sessioonid ning logi välja neist, mida sa enam ei kasuta.</string>
     <string name="device_manager_sessions_other_title">Muud sessioonid</string>
     <string name="settings_sessions_list">Sessioonid</string>
@@ -2691,7 +2690,7 @@
     <string name="device_manager_filter_bottom_sheet_title">Filtreeri</string>
     <string name="device_manager_session_last_activity">Viimati kasutusel %1$s</string>
     <string name="device_manager_device_title">Seade</string>
-    <string name="device_manager_session_title">Sessioonid</string>
+    <string name="device_manager_session_title">Sessioon</string>
     <string name="device_manager_current_session_title">Praegune sessioon</string>
     <string name="device_manager_verification_status_detail_other_session_unverified">Parima turvalisuse ja töökindluse nimel verifitseeri see sessioon või logi ta võrgust välja.</string>
     <string name="device_manager_verification_status_detail_current_session_unverified">Turvalise sõnumivahetuse nimel palun verifitseeri oma praegune sessioon.</string>
@@ -2701,4 +2700,100 @@
     <string name="labs_enable_deferred_dm_title">Võta kasutusele viivitusega otsevestlused</string>
     <string name="labs_enable_new_app_layout_summary">Lihtsustatud SchildiChat valikuliste kaartidega</string>
     <string name="labs_enable_new_app_layout_title">Võta kasutusele rakenduse uus välimus</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Sa oled rakenduse turvaseadistustes määranud, et krüptimine kehtib vaid verifitseeritud sessioonidele.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ Selles jututoas on verifitseerimata seadmeid, mis ei saa sinu saadetud sõnumeid dekrüptida.</string>
+    <string name="device_manager_learn_more_session_rename">Teised osapooled nii otsesõnumites kui jututubades näevad sinu kõikide sessioonide loendit.
+\n
+\nSee tähendab, et nad võivad uskuda, et tegemist on tõesti sinuga. Samal ajal näevad ka siin sisestatud sessiooninime.</string>
+    <string name="device_manager_learn_more_session_rename_title">Sessioonide nimede muutmine</string>
+    <string name="device_manager_learn_more_sessions_verified">Verifitseeritud sessioonid on sellised, kuhu sa oled oma kasutajanime ja salasõnaga sisse loginud ning mille puhul oled risttunnustamise läbi teinud või paroolifraasi abil ta turvaliseks märkinud.
+\n
+\nSee tähendab, et nendes sessioonides on olemas sinu varasemate sõnumite krüptovõtmed ja teistele osapooltele on nad tuvastatavad nii, et tegemist on tõesti sinuga.</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Verifitseeritud sessioonid</string>
+    <string name="device_manager_learn_more_sessions_unverified">Verifitseerimata sessioonid on sellised, kuhu sa oled oma kasutajanime ja salasõnaga sisse loginud, kuid mille puhul on risttunnustamine tegemata.
+\n
+\nPalun kontrolli, et need on sulle teadaolevad sessioonid. Vastasel korral võib olla tegemist sinu kasutajakonto lubamatu kasutamisega.</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Verifitseerimata sessioonid</string>
+    <string name="device_manager_learn_more_sessions_inactive">Sessioonid, mida sa pole mõnda aega kasutanud, saavad jätkuvalt pärida sinu krüptovõtmeid.
+\n
+\nSelliste sessioonide eemaldamine parandab jõudlust ja turvalisust ning sul on lihtsam märgata, kui loendisse tekib midagi kahtlast.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Mitteaktiivsed sessioonid</string>
+    <string name="device_manager_session_rename_warning">Palun arvesta, et sessioonide nimed on näha ka kõikidele osapooltele, kellega sa suhtled.</string>
+    <string name="device_manager_session_rename_description">Sinu enda kirjutatud sessiooninimede alusel on sul oma seadmeid lihtsam ära tunda.</string>
+    <string name="device_manager_session_rename_edit_hint">Sessiooni nimi</string>
+    <string name="device_manager_session_rename">Muuda sessiooni nime</string>
+    <string name="device_manager_session_overview_signout">Logi sellest sessioonist välja</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Verifitseerimata · Sinu praegune sessioon</string>
+    <string name="tooltip_attachment_voice_broadcast">Alusta ringhäälingukõnet</string>
+    <string name="key_authenticity_not_guaranteed">Selle krüptitud sõnumi autentsus pole selles seadmes tagatud.</string>
+    <string name="settings_security_incognito_keyboard_summary">Väldi sisetuste ja muude isikustatud andmete edastamist väljaspoole seda rakendust. Palun arvesta, et kõik klaviatuurirakendused ei pruugi seda seadistust tunnistada.</string>
+    <string name="settings_security_incognito_keyboard_title">Privaatne klahvistik</string>
+    <string name="command_description_table_flip">Lisab vormindamata sõnumi ette (╯°□°）╯︵ ┻━┻</string>
+    <string name="attachment_type_voice_broadcast">Ringhäälingukõne</string>
+    <string name="command_description_devtools">Ava arendaja töövahendite vaade</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Ära iialgi saada selles jututoas krüptitud sõnumeid verifitseerimata sessioonidesse.</string>
+    <string name="action_got_it">Selge lugu</string>
+    <string name="labs_enable_rich_text_editor_summary">Proovi vormindatud teksti alusel töötavat tekstitoimetit (varsti lisandub ka vormindamata teksti režiim)</string>
+    <string name="labs_enable_rich_text_editor_title">Võta kasutusele vormindatud teksti pruukiv tekstitoimeti</string>
+    <string name="qr_code_login_header_connected_description">Vaata seadet, kus sa oled Matrix\'i võtku loginud - seal peaks nüüd kuvatama QR-koodi. Kinnita, et allpool toodud QR-kood on sama kui tolles seadmes kuvatav kood:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Sa võid seda seadet kasutada nutiseadme või veebirakenduse sisselogimiseks QR-koodi alusel. Sa saad seda teha kahel moel:</string>
+    <string name="rich_text_editor_format_underline">Kasuta allajoonitud kirja</string>
+    <string name="rich_text_editor_format_strikethrough">Kasuta läbijoonitud kirja</string>
+    <string name="rich_text_editor_format_italic">Kasuta kaldkirja</string>
+    <string name="rich_text_editor_format_bold">Kasuta paksu kirja</string>
+    <string name="qr_code_login_confirm_security_code_description">Palun vaata, et sa kindlasti tead, kust see QR-kood kuvatakse. Sellisel viisil seadmete sidumisel sa annad oma kasutajakontole täiemahulise ligipääsu.</string>
+    <string name="qr_code_login_confirm_security_code">Kinnita</string>
+    <string name="qr_code_login_try_again">Proovi uuesti</string>
+    <string name="qr_code_login_status_no_match">Ei klapi\?</string>
+    <string name="qr_code_login_signing_in">Logime sind võrku</string>
+    <string name="qr_code_login_connecting_to_device">Loon ühendust seadmega</string>
+    <string name="qr_code_login_scan_qr_code_button">Loe QR-koodi</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Kas logid sisse nutiseadmest\?</string>
+    <string name="qr_code_login_show_qr_code_button">Näita selles seadmes QR-koodi</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Vali „Loe QR-koodi“</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Alusta sisselogimisvaatest</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Vali „Logi võrku QR-koodi abil“</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Alusta sisselogimisvaatest</string>
+    <string name="qr_code_login_new_device_instruction_3">Vali „Näita selles seadmes QR-koodi“</string>
+    <string name="qr_code_login_new_device_instruction_2">Ava Seadistused -&gt; Turvalisus ja privaatsus -&gt; Näita kõiki sessioone</string>
+    <string name="qr_code_login_new_device_instruction_1">Ava ${app_name} oma teises seades</string>
+    <string name="qr_code_login_header_failed_denied_description">Teine seade lükkas päringu tagasi.</string>
+    <string name="qr_code_login_header_failed_timeout_description">Sidumine ei lõppenud etteantud aja jooksul.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Sidumine selle seadmega ei ole toetatud.</string>
+    <string name="qr_code_login_header_failed_title">Seoste loomine ei õnnestunud</string>
+    <string name="qr_code_login_header_connected_title">Turvaline ühendus on olemas</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Loe QR-koodi seadmega, kus sa oled Matrix\'i võrgust välja loginud.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Järgneva QR-koodi skaneerimiseks kasuta seadet, kus sa oled Matrix\'i võrku loginud:</string>
+    <string name="qr_code_login_header_show_qr_code_title">Logi sisse QR-koodi abil</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Kasuta selle seadme kaamerat ja logi sisse teises seadmes kuvatud QR-koodi alusel:</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Loe QR-koodi</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="labs_enable_client_info_recording_summary">Sessioonide paremaks tuvastamiseks saad nüüd sessioonihalduris salvestada klientrakenduse nime, versiooni ja aadressi.</string>
+    <string name="labs_enable_client_info_recording_title">Luba klientrakenduse teabe salvestamine</string>
+    <string name="labs_enable_session_manager_summary">Sellega saad parema ülevaate oma sessioonidest ja võimaluse neid mugavasti hallata.</string>
+    <string name="labs_enable_session_manager_title">Kasuta uut sessioonihaldurit</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Logi sisse QR-koodi abil</string>
+    <string name="device_manager_session_details_device_operating_system">Operatsioonisüsteem</string>
+    <string name="device_manager_session_details_device_model">Mudel</string>
+    <string name="device_manager_session_details_device_browser">Brauser</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">Versioon</string>
+    <string name="device_manager_session_details_application_name">Nimi</string>
+    <string name="device_manager_session_details_application">Rakendus</string>
+    <string name="device_manager_push_notifications_description">Luba selles sessioonis tõuketeavitused.</string>
+    <string name="device_manager_push_notifications_title">Tõuketeavitused</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Selle sessiooni olekut ei saa tuvastada enne kui oled ta verifitseerinud.</string>
+    <string name="device_manager_verification_status_unknown">Verifitseerimise olek on määratlemata</string>
+    <string name="login_scan_qr_code">Loe QR-koodi</string>
+    <string name="push_gateway_item_enabled">Kasutusel:</string>
+    <string name="push_gateway_item_device_id">Sessiooni tunnus:</string>
+    <string name="error_check_network">Midagi läks nüüd sassi. Palun kontrolli oma seadme võrguühendust ja proovi uuesti.</string>
+    <string name="grant_permission">Anna õigused</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} vajab teavituste näitamiseks õigusi.
+\nPalun luba vastavad õigused.</string>
+    <string name="permissions_rationale_msg_notification">${app_name} vajab teavituste näitamiseks õigusi. Teavituste sisuks võivad olla sulle saadetud sõnumid, kutsed ja muud olulist.
+\n
+\nJärgmistes vaadetes palun anna sellele rakendusele teavituste kuvamiseks vajalikud õigused.</string>
 </resources>

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

@@ -155,7 +155,7 @@
     <string name="notice_room_guest_access_can_join_by_you">به میهمانان اجازهٔ پیوستن به گروه دادید.</string>
     <string name="notice_room_guest_access_forbidden_by_you">میمهانان را از پیوستن به گروه بازداشتید.</string>
     <string name="notice_end_to_end_ok_by_you">رمزنگاری سرتاسری را روشن کردید.</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">رمزنگاری سرتاسری را روشن کردید (الگوریتم ناشناخته %1$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">رمزنگاری سرتاسری را روشن کردید (الگوریتم تشخیص‌داده‌نشده %1$s).</string>
     <string name="notice_direct_room_guest_access_forbidden_by_you">مهمان‌ها را از پیوستن به اتاق بازداشتید.</string>
     <string name="notice_direct_room_guest_access_forbidden">%1$s مهمان‌ها را از پیوستن به اتاق بازداشت.</string>
     <string name="notice_direct_room_guest_access_can_join_by_you">به مهمان‌ها اجازه دادید به این‌جا بپیوندند.</string>
@@ -659,7 +659,7 @@
     <string name="settings_discovery_manage">مدیریت تنظیمات کشفتان.</string>
     <string name="settings_unignore_user">نمایش همهٔ پیام‌ها از %s؟</string>
     <string name="settings_emails_and_phone_numbers_title">رایانامه‌ها و شماره تلفن‌ها</string>
-    <string name="settings_emails_and_phone_numbers_summary">مدیریت رایانامه‌ها و شماره تلفن‌های پیوسته به حساب ماتریکستان</string>
+    <string name="settings_emails_and_phone_numbers_summary">مدیریت نشانی‌های رایانامه و شماره تلفن‌های پیوسته به حساب ماتریکستان</string>
     <string name="media_saving_period_3_days">۳ روز</string>
     <string name="media_saving_period_1_week">۱ هفته</string>
     <string name="media_saving_period_1_month">۱ ماه</string>
@@ -822,7 +822,7 @@
     <string name="add_identity_server">پیکربندی کارساز هویت</string>
     <string name="change_identity_server">تغییر کارساز هویت</string>
     <string name="settings_discovery_emails_title">نشانی‌های رایانامهٔ قابل‌کشف</string>
-    <string name="settings_discovery_no_mails">گزینه‌های کشف به محض افزودن یک رایانامه، ظاهر خواهند شد.</string>
+    <string name="settings_discovery_no_mails">گزینه‌های کشف به محض افزودن یک نشانی رایانامه، ظاهر خواهند شد.</string>
     <string name="settings_discovery_no_msisdn">گزینه‌های کشف به محض افزودن یک شماره تلفن، ظاهر خواهند شد.</string>
     <string name="settings_discovery_msisdn_title">شماره تلفن‌های قابل‌کشف</string>
     <string name="labs_allow_extended_logging">به کار انداختن گزارش‌های پرگو.</string>
@@ -1234,7 +1234,7 @@
     <string name="error_threepid_auth_failed">مطمئن شوید لینک فعال‌سازی‌ای را که به ایمیل شما ارسال شده، باز کرده‌اید.</string>
     <string name="settings_remove_three_pid_confirmation_content">برداشتن %s؟</string>
     <string name="settings_phone_numbers">شماره تلفن‌ها</string>
-    <string name="settings_emails_empty">هیچ رایانامه‌ای به حسابتان افزوده نشده</string>
+    <string name="settings_emails_empty">هیچ نشانی رایانامه‌ای به حسابتان افزوده نشده</string>
     <string name="settings_emails">نشانی‌های رایانامه</string>
     <string name="settings_phone_number_empty">هیچ شماره تلفنی به حسابتان افزوده نشده</string>
     <string name="search_no_results">نتیجه‌ای در پی نداشت</string>
@@ -1397,7 +1397,7 @@
     <string name="login_signup_to">ثبت نام در %1$s</string>
     <string name="login_msisdn_error_other">شماره تلفن نامعتبر است. لطفا آن را بررسی کنید</string>
     <string name="login_msisdn_confirm_notice">ما یک کد فعال‌سازی به %1$s ارسال کردیم. لطفا آن را وارد کنید.</string>
-    <string name="login_set_email_notice">برای بازیابی حساب خود یک ایمیل تنظیم کنید. بعداً، در صورتی که تمایل داشتید می‌توانید به افراد اجازه دهید با ایمیل، شما را پیدا کنند.</string>
+    <string name="login_set_email_notice">برای بازیابی حسابتان، نشانی رایانامه‌ای تنظیم کنید. بعداً می‌توانید بگذارید افرادی که می‌شناسید، با این نشانی بیابندتان.</string>
     <string name="login_set_msisdn_notice">یک شماره تلفن تنظیم کنید تا در صورتی که تمایل دارید، به افراد اجازه پیدا کردن شما را با استفاده از آن بدهد.</string>
     <string name="login_reset_password_cancel_confirmation_content">گذرواژه شما هنوز تغییر نکرده‌است.
 \n
@@ -1407,12 +1407,12 @@
     <string name="login_reset_password_mail_confirmation_notice_2">برای تایید گذرواژه جدید لینک ارسالی را باز کرده، سپس روی متن زیر کلیک کنید.</string>
     <string name="login_reset_password_mail_confirmation_notice">یک ایمیل تائید به %1$s ارسال شد.</string>
     <string name="login_reset_password_mail_confirmation_title">صندوق ایمیل خود را بررسی کنید</string>
-    <string name="login_reset_password_error_not_found">این ایمیل به هیچ حسابی متصل نشده‌است</string>
+    <string name="login_reset_password_error_not_found">این نشانی رایانامه به هیچ حسابی پیوند داده نشده</string>
     <string name="login_reset_password_warning_content">با تغییر گذرواژه ، کلیدهای رمزگذاری سرتاسر در تمام نشست‌های شما تغییر کرده و تاریخچه گفتگوی رمزشده‌ی شما غیرقابل خواندن می‌شود. قبل از تغییر گذرواژه، کلید امنیتی یا کلید پشتیبان را وارد کرده و یا کلیدهای اتاق خود را از نشست دیگری استخراج کنید.</string>
     <string name="login_reset_password_submit">بعدی</string>
     <string name="login_reset_password_notice">برای تأیید تنظیم گذرواژه‌ی جدید ، یک ایمیل تأیید به آدرس ایمیل شما ارسال خواهد شد.</string>
     <string name="login_reset_password_on">بازنشانی گذرواژه در %1$s</string>
-    <string name="login_login_with_email_error">این ایمیل به هیچ حسابی مرتبط نیست.</string>
+    <string name="login_login_with_email_error">این نشانی رایانامه به هیچ حسابی مرتبط نیست.</string>
     <string name="login_registration_not_supported">برنامه قادر به ایجاد حساب در این سرور نیست.
 \n
 \nآیا می خواهید با استفاده از مرورگر حساب کاربری بسازید؟</string>
@@ -1427,7 +1427,7 @@
     <string name="login_server_text">درست مانند ایمیل، حساب‌های کاربری یک خانه دارند؛ اگرچه می توانید با هر کسی که دوست دارید، صحبت کنید</string>
     <string name="login_server_title">کارسازی برگزینید</string>
     <string name="login_splash_submit">شروع کنید</string>
-    <string name="login_splash_text3">تجارب خود را گسترش داده و شخصی‌سازی کنید</string>
+    <string name="login_splash_text3">تجربه‌هایتان را گسترش داده و شخصی‌سازی کنید</string>
     <string name="login_splash_text2">گفتگوهای خصوصی خود را با رمزگذاری محافظت کنید</string>
     <string name="login_splash_text1">با افراد به صورت مستقیم و یا در قالب گروه گپ بزنید</string>
     <string name="login_splash_title">صاحب گفتگوهای خود باشید.</string>
@@ -1484,18 +1484,18 @@
     <string name="settings_discovery_please_enter_server">لطفاً نشانی کارساز هویت را وارد کنید</string>
     <string name="settings_discovery_bad_identity_server">نتوانست به کارساز هویت وصل شود</string>
     <string name="settings_discovery_enter_identity_server">یک نشانی کارساز هویت وارد کنید</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">ما یک ایمیل تأیید به %s ارسال کردیم، ابتدا ایمیل خود را بررسی کرده و روی لینک تأیید کلیک کنید</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">رایانامه‌ای به %s فرستادیم. لطفاً نخست رایانامه‌تان را بررسی کرده و روی پیوند تأیید کلیک کنید</string>
-    <string name="settings_discovery_confirm_mail">ما یک ایمیل تأیید به %s ارسال کردیم، ایمیل خود را بررسی کرده و روی لینک تأیید کلیک کنید</string>
+    <string name="settings_discovery_confirm_mail">رایانامه‌ای به %s فرستادیم. رایانامه‌تان را بررسی کرده و روی پیوند تأیید کلیک کنید</string>
     <string name="settings_discovery_disconnect_identity_server_info">قطع ارتباط با سرور هویت‌سنجی به این معنی است که توسط کاربران دیگر قابل شناسایی نخواهید بود و نمی توانید دیگران را از طریق ایمیل یا تلفن دعوت کنید.</string>
     <string name="settings_discovery_identity_server_info_none">در حال استفاده از کارساز هویتی نیستید. برای کشق و قابل کشف بودن به دست آشنایان موجودی که می‌شناسید، یک کارساز هویت در زیر پیکربندی کنید.</string>
     <string name="settings_discovery_identity_server_info">دارید برای کشف و قابل کشف بودن به دست آشنایان موجودی که می‌شناسید از %1$s استفاده می‌کنید.</string>
     <string name="settings_troubleshoot_test_token_registration_quick_fix">ثبت ژتون</string>
     <string name="push_gateway_item_format">فرمت:</string>
     <string name="push_gateway_item_url">آدرس:</string>
-    <string name="push_gateway_item_device_name">نام نشست:</string>
+    <string name="push_gateway_item_device_name">نام نمایشی نشست:</string>
-    <string name="push_gateway_item_app_display_name">نام برنامه:</string>
+    <string name="push_gateway_item_app_display_name">نام نمایشی کاره:</string>
-    <string name="push_gateway_item_push_key">کلید push:</string>
+    <string name="push_gateway_item_push_key">کلید ارسال:</string>
-    <string name="push_gateway_item_app_id">شناسه برنامه:</string>
+    <string name="push_gateway_item_app_id">شناسهٔ کاره:</string>
     <string name="settings_push_gateway_no_pushers">هیچ push gateway‌ای ثبت نشده است</string>
     <string name="settings_push_rules_no_rules">هیچ قانونی برای push تعریف نشده است</string>
     <string name="navigate_to_room_when_already_in_the_room">شما در حال مشاهده این اتاق هستید!</string>
@@ -1680,7 +1680,7 @@
     <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">عبارت رمزی که فقط خودتان می‌دانید را وارد کرده و کلیدی برای پشتیبان تولید کنید.</string>
     <string name="identity_server_set_alternative_notice">به هنوتم جایگزین، می‌توانید نشامی هر کارساز هویت دیگری را وارد کنید</string>
     <string name="identity_server_set_default_notice">کارساز خانگیتان (%1$s) پیشنهاد استفاده از %2$s برای کارساز هویتتان را می‌دهد</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">برای محرمانگیتان، المنت تنها از فرستادن شماره تلفن و رایانامه‌های کاربری در هم ریخته پشتیبانی می‌کند.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">برای محرمانگیتان، ${app_name} تنها از فرستادن شماره‌های تلفن و نشانی‌های رایانامهٔ کاربری در هم ریخته پشتیبانی می‌کند.</string>
     <string name="identity_server_error_outdated_home_server">این عملیات ممکن نیست. کارساز خانگی منقضی شده است.</string>
     <string name="invite_users_to_room_failure">نتوانستیم کاربران را دعوت کنیم. لطفاً کاربرانی که می‌خواهید دعوت کنید را بررسی کرده و دوباره تلاش کنید.</string>
     <string name="create_room_dm_failure">نتوانستیم پیامتان را ایجاد کنیم. لطفاً کاربرانی که می‌خواهید دعوت کنید را بررسی کرده و دوباره تلاش کنید.</string>
@@ -1747,7 +1747,7 @@
         <item quantity="one">دستگاهی را که می‌توانید با استفاده از آن‌ها خود را تایید کنید نشان بده</item>
         <item quantity="other">%d دستگاهی را که می‌توانید با استفاده از آن‌ها خود را تایید کنید نشان بده</item>
     </plurals>
-    <string name="settings_discovery_consent_notice_on">رضاییتان را برای فرستادن رایانامه‌ها و شماره‌تلفن‌ها به این کارساز هویت به منظور کشف دیگر کاربران از آشنایانتان، داده‌اید.</string>
+    <string name="settings_discovery_consent_notice_on">رضاییتان را برای فرستادن نشانی‌های رایانامه و شماره‌های تلفن به این کارساز هویت به منظور کشف دیگر کاربران از آشنایانتان، داده‌اید.</string>
     <string name="room_preview_not_found">در حال حاضر این اتاق قابل دسترسی نیست.
 \nبعدا دوباره تلاش کنید، یا از مدیر اتاق بخواهید بررسی کند که آیا دسترسی دارید.</string>
     <string name="room_alias_action_publish">انتشار این نشانی</string>
@@ -2141,7 +2141,7 @@
     <string name="settings_notification_mentions_and_keywords">اشاره‌ها و کلیدواژگان</string>
     <string name="settings_notification_default">آگاهی‌های پیش‌گزیده</string>
     <string name="link_this_email_with_your_account">%s در تنظیمات برای دریافت مستقیم دعوت‌ها در المنت.</string>
-    <string name="link_this_email_settings_link">این رایانامه را به حسابتان پیوند دهید</string>
+    <string name="link_this_email_settings_link">پیوند این نشانی رایانامه به حسابتان</string>
     <string name="this_invite_to_this_space_was_sent">این دعوت به این فضا به %s فرستاده شده که با حسابتان در ارتباط نیست</string>
     <string name="this_invite_to_this_room_was_sent">این دعوت به این اتاق به %s فرستاده شده که با حسابتان در ارتباط نیست</string>
     <string name="upgrade_public_room_from_to">این اتاق را از %1$s به %2$s ارتقا خواهید داد.</string>
@@ -2211,7 +2211,7 @@
     <string name="room_settings_space_access_title">دسترسی فضا</string>
     <string name="room_settings_access_rules_pref_dialog_title">چه کسی می‌تواند دسترسی داشته باشد؟</string>
     <string name="settings_notification_emails_enable_for_email">به کار انداختن آگاهی‌های رایانامه‌ای برای %s</string>
-    <string name="settings_notification_emails_no_emails">برای دریافت رایانامه با آگاهی، لطفاً رایانامه‌ای را به حساب ماتریکستان وصل کنید</string>
+    <string name="settings_notification_emails_no_emails">برای دریافت رایانامه با آگاهی، لطفاً نشانی رایانامه‌ای را به حساب ماتریکستان وصل کنید</string>
     <string name="settings_notification_emails_category">آگاهی رایانامه‌ای</string>
     <string name="room_permissions_upgrade_the_space">ارتقای فضا</string>
     <string name="room_permissions_change_space_name">تغییر نام فضا</string>
@@ -2258,13 +2258,13 @@
     <string name="create_poll_question_title">پرسش یا موضوع نظرسنجی</string>
     <string name="create_poll_title">ایجاد نظرسنجی</string>
     <string name="attachment_type_poll">نظرسنجی</string>
-    <string name="identity_server_consent_dialog_title_2">فرستادن رایانامه‌ّا و شماره‌های تلفن به %s</string>
+    <string name="identity_server_consent_dialog_title_2">فرستادن نشانی‌های رایانامه و شماره‌های تلفن به %s</string>
     <string name="settings_discovery_consent_notice_off_2">آشنایانتان خصوصی هستند. برای کشف کاربران از آشنایانتان، نیاز به اجازه‌تان برای فرستادن اطّلاعات آشنا به کارساز هویتتان داریم.</string>
     <string name="shortcut_disabled_reason_sign_out">نشست خارج شده است!</string>
     <string name="shortcut_disabled_reason_room_left">اتاق ترک شده است!</string>
     <string name="identity_server_consent_dialog_content_question">با فرستادن این اطّلاعات موافقید؟</string>
     <string name="action_not_now">اکنون نه</string>
-    <string name="identity_server_consent_dialog_content_3">برای کشف آشنایان موجود، لازم است اطلاعات آشنایان (رایانامه‌ها و شماره تلفن‌ها) را به کارساز هویتتان بفرستید. برای محرمانگیتان، داده‌هایتان را پیش از فرستادن، در هم می‌ریزیم.</string>
+    <string name="identity_server_consent_dialog_content_3">برای کشف آشنایان موجود، لازم است اطلاعات آشنایان (نشانی‌های رایانامه و شماره‌های تلفن) را به کارساز هویتتان بفرستید. برای محرمانگیتان، داده‌هایتان را پیش از فرستادن، در هم می‌ریزیم.</string>
     <string name="analytics_opt_in_content">با هم‌رسانی داده‌ّای استفادهٔ ناشناس، در تشخیص مشکل‌ها و بهبود المنت یاریمان کنید. برای درک چگونگی استفادهٔ مردم از چندین افزاره، شناسه‌ای کاتوره‌ای بین افزاره‌هایتان هم‌رسانی خواهیم کرد.
 \n
 \nمی‌توانید از %s قوانینمان را بخوانید.</string>
@@ -2600,7 +2600,6 @@
 \nشاید این کارساز خانگی برای نمایش نقشه‌ها پیکربندی نشده باشد.</string>
     <string name="a11y_open_settings">گشودن تنظیمات</string>
     <string name="all_chats">تمامی گپ‌ها</string>
-    <string name="device_manager_settings_active_sessions_show_all">نمایش تمامی نشست‌ها (ن۲، دح‌ت)</string>
     <string name="device_manager_sessions_other_description">برای امنیت بیش‌تر، نشست‌هایتان را تأیید و از هر نشستی که تشخیصش نمی‌دهید یا دیگر استفاده نمی‌کنید خارج شوید.</string>
     <string name="device_manager_sessions_other_title">دیگر نشست‌ها</string>
     <string name="settings_sessions_list">نشست‌ها</string>
@@ -2705,4 +2704,26 @@
         <item quantity="one">غیرفعّال برای ۱ روز یا بیش‌تر</item>
         <item quantity="other">غیرفعّال برای %1$d روز یا بیش‌تر</item>
     </plurals>
+    <string name="device_manager_other_sessions_description_unverified_current_session">تأیید نشده · نشست کنونیتان</string>
+    <string name="key_authenticity_not_guaranteed">اعتبار این پیام رمز شده نمی‌تواند روی این افزاره تأیید شود.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">در این اتاق، هرگز پیام‌های رمز شده به نشست‌های تأیید نشده فرستاده نشود.</string>
+    <string name="device_manager_learn_more_session_rename_title">تغییر نام نشست‌ها</string>
+    <string name="device_manager_learn_more_sessions_verified_title">نشست‌های تأییدشده</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">نشست‌های تأییدنشده</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">نشست‌های غیرفعّال</string>
+    <string name="device_manager_session_rename_warning">لطفاً آگاه باشید که نام‌های نشست برای افرادی که با آن‌ها در تماسید نیز نشان داده می‌شود.</string>
+    <string name="device_manager_session_rename_description">نام‌های نشست شخصی به نظم دادن آسان‌تر افزاره‌هایتان کمک می‌کند.</string>
+    <string name="device_manager_session_rename_edit_hint">نام نشست</string>
+    <string name="device_manager_session_rename">تغییر نام نشست</string>
+    <string name="device_manager_session_overview_signout">خروج از این نشست</string>
+    <string name="settings_security_incognito_keyboard_title">صفحه‌کلید ناشناس</string>
+    <string name="command_description_devtools">گشودن صفحهٔ ابزارهای توسعه‌دهنده</string>
+    <string name="labs_enable_deferred_dm_title">به کار انداختن پیام‌های مستقیم تعویقی</string>
+    <string name="action_got_it">گرفتم</string>
+    <string name="tooltip_attachment_voice_broadcast">آغاز یک پخش همگانی صوتی</string>
+    <string name="command_description_table_flip">(╯°□°）╯︵ ┻━┻ را به ابتدای پیام متنی خام می‌افزاید</string>
+    <string name="attachment_type_voice_broadcast">پخش همگانی صدا</string>
+    <string name="grant_permission">اعطای دسترسی</string>
+    <string name="labs_enable_rich_text_editor_summary">ویرایشگر متن غنی را بیازمایید (حالت متن خام به زودی)</string>
+    <string name="labs_enable_rich_text_editor_title">به کار انداختن ویرایشگر متن غنی</string>
 </resources>

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

@@ -869,10 +869,10 @@
     <string name="settings_push_rules">Règles de notification</string>
     <string name="settings_push_rules_no_rules">Aucune règle de notification définie</string>
     <string name="settings_push_gateway_no_pushers">Aucune passerelle de notification enregistrée</string>
-    <string name="push_gateway_item_app_id">app_id :</string>
+    <string name="push_gateway_item_app_id">App ID :</string>
-    <string name="push_gateway_item_push_key">push_key :</string>
+    <string name="push_gateway_item_push_key">Clé Push :</string>
-    <string name="push_gateway_item_app_display_name">app_display_name :</string>
+    <string name="push_gateway_item_app_display_name">Nom d’affichage de l’application :</string>
-    <string name="push_gateway_item_device_name">session_name :</string>
+    <string name="push_gateway_item_device_name">Nom d’affichage de la session :</string>
     <string name="push_gateway_item_url">URL :</string>
     <string name="push_gateway_item_format">Format :</string>
     <string name="preference_voice_and_video">Voix et vidéo</string>
@@ -934,11 +934,11 @@
     <string name="settings_discovery_identity_server_info">Vous utilisez actuellement %1$s pour découvrir et être découvrable par les contacts existants que vous connaissez.</string>
     <string name="settings_discovery_identity_server_info_none">Vous n’utilisez actuellement aucun serveur d’identité. Pour découvrir et être découvrable par les contacts existants que vous connaissez, configurez-en un ci-dessous.</string>
     <string name="settings_discovery_emails_title">Adresses électronique découvrables</string>
-    <string name="settings_discovery_no_mails">Les options de découverte apparaîtront quand vous aurez ajouté un courriel.</string>
+    <string name="settings_discovery_no_mails">Les options de découverte apparaîtront quand vous aurez ajouté une adresse courriel.</string>
     <string name="settings_discovery_no_msisdn">Les options de découverte apparaîtront quand vous aurez ajouté un numéro de téléphone.</string>
     <string name="settings_discovery_disconnect_identity_server_info">La déconnexion du serveur d’identité signifie que vous ne pourrez plus être découvrable par les autres utilisateurs et que vous ne pourrez plus inviter d’autres personnes par courriel ou par téléphone.</string>
     <string name="settings_discovery_msisdn_title">Numéros de téléphone découvrables</string>
-    <string name="settings_discovery_confirm_mail">Nous vous avons envoyé un courriel de confirmation à %s, consultez vos courriels et cliquez sur le lien de confirmation</string>
+    <string name="settings_discovery_confirm_mail">Nous vous avons envoyé un courriel à %s, consultez vos courriels et cliquez sur le lien de confirmation</string>
     <string name="settings_discovery_enter_identity_server">Renseignez l’URL d’un serveur d’identité</string>
     <string name="settings_discovery_bad_identity_server">Impossible de se connecter au serveur d’identité</string>
     <string name="settings_discovery_please_enter_server">Veuillez renseigner l’URL du serveur d’identité</string>
@@ -1066,7 +1066,7 @@
     <string name="login_registration_not_supported">L’application ne peut pas créer de compte sur ce serveur d’accueil.
 \n
 \nVoulez-vous vous inscrire en utilisant un client web \?</string>
-    <string name="login_login_with_email_error">Ce courriel n’est associé à aucun compte.</string>
+    <string name="login_login_with_email_error">Cette adresse de courriel n’est associée à aucun compte.</string>
     <string name="login_reset_password_on">Réinitialiser le mot de passe sur %1$s</string>
     <string name="login_reset_password_notice">Un courriel de vérification sera envoyé à votre adresse pour confirmer la configuration de votre nouveau mot de passe.</string>
     <string name="login_reset_password_submit">Suivant</string>
@@ -1075,7 +1075,7 @@
     <string name="login_reset_password_warning_title">Attention !</string>
     <string name="login_reset_password_warning_content">Le changement de mot de passe réinitialisera toutes les clés de chiffrement sur toutes vos sessions, rendant l’historique des discussions chiffrées illisible. Configurez la sauvegarde de clés ou exportez vos clés de salon depuis une autre session avant de réinitialiser votre mot de passe.</string>
     <string name="login_reset_password_warning_submit">Poursuivre</string>
-    <string name="login_reset_password_error_not_found">Ce courriel n’est lié à aucun compte</string>
+    <string name="login_reset_password_error_not_found">Ce adresse de courriel n’est liée à aucun compte</string>
     <string name="login_reset_password_mail_confirmation_title">Vérifiez votre boîte de réception</string>
     <string name="login_reset_password_mail_confirmation_notice">Un courriel de vérification a été envoyé à %1$s.</string>
     <string name="login_reset_password_mail_confirmation_notice_2">Touchez le lien pour confirmer votre nouveau mot de passe. Après avoir suivi le lien qu’il contient, cliquez ci-dessous.</string>
@@ -1089,7 +1089,7 @@
 \n
 \nArrêter le processus de changement \?</string>
     <string name="login_set_email_title">Définir l’adresse électronique</string>
-    <string name="login_set_email_notice">Définir une adresse électronique pour récupérer votre compte. Plus tard, vous pourrez éventuellement autoriser des personnes à vous retrouver avec votre adresse électronique.</string>
+    <string name="login_set_email_notice">Définir une adresse de courriel pour récupérer votre compte. Plus tard, vous pourrez éventuellement autoriser des personnes à vous retrouver avec cette adresse.</string>
     <string name="login_set_email_mandatory_hint">Courriel</string>
     <string name="login_set_email_optional_hint">Courriel (facultatif)</string>
     <string name="login_set_email_submit">Suivant</string>
@@ -1432,7 +1432,7 @@
     <string name="event_redacted">Message supprimé</string>
     <string name="settings_show_redacted">Afficher les messages supprimés</string>
     <string name="settings_show_redacted_summary">Afficher un remplaçant pour les messages supprimés</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Nous vous avons envoyé un courriel de confirmation à %s, consultez vos courriels et cliquez sur le lien de confirmation</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Nous vous avons envoyé un courriel à %s, consultez vos courriels et cliquez sur le lien de confirmation</string>
     <string name="settings_text_message_sent_wrong_code">Le code de vérification n’est pas correct.</string>
     <string name="uploads_media_title">MÉDIA</string>
     <string name="uploads_media_no_result">Il n’y a aucun média dans ce salon</string>
@@ -1455,7 +1455,7 @@
     <string name="identity_server_error_outdated_home_server">Cette opération n’est pas possible. Le serveur d’accueil est obsolète.</string>
     <string name="identity_server_error_no_identity_server_configured">Veuillez d’abord configurer un serveur d’identité.</string>
     <string name="identity_server_error_terms_not_signed">Veuillez d’abord accepter les termes du serveur d’identité dans les paramètres.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Pour votre vie privée, ${app_name} prend uniquement en charge l’envoi des adresses électronique et des numéros de téléphone hachés.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Pour votre vie privée, ${app_name} prend uniquement en charge l’envoi des adresses de courriel et des numéros de téléphone hachés.</string>
     <string name="identity_server_error_binding_error">L’association a échoué.</string>
     <string name="identity_server_error_no_current_binding_error">Il n’y a actuellement aucune association avec cet identifiant.</string>
     <string name="identity_server_set_default_notice">Votre serveur d’accueil (%1$s) propose d’utiliser %2$s comme serveur d’identité</string>
@@ -1669,7 +1669,7 @@
     <string name="error_threepid_auth_failed">Assurez-vous d\'avoir cliqué sur le lien envoyé par courriel.</string>
     <string name="settings_remove_three_pid_confirmation_content">Supprimer %s \?</string>
     <string name="settings_phone_numbers">Numéros de téléphone</string>
-    <string name="settings_emails_empty">Aucune adresse électronique n’a été ajoutée à votre compte</string>
+    <string name="settings_emails_empty">Aucune adresse de courriel n’a été ajoutée à votre compte</string>
     <string name="settings_emails">Adresses électroniques</string>
     <string name="settings_phone_number_empty">Aucun numéro de téléphone n’a été ajouté à votre compte</string>
     <string name="search_banned_user_hint">Filtrer les utilisateurs exclus</string>
@@ -1734,7 +1734,7 @@
     <string name="attachment_viewer_item_x_of_y">%1$d de %2$d</string>
     <string name="settings_discovery_consent_action_give_consent">Autoriser</string>
     <string name="settings_discovery_consent_action_revoke">Révoquer mon autorisation</string>
-    <string name="settings_discovery_consent_notice_on">Vous avez donné votre autorisation pour envoyer des courriels et des numéros de téléphone à ce serveur d’identité pour découvrir d\'autres utilisateurs à partir de vos contacts.</string>
+    <string name="settings_discovery_consent_notice_on">Vous avez donné votre autorisation pour envoyer des adresses de courriel et des numéros de téléphone à ce serveur d’identité pour découvrir d\'autres utilisateurs à partir de vos contacts.</string>
     <string name="settings_discovery_consent_title">Envoyer des courriels et des numéros de téléphone</string>
     <string name="direct_room_user_list_suggestions_title">Suggestions</string>
     <string name="direct_room_user_list_known_title">Utilisateurs connus</string>
@@ -2142,7 +2142,7 @@
     <string name="settings_notification_mentions_and_keywords">Mentions et mots-clés</string>
     <string name="settings_notification_default">Notifications par défaut</string>
     <string name="link_this_email_with_your_account">%s dans les paramètres pour recevoir les invitations directement dans ${app_name}.</string>
-    <string name="link_this_email_settings_link">Lier ce courriel à votre compte</string>
+    <string name="link_this_email_settings_link">Lier cette adresse de courriel à votre compte</string>
     <string name="this_invite_to_this_space_was_sent">Cette invitation à cette espace a été envoyée à %s qui n’est pas associé à votre compte</string>
     <string name="this_invite_to_this_room_was_sent">Cette invitation à ce salon a été envoyée à %s qui n’est pas associé à votre compte</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">Tous les salons dans lesquels vous vous trouvez seront affichés sur l’Accueil.</string>
@@ -2258,7 +2258,7 @@
     <string name="create_poll_question_title">Question ou sujet du sondage</string>
     <string name="create_poll_title">Créer un sondage</string>
     <string name="attachment_type_poll">Sondage</string>
-    <string name="identity_server_consent_dialog_title_2">Envoyer des courriels et des numéros de téléphone à %s</string>
+    <string name="identity_server_consent_dialog_title_2">Envoyer des adresses de courriel et des numéros de téléphone à %s</string>
     <string name="settings_discovery_consent_notice_off_2">Vos contacts sont personnels et privés. Pour découvrir des utilisateurs à partir de vos contacts, nous avons besoin de votre permission pour envoyer les informations des contacts à votre serveur d’identité.</string>
     <string name="shortcut_disabled_reason_sign_out">La session a été déconnectée !</string>
     <string name="shortcut_disabled_reason_room_left">Le salon a été quitté !</string>
@@ -2600,7 +2600,6 @@
 \nCe serveur d’accueil n’a peut-être pas été configuré pour afficher les cartes.</string>
     <string name="a11y_open_settings">Ouvrir les paramètres</string>
     <string name="all_chats">Toutes les conversations</string>
-    <string name="device_manager_settings_active_sessions_show_all">Afficher toutes les sessions (V2, en cours)</string>
     <string name="device_manager_sessions_other_description">Pour une meilleure sécurité, vérifiez vos sessions et déconnectez toutes les sessions que vous ne connaissez pas ou que vous n’utilisez plus.</string>
     <string name="device_manager_sessions_other_title">Autres sessions</string>
     <string name="settings_sessions_list">Sessions</string>
@@ -2710,4 +2709,67 @@
     <string name="labs_enable_deferred_dm_title">Activer les conversations privées différées</string>
     <string name="labs_enable_new_app_layout_summary">Un SchildiChat simplifié avec des onglets optionnels</string>
     <string name="labs_enable_new_app_layout_title">Activer la nouvelle présentation</string>
+    <string name="device_manager_learn_more_session_rename">Les autres utilisateurs en conversations privées ou salons qui peuvent vous parler sont capables de voir la liste complète de vos sessions.
+\n
+\nCela leur fournit une preuve de confiance que c’est bien avec vous qu\'ils communiquent, mais cela veut également dire qu’ils peuvent voir le nom de la session que vous saisissez ici.</string>
+    <string name="device_manager_learn_more_session_rename_title">Renommer les sessions</string>
+    <string name="device_manager_learn_more_sessions_verified">Les sessions vérifiées sont celles qui sont identifiées avec votre mot de passe puis vérifiée, soit à l’aide de votre phrase de sécurité, ou bien par la vérification croisée.
+\n
+\nCela signifie qu’elles possèdent les clés de chiffrement de vos messages passés, et certifient aux autres utilisateurs avec qui vous communiquez que ces sessions viennent vraiment de vous.</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Sessions vérifiées</string>
+    <string name="device_manager_learn_more_sessions_unverified">Les sessions non vérifiées sont celles qui sont identifiées avec votre mot de passe sans avoir fait de vérification croisée.
+\n
+\nVous devriez tout particulièrement vous assurer de reconnaître ces sessions, car elles pourraient être la preuve d’un usage non autorisé de votre compte.</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Sessions non vérifiées</string>
+    <string name="device_manager_learn_more_sessions_inactive">Les sessions inactives sont celles que vous n’avez pas utilisées depuis un certain temps, mais qui continue de recevoir les clés de chiffrements.
+\n
+\nLa suppression des sessions inactives améliore la sécurité et la performance, et vous aide à identifier si une nouvelle session est douteuse.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Sessions inactives</string>
+    <string name="device_manager_session_rename_warning">Soyez conscient que les noms de sessions sont également visibles pour les personnes avec lesquelles vous communiquez.</string>
+    <string name="device_manager_session_rename_description">Les noms de sessions personnalisés peuvent vous aider à reconnaître vos appareils plus facilement.</string>
+    <string name="device_manager_session_rename_edit_hint">Nom de la session</string>
+    <string name="device_manager_session_rename">Renommer la session</string>
+    <string name="device_manager_session_overview_signout">Se déconnecter de cette session</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Non vérifiée · Votre session actuelle</string>
+    <string name="tooltip_attachment_voice_broadcast">Démarrer une diffusion audio</string>
+    <string name="key_authenticity_not_guaranteed">L’authenticité de ce message chiffré ne peut pas être garantie sur cet appareil.</string>
+    <string name="settings_security_incognito_keyboard_summary">Demande au clavier de ne pas mettre à jour les données personnalisées, comme l’historique de la frappe et le dictionnaire composé de ce que vous avez tapé dans vos conversations. Il est possible que certains claviers ne respectent pas ce paramètre.</string>
+    <string name="settings_security_incognito_keyboard_title">Clavier incognito</string>
+    <string name="command_description_table_flip">Préfixe le message par (╯°□°）╯︵ ┻━┻</string>
+    <string name="attachment_type_voice_broadcast">Diffusion audio</string>
+    <string name="command_description_devtools">Ouvrir l’écran des outils développeurs</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Vous avez activé le chiffrement vers les sessions vérifiées uniquement, pour tous les salons, dans les paramètres Sécurité.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ Il y a des appareils non vérifiés dans ce salon, ils ne pourront pas déchiffrer vos messages envoyés.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Ne jamais envoyer de messages chiffrés aux sessions non vérifiées dans ce salon.</string>
+    <string name="action_got_it">Compris</string>
+    <string name="rich_text_editor_format_underline">Souligner le texte</string>
+    <string name="rich_text_editor_format_strikethrough">Barrer le texte</string>
+    <string name="rich_text_editor_format_italic">Mettre en italique</string>
+    <string name="rich_text_editor_format_bold">Mettre en gras</string>
+    <string name="labs_enable_client_info_recording_summary">Enregistre le nom du client, sa version, et son URL pour retrouvez vos sessions plus facilement dans le gestionnaire de sessions.</string>
+    <string name="labs_enable_client_info_recording_title">Activer l’enregistrement des informations du client</string>
+    <string name="labs_enable_session_manager_summary">Ayez une meilleur visibilité et plus de contrôle sur toutes vos sessions.</string>
+    <string name="labs_enable_session_manager_title">Activer le nouveau gestionnaire de session</string>
+    <string name="device_manager_session_details_device_operating_system">Système d’exploitation</string>
+    <string name="device_manager_session_details_device_model">Modèle</string>
+    <string name="device_manager_session_details_device_browser">Navigateur</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">Version</string>
+    <string name="device_manager_session_details_application_name">Nom</string>
+    <string name="device_manager_session_details_application">Application</string>
+    <string name="device_manager_push_notifications_description">Recevoir les notifications push sur cette session.</string>
+    <string name="device_manager_push_notifications_title">Notifications push</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Vérifiez votre session actuelle pour découvrir le statut de vérification de cette session.</string>
+    <string name="device_manager_verification_status_unknown">Status de vérification inconnu</string>
+    <string name="push_gateway_item_enabled">Activer :</string>
+    <string name="push_gateway_item_device_id">Identifiant de session :</string>
+    <string name="error_check_network">Quelque chose s’est mal passé. Vérifiez votre connexion réseau et réessayez.</string>
+    <string name="grant_permission">Accorder la permission</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} a besoin d’une permission pour afficher les notifications.
+\nVeuillez accorder la permission.</string>
+    <string name="permissions_rationale_msg_notification">${app_name} a besoin de la permission pour afficher les notifications. Les notifications peuvent afficher vos messages, vos invitations, etc.
+\n
+\nVeuillez autoriser l’accès sur la prochaine fenêtre pour pouvoir voir des notifications.</string>
+    <string name="labs_enable_rich_text_editor_summary">Essayer l’éditeur de texte formaté (le mode texte brut arrive bientôt)</string>
+    <string name="labs_enable_rich_text_editor_title">Activer l’éditeur de texte formaté</string>
 </resources>

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

@@ -569,7 +569,7 @@ Matrixban az üzenetek láthatósága hasonlít az e-mailre. Az üzenet törlés
     <string name="settings_troubleshoot_diagnostic_success_status">Alapszintű diagnosztika nem talált hibát. Ha még mindig nem kapsz értesítéseket, kérlek küldj egy hiba jegyet amivel segítheted a hibakeresésünket.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Egy vagy több teszt is sikertelen volt, próbáld ki a javasolt javítást, javításokat.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Egy vagy több teszt sikertelenül végződött, kérlek küldj egy hibabejelentést ami segít nekünk a problémát kivizsgálni.</string>
-    <string name="settings_troubleshoot_test_system_settings_title">Rendszer beállítások.</string>
+    <string name="settings_troubleshoot_test_system_settings_title">Rendszerbeállítások.</string>
     <string name="settings_troubleshoot_test_system_settings_success">Az értesítések engedélyezve vannak a rendszerbeállításokban.</string>
     <string name="settings_troubleshoot_test_system_settings_failed">Az értesítések tiltva vannak a rendszerbeállításokban.
 Kérlek ellenőrizd a rendszerbeállításokat.</string>
@@ -582,7 +582,7 @@ Kérlek ellenőrizd a fiókbeállításokat.</string>
     <string name="settings_troubleshoot_test_device_settings_title">Munkamenet beállítások.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Az értesítések engedélyezve vannak ezen az munkameneten.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Az értesítések tiltva vannak ezen a munkameneten. Kérlek ellenőrizd a ${app_name} beállításokat.</string>
-    <string name="settings_troubleshoot_test_device_settings_quickfix">Engedélyez</string>
+    <string name="settings_troubleshoot_test_device_settings_quickfix">Engedélyezés</string>
     <string name="settings_troubleshoot_test_play_services_title">Play Szolgáltatások ellenőrzése</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK elérhető és a legújabb verziójú.</string>
     <string name="settings_troubleshoot_test_play_services_failed">"${app_name} a Google Play Services-t használja  a „push” értesítések fogadásához, de úgy tűnik az nincs megfelelően beállítva:
@@ -824,18 +824,18 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="navigate_to_room_when_already_in_the_room">Már nézed ezt a szobát!</string>
     <string name="settings_general_title">Általános</string>
     <string name="settings_preferences">Beállítások</string>
-    <string name="settings_security_and_privacy">Biztonság &amp; Adatvédelem</string>
+    <string name="settings_security_and_privacy">Biztonság és adatvédelem</string>
     <string name="settings_push_rules">„Push” szabályok</string>
     <string name="settings_push_rules_no_rules">„Push” szabályok nincsenek</string>
     <string name="settings_push_gateway_no_pushers">„Push” átjárók nincsenek regisztrálva</string>
-    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="push_gateway_item_app_id">Alk azon:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
+    <string name="push_gateway_item_push_key">Push kulcs:</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
+    <string name="push_gateway_item_app_display_name">Alk. képernyő név:</string>
-    <string name="push_gateway_item_device_name">session_name:</string>
+    <string name="push_gateway_item_device_name">Munkamenet képernyő név:</string>
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Formátum:</string>
-    <string name="preference_voice_and_video">Hang &amp; Videó</string>
+    <string name="preference_voice_and_video">Hang és videó</string>
-    <string name="preference_root_help_about">Segítség &amp; Névjegy</string>
+    <string name="preference_root_help_about">Súgó és névjegy</string>
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Token regisztrálása</string>
     <string name="send_suggestion">Javaslat tétel</string>
     <string name="send_suggestion_content">A javaslatodat kérlek ír le alulra.</string>
@@ -897,7 +897,7 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="settings_discovery_no_msisdn">Amint hozzáadtál egy telefonszámot megjelenik a felderítési beállítási lehetőség.</string>
     <string name="settings_discovery_disconnect_identity_server_info">Az azonosítási szerverről való lecsatlakozással nem leszel mások által megtalálható és másokat sem tudsz meghívni e-mail címmel vagy telefonszámmal.</string>
     <string name="settings_discovery_msisdn_title">Felderíthető telefonszámok</string>
-    <string name="settings_discovery_confirm_mail">Megerősítő levelet küldtünk ide: %s, ellenőrizd az e-mailedet és kattints a megerősítő hivatkozásra</string>
+    <string name="settings_discovery_confirm_mail">E-mailt küldtünk ide: %s, ellenőrizd és kattints a megerősítő hivatkozásra</string>
     <string name="settings_discovery_enter_identity_server">Add meg az azonosítási szerver URL-jét</string>
     <string name="settings_discovery_bad_identity_server">Az azonosítási szerverhez nem lehet csatlakozni</string>
     <string name="settings_discovery_please_enter_server">Kérlek add meg az azonosítási szerver url-jét</string>
@@ -1391,7 +1391,7 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="invite_users_to_room_failure">Felhasználókat nem tudtuk meghívni. Ellenőrizd azokat a felhasználókat akiket meg szeretnél hívni és próbáld újra.</string>
     <string name="event_redacted">Üzenet eltávolítva</string>
     <string name="settings_show_redacted_summary">Helykitöltő mutatása a törölt szövegek helyett</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Megerősítő levelet küldtünk ide: %s, először ellenőrizd az e-mailedet és kattints a megerősítő hivatkozásra</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">E-mailt küldtünk ide: %s, először ellenőrizd és kattints a megerősítő hivatkozásra</string>
     <string name="uploads_media_title">MÉDIA</string>
     <string name="uploads_files_title">FÁJLOK</string>
     <string name="uploads_files_subtitle">%1$s itt: %2$s</string>
@@ -2611,7 +2611,6 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="a11y_device_manager_device_type_desktop">Asztali</string>
     <string name="a11y_device_manager_device_type_web">Web</string>
     <string name="a11y_device_manager_device_type_mobile">Mobil</string>
-    <string name="device_manager_settings_active_sessions_show_all">Minden munkamenet megjelenítése (V2, WIP)</string>
     <string name="device_manager_sessions_other_description">A legjobb biztonság érdekében ellenőrizd a munkameneteket, és jelentkezz ki minden olyan munkamenetből, melyet már nem ismersz fel vagy nem használsz.</string>
     <string name="device_manager_sessions_other_title">Más munkamenetek</string>
     <string name="settings_sessions_list">Munkamenetek</string>
@@ -2710,4 +2709,100 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="labs_enable_deferred_dm_title">Késleltetett közvetlen üzenetek engedélyezése</string>
     <string name="labs_enable_new_app_layout_summary">Egyszerűsített SchildiChat opcionálisan lapokkal</string>
     <string name="labs_enable_new_app_layout_title">Új kinézet engedélyezése</string>
+    <string name="device_manager_learn_more_session_rename">Más felhasználók akikkel közvetlenül vagy szobában beszélgetsz látják a teljes listát a munkameneteidről.
+\n
+\nEzzel ők biztosak lehetnek abban, hogy ténylegesen veled beszélgetnek. Ez azt is jelenti, hogy látják a munkamenet nevét amit itt megadsz.</string>
+    <string name="device_manager_learn_more_sessions_verified">Ellenőrzött munkamenetbe a neveddel és jelszavaddal léptek be és ellenőrizve lett vagy a biztonsági jelmondattal vagy másik munkamenetből.
+\n
+\nEz azt jelenti, hogy tartalmazzák a titkosítási kulcsokat az régi üzenetekhez, és biztosítja a többieket a kommunikációban, hogy ezt a munkamenetet tényleg te használod.</string>
+    <string name="rich_text_editor_format_underline">Aláhúzott</string>
+    <string name="rich_text_editor_format_strikethrough">Áthúzott</string>
+    <string name="rich_text_editor_format_italic">Dőlt</string>
+    <string name="rich_text_editor_format_bold">Félkövér</string>
+    <string name="labs_enable_client_info_recording_summary">Kliens neve, verziója és url felvétele a munkamenet könnyebb azonosításához a munkamenet kezelőben.</string>
+    <string name="labs_enable_client_info_recording_title">Kliens információ felvételének engedélyezése</string>
+    <string name="labs_enable_session_manager_summary">Jobb áttekintés és felügyelet a munkamenetek felett.</string>
+    <string name="labs_enable_session_manager_title">Új munkamenet kezelő engedélyezése</string>
+    <string name="device_manager_learn_more_session_rename_title">Munkamenet átnevezése</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Hitelesített munkamenetek</string>
+    <string name="device_manager_learn_more_sessions_unverified">Az ellenőrizetlen munkamenetek azok amikre a felhasználói neveddel és jelszavaddal léptek be de nem lett ellenőrizve.
+\n
+\nMindenképpen győződj meg arról, hogy felismered ezeket a munkameneteket mert lehet, hogy illetéktelenül használják a fiókodat.</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Ellenőrizetlen munkamenetek</string>
+    <string name="device_manager_learn_more_sessions_inactive">Az inaktív munkamenetek azok amiket egy ideje nem használtál, de továbbra is megkapják a titkosítási kulcsokat.
+\n
+\nA nem aktív munkamenetek törlésével növelhető a biztonság és a sebesség valamint könnyebb lesz felismerni a gyanús munkameneteket.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Nem aktív munkamenetek</string>
+    <string name="device_manager_session_rename_warning">Fontos, hogy a munkamenet neve a kommunikációban résztvevők számára látható.</string>
+    <string name="device_manager_session_rename_description">Az egyedi munkamenet név segíthet az eszköz könnyebb felismerésében.</string>
+    <string name="device_manager_session_rename_edit_hint">Munkamenet neve</string>
+    <string name="device_manager_session_rename">Munkamenet átnevezése</string>
+    <string name="device_manager_session_details_device_operating_system">Operációs rendszer</string>
+    <string name="device_manager_session_details_device_model">Modell</string>
+    <string name="device_manager_session_details_device_browser">Böngésző</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">Verzió</string>
+    <string name="device_manager_session_details_application_name">Név</string>
+    <string name="device_manager_session_details_application">Alkalmazás</string>
+    <string name="device_manager_push_notifications_description">Push értesítések fogadása ebben a munkamenetben.</string>
+    <string name="device_manager_push_notifications_title">Push értesítések</string>
+    <string name="device_manager_session_overview_signout">Kijelentkezés ebből a munkamenetből</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Ellenőrizetlen · A jelenlegi munkameneted</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Ellenőrizd a jelenlegi munkamenetedet, hogy ismert állapotba kerüljön.</string>
+    <string name="device_manager_verification_status_unknown">Ismeretlen ellenőrzési státusz</string>
+    <string name="tooltip_attachment_voice_broadcast">Hang közvetítés indítása</string>
+    <string name="key_authenticity_not_guaranteed">A titkosított üzenetek valódiságát ezen az eszközön nem lehet garantálni.</string>
+    <string name="settings_security_incognito_keyboard_summary">Utasítja a billentyűzetet, hogy ne mentsen személyre szabott adatokat, mint előzmények vagy szótár abból amit a beszélgetésekben írsz. Vedd figyelembe, hogy nem minden billentyűzet veszi ezt figyelembe.</string>
+    <string name="settings_security_incognito_keyboard_title">Inkognitó billentyűzet</string>
+    <string name="command_description_table_flip">(╯°□°）╯︵ ┻━┻ -t tesz a szöveg elejére</string>
+    <string name="attachment_type_voice_broadcast">Hang közvetítés</string>
+    <string name="push_gateway_item_enabled">Engedélyezve:</string>
+    <string name="push_gateway_item_device_id">Munkamenet azon.:</string>
+    <string name="error_check_network">Valami nem sikerült. Kérlek ellenőrizd a hálózati kapcsolatot és próbáld újra.</string>
+    <string name="command_description_devtools">A fejlesztői eszközök képernyő megnyitása</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Bekapcsoltad a Biztonsági beállításoknál, hogy csak ellenőrzött munkamenetek számára legyen titkosítva az üzenet bármely szobában.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ Ellenőrizetlen eszközök vannak a szobában, ezek nem fogják tudni visszafejteni az általad küldött üzeneteket.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Sose küldj titkosított üzenetet ellenőrizetlen munkamenetbe ebből a munkamenetből ebben a szobában.</string>
+    <string name="grant_permission">Engedély megadása</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} alkalmazásnak értesítések megjelenítéséhez engedélyre van szüksége.
+\nKérjük, adj rá engedélyt.</string>
+    <string name="permissions_rationale_msg_notification">${app_name} alkalmazásnak szüksége van engedélyre az értesítések megjelenítéséhez. Az értesítés megjelenítheti az üzenetet, meghívót, stb.
+\n
+\nA következő felugró ablakban adj rá engedélyt, hogy az értesítések megjelenhessenek.</string>
+    <string name="labs_enable_rich_text_editor_summary">Próbálja ki az új szövegbevitelt (hamarosan érkezik a sima szöveges üzemmód)</string>
+    <string name="labs_enable_rich_text_editor_title">Vizuális szerkesztő engedélyezése</string>
+    <string name="action_got_it">Értem</string>
+    <string name="qr_code_login_status_no_match">Nem egyezik\?</string>
+    <string name="qr_code_login_signing_in">Bejelentkeztetés</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Mobil eszközzel jelentkezel be\?</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Kezd a bejelentkező képernyőn</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Kezd a bejelentkező képernyőn</string>
+    <string name="qr_code_login_header_connected_description">Nézd meg a már bejelentkezett eszközödet, az alábbi kódot kell megjelenítenie. Erősítsd meg, hogy az alábbi kód megegyezik a másik eszközön láthatóval:</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Használd a már belépett eszközt az alábbi QR kód beolvasásához:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Ezzel az eszközzel, QR kód segítségével, bejelentkezhetsz mobil és webes munkamenetbe. Két lehetőséged is van:</string>
+    <string name="qr_code_login_confirm_security_code_description">Győződj meg a kód eredetéről. Az eszközök összekötésével esetleg valakinek teljes hozzáférést adhatsz a fiókodhoz.</string>
+    <string name="qr_code_login_confirm_security_code">Megerősítés</string>
+    <string name="qr_code_login_try_again">Próbáld újra</string>
+    <string name="qr_code_login_connecting_to_device">Csatlakozás az eszközhöz</string>
+    <string name="qr_code_login_scan_qr_code_button">QR kód beolvasása</string>
+    <string name="qr_code_login_show_qr_code_button">QR kód megjelenítése ezen az eszközön</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Válaszd ezt: „QR kód beolvasása”</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Válaszd ezt: „Belépés QR kóddal”</string>
+    <string name="qr_code_login_new_device_instruction_3">Válaszd ezt: „QR kód megjelenítése ezen az eszközön”</string>
+    <string name="qr_code_login_new_device_instruction_2">Menj a Beállítások -&gt; Biztonság és Adatvédelem -&gt; Minden munkamenet megjelenítése menübe</string>
+    <string name="qr_code_login_new_device_instruction_1">Nyisd meg a(z) ${app_name} alkalmazást a másik eszközön</string>
+    <string name="qr_code_login_header_failed_denied_description">A kérést elutasították a másik eszközön.</string>
+    <string name="qr_code_login_header_failed_timeout_description">Az összekötés az elvárt időn belül nem fejeződött be.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Összekötés ezzel az eszközzel nem támogatott.</string>
+    <string name="qr_code_login_header_failed_title">Kapcsolat sikertelen</string>
+    <string name="qr_code_login_header_connected_title">Biztonságos kapcsolat beállítva</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">A kijelentkezett eszközzel olvasd be a QR kódot alább.</string>
+    <string name="qr_code_login_header_show_qr_code_title">Belépés QR kóddal</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Használd a kamerát ezen az eszközön a másik eszközödön megjelenő QR kód beolvasására:</string>
+    <string name="qr_code_login_header_scan_qr_code_title">QR kód beolvasása</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Belépés QR kóddal</string>
+    <string name="login_scan_qr_code">QR kód beolvasása</string>
 </resources>

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

@@ -95,7 +95,7 @@
     <string name="auth_invalid_login_param">Nama pengguna dan/atau kata sandi salah</string>
     <string name="auth_reset_password_error_unauthorized">Verifikasi alamat email gagal: pastikan tautan yang termuat di email telah diklik</string>
     <string name="login_error_bad_json">JSON amburadul</string>
-    <string name="login_error_not_json">Tidak berisi JSON yang sah</string>
+    <string name="login_error_not_json">Tidak berisi JSON yang absah</string>
     <string name="login_error_limit_exceeded">Pengajuan yang dikirimkan terlalu banyak</string>
     <string name="incoming_video_call">Panggilan Video Masuk</string>
     <string name="incoming_voice_call">Panggilan Suara Masuk</string>
@@ -183,8 +183,8 @@
     <string name="settings_app_info_link_summary">Tampilkan info aplikasi dalam pengaturan sistem.</string>
     <string name="settings_app_info_link_title">Info aplikasi</string>
     <string name="settings_notification_ringtone">Suara pemberitahuan</string>
-    <string name="settings_enable_all_notif">Perbolehkan pemberitahuan untuk akun ini</string>
+    <string name="settings_enable_all_notif">Aktifkan pemberitahuan untuk akun ini</string>
-    <string name="settings_enable_this_device">Perbolehkan pemberitahuan untuk perangkat ini</string>
+    <string name="settings_enable_this_device">Aktifkan pemberitahuan untuk sesi ini</string>
     <string name="settings_containing_my_display_name">Pesan yang berisikan nama layarku</string>
     <string name="settings_containing_my_user_name">Pesan berisikan nama layarku</string>
     <string name="settings_messages_in_one_to_one">Pesan percakapan empat mata</string>
@@ -216,7 +216,7 @@
     <string name="widget_integration_missing_user_id">Tidak ada user_id dalam permohonan.</string>
     <string name="widget_integration_room_not_visible">Ruang %s tidak terlihat.</string>
     <string name="widget_integration_missing_parameter">Ada parameter penting yang hilang.</string>
-    <string name="room_add_matrix_apps">Tambahkan apps Matrix</string>
+    <string name="room_add_matrix_apps">Tambahkan aplikasi Matrix</string>
     <string name="settings_labs_native_camera">Gunakan kamera bawaan</string>
     <string name="you_added_a_new_device">Anda menambahkan perangkat baru \'%s\', yang sedang meminta kunci enkripsi.</string>
     <string name="your_unverified_device_requesting">Perangkat Anda yang belum terverifikasi \'%s\' sedang meminta kunci enkripsi.</string>
@@ -234,7 +234,7 @@
     <string name="command_description_remove_user">Keluarkan pengguna dengan id berikut</string>
     <string name="command_description_nick">Ubah nama panggilan layar Anda</string>
     <string name="command_description_markdown">Mati/Nyalakan markdown</string>
-    <string name="command_description_clear_scalar_token">Untuk memperbaiki kepengurusan Apps Matrix</string>
+    <string name="command_description_clear_scalar_token">Untuk memperbaiki kepengurusan Aplikasi Matrix</string>
     <string name="notification_off">Mati</string>
     <string name="notification_noisy">Berisik</string>
     <string name="encrypted_message">Pesan terenkripsi</string>
@@ -394,7 +394,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
 \nMohon periksa pengaturan akun anda.</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Perbolehkan</string>
     <string name="settings_troubleshoot_test_device_settings_title">Pengaturan Perangkat.</string>
-    <string name="settings_troubleshoot_test_device_settings_success">Pemberitahuan diperbolehkan untuk perangkat ini.</string>
+    <string name="settings_troubleshoot_test_device_settings_success">Pemberitahuan diperbolehkan untuk sesi ini.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Notifikasi tidak diaktifkan pada sesi ini.
 \nMohon periksa pengaturan ${app_name}.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Perbolehkan</string>
@@ -414,7 +414,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
 \n%1$s</string>
     <string name="settings_troubleshoot_test_service_boot_title">Mulai ketika menyalakan perangkat</string>
     <string name="settings_troubleshoot_test_service_boot_success">Layanan akan dimulai ketika perangkat dinyalakan kembali.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Layanan tidak akan mulai ketika perangkat dinyalakan kembali, Anda tidak akan menerima pemberitahuan hingga Anda membuka ${app_name}.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">Layanan tidak akan mulai ketika perangkat dinyalakan kembali, Anda tidak akan menerima pemberitahuan sampai Anda membuka ${app_name}.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Perbolehkan memulai ketika perangkat dinyalakan</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Periksa halangan di balik layar</string>
     <string name="settings_troubleshoot_test_bg_restricted_success">Larangan latar belakang dinonaktifkan untuk ${app_name}. Percobaan ini sebaiknya dijalankan menggunakan jaringan data ponsel (bukan WiFi).
@@ -442,7 +442,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="settings_notification_by_event">Urgensi pemberitahuan lewat kejadian</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Pengaturan Sesukanya.</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Perhatikan bahwa sebagian jenis pesan tersetel diam (mengeluarkan pemberitahuan tanpa suara).</string>
-    <string name="settings_troubleshoot_test_bing_settings_failed">Sebagian pemberitahuan dimatikan dalam aturan Anda.</string>
+    <string name="settings_troubleshoot_test_bing_settings_failed">Sebagian pemberitahuan dimatikan dalam pengaturan Anda.</string>
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
 \nError ini di luar kendali ${app_name} dan menurut Google, error ini muncul ketika terlalu banyak aplikasi terdaftar dengan FCM pada perangkat tersebut. Error ini tidak seharusnya mempengaruhi pengguna biasa.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
@@ -450,7 +450,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
 \nError ini di luar kendali ${app_name}. Tidak terdapat akun Google pada perangkat. Mohon buka pengelola akun dan tambahkan akun Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Tambah Akun</string>
-    <string name="settings_troubleshoot_test_battery_failed">Apabila perangkat tidak sedang diisi atau dipergunakan dengan layar dimatikan, perangkat masuk mode Doze. Ini akan menghalangi aplikasi mengakses jaringan dan menunda tugas, sinkronisasi, dan alarm standar.</string>
+    <string name="settings_troubleshoot_test_battery_failed">Apabila perangkat tidak sedang diisi atau dipergunakan dengan layar dimatikan, perangkat masuk mode tidur. Ini akan menghalangi aplikasi mengakses jaringan dan menunda tugas, sinkronisasi, dan alarm standar.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Abaikan Optimisasi</string>
     <string name="settings_noisy_notifications_preferences">Kelola Pemberitahuan Berisik</string>
     <string name="settings_call_notifications_preferences">Kelola Pemberitahuan Panggilan</string>
@@ -459,7 +459,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="settings_cryptography_manage_keys">Pengelolaan Kunci Kriptografi</string>
     <string name="settings_inline_url_preview_summary">Pratinjau tautan dalam obrolan apabila homeserver mendukung fitur ini.</string>
     <string name="settings_send_typing_notifs">Kirim pemberitahuan mengetik</string>
-    <string name="settings_send_typing_notifs_summary">Beritahu pengguna lain bahwa Anda sedang mengetik.</string>
+    <string name="settings_send_typing_notifs_summary">Beri tahu pengguna lain bahwa Anda sedang mengetik.</string>
     <string name="settings_send_markdown">Format markdown</string>
     <string name="settings_send_markdown_summary">Format pesan menggunakan sintaks markdown sebelum dikirim. Ini mengizinkan format lanjutan seperti menggunakan tanda bintang untuk menunjukkan teks miring.</string>
     <string name="settings_show_read_receipts">Tunjukkan tanda telah dibaca</string>
@@ -565,7 +565,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="room_permissions_change_main_address_for_the_room">Mengubah alamat utama untuk ruangan ini</string>
     <string name="room_permissions_change_room_avatar">Mengubah avatar ruangan</string>
     <string name="room_permissions_modify_widgets">Mengubah widget</string>
-    <string name="room_permissions_notify_everyone">Beritahu semuanya</string>
+    <string name="room_permissions_notify_everyone">Beri tahu semuanya</string>
     <string name="room_permissions_remove_messages_sent_by_others">Menghapus pesan yang dikirim dari yang lain</string>
     <string name="room_permissions_change_settings">Ubah pengaturan</string>
     <string name="room_permissions_default_role">Peran bawaan</string>
@@ -610,11 +610,11 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     </plurals>
     <string name="settings_call_show_confirmation_dialog_summary">Meminta untuk konfirmasi sebelum memulai panggilan</string>
     <string name="settings_call_show_confirmation_dialog_title">Cegah panggilan tidak disengaja</string>
-    <string name="error_unauthorized">Tidak sah, tidak ada kredensial otentikasi yang valid</string>
+    <string name="error_unauthorized">Tidak sah, tidak ada kredensial otentikasi yang absah</string>
     <string name="login_error_ssl_other">Kesalahan SSL.</string>
     <string name="login_error_ssl_peer_unverified">Kesalahan SSL: identitas peer belum diverifikasi.</string>
     <string name="login_error_homeserver_not_found">Tidak dapat mencapai homeserver pada URL ini, silakan periksa</string>
-    <string name="login_error_no_homeserver_found">Ini bukan alamat server Matrix yang valid</string>
+    <string name="login_error_no_homeserver_found">Ini bukan alamat server Matrix yang absah</string>
     <string name="auth_msisdn_already_defined">Nomor telepon ini sudah ditentukan.</string>
     <string name="auth_login_sso">Masuk dengan single sign-on</string>
     <string name="use_as_default_and_do_not_ask_again">Gunakan sebagai bawaan dan jangan tanya lagi</string>
@@ -676,10 +676,10 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="action_revoke">Batalkan</string>
     <string name="none">Tidak Ada</string>
     <string name="system_theme">Bawaan Sistem</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Anda mengaktifkan enkripsi ujung-ke-ujung. (algoritma tidak dikenali %1$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Anda mengaktifkan enkripsi ujung ke ujung. (algoritma tidak dikenali %1$s).</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s mengaktifkan enkripsi ujung-ke-ujung. (algoritma tidak dikenali %2$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s mengaktifkan enkripsi ujung ke ujung. (algoritma tidak dikenali %2$s).</string>
-    <string name="notice_end_to_end_ok_by_you">Anda mengaktifkan enkripsi ujung-ke-ujung.</string>
+    <string name="notice_end_to_end_ok_by_you">Anda mengaktifkan enkripsi ujung ke ujung.</string>
-    <string name="notice_end_to_end_ok">%1$s mengaktifkan enkripsi ujung-ke-ujung.</string>
+    <string name="notice_end_to_end_ok">%1$s mengaktifkan enkripsi ujung ke ujung.</string>
     <string name="notice_direct_room_guest_access_forbidden_by_you">Anda telah mencegah para tamu untuk bergabung ke ruangan.</string>
     <string name="notice_direct_room_guest_access_forbidden">%1$s telah mencegah para tamu untuk bergabung ke ruangan.</string>
     <string name="notice_room_guest_access_forbidden_by_you">Anda telah mencegah para tamu untuk bergabung ke ruangan.</string>
@@ -816,7 +816,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="notice_room_server_acl_allow_is_empty">🎉 Semua server dilarang untuk berpartisipasi! Ruangan ini tidak lagi dapat digunakan.</string>
     <string name="notice_room_server_acl_updated_no_change">Tidak ada berubahan.</string>
     <string name="settings_phone_numbers">Nomor telepon</string>
-    <string name="settings_emails_empty">Tidak ada email yang ditambahkan ke akun Anda</string>
+    <string name="settings_emails_empty">Tidak ada alamat email yang ditambahkan ke akun Anda</string>
     <string name="settings_emails">Surel</string>
     <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Server yang cocok dengan literal IP sekarang dilarang.</string>
     <string name="notice_room_server_acl_updated_banned">• Server yang cocok dengan %s sekarang dilarang.</string>
@@ -962,16 +962,16 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="room_settings_room_notifications_account_settings">Pengaturan akun</string>
     <string name="room_settings_room_notifications_manage_notifications">Anda dapat mengelola notifikasi di %1$s.</string>
     <string name="room_settings_room_notifications_encryption_notice">Harap dicatat bahwa pemberitahuan sebutan &amp; kata kunci tidak tersedia dalam ruangan terenkripsi di ponsel.</string>
-    <string name="room_settings_room_notifications_notify_me">Beritahu saya untuk</string>
+    <string name="room_settings_room_notifications_notify_me">Beri tahu saya untuk</string>
     <string name="settings_play_shutter_sound">Putar suara rana</string>
     <string name="media_source_choose">Pilih</string>
     <string name="settings_default_media_source">Sumber media bawaan</string>
     <string name="compression_opt_list_choose">Pilih</string>
     <string name="settings_default_compression">Kompresi bawaan</string>
     <string name="settings_media">Media</string>
-    <string name="settings_emails_and_phone_numbers_summary">Kelola email dan nomor telepon yang ditautkan ke akun Matrix Anda</string>
+    <string name="settings_emails_and_phone_numbers_summary">Kelola alamat email dan nomor telepon yang ditautkan ke akun Matrix Anda</string>
     <string name="settings_emails_and_phone_numbers_title">Email dan nomor telepon</string>
-    <string name="settings_fail_to_update_password_invalid_current_password">Sandi tidak valid</string>
+    <string name="settings_fail_to_update_password_invalid_current_password">Kata sandi tidak absah</string>
     <string name="settings_password">Sandi</string>
     <string name="disabled_integration_dialog_content">Aktifkan \'Izinkan integrasi\' di Pengaturan untuk melakukan ini.</string>
     <string name="disabled_integration_dialog_title">Integrasi dinonaktifkan</string>
@@ -997,7 +997,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <plurals name="seconds">
         <item quantity="other">%d detik</item>
     </plurals>
-    <string name="settings_background_fdroid_sync_mode_disabled_description">Anda tidak akan diberitahu tentang pesan masuk saat aplikasi berada di latar belakang.</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">Anda tidak akan diberi tahu tentang pesan masuk saat aplikasi berada di latar belakang.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Tidak ada sinkronisasi latar belakang</string>
     <string name="settings_background_fdroid_sync_mode_real_time_description">${app_name} akan disinkronkan di latar belakang secara berkala pada waktu yang tepat (dapat dikonfigurasi).
 \nIni akan memengaruhi penggunaan radio dan baterai, dan ada juga pemberitahuan yang ditampilkan permanen menyatakan bahwa ${app_name} sedang mendengarkan peristiwa.</string>
@@ -1021,7 +1021,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="settings_notification_keyword_contains_dot">Kata kunci tidak boleh diawali dengan \'.\'</string>
     <string name="settings_notification_new_keyword">Tambahkan kata kunci baru</string>
     <string name="settings_notification_your_keywords">Kata kunci Anda</string>
-    <string name="settings_notification_notify_me_for">Beritahu saya untuk</string>
+    <string name="settings_notification_notify_me_for">Beri tahu saya untuk</string>
     <string name="settings_notification_other">Lainnya</string>
     <string name="settings_notification_mentions_and_keywords">Sebutan dan Kata Kunci</string>
     <string name="settings_notification_default">Notifikasi Bawaan</string>
@@ -1035,16 +1035,16 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="video_call_with_participant">Panggilan video dengan %s</string>
     <string name="call_ringing">Panggilan berdering…</string>
     <string name="spaces">Space</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Kami mengirimi Anda email konfirmasi ke %s, mohon periksa email Anda dan klik tautan konfirmasi</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Kami mengirim Anda email konfirmasi ke %s, mohon periksa email Anda dan klik tautan konfirmasi</string>
-    <string name="settings_discovery_no_mails">Opsi penemuan akan muncul setelah Anda menambahkan email.</string>
+    <string name="settings_discovery_no_mails">Opsi penemuan akan muncul setelah Anda menambahkan sebuah alamat email.</string>
     <string name="settings_discovery_disconnect_identity_server_info">Memutuskan sambungan dari server identitas Anda akan membuat Anda tidak dapat ditemukan oleh pengguna lain dan Anda tidak akan dapat mengundang orang lain melalui email atau nomor telepon.</string>
     <string name="settings_discovery_consent_title">Kirim email dan nomor telepon</string>
-    <string name="settings_discovery_consent_notice_on">Anda telah memberikan persetujuan untuk mengirim email dan nomor telepon ke server identitas ini untuk menemukan pengguna lain dari kontak Anda.</string>
+    <string name="settings_discovery_consent_notice_on">Anda telah memberikan persetujuan untuk mengirim alamat email dan nomor telepon ke server identitas ini untuk menemukan pengguna lain dari kontak Anda.</string>
     <string name="settings_discovery_disconnect_with_bound_pid">Anda sedang berbagi email atau nomor telepon di server identitas %1$s. Anda harus menyambungkan kembali ke %2$s untuk berhenti membagikannya.</string>
     <string name="settings_agree_to_terms">Setujui Persyaratan Layanan server identitas (%s) agar Anda dapat ditemukan melalui email atau nomor telepon.</string>
-    <string name="settings_discovery_confirm_mail">Kami mengirimi Anda email konfirmasi ke %s, periksa email Anda dan klik tautan konfirmasi</string>
+    <string name="settings_discovery_confirm_mail">Kami mengirim Anda sebuah email ke %s, periksa email Anda dan klik tautan konfirmasi</string>
     <string name="login_reset_password_on">Setel ulang sandi di %1$s</string>
-    <string name="login_login_with_email_error">Email ini tidak terkait dengan akun apa pun.</string>
+    <string name="login_login_with_email_error">Alamat email ini tidak terkait dengan akun apa pun.</string>
     <string name="login_registration_not_supported">Aplikasi tidak dapat membuat akun di homeserver ini.
 \n
 \nApakah Anda ingin mendaftar menggunakan klien web\?</string>
@@ -1080,7 +1080,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="login_server_text">Sama seperti email, akun memiliki satu tempat, tetapi Anda dapat berkomunikasi dengan siapa saja</string>
     <string name="login_server_title">Pilih server</string>
     <string name="login_splash_submit">Mulai</string>
-    <string name="login_splash_text3">Luaskan &amp; sesuaikan pengalaman Anda</string>
+    <string name="login_splash_text3">Tingkatkan &amp; sesuaikan pengalaman Anda</string>
     <string name="login_splash_title">Ini adalah percakapan Anda. Miliki percakapan Anda.</string>
     <string name="login_splash_text2">Jaga percakapan tetap pribadi dengan enkripsi</string>
     <string name="login_splash_text1">Chat dengan orang-orang secara langsung atau dalam grup</string>
@@ -1148,9 +1148,9 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
     <string name="labs_show_unread_notifications_as_tab">Tambahkan tab terdedikasi untuk notifikasi yang belum dibaca di layar utama.</string>
     <string name="error_file_too_big_simple">File ini terlalu besar untuk diupload.</string>
-    <string name="keys_backup_settings_invalid_signature_from_unverified_device">Cadangan mempunyai tanda tangan yang tidak valid dari sesi %s yang belum diverifikasi</string>
+    <string name="keys_backup_settings_invalid_signature_from_unverified_device">Cadangan mempunyai tanda tangan yang tidak absah dari sesi %s yang belum diverifikasi</string>
-    <string name="keys_backup_settings_invalid_signature_from_verified_device">Cadangan mempunyai tanda tangan yang tidak valid dari sesi %s yang terverifikasi</string>
+    <string name="keys_backup_settings_invalid_signature_from_verified_device">Cadangan mempunyai tanda tangan yang tidak absah dari sesi %s yang terverifikasi</string>
-    <string name="keys_backup_settings_valid_signature_from_unverified_device">Cadangan mempunyai tanda tangan yang valid dari sesi %s yang belum diverifikasi</string>
+    <string name="keys_backup_settings_valid_signature_from_unverified_device">Cadangan mempunyai tanda tangan yang absah dari sesi %s yang belum diverifikasi</string>
     <string name="send_file_step_sending_thumbnail">Mengirim gambar mini (%1$s / %2$s)</string>
     <plurals name="fallback_users_read">
         <item quantity="other">%d pengguna telah membaca</item>
@@ -1240,10 +1240,10 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="preference_voice_and_video">Suara &amp; Video</string>
     <string name="push_gateway_item_format">Format:</string>
     <string name="push_gateway_item_url">Url:</string>
-    <string name="push_gateway_item_device_name">session_name:</string>
+    <string name="push_gateway_item_device_name">Nama Tampilan Sesi:</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
+    <string name="push_gateway_item_app_display_name">Nama Tampilan Aplikasi:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
+    <string name="push_gateway_item_push_key">Kunci Dorongan:</string>
-    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="push_gateway_item_app_id">ID Aplikasi:</string>
     <string name="settings_push_gateway_no_pushers">Tidak ada gateway dorong terdaftar</string>
     <string name="settings_push_rules_no_rules">Tidak ada aturan push yang ditentukan</string>
     <string name="settings_push_rules">Aturan Push</string>
@@ -1278,8 +1278,8 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="keys_backup_settings_delete_confirm_title">Hapus Cadangan</string>
     <string name="keys_backup_settings_checking_backup_state">Memeriksa status cadangan</string>
     <string name="keys_backup_settings_deleting_backup">Menghapus cadangan…</string>
-    <string name="keys_backup_settings_valid_signature_from_verified_device">Cadangan mempunyai tanda tangan yang valid dari sesi %s yang terverifikasi.</string>
+    <string name="keys_backup_settings_valid_signature_from_verified_device">Cadangan mempunyai tanda tangan yang absah dari sesi %s yang terverifikasi.</string>
-    <string name="keys_backup_settings_valid_signature_from_this_device">Cadangan mempunyai tanda tangan yang valid dari sesi ini.</string>
+    <string name="keys_backup_settings_valid_signature_from_this_device">Cadangan mempunyai tanda tangan yang absah dari sesi ini.</string>
     <string name="keys_backup_settings_signature_from_unknown_device">Cadangan mempunyai tanda tangan dari sesi tidak dikenal dengan ID %s.</string>
     <string name="keys_backup_settings_status_not_setup">Kunci Anda tidak dicadangkan dari sesi ini.</string>
     <string name="keys_backup_settings_status_ko">Cadangan Kunci belum aktif di sesi ini.</string>
@@ -1342,7 +1342,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="keys_backup_setup_step1_manual_export">Ekspor kunci secara manual</string>
     <string name="keys_backup_setup_step1_advanced">(Lanjutan)</string>
     <string name="keys_backup_setup">Mulai menggunakan Cadangan Kunci</string>
-    <string name="keys_backup_setup_step1_description">Pesan di ruangan terenkripsi diamankan dengan enkripsi ujung-ke-ujung. Hanya Anda dan penerima memiliki kunci untuk membaca pesan-pesan ini.
+    <string name="keys_backup_setup_step1_description">Pesan di ruangan terenkripsi diamankan dengan enkripsi ujung ke ujung. Hanya Anda dan penerima memiliki kunci untuk membaca pesan ini.
 \n
 \nCadangkan kunci Anda dengan aman untuk menghindari kehilangan kunci Anda.</string>
     <string name="keys_backup_setup_step1_title">Jangan pernah kehilangan pesan terenkripsi</string>
@@ -1351,7 +1351,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="passphrase_empty_error_message">Mohon masukkan frasa sandi</string>
     <string name="passphrase_passphrase_does_not_match">Frasa sandi tidak cocok</string>
     <string name="passphrase_create_passphrase">Buat frasa sandi</string>
-    <string name="no_valid_google_play_services_apk">Tidak menemukan APK Layanan Google Play yang valid. Notifikasi mungkin tidak berkerja dengan seharusnya.</string>
+    <string name="no_valid_google_play_services_apk">Tidak menemukan APK Layanan Google Play yang absah. Notifikasi mungkin tidak bekerja dengan seharusnya.</string>
     <string name="settings_security_and_privacy">Keamanan &amp; Privasi</string>
     <string name="settings_preferences">Preferensi</string>
     <string name="settings_general_title">Umum</string>
@@ -1435,7 +1435,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="settings_active_sessions_manage">Kelola Sesi</string>
     <string name="settings_active_sessions_show_all">Tampilkan Semua Sesi</string>
     <string name="settings_active_sessions_list">Sesi Aktif</string>
-    <string name="settings_hs_admin_e2e_disabled">Admin server Anda telah menonaktifkan enkripsi ujung-ke-ujung secara bawaan di ruangan &amp; Pesan Langsung privat.</string>
+    <string name="settings_hs_admin_e2e_disabled">Admin server Anda telah menonaktifkan enkripsi ujung ke ujung secara bawaan di ruangan &amp; Pesan Langsung privat.</string>
     <string name="encryption_information_dg_xsigning_disabled">Tanda Tangan Silang dinonaktifkan</string>
     <string name="encryption_information_dg_xsigning_trusted">Tanda Tangan Silang diaktifkan.
 \nKunci dipercaya.
@@ -1446,7 +1446,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
 \nKunci Privat di perangkat.</string>
     <string name="encryption_information_cross_signing_state">Tanda Tangan Silang</string>
     <string name="verification_conclusion_ok_self_notice">Sesi baru Anda telah diverifikasi. Ini memiliki akses ke pesan terenkripsi Anda, dan pengguna lain akan melihatnya sebagai tepercaya.</string>
-    <string name="verification_conclusion_ok_notice">Pesan dengan pengguna ini dienkripsi ujung-ke-ujung dan tidak dapat dibaca oleh pihak ketiga.</string>
+    <string name="verification_conclusion_ok_notice">Pesan dengan pengguna ini dienkripsi ujung ke ujung dan tidak dapat dibaca oleh pihak ketiga.</string>
     <string name="verification_code_notice">Bandingkan kode dengan yang ditampilkan di layar pengguna lain.</string>
     <string name="verification_emoji_notice">Bandingkan emoji yang unik, dan pastikan mereka muncul di urutan yang sama.</string>
     <string name="verification_request_start_notice">Supaya aman, lakukan secara langsung atau gunakan cara lain untuk berkomunikasi.</string>
@@ -1454,8 +1454,8 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="room_settings_enable_encryption_dialog_submit">Aktifkan enkripsi</string>
     <string name="room_settings_enable_encryption_dialog_content">Ketika diaktifkan, enkripsi tidak dapat dinonaktifkan. Pesan yang dikirim di ruangan terenkripsi tidak dapat dilihat oleh servernya, hanya anggota ruangan. Mengaktifkan enkripsi mungkin mencegah banyaknya bot dan jembatan bekerja dengan seharusnya.</string>
     <string name="room_settings_enable_encryption_dialog_title">Aktifkan enkripsi\?</string>
-    <string name="room_settings_enable_encryption_no_permission">Anda tidak memiliki izin untuk mengaktifkan enkripsi ujung-ke-ujung di ruangan ini.</string>
+    <string name="room_settings_enable_encryption_no_permission">Anda tidak memiliki izin untuk mengaktifkan enkripsi ujung ke ujung di ruangan ini.</string>
-    <string name="room_settings_enable_encryption">Aktifkan enkripsi ujung-ke-ujung…</string>
+    <string name="room_settings_enable_encryption">Aktifkan enkripsi ujung ke ujung…</string>
     <string name="settings_category_composer">Editor pesan</string>
     <string name="settings_category_timeline">Linimasa</string>
     <string name="command_description_rainbow_emote">Mengirim emote yang dicantum berwarna pelangi</string>
@@ -1490,14 +1490,14 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="room_profile_section_more">Lebih banyak</string>
     <string name="room_profile_section_security_learn_more">Pelajari lebih lanjut</string>
     <string name="room_profile_section_security">Keamanan</string>
-    <string name="direct_room_profile_encrypted_subtitle">Pesan di ruangan ini dienkripsi ujung-ke-ujung.
+    <string name="direct_room_profile_encrypted_subtitle">Pesan di ruangan ini dienkripsi secara ujung ke ujung.
 \n
 \nPesan Anda diamankan dengan kunci dan hanya Anda dan penerima memiliki kunci unik untuk mengakses mereka.</string>
-    <string name="room_profile_encrypted_subtitle">Pesan di ruangan ini dienkripsi ujung-ke-ujung.
+    <string name="room_profile_encrypted_subtitle">Pesan di ruangan ini dienkripsi secara ujung ke ujung.
 \n
 \nPesan Anda diamankan dengan kunci dan hanya Anda dan penerima memiliki kunci unik untuk mengakses mereka.</string>
-    <string name="direct_room_profile_not_encrypted_subtitle">Pesan ini tidak terenkripsi secara ujung-ke-ujung.</string>
+    <string name="direct_room_profile_not_encrypted_subtitle">Pesan ini tidak terenkripsi secara ujung ke ujung.</string>
-    <string name="room_profile_not_encrypted_subtitle">Pesan di ruangan ini tidak terenkripsi secara ujung-ke-ujung.</string>
+    <string name="room_profile_not_encrypted_subtitle">Pesan di ruangan ini tidak terenkripsi secara ujung ke ujung.</string>
     <string name="verification_request_waiting_for">Menunggu untuk %s…</string>
     <string name="verification_verified_user">Diverifikasi %s</string>
     <string name="verification_verify_user">Verifikasi %s</string>
@@ -1587,8 +1587,8 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
 \n• Administrator server Anda telah menghilangkan akses Anda untuk keamanan.</string>
     <string name="signed_out_title">Anda telah keluar</string>
     <string name="seen_by">Dilihat oleh</string>
-    <string name="autodiscover_well_known_error">Tidak dapat menemukan homeserver yang valid. Mohon cek pengenal Anda</string>
+    <string name="autodiscover_well_known_error">Tidak dapat menemukan homeserver yang absah. Mohon cek pengenal Anda</string>
-    <string name="login_signin_matrix_id_error_invalid_matrix_id">Ini bukan pengenal pengguna yang valid. Format yang diharapkan: \'@pengguna:homeserver.org\'</string>
+    <string name="login_signin_matrix_id_error_invalid_matrix_id">Ini bukan pengenal pengguna yang absah. Format yang diharapkan: \'@pengguna:homeserver.org\'</string>
     <string name="login_signin_matrix_id_password_notice">Jika Anda tidak tahu kata sandi Anda, kembali untuk mengatur ulang.</string>
     <string name="login_signin_matrix_id_hint">ID Matrix</string>
     <string name="login_signin_matrix_id_notice">Jika Anda membuat akun di sebuah homeserver, gunakan ID Matrix Anda (mis. @pengguna:domain.com) dan kata sandi dibawah.</string>
@@ -1616,7 +1616,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="login_signup_password_hint">Kata sandi</string>
     <string name="login_signup_username_hint">Nama pengguna</string>
     <string name="login_signin_username_hint">Nama pengguna atau email</string>
-    <string name="login_msisdn_error_other">Nomor telepon kelihatannya tidak valid. Mohon dicek lagi</string>
+    <string name="login_msisdn_error_other">Nomor telepon kelihatannya tidak absah. Mohon dicek lagi</string>
     <string name="login_msisdn_error_not_international">Nomor telepon internasional harus mulai dengan \'+\'</string>
     <string name="login_msisdn_notice">Mohon menggunakan format internasional (nomor telepon harus mulai dengan \'+\')</string>
     <string name="login_msisdn_confirm_submit">Lanjut</string>
@@ -1632,7 +1632,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="login_set_email_submit">Lanjut</string>
     <string name="login_set_email_optional_hint">Email (opsional)</string>
     <string name="login_set_email_mandatory_hint">Email</string>
-    <string name="login_set_email_notice">Atur sebuah email untuk memulihkan akun Anda. Nantinya, Anda dapat mengizinkan orang yang Anda tahu untuk menemukan Anda dari email secara opsional.</string>
+    <string name="login_set_email_notice">Atur sebuah alamat email untuk memulihkan akun Anda. Nantinya, Anda dapat mengizinkan orang yang Anda tahu untuk menemukan Anda dari email ini secara opsional.</string>
     <string name="login_set_email_title">Atur alamat email</string>
     <string name="login_reset_password_cancel_confirmation_content">Kata sandi Anda belum diubah.
 \n
@@ -1646,9 +1646,9 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="login_reset_password_mail_confirmation_notice_2">Ketuk tautan untuk mengkonfirmasi kata sandi baru Anda. Setelah Anda mengikuti petunjuk yang ada di tautan, klik bawahnya.</string>
     <string name="login_reset_password_mail_confirmation_notice">Email verifikasi terkirim ke %1$s.</string>
     <string name="login_reset_password_mail_confirmation_title">Cek kotak masuk Anda</string>
-    <string name="login_reset_password_error_not_found">Email ini tidak tertaut dengan akun apa pun</string>
+    <string name="login_reset_password_error_not_found">Alamat email ini tidak tertaut dengan akun apa pun</string>
     <string name="login_reset_password_warning_submit">Lanjut</string>
-    <string name="login_reset_password_warning_content">Mengubah kata sandi Anda akan mengatur ulang kunci enkripsi ujung-ke-ujung pada semua sesi Anda, yang akan membuat riwayat obrolan terenkripsi tidak dapat dibaca. Atur Cadangan Kunci atau ekspor kunci ruangan Anda dari sesi lain sebelum mengatur ulang kata sandi Anda.</string>
+    <string name="login_reset_password_warning_content">Mengubah kata sandi Anda akan mengatur ulang kunci enkripsi ujung ke ujung pada semua sesi Anda, yang akan membuat riwayat obrolan terenkripsi tidak dapat dibaca. Atur Cadangan Kunci atau ekspor kunci ruangan Anda dari sesi lain sebelum mengatur ulang kata sandi Anda.</string>
     <string name="login_reset_password_warning_title">Peringatan!</string>
     <string name="login_reset_password_password_hint">Kata sandi baru</string>
     <string name="login_reset_password_email_hint">Email</string>
@@ -1760,7 +1760,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="space_type_public">Publik</string>
     <string name="create_spaces_private_teammates">Space privat untuk Anda &amp; tim Anda</string>
     <string name="create_spaces_me_and_teammates">Saya dan tim saya</string>
-    <string name="create_spaces_organise_rooms">Space yang privat untuk mengorganisir ruangan Anda</string>
+    <string name="create_spaces_organise_rooms">Space yang privat untuk mengelola ruangan Anda</string>
     <string name="create_spaces_just_me">Saya saja</string>
     <string name="create_spaces_make_sure_access">Pastikan orang yang tepat memiliki akses ke %s.</string>
     <string name="create_spaces_who_are_you_working_with">Dengan siapa Anda bekerja\?</string>
@@ -1803,9 +1803,9 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="dev_tools_menu_name">Alat Pengembang</string>
     <string name="a11y_public_room">Ruangan publik</string>
     <string name="a11y_view_read_receipts">Lihat laporan dibaca</string>
-    <string name="a11y_rule_notify_off">Jangan beritahu</string>
+    <string name="a11y_rule_notify_off">Jangan beri tahu</string>
-    <string name="a11y_rule_notify_silent">Beritahu tanpa suara</string>
+    <string name="a11y_rule_notify_silent">Beri tahu tanpa suara</string>
-    <string name="a11y_rule_notify_noisy">Beritahu dengan suara</string>
+    <string name="a11y_rule_notify_noisy">Beri tahu dengan suara</string>
     <string name="a11y_error_message_not_sent">Pesan tidak terkirim karena kesalahan</string>
     <string name="a11y_unchecked">Tidak dicentang</string>
     <string name="a11y_checked">Dicentang</string>
@@ -1814,7 +1814,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="warning_room_not_created_yet">Ruangannya belum dibuat. Batalkan pembuatan ruangan\?</string>
     <string name="universal_link_malformed">Tautannya cacat</string>
     <string name="qr_code_not_scanned">Kode QR tidak dipindai!</string>
-    <string name="invalid_qr_code_uri">Kode QR tidak valid (URI tidak valid)!</string>
+    <string name="invalid_qr_code_uri">Kode QR tidak absah (URI tidak absah)!</string>
     <string name="cannot_dm_self">Tidak dapat membuat pesan langsung dengan Anda sendiri!</string>
     <string name="share_by_text">Bagikan melalui teks</string>
     <string name="room_error_not_found">Tidak dapat mencari ruangan ini. Pastikan ruangannya sudah ada.</string>
@@ -1875,7 +1875,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="crypto_error_withheld_generic">Anda tidak dapat mengakses pesan ini karena pengirim telah sengaja tidak mengirim kuncinya</string>
     <string name="crypto_error_withheld_unverified">Anda tidak dapat mengakses pesan ini karena sesi Anda tidak dipercayai oleh pengirim</string>
     <string name="crypto_error_withheld_blacklisted">Anda tidak dapat mengakses pesan ini karena Anda telah diblokir oleh pengirim</string>
-    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Karena enkripsi ujung-ke-ujung, Anda mungkin harus menunggu untuk pesan dari seseorang untuk datang karena kunci enkripsinya tidak dikirim secara benar ke Anda.</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Karena adanya enkripsi ujung ke ujung, Anda mungkin harus menunggu untuk pesan dari seseorang untuk datang karena kunci enkripsinya tidak dikirim secara benar ke Anda.</string>
     <string name="notice_crypto_unable_to_decrypt_friendly">Menunggu untuk pesan ini, mungkin membutuhkan beberapa waktu</string>
     <string name="notice_crypto_unable_to_decrypt_final">Anda tidak dapat mengakses pesan ini</string>
     <string name="room_settings_set_avatar">Atur avatar</string>
@@ -1910,7 +1910,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="identity_server_user_consent_not_provided">Izin pengguna belum diberikan.</string>
     <string name="identity_server_error_no_current_binding_error">Tidak ada asosiasi saat ini dengan pengenal ini.</string>
     <string name="identity_server_error_binding_error">Asosiasi telah gagal.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Untuk pricvasi Anda, ${app_name} hanya mendukung pengiriman email pengguna yang telah di-hash dan nomor telepon.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Demi privasi Anda, ${app_name} hanya mendukung pengiriman email pengguna dan nomor telepon yang telah di-hash.</string>
     <string name="identity_server_error_terms_not_signed">Mohon terima ketentuan server identitas ini di pengaturan.</string>
     <string name="identity_server_error_no_identity_server_configured">Mohon konfigurasi server identitas.</string>
     <string name="identity_server_error_outdated_identity_server">Server identitas ini telah usang. ${app_name} hanya mendukung API V2.</string>
@@ -1946,7 +1946,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="create_space_error_empty_field_space_name">Beri nama untuk melanjutkan.</string>
     <string name="create_pin_confirm_failure">Gagal untuk memvalidasi PIN, mohon ketuk yang baru.</string>
     <string name="link_this_email_with_your_account">%s di Pengaturan untuk menerima undangan secara langsung di ${app_name}.</string>
-    <string name="link_this_email_settings_link">Tautkan email ini ke akun Anda</string>
+    <string name="link_this_email_settings_link">Tautkan alamat email ini ke akun Anda</string>
     <string name="this_invite_to_this_space_was_sent">Undangan space ini telah dikirim ke %s yang tidak diasosiasikan dengan akun Anda</string>
     <string name="this_invite_to_this_room_was_sent">Undangan ruangan ini telah dikirim ke %s yang tidak diasosiasikan dengan akun Anda</string>
     <string name="external_link_confirmation_title">Periksa ulang tautan ini</string>
@@ -2001,7 +2001,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="bootstrap_progress_checking_backup_with_info">Memeriksa kunci cadangan (%s)</string>
     <string name="bootstrap_progress_checking_backup">Memeriksa kunci cadangan</string>
     <string name="recovery_key_empty_error_message">Mohon masukkan sebuah kunci pemulihan</string>
-    <string name="bootstrap_invalid_recovery_key">Bukan kunci pemulihan yang valid</string>
+    <string name="bootstrap_invalid_recovery_key">Bukan kunci pemulihan yang absah</string>
     <string name="use_file">Gunakan File</string>
     <string name="bootstrap_enter_recovery">Masukkan %s Anda untuk melanjutkan</string>
     <string name="security_prompt_text">Verifikasi diri Anda dan lainnya untuk tetap membuat pesan Anda aman</string>
@@ -2027,8 +2027,8 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="room_created_summary_item_by_you">Anda membuat dan mengatur ruangan ini.</string>
     <string name="room_created_summary_item">%s membuat dan mengatur ruangan ini.</string>
     <string name="encryption_not_enabled">Enkripsi tidak diaktifkan</string>
-    <string name="direct_room_encryption_enabled_tile_description">Pesan di obrolan ini dienkripsi secara ujung-ke-ujung.</string>
+    <string name="direct_room_encryption_enabled_tile_description">Pesan di obrolan ini dienkripsi secara ujung ke ujung.</string>
-    <string name="encryption_enabled_tile_description">Pesan di ruangan ini dienkripsi secara ujung-ke-ujung. Pelajari lebih lanjut &amp; verifikasi pengguna di profil mereka.</string>
+    <string name="encryption_enabled_tile_description">Pesan di ruangan ini dienkripsi secara ujung ke ujung. Pelajari lebih lanjut &amp; verifikasi pengguna di profil mereka.</string>
     <string name="encryption_enabled">Enkripsi diaktifkan</string>
     <string name="bootstrap_cancel_text">Jika Anda batalkan, Anda mungkin kehilangan pesan terenkripsi dan data Anda jika Anda kehilangan akses ke login Anda.
 \n
@@ -2165,7 +2165,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="create_space_in_progress">Membuat space…</string>
     <string name="settings_developer_mode_show_info_on_screen_summary">Tampilkan info yang berguna untuk membantu debugging aplikasi</string>
     <string name="settings_developer_mode_show_info_on_screen_title">Tampilkan info debug di layar</string>
-    <string name="does_not_look_like_valid_email">Tidak terlihat sebagai alamat email yang valid</string>
+    <string name="does_not_look_like_valid_email">Tidak terlihat sebagai alamat email yang absah</string>
     <string name="open_discovery_settings">Buka Pengaturan Penemuan</string>
     <string name="user_directory_search_hint_2">Cari dengan nama, ID atau email</string>
     <string name="create_new_space">Buat Space Baru</string>
@@ -2173,7 +2173,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="room_settings_space_access_title">Akses space</string>
     <string name="room_settings_access_rules_pref_dialog_title">Siapa yang dapat akses\?</string>
     <string name="settings_notification_emails_enable_for_email">Aktifkan notifikasi email untuk %s</string>
-    <string name="settings_notification_emails_no_emails">Untuk menerima email dengan notifikasi, mohon tautkan sebuah email ke akun Matrix Anda</string>
+    <string name="settings_notification_emails_no_emails">Untuk menerima email dengan notifikasi, mohon tautkan sebuah alamat email ke akun Matrix Anda</string>
     <string name="settings_notification_emails_category">Notifikasi email</string>
     <string name="room_permissions_upgrade_the_space">Tingkatkan space ini</string>
     <string name="room_permissions_change_space_name">Ubah nama space</string>
@@ -2219,12 +2219,12 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="create_poll_question_title">Pertanyaan atau topik poll</string>
     <string name="create_poll_title">Buat Poll</string>
     <string name="attachment_type_poll">Poll</string>
-    <string name="identity_server_consent_dialog_title_2">Kirim email dan nomor telepon ke %s</string>
+    <string name="identity_server_consent_dialog_title_2">Kirim alamat email dan nomor telepon ke %s</string>
     <string name="settings_discovery_consent_notice_off_2">Kontak Anda privat. Untuk menemukan pengguna dari kontak Anda, kami membutuhkan izin untuk mengirim info kontak ke server identitas Anda.</string>
     <string name="shortcut_disabled_reason_sign_out">Sesinya telah dikeluarkan!</string>
     <string name="shortcut_disabled_reason_room_left">Ruangannya telah ditinggalkan!</string>
     <string name="identity_server_consent_dialog_content_question">Apakah Anda setuju untuk mengirimkan info ini\?</string>
-    <string name="identity_server_consent_dialog_content_3">Untuk menemukan kontak yang sudah ada, Anda harus mengirim info kontak (email dan nomor telepon) ke server identitas Anda. Kami meng-hash data Anda sebelum mengirim untuk privasi.</string>
+    <string name="identity_server_consent_dialog_content_3">Untuk menemukan kontak yang sudah ada, Anda harus mengirim info kontak (email dan nomor telepon) ke server identitas Anda. Kami hash data Anda sebelum mengirim demi privasi.</string>
     <string name="action_not_now">Nanti</string>
     <string name="delete_poll_dialog_content">Apakah Anda yakin untuk menghapus poll ini\? Anda tidak akan dapat memulihkannya setelah dihapus.</string>
     <string name="delete_poll_dialog_title">Hapus poll</string>
@@ -2298,17 +2298,17 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="poll_no_votes_cast">Tidak ada suara</string>
     <string name="encryption_misconfigured">Enkripsi dikonfigurasi dengan salah</string>
     <string name="room_profile_section_restore_security">Pulihkan Enkripsi</string>
-    <string name="contact_admin_to_restore_encryption">Mohon hubungi sebuah admin untuk memulihkan enkripsi ke status yang valid.</string>
+    <string name="contact_admin_to_restore_encryption">Mohon hubungi sebuah admin untuk memulihkan enkripsi ke status yang absah.</string>
     <string name="encryption_has_been_misconfigured">Enkripsi telah dikonfigurasi dengan salah.</string>
     <string name="sent_location">Membagikan lokasinya</string>
     <string name="login_splash_create_account">Buat akun</string>
     <string name="ftue_auth_carousel_workplace_title">Perpesanan untuk tim Anda.</string>
-    <string name="ftue_auth_carousel_encrypted_body">Terenkripsi secara ujung-ke-ujung dan tidak memerlukan nomor telepon. Tidak ada iklan atau penambangan data.</string>
+    <string name="ftue_auth_carousel_encrypted_body">Terenkripsi secara ujung ke ujung dan tidak memerlukan nomor telepon. Tanpa iklan atau penambangan data.</string>
     <string name="ftue_auth_carousel_control_body">Anda pilih di mana percakapan Anda disimpan, memberikan Anda kendali dan kebebasan. Terhubung via Matrix.</string>
     <string name="ftue_auth_carousel_secure_body">Komunikasi aman dan independen yang memberikan tingkat privasi yang sama seperti percakapan wajah-ke-wajah di dalam rumah Anda sendiri.</string>
     <string name="attachment_type_location">Lokasi</string>
     <string name="room_unsupported_e2e_algorithm_as_admin">Enkripsi telah dikonfigurasi dengan salah sehingga Anda tidak dapat mengirim pesan. Klik untuk membuka pengaturan.</string>
-    <string name="room_unsupported_e2e_algorithm">Enkripsi telah dikonfigurasi dengan salah sehingga Anda tidak dapat mengirim pesan. Mohon hubungi sebuah admin untuk memulihkan enkripsi ke status yang valid.</string>
+    <string name="room_unsupported_e2e_algorithm">Enkripsi telah dikonfigurasi dengan salah sehingga Anda tidak dapat mengirim pesan. Mohon hubungi sebuah admin untuk memulihkan enkripsi ke status yang absah.</string>
     <string name="ftue_auth_use_case_skip">Belum yakin\? %s</string>
     <string name="message_bubbles">Tampilkan gelembung pesan</string>
     <string name="location_timeline_failed_to_load_map">Gagal untuk memuat peta</string>
@@ -2344,7 +2344,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="action_view_threads">Tampilkan Utasan</string>
     <string name="room_message_autocomplete_notification">Notifikasi ruangan</string>
     <string name="room_message_autocomplete_users">Pengguna</string>
-    <string name="room_message_notify_everyone">Beritahu seluruh ruangan</string>
+    <string name="room_message_notify_everyone">Beri tahu seluruh ruangan</string>
     <plurals name="message_reaction_show_more">
         <item quantity="other">%1$d lagi</item>
     </plurals>
@@ -2429,7 +2429,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="settings_show_latest_profile_description">Tampilkan info profil (avatar dan nama tampilan) terkini untuk semua pesan.</string>
     <string name="settings_show_latest_profile">Tampilkan info pengguna terkini</string>
     <string name="a11y_presence_busy">Sibuk</string>
-    <string name="keys_backup_settings_signature_from_this_user">Cadangan memiliki tandatangan yang valid dari pengguna ini.</string>
+    <string name="keys_backup_settings_signature_from_this_user">Cadangan memiliki tandatangan yang absah dari pengguna ini.</string>
     <string name="location_share_live_until">Langsung sampai %1$s</string>
     <string name="live_location_bottom_sheet_last_updated_at">Diperbarui %1$s yang lalu</string>
     <string name="labs_enable_live_location_summary">Implementasi sementara: lokasi tetap di riwayat ruangan</string>
@@ -2480,7 +2480,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="labs_enable_msc3061_share_history_desc">Ketika mengundang ke ruangan terenkripsi yang juga membagikan riwayat, riwayat terenkripsi akan dapat dilihat.</string>
     <string name="labs_enable_msc3061_share_history">MSC3061: Pembagian kunci ruangan untuk pesan lama</string>
     <string name="send_your_first_msg_to_invite">Kirim pesan pertama Anda untuk mengundang %s ke obrolan</string>
-    <string name="direct_room_encryption_enabled_tile_description_future">Pesan di obrolan ini akan dienkripsi secara ujung-ke-ujung.</string>
+    <string name="direct_room_encryption_enabled_tile_description_future">Pesan di obrolan ini akan dienkripsi secara ujung ke ujung.</string>
     <string name="create_room_action_go">Mulai</string>
     <string name="ftue_auth_password_reset_email_confirmation_subtitle">Ikuti petunjuk yang terkirim ke %s</string>
     <string name="ftue_auth_email_verification_subtitle">Ikuti petunjuk yang terkirim ke %s</string>
@@ -2552,7 +2552,6 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="search_space_two_parents">%1$s dan %2$s</string>
     <string name="auth_reset_password_error_unverified">Email belum diverifikasi, periksa kotak masuk Anda</string>
     <string name="all_chats">Semua Obrolan</string>
-    <string name="device_manager_settings_active_sessions_show_all">Tampilkan Semua Sesi (V2, Dalam Pengembangan)</string>
     <string name="device_manager_sessions_other_description">Untuk keamanan terbaik, verifikasi sesi Anda dan keluarkan sesi apa pun yang Anda tidak kenal atau Anda tidak gunakan lagi.</string>
     <string name="device_manager_sessions_other_title">Sesi lainnya</string>
     <string name="settings_sessions_list">Sesi</string>
@@ -2658,4 +2657,100 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="labs_enable_deferred_dm_title">Aktifkan pesan langsung tangguhan</string>
     <string name="labs_enable_new_app_layout_summary">Sebuah SchildiChat yang sederhana dengan fitur tab opsional</string>
     <string name="labs_enable_new_app_layout_title">Aktifkan tata letak baru</string>
+    <string name="device_manager_learn_more_session_rename">Pengguna lain dalam pesan langsung dan ruangan yang Anda bergabung dapat melihat daftar sesi Anda yang lengkap.
+\n
+\nIni memberikan mereka kepastian bahwa mereka berbicara dengan Anda, tetapi ini juga berarti bahwa mereka dapat melihat nama sesi yang Anda masukkan di sini.</string>
+    <string name="device_manager_learn_more_session_rename_title">Mengubah nama sesi</string>
+    <string name="device_manager_learn_more_sessions_verified">Sesi yang terverifikasi telah masuk dengan kredensial Anda dan juga telah diverifikasi, menggunakan frasa sandi atau memverifikasi secara silang.
+\n
+\nIni berarti mereka memegang kunci enkripsi ke pesan Anda sebelumnya, dan mengonfirmasi pengguna lain yang Anda berkomunikasi bahwa sesi ini memang Anda.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Sesi tidak aktif</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Sesi belum diverifikasi</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Sesi terverifikasi</string>
+    <string name="device_manager_learn_more_sessions_unverified">Sesi yang belum diverifikasi adalah sesi yang telah masuk dengan kredensial Anda tetapi belum diverifikasi secara silang.
+\n
+\nAnda seharusnya yakin bahwa Anda mengenal sesi ini karena mereka bisa saja berarti seseorang menggunakan akun Anda secara tidak sah.</string>
+    <string name="device_manager_learn_more_sessions_inactive">Sesi yang tidak aktif adalah sesi yang Anda tidak gunakan dalam beberapa waktu, tetapi mereka masih mendapatkan kunci enkripsi.
+\n
+\nMenghapus sesi yang sudah tidak aktif meningkatkan keamanan dan performa, dan membuatnya lebih mudah untuk mengenal jika sebuah sesi baru mencurigakan.</string>
+    <string name="device_manager_session_rename_warning">Harap diketahui bahwa nama sesi juga terlihat ke orang-orang yang Anda berkomunikasi.</string>
+    <string name="device_manager_session_rename_description">Nama sesi khusus dapat membantu Anda mengenal perangkat Anda dengan lebih mudah.</string>
+    <string name="device_manager_session_rename_edit_hint">Nama sesi</string>
+    <string name="device_manager_session_rename">Ubah nama sesi</string>
+    <string name="device_manager_session_overview_signout">Keluar dari sesi ini</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Belum diverifikasi · Sesi Anda saat ini</string>
+    <string name="tooltip_attachment_voice_broadcast">Mulai sebuah siaran suara</string>
+    <string name="key_authenticity_not_guaranteed">Keaslian pesan terenkripsi ini tidak dapat dijamin pada perangkat ini.</string>
+    <string name="settings_security_incognito_keyboard_summary">Minta papan ketik untuk tidak memperbarui data yang dipersonalisasi seperti riwayat pengetikan dan kamus berdasarkan apa yang Anda ketik dalam percakapan. Dicatat bahwa beberapa papan ketik mungkin tidak menghormati pengaturan ini.</string>
+    <string name="settings_security_incognito_keyboard_title">Papan ketik samaran</string>
+    <string name="command_description_table_flip">Menambahkan (╯°□°）╯︵ ┻━┻ ke pesan teks biasa</string>
+    <string name="attachment_type_voice_broadcast">Siaran Suara</string>
+    <string name="command_description_devtools">Buka layar alat pengembang</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Anda telah mengaktifkan enkripsi ke sesi yang terverifikasi hanya untuk semua ruangan di Pengaturan Keamanan.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ Ada perangkat yang belum diverifikasi di ruangan ini, mereka tidak akan mendekripsikan pesan yang Anda kirim.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Jangan kirim pesan terenkripsi ke sesi yang belum diverifikasi di ruangan ini.</string>
+    <string name="action_got_it">Saya mengerti</string>
+    <string name="rich_text_editor_format_underline">Terapkan format garis bawah</string>
+    <string name="rich_text_editor_format_strikethrough">Terapkan format coret</string>
+    <string name="rich_text_editor_format_italic">Terapkan format miring</string>
+    <string name="rich_text_editor_format_bold">Terapkan format tebal</string>
+    <string name="labs_enable_client_info_recording_summary">Rekam nama klien, versi, dan URL untuk lebih mudah mengenal sesi di pengelola sesi.</string>
+    <string name="labs_enable_client_info_recording_title">Aktifkan perekaman info klien</string>
+    <string name="labs_enable_session_manager_summary">Miliki keterlihatan dan kendali yang lebih baik pada semua sesi Anda.</string>
+    <string name="labs_enable_session_manager_title">Aktifkan pengelola sesi baru</string>
+    <string name="device_manager_session_details_device_operating_system">Sistem operasi</string>
+    <string name="device_manager_session_details_device_model">Model</string>
+    <string name="device_manager_session_details_device_browser">Peramban</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">Versi</string>
+    <string name="device_manager_session_details_application_name">Nama</string>
+    <string name="device_manager_session_details_application">Aplikasi</string>
+    <string name="device_manager_push_notifications_description">Terima notifikasi dorongan di sesi ini.</string>
+    <string name="device_manager_push_notifications_title">Notifikasi dorongan</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Verifikasi sesi Anda saat ini untuk menampilkan status verifikasi sesi ini.</string>
+    <string name="device_manager_verification_status_unknown">Status verifikasi tidak diketahui</string>
+    <string name="push_gateway_item_enabled">Diaktifkan:</string>
+    <string name="push_gateway_item_device_id">ID Sesi:</string>
+    <string name="error_check_network">Ada sesuatu yang salah. Mohon periksa koneksi jaringan Anda dan coba lagi.</string>
+    <string name="grant_permission">Berikan Izin</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} membutuhkan izin untuk menampilkan notifikasi.
+\nMohon berikan izin itu.</string>
+    <string name="permissions_rationale_msg_notification">${app_name} membutuhkan izin untuk menampilkan notifikasi. Notifikasi dapat menampilkan pesan Anda, undangan Anda, dll.
+\n
+\nMohon perbolehkan akses di munculan berikutnya untuk dapat melihat notifikasi.</string>
+    <string name="labs_enable_rich_text_editor_summary">Coba editor teks kaya (mode teks biasa akan datang)</string>
+    <string name="labs_enable_rich_text_editor_title">Aktifkan editor teks kaya</string>
+    <string name="qr_code_login_confirm_security_code_description">Pastikan Anda tahu asal kode ini. Dengan menautkan perangkat, Anda akan memberikan seseorang akses penuh ke akun Anda.</string>
+    <string name="qr_code_login_confirm_security_code">Konfirmasi</string>
+    <string name="qr_code_login_try_again">Coba lagi</string>
+    <string name="qr_code_login_status_no_match">Tidak cocok\?</string>
+    <string name="qr_code_login_signing_in">Memasukkan Anda</string>
+    <string name="qr_code_login_connecting_to_device">Menghubungkan ke perangkat</string>
+    <string name="qr_code_login_scan_qr_code_button">Pindai kode QR</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Ingin masuk di perangkat ponsel\?</string>
+    <string name="qr_code_login_show_qr_code_button">Tampilkan kode QR di perangkat ini</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Pilih \'Pindai dengan kode QR\'</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Mulai dari layar masuk</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Pilih \'Masuk dengan kode QR\'</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Mulai dari layar masuk</string>
+    <string name="qr_code_login_new_device_instruction_3">Pilih \'Tampilkan kode QR di perangkat ini\'</string>
+    <string name="qr_code_login_new_device_instruction_2">Pergi ke Pengaturan → Keamanan &amp; Privasi → Tampilkan Semua Sesi</string>
+    <string name="qr_code_login_new_device_instruction_1">Buka ${app_name} di perangkat Anda yang lain</string>
+    <string name="qr_code_login_header_failed_denied_description">Permintaan ditolak di perangkat lain.</string>
+    <string name="qr_code_login_header_failed_timeout_description">Penautan tidak selesai dalam waktu yang dibutuhkan.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Penautan dengan perangkat ini tidak didukung.</string>
+    <string name="qr_code_login_header_failed_title">Koneksi tidak berhasil</string>
+    <string name="qr_code_login_header_connected_description">Periksa perangkat yang masuk, kode di bawah seharusnya ditampilkan. Konfirmasi bahwa kode di bawah cocok dengan perangkat itu:</string>
+    <string name="qr_code_login_header_connected_title">Koneksi aman dibuat</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Pindai kode QR di bawah dengan perangkat Anda yang telah keluar dari akun.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Gunakan perangkat yang sudah masuk untuk memindai kode QR di bawah:</string>
+    <string name="qr_code_login_header_show_qr_code_title">Masuk dengan kode QR</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Gunakan kamera pada perangkat ini untuk memindai kode QR yang ditampilkan pada perangkat Anda yang lain:</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Pindai kode QR</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Anda dapat menggunakan perangkat ini untuk masuk ke perangkat ponsel atau web dengan sebuah kode QR. Ada dua cara untuk melalukan ini:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Masuk dengan Kode QR</string>
+    <string name="login_scan_qr_code">Pindai kode QR</string>
 </resources>

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

@@ -152,7 +152,7 @@
     <string name="settings_version">Útgáfa</string>
     <string name="settings_olm_version">Útgáfa olm</string>
     <string name="settings_app_term_conditions">Skilmálar og kvaðir</string>
-    <string name="settings_third_party_notices">Athugasemdir frá þriðja aðila</string>
+    <string name="settings_third_party_notices">Tilkynningar frá utanaðkomandi aðilum</string>
     <string name="settings_copyright">Höfundarréttur</string>
     <string name="settings_privacy_policy">Meðferð persónuupplýsinga</string>
     <string name="settings_clear_cache">Hreinsa skyndiminni</string>
@@ -1218,7 +1218,7 @@
     <string name="room_list_quick_actions_notifications_all_noisy">Öll skilaboð (hávært)</string>
     <string name="content_reported_as_inappropriate_title">Tilkynnt sem óviðeigandi</string>
     <string name="content_reported_as_spam_title">Tilkynnt sem ruslpóstur</string>
-    <string name="content_reported_title">Efni tilkynnt</string>
+    <string name="content_reported_title">Efni kært</string>
     <string name="report_content_custom_submit">KÆRA</string>
     <string name="report_content_custom_hint">Ástæður fyrir kæru á þessu efni</string>
     <string name="report_content_custom_title">Kæra þetta efni</string>
@@ -1990,7 +1990,7 @@
     <string name="seen_by">Séð af</string>
     <string name="ftue_personalize_skip_this_step">Sleppa þessu skrefi</string>
     <string name="ftue_personalize_submit">Vista og halda áfram</string>
-    <string name="ftue_personalize_complete_subtitle">Farðu hvenær sem er í stillingarnar til að breyta notandasniðinu þínu.</string>
+    <string name="ftue_personalize_complete_subtitle">Farðu hvenær sem er í stillingarnar til að breyta notandasniðinu þínu</string>
     <string name="ftue_personalize_complete_title">Nú ertu tilbúin(n)!</string>
     <string name="ftue_personalize_lets_go">Hefjumst handa</string>
     <string name="ftue_profile_picture_subtitle">Þú getur breytt þessu hvenær sem er</string>
@@ -2214,4 +2214,53 @@
     <string name="explore_rooms">Kanna spjallrásir</string>
     <string name="create_room">Búa til spjallrás</string>
     <string name="start_chat">Hefja spjall</string>
+    <string name="settings_discovery_no_terms">Auðkennisþjónninn sem þú valdir er ekki með neina þjónustuskilmála. Ekki halda áfram nema þú treystir eiganda netþjónsins</string>
+    <string name="settings_troubleshoot_test_token_registration_failed">Mistókst að skrá FCM-teikn á heimaþjóninn:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_token_registration_success">Það tókst að skrá FCM-teikn á heimaþjóninn.</string>
+    <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Ein eða fleiri prófanir mistókust, prófaðu tillögur að lagfæringum.</string>
+    <string name="error_threepid_auth_failed">Gakktu úr skugga um að þú hafir smellt á tengilinn í tölvupóstinum sem við sendum þér.</string>
+    <string name="space_permissions_notice_read_only">Þú hefur ekki heimild til að uppfæra þau hlutverk sem krafist er til að breyta ýmsum þáttum svæðisins</string>
+    <string name="room_permissions_notice_read_only">Þú hefur ekki heimild til að uppfæra þau hlutverk sem krafist er til að breyta ýmsum þáttum spjallrásarinnar</string>
+    <string name="space_permissions_notice">Veldu þau hlutverk sem krafist er til að breyta ýmsum þáttum svæðisins</string>
+    <string name="room_permissions_notice">Veldu þau hlutverk sem krafist er til að breyta ýmsum þáttum spjallrásarinnar</string>
+    <string name="room_unsupported_e2e_algorithm_as_admin">Dulritun er rangt stillt þannig að þú getur ekki sent skilaboð. Smelltu til að opna stillingar.</string>
+    <string name="room_unsupported_e2e_algorithm">Dulritun er rangt stillt þannig að þú getur ekki sent skilaboð. Hafðu samband við einhvern stjórnanda til að koma dulritun í lag.</string>
+    <string name="space_participants_unban_prompt_msg">Afbönnun á þessum notanda mun gera viðkomandi kleift að taka þátt aftur í svæðinu.</string>
+    <string name="room_participants_unban_prompt_msg">Afbönnun á þessum notanda mun gera viðkomandi kleift að taka þátt aftur í spjallrásinni.</string>
+    <string name="space_participants_ban_prompt_msg">Bann á notanda mun henda honum út af þessu svæði og koma í veg fyrir að viðkomandi komi aftur.</string>
+    <string name="space_participants_remove_prompt_msg">Notandinn verður fjarlægður af þessu svæði.
+\n
+\nTil koma í veg fyrir að viðkomandi komi aftur, ætti frekar að banna hann.</string>
+    <string name="room_participants_remove_prompt_msg">Notandinn verður fjarlægður af þessari spjallrás.
+\n
+\nTil koma í veg fyrir að viðkomandi komi aftur, ætti frekar að banna hann.</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">Ertu viss um að þú viljir hætta við boðið til þessa notanda\?</string>
+    <string name="room_participants_action_unignore_prompt_msg">Afhunsun á þessum notanda mun sýna öll skilaboð frá viðkomandi aftur.</string>
+    <string name="room_participants_action_ignore_prompt_msg">Að hunsa þennan notanda mun fjarlægja skilaboð frá viðkomandi í þeim spjallrásum sem þið eigið sameiginlegar.
+\n
+\nÞú getur afturkallað þessa aðgerð hvenær sem er í almennu stillingunum.</string>
+    <string name="room_participants_power_level_demote_warning_prompt">Þú getur ekki afturkallað þessa aðgerð, þar sem þú ert að lækka sjálfa/n þig í tign, og ef þú ert síðasti notandinn með nógu mikil völd á þessari spjallrás, verður ómögulegt að ná aftur stjórn á henni.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">Ræstu ${app_name} á öðru tæki sem getur afkóðað skilaboðin og síðan sent dulritunarlyklana yfir í þessa setu.</string>
+    <string name="e2e_re_request_encryption_key">Biðja aftur um dulritunarlykla frá hinum setunum þínum.</string>
+    <string name="invites_empty_message">Þetta er þar sem nýjar beiðnir og boðsgestir birtast.</string>
+    <string name="space_list_empty_message">Svæði eru ný leið til að hópa fólk og spjallrásir. Útbúðu svæði til að komast í gang.</string>
+    <string name="sign_out_bottom_sheet_warning_backup_not_active">Öryggisafritun dulritunarlykla ætti að vera virk í öllum setunum þínum til að koma í veg fyrir að þú getir tapað aðgangi að dulrituðu skilaboðunum þínum.</string>
+    <string name="initial_sync_request_reason_unignored_users">- Sumir tengiliðir hafa verið afhunsaðir</string>
+    <string name="initial_sync_request_content">${app_name} þarf að hreinsa skyndiminnið til að haldast uppfært, af eftirfarandi ástæðu:
+\n%s\?
+\n
+\nAthugaðu að þessi aðgerð mun endurræsa forritið og það getur tekið nokkurn tíma.</string>
+    <string name="a11y_collapse_space_children">Fella saman undirsvæði %s</string>
+    <string name="a11y_expand_space_children">Fella út undirsvæði %s</string>
+    <string name="ftue_auth_password_reset_email_confirmation_subtitle">Farðu eftir leiðbeiningunum sem sendar voru á %s</string>
+    <string name="ftue_auth_email_verification_footer">Fékkstu ekki tölvupóst\?</string>
+    <string name="ftue_auth_email_verification_subtitle">Farðu eftir leiðbeiningunum sem sendar voru á %s</string>
+    <string name="ftue_auth_new_password_subtitle">Hafðu það að minnsta kosti 8 stafa langt.</string>
+    <string name="ftue_auth_reset_password_email_subtitle">%s mun senda þér staðfestingartengil</string>
+    <string name="ftue_auth_phone_subtitle">%s þarf að sannreyna notandaaðganginn þinn</string>
+    <string name="ftue_auth_email_subtitle">%s þarf að sannreyna notandaaðganginn þinn</string>
+    <string name="ftue_auth_terms_subtitle">Endilega lestu í gegnum stefnur og skilmála fyrir %s</string>
+    <string name="ftue_auth_terms_title">Stefnur netþjónsins</string>
+    <string name="ftue_auth_choose_server_ems_subtitle">Element Matrix Services (EMS) er afkastamikil og áreiðanleg hýsingarþjónusta fyrir hraðvirk og örugg samskipti í rauntíma. Skoðaðu hvernig við förum að því á <a href="${ftue_ems_url}">element.io/ems</a></string>
 </resources>

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

@@ -155,7 +155,7 @@
     <string name="notice_room_guest_access_can_join_by_you">Hai permesso l\'accesso alla stanza per gli ospiti.</string>
     <string name="notice_room_guest_access_forbidden_by_you">Hai impedito l\'accesso alla stanza per gli ospiti.</string>
     <string name="notice_end_to_end_ok_by_you">Hai attivato la crittografia end-to-end.</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Hai attivato la crittografia E2E (algoritmo %1$s sconosciuto).</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Hai attivato la crittografia E2E (algoritmo %1$s non riconosciuto).</string>
     <string name="notice_direct_room_guest_access_forbidden_by_you">Hai impedito l\'accesso alla stanza agli ospiti.</string>
     <string name="notice_direct_room_guest_access_forbidden">%1$s ha impedito l\'accesso alla stanza agli ospiti.</string>
     <string name="notice_direct_room_guest_access_can_join_by_you">Hai permesso l\'accesso agli ospiti.</string>
@@ -889,10 +889,10 @@
     <string name="settings_push_rules">Regole di push</string>
     <string name="settings_push_rules_no_rules">Nessuna regola di push definita</string>
     <string name="settings_push_gateway_no_pushers">Nessun gateway di push registrato</string>
-    <string name="push_gateway_item_app_id">id_app:</string>
+    <string name="push_gateway_item_app_id">ID app:</string>
-    <string name="push_gateway_item_push_key">chiave_push:</string>
+    <string name="push_gateway_item_push_key">Chiave push:</string>
-    <string name="push_gateway_item_app_display_name">nome_visualizzato_app:</string>
+    <string name="push_gateway_item_app_display_name">Nome mostrato app:</string>
-    <string name="push_gateway_item_device_name">nome_sessione:</string>
+    <string name="push_gateway_item_device_name">Nome mostrato sessione:</string>
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Formato:</string>
     <string name="preference_voice_and_video">Audio e Video</string>
@@ -955,11 +955,11 @@
     <string name="settings_discovery_identity_server_info">Attualmente stai usando %1$s per trovare altri utenti ed essere a tua volta rintracciabile da loro.</string>
     <string name="settings_discovery_identity_server_info_none">Attualmente non stai usando alcun server d\'identità. Per trovare e farti rintracciare dagli altri utenti, configurane uno qua sotto.</string>
     <string name="settings_discovery_emails_title">Indirizzi email visibili pubblicamente</string>
-    <string name="settings_discovery_no_mails">Le opzioni su come farsi trovare appariranno dopo che avrai aggiunto un\'email.</string>
+    <string name="settings_discovery_no_mails">Le opzioni su come farsi trovare appariranno dopo che avrai aggiunto un indirizzo email.</string>
     <string name="settings_discovery_no_msisdn">Le opzioni su come farsi trovare appariranno dopo che avrai aggiunto un numero di telefono.</string>
     <string name="settings_discovery_disconnect_identity_server_info">Se ti disconnetti dal server d\'identità gli altri utenti non potranno trovarti e tu non potrai invitarli tramite le loro email o numeri di telefono.</string>
     <string name="settings_discovery_msisdn_title">Numeri di telefono visibili pubblicamente</string>
-    <string name="settings_discovery_confirm_mail">Abbiamo inviato un\'email di conferma a %s, controlla la tua posta e clicca sul link di conferma</string>
+    <string name="settings_discovery_confirm_mail">Abbiamo inviato un\'email a %s, controlla la tua posta e clicca sul link di conferma</string>
     <string name="settings_discovery_enter_identity_server">Inserisci un URL di un server d\'identità</string>
     <string name="settings_discovery_bad_identity_server">Impossibile connettersi al server d\'identità</string>
     <string name="settings_discovery_please_enter_server">Inserisci l\'URL del server d\'identità</string>
@@ -1087,7 +1087,7 @@
     <string name="login_registration_not_supported">L\'applicazione non riesce a creare un account su questo Home Server.
 \n
 \nVuoi registrarti usando un client web\?</string>
-    <string name="login_login_with_email_error">Questa email non è associata ad alcun account.</string>
+    <string name="login_login_with_email_error">Questo indirizzo email non è associato ad alcun account.</string>
     <string name="login_reset_password_on">Reimposta la password su %1$s</string>
     <string name="login_reset_password_notice">Per confermare la nuova password ti verrà inviata un\'email di verifica.</string>
     <string name="login_reset_password_submit">Avanti</string>
@@ -1096,7 +1096,7 @@
     <string name="login_reset_password_warning_title">Attenzione!</string>
     <string name="login_reset_password_warning_content">Cambiando la password verranno reimpostate le chiavi crittografiche E2E di tutte le tue sessioni rendendo illeggibile la cronologia delle chat criptate. Prima di reimpostare la password imposta il Backup delle Chiavi o esporta le chiavi della tua stanza da un\'altra sessione.</string>
     <string name="login_reset_password_warning_submit">Continua</string>
-    <string name="login_reset_password_error_not_found">Questa email non è collegata ad alcun account</string>
+    <string name="login_reset_password_error_not_found">Questo indirizzo email non è collegato ad alcun account</string>
     <string name="login_reset_password_mail_confirmation_title">Controlla la tua posta</string>
     <string name="login_reset_password_mail_confirmation_notice">Un\'email di verifica è stata inviata a %1$s.</string>
     <string name="login_reset_password_mail_confirmation_notice_2">Clicca sul link per confermare la tua nuova password. Una volta fatto, clicca sotto.</string>
@@ -1110,7 +1110,7 @@
 \n
 \nFermare il processo di cambio password\?</string>
     <string name="login_set_email_title">Imposta indirizzo email</string>
-    <string name="login_set_email_notice">Imposta un\'email per recuperare il tuo account. Più tardi potrai decidere se permettere alle persone che conosci di trovarti tramite questa email.</string>
+    <string name="login_set_email_notice">Imposta un indirizzo email per recuperare il tuo account. Più tardi potrai decidere se permettere alle persone che conosci di trovarti tramite questo indirizzo.</string>
     <string name="login_set_email_mandatory_hint">Email</string>
     <string name="login_set_email_optional_hint">Email (facoltativa)</string>
     <string name="login_set_email_submit">Avanti</string>
@@ -1448,7 +1448,7 @@
     <string name="event_redacted">Messaggio rimosso</string>
     <string name="settings_show_redacted">Mostra messaggi rimossi</string>
     <string name="settings_show_redacted_summary">Mostra un segnaposto per i messaggi rimossi</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Ti abbiamo inviato un\'email di conferma a %s, controlla la tua posta e clicca il link di conferma</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Abbiamo inviato un\'email a %s, controlla la tua posta e clicca il link di conferma</string>
     <string name="settings_text_message_sent_wrong_code">Il codice di verifica non è corretto.</string>
     <string name="uploads_media_title">MEDIA</string>
     <string name="uploads_media_no_result">In questa stanza non ci sono file multimediali</string>
@@ -1471,7 +1471,7 @@
     <string name="identity_server_error_outdated_home_server">Questa operazione non è possibile. L\'Home Server è obsoleto.</string>
     <string name="identity_server_error_no_identity_server_configured">Prima configura un server d\'identità.</string>
     <string name="identity_server_error_terms_not_signed">Prima accetta le condizioni del server d\'identità nelle impostazioni.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Per la tua privacy, ${app_name} supporta solo l\'invio di email e numeri di telefono degli utenti in modalità oscurata (hash).</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Per la tua privacy, ${app_name} supporta solo l\'invio di hash degli indirizzi email e dei numeri di telefono degli utenti.</string>
     <string name="identity_server_error_binding_error">L\'associazione è fallita.</string>
     <string name="identity_server_error_no_current_binding_error">Non c\'è alcuna associazione con questo identificativo.</string>
     <string name="identity_server_set_default_notice">Il tuo home server (%1$s) propone di usare %2$s come tuo server d\'identità</string>
@@ -1645,12 +1645,12 @@
     <string name="auth_msisdn_already_defined">Questo numero di telefono è già definito.</string>
     <string name="settings_phone_number_empty">Nessun numero di telefono aggiunto al tuo account</string>
     <string name="settings_emails">Indirizzi email</string>
-    <string name="settings_emails_empty">Nessuna email aggiunta al tuo account</string>
+    <string name="settings_emails_empty">Nessun indirizzo email aggiunto al tuo account</string>
     <string name="settings_phone_numbers">Numeri di telefono</string>
     <string name="settings_remove_three_pid_confirmation_content">Rimuovere %s\?</string>
     <string name="error_threepid_auth_failed">Assicurati di avere cliccato il link nell\'email che ti abbiamo inviato.</string>
     <string name="settings_emails_and_phone_numbers_title">Email e numeri di telefono</string>
-    <string name="settings_emails_and_phone_numbers_summary">Gestisci le email e i numeri di telefono collegati al tuo account Matrix</string>
+    <string name="settings_emails_and_phone_numbers_summary">Gestisci gli indirizzi email e i numeri di telefono collegati al tuo account Matrix</string>
     <string name="settings_text_message_sent_hint">Codice</string>
     <string name="login_msisdn_notice">Si prega di usare il formato internazionale (il numero deve iniziare con \'+\')</string>
     <string name="confirm_your_identity_quad_s">Conferma la tua identità verificando questo accesso, dandogli l\'accesso ai messaggi cifrati.</string>
@@ -1769,7 +1769,7 @@
     <string name="attachment_viewer_item_x_of_y">%1$d di %2$d</string>
     <string name="settings_discovery_consent_action_give_consent">Dai il consenso</string>
     <string name="settings_discovery_consent_action_revoke">Revoca il mio consenso</string>
-    <string name="settings_discovery_consent_notice_on">Hai acconsentito ad inviare email e numeri di telefono a questo server d\'identità per poter rintracciare altri utenti tra i tuoi contatti.</string>
+    <string name="settings_discovery_consent_notice_on">Hai acconsentito ad inviare indirizzi email e numeri di telefono a questo server d\'identità per poter rintracciare altri utenti tra i tuoi contatti.</string>
     <string name="settings_discovery_consent_title">Invia email e numeri di telefono</string>
     <string name="direct_room_user_list_suggestions_title">Suggerimenti</string>
     <string name="direct_room_user_list_known_title">Utenti conosciuti</string>
@@ -1978,7 +1978,7 @@
     <string name="space_type_public">Pubblico</string>
     <string name="create_spaces_private_teammates">Uno Spazio privato per te e i tuoi compagni</string>
     <string name="create_spaces_me_and_teammates">Io e i miei compagni</string>
-    <string name="create_spaces_organise_rooms">Uno Spazio privato per organizzare le tue stanze</string>
+    <string name="create_spaces_organise_rooms">Uno spazio privato per organizzare le tue stanze</string>
     <string name="create_spaces_just_me">Solo io</string>
     <string name="create_spaces_make_sure_access">Assicurati che le persone giuste abbiano accesso a %s.</string>
     <string name="create_spaces_who_are_you_working_with">Con chi stai lavorando\?</string>
@@ -2133,7 +2133,7 @@
     <string name="settings_notification_mentions_and_keywords">Menzioni e parole chiave</string>
     <string name="settings_notification_default">Notifiche predefinite</string>
     <string name="link_this_email_with_your_account">%s nella impostazioni per ricevere inviti direttamente in ${app_name}.</string>
-    <string name="link_this_email_settings_link">Collega questa email con il tuo account</string>
+    <string name="link_this_email_settings_link">Collega questo indirizzo email con il tuo account</string>
     <string name="this_invite_to_this_space_was_sent">Questo invito per questo spazio è stato inviato a %s, la quale non è associata al tuo account</string>
     <string name="this_invite_to_this_room_was_sent">Questo invito per questa stanza è stato inviato a %s, la quale non è associata al tuo account</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">Tutte le stanze in cui sei appariranno nella pagina principale.</string>
@@ -2249,12 +2249,12 @@
     <string name="create_poll_question_title">Domanda o argomento del sondaggio</string>
     <string name="create_poll_title">Crea sondaggio</string>
     <string name="attachment_type_poll">Sondaggio</string>
-    <string name="identity_server_consent_dialog_title_2">Invia email e numeri di telefono a %s</string>
+    <string name="identity_server_consent_dialog_title_2">Invia indirizzi email e numeri di telefono a %s</string>
     <string name="settings_discovery_consent_notice_off_2">I tuoi contatti sono privati. Per trovare utenti dai tuoi contatti, ci serve l\'autorizzazione per inviare le informazioni dei contatti al tuo server d\'identità.</string>
     <string name="shortcut_disabled_reason_sign_out">La sessione è stata disconnessa!</string>
     <string name="shortcut_disabled_reason_room_left">La stanza è stata lasciata!</string>
     <string name="identity_server_consent_dialog_content_question">Sei d\'accordo con l\'invio di queste informazioni\?</string>
-    <string name="identity_server_consent_dialog_content_3">Per trovare i contatti esistenti, devi inviare le informazioni dei contatti (email e numeri di telefono) al tuo server d\'identità. Facciamo un hash dei dati prima di inviarli per privacy.</string>
+    <string name="identity_server_consent_dialog_content_3">Per trovare i contatti esistenti, devi inviare le informazioni dei contatti (indirizzi email e numeri di telefono) al tuo server d\'identità. Facciamo un hash dei dati prima di inviarli per privacy.</string>
     <string name="action_not_now">Non ora</string>
     <string name="delete_poll_dialog_content">Vuoi davvero rimuovere questo sondaggio\? Non potrai recuperarlo una volta rimosso.</string>
     <string name="delete_poll_dialog_title">Rimuovi sondaggio</string>
@@ -2591,7 +2591,6 @@
 \nQuesto homeserver potrebbe non essere configurato per mostrare mappe.</string>
     <string name="a11y_open_settings">Apri le impostazioni</string>
     <string name="all_chats">Tutte le chat</string>
-    <string name="device_manager_settings_active_sessions_show_all">Mostra tutte le sessioni (V2, WIP)</string>
     <string name="device_manager_sessions_other_description">Per una maggiore sicurezza, verifica le tue sessioni e disconnetti quelle che non riconosci o che non usi più.</string>
     <string name="device_manager_sessions_other_title">Altre sessioni</string>
     <string name="settings_sessions_list">Sessioni</string>
@@ -2701,4 +2700,100 @@
     <string name="labs_enable_deferred_dm_summary">Crea messaggio diretto solo al primo messaggio</string>
     <string name="labs_enable_new_app_layout_summary">Un SchildiChat semplificato con schede opzionali</string>
     <string name="labs_enable_new_app_layout_title">Attiva nuova disposizione</string>
+    <string name="device_manager_learn_more_session_rename">Gli altri utenti nei messaggi diretti e nelle stanze in cui entri, possono vedere una lista completa delle tue sessioni.
+\n
+\nIn questo modo hanno la certezza che stanno parlando davvero con te, ma significa anche che possono vedere il nome della sessione che inserisci qui.</string>
+    <string name="device_manager_learn_more_session_rename_title">Rinominare le sessioni</string>
+    <string name="device_manager_learn_more_sessions_verified">Le sessioni verificate hanno effettuato l\'accesso con le tue credenziali e sono state verificate, usando la frase di sicurezza o la verifica incrociata.
+\n
+\nCiò significa che hanno le tue chiavi di crittografia per i messaggi passati, e confermano agli altri utenti con cui comunichi che queste sessioni sono usate da te.</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Sessioni verificate</string>
+    <string name="device_manager_learn_more_sessions_unverified">Le sessioni non verificate sono quelle in cui è stato fatto l\'accesso con le tue credenziali, ma che non sono state verificate.
+\n
+\nDovresti essere particolarmente sicuro di riconoscere queste sessioni dato che potrebbero rappresentare un uso non autorizzato del tuo account.</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Sessioni non verificate</string>
+    <string name="device_manager_learn_more_sessions_inactive">Le sessioni inattive sono quelle che non usi da un po\' di tempo, ma che continuano a ricevere chiavi di crittografia.
+\n
+\nLa rimozione di sessioni inattive migliora la sicurezza e le prestazioni, e ti rende più facile capire se una sessione nuova è sospetta.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Sessioni inattive</string>
+    <string name="device_manager_session_rename_warning">Ricorda che i nomi di sessione sono anche visibili alle persone con cui comunichi.</string>
+    <string name="device_manager_session_rename_description">I nomi di sessione personalizzati possono aiutarti a riconoscere i tuoi dispositivi più facilmente.</string>
+    <string name="device_manager_session_rename_edit_hint">Nome sessione</string>
+    <string name="device_manager_session_rename">Rinomina sessione</string>
+    <string name="device_manager_session_overview_signout">Disconnetti questa sessione</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Non verificata · La sessione attuale</string>
+    <string name="tooltip_attachment_voice_broadcast">Inizia un broadcast vocale</string>
+    <string name="key_authenticity_not_guaranteed">L\'autenticità di questo messaggio cifrato non può essere garantita su questo dispositivo.</string>
+    <string name="settings_security_incognito_keyboard_summary">Richiedi che la tastiera non debba aggiornare dati personalizzati come la cronologia di digitazione e il dizionario in base a cosa digiti nelle conversazioni. Nota che alcune tastiere potrebbero non rispettare questa impostazione.</string>
+    <string name="settings_security_incognito_keyboard_title">Tastiera incognito</string>
+    <string name="command_description_table_flip">Antepone (╯°□°）╯︵ ┻━┻ ad un messaggio di testo</string>
+    <string name="attachment_type_voice_broadcast">Broadcast voce</string>
+    <string name="command_description_devtools">Apri la schermata degli strumenti per sviluppatori</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Hai attivato la crittografia solo per sessioni verificate in tutte le stanze nelle impostazioni di sicurezza.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ Ci sono dispositivi non verificati in questa stanza, non potranno decifrare i messaggi che invii.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Non inviare mai messaggi cifrati a sessioni non verificate in questa stanza.</string>
+    <string name="action_got_it">Capito</string>
+    <string name="rich_text_editor_format_underline">Applica formato sottolineato</string>
+    <string name="rich_text_editor_format_strikethrough">Applica formato sbarrato</string>
+    <string name="rich_text_editor_format_italic">Applica formato corsivo</string>
+    <string name="rich_text_editor_format_bold">Applica formato grassetto</string>
+    <string name="labs_enable_client_info_recording_summary">Registra il nome, la versione e l\'url del client per riconoscere le sessioni più facilmente nel gestore di sessioni.</string>
+    <string name="labs_enable_client_info_recording_title">Attiva registrazione info client</string>
+    <string name="labs_enable_session_manager_summary">Maggiore visibilità e controllo su tutte le tue sessioni.</string>
+    <string name="labs_enable_session_manager_title">Attiva il nuovo gestore di sessioni</string>
+    <string name="device_manager_session_details_device_operating_system">Sistema operativo</string>
+    <string name="device_manager_session_details_device_model">Modello</string>
+    <string name="device_manager_session_details_device_browser">Browser</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">Versione</string>
+    <string name="device_manager_session_details_application_name">Nome</string>
+    <string name="device_manager_session_details_application">Applicazione</string>
+    <string name="device_manager_push_notifications_description">Ricevi notifiche push in questa sessione.</string>
+    <string name="device_manager_push_notifications_title">Notifiche push</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Verifica l\'attuale sessione per rivelare lo stato di verifica di questa sessione.</string>
+    <string name="device_manager_verification_status_unknown">Stato di verifica sconosciuto</string>
+    <string name="push_gateway_item_enabled">Attivato:</string>
+    <string name="push_gateway_item_device_id">ID sessione:</string>
+    <string name="error_check_network">Qualcosa è andato storto. Controlla la tua connessione di rete e riprova.</string>
+    <string name="grant_permission">Concedi l\'autorizzazione</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} chiede l\'autorizzazione per mostrare notifiche.
+\nConcedi l\'autorizzazione.</string>
+    <string name="permissions_rationale_msg_notification">${app_name} chiede l\'autorizzazione per mostrare notifiche. Le notifiche possono mostrare i messaggi, gli inviti, ecc.
+\n
+\nConsenti l\'accesso nelle prossime schermate per potere vedere la notifica.</string>
+    <string name="labs_enable_rich_text_editor_summary">Prova l\'editor in rich text (il testo semplice è in arrivo)</string>
+    <string name="labs_enable_rich_text_editor_title">Attiva editor in rich text</string>
+    <string name="qr_code_login_confirm_security_code_description">Assicurati di conoscere l\'origine di questo codice. Collegando i dispositivi, fornirai a qualcuno l\'accesso totale al tuo account.</string>
+    <string name="qr_code_login_confirm_security_code">Conferma</string>
+    <string name="qr_code_login_try_again">Riprova</string>
+    <string name="qr_code_login_status_no_match">Non corrisponde\?</string>
+    <string name="qr_code_login_signing_in">Accesso in corso</string>
+    <string name="qr_code_login_connecting_to_device">Connessione al dispositivo</string>
+    <string name="qr_code_login_scan_qr_code_button">Scansiona codice QR</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Effettuare l\'accesso in un dispositivo mobile\?</string>
+    <string name="qr_code_login_show_qr_code_button">Mostra codice QR in questo dispositivo</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Seleziona \'Scansiona codice QR\'</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Inizia nella schermata di accesso</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Seleziona ‘Accedi con codice QR’</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Inizia nella schermata di accesso</string>
+    <string name="qr_code_login_new_device_instruction_3">Seleziona ‘Mostra codice QR in questo dispositivo’</string>
+    <string name="qr_code_login_new_device_instruction_2">Vai in Impostazioni -&gt; Sicurezza e privacy -&gt; Mostra tutte le sessioni</string>
+    <string name="qr_code_login_new_device_instruction_1">Apri ${app_name} sull\'altro dispositivo</string>
+    <string name="qr_code_login_header_failed_denied_description">La richiesta è stata negata sull\'altro dispositivo.</string>
+    <string name="qr_code_login_header_failed_timeout_description">Il collegamento non è stato completato nel tempo previsto.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Il collegamento con questo dispositivo non è supportato.</string>
+    <string name="qr_code_login_header_failed_title">Connessione non riuscita</string>
+    <string name="qr_code_login_header_connected_description">Controlla il dispositivo che ha l\'accesso, dovresti vedere il codice sotto. Conferma che il codice corrisponda con quel dispositivo:</string>
+    <string name="qr_code_login_header_connected_title">Connessione sicura stabilita</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Scansiona il codice QR sottostante con il dispositivo che è disconnesso.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Usa il dispositivo che ha l\'accesso per scansionare il codice QR sotto:</string>
+    <string name="qr_code_login_header_show_qr_code_title">Accedi con codice QR</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Usa la fotocamera di questo dispositivo per scansionare il codice QR mostrato nell\'altro dispositivo:</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Scansiona codice QR</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Puoi usare questo dispositivo per accedere in un dispositivo mobile o web con un codice QR. Ci sono due modi:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Accedi con codice QR</string>
+    <string name="login_scan_qr_code">Scansiona codice QR</string>
 </resources>

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

@@ -861,9 +861,7 @@
     <string name="login_a11y_choose_other">בחר שרת בית מותאם אישית</string>
     <string name="login_a11y_choose_modular">בחר שירותי מטריקס אלמנט</string>
     <string name="login_a11y_choose_matrix_org">בחר matrix.org</string>
-    <string name="login_signup_cancel_confirmation_content">חשבונך טרם נוצר.
+    <string name="login_signup_cancel_confirmation_content">חשבונך טרם נוצר. להפסיק את תהליך ההרשמה\?</string>
-\n
-\nלהפסיק את תהליך ההרשמה\?</string>
     <string name="login_signup_cancel_confirmation_title">אזהרה</string>
     <string name="login_signup_error_user_in_use">שם המשתמש הזה תפוס</string>
     <string name="login_signup_submit">הבא</string>
@@ -2304,7 +2302,7 @@
     <string name="ftue_auth_use_case_option_three">קהילות</string>
     <string name="ftue_auth_use_case_option_two">צוותים</string>
     <string name="ftue_auth_use_case_option_one">חברים ומשפחה</string>
-    <string name="ftue_auth_use_case_subtitle">נעזור לך להתחבר.</string>
+    <string name="ftue_auth_use_case_subtitle">נעזור לך להתחבר</string>
     <string name="ftue_auth_use_case_title">עם מי תדברו הכי הרבה\?</string>
     <string name="ftue_auth_carousel_encrypted_body">מוצפן מקצה לקצה ואין צורך במספר טלפון. ללא פרסומות או עיבוד נתונים.</string>
     <string name="ftue_auth_carousel_control_body">בחר היכן השיחות שלך נשמרות, נותן לך שליטה ועצמאות. מחובר דרך Matrix.</string>

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

@@ -987,7 +987,7 @@
     <string name="settings_troubleshoot_test_push_loop_title">プッシュ通知のテスト</string>
     <string name="settings_troubleshoot_test_token_registration_failed">FCMトークンのホームサーバーへの登録に失敗しました:
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_token_registration_success">FCMトークンのホームサーバーへの登録が成功しました。</string>
+    <string name="settings_troubleshoot_test_token_registration_success">FCMトークンがホームサーバーに登録されました。</string>
     <string name="settings_troubleshoot_test_token_registration_title">トークンの登録</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">アカウントを追加</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
@@ -1233,7 +1233,7 @@
     <string name="login_terms_title">続行するには利用規約を承認してください</string>
     <string name="error_terms_not_accepted">ホームサーバーの利用規約を承認したら、再試行してください。</string>
     <string name="login_signup_submit">次に</string>
-    <string name="login_msisdn_confirm_submit">次に</string>
+    <string name="login_msisdn_confirm_submit">次へ</string>
     <string name="login_set_msisdn_submit">次に</string>
     <string name="login_set_email_submit">次に</string>
     <string name="login_reset_password_submit">次に</string>
@@ -1282,9 +1282,9 @@
     <string name="send_suggestion_failed">提案の送信に失敗しました(%s)</string>
     <string name="send_suggestion_sent">ありがとうございます、提案は正常に送信されました</string>
     <string name="settings_troubleshoot_test_token_registration_quick_fix">トークンの登録</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
+    <string name="push_gateway_item_app_display_name">アプリケーションの表示名:</string>
-    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="push_gateway_item_app_id">App ID:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
+    <string name="push_gateway_item_push_key">Push Key:</string>
     <string name="settings_push_gateway_no_pushers">登録されたプッシュゲートウェイはありません</string>
     <string name="settings_push_rules_no_rules">プッシュ通知に関するルールが定義されていません</string>
     <string name="settings_push_rules">プッシュ通知に関するルール</string>
@@ -1383,8 +1383,8 @@
     <string name="settings_discovery_consent_action_revoke">同意を撤回</string>
     <string name="settings_discovery_consent_notice_on">あなたの連絡先から他のユーザーを発見するために、メールアドレスや電話番号をこのIDサーバーに送信することに同意しています。</string>
     <string name="settings_discovery_consent_title">メールと電話番号を送信</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">%sに確認メールを送りました。まず、メールを確認してリンクをクリックしてください</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">%sにメールを送りました。メールを確認してリンクをクリックしてください</string>
-    <string name="settings_discovery_confirm_mail">%sに確認のためのメールを送りました。メールにて確認リンクをクリックしてください</string>
+    <string name="settings_discovery_confirm_mail">%sにメールを送りました。メールの確認リンクをクリックしてください</string>
     <string name="settings_discovery_msisdn_title">発見可能な電話番号</string>
     <string name="settings_discovery_disconnect_identity_server_info">IDサーバーとの接続を解除すると、他のユーザーによって発見されなくなり、また、メールアドレスや電話で他のユーザーを招待することができなくなります。</string>
     <string name="settings_discovery_no_msisdn">電話番号を追加すると、発見可能に設定する電話番号を選択できるようになります。</string>
@@ -1412,7 +1412,7 @@
     <string name="send_suggestion">提案する</string>
     <string name="push_gateway_item_format">フォーマット:</string>
     <string name="push_gateway_item_url">URL:</string>
-    <string name="push_gateway_item_device_name">セッション名:</string>
+    <string name="push_gateway_item_device_name">セッションの表示名:</string>
     <string name="verify_not_me_self_verification">以下のうちいずれかが流出、あるいはハッキングされた恐れがあります。
 \n
 \n- あなたのパスワード
@@ -1696,7 +1696,7 @@
     <string name="room_message_placeholder">メッセージを送る…</string>
     <string name="error_file_too_big_simple">このファイルは大きすぎてアップロードできません。</string>
     <string name="identity_server_consent_dialog_content_question">この情報の送信に同意しますか？</string>
-    <string name="identity_server_consent_dialog_content_3">連絡先を発見するには、連絡先のデータ（電話番号や電子メール）をあなたのIDサーバーに送信する必要があります。プライバシーの保護のため、データは送信前にハッシュ化されます。</string>
+    <string name="identity_server_consent_dialog_content_3">連絡先を発見するには、連絡先のデータ（メールアドレスと電話番号）をあなたのIDサーバーに送信する必要があります。プライバシーの保護のため、データは送信前にハッシュ化されます。</string>
     <string name="identity_server_consent_dialog_title_2">メールアドレスと電話番号を%sに送信</string>
     <string name="settings_discovery_no_policy_provided">このIDサーバーは運営方針を提供していません</string>
     <string name="settings_discovery_hide_identity_server_policy_title">IDサーバーの運営方針を隠す</string>
@@ -2359,4 +2359,104 @@
     <string name="beta_title_bottom_sheet_action">ベータ版</string>
     <string name="beta">ベータ版</string>
     <string name="action_try_it_out">試す</string>
+    <string name="settings_presence_user_always_appears_offline">オフラインモード</string>
+    <string name="invites_empty_title">新着はありません。</string>
+    <string name="initial_sync_request_reason_unignored_users">- ユーザーの無視が解除されました</string>
+    <string name="onboarding_new_app_layout_button_try">試してみる</string>
+    <string name="onboarding_new_app_layout_feedback_message">右上をタップするとフィードバックを送信するオプションが表示されます。</string>
+    <string name="onboarding_new_app_layout_feedback_title">フィードバックを送信</string>
+    <string name="onboarding_new_app_layout_spaces_message">右下からスペースにより早く簡単にアクセスできます。</string>
+    <string name="onboarding_new_app_layout_spaces_title">スペースにアクセス</string>
+    <string name="onboarding_new_app_layout_welcome_message">${app_name}をシンプルにするために、タブはオプションになりました。右上のメニューから管理できます。</string>
+    <string name="onboarding_new_app_layout_welcome_title">新しいレイアウトにようこそ！</string>
+    <string name="settings_autoplay_animated_images_title">アニメーション画像を自動再生</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_failed">エンドポイントのホームサーバーへの登録に失敗しました:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_success">エンドポイントがホームサーバーに登録されました。</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_title">エンドポイントの登録</string>
+    <string name="grant_permission">権限を与える</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name}は通知の表示に権限が必要です。
+\n権限を与えてください。</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="other">%1$sと他%2$d名</item>
+    </plurals>
+    <string name="search_space_two_parents">%1$sと%2$s</string>
+    <string name="threads_labs_enable_notice_message">ホームサーバーがサポートしていないため、スレッド機能は不安定かもしれません。スレッドのメッセージは安定して表示されないおそれがあります。%sスレッド機能を有効にしてよろしいですか？</string>
+    <string name="threads_labs_enable_notice_title">スレッド（ベータ版）</string>
+    <string name="threads_beta_enable_notice_message">スレッドを用いると、会話のテーマを保ったり、会話を追跡したりするのが容易になります。%sスレッドを有効にするとアプリケーションが再起動します。再起動には時間がかかる可能性があります。</string>
+    <string name="threads_beta_enable_notice_title">スレッド（ベータ版）</string>
+    <string name="permissions_rationale_msg_notification">${app_name}は通知を表示するために許可を必要としています。通知にはメッセージや招待などが表示されます。
+\n
+\n通知を表示するには、次のポップアップでアクセスを許可してください。</string>
+    <string name="auth_reset_password_error_unverified">メールアドレスが認証されていません。メールボックスを確認してください</string>
+    <string name="call_stop_screen_sharing">画面共有を停止</string>
+    <string name="call_start_screen_sharing">画面を共有</string>
+    <string name="invites_title">招待</string>
+    <string name="device_manager_push_notifications_title">プッシュ通知</string>
+    <string name="device_manager_session_rename_edit_hint">セッション名</string>
+    <string name="device_manager_session_rename">セッションを改名</string>
+    <string name="device_manager_session_details_device_ip_address">IPアドレス</string>
+    <string name="device_manager_session_details_device_operating_system">オペレーティングシステム</string>
+    <string name="device_manager_session_details_device_model">形式</string>
+    <string name="device_manager_session_details_device_browser">ブラウザー</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">バージョン</string>
+    <string name="device_manager_session_details_application_name">名称</string>
+    <string name="device_manager_session_details_application">アプリケーション</string>
+    <string name="ftue_personalize_skip_this_step">このステップをスキップ</string>
+    <string name="ftue_personalize_complete_title">問題ありません！</string>
+    <string name="ftue_personalize_lets_go">進みましょう</string>
+    <string name="ftue_auth_login_username_entry">ユーザー名 / メールアドレス / 電話番号</string>
+    <string name="ftue_auth_captcha_title">あなたは人間ですか？</string>
+    <string name="ftue_auth_password_reset_email_confirmation_subtitle">%sに送信された手順に従ってください</string>
+    <string name="ftue_auth_password_reset_confirmation">パスワードを再設定</string>
+    <string name="ftue_auth_forgot_password">パスワードを忘れた場合</string>
+    <string name="ftue_auth_email_resend_email">電子メールを再送信</string>
+    <string name="ftue_auth_email_verification_footer">電子メールが届いていませんか？</string>
+    <string name="ftue_auth_email_verification_subtitle">%sに送信された手順に従ってください</string>
+    <string name="ftue_auth_email_verification_title">メールアドレスを認証</string>
+    <string name="ftue_auth_phone_confirmation_resend_code">コードを再送信</string>
+    <string name="ftue_auth_phone_confirmation_subtitle">コードが%sに送信されました</string>
+    <string name="ftue_auth_phone_confirmation_title">電話番号を確認してください</string>
+    <string name="ftue_auth_sign_out_all_devices">全ての端末からサインアウト</string>
+    <string name="ftue_auth_reset_password">パスワードを再設定</string>
+    <string name="ftue_auth_new_password_subtitle">パスワードは8文字以上に設定してください。</string>
+    <string name="ftue_auth_new_password_title">パスワードを選択</string>
+    <string name="ftue_auth_new_password_entry_title">新しいパスワード</string>
+    <string name="ftue_auth_reset_password_breaker_title">電子メールを確認してください。</string>
+    <string name="ftue_auth_reset_password_email_subtitle">%sは認証リンクを送信します</string>
+    <string name="ftue_auth_phone_confirmation_entry_title">確認コード</string>
+    <string name="ftue_auth_phone_entry_title">電話番号</string>
+    <string name="ftue_auth_phone_subtitle">%sはアカウントの認証が必要です</string>
+    <string name="ftue_auth_phone_title">電話番号を入力してください</string>
+    <string name="ftue_auth_email_entry_title">メールアドレス</string>
+    <string name="ftue_auth_email_subtitle">%sはアカウントの認証が必要です</string>
+    <string name="labs_enable_rich_text_editor_title">リッチテキストエディターを有効にする</string>
+    <string name="labs_enable_deferred_dm_summary">最初のメッセージを送信する際にダイレクトメッセージを作成</string>
+    <string name="labs_enable_deferred_dm_title">遅延DMを有効にする</string>
+    <string name="space_list_empty_title">スペースがありません。</string>
+    <string name="labs_enable_new_app_layout_title">新しいレイアウトを有効にする</string>
+    <string name="home_layout_preferences_sort_activity">アクティビティー順</string>
+    <string name="home_layout_preferences_sort_name">アルファベット順</string>
+    <string name="home_layout_preferences_sort_by">並び替え</string>
+    <string name="home_layout_preferences_filters">フィルターを表示</string>
+    <string name="home_layout_preferences">レイアウトの設定</string>
+    <string name="action_got_it">了解</string>
+    <string name="action_next">次へ</string>
+    <string name="action_learn_more">詳しく知る</string>
+    <string name="time_unit_second_short">秒</string>
+    <string name="time_unit_minute_short">分</string>
+    <string name="time_unit_hour_short">時</string>
+    <string name="initial_sync_request_content">${app_name}は以下の理由で、キャッシュを消去して最新の状態にする必要があります。
+\n%s
+\n
+\nアプリケーションが再起動します。再起動には時間がかかる可能性があります。</string>
+    <string name="initial_sync_request_title">初期同期のリクエスト</string>
+    <string name="a11y_collapse_space_children">%sの子スペースを折りたたむ</string>
+    <string name="a11y_expand_space_children">%sの子スペースを展開</string>
+    <string name="explore_rooms">ルームを探索</string>
+    <string name="change_space">スペースを変更</string>
+    <string name="create_room">ルームを作成</string>
+    <string name="start_chat">チャットを開始</string>
+    <string name="all_chats">全ての会話</string>
 </resources>

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

@@ -47,7 +47,8 @@
     <string name="initial_sync_start_importing_account_rooms">초기 동기화:
 \n방 가져오는 중</string>
     <string name="initial_sync_start_importing_account_joined_rooms">초기 동기화:
-\n들어간 방 가져오는 중</string>
+\n대화 가져오는 중
+\n많은 방에 참여하신 경우, 오래 걸릴 수 있습니다</string>
     <string name="initial_sync_start_importing_account_invited_rooms">초기 동기화:
 \n초대받은 방 가져오는 중</string>
     <string name="initial_sync_start_importing_account_left_rooms">초기 동기화:
@@ -958,4 +959,39 @@
     <string name="notice_room_name_changed_by_you">방 이름을 바꾸었습니다: %1$s</string>
     <string name="notice_room_avatar_changed_by_you">방 사진을 바꾸었습니다</string>
     <string name="notice_room_avatar_changed">%1$s님이 방 사진을 바꾸었습니다</string>
+    <string name="initial_sync_request_title">초기 동기화 요청</string>
+    <string name="initial_sync_start_downloading">초기 동기화:
+\n데이터 내려받는 중…</string>
+    <string name="initial_sync_start_server_computing">초기 동기화:
+\n서버 응답을 기다리는 중…</string>
+    <string name="room_displayname_empty_room_was">빈 방 (기존 %s)</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="other">%1$s님, %2$s님, %3$s님과 %4$d님 등</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s님, %2$s님, %3$s님과 %4$s님</string>
+    <string name="room_displayname_3_members">%1$s님, %2$s님과 %3$s님</string>
+    <string name="room_error_access_unauthorized">이 방에 참여할 수 없습니다</string>
+    <string name="explore_rooms">방 둘러보기</string>
+    <string name="create_room">방 만들기</string>
+    <string name="start_chat">채팅 시작</string>
+    <string name="all_chats">모든 채팅</string>
+    <string name="power_level_moderator">중재자</string>
+    <string name="power_level_admin">관리자</string>
+    <string name="notice_widget_modified_by_you">%1$s위젯을 수정했습니다</string>
+    <string name="notice_widget_modified">%1$s님이 %2$s위젯을 수정했습니다</string>
+    <string name="notice_widget_removed_by_you">%1$s위젯을 삭제했습니다</string>
+    <string name="notice_widget_removed">%1$s님이 %2$s위젯을 삭제했습니다</string>
+    <string name="notice_widget_added_by_you">%1$s위젯을 추가했습니다</string>
+    <string name="notice_widget_added">%1$s님이 %2$s위젯을 추가했습니다</string>
+    <string name="notice_room_third_party_registered_invite_by_you">%1$s님의 초대를 수락했습니다</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">%1$s님 초대를 취소했습니다</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s님이 %2$s님 초대를 취소했습니다</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">%1$s님에게 방에 참가하라고 보낸 초대를 취소했습니다</string>
+    <string name="notice_direct_room_third_party_invite_by_you">%1$s님을 초대했습니다</string>
+    <string name="notice_direct_room_third_party_invite">%1$s님이 %2$s님을 초대했습니다</string>
+    <string name="notice_room_third_party_invite_by_you">%1$s님에게 방 초대를 보냈습니다</string>
+    <string name="notice_room_avatar_removed_by_you">방 아바타를 삭제했습니다</string>
+    <string name="notice_room_avatar_removed">%1$s님이 방 아바타를 삭제했습니다</string>
+    <string name="notice_room_topic_removed_by_you">방 주제를 삭제했습니다</string>
+    <string name="notice_room_name_removed_by_you">방 이름을 삭제했습니다</string>
 </resources>

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

@@ -2596,7 +2596,6 @@
     </plurals>
     <string name="search_space_two_parents">%1$s en %2$s</string>
     <string name="auth_reset_password_error_unverified">E-mailadres niet geverifieerd, controleer je inbox</string>
-    <string name="device_manager_settings_active_sessions_show_all">Alle sessies weergeven (V2, WIP)</string>
     <string name="location_share_loading_map_error">Kan kaart niet laden
 \nDeze server is mogelijk niet geconfigureerd om kaarten weer te geven.</string>
     <string name="a11y_open_settings">Open instellingen</string>

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

@@ -2688,7 +2688,6 @@
     <string name="auth_reset_password_error_unverified">Email nie został zweryfikowany, sprawdź swoją skrzynkę</string>
     <string name="settings_troubleshoot_test_endpoint_registration_failed">Nie udało się zarejestrować tokena punktu końcowego na serwerze domowym:
 \n%1$s</string>
-    <string name="device_manager_settings_active_sessions_show_all">Wyświetl wszystkie sesje (V2, WIP)</string>
     <string name="settings_troubleshoot_test_current_gateway">Bieżąca brama: %s</string>
     <string name="settings_troubleshoot_test_current_gateway_title">Wejście</string>
     <string name="settings_troubleshoot_test_current_endpoint_failed">Nie można znaleźć punktu końcowego.</string>

library/ui-strings/src/main/res/values-pt-rBR/strings.xml

@@ -1007,10 +1007,10 @@
     <string name="settings_push_rules">Regras de Push</string>
     <string name="settings_push_rules_no_rules">Nenhuma regra de push definida</string>
     <string name="settings_push_gateway_no_pushers">Nenhum gateway de push registrado</string>
-    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="push_gateway_item_app_id">ID do App:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
+    <string name="push_gateway_item_push_key">Chave Push:</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
+    <string name="push_gateway_item_app_display_name">Nome de Exibição do App:</string>
-    <string name="push_gateway_item_device_name">session_name:</string>
+    <string name="push_gateway_item_device_name">Nome de Exibição da Sessão:</string>
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Formato:</string>
     <string name="preference_voice_and_video">Voz &amp; Vídeo</string>
@@ -1053,12 +1053,12 @@
     <string name="settings_discovery_identity_server_info">Você está atualmente usando %1$s para descobrir e ser descobertável por contatos existentes que você conhece.</string>
     <string name="settings_discovery_identity_server_info_none">Você não está atualmente usando um servidor de identidade. Para descobrir e ser descobertável por contatos existentes que você conhece, configure um abaixo.</string>
     <string name="settings_discovery_emails_title">Endereços de email descobertáveis</string>
-    <string name="settings_discovery_no_mails">Opções de descoberta vão aparecer uma vez que você tenha adicionado um email.</string>
+    <string name="settings_discovery_no_mails">Opções de descoberta vão aparecer uma vez que você tenha adicionado um endereço de email.</string>
     <string name="settings_discovery_no_msisdn">Opções de descoberta vão aparecer uma vez que você tenha adicionado um número de telefone.</string>
     <string name="settings_discovery_disconnect_identity_server_info">Desconectar-se de seu servidor de identidade vai significar que você não vai ser descobertável por outras(os) usuárias(os) e você não vai ser capaz de convidar outras(os) por email ou telefone.</string>
     <string name="settings_discovery_msisdn_title">Números de telefone descobertáveis</string>
-    <string name="settings_discovery_confirm_mail">Nós enviamos a você um email de confirmar para %s, cheque seu email e clique no link de confirmação</string>
+    <string name="settings_discovery_confirm_mail">Nós enviamos um email para %s, cheque seu email e clique no link de confirmação</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Nós enviamos a você um email de confirmar para %s, por favor primeiro cheque seu email e clique no link de confirmação</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Nós enviamos um email para %s, por favor primeiro cheque seu email e clique no link de confirmação</string>
     <string name="settings_discovery_enter_identity_server">Entre um URL de servidor de identidade</string>
     <string name="settings_discovery_bad_identity_server">Não foi possível conectar-se a servidor de identidade</string>
     <string name="settings_discovery_please_enter_server">Por favor entre o url de servidor de identidade</string>
@@ -1171,7 +1171,7 @@
     <string name="login_registration_not_supported">O aplicativo não é capaz de criar uma conta neste servidorcasa.
 \n
 \nVocê quer fazer signup usando um cliente web\?</string>
-    <string name="login_login_with_email_error">Este email não está associado com nenhuma conta.</string>
+    <string name="login_login_with_email_error">Este endereço de email não está associado a nenhuma conta.</string>
     <string name="login_reset_password_on">Resettar senha em %1$s</string>
     <string name="login_reset_password_notice">Um email de verificação vai ser enviado para sua inbox para confirmar definição de sua nova senha.</string>
     <string name="login_reset_password_submit">Próximo</string>
@@ -1180,7 +1180,7 @@
     <string name="login_reset_password_warning_title">Aviso!</string>
     <string name="login_reset_password_warning_content">Mudar sua senha vai resettar quaisquer chaves de encriptação ponta-a-ponta em todas as suas sessões, fazendo histórico de chat encriptado ilegível. Configure Backup de Chave ou exporte suas chaves de sala de uma outra sessão antes de resettar sua senha.</string>
     <string name="login_reset_password_warning_submit">Continuar</string>
-    <string name="login_reset_password_error_not_found">Este email não está linkado a nenhuma conta</string>
+    <string name="login_reset_password_error_not_found">Este endereço de email não está linkado a nenhuma conta</string>
     <string name="login_reset_password_mail_confirmation_title">Cheque sua inbox</string>
     <string name="login_reset_password_mail_confirmation_notice">Um email de verificação foi enviado para %1$s.</string>
     <string name="login_reset_password_mail_confirmation_notice_2">Toque no link para confirmar sua nova senha. Uma vez que você tenha seguido o link que ele contém, clique abaixo.</string>
@@ -1194,7 +1194,7 @@
 \n
 \nPara o processo de mudança de senha\?</string>
     <string name="login_set_email_title">Definir endereço de email</string>
-    <string name="login_set_email_notice">Defina um email para recuperar sua conta. Mais tarde, você pode opcionalmente permitir pessoas que você conhece descobrirem você por seu email.</string>
+    <string name="login_set_email_notice">Defina um endereço de email para recuperar sua conta. Mais tarde, você pode opcionalmente permitir pessoas que você conhece descobrirem você por este endereço.</string>
     <string name="login_set_email_mandatory_hint">Email</string>
     <string name="login_set_email_optional_hint">Email (opcional)</string>
     <string name="login_set_email_submit">Próximo</string>
@@ -1560,7 +1560,7 @@
     <string name="identity_server_error_outdated_home_server">Esta operação não é possível. O servidorcasa está desatualizado.</string>
     <string name="identity_server_error_no_identity_server_configured">Por favor primeiro configure um servidor de identidade.</string>
     <string name="identity_server_error_terms_not_signed">Por favor primeiro aceite os termos do servidor de identidade nas configurações.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Para sua privacidade, ${app_name} somente suporta enviar emails e números de telefone de usuária(o) hashados.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Para sua privacidade, ${app_name} somente suporta enviar endereços de email e números de telefone de usuária(o) hashados.</string>
     <string name="identity_server_error_binding_error">A associação tem falhado.</string>
     <string name="identity_server_error_no_current_binding_error">Não há nenhuma associação atual com este identificador.</string>
     <string name="identity_server_set_default_notice">Seu servidorcasa (%1$s) propõe usar %2$s para seu servidor de identidade</string>
@@ -1654,7 +1654,7 @@
     <string name="no_permissions_to_start_webrtc_call">Você não tem permissão para começar uma chamada nesta sala</string>
     <string name="settings_phone_number_empty">Nenhum número de telefone tem sido adicionado a sua conta</string>
     <string name="settings_emails">Endereços de email</string>
-    <string name="settings_emails_empty">Nenhum email tem sido adicionado a sua conta</string>
+    <string name="settings_emails_empty">Nenhum endereço de email tem sido adicionado a sua conta</string>
     <string name="settings_phone_numbers">Números de telefone</string>
     <string name="settings_remove_three_pid_confirmation_content">Remover %s\?</string>
     <string name="error_threepid_auth_failed">Assegure-se que você tem clicado no link no email que enviamos para você.</string>
@@ -1663,7 +1663,7 @@
         <item quantity="other">%d segundos</item>
     </plurals>
     <string name="settings_emails_and_phone_numbers_title">Emails e números de telefone</string>
-    <string name="settings_emails_and_phone_numbers_summary">Gerenciar emails e números de telefone linkados a sua conta Matrix</string>
+    <string name="settings_emails_and_phone_numbers_summary">Gerenciar endereços de email e números de telefone linkados a sua conta Matrix</string>
     <string name="settings_text_message_sent_hint">Código</string>
     <string name="login_msisdn_notice">Por favor use o formato internacional (número de telefone deve começar com \'+\')</string>
     <string name="confirm_your_identity_quad_s">Confirme sua identidade ao verificar este login, concedendo-lhe acesso a mensagens encriptadas.</string>
@@ -1778,7 +1778,7 @@
     <string name="attachment_viewer_item_x_of_y">%1$d de %2$d</string>
     <string name="settings_discovery_consent_action_give_consent">Dar consentimento</string>
     <string name="settings_discovery_consent_action_revoke">Revogar meu consentimento</string>
-    <string name="settings_discovery_consent_notice_on">Você tem dado seu consentimento para enviar emails e números de telefone para este servidor de identidade para descobrir outras(os) usuárias(os) de seus contatos.</string>
+    <string name="settings_discovery_consent_notice_on">Você tem dado seu consentimento para enviar endereços de email e números de telefone para este servidor de identidade para descobrir outras(os) usuárias(os) de seus contatos.</string>
     <string name="settings_discovery_consent_title">Enviar emails e números de telefone</string>
     <string name="direct_room_user_list_suggestions_title">Sugestões</string>
     <string name="direct_room_user_list_known_title">Usuárias(os) Conhecidas(os)</string>
@@ -2142,7 +2142,7 @@
     <string name="settings_notification_mentions_and_keywords">Menções e Palavrachaves</string>
     <string name="settings_notification_default">Notificações Default</string>
     <string name="link_this_email_with_your_account">%s em Configurações para receber convites diretamente em ${app_name}.</string>
-    <string name="link_this_email_settings_link">Linkar este email com sua conta</string>
+    <string name="link_this_email_settings_link">Linkar este endereço de email com sua conta</string>
     <string name="this_invite_to_this_space_was_sent">Este convite para este espaço foi enviado para %s que não está associado com sua conta</string>
     <string name="this_invite_to_this_room_was_sent">Este convite para esta sala foi enviado para %s que não está associado com sua conta</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">Todas as salas em que você está vão ser mostradas em Home.</string>
@@ -2211,7 +2211,7 @@
     <string name="room_settings_space_access_title">Acesso a espaço</string>
     <string name="room_settings_access_rules_pref_dialog_title">Quem pode acessar\?</string>
     <string name="settings_notification_emails_enable_for_email">Habilitar notificações de email para %s</string>
-    <string name="settings_notification_emails_no_emails">Para receber email com notificação, por favor associe um email a sua conta Matrix</string>
+    <string name="settings_notification_emails_no_emails">Para receber email com notificação, por favor associe um endereço de email a sua conta Matrix</string>
     <string name="settings_notification_emails_category">Notificação de email</string>
     <string name="room_permissions_upgrade_the_space">Fazer upgrade do espaço</string>
     <string name="room_permissions_change_space_name">Mudar nome de espaço</string>
@@ -2258,12 +2258,12 @@
     <string name="create_poll_question_title">Sondar pergunta ou tópico</string>
     <string name="create_poll_title">Criar Sondagem</string>
     <string name="attachment_type_poll">Sondagem</string>
-    <string name="identity_server_consent_dialog_title_2">Enviar emails e números de telefone para %s</string>
+    <string name="identity_server_consent_dialog_title_2">Enviar endereços de email e números de telefone para %s</string>
     <string name="settings_discovery_consent_notice_off_2">Seus contatos são privados. Para descobrir usuárias(os) de seus contatos, você precisa de permissão para enviar info de contato a seu servidor de identidade.</string>
     <string name="shortcut_disabled_reason_sign_out">O signout desta sessão tem sido feito!</string>
     <string name="shortcut_disabled_reason_room_left">Esta sala tem sido saída!</string>
     <string name="identity_server_consent_dialog_content_question">Você concorda em enviar esta info\?</string>
-    <string name="identity_server_consent_dialog_content_3">Para descobrir contatos existentes, você precisa enviar info de contato (emails e números de telefone) para seu servidor de identidade. Nós hashamos seus dados antes de enviar por privacidade.</string>
+    <string name="identity_server_consent_dialog_content_3">Para descobrir contatos existentes, você precisa enviar info de contato (endereços de email e números de telefone) para seu servidor de identidade. Nós hashamos seus dados antes de enviar por privacidade.</string>
     <string name="action_not_now">Não agora</string>
     <string name="delete_poll_dialog_content">Você tem certeza que você quer remover esta sondagem\? Você não vai ser capaz de recuperá-la uma vez removida.</string>
     <string name="delete_poll_dialog_title">Remover sondagem</string>
@@ -2600,7 +2600,6 @@
 \nEste servidor casa pode não estar configurado para exibir mapas.</string>
     <string name="a11y_open_settings">Abrir configurações</string>
     <string name="all_chats">Todos os Chats</string>
-    <string name="device_manager_settings_active_sessions_show_all">Mostrar Todas Sessões (V2, WIP)</string>
     <string name="device_manager_sessions_other_description">Para a melhor segurança, verifique suas sessões e faça signout de qualquer sessão que você não reconhece ou usa mais.</string>
     <string name="device_manager_sessions_other_title">Outras sessões</string>
     <string name="settings_sessions_list">Sessões</string>
@@ -2710,4 +2709,100 @@
     <string name="labs_enable_deferred_dm_title">Habilitar DMs diferidas</string>
     <string name="labs_enable_new_app_layout_summary">Um SchildiChat simplificado com abas opcionais</string>
     <string name="labs_enable_new_app_layout_title">Habilitar novo layout</string>
+    <string name="device_manager_learn_more_session_rename">Outras(os) usuárias(os) em mensagens diretas e salas a que você se junta são capazes de visualizar uma lista completa de suas sessões.
+\n
+\nIsto as/os provê com confiança que elas(es) são estão realmente falando com você, mas também significa que elas(es) veem o nome da sessão que você entrar aqui.</string>
+    <string name="device_manager_learn_more_session_rename_title">Renomeando sessões</string>
+    <string name="device_manager_learn_more_sessions_verified">Sessões verificadas têm feito login com suas credenciais e então têm sido verificadas, ou usando sua frasepasse segura ou por verificação cruzada.
+\n
+\nIsto significa que elas mantêm chaves de encriptação para suas mensagens anteriores, e confirmam a outras(os) usuárias(os) com quem você está comunicando que estas sessões são realmente você.</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Sessões verificadas</string>
+    <string name="device_manager_learn_more_sessions_unverified">Sessões não-verificadas são sessões que você tem feito login com suas credenciais mas não têm sido verificadas cruzado.
+\n
+\nVocê devia especialmente se certificar que você reconhece estas sessões já que elas podiam representar um uso não-autorizado de sua conta.</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Sessões não-verificadas</string>
+    <string name="device_manager_learn_more_sessions_inactive">Sessões inativas são sessões que você não tem usado em algum tempo, mas elas continuam a receber chaves de encriptação.
+\n
+\nRemover sessões inativas melhora segurança e performance, e torna-o mais fácil para você identificar se uma nova sessão é suspeita.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Sessões inativas</string>
+    <string name="device_manager_session_rename_warning">Por favor esteja ciente que nomes de sessões também são visíveis a pessoas com quem você se comunica.</string>
+    <string name="device_manager_session_rename_description">Nomes de sessões personalizadas podem ajudar você a reconhecer seus dispositivos mais facilmente.</string>
+    <string name="device_manager_session_rename_edit_hint">Nome da sessão</string>
+    <string name="device_manager_session_rename">Renomear sessão</string>
+    <string name="device_manager_session_overview_signout">Fazer signout desta sessão</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Não-verificada · Sua sessão atual</string>
+    <string name="tooltip_attachment_voice_broadcast">Começar um broadcast de voz</string>
+    <string name="key_authenticity_not_guaranteed">A autenticidade desta mensagem encriptada não pode ser garantida neste dispositivo.</string>
+    <string name="settings_security_incognito_keyboard_summary">Requisitar que o teclado não devia atualizar quaisquer dados personalizados tais como histórico de digitação e dicionário baseado no que você tem digitado em conversas. Note que alguns teclados podem não respeitar esta configuração.</string>
+    <string name="settings_security_incognito_keyboard_title">Teclado incognito</string>
+    <string name="command_description_table_flip">Prepende (╯°□°）╯︵ ┻━┻ a uma mensagem de texto puro</string>
+    <string name="attachment_type_voice_broadcast">Broadcast de Voz</string>
+    <string name="command_description_devtools">Abrir tela de ferramentas de desenvolvedor(a)</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Você tem habilitado encriptar para sessões verificadas somente para todas as salas em Configurações de Segurança.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ Existem dispositivos não-verificados nesta sala, eles não vão ser capazes de decriptar mensagens que você enviar.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Nunca enviar mensagens encriptadas a sessões não-verificadas nesta sala.</string>
+    <string name="action_got_it">Entendido</string>
+    <string name="rich_text_editor_format_strikethrough">Aplicar formato tachar</string>
+    <string name="rich_text_editor_format_underline">Aplicar formato sublinhar</string>
+    <string name="rich_text_editor_format_italic">Aplicar formato itálico</string>
+    <string name="rich_text_editor_format_bold">Aplicar formato negrito</string>
+    <string name="labs_enable_client_info_recording_summary">Gravar o nome de cliente, versão, e url para reconhecer sessões mais facilmente em gerenciador de sessão.</string>
+    <string name="labs_enable_client_info_recording_title">Habilitar gravação de info de cliente</string>
+    <string name="labs_enable_session_manager_summary">Tenha visibilidade e controle maiores sobre todas suas sessões.</string>
+    <string name="labs_enable_session_manager_title">Habilitar novo gerenciador de sessão</string>
+    <string name="device_manager_session_details_device_operating_system">Sistema operativo</string>
+    <string name="device_manager_session_details_device_model">Modelo</string>
+    <string name="device_manager_session_details_device_browser">Browser</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">Versão</string>
+    <string name="device_manager_session_details_application_name">Nome</string>
+    <string name="device_manager_session_details_application">Aplicativo</string>
+    <string name="device_manager_push_notifications_description">Receber notificações push nesta sessão.</string>
+    <string name="device_manager_push_notifications_title">Notificações push</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Verifique sua sessão atual para revelar o status de verificação desta sessão.</string>
+    <string name="device_manager_verification_status_unknown">Status de verificação desconhecido</string>
+    <string name="push_gateway_item_enabled">Habilitado:</string>
+    <string name="push_gateway_item_device_id">ID da Sessão:</string>
+    <string name="error_check_network">Algo deu errado. Por favor cheque sua conexão de rede e tente de novo.</string>
+    <string name="grant_permission">Conceder Permissão</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} precisa de permissão para mostrar notificações.
+\nPor favor conceda a permissão.</string>
+    <string name="permissions_rationale_msg_notification">${app_name} precisa de permissão para exibir notificações. Notificações podem exibir suas mensagens, seus convites, etc.
+\n
+\nPor favor permita acesso nos próximos pop-ups para ser capaz de visualizar notificação.</string>
+    <string name="labs_enable_rich_text_editor_summary">Experimente o editor de texto rico (modo de texto puro vindo em breve)</string>
+    <string name="labs_enable_rich_text_editor_title">Habilitar editor de texto rico</string>
+    <string name="qr_code_login_confirm_security_code_description">Por favor assegure que você sabe a origem deste código. Ao linkar dispositivos, você vai prover alguém com acesso completo a sua conta.</string>
+    <string name="qr_code_login_confirm_security_code">Confirmar</string>
+    <string name="qr_code_login_try_again">Tentar de novo</string>
+    <string name="qr_code_login_status_no_match">Nenhuma correspondência\?</string>
+    <string name="qr_code_login_signing_in">Fazendo-lhe signin</string>
+    <string name="qr_code_login_connecting_to_device">Conectando a dispositivo</string>
+    <string name="qr_code_login_scan_qr_code_button">Scannar QR code</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Fazendo signin com um dispositivo móvel\?</string>
+    <string name="qr_code_login_show_qr_code_button">Mostrar QR code neste dispositivo</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Selecione \'Scannar QR code\'</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Comece na tela de signin</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Selecione \'Fazer signin com QR code\'</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Comece na tela de signin</string>
+    <string name="qr_code_login_new_device_instruction_3">Selecione \'Mostrar QR code neste dispositivo\'</string>
+    <string name="qr_code_login_new_device_instruction_2">Vá para Configurações -&gt; Segurança &amp; Privacidade -&gt; Mostrar Todas as Sessões</string>
+    <string name="qr_code_login_new_device_instruction_1">Obra ${app_name} em seu outro dispositivo</string>
+    <string name="qr_code_login_header_failed_denied_description">A requisição foi negada no outro dispositivo.</string>
+    <string name="qr_code_login_header_failed_timeout_description">A linkagem não foi completada no tempo requerido.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Linkagem com este dispositivo não é suportado.</string>
+    <string name="qr_code_login_header_failed_title">Conexão malsucedida</string>
+    <string name="qr_code_login_header_connected_description">Cheque seu dispositivo feito signin, o código abaixo deveria ser exibido. Confirme que o código abaixo corresponde com esse dispositivo:</string>
+    <string name="qr_code_login_header_connected_title">Conexão segura estabelecida</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Scanne o QR code abaixo com seu dispositivo que está feito signout.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Use seu dispositivo feito signin para scannar o QR code abaixo:</string>
+    <string name="qr_code_login_header_show_qr_code_title">Fazer signin com QR code</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Use a câmera neste dispositivo para scannar o QR code mostrado em seu outro dispositivo:</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Scannar QR code</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Você pode usar este dispositivo para fazer signin com um dispositivo móvel ou web com um QR code. Existem duas maneiras de fazer isto:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Fazer signin com QR Code</string>
+    <string name="login_scan_qr_code">Scannar QR code</string>
 </resources>

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

@@ -398,8 +398,8 @@
     <string name="settings_pin_missed_notifications">Прикрепить комнаты с отключенными уведомлениями</string>
     <string name="settings_pin_unread_messages">Прикрепить комнаты с непрочитанными сообщениями</string>
     <string name="devices_details_id_title">ID</string>
-    <string name="devices_details_name_title">Публичное имя</string>
+    <string name="devices_details_name_title">Публичное название</string>
-    <string name="devices_details_device_name">Обновить публичное имя</string>
+    <string name="devices_details_device_name">Обновить публичное название</string>
     <string name="devices_details_last_seen_title">Недавно</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
     <string name="devices_delete_dialog_title">Аутентификация</string>
@@ -431,23 +431,23 @@
     <string name="room_settings_set_main_address">Установить как основной адрес</string>
     <string name="room_settings_unset_main_address">Сбросить основной адрес</string>
     <string name="encryption_information_decryption_error">Ошибка дешифровки</string>
-    <string name="encryption_information_device_name">Публичное имя</string>
+    <string name="encryption_information_device_name">Публичное название</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>
     <string name="encryption_export_room_keys_summary">Экспорт ключей в локальный файл</string>
     <string name="encryption_export_export">Экспорт</string>
-    <string name="passphrase_enter_passphrase">Введите парольную фразу</string>
+    <string name="passphrase_enter_passphrase">Введите мнемоническую фразу</string>
-    <string name="passphrase_confirm_passphrase">Подтвердите парольную фразу</string>
+    <string name="passphrase_confirm_passphrase">Подтвердите мнемоническую фразу</string>
     <string name="encryption_import_e2e_room_keys">Импорт E2E ключей комнаты</string>
     <string name="encryption_import_room_keys">Импорт ключей комнаты</string>
     <string name="encryption_import_room_keys_summary">Импортировать ключи из локального файла</string>
     <string name="encryption_import_import">Импорт</string>
     <string name="encryption_never_send_to_unverified_devices_title">Шифровать только для проверенных сессий</string>
     <string name="encryption_never_send_to_unverified_devices_summary">Не отправлять зашифрованные сообщения непроверенным сессиям с этой сессии.</string>
-    <string name="encryption_information_not_verified">Не проверено</string>
+    <string name="encryption_information_not_verified">Не заверено</string>
-    <string name="encryption_information_verified">Проверено</string>
+    <string name="encryption_information_verified">Заверено</string>
     <string name="encryption_information_verify">Подтвердить</string>
     <string name="encryption_information_verify_device_warning">Чтобы убедиться, что этой сессии можно доверять, обратитесь к ее владельцу, используя другие способы (например, лично или по телефону), и спросите, соответствует ли ключ, который он видит в настройках для этой сессии:</string>
     <string name="encryption_information_verify_device_warning2">Если они не совпадают, безопасность вашего общения может быть поставлена под угрозу.</string>
@@ -617,7 +617,7 @@
     </plurals>
     <string name="system_alerts_header">Системные оповещения</string>
     <string name="dialog_title_error">Ошибка</string>
-    <string name="passphrase_create_passphrase">Создать парольную фразу</string>
+    <string name="passphrase_create_passphrase">Создать мнемоническую фразу</string>
     <string name="passphrase_passphrase_does_not_match">Парольные фразы не совпадают</string>
     <string name="resource_limit_contact_admin">свяжитесь с вашим администратором</string>
     <string name="resource_limit_soft_default">Превышен один из ресурсных лимитов сервера, по этому <b>некоторые пользователи не смогут авторизоваться</b>.</string>
@@ -637,7 +637,7 @@
     <string name="settings_call_ringtone_title">Мелодия входящего вызова</string>
     <string name="settings_call_ringtone_dialog_title">Выберите мелодию звонка:</string>
     <string name="video_call_in_progress">Идёт видеозвонок …</string>
-    <string name="room_participants_action_remove">Удалить из чата</string>
+    <string name="room_participants_action_remove">Удалить из комнаты</string>
     <string name="settings_notification_troubleshoot">Поиск проблем с уведомлениями</string>
     <string name="settings_send_typing_notifs">Оправлять уведомления о наборе текста</string>
     <string name="settings_send_markdown">Markdown форматирование</string>
@@ -725,23 +725,23 @@
     <string name="settings_cryptography_manage_keys">Управление криптографическими ключами</string>
     <string name="encryption_settings_manage_message_recovery_summary">Управление резервным копированием ключей</string>
     <string name="notification_silent">Беззвучный</string>
-    <string name="passphrase_empty_error_message">Пожалуйста, введите парольную фразу</string>
+    <string name="passphrase_empty_error_message">Пожалуйста, введите мнемоническую фразу</string>
     <string name="passphrase_passphrase_too_weak">Парольная фраза слишком простая</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Пожалуйста, удалите парольную фразу, если хотите, чтобы ${app_name} сгенерировал ключ восстановления.</string>
+    <string name="keys_backup_passphrase_not_empty_error_message">Пожалуйста, удалите мнемоническую фразу, если хотите, чтобы ${app_name} сгенерировал бумажный ключ.</string>
     <string name="keys_backup_setup_step1_title">Никогда не теряйте зашифрованных сообщений</string>
     <string name="keys_backup_setup_step1_description">Сообщения в зашифрованных комнатах защищены сквозным шифрованием. Ключи для прочтения этих сообщений есть только у вас и получателя(ей).
 \n
 \nНадёжно сохраните резервную копию ключей, чтобы не потерять их.</string>
     <string name="keys_backup_setup_step2_button_title">Установите парольную фразу</string>
-    <string name="keys_backup_setup_step3_copy_button_title">Сохраните ключ восстановления</string>
+    <string name="keys_backup_setup_step3_copy_button_title">Сохранить бумажный ключ</string>
     <string name="keys_backup_setup_step3_button_title">Готово</string>
     <string name="keys_backup_setup_step3_save_button_title">Сохранить как файл</string>
     <string name="keys_backup_setup_step3_please_make_copy">Пожалуйста, сделайте копию</string>
-    <string name="keys_backup_setup_step3_share_intent_chooser_title">Поделиться ключом восстановления с…</string>
+    <string name="keys_backup_setup_step3_share_intent_chooser_title">Поделиться бумажным ключом с…</string>
-    <string name="recovery_key">Ключ для восстановления</string>
+    <string name="recovery_key">Бумажный ключ</string>
     <string name="unexpected_error">Непредвиденная ошибка</string>
     <string name="keys_backup_setup_skip_title">Уверены?</string>
-    <string name="keys_backup_settings_delete_confirm_message">Удалить резервную копию ключей шифрования с сервера? Вы больше не сможете использовать ключ восстановления для чтения истории зашифрованных сообщений.</string>
+    <string name="keys_backup_settings_delete_confirm_message">Удалить резервную копию ключей шифрования с сервера\? Вы больше не сможете использовать бумажный ключ для чтения истории зашифрованных сообщений.</string>
     <string name="keys_backup_settings_delete_confirm_title">Удалить резервную копию</string>
     <string name="keys_backup_settings_deleting_backup">Удаление резервной копии…</string>
     <string name="keys_backup_settings_untrusted_backup">Чтобы использовать резервную копию ключа в этой сессии, восстановите его с помощью своей парольной фразы или ключа восстановления.</string>
@@ -755,17 +755,17 @@
     <string name="keys_backup_settings_status_ok">Резервное копирование ключей успешно настроено для этой сессии.</string>
     <string name="keys_backup_settings_delete_backup_button">Удалить резервную копию</string>
     <string name="keys_backup_settings_restore_backup_button">Восстановить из резервной копии</string>
-    <string name="keys_backup_recovery_code_empty_error_message">Пожалуйста, введите ключ восстановления</string>
+    <string name="keys_backup_recovery_code_empty_error_message">Пожалуйста, введите бумажный ключ</string>
     <string name="keys_backup_unlock_button">Разблокировать историю</string>
     <string name="keys_backup_restoring_waiting_message">Восстановление резервной копии:</string>
-    <string name="keys_backup_restore_key_enter_hint">Введите ключ восстановления</string>
+    <string name="keys_backup_restore_key_enter_hint">Введите бумажный ключ</string>
-    <string name="keys_backup_restore_with_recovery_key">Используйте ключ восстановления для разблокировки истории зашифрованных сообщений</string>
+    <string name="keys_backup_restore_with_recovery_key">Используйте бумажный ключ для разблокировки зашифрованных сообщений</string>
-    <string name="keys_backup_restore_with_passphrase_helper_with_link">Если вы не знаете вашу парольную фразу для восстановления, вы можете %s.</string>
+    <string name="keys_backup_restore_with_passphrase_helper_with_link">Если забыли свою мнемоническую фразу, вы можете %s.</string>
-    <string name="keys_backup_restore_use_recovery_key">используйте ключ восстановления</string>
+    <string name="keys_backup_restore_use_recovery_key">используйте бумажный ключ</string>
     <string name="keys_backup_setup_skip_msg">Вы можете потерять доступ к сообщениям, если выйдете из системы или потеряете это устройство.</string>
     <string name="keys_backup_restore_is_getting_backup_version">Получение версии резервной копии…</string>
-    <string name="keys_backup_restore_with_passphrase">Используйте парольную фразу для разблокировки истории зашифрованных сообщений</string>
+    <string name="keys_backup_restore_with_passphrase">Используйте мнемоническую фразу для разблокировки зашифрованных сообщений</string>
-    <string name="keys_backup_restore_with_key_helper">Потеряли ключ восстановления? В настройках вы можете создать новый.</string>
+    <string name="keys_backup_restore_with_key_helper">Потеряли бумажный ключ\? В настройках вы можете создать новый.</string>
     <string name="keys_backup_restore_success_title">Резервная копия восстановлена %s !</string>
     <string name="keys_backup_settings_invalid_signature_from_unverified_device">Резервная копия имеет недействительную подпись из неподтвержденной сессии %s</string>
     <string name="keys_backup_get_version_error">Не удалось получить последнюю версию ключей восстановления (%s).</string>
@@ -780,9 +780,9 @@
         <item quantity="few">Восстановлены резервные копии с %d ключами.</item>
         <item quantity="many">Восстановлены резервные копии с %d ключами.</item>
     </plurals>
-    <string name="keys_backup_recovery_code_error_decrypt">Невозможно расшифровать резервную копию с помощью этого ключа восстановления: убедитесь, что вы ввели правильный ключ.</string>
+    <string name="keys_backup_recovery_code_error_decrypt">Невозможно расшифровать резервную копию с помощью этого бумажного ключа: пожалуйста, убедитесь, что вы ввели правильный бумажный ключ.</string>
-    <string name="keys_backup_passphrase_error_decrypt">Невозможно расшифровать резервную копию с помощью этого пароля: убедитесь, что вы ввели правильный пароль.</string>
+    <string name="keys_backup_passphrase_error_decrypt">Невозможно расшифровать резервную копию с помощью этой мнемонической фразы: пожалуйста, убедитесь, что вы ввели правильную мнемоническую фразу.</string>
-    <string name="keys_backup_setup_step3_generating_key_status">Генерация ключей восстановления с использованием парольной фразы может занять несколько секунд.</string>
+    <string name="keys_backup_setup_step3_generating_key_status">Генерация бумажного ключа с использованием мнемонической фразы может занять несколько секунд.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
 \nЭта ошибка вне контроля ${app_name}. На телефоне нет учетной записи Google. Пожалуйста, добавьте аккаунт Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
@@ -815,9 +815,9 @@
     <string name="keys_backup_banner_in_progress">Резервное копирование ключей…</string>
     <string name="keys_backup_banner_recover_line1">Никогда не теряйте зашифрованные сообщения</string>
     <string name="keys_backup_setup_step3_share_recovery_file">Поделиться</string>
-    <string name="keys_backup_setup_step3_button_title_no_passphrase">Я сделал копию</string>
+    <string name="keys_backup_setup_step3_button_title_no_passphrase">Я сделал(а) копию</string>
-    <string name="keys_backup_setup_step3_text_line2_no_passphrase">Храните ключ восстановления в надежном месте, например, в диспетчере паролей (или в сейфе)</string>
+    <string name="keys_backup_setup_step3_text_line2_no_passphrase">Храните бумажный ключ в очень надёжном месте, например, в менеджере паролей (или в сейфе)</string>
-    <string name="keys_backup_setup_step2_text_title">Защитите резервную копию парольной фразой.</string>
+    <string name="keys_backup_setup_step2_text_title">Защитите резервную копию мнемонической фразой.</string>
     <string name="encryption_message_recovery">Восстановление зашифрованных сообщений</string>
     <string name="keys_backup_setup">Начать использовать резервное копирование ключей</string>
     <string name="keys_backup_banner_recover_line2">Использовать резервное копирование ключей</string>
@@ -825,16 +825,16 @@
     <string name="keys_backup_banner_update_line1">Новые ключи зашифрованных сообщений</string>
     <string name="keys_backup_setup_step3_text_line1">Ваши ключи копируются.</string>
     <string name="keys_backup_setup_step2_skip_button_title">(Дополнительно) Настройка с ключом восстановления</string>
-    <string name="keys_backup_setup_step1_recovery_key_alternative">Или защитите резервную копию с помощью ключа восстановления, сохранив его в безопасном месте.</string>
+    <string name="keys_backup_setup_step1_recovery_key_alternative">Или защитите резервную копию бумажным ключом, сохранив его в надёжном месте.</string>
     <string name="sign_out_bottom_sheet_warning_backup_not_active">Безопасная резервная копия ключей должна быть активирована на всех ваших сессиях, чтобы не потерять доступ к зашифрованным сообщениям.</string>
-    <string name="keys_backup_setup_step2_text_description">Зашифрованная копия ключей будет храниться на вашем сервере. Для безопасности защитите её парольной фразой.
+    <string name="keys_backup_setup_step2_text_description">Зашифрованная копия ключей будет храниться на вашем сервере. Для безопасности защитите её мнемонической фразой.
 \n
-\nДля максимальной безопасности парольная фраза должна отличаться от пароля вашей учётной записи.</string>
+\nДля максимальной безопасности мнемоническая фраза должна отличаться от пароля вашей учётной записи.</string>
     <string name="keys_backup_setup_step3_text_line2">Ключ восстановления — это страховка, вы можете использовать его для восстановления доступа к вашим зашифрованным сообщениям, если забудете вашу парольную фразу. 
 \nХраните ключ восстановления в надёжном месте, например, в диспетчере паролей (или в сейфе)</string>
     <string name="keys_backup_restoring_importing_keys_waiting_message">Импортирование ключей…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">Скачивание ключей…</string>
-    <string name="keys_backup_restoring_computing_key_waiting_message">Вычисление ключа восстановления…</string>
+    <string name="keys_backup_restoring_computing_key_waiting_message">Вычисление бумажного ключа…</string>
     <string name="action_ignore">Игнорировать</string>
     <string name="action_mark_room_read">Отметить как прочитанное</string>
     <string name="auth_login_sso">Войти с помощью единого входа</string>
@@ -929,10 +929,10 @@
     <string name="settings_preferences">Предпочтения</string>
     <string name="settings_security_and_privacy">Безопасность</string>
     <string name="settings_push_rules">Правила push-уведомлений</string>
-    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="push_gateway_item_app_id">ID приложения:</string>
     <string name="push_gateway_item_push_key">push_key:</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
+    <string name="push_gateway_item_app_display_name">Отображаемое название приложения:</string>
-    <string name="push_gateway_item_device_name">session_name:</string>
+    <string name="push_gateway_item_device_name">Отображаемое название сессии:</string>
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Формат:</string>
     <string name="preference_voice_and_video">Голос и видео</string>
@@ -1219,10 +1219,10 @@
     <string name="room_profile_section_more">Ещё</string>
     <string name="a11y_qr_code_for_verification">QR-код</string>
     <string name="no_connectivity_to_the_server_indicator">Соединение с сервером потеряно</string>
-    <string name="verification_cannot_access_other_session">Используйте пароль восстановления или ключ</string>
+    <string name="verification_cannot_access_other_session">Используйте мнемоническую фразу или бумажный ключ</string>
     <string name="e2e_use_keybackup">Разблокировать историю зашифрованных сообщений</string>
     <string name="verify_cancelled_notice">Проверка была отменена. Вы можете начать проверку снова.</string>
-    <string name="recovery_passphrase">Парольная фраза для восстановления</string>
+    <string name="recovery_passphrase">Мнемоническая фраза</string>
     <string name="enter_account_password">Введите %s, чтобы продолжить.</string>
     <string name="bootstrap_dont_reuse_pwd">Не переиспользуйте пароль учётной записи.</string>
     <string name="bootstrap_loading_text">Это может занять несколько секунд, пожалуйста, наберитесь терпения.</string>
@@ -1314,7 +1314,7 @@
     <string name="settings_secure_backup_reset">Сброс безопасного резервного копирования</string>
     <string name="settings_secure_backup_enter_to_setup">Настроить на этом устройстве</string>
     <string name="settings_secure_backup_section_info">Защитите себя от потери доступа к зашифрованным сообщениям и данным, создав резервные копии ключей шифрования на вашем сервере.</string>
-    <string name="reset_secure_backup_title">Создайте новый ключ безопасности или задайте новую секретную фразу для существующей резервной копии.</string>
+    <string name="reset_secure_backup_title">Создайте новый бумажный ключ или задайте новую мнемоническую фразу для существующей резервной копии.</string>
     <string name="reset_secure_backup_warning">Это заменит ваш текущий ключ или фразу.</string>
     <string name="disabled_integration_dialog_title">Интеграции отключены</string>
     <string name="disabled_integration_dialog_content">Включите «Управление интеграциями» в настройках, чтобы сделать это.</string>
@@ -1326,7 +1326,7 @@
     <string name="encryption_exported_successfully">Ключи успешно экспортированы</string>
     <string name="active_widget_view_action">ОБЗОР</string>
     <string name="active_widgets_title">Активные виджеты</string>
-    <string name="recovery_key_export_saved">Ключ восстановления был сохранён.</string>
+    <string name="recovery_key_export_saved">Бумажный ключ сохранён.</string>
     <string name="secure_backup_banner_setup_line1">Безопасное резервное копирование</string>
     <string name="secure_backup_banner_setup_line2">Защита от потери доступа к зашифрованным сообщениям и данным</string>
     <string name="secure_backup_setup">Настроить безопасное резервное копирование</string>
@@ -1368,7 +1368,7 @@
     <string name="autocomplete_limited_results">Показываем только первые результаты, наберите больше букв…</string>
     <string name="settings_developer_mode_fail_fast_title">Раннее падение</string>
     <string name="settings_developer_mode_fail_fast_summary">${app_name} может падать чаще, когда происходит непредвиденная ошибка</string>
-    <string name="command_description_shrug">Добавляет смайл ¯\\_(ツ)_/¯ в начало сообщения</string>
+    <string name="command_description_shrug">Добавляет ¯\\_(ツ)_/¯ в начало сообщения</string>
     <string name="create_room_encryption_description">После включения шифрования его нельзя отключить.</string>
     <string name="login_error_threepid_denied">Ваш почтовый домен не имеет права регистрироваться на этом сервере</string>
     <string name="verification_conclusion_not_secure">Не безопасно</string>
@@ -1429,9 +1429,9 @@
     <string name="verification_emoji_notice">Сравните уникальные эмодзи, убедившись, что они появились в том же порядке.</string>
     <string name="verification_code_notice">Сравните код с тем, который отображается на экране другого пользователя.</string>
     <string name="verification_conclusion_ok_notice">Сообщения от этого пользователя зашифрованы сквозным шифрованием и не смогут быть прочитаны третьими лицами.</string>
-    <string name="verification_conclusion_ok_self_notice">Ваша новая сессия подтверждена. У нее есть доступ к вашим зашифрованным сообщениям, а другие пользователи увидят его как доверенное.</string>
+    <string name="verification_conclusion_ok_self_notice">Ваша новая сессия подтверждена. Она имеет доступ к вашим зашифрованным сообщениям, и другие пользователи будут воспринимать её как заверенную.</string>
-    <string name="encryption_information_cross_signing_state">Перекрестная подпись</string>
+    <string name="encryption_information_cross_signing_state">Перекрёстная подпись</string>
-    <string name="encryption_information_dg_xsigning_complete">Перекрестная подпись включена
+    <string name="encryption_information_dg_xsigning_complete">Перекрёстная подпись включена
 \nЛичные ключи хранятся на устройстве.</string>
     <string name="encryption_information_dg_xsigning_trusted">Перекрестная подпись включена
 \nКлючи являются доверенными.
@@ -1553,12 +1553,12 @@
     <string name="auth_invalid_login_deactivated_account">Эта учётная запись была деактивирована.</string>
     <string name="bootstrap_enter_recovery">Введите %s, чтобы продолжить</string>
     <string name="use_file">Использовать файл</string>
-    <string name="bootstrap_invalid_recovery_key">Это недействительный ключ восстановления</string>
+    <string name="bootstrap_invalid_recovery_key">Этот бумажный ключ недействителен</string>
-    <string name="recovery_key_empty_error_message">Пожалуйста, введите ключ восстановления</string>
+    <string name="recovery_key_empty_error_message">Пожалуйста, введите бумажный ключ</string>
     <string name="bootstrap_progress_checking_backup">Проверка ключа резервного копирования</string>
     <string name="bootstrap_progress_checking_backup_with_info">Проверка ключа резервного копирования (%s)</string>
     <string name="bootstrap_progress_compute_curve_key">Получение кривой ключа</string>
-    <string name="bootstrap_progress_generating_ssss_recovery">Генерация ключа SSSS из ключа восстановления</string>
+    <string name="bootstrap_progress_generating_ssss_recovery">Генерация ключа SSSS из бумажного ключа</string>
     <string name="bootstrap_progress_storing_in_sss">Сохранение резервной копии ключа в SSSS</string>
     <string name="bootstrap_migration_use_recovery_key">используйте ваш ключ восстановления ключа резервной копии</string>
     <string name="bootstrap_migration_backup_recovery_key">Ключ восстановления ключа резервной копии</string>
@@ -1571,7 +1571,7 @@
 \n${app_name} для Android</string>
     <string name="or_other_mx_capable_client">или другой клиент Matrix поддерживающий перекрестную подпись</string>
     <string name="command_description_discard_session">Принудительно отбрасывает текущую групповую сессию для отправки сообщений в зашифрованную комнату</string>
-    <string name="enter_secret_storage_passphrase_or_key">Чтобы продолжить, используйте ваш %1$s или используйте ваш %2$s.</string>
+    <string name="enter_secret_storage_passphrase_or_key">Чтобы продолжить, используйте %1$s или %2$s.</string>
     <string name="use_recovery_key">Используйте ключ восстановления</string>
     <string name="enter_secret_storage_input_key">Выберите ключ восстановления или введите его вручную, введя или вставив из буфера обмена</string>
     <string name="failed_to_access_secure_storage">Не удалось получить доступ к защищенному хранилищу данных</string>
@@ -1624,13 +1624,13 @@
     <string name="bottom_sheet_setup_secure_backup_submit">Настроить</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_title">Используйте ключ безопасности</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Создайте ключ безопасности для хранения в надежном месте, например в менеджере паролей или сейфе.</string>
-    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Использовать секретную фразу</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Использовать мнемоническую фразу</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Введите секретную фразу, известную только вам, и создайте ключ для резервного копирования.</string>
     <string name="bottom_sheet_save_your_recovery_key_title">Сохраните свой ключ безопасности</string>
-    <string name="bottom_sheet_save_your_recovery_key_content">Храните ключ безопасности в надежном месте, например в менеджере паролей или сейфе.</string>
+    <string name="bottom_sheet_save_your_recovery_key_content">Храните бумажный ключ в надёжном месте, например, в менеджере паролей или в сейфе.</string>
     <string name="set_a_security_phrase_title">Задайте секретную фразу</string>
     <string name="set_a_security_phrase_notice">Введите секретную фразу, известную только вам, для защиты данных на вашем сервере.</string>
-    <string name="set_a_security_phrase_hint">Секретная фраза</string>
+    <string name="set_a_security_phrase_hint">Мнемоническая фраза</string>
     <string name="set_a_security_phrase_again_notice">Для подтверждения введите вашу секретную фразу ещё раз.</string>
     <string name="room_settings_name_hint">Название комнаты</string>
     <string name="room_settings_topic_hint">Тема</string>
@@ -1646,7 +1646,7 @@
     <string name="disclaimer_content">Мы рады сообщить, что сменили имя! Ваше приложение обновлено, и вы вошли в свою учетную запись.</string>
     <string name="disclaimer_negative_button">ПОНЯТНО</string>
     <string name="disclaimer_positive_button">УЗНАТЬ БОЛЬШЕ</string>
-    <string name="save_recovery_key_chooser_hint">Сохранить ключ восстановления в</string>
+    <string name="save_recovery_key_chooser_hint">Сохранить бумажный ключ в</string>
     <string name="loading_contact_book">Получаем ваши контакты…</string>
     <string name="empty_contact_book">Ваша контактная книга пуста</string>
     <string name="contacts_book_title">Книга контактов</string>
@@ -1701,12 +1701,12 @@
     <string name="auth_msisdn_already_defined">Этот номер телефона уже используется.</string>
     <string name="settings_phone_number_empty">В ваш аккаунт не добавлен номер телефона</string>
     <string name="settings_emails">Адрес электронной почты</string>
-    <string name="settings_emails_empty">В ваш аккаунт не добавлен адрес электронной почты</string>
+    <string name="settings_emails_empty">В вашу учётную запись не добавлен адрес электронной почты</string>
     <string name="settings_phone_numbers">Телефонные номера</string>
     <string name="settings_remove_three_pid_confirmation_content">Удалить %s\?</string>
     <string name="error_threepid_auth_failed">Убедитесь, что вы перешли по ссылке в электронном письме, которое мы вам отправили.</string>
     <string name="settings_emails_and_phone_numbers_title">Электронная почта и номера телефонов</string>
-    <string name="settings_emails_and_phone_numbers_summary">Управляйте электронной почтой и номерами телефонов, привязанными к вашей учетной записи Matrix</string>
+    <string name="settings_emails_and_phone_numbers_summary">Управляйте адресами электронной почты и номерами телефонов, привязанными к вашей учётной записи Matrix</string>
     <string name="settings_text_message_sent_hint">Код</string>
     <string name="login_msisdn_notice">Используйте международный формат (номер телефона должен начинаться с \'+\')</string>
     <string name="confirm_your_identity_quad_s">Подтвердите свою личность, проверив этот логин, предоставив ему доступ к зашифрованным сообщениям.</string>
@@ -2275,7 +2275,7 @@
     <string name="room_settings_space_access_title">Доступ к пространству</string>
     <string name="room_settings_access_rules_pref_dialog_title">Кто имеет к этому доступ\?</string>
     <string name="settings_notification_emails_enable_for_email">Включить уведомления по электронной почте для %s</string>
-    <string name="settings_notification_emails_no_emails">Чтобы получать уведомления по электронной почте, пожалуйста, привяжите электронную почту к вашей учетной записи Matrix</string>
+    <string name="settings_notification_emails_no_emails">Чтобы получать уведомления по электронной почте, пожалуйста, привяжите адрес электронной почты к своей учётной записи Matrix</string>
     <string name="settings_notification_emails_category">Уведомление по эл. почте</string>
     <string name="room_permissions_upgrade_the_space">Обновить пространство</string>
     <string name="room_permissions_change_space_name">Изменить название пространства</string>
@@ -2633,7 +2633,7 @@
     <string name="ftue_auth_sign_in_choose_server_header">Где хранятся ваши переписки</string>
     <string name="ftue_auth_create_account_choose_server_header">Где будут храниться ваши переписки</string>
     <string name="ftue_auth_create_account_password_entry_footer">Должно быть 8 или более символов</string>
-    <string name="crosssigning_cannot_verify_this_session">Не удалось подтвердить это устройство</string>
+    <string name="crosssigning_cannot_verify_this_session">Не удалось подтвердить эту сессию</string>
     <string name="permalink_unsupported_groups">Невозможно открыть эту ссылку: сообщества были заменены пространствами</string>
     <string name="ftue_auth_login_username_entry">Имя пользователя / Почта / Телефон</string>
     <string name="ftue_auth_password_reset_email_confirmation_subtitle">Следуйте инструкциям, отправленным на %s</string>
@@ -2664,7 +2664,6 @@
     <string name="device_manager_sessions_other_title">Другие сессии</string>
     <string name="settings_sessions_list">Сессии</string>
     <string name="a11y_create_message">Создать беседу или комнату</string>
-    <string name="device_manager_settings_active_sessions_show_all">Показать все сессии (V2, в разработке)</string>
     <string name="room_list_filter_people">ЛС</string>
     <string name="home_layout_preferences">Настройки вида</string>
     <string name="home_layout_preferences_filters">Фильтры</string>
@@ -2721,7 +2720,7 @@
     <string name="home_empty_space_no_rooms_title">%s
 \nвыглядит слегка пустовато.</string>
     <string name="onboarding_new_app_layout_button_try">Попробовать</string>
-    <string name="device_manager_session_details_description">Сведения о приложении, устройстве и активности.</string>
+    <string name="device_manager_session_details_description">Информация о приложении, устройстве и активности.</string>
     <string name="device_manager_verification_status_detail_current_session_unverified">Подтвердите текущую сессию для более безопасного обмена сообщениями.</string>
     <string name="space_list_empty_title">Пока нет пространств.</string>
     <string name="device_manager_other_sessions_recommendation_description_unverified">Подтвердите свои сессии для более безопасного обмена сообщениями или выйдите из тех, которые более не признаёте или не используете.</string>
@@ -2742,4 +2741,55 @@
     </plurals>
     <string name="device_manager_filter_option_unverified">Незаверенные</string>
     <string name="device_manager_filter_bottom_sheet_title">Фильтр</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Незаверенная · Текущая сессия</string>
+    <string name="device_manager_session_rename">Переименовать сессию</string>
+    <string name="device_manager_session_rename_edit_hint">Название сессии</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">Заверенные</string>
+    <string name="device_manager_session_overview_signout">Выйти из этой сессии</string>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">Неактивные</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">Незаверенные</string>
+    <string name="device_manager_session_rename_warning">Пожалуйста, имейте в виду, что названия сессий также видны людям, с которыми вы общаетесь.</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Заверенные сессии</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Незаверенные сессии</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Неактивные сессии</string>
+    <string name="command_description_table_flip">Добавляет (╯°□°）╯︵ ┻━┻ в начало сообщения</string>
+    <string name="settings_security_incognito_keyboard_title">Приватная клавиатура</string>
+    <string name="settings_security_incognito_keyboard_summary">Запрещает клавиатуре обновлять персональные данные, такие как история набора текста и словарь, на основе того, что вы набрали при общении. Обратите внимание, что некоторые клавиатуры могут не соблюдать эту настройку.</string>
+    <string name="action_got_it">Понятно</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 В настройках безопасности вы включили шифрование только для заверенных сессий во всех комнатах.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Не отправлять зашифрованные сообщения незаверенным сессиям в этой комнате.</string>
+    <string name="device_manager_learn_more_sessions_inactive">Неактивные сессии — это сессии, которыми вы не пользовались определённое время, но они продолжают получать ключи шифрования.
+\n
+\nУдаление неактивных сессий повышает безопасность и производительность, а также облегчает выявление подозрительных новых сессий.</string>
+    <string name="device_manager_learn_more_session_rename_title">Переименование сессий</string>
+    <string name="device_manager_learn_more_session_rename">Другие пользователи в личных сообщениях и комнатах, к которым вы присоединились, могут просматривать весь список ваших сессий.
+\n
+\nЭто даёт им уверенность в том, что они действительно общаются с вами, но это также означает, что они могут видеть название сессии, которое вы ввели здесь.</string>
+    <string name="labs_enable_rich_text_editor_title">Визуальный редактор текста</string>
+    <string name="push_gateway_item_device_id">ID сессии:</string>
+    <string name="device_manager_push_notifications_title">Уведомления</string>
+    <string name="device_manager_push_notifications_description">Получать push-уведомления в этой сессии.</string>
+    <string name="device_manager_session_details_application_url">URL-адрес</string>
+    <string name="device_manager_session_details_application">Приложение</string>
+    <string name="device_manager_session_details_application_name">Название</string>
+    <string name="device_manager_session_details_application_version">Версия</string>
+    <string name="device_manager_session_details_device_browser">Веб-браузер</string>
+    <string name="device_manager_session_details_device_model">Модель</string>
+    <string name="device_manager_session_details_device_operating_system">Операционная система</string>
+    <string name="labs_enable_session_manager_title">Новый менеджер сессий</string>
+    <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+        <item quantity="one">Рассмотрите возможность выхода из старых сессий (%1$d день или дольше), которые вы более не используете.</item>
+        <item quantity="few">Рассмотрите возможность выхода из старых сессий (%1$d дня или дольше), которые вы более не используете.</item>
+        <item quantity="many">Рассмотрите возможность выхода из старых сессий (%1$d дней или дольше), которые вы более не используете.</item>
+        <item quantity="other">Рассмотрите возможность выхода из старых сессий (%1$d дней или дольше), которые вы более не используете.</item>
+    </plurals>
+    <string name="poll_undisclosed_not_ended">Результаты будут видны после завершения опроса</string>
+    <string name="onboarding_new_app_layout_spaces_message">Доступ к пространствам (внизу справа) быстрее и проще, чем когда-либо прежде.</string>
+    <string name="onboarding_new_app_layout_spaces_title">Доступ к пространствам</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="one">Рассмотрите возможность выхода из старых сессий (%1$d день или дольше), которые вы более не используете.</item>
+        <item quantity="few">Рассмотрите возможность выхода из старых сессий (%1$d дня или дольше), которые вы более не используете.</item>
+        <item quantity="many">Рассмотрите возможность выхода из старых сессий (%1$d дней или дольше), которые вы более не используете.</item>
+        <item quantity="other">Рассмотрите возможность выхода из старых сессий (%1$d дней или дольше), которые вы более не используете.</item>
+    </plurals>
 </resources>

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

@@ -1040,8 +1040,8 @@
     <string name="settings_discovery_no_msisdn">Možnosti objavovania sa zobrazia, až keď pridáte telefónne číslo.</string>
     <string name="settings_discovery_disconnect_identity_server_info">Odpojením sa od servera totožností znemožníte ostatným, aby vás našli a tiež nebudete môcť kontakty pozývať zadaním emailovej adresy alebo telefónneho čísla.</string>
     <string name="settings_discovery_msisdn_title">Telefónne čísla, podľa ktorých je vás možné nájsť</string>
-    <string name="settings_discovery_confirm_mail">Odoslali sme vám potvrdzujúci e-mail na adresu %s, skontrolujte svoj e-mail a kliknite na potvrdzujúci odkaz</string>
+    <string name="settings_discovery_confirm_mail">Odoslali sme vám e-mail na adresu %s, skontrolujte svoj e-mail a kliknite na potvrdzujúci odkaz</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Odoslali sme vám potvrdzujúci e-mail na adresu %s, najskôr si prosím skontrolujte svoj e-mail a kliknite na potvrdzujúci odkaz</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Odoslali sme vám e-mail na adresu %s, najskôr si prosím skontrolujte svoj e-mail a kliknite na potvrdzujúci odkaz</string>
     <string name="settings_discovery_enter_identity_server">Zadajte URL adresu servera totožností</string>
     <string name="settings_discovery_bad_identity_server">Nie je možné sa pripojiť k serveru totožností</string>
     <string name="settings_discovery_please_enter_server">Prosím, zadajte URL adresu servera totožností</string>
@@ -1700,7 +1700,7 @@
     <string name="login_set_msisdn_notice2">Prosím, použite medzinárodný formát.</string>
     <string name="login_set_msisdn_notice">Nastavte si telefónne číslo, aby ste voliteľne umožnili ľuďom, ktorých poznáte, aby vás objavili.</string>
     <string name="does_not_look_like_valid_email">Toto nevyzerá ako platná e-mailová adresa</string>
-    <string name="login_set_email_notice">Nastavte si e-mail na obnovenie konta. Neskôr môžete voliteľne povoliť známym, aby vás objavili podľa vášho e-mailu.</string>
+    <string name="login_set_email_notice">Nastavte si e-mail na obnovenie konta. Neskôr môžete voliteľne povoliť svojim známym, aby vás objavili podľa tohto e-mailu.</string>
     <string name="login_set_email_title">Nastaviť e-mailovú adresu</string>
     <string name="login_reset_password_success_submit">Späť na prihlásenie</string>
     <string name="login_reset_password_success_notice">Vaše heslo bolo obnovené.</string>
@@ -1846,7 +1846,7 @@
     <string name="settings_notification_keyword_contains_dot">Kľúčové slová nemôžu začínať na \".\"</string>
     <string name="settings_notification_new_keyword">Pridať nové kľúčové slovo</string>
     <string name="settings_notification_emails_enable_for_email">Povoliť e-mailové oznámenia pre %s</string>
-    <string name="settings_notification_emails_no_emails">Ak chcete dostávať e-mail s upozornením, priraďte e-mail k svojmu kontu Matrix</string>
+    <string name="settings_notification_emails_no_emails">Ak chcete dostávať e-mail s upozornením, priraďte e-mail k svojmu Matrix účtu</string>
     <string name="settings_notification_emails_category">E-mailové oznámenie</string>
     <string name="room_settings_room_notifications_notify_me">Upozorniť ma na</string>
     <string name="settings_notification_notify_me_for">Upozorniť ma na</string>
@@ -1856,10 +1856,10 @@
     <string name="room_settings_mention_and_keyword_only">Iba zmienky a kľúčové slová</string>
     <string name="login_msisdn_error_not_international">Medzinárodné telefónne čísla musia začínať znakom \"+\"</string>
     <string name="identity_server_consent_dialog_content_3">Ak chcete zistiť existujúce kontakty, potrebujete odoslať kontaktné informácie (e-maily a telefónne čísla) na server totožností. Pred odoslaním vaše údaje zahašujeme kvôli ochrane osobných údajov.</string>
-    <string name="identity_server_consent_dialog_title_2">Odoslať e-maily a telefónne čísla na %s</string>
+    <string name="identity_server_consent_dialog_title_2">Odoslať emailové adresy a telefónne čísla na %s</string>
     <string name="settings_discovery_consent_notice_on">Dali ste súhlas na odosielanie e-mailov a telefónnych čísel na tento server totožností na objavenie ďalších používateľov z vašich kontaktov.</string>
     <string name="settings_discovery_consent_title">Odoslať e-maily a telefónne čísla</string>
-    <string name="settings_emails_and_phone_numbers_summary">Spravovať e-maily a telefónne čísla prepojené s vaším účtom Matrix</string>
+    <string name="settings_emails_and_phone_numbers_summary">Spravujte e-maily a telefónne čísla prepojené s vaším účtom Matrix</string>
     <string name="settings_emails_and_phone_numbers_title">Emaily a telefónne čísla</string>
     <string name="change_password_summary">Nastaviť nové heslo k účtu…</string>
     <string name="bootstrap_dont_reuse_pwd">Nepoužívajte heslo k svojmu účtu.</string>
@@ -2650,8 +2650,7 @@
 \nTento domovský server nemusí byť nakonfigurovaný na zobrazovanie máp.</string>
     <string name="a11y_open_settings">Otvoriť nastavenia</string>
     <string name="all_chats">Všetky konverzácie</string>
-    <string name="device_manager_settings_active_sessions_show_all">Zobraziť všetky relácie (V2, WIP)</string>
+    <string name="device_manager_sessions_other_description">V záujme čo najlepšieho zabezpečenia, overte svoje relácie a odhláste sa z každej relácie, ktorú už nepoznáte alebo nepoužívate.</string>
-    <string name="device_manager_sessions_other_description">V záujme čo najlepšieho zabezpečenia overte svoje relácie a odhláste sa z každej relácie, ktorú už nepoznáte alebo nepoužívate.</string>
     <string name="device_manager_sessions_other_title">Iné relácie</string>
     <string name="settings_sessions_list">Relácie</string>
     <string name="a11y_open_spaces">Otvoriť zoznam priestorov</string>
@@ -2764,4 +2763,100 @@
     <string name="labs_enable_deferred_dm_title">Povoliť odložené priame správy</string>
     <string name="labs_enable_new_app_layout_summary">Zjednodušený SchildiChat s voliteľnými kartami</string>
     <string name="labs_enable_new_app_layout_title">Zapnúť nové usporiadanie</string>
+    <string name="device_manager_learn_more_session_rename">Ostatní používatelia v priamych správach a miestnostiach, do ktorých sa pripojíte, si môžu pozrieť úplný zoznam vašich relácií.
+\n
+\nTo im poskytuje istotu, že sa s vami naozaj rozprávajú, ale zároveň to znamená, že vidia názov relácie, ktorý sem zadáte.</string>
+    <string name="device_manager_learn_more_session_rename_title">Premenovanie relácií</string>
+    <string name="device_manager_learn_more_sessions_verified">Overené relácie, do ktorých ste sa prihlásili pomocou svojich prihlasovacích údajov a ktoré boli následne overené buď pomocou vašej bezpečnostnej prístupovej frázy, alebo krížovým overením.
+\n
+\nTo znamená, že majú šifrovacie kľúče pre vaše predchádzajúce správy a potvrdzujú ostatným používateľom, s ktorými komunikujete, že tieto relácie ste skutočne vy.</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Overené relácie</string>
+    <string name="device_manager_learn_more_sessions_unverified">Neoverené relácie sú relácie, do ktorých ste sa prihlásili pomocou svojich prístupových údajov, ale ktoré neboli krížovo overené.
+\n
+\nMali by ste si byť obzvlášť istí, že tieto relácie poznáte, pretože by mohli predstavovať neoprávnené použitie vášho konta.</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Neoverené relácie</string>
+    <string name="device_manager_learn_more_sessions_inactive">Neaktívne relácie sú relácie, ktoré ste určitý čas nepoužívali, ale naďalej dostávajú šifrovacie kľúče.
+\n
+\nOdstránenie neaktívnych relácií zvyšuje bezpečnosť a výkon a uľahčuje identifikáciu podozrivých nových relácií.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Neaktívne relácie</string>
+    <string name="device_manager_session_rename_warning">Uvedomte si, že názvy relácií sú viditeľné aj pre ľudí, s ktorými komunikujete.</string>
+    <string name="device_manager_session_rename_description">Vlastné názvy relácií vám pomôžu ľahšie rozpoznať vaše zariadenia.</string>
+    <string name="device_manager_session_rename_edit_hint">Názov relácie</string>
+    <string name="device_manager_session_rename">Premenovať reláciu</string>
+    <string name="device_manager_session_overview_signout">Odhlásiť sa z tejto relácie</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Neoverená - Vaša aktuálna relácia</string>
+    <string name="tooltip_attachment_voice_broadcast">Spustiť hlasové vysielanie</string>
+    <string name="key_authenticity_not_guaranteed">Vierohodnosť tejto zašifrovanej správy nie je možné zaručiť na tomto zariadení.</string>
+    <string name="settings_security_incognito_keyboard_summary">Požiadajte, aby klávesnica neaktualizovala žiadne personalizované údaje, napríklad históriu písania a slovník, na základe toho, čo ste napísali v konverzáciách. Upozorňujeme, že niektoré klávesnice nemusia toto nastavenie rešpektovať.</string>
+    <string name="settings_security_incognito_keyboard_title">Inkognito klávesnica</string>
+    <string name="command_description_table_flip">Pridá znaky (╯°□°）╯︵ ┻━┻ pred správy vo formáte obyčajného textu</string>
+    <string name="attachment_type_voice_broadcast">Hlasové vysielanie</string>
+    <string name="command_description_devtools">Otvoriť obrazovku vývojárskych nástrojov</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 V Nastaveniach zabezpečenia ste povolili šifrovanie len pre overené relácie pre všetky miestnosti.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ V tejto miestnosti sa nachádzajú neoverené zariadenia, ktoré nebudú schopné dešifrovať odoslané správy.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Nikdy neposielať šifrované správy do neoverených relácií v tejto miestnosti.</string>
+    <string name="action_got_it">Rozumiem</string>
+    <string name="rich_text_editor_format_underline">Použiť formát podčiarknutia</string>
+    <string name="rich_text_editor_format_strikethrough">Použiť formát prečiarknutia</string>
+    <string name="rich_text_editor_format_italic">Použiť formát kurzívou</string>
+    <string name="rich_text_editor_format_bold">Použiť tučný formát</string>
+    <string name="labs_enable_client_info_recording_summary">Zaznamenať názov klienta, verziu a url, aby bolo možné ľahšie rozpoznať relácie v správcovi relácií.</string>
+    <string name="labs_enable_client_info_recording_title">Povoliť zaznamenanie informácií o klientovi</string>
+    <string name="labs_enable_session_manager_summary">Majte lepší prehľad a kontrolu nad všetkými reláciami.</string>
+    <string name="labs_enable_session_manager_title">Použiť nového správcu relácií</string>
+    <string name="device_manager_session_details_device_operating_system">Operačný systém</string>
+    <string name="device_manager_session_details_device_model">Model</string>
+    <string name="device_manager_session_details_device_browser">Prehliadač</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">Verzia</string>
+    <string name="device_manager_session_details_application_name">Názov</string>
+    <string name="device_manager_session_details_application">Aplikácia</string>
+    <string name="device_manager_push_notifications_description">Prijímať push oznámenia v tejto relácii.</string>
+    <string name="device_manager_push_notifications_title">Push oznámenia</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Overením aktuálnej relácie zistíte stav overenia tejto relácie.</string>
+    <string name="device_manager_verification_status_unknown">Neznámy stav overenia</string>
+    <string name="push_gateway_item_enabled">Zapnuté:</string>
+    <string name="push_gateway_item_device_id">ID relácie:</string>
+    <string name="error_check_network">Niečo sa pokazilo. Skontrolujte, prosím, svoje sieťové pripojenie a skúste to znova.</string>
+    <string name="grant_permission">Udeliť oprávnenie</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} potrebuje povolenie na zobrazovanie oznámení.
+\nProsím, udeľte toto povolenie.</string>
+    <string name="permissions_rationale_msg_notification">${app_name} potrebuje povolenie na zobrazovanie oznámení. Oznámenia môžu zobrazovať vaše správy, pozvánky atď.
+\n
+\nPovoľte prístup na ďalších vyskakovacích oknách, aby ste mohli zobrazovať oznámenia.</string>
+    <string name="labs_enable_rich_text_editor_summary">Vyskúšajte rozšírený textový editor (čistý textový režim sa objaví čoskoro)</string>
+    <string name="labs_enable_rich_text_editor_title">Povoliť rozšírený textový editor</string>
+    <string name="qr_code_login_confirm_security_code_description">Uistite sa prosím, že poznáte pôvod tohto kódu. Prepojením zariadení poskytnete niekomu plný prístup k svojmu účtu.</string>
+    <string name="qr_code_login_confirm_security_code">Potvrdiť</string>
+    <string name="qr_code_login_try_again">Skúste to znova</string>
+    <string name="qr_code_login_status_no_match">Nezhoduje sa\?</string>
+    <string name="qr_code_login_signing_in">Prebieha prihlasovanie</string>
+    <string name="qr_code_login_connecting_to_device">Pripájanie k zariadeniu</string>
+    <string name="qr_code_login_scan_qr_code_button">Skenovať QR kód</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Prihlasovanie do mobilného zariadenia\?</string>
+    <string name="qr_code_login_show_qr_code_button">Zobraziť QR kód na tomto zariadení</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Vyberte možnosť \"Skenovať QR kód\"</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Začnite na prihlasovacej obrazovke</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Vyberte možnosť \"Prihlásiť sa pomocou QR kódu\"</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Začnite na prihlasovacej obrazovke</string>
+    <string name="qr_code_login_new_device_instruction_3">Vyberte možnosť \"Zobraziť QR kód na tomto zariadení\"</string>
+    <string name="qr_code_login_new_device_instruction_2">Prejdite do Nastavenia -&gt; Zabezpečenie a súkromie -&gt; Zobraziť všetky relácie</string>
+    <string name="qr_code_login_new_device_instruction_1">Otvorte ${app_name} na vašom druhom zariadení</string>
+    <string name="qr_code_login_header_failed_denied_description">Žiadosť bola na druhom zariadení zamietnutá.</string>
+    <string name="qr_code_login_header_failed_timeout_description">Prepojenie nebolo dokončené v požadovanom čase.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Prepojenie s týmto zariadením nie je podporované.</string>
+    <string name="qr_code_login_header_failed_title">Neúspešné pripojenie</string>
+    <string name="qr_code_login_header_connected_description">Skontrolujte svoje prihlásené zariadenie, mal by sa zobraziť nasledujúci kód. Skontrolujte, či sa nižšie uvedený kód zhoduje s daným zariadením:</string>
+    <string name="qr_code_login_header_connected_title">Zabezpečené pripojenie bolo vytvorené</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Naskenujte nižšie uvedený QR kód pomocou zariadenia, ktoré je odhlásené.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Pomocou prihláseného zariadenia naskenujte nižšie uvedený QR kód:</string>
+    <string name="qr_code_login_header_show_qr_code_title">Prihlásiť sa pomocou QR kódu</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Pomocou fotoaparátu na tomto zariadení naskenujte QR kód zobrazený na vašom druhom zariadení:</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Skenovať QR kód</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Pomocou tohto zariadenia sa môžete prihlásiť do mobilného alebo webového zariadenia pomocou QR kódu. Môžete to urobiť dvoma spôsobmi:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Prihlásiť sa pomocou QR kódu</string>
+    <string name="login_scan_qr_code">Skenovať QR kód</string>
 </resources>

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

@@ -570,8 +570,8 @@
     <string name="settings_discovery_no_msisdn">Upptäckbarhetsalternativ kommer att synas när du har lagt till ett telefonnummer.</string>
     <string name="settings_discovery_disconnect_identity_server_info">Om du kopplar bort från din identitetsserver så kommer du inte att vara upptäckbar av andra användare och du kommer inte kunna bjuda in folk med hjälp av deras e-postadresser eller telefonnummer.</string>
     <string name="settings_discovery_msisdn_title">Upptäckbara telefonnummer</string>
-    <string name="settings_discovery_confirm_mail">Vi skickade ett bekräftelse-e-brev till %s, kolla din e-post och klicka på bekräftelselänken</string>
+    <string name="settings_discovery_confirm_mail">Vi skickade ett e-brev till %s, kolla din e-post och klicka på bekräftelselänken</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Vi skickade ett bekräftelse-e-brev till %s, vänligen kolla din e-post och klicka på bekräftelselänken</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Vi skickade ett e-brev till %s, vänligen kolla din e-post och klicka på bekräftelselänken</string>
     <string name="settings_discovery_enter_identity_server">Skriv in en identitetsserver-URL</string>
     <string name="settings_discovery_bad_identity_server">Kunde inte ansluta till identitetsserver</string>
     <string name="settings_discovery_please_enter_server">Vänligen ange en identitetsserver-URL</string>
@@ -615,7 +615,7 @@
     <string name="login_reset_password_mail_confirmation_submit">Jag har verifierat min e-postadress</string>
     <string name="login_reset_password_success_notice_2">Du har blivit utloggad ur alla sessioner och kommer inte längre motta pushnotiser. För att återaktivera pushnotiser, logga in igen på varje enhet.</string>
     <string name="login_set_email_title">Sätt e-postadress</string>
-    <string name="login_set_email_notice">Sätt en e-postadress för att kunna återförva ditt konto. Senare kan du valfritt låta personer du känner upptäcka dig med din e-postadress.</string>
+    <string name="login_set_email_notice">Sätt en e-postadress för att kunna återförvärva ditt konto. Senare kan du valfritt låta personer du känner upptäcka dig med den här e-postadressen.</string>
     <string name="login_set_email_mandatory_hint">E-post</string>
     <string name="login_set_email_optional_hint">E-post (valfritt)</string>
     <string name="login_set_msisdn_notice">Sätt ett telefonnummer som valfritt kan användas för att vara upptäckbar av folk som känner dig.</string>
@@ -1312,10 +1312,10 @@
     <string name="keys_backup_unable_to_get_keys_backup_data">Ett fel inträffade vid hämtning av nyckelsäkerhetskopia</string>
     <string name="navigate_to_room_when_already_in_the_room">Du tittar redan på det här rummet!</string>
     <string name="settings_push_gateway_no_pushers">Inga registrerade pushgateways</string>
-    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="push_gateway_item_app_id">App-ID:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
+    <string name="push_gateway_item_push_key">Pushnyckel:</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
+    <string name="push_gateway_item_app_display_name">Appens visningsnamn:</string>
-    <string name="push_gateway_item_device_name">session_name:</string>
+    <string name="push_gateway_item_device_name">Sessionens visningsnamn:</string>
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Format:</string>
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Registrera token</string>
@@ -2581,4 +2581,141 @@
     <string name="font_size_section_manually">Välj manuellt</string>
     <string name="font_size_section_auto">Ställ in automatiskt</string>
     <string name="font_size_title">Välj teckenstorlek</string>
+    <string name="command_description_devtools">Öppna utvecklingsverktygsskärmen</string>
+    <string name="timeline_error_room_not_found">Tyvärr hittades inte det här rummet.
+\nVänligen pröva igen senare.%s</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Du har aktiverat kryptering endast till verifierade sessioner för alla rum i säkerhetsinställningarna.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ Det finns overifierade enheter i det här rummet, de kommer inte kunna avkryptera meddelanden du skickar.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Skicka aldrig krypterade meddelanden till overifierade sessioner i det här rummet.</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="one">%1$s och %2$d till</item>
+        <item quantity="other">%1$s och %2$d till</item>
+    </plurals>
+    <string name="search_space_two_parents">%1$s och %2$s</string>
+    <string name="auth_reset_password_error_unverified">E-post inte verifierad, kolla din inkorg</string>
+    <string name="invites_empty_message">Det här är var dina nya förfrågningar och inbjudningar kommer att vara.</string>
+    <string name="invites_empty_title">Inget nytt.</string>
+    <string name="invites_title">Inbjudningar</string>
+    <string name="space_list_empty_message">Utrymmen är ett nytt sätt att gruppera rum och personer. Skapa ett utrymme för att komma igång.</string>
+    <string name="space_list_empty_title">Inga utrymmen än.</string>
+    <string name="labs_enable_deferred_dm_summary">Skapa DM först när du skickar första meddelandet</string>
+    <string name="labs_enable_deferred_dm_title">Aktivera avvaktade DM:er</string>
+    <string name="labs_enable_new_app_layout_summary">En förenklad SchildiChat med valfria flikar</string>
+    <string name="labs_enable_new_app_layout_title">Aktivera ny layout</string>
+    <string name="home_layout_preferences_sort_name">A - Ö</string>
+    <string name="home_layout_preferences_sort_activity">Aktivitet</string>
+    <string name="home_layout_preferences_sort_by">Sortera efter</string>
+    <string name="home_layout_preferences_recents">Visa nyliga</string>
+    <string name="home_layout_preferences_filters">Visa filter</string>
+    <string name="home_layout_preferences">Gränssnittsinställningar</string>
+    <string name="action_got_it">Förstått</string>
+    <string name="a11y_collapse_space_children">Kollapsa underutrymmen för %s</string>
+    <string name="a11y_expand_space_children">Expandera underutrymmen för %s</string>
+    <string name="explore_rooms">Utforska rum</string>
+    <string name="change_space">Byt utrymme</string>
+    <string name="create_room">Skapa rum</string>
+    <string name="start_chat">Starta chatt</string>
+    <string name="all_chats">Alla chattar</string>
+    <string name="device_manager_verification_status_detail_other_session_verified">Den här sessionen är redo för säkra meddelanden.</string>
+    <string name="device_manager_verification_status_detail_current_session_verified">Din nuvarande session är redo för säkra meddelanden.</string>
+    <string name="device_manager_verification_status_unverified">Overifierad session</string>
+    <string name="device_manager_verification_status_verified">Verifierad session</string>
+    <string name="a11y_device_manager_device_type_unknown">Okänd enhetstyp</string>
+    <string name="a11y_device_manager_device_type_desktop">Skrivbord</string>
+    <string name="a11y_device_manager_device_type_web">Webb</string>
+    <string name="a11y_device_manager_device_type_mobile">Mobil</string>
+    <string name="device_manager_sessions_other_description">För bäst säkerhet, verifiera dina sessioner och logga ut från alla sessioner du inte känner igen eller använder längre.</string>
+    <string name="device_manager_sessions_other_title">Andra sessioner</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">Godkänn automatiskt Element Call-widgets och ge kamera-/mikrofonåtkomst</string>
+    <string name="labs_enable_element_call_permission_shortcuts">Aktivera Element Call-behörighetsgenvägar</string>
+    <string name="tooltip_attachment_voice_broadcast">Starta en röstsändning</string>
+    <string name="live_location_description">Realtidsplats</string>
+    <string name="location_share_loading_map_error">Kunde inte ladda kartan.
+\nDen här hemservern kanske inte är konfigurerad för at visa kartor.</string>
+    <string name="a11y_open_settings">Öppna inställningar</string>
+    <string name="key_authenticity_not_guaranteed">Autenticiteten för det krypterade meddelanden kan inte garanteras på den här enheten.</string>
+    <string name="settings_security_incognito_keyboard_summary">Begär att tangentbordet inte ska uppdatera någon personanpassad data som skrivhistorik och ordlista baserat på vad du har skrivit i konversationer. Observera att vissa tangentbord inte respekterar den här inställningen.</string>
+    <string name="settings_security_incognito_keyboard_title">Inkognitotangentbord</string>
+    <string name="verify_invalid_qr_notice">Det här QR-koden ser ogiltig ut. Vänligen pröva igen för att verifiera med en annan metod.</string>
+    <string name="crosssigning_cannot_verify_this_session_desc">Du kommer inte komma åt krypterad meddelandehistorik. Återställ din säkra meddelandesäkerhetskopia och verifieringsnycklar för att börja om.</string>
+    <string name="crosssigning_cannot_verify_this_session">Kunde inte verifiera den här enheten</string>
+    <string name="settings_sessions_list">Sessioner</string>
+    <string name="command_description_table_flip">Lägger till (╯°□°）╯︵ ┻━┻ till början av ett textmeddelande</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">Vad är din servers adress\?</string>
+    <string name="ftue_auth_sign_in_choose_server_header">Där dina konversationer bor</string>
+    <string name="attachment_type_voice_broadcast">Röstsändning</string>
+    <string name="a11y_open_spaces">Öppna utrymmeslista</string>
+    <string name="a11y_create_message">Skapa den ny konversation eller ett nytt rum</string>
+    <string name="updating_your_data">Uppdaterar din data…</string>
+    <string name="room_list_filter_people">Personer</string>
+    <string name="room_list_filter_favourites">Favoriter</string>
+    <string name="room_list_filter_unreads">Olästa</string>
+    <string name="room_list_filter_all">Alla</string>
+    <string name="device_manager_push_notifications_title">Pushnotiser</string>
+    <string name="device_manager_session_details_description">Applikations-, enhets- och aktivitetsinformation.</string>
+    <string name="device_manager_session_details_title">Sessionsdetaljer</string>
+    <string name="device_manager_session_overview_signout">Logga ut ur den här sessionen</string>
+    <string name="device_manager_other_sessions_clear_filter">Rensa filter</string>
+    <string name="device_manager_other_sessions_no_inactive_sessions_found">Inga inaktiva sessioner hittade.</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">Inga overifierade sessioner hittade.</string>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">Inga verifierade sessioner hittade.</string>
+    <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+        <item quantity="one">Överväg att logga ut ur gamla sessioner (%1$d dag eller längre) du inte använder längre.</item>
+        <item quantity="other">Överväg att logga ut ur gamla sessioner (%1$d dagar eller längre) du inte använder längre.</item>
+    </plurals>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">Inaktiv</string>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">Verifiera dina sessioner för förbättrad säker meddelandehantering eller logga ut ur de du inte känner igen eller använder längre.</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">Overifierad</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">För bäst säkerhet, logga ut från sessioner du inte känner igen eller använder längre.</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">Verifierad</string>
+    <string name="a11y_device_manager_filter">Filter</string>
+    <plurals name="device_manager_inactive_sessions_description">
+        <item quantity="one">Överväg att logga ut ur gamla sessioner (%1$d dag eller längre) som du inte använder längre.</item>
+        <item quantity="other">Överväg att logga ut ur gamla sessioner (%1$d dagar eller längre) som du inte använder längre.</item>
+    </plurals>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="one">Inaktiv %1$d dag eller längre</item>
+        <item quantity="other">Inaktiv %1$d dagar eller längre</item>
+    </plurals>
+    <string name="device_manager_filter_option_inactive">Inaktiv</string>
+    <string name="device_manager_filter_option_unverified_description">Inte redo för säkra meddelanden</string>
+    <string name="device_manager_filter_option_unverified">Overifierad</string>
+    <string name="device_manager_filter_option_verified_description">Redo för säkra meddelanden</string>
+    <string name="device_manager_filter_option_verified">Verifierade</string>
+    <string name="device_manager_filter_option_all_sessions">Alla sessioner</string>
+    <string name="device_manager_filter_bottom_sheet_title">Filter</string>
+    <string name="device_manager_session_last_activity">Senast aktiv %1$s</string>
+    <string name="device_manager_device_title">Enhet</string>
+    <string name="device_manager_session_title">Session</string>
+    <string name="device_manager_current_session_title">Nuvarande session</string>
+    <string name="device_manager_inactive_sessions_title">Inaktiva sessioner</string>
+    <string name="device_manager_unverified_sessions_description">Verifiera eller logga ut ur overifierade sessioner.</string>
+    <string name="device_manager_unverified_sessions_title">Overifierade sessioner</string>
+    <string name="device_manager_header_section_security_recommendations_description">Förbättra din kontosäkerhet genom att följa dessa rekommendationer.</string>
+    <string name="device_manager_header_section_security_recommendations_title">Säkerhetsrekommendationer</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">Inaktiv %1$d+ dag (%2$s)</item>
+        <item quantity="other">Inaktiv %1$d+ dagar (%2$s)</item>
+    </plurals>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Overifierad · Din nuvarande session</string>
+    <string name="device_manager_other_sessions_description_unverified">Overifierad · Senast aktiv %1$s</string>
+    <string name="device_manager_other_sessions_description_verified">Verifierad · Senast aktiv %1$s</string>
+    <string name="device_manager_other_sessions_view_all">Visa alla (%1$d)</string>
+    <string name="device_manager_view_details">Visa detaljer</string>
+    <string name="device_manager_verify_session">Verifiera session</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Verifiera din nuvarande session för att visa den här sessionens verifieringsstatus.</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">Verifiera eller logga ut från den här sessionen för bäst säkerhet och pålitlighet.</string>
+    <string name="device_manager_verification_status_detail_current_session_unverified">Verifiera din nuvarande session för förbättrad säker meddelandehantering.</string>
+    <string name="device_manager_verification_status_unknown">Okänd verifieringsstatus</string>
+    <string name="push_gateway_item_enabled">Aktiverad:</string>
+    <string name="push_gateway_item_device_id">Sessions-ID:</string>
+    <string name="error_check_network">Nåt gick fel. Kolla din nätverksanslutning och pröva igen.</string>
+    <string name="grant_permission">Ge åtkomst</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} behöver behörighet att visa aviseringar.
+\nVänligen ge åtkomst.</string>
+    <string name="permissions_rationale_msg_notification">${app_name} behöver behörighet att visa aviseringar. Aviseringar kan visa dina meddelanden, dina inbjudningar, o.s.v.
+\n
+\nVänligen ge åtkomst på nästa pop-uper för att kunna se aviseringar.</string>
+    <string name="labs_enable_rich_text_editor_title">Aktivera rik-text-redigerare</string>
+    <string name="labs_enable_rich_text_editor_summary">Testa den nya rik-text-redigeraren</string>
 </resources>

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

@@ -675,8 +675,8 @@
     <string name="uploads_files_no_result">У цій кімнаті немає файлів</string>
     <string name="uploads_files_subtitle">%1$s о %2$s</string>
     <string name="settings_phone_number_empty">Жодного номера телефону не додано до вашого облікового запису</string>
-    <string name="settings_emails_empty">У ваш обліковий запис не додано жодної електронної адреси</string>
+    <string name="settings_emails_empty">У ваш обліковий запис не додано жодної адреси електронної адреси</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Для вашої приватності ${app_name} підтримує лише надсилання хешованих електронних адрес користувачів та номера телефону.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Для вашої приватності ${app_name} підтримує лише надсилання хешованих електронних адрес користувачів та номерів телефону.</string>
     <string name="settings_discovery_consent_notice_on">Ви погодилися надіслати електронні адреси та телефонні номери на цей сервер ідентифікації для виявлення інших користувачів із ваших контактів.</string>
     <string name="settings_discovery_consent_title">Надіслати електронні адреси та номери телефонів</string>
     <string name="settings_emails_and_phone_numbers_summary">Керування електронними адресами та номерами телефонів, пов’язаними з вашим обліковим записом Matrix</string>
@@ -1740,10 +1740,10 @@
     <string name="feedback">Відгук</string>
     <string name="push_gateway_item_format">Формат:</string>
     <string name="push_gateway_item_url">Url:</string>
-    <string name="push_gateway_item_device_name">session_name:</string>
+    <string name="push_gateway_item_device_name">Показувана назва сеансу:</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
+    <string name="push_gateway_item_app_display_name">Показувана назва застосунку:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
+    <string name="push_gateway_item_push_key">Ключ Push:</string>
-    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="push_gateway_item_app_id">ID застосунку:</string>
     <string name="settings_sdk_version">Версія Matrix SDK</string>
     <string name="create_room_federation_error">Кімнату створено, але деякі запрошення не надіслано з такої причини:
 \n
@@ -1814,8 +1814,8 @@
     <string name="error_network_timeout">Схоже, що відповідь сервера надто тривала, це може бути спричинено або поганим з’єднанням, або помилкою сервера. Повторіть спробу через деякий час.</string>
     <string name="error_terms_not_accepted">Повторіть спробу, коли погодитесь з умовами свого домашнього сервера.</string>
     <string name="settings_text_message_sent">Текстове повідомлення надіслано на %s. Введіть код підтвердження, який воно містить.</string>
-    <string name="settings_discovery_confirm_mail">Ми надіслали вам електронний лист для підтвердження на %s, відкрийте свою е-пошту та клацніть на посилання для підтвердження</string>
+    <string name="settings_discovery_confirm_mail">Ми надіслали вам електронний лист на %s, відкрийте свою е-пошту та клацніть на посилання для підтвердження</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Ми надіслали вам електронний лист для підтвердження на %s, відкрийте свою е-пошту та клацніть на посилання для підтвердження</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Ми надіслали вам електронний лист на %s, відкрийте свою е-пошту та клацніть на посилання для підтвердження</string>
     <string name="sent_a_poll">Опитування</string>
     <string name="sent_a_file">Файл</string>
     <string name="sent_a_voice_message">Голосове</string>
@@ -1877,7 +1877,7 @@
     <string name="login_signup_submit">Далі</string>
     <string name="login_reset_password_submit">Далі</string>
     <string name="login_reset_password_on">Скинути пароль на %1$s</string>
-    <string name="login_login_with_email_error">Ця е-пошта не пов\'язана з жодним обліковим записом.</string>
+    <string name="login_login_with_email_error">Ця адреса е-пошти не пов\'язана з жодним обліковим записом.</string>
     <string name="login_registration_disabled">Перепрошуємо, сервер не приймає нових облікових записів.</string>
     <string name="login_sso_error_message">Сталася помилка під час завантаження сторінки: %1$s (%2$d)</string>
     <string name="login_server_url_form_common_notice">Введіть адресу сервера, який ви хочете використовувати</string>
@@ -1895,7 +1895,7 @@
     <string name="login_connect_to_modular">Під\'єднатися до Element Matrix Services</string>
     <string name="login_connect_to">Під\'єднатися до %1$s</string>
     <string name="login_reset_password_mail_confirmation_title">Перевірти вхідні</string>
-    <string name="login_reset_password_error_not_found">Ця е-пошта не пов\'язана з жодним обліковим записом</string>
+    <string name="login_reset_password_error_not_found">Ця адреса е-пошти не пов\'язана з жодним обліковим записом</string>
     <string name="login_reset_password_warning_submit">Продовжити</string>
     <string name="login_continue">Продовжити</string>
     <string name="login_social_sso">єдиний вхід</string>
@@ -1948,7 +1948,7 @@
     <string name="finish_setting_up_discovery">Завершити налаштування виявності.</string>
     <string name="settings_discovery_msisdn_title">Виявні номери телефону</string>
     <string name="settings_discovery_no_msisdn">Опції виявності з\'являться після додавання номера телефону.</string>
-    <string name="settings_discovery_no_mails">Опції виявності з\'являться після додавання е-пошти.</string>
+    <string name="settings_discovery_no_mails">Опції виявності з\'являться після додавання адреси е-пошти.</string>
     <string name="open_discovery_settings">Відкрити налаштування виявності</string>
     <string name="user_directory_search_hint_2">Пошук за іменем, ID або е-поштою</string>
     <string name="create_new_space">Створити новий простір</string>
@@ -1956,7 +1956,7 @@
     <string name="room_settings_space_access_title">Доступ до простору</string>
     <string name="room_settings_access_rules_pref_dialog_title">Хто може мати доступ\?</string>
     <string name="settings_notification_emails_enable_for_email">Увімкнути сповіщення е-поштою для %s</string>
-    <string name="settings_notification_emails_no_emails">Щоб отримувати сповіщення е-поштою, пов’яжіть її зі своїм обліковим записом Matrix</string>
+    <string name="settings_notification_emails_no_emails">Щоб отримувати сповіщення е-поштою, пов’яжіть її адресу зі своїм обліковим записом Matrix</string>
     <string name="settings_notification_emails_category">Сповіщення е-поштою</string>
     <string name="room_permissions_upgrade_the_space">Оновити простір</string>
     <string name="room_permissions_change_space_name">Змінити назву простору</string>
@@ -2197,7 +2197,7 @@
     <string name="create_spaces_room_private_header">Над чим ви працюєте\?</string>
     <string name="create_spaces_invite_public_header">Хто учасники вашої команди\?</string>
     <string name="create_space_error_empty_field_space_name">Назвіть його, щоб продовжити.</string>
-    <string name="create_spaces_organise_rooms">Приватний простір для організації ваших кімнат</string>
+    <string name="create_spaces_organise_rooms">Приватний простір для впорядкування ваших кімнат</string>
     <string name="room_error_not_found">Не вдалося знайти таку кімнату. Переконайтеся, що вона існує.</string>
     <string name="settings_security_pin_code_notifications_title">Показувати вміст у сповіщеннях</string>
     <plurals name="wrong_pin_message_remaining_attempts">
@@ -2233,7 +2233,7 @@
         <item quantity="many">Надіслано забагато запитів. Спробуйте знову за %1$d секунд…</item>
         <item quantity="other">Надіслано забагато запитів. Спробуйте знову за %1$d секунд…</item>
     </plurals>
-    <string name="login_set_email_notice">Вкажіть е-пошту для відновлення облікового запису. Згодом ви зможете дозволити знайомим знаходити вас за е-поштою.</string>
+    <string name="login_set_email_notice">Вкажіть адресу е-пошти для відновлення облікового запису. Згодом ви зможете дозволити знайомим знаходити вас за цією адресою.</string>
     <string name="login_reset_password_success_notice_2">Ви вийшли з усіх сеансів і більше не отримуватимете сповіщень. Щоб отримувати сповіщення знову, ввійдіть на кожному пристрої заново.</string>
     <string name="login_reset_password_warning_content">Зміна пароля скине всі ключі наскрізного шифрування всіх ваших сеансів, унеможливлюючи читання історії шифрованих чатів. Налаштуйте резервне копіювання ключів чи експортуйте ключі кімнат з іншого сеансу, перш ніж скинути пароль.</string>
     <string name="login_registration_not_supported">Застосунку не вдалося створити обліковий запис на цьому домашньому сервері.
@@ -2242,7 +2242,7 @@
     <string name="login_mode_not_supported">Застосунку не вдається зайти до вашого домашнього сервера. Домашній сервер підтримує такі типи входу: %1$s.
 \n
 \nБажаєте зайти через вебклієнт\?</string>
-    <string name="identity_server_consent_dialog_content_3">Щоб знайти наявні контакти, надішліть дані контактів (е-пошти й номери телефонів) серверу ідентифікації. Ми хешуємо ваші дані перед надсиланням для приватності.</string>
+    <string name="identity_server_consent_dialog_content_3">Щоб знайти наявні контакти, надішліть дані контактів (адреси е-пошти й номери телефонів) серверу ідентифікації. Ми хешуємо ваші дані перед надсиланням для приватності.</string>
     <string name="settings_discovery_consent_notice_off_2">Ваші контакти приватні. Щоб дізнаватись про користувачів, відповідних вашим контактам, дозвольте нам надсилати дані ваших контактів серверу ідентифікації.</string>
     <string name="identity_server_consent_dialog_title_2">Надіслати електронні адреси та номери телефонів %s</string>
     <string name="shortcut_disabled_reason_sign_out">Сеанс завершено!</string>
@@ -2340,7 +2340,7 @@
 \nВвімкнути захищене резервне копіювання й керувати своїми ключами можна в налаштуваннях.</string>
     <string name="verify_cancel_other">Скасування залишить %1$s (%2$s) без звірки. У їхньому користувацькому профілі можна почати заново.</string>
     <string name="verify_new_session_notice">Звірте цим сеансом свій новий. Це надасть йому доступ до зашифрованих повідомлень.</string>
-    <string name="verification_profile_device_untrust_info">Надіслані цьому сеансу й цим сеансом повідомлення позначатимуться застереженнями, поки цей користувач йому не довірить. Або ви можете власноруч звірити сеанс.</string>
+    <string name="verification_profile_device_untrust_info">Поки цей користувач не довіряє цьому сеансу, повідомлення, що надсилаються до нього і від нього, позначаються попередженнями. Крім того, ви можете звірити його вручну.</string>
     <string name="room_settings_enable_encryption_dialog_content">Якщо ви увімкнете шифрування для кімнати, його неможливо буде вимкнути. Надіслані у зашифровану кімнату повідомлення будуть прочитними тільки для учасників кімнати, натомість для сервера вони будуть непрочитними. Увімкнення шифрування може унеможливити роботу ботів та мостів.</string>
     <string name="verify_cannot_cross_sign">Не вдалося поширити звірку цього сеансу з вашими іншими.
 \nЗвірка збережеться локально, її поширить майбутня версія застосунку.</string>
@@ -2700,7 +2700,6 @@
 \nМожливо, цей домашній сервер не налаштовано для показу карт.</string>
     <string name="a11y_open_settings">Відкрити налаштування</string>
     <string name="all_chats">Усі бесіди</string>
-    <string name="device_manager_settings_active_sessions_show_all">Показати всі сеанси (V2, WIP)</string>
     <string name="device_manager_sessions_other_description">Звірте свої сеанси та вийдіть з усіх сеансів, які ви більше не розпізнаєте або не використовуєте для кращої безпеки.</string>
     <string name="device_manager_sessions_other_title">Інші сеанси</string>
     <string name="settings_sessions_list">Сеанси</string>
@@ -2756,7 +2755,7 @@
     </plurals>
     <string name="device_manager_inactive_sessions_title">Неактивні сеанси</string>
     <string name="device_manager_unverified_sessions_description">Звірити або вийти з не звірених сеансів.</string>
-    <string name="device_manager_unverified_sessions_title">Не звірений сеанс</string>
+    <string name="device_manager_unverified_sessions_title">Не звірені сеанси</string>
     <string name="device_manager_header_section_security_recommendations_description">Удоскональте безпеку свого облікового запису, дотримуючись цих порад.</string>
     <string name="device_manager_header_section_security_recommendations_title">Поради щодо безпеки</string>
     <plurals name="device_manager_other_sessions_description_inactive">
@@ -2818,4 +2817,100 @@
     <string name="labs_enable_deferred_dm_title">Увімкнути відкладені приватні повідомлення</string>
     <string name="labs_enable_new_app_layout_summary">Спрощений SchildiChat з опціональними вкладками</string>
     <string name="labs_enable_new_app_layout_title">Увімкнути новий вигляд</string>
+    <string name="device_manager_learn_more_session_rename">Інші користувачі в особистих повідомленнях і кімнатах, до яких ви приєдналися, можуть переглядати повний список ваших сеансів.
+\n
+\nЦе дає їм впевненість у тому, що вони дійсно розмовляють з вами, а також означає, що вони можуть бачити назву сеансу, яку ви ввели тут.</string>
+    <string name="device_manager_learn_more_session_rename_title">Перейменування сеансів</string>
+    <string name="device_manager_learn_more_sessions_verified">Звірені сеанси — ті, до яких ви ввійшли за допомогою своїх облікових даних, а потім пройшли перевірку, використовуючи вашу захищену парольну фразу або шляхом перехресної перевірки.
+\n
+\nЦе означає, що вони мають ключі шифрування для ваших попередніх повідомлень і підтверджують іншим користувачам, з якими ви спілкуєтеся, що ці сеанси — це дійсно ви.</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Звірені сеанси</string>
+    <string name="device_manager_learn_more_sessions_unverified">Не звірені сеанси — це сеанси, до яких ви ввійшли в за допомогою своїх облікових даних, але не пройшли перехресну перевірку.
+\n
+\nВи повинні бути особливо впевнені, що розпізнаєте ці сеанси, оскільки вони можуть означати несанкціоноване використання вашого облікового запису.</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Не звірені сеанси</string>
+    <string name="device_manager_learn_more_sessions_inactive">Неактивні сеанси — це сеанси, які ви не використовували протягом певного часу, але вони продовжують отримувати ключі шифрування.
+\n
+\nВилучення неактивних сеансів поліпшує безпеку і швидкодію, а також полегшує визначення підозрілих нових сеансів.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Неактивні сеанси</string>
+    <string name="device_manager_session_rename_warning">Зауважте, що назви сеансів також видно людям, з якими ви спілкуєтесь.</string>
+    <string name="device_manager_session_rename_description">Власні назви сеансів допоможуть вам легше розпізнавати ваші пристрої.</string>
+    <string name="device_manager_session_rename_edit_hint">Назва сеансу</string>
+    <string name="device_manager_session_rename">Перейменувати сеанс</string>
+    <string name="device_manager_session_overview_signout">Вийти з цього сеансу</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Не звірений - Ваш поточний сеанс</string>
+    <string name="tooltip_attachment_voice_broadcast">Розпочати голосове мовлення</string>
+    <string name="key_authenticity_not_guaranteed">Справжність цього зашифрованого повідомлення не може бути гарантована на цьому пристрої.</string>
+    <string name="settings_security_incognito_keyboard_summary">Заборонити клавіатурі оновлювати будь-які персоналізовані дані, як-от історію набору тексту та словник, на основі того, що ви набрали в розмовах. Зверніть увагу, що деякі клавіатури можуть не дотримуватися цього налаштування.</string>
+    <string name="settings_security_incognito_keyboard_title">Клавіатура інкогніто</string>
+    <string name="command_description_table_flip">Надсилає (╯°□°）╯︵ ┻━┻ на початку текстового повідомлення</string>
+    <string name="attachment_type_voice_broadcast">Голосове мовлення</string>
+    <string name="command_description_devtools">Відкрийте інструменти розробника</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Ви увімкнули шифрування лише для перевірених сеансів для всіх кімнат у налаштуваннях безпеки.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ У цій кімнаті є неперевірені пристрої, вони не зможуть розшифрувати повідомлення, які ви надсилаєте.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Ніколи не надсилати зашифровані повідомлення на неперевірені сеанси в цій кімнаті.</string>
+    <string name="action_got_it">Зрозуміло</string>
+    <string name="rich_text_editor_format_underline">Застосувати форматування підкресленим</string>
+    <string name="rich_text_editor_format_strikethrough">Застосувати форматування перекресленим</string>
+    <string name="rich_text_editor_format_italic">Застосувати форматування курсивом</string>
+    <string name="rich_text_editor_format_bold">Застосувати форматування жирним</string>
+    <string name="labs_enable_client_info_recording_summary">Записуйте назву клієнта, версію та URL-адресу, щоб легше розпізнавати сеанси в менеджері сеансів.</string>
+    <string name="labs_enable_client_info_recording_title">Увімкнути запис відомостей про клієнт</string>
+    <string name="labs_enable_session_manager_summary">Отримайте кращу видимість і контроль над усіма вашими сеансами.</string>
+    <string name="labs_enable_session_manager_title">Увімкнути новий менеджер сеансів</string>
+    <string name="device_manager_session_details_device_operating_system">Операційна система</string>
+    <string name="device_manager_session_details_device_model">Модель</string>
+    <string name="device_manager_session_details_device_browser">Браузер</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">Версія</string>
+    <string name="device_manager_session_details_application_name">Назва</string>
+    <string name="device_manager_session_details_application">Застосунок</string>
+    <string name="device_manager_push_notifications_description">Отримувати push-сповіщення про цей сеанс.</string>
+    <string name="device_manager_push_notifications_title">Push-сповіщення</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Звірте свій поточний сеанс, щоб побачити стан перевірки цього сеансу.</string>
+    <string name="device_manager_verification_status_unknown">Невідомий стан перевірки</string>
+    <string name="push_gateway_item_enabled">Увімкнено:</string>
+    <string name="push_gateway_item_device_id">ID сеансу:</string>
+    <string name="error_check_network">Щось пішло не так. Будь ласка, перевірте мережеве з\'єднання та спробуйте ще раз.</string>
+    <string name="grant_permission">Надати дозвіл</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} потребує дозволу на показ сповіщень.
+\nНадайте дозвіл.</string>
+    <string name="permissions_rationale_msg_notification">Для показу сповіщень ${app_name} потрібен дозвіл. Сповіщення можуть показувати ваші повідомлення, запрошення тощо.
+\n
+\nДозвольте доступ до наступних спливних вікон, щоб мати змогу переглядати сповіщення.</string>
+    <string name="labs_enable_rich_text_editor_summary">Спробуйте розширений текстовий редактор (незабаром з\'явиться режим звичайного тексту)</string>
+    <string name="labs_enable_rich_text_editor_title">Увімкнути розширений текстовий редактор</string>
+    <string name="qr_code_login_confirm_security_code_description">Переконайтеся, що ви знаєте походження цього коду. Пов\'язавши пристрої, ви надасте будь-кому повний доступ до свого облікового запису.</string>
+    <string name="qr_code_login_confirm_security_code">Підтвердити</string>
+    <string name="qr_code_login_try_again">Повторити спробу</string>
+    <string name="qr_code_login_status_no_match">Не збігається\?</string>
+    <string name="qr_code_login_signing_in">Вхід</string>
+    <string name="qr_code_login_connecting_to_device">Під\'єднання до пристрою</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Входите на мобільному пристрої\?</string>
+    <string name="qr_code_login_show_qr_code_button">Показати QR-код на цьому пристрої</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Виберіть «Сканувати QR-код»</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Виберіть «Увійти за допомогою QR-коду»</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Почніть з екрана входу</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Почніть з екрана входу</string>
+    <string name="qr_code_login_new_device_instruction_3">Виберіть «Показати QR-код на цьому пристрої»</string>
+    <string name="qr_code_login_new_device_instruction_2">Перейдіть до Налаштування -&gt; Безпека й приватність -&gt; Показати всі сеанси</string>
+    <string name="qr_code_login_new_device_instruction_1">Відкрийте ${app_name} на іншому своєму пристрої</string>
+    <string name="qr_code_login_header_failed_denied_description">Запит на іншому пристрої було відхилено.</string>
+    <string name="qr_code_login_header_failed_timeout_description">Пов\'язування не було завершено у встановлені терміни.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Пов\'язування з цим пристроєм не підтримується.</string>
+    <string name="qr_code_login_header_failed_title">Невдале з\'єднання</string>
+    <string name="qr_code_login_header_connected_description">Перевірте свій пристрій, на якому ви ввійшли. На екрані повинен з\'явитися код, наведений нижче. Переконайтеся, що наведений код збігається з кодом на вашому пристрої:</string>
+    <string name="qr_code_login_header_connected_title">Безпечне з\'єднання встановлено</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Зіскануйте QR-код нижче своїм пристроєм, з якого ви вийшли.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Скануйте QR-код нижче за допомогою свого пристрою для входу:</string>
+    <string name="qr_code_login_header_show_qr_code_title">Увійти за допомогою QR-коду</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Використовуйте камеру цього пристрою, щоб зісканувати QR-код, показаний на іншому пристрої:</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">За допомогою цього пристрою ви можете ввійти на мобільному або вебпристрої за допомогою QR-коду. Зробити це можна двома способами:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Увійти за допомогою QR-коду</string>
+    <string name="qr_code_login_scan_qr_code_button">Сканувати QR-код</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Сканувати QR-код</string>
+    <string name="login_scan_qr_code">Сканувати QR-код</string>
 </resources>

library/ui-strings/src/main/res/values-zh-rCN/strings.xml

@@ -1583,12 +1583,12 @@
     <string name="auth_msisdn_already_defined">此电话号码已定义。</string>
     <string name="settings_phone_number_empty">你的账户尚未添加电话号码</string>
     <string name="settings_emails">电子邮件地址</string>
-    <string name="settings_emails_empty">你的账户尚未添加电子邮件</string>
+    <string name="settings_emails_empty">你的账户尚未添加电子邮件地址</string>
     <string name="settings_phone_numbers">电话号码</string>
     <string name="settings_remove_three_pid_confirmation_content">移除 %s？</string>
     <string name="error_threepid_auth_failed">请确认你已点击我们向你发送的电子邮件中的链接。</string>
     <string name="settings_emails_and_phone_numbers_title">电子邮件和电话号码</string>
-    <string name="settings_emails_and_phone_numbers_summary">管理链接到你的 Matrix 账户的电子邮件和电话号码</string>
+    <string name="settings_emails_and_phone_numbers_summary">管理链接到你的Matrix账户的电子邮件地址和电话号码</string>
     <string name="settings_text_message_sent_hint">代码</string>
     <string name="login_msisdn_notice">请使用国际格式（电话号码必须以“+”开始）</string>
     <string name="confirm_your_identity_quad_s">验证此登录来确认你的身份，授权其访问加密消息。</string>
@@ -2171,7 +2171,7 @@
     <string name="room_settings_space_access_title">空间访问</string>
     <string name="room_settings_access_rules_pref_dialog_title">谁可以访问？</string>
     <string name="settings_notification_emails_enable_for_email">启用 %s 的电邮通知</string>
-    <string name="settings_notification_emails_no_emails">要接收通知邮件，请将一个电子邮箱关联到你的 Matrix 账户</string>
+    <string name="settings_notification_emails_no_emails">要接收通知邮件，请将一个电子邮件地址关联到你的Matrix账户</string>
     <string name="settings_notification_emails_category">电子邮件通知</string>
     <string name="room_permissions_upgrade_the_space">升级空间</string>
     <string name="room_permissions_change_space_name">更改空间名称</string>
@@ -2550,7 +2550,6 @@
 \n此主服务器可能没有设置好显示地图。</string>
     <string name="a11y_open_settings">打开设置</string>
     <string name="all_chats">全部聊天</string>
-    <string name="device_manager_settings_active_sessions_show_all">显示全部会话（V2, WIP）</string>
     <string name="device_manager_sessions_other_description">为获得最佳安全性，请验证你的会话，并从任何你不认识或不再使用的会话登出。</string>
     <string name="device_manager_sessions_other_title">其他会话</string>
     <string name="settings_sessions_list">会话</string>
@@ -2624,4 +2623,6 @@
     <string name="labs_enable_deferred_dm_summary">仅在首条消息创建私聊消息</string>
     <string name="labs_enable_deferred_dm_title">启用延迟的私聊消息</string>
     <string name="labs_enable_new_app_layout_summary">简化的SchildiChat，带有可选的标签</string>
+    <string name="settings_security_incognito_keyboard_title">无痕键盘</string>
+    <string name="settings_security_incognito_keyboard_summary">要求键盘不要基于你在对话中的输入更新任何个性化数据，如输入历史和字典。请注意，某些键盘可能不会遵守此设置。</string>
 </resources>

library/ui-strings/src/main/res/values-zh-rTW/strings.xml

@@ -873,10 +873,10 @@
     <string name="settings_push_rules">推送規則</string>
     <string name="settings_push_rules_no_rules">未定義通送規則</string>
     <string name="settings_push_gateway_no_pushers">沒有已註冊的推送閘道</string>
-    <string name="push_gateway_item_app_id">app_id：</string>
+    <string name="push_gateway_item_app_id">App ID：</string>
-    <string name="push_gateway_item_push_key">push_key：</string>
+    <string name="push_gateway_item_push_key">推送金鑰：</string>
-    <string name="push_gateway_item_app_display_name">app_display_name：</string>
+    <string name="push_gateway_item_app_display_name">應用程式顯示名稱：</string>
-    <string name="push_gateway_item_device_name">session_name：</string>
+    <string name="push_gateway_item_device_name">工作階段顯示名稱：</string>
     <string name="push_gateway_item_url">Url：</string>
     <string name="push_gateway_item_format">格式：</string>
     <string name="preference_voice_and_video">音訊與視訊</string>
@@ -938,11 +938,11 @@
     <string name="settings_discovery_identity_server_info">您正在使用 %1$s 來探索與被您認識的既有聯絡人探索。</string>
     <string name="settings_discovery_identity_server_info_none">您目前並未使用身份識別伺服器。要探索與被您認識的聯絡人探索，請在下方設定一個。</string>
     <string name="settings_discovery_emails_title">可探索的電子郵件地址</string>
-    <string name="settings_discovery_no_mails">在您新增電子郵件後，探索選項將會出現。</string>
+    <string name="settings_discovery_no_mails">在您新增電子郵件地址後，探索選項將會出現。</string>
     <string name="settings_discovery_no_msisdn">在您新增電話號碼後，探索選項將會出現。</string>
     <string name="settings_discovery_disconnect_identity_server_info">與您的身份識別伺服器斷線代表您無法被其他使用者探索，且您將無法透過電子郵件或電話邀請其他人。</string>
     <string name="settings_discovery_msisdn_title">可探索的電話號碼</string>
-    <string name="settings_discovery_confirm_mail">我們將會傳送確認電子郵件到 %s 給您，請檢查您的電子郵件並在確認連結上點選</string>
+    <string name="settings_discovery_confirm_mail">我們將會傳送電子郵件到 %s，請檢查您的電子郵件並在確認連結上點選</string>
     <string name="settings_discovery_enter_identity_server">輸入身份識別伺服器 URL</string>
     <string name="settings_discovery_bad_identity_server">無法連線到身份識別伺服器</string>
     <string name="settings_discovery_please_enter_server">請輸入身份識別伺服器 URL</string>
@@ -1069,7 +1069,7 @@
     <string name="login_registration_not_supported">應用程式無法在此家伺服器上建立帳號。
 \n
 \n您想要使用網路客戶端註冊嗎？</string>
-    <string name="login_login_with_email_error">此電子郵件未關聯到任何帳號。</string>
+    <string name="login_login_with_email_error">此電子郵件地址未關聯到任何帳號。</string>
     <string name="login_reset_password_on">在 %1$s 上重設密碼</string>
     <string name="login_reset_password_notice">驗證郵件已傳送到您的收件匣以確認您要設定新密碼。</string>
     <string name="login_reset_password_submit">下一步</string>
@@ -1078,7 +1078,7 @@
     <string name="login_reset_password_warning_title">警告！</string>
     <string name="login_reset_password_warning_content">變更您的密碼將會重設在您所有工作階段中任何的端到端加密金鑰，讓已加密的聊天歷史無法讀取。請在重設您的密碼前從其他工作階段設定金鑰備份或匯出您的聊天室金鑰。</string>
     <string name="login_reset_password_warning_submit">繼續</string>
-    <string name="login_reset_password_error_not_found">此電子郵件未被連結到任何帳號</string>
+    <string name="login_reset_password_error_not_found">此電子郵件地址未被連結到任何帳號</string>
     <string name="login_reset_password_mail_confirmation_title">檢查您的收件匣</string>
     <string name="login_reset_password_mail_confirmation_notice">驗證電子郵件已傳送至 %1$s。</string>
     <string name="login_reset_password_mail_confirmation_notice_2">輕點連結以確認您的新密碼。在您使用了其中包含的連結後，請點擊下方。</string>
@@ -1092,7 +1092,7 @@
 \n
 \n停止密碼變更流程？</string>
     <string name="login_set_email_title">設定電子郵件地址</string>
-    <string name="login_set_email_notice">設定電子郵件以復原您的帳號。之後您也可以選擇性地讓您認識的人透過您的電子郵件找到您。</string>
+    <string name="login_set_email_notice">設定電子郵件地址以復原您的帳號。之後您也可以選擇性地讓您認識的人透過此地址找到您。</string>
     <string name="login_set_email_mandatory_hint">電子郵件</string>
     <string name="login_set_email_optional_hint">電子郵件（選擇性）</string>
     <string name="login_set_email_submit">下一個</string>
@@ -1430,7 +1430,7 @@
     <string name="event_redacted">訊息已移除</string>
     <string name="settings_show_redacted">顯示已移除的訊息</string>
     <string name="settings_show_redacted_summary">為已移除的訊息顯示佔位符</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">我們已傳送確認電子郵件給 %s，請先檢查您的電子郵件並點擊確認連結</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">我們已傳送電子郵件到 %s，請先檢查您的電子郵件並點擊確認連結</string>
     <string name="settings_text_message_sent_wrong_code">驗證代碼不正確。</string>
     <string name="uploads_media_title">媒體</string>
     <string name="uploads_media_no_result">此聊天室中沒有媒體</string>
@@ -1453,7 +1453,7 @@
     <string name="identity_server_error_outdated_home_server">此動作是不可能的。家伺服器太舊了。</string>
     <string name="identity_server_error_no_identity_server_configured">請先設定身份識別伺服器。</string>
     <string name="identity_server_error_terms_not_signed">請先在設定中同意身份識別伺服器的條款。</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">為了保護您的隱私，${app_name} 僅支援傳送雜湊過的使用者電子郵件與電話號碼。</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">為了保護您的隱私，${app_name} 僅支援傳送雜湊過的使用者電子郵件地址與電話號碼。</string>
     <string name="identity_server_error_binding_error">關聯失敗。</string>
     <string name="identity_server_error_no_current_binding_error">目前沒有此識別符的關聯。</string>
     <string name="identity_server_set_default_notice">您的家伺服器 (%1$s) 建議將 %2$s 用於您的身份識別伺服器</string>
@@ -1623,12 +1623,12 @@
     <string name="auth_msisdn_already_defined">此電話號碼已被定義。</string>
     <string name="settings_phone_number_empty">未新增電話號碼到您的帳號</string>
     <string name="settings_emails">電子郵件地址</string>
-    <string name="settings_emails_empty">未傳送電子郵件到您的帳號</string>
+    <string name="settings_emails_empty">未新增電子郵件地址至您的帳號</string>
     <string name="settings_phone_numbers">電話號碼</string>
     <string name="settings_remove_three_pid_confirmation_content">移除 %s？</string>
     <string name="error_threepid_auth_failed">確保您已經點擊我們傳送給您的電子郵件中的連結。</string>
     <string name="settings_emails_and_phone_numbers_title">電子郵件與電話號碼</string>
-    <string name="settings_emails_and_phone_numbers_summary">管理連結到您 Matrix 帳號的電子郵件與電話號碼</string>
+    <string name="settings_emails_and_phone_numbers_summary">管理連結到您 Matrix 帳號的電子郵件地址與電話號碼</string>
     <string name="settings_text_message_sent_hint">代碼</string>
     <string name="login_msisdn_notice">請使用國際格式（電話號碼必須以 \'+\' 開頭）</string>
     <string name="confirm_your_identity_quad_s">透過確認此登入來驗證您的身份，以及授予存取加密訊息的權限。</string>
@@ -1744,7 +1744,7 @@
     <string name="attachment_viewer_item_x_of_y">%2$d 中的 %1$d</string>
     <string name="settings_discovery_consent_action_give_consent">給予同意</string>
     <string name="settings_discovery_consent_action_revoke">撤銷我的同意</string>
-    <string name="settings_discovery_consent_notice_on">您已同意傳送電子郵件與電話號碼到此身份提供者以從您的聯絡人中探索其他使用者。</string>
+    <string name="settings_discovery_consent_notice_on">您已同意傳送電子郵件地址與電話號碼到此身份提供者以從您的聯絡人中探索其他使用者。</string>
     <string name="settings_discovery_consent_title">傳送電子郵件或電話號碼</string>
     <string name="direct_room_user_list_suggestions_title">建議</string>
     <string name="direct_room_user_list_known_title">已知的使用者</string>
@@ -2103,7 +2103,7 @@
     <string name="settings_notification_mentions_and_keywords">提及與關鍵字</string>
     <string name="settings_notification_default">預設通知</string>
     <string name="link_this_email_with_your_account">設定中的 %s 可直接在 ${app_name} 中接收邀請。</string>
-    <string name="link_this_email_settings_link">將此電子郵件與您的帳號連結</string>
+    <string name="link_this_email_settings_link">將此電子郵件地址與您的帳號連結</string>
     <string name="this_invite_to_this_space_was_sent">此空間的邀請已傳送給與您的帳號無關的 %s</string>
     <string name="this_invite_to_this_room_was_sent">此聊天室的邀請已傳送給與您的帳號無關的 %s</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">您所在的所有聊天室都會顯示在 Home 中。</string>
@@ -2171,7 +2171,7 @@
     <string name="room_settings_space_access_title">空間存取</string>
     <string name="room_settings_access_rules_pref_dialog_title">誰可以存取？</string>
     <string name="settings_notification_emails_enable_for_email">啟用 %s 的電子郵件通知</string>
-    <string name="settings_notification_emails_no_emails">要收到通知用的電子郵件，請將電子郵件關聯至您的 Matrix 帳號</string>
+    <string name="settings_notification_emails_no_emails">要收到通知用的電子郵件，請將電子郵件地址關聯至您的 Matrix 帳號</string>
     <string name="settings_notification_emails_category">電子郵件通知</string>
     <string name="room_permissions_upgrade_the_space">升級空間</string>
     <string name="room_permissions_change_space_name">變更空間名稱</string>
@@ -2217,12 +2217,12 @@
     <string name="create_poll_question_title">投票問題或主題</string>
     <string name="create_poll_title">建立投票</string>
     <string name="attachment_type_poll">投票</string>
-    <string name="identity_server_consent_dialog_title_2">向 %s 傳送電子郵件與電話號碼</string>
+    <string name="identity_server_consent_dialog_title_2">向 %s 傳送電子郵件地址與電話號碼</string>
     <string name="settings_discovery_consent_notice_off_2">您的通訊錄是私人的。要從您的通訊錄中探索使用者，我們需要您的權限來傳送聯絡人資訊到您的身份識別伺服器。</string>
     <string name="shortcut_disabled_reason_sign_out">已登出工作階段！</string>
     <string name="shortcut_disabled_reason_room_left">已離開聊天室！</string>
     <string name="identity_server_consent_dialog_content_question">您同意傳送此資訊嗎？</string>
-    <string name="identity_server_consent_dialog_content_3">要探索現有聯絡人，您必須傳送聯絡人資訊（電子郵件與電話號碼）到您的身份識別伺服器。我們會在傳送前對您的資料進行雜湊處理以保護隱私。</string>
+    <string name="identity_server_consent_dialog_content_3">要探索現有聯絡人，您必須傳送聯絡人資訊（電子郵件地址與電話號碼）到您的身份識別伺服器。我們會在傳送前對您的資料進行雜湊處理以保護隱私。</string>
     <string name="action_not_now">現在不要</string>
     <string name="delete_poll_dialog_content">您確定要移除此投票？移除後將無法復原。</string>
     <string name="delete_poll_dialog_title">移除投票</string>
@@ -2550,7 +2550,6 @@
 \n此家伺服器可能未設定好顯示地圖。</string>
     <string name="a11y_open_settings">開啟設定</string>
     <string name="all_chats">所有聊天</string>
-    <string name="device_manager_settings_active_sessions_show_all">顯示所有工作階段 (V2, WIP)</string>
     <string name="device_manager_sessions_other_description">為了取得最佳安全性，請驗證您的工作階段並登出任何您無法識別或不再使用的工作階段。</string>
     <string name="device_manager_sessions_other_title">其他工作階段</string>
     <string name="settings_sessions_list">工作階段</string>
@@ -2656,4 +2655,100 @@
     <string name="labs_enable_deferred_dm_title">啟用延期直接訊息</string>
     <string name="labs_enable_new_app_layout_summary">包含選擇性分頁的簡潔 SchildiChat</string>
     <string name="labs_enable_new_app_layout_title">啟用新佈局</string>
+    <string name="device_manager_learn_more_session_rename">您加入的直接消息與聊天室中的其他使用者可以檢視您的工作階段的完整清單。
+\n
+\n這讓他們確信他們真的在與您交談，但這也意味著他們可以看到您在此處輸入的工作階段名稱。</string>
+    <string name="device_manager_learn_more_session_rename_title">正在重新命名工作階段</string>
+    <string name="device_manager_learn_more_sessions_verified">已驗證的工作階段代表使用您的憑證登入，然後使用您的安全通關密語或透過交叉驗證進行驗證。
+\n
+\n這代表了它們持有您先前訊息的加密金鑰，並向您正在與之通訊的其他使用者確認這些工作階段確實是您。</string>
+    <string name="device_manager_learn_more_sessions_verified_title">已驗證的工作階段</string>
+    <string name="device_manager_learn_more_sessions_unverified">未驗證的工作階段是使用您的憑證登入但未交叉驗證的工作階段。
+\n
+\n您應特別確定您可以識別這些工作階段，因為它們可能代表未經授權使用您的帳號。</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">未驗證的工作階段</string>
+    <string name="device_manager_learn_more_sessions_inactive">不活躍的工作階段是您有一段時間未使用的工作階段，但它們會繼續接收加密金鑰。
+\n
+\n移除不活躍的工作階段可以改善安全性與效能，並讓您可以更容易地識別新的工作階段是否可疑。</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">不活躍的工作階段</string>
+    <string name="device_manager_session_rename_warning">請注意，與您交流的人也可以看到工作階段名稱。</string>
+    <string name="device_manager_session_rename_description">自訂工作階段名稱可以協助您更輕鬆地識別您的裝置。</string>
+    <string name="device_manager_session_rename_edit_hint">工作階段名稱</string>
+    <string name="device_manager_session_rename">重新命名工作階段</string>
+    <string name="device_manager_session_overview_signout">登出此工作階段</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">未驗證 · 您目前的工作階段</string>
+    <string name="tooltip_attachment_voice_broadcast">開始語音廣播</string>
+    <string name="key_authenticity_not_guaranteed">此裝置無法保證此加密訊息的真實性。</string>
+    <string name="settings_security_incognito_keyboard_summary">要求鍵盤不要根據您在對話中輸入的內容更新任何個人化資料（如輸入歷史紀錄與字典等）。請注意，某些鍵盤可能不會遵守此設定。</string>
+    <string name="settings_security_incognito_keyboard_title">無痕式鍵盤</string>
+    <string name="command_description_table_flip">將 (╯°□°）╯︵ ┻━┻ 放到純文字訊息之前</string>
+    <string name="attachment_type_voice_broadcast">語音廣播</string>
+    <string name="command_description_devtools">開啟開發者工具畫面</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 您已在「安全」設定中為所有聊天室啟用加密驗證工作階段。</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ 此聊天室中有未驗證的裝置，它們將無法解密您傳送的訊息。</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">切莫向此聊天室中未經驗證的工作階段傳送加密訊息。</string>
+    <string name="action_got_it">知道了</string>
+    <string name="rich_text_editor_format_underline">套用底線格式</string>
+    <string name="rich_text_editor_format_strikethrough">套用刪除線格式</string>
+    <string name="rich_text_editor_format_italic">套用義式斜體格式</string>
+    <string name="rich_text_editor_format_bold">套用粗體格式</string>
+    <string name="labs_enable_client_info_recording_summary">記錄客戶端名稱、版本與 URL，以便在工作階段管理程式中可以更簡單地辨認工作階段。</string>
+    <string name="labs_enable_client_info_recording_title">啟用客戶端資訊記錄</string>
+    <string name="labs_enable_session_manager_summary">對所有工作階段有更大的能見度與控制。</string>
+    <string name="labs_enable_session_manager_title">啟用新的工作階段管理程式</string>
+    <string name="device_manager_session_details_device_operating_system">作業系統</string>
+    <string name="device_manager_session_details_device_model">模型</string>
+    <string name="device_manager_session_details_device_browser">瀏覽器</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">版本</string>
+    <string name="device_manager_session_details_application_name">名稱</string>
+    <string name="device_manager_session_details_application">應用程式</string>
+    <string name="device_manager_push_notifications_description">接收關於此工作階段的推播通知。</string>
+    <string name="device_manager_push_notifications_title">推播通知</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">驗證您目前的工作階段以顯示此工作階段的驗證狀態。</string>
+    <string name="device_manager_verification_status_unknown">未知的驗證狀態</string>
+    <string name="push_gateway_item_enabled">已啟用：</string>
+    <string name="push_gateway_item_device_id">工作階段 ID：</string>
+    <string name="error_check_network">發生了一些問題。請檢查您的網路連線並再試一次。</string>
+    <string name="grant_permission">授予權限</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} 需要權限以顯示通知。
+\n請授予權限。</string>
+    <string name="permissions_rationale_msg_notification">${app_name} 需要權限才能顯示通知。通知可以顯示您的訊息、您的邀請等等。
+\n
+\n請在下一個彈出式視窗允許存取以檢視通知。</string>
+    <string name="labs_enable_rich_text_editor_summary">試用格式化文字編輯器（純文字模式即將推出）</string>
+    <string name="labs_enable_rich_text_editor_title">啟用格式化文字編輯器</string>
+    <string name="qr_code_login_confirm_security_code_description">請確保您知道此驗證碼的來源。透過連結裝置，您將為某人提供對您帳號的完整存取權限。</string>
+    <string name="qr_code_login_confirm_security_code">確認</string>
+    <string name="qr_code_login_try_again">再試一次</string>
+    <string name="qr_code_login_status_no_match">不相符？</string>
+    <string name="qr_code_login_signing_in">登入</string>
+    <string name="qr_code_login_connecting_to_device">連線至裝置</string>
+    <string name="qr_code_login_scan_qr_code_button">掃描 QR code</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">正在使用行動裝置登入？</string>
+    <string name="qr_code_login_show_qr_code_button">在此裝置顯示 QR code</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">選取「掃描 QR code」</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">從登入畫面開始</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">選取「使用 QR code 登入」</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">從登入畫面開始</string>
+    <string name="qr_code_login_new_device_instruction_3">選取「在此裝置上顯示 QR code」</string>
+    <string name="qr_code_login_new_device_instruction_2">到「設定」→「安全與隱私」→「顯示所有工作階段」</string>
+    <string name="qr_code_login_new_device_instruction_1">在您的其他裝置上開啟 ${app_name}</string>
+    <string name="qr_code_login_header_failed_denied_description">請求在另一台裝置上被拒絕。</string>
+    <string name="qr_code_login_header_failed_timeout_description">連結未在規定時間內完成。</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">不支援與其裝置連結。</string>
+    <string name="qr_code_login_header_failed_title">連線不成功</string>
+    <string name="qr_code_login_header_connected_description">請檢查您已登入的裝置，應該會顯示以下驗證碼。請確認以下驗證碼與該裝置相符：</string>
+    <string name="qr_code_login_header_connected_title">已建立安全連線</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">使用您已登出的裝置掃描以下 QR code。</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">使用您已登入的裝置來掃描下方的 QR code：</string>
+    <string name="qr_code_login_header_show_qr_code_title">使用 QR code 登入</string>
+    <string name="qr_code_login_header_scan_qr_code_description">使用此裝置的相機掃描您其他裝置上顯示的 QR code：</string>
+    <string name="qr_code_login_header_scan_qr_code_title">掃描 QR code</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">您可以使用此裝置透過 QR code 登入移動裝置或網路裝置。有兩種方法可以作到：</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">使用 QR code 登入</string>
+    <string name="login_scan_qr_code">掃描 QR code</string>
 </resources>

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

@@ -446,6 +446,9 @@
     <string name="labs_enable_deferred_dm_title">Enable deferred DMs</string>
     <string name="labs_enable_deferred_dm_summary">Create DM only on first message</string>
 
+    <string name="labs_enable_rich_text_editor_title">Enable rich text editor</string>
+    <string name="labs_enable_rich_text_editor_summary">Try out the rich text editor (plain text mode coming soon)</string>
+
     <!-- Home fragment -->
     <string name="invitations_header">Invites</string>
     <string name="low_priority_header">Low priority</string>
@@ -635,6 +638,8 @@
     <string name="permissions_rationale_msg_record_audio">${app_name} needs permission to access your microphone to perform audio calls.</string>
     <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
     <string name="permissions_rationale_msg_camera_and_audio">${app_name} needs permission to access your camera and your microphone to perform video calls.\n\nPlease allow access on the next pop-ups to be able to make the call.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="permissions_rationale_msg_notification">${app_name} needs permission to display notifications. Notifications can display your messages, your invitations, etc.\n\nPlease allow access on the next pop-ups to be able to view notification.</string>
 
     <string name="permissions_denied_qr_code">To scan a QR code, you need to allow camera access.</string>
     <string name="permissions_denied_add_contact">Allow permission to access your contacts.</string>
@@ -854,7 +859,9 @@
     <string name="settings_troubleshoot_test_system_settings_title">System Settings.</string>
     <string name="settings_troubleshoot_test_system_settings_success">Notifications are enabled in the system settings.</string>
     <string name="settings_troubleshoot_test_system_settings_failed">Notifications are disabled in the system settings.\nPlease check system settings.</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} needs the permission to show notifications.\nPlease grant the permission.</string>
     <string name="open_settings">Open Settings</string>
+    <string name="grant_permission">Grant Permission</string>
 
     <string name="settings_troubleshoot_test_account_settings_title">Account Settings.</string>
     <string name="settings_troubleshoot_test_account_settings_success">Notifications are enabled for your account.</string>
@@ -1663,6 +1670,7 @@
     <string name="create_new_room">Create New Room</string>
     <string name="create_new_space">Create New Space</string>
     <string name="error_no_network">No network. Please check your Internet connection.</string>
+    <string name="error_check_network">Something went wrong. Please check your network connection and try again.</string>
     <string name="change_room_directory_network">"Change network"</string>
     <string name="please_wait">"Please wait…"</string>
     <string name="updating_your_data">Updating your data…</string>
@@ -1702,13 +1710,15 @@
     <string name="settings_push_rules_no_rules">No push rules defined</string>
     <string name="settings_push_gateway_no_pushers">No registered push gateways</string>
 
-    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="push_gateway_item_app_id">App ID:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
+    <string name="push_gateway_item_push_key">Push Key:</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
+    <string name="push_gateway_item_app_display_name">App Display Name:</string>
-    <string name="push_gateway_item_device_name">session_name:</string>
+    <string name="push_gateway_item_device_name">Session Display Name:</string>
+    <string name="push_gateway_item_device_id">Session ID:</string>
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Format:</string>
     <string name="push_gateway_item_profile_tag">Profile tag:</string>
+    <string name="push_gateway_item_enabled">Enabled:</string>
 
     <string name="preference_voice_and_video">Voice &amp; Video</string>
     <string name="preference_root_help_about">Help &amp; About</string>
@@ -2115,7 +2125,7 @@
     <string name="login_reset_password_cancel_confirmation_content">Your password is not yet changed.\n\nStop the password change process?</string>
 
     <string name="login_set_email_title">Set email address</string>
-    <string name="login_set_email_notice">Set an email address to recover your account. Later, you can optionally allow people you know to discover you by your this address.</string>
+    <string name="login_set_email_notice">Set an email address to recover your account. Later, you can optionally allow people you know to discover you by this address.</string>
     <string name="login_set_email_mandatory_hint">Email</string>
     <string name="login_set_email_optional_hint">Email (optional)</string>
     <string name="login_set_email_submit">Next</string>
@@ -2173,6 +2183,7 @@
     <string name="login_signin_matrix_id_password_notice">If you don’t know your password, go back to reset it.</string>
     <string name="login_signin_matrix_id_error_invalid_matrix_id">This is not a valid user identifier. Expected format: \'@user:homeserver.org\'</string>
     <string name="autodiscover_well_known_error">Unable to find a valid homeserver. Please check your identifier</string>
+    <string name="login_scan_qr_code">Scan QR code</string>
 
     <string name="seen_by">Seen by</string>
 
@@ -3234,7 +3245,6 @@
     <string name="labs_enable_element_call_permission_shortcuts_summary">Auto-approve Element Call widgets and grant camera / mic access</string>
 
     <!-- Device Manager -->
-    <string name="device_manager_settings_active_sessions_show_all">Show All Sessions (V2, WIP)</string>
     <string name="device_manager_sessions_other_title">Other sessions</string>
     <string name="device_manager_sessions_other_description">For best security, verify your sessions and sign out from any session that you don’t recognize or use anymore.</string>
     <string name="a11y_device_manager_device_type_mobile">Mobile</string>
@@ -3243,10 +3253,12 @@
     <string name="a11y_device_manager_device_type_unknown">Unknown device type</string>
     <string name="device_manager_verification_status_verified">Verified session</string>
     <string name="device_manager_verification_status_unverified">Unverified session</string>
+    <string name="device_manager_verification_status_unknown">Unknown verification status</string>
     <string name="device_manager_verification_status_detail_current_session_verified">Your current session is ready for secure messaging.</string>
     <string name="device_manager_verification_status_detail_other_session_verified">This session is ready for secure messaging.</string>
     <string name="device_manager_verification_status_detail_current_session_unverified">Verify your current session for enhanced secure messaging.</string>
     <string name="device_manager_verification_status_detail_other_session_unverified">Verify or sign out from this session for best security and reliability.</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Verify your current session to reveal this session\'s verification status.</string>
     <string name="device_manager_verify_session">Verify Session</string>
     <string name="device_manager_view_details">View Details</string>
     <string name="device_manager_other_sessions_view_all">View All (%1$d)</string>
@@ -3302,14 +3314,26 @@
     <string name="device_manager_session_overview_signout">Sign out of this session</string>
     <string name="device_manager_session_details_title">Session details</string>
     <string name="device_manager_session_details_description">Application, device, and activity information.</string>
+    <string name="device_manager_push_notifications_title">Push notifications</string>
+    <string name="device_manager_push_notifications_description">Receive push notifications on this session.</string>
     <string name="device_manager_session_details_session_name">Session name</string>
     <string name="device_manager_session_details_session_id">Session ID</string>
     <string name="device_manager_session_details_session_last_activity">Last activity</string>
+    <string name="device_manager_session_details_application">Application</string>
+    <string name="device_manager_session_details_application_name">Name</string>
+    <string name="device_manager_session_details_application_version">Version</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_device_browser">Browser</string>
+    <string name="device_manager_session_details_device_model">Model</string>
+    <string name="device_manager_session_details_device_operating_system">Operating system</string>
     <string name="device_manager_session_details_device_ip_address">IP address</string>
     <string name="device_manager_session_rename">Rename session</string>
     <string name="device_manager_session_rename_edit_hint">Session name</string>
     <string name="device_manager_session_rename_description">Custom session names can help you recognize your devices more easily.</string>
     <string name="device_manager_session_rename_warning">Please be aware that session names are also visible to people you communicate with.</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Sign in with QR Code</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">You can use this device to sign in a mobile or web device with a QR code. There are two ways to do this:</string>
+
     <string name="device_manager_learn_more_sessions_inactive_title">Inactive sessions</string>
     <string name="device_manager_learn_more_sessions_inactive">Inactive sessions are sessions you have not used in some time, but they continue to receive encryption keys.\n\nRemoving inactive sessions improves security and performance, and makes it easier for you to identify if a new session is suspicious.</string>
     <string name="device_manager_learn_more_sessions_unverified_title">Unverified sessions</string>
@@ -3318,6 +3342,12 @@
     <string name="device_manager_learn_more_sessions_verified">Verified sessions have logged in with your credentials and then been verified, either using your secure passphrase or by cross-verifying.\n\nThis means they hold encryption keys for your previous messages, and confirm to other users you are communicating with that these sessions are really you.</string>
     <string name="device_manager_learn_more_session_rename_title">Renaming sessions</string>
     <string name="device_manager_learn_more_session_rename">Other users in direct messages and rooms that you join are able to view a full list of your sessions.\n\nThis provides them with confidence that they are really speaking to you, but it also means they can see the session name you enter here.</string>
+    <string name="labs_enable_session_manager_title">Enable new session manager</string>
+    <string name="labs_enable_session_manager_summary">Have greater visibility and control over all your sessions.</string>
+    <string name="labs_enable_client_info_recording_title">Enable client info recording</string>
+    <string name="labs_enable_client_info_recording_summary">Record the client name, version, and url to recognise sessions more easily in session manager.</string>
+    <string name="labs_enable_voice_broadcast_title">Enable voice broadcast (under active development)</string>
+    <string name="labs_enable_voice_broadcast_summary">Be able to record and send voice broadcast in room timeline.</string>
 
     <!-- Note to translators: %s will be replaces with selected space name -->
     <string name="home_empty_space_no_rooms_title">%s\nis looking a little empty.</string>
@@ -3340,4 +3370,43 @@
     <string name="onboarding_new_app_layout_feedback_message">Tap top right to see the option to feedback.</string>
     <string name="onboarding_new_app_layout_button_try">Try it out</string>
 
+    <string name="one">1</string>
+    <string name="two">2</string>
+    <string name="three">3</string>
+
+    <!-- QR Code Login -->
+    <string name="qr_code_login_header_scan_qr_code_title">Scan QR code</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Use the camera on this device to scan the QR code shown on your other device:</string>
+    <string name="qr_code_login_header_show_qr_code_title">Sign in with QR code</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Use your signed in device to scan the QR code below:</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Scan the QR code below with your device that’s signed out.</string>
+    <string name="qr_code_login_header_connected_title">Secure connection established</string>
+    <string name="qr_code_login_header_connected_description">Check your signed in device, the code below should be displayed. Confirm that the code below matches with that device:</string>
+    <string name="qr_code_login_header_failed_title">Unsuccessful connection</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Linking with this device is not supported.</string>
+    <string name="qr_code_login_header_failed_timeout_description">The linking wasn’t completed in the required time.</string>
+    <string name="qr_code_login_header_failed_denied_description">The request was denied on the other device.</string>
+    <string name="qr_code_login_new_device_instruction_1">Open ${app_name} on your other device</string>
+    <string name="qr_code_login_new_device_instruction_2">Go to Settings -> Security &amp; Privacy -> Show All Sessions</string>
+    <string name="qr_code_login_new_device_instruction_3">Select \'Show QR code in this device\'</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Start at the sign in screen</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Select \'Sign in with QR code\'</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Start at the sign in screen</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Select \'Scan QR code\'</string>
+    <string name="qr_code_login_show_qr_code_button">Show QR code in this device</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Signing in a mobile device?</string>
+    <string name="qr_code_login_scan_qr_code_button">Scan QR code</string>
+    <string name="qr_code_login_connecting_to_device">Connecting to device</string>
+    <string name="qr_code_login_signing_in">Signing you in</string>
+    <string name="qr_code_login_status_no_match">No match?</string>
+    <string name="qr_code_login_try_again">Try again</string>
+    <string name="qr_code_login_confirm_security_code">Confirm</string>
+    <string name="qr_code_login_confirm_security_code_description">Please ensure that you know the origin of this code. By linking devices, you will provide someone with full access to your account.</string>
+
+    <!-- WYSIWYG Composer -->
+    <string name="rich_text_editor_format_bold">Apply bold format</string>
+    <string name="rich_text_editor_format_italic">Apply italic format</string>
+    <string name="rich_text_editor_format_strikethrough">Apply strikethrough format</string>
+    <string name="rich_text_editor_format_underline">Apply underline format</string>
+
 </resources>

library/ui-styles/build.gradle

@@ -21,6 +21,8 @@ plugins {
 
 android {
 
+    namespace "im.vector.lib.ui.styles"
+
     compileSdk versions.compileSdk
     defaultConfig {
         minSdk versions.minSdk

library/ui-styles/src/debug/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="im.vector.lib.ui.styles">
 
     <application android:theme="@style/AppTheme.SC.Light">
         <activity

library/ui-styles/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="im.vector.lib.ui.styles">
 
     <application android:supportsRtl="true" />
 

library/ui-styles/src/main/res/values/colors.xml

@@ -150,10 +150,16 @@
     <color name="shield_color_gray">#808080</color>
     <color name="shield_color_warning">#E53935</color>
     <color name="shield_color_warning_background">#0FE53935</color>
+    <color name="shield_color_unknown">#757575</color>
 
     <!-- Badge Colors -->
     <attr name="vctr_badge_color_border" format="color" />
     <color name="vctr_badge_color_border_light">@color/palette_white</color>
     <color name="vctr_badge_color_border_dark">@color/palette_black_950</color>
 
+    <!-- WYSIWYG Colors -->
+    <attr name="vctr_rich_text_editor_menu_button_background" format="color" />
+    <color name="vctr_rich_text_editor_menu_button_background_light">#EEF8F4</color>
+    <color name="vctr_rich_text_editor_menu_button_background_dark">#1D292A</color>
+
 </resources>

library/ui-styles/src/main/res/values/dimens.xml

@@ -51,7 +51,8 @@
     <dimen name="composer_attachment_width">42dp</dimen>
     <dimen name="composer_attachment_height">48dp</dimen>
     <dimen name="composer_attachment_margin">1dp</dimen>
-
+    <dimen name="rich_text_composer_corner_radius_single_line">28dp</dimen>
+    <dimen name="rich_text_composer_corner_radius_expanded">14dp</dimen>
 
     <dimen name="chat_bubble_margin_start">28dp</dimen>
     <dimen name="chat_bubble_margin_end">6dp</dimen>

library/ui-styles/src/main/res/values/stylable_qr_code_instructions_view.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="QrCodeLoginInstructionsView">
+        <attr name="qrCodeLoginInstruction1" format="string" />
+        <attr name="qrCodeLoginInstruction2" format="string" />
+        <attr name="qrCodeLoginInstruction3" format="string" />
+        <attr name="qrCodeLoginInstruction4" format="string" />
+    </declare-styleable>
+
+</resources>

library/ui-styles/src/main/res/values/stylable_qr_code_login_header_view.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="QrCodeLoginHeaderView">
+        <attr name="qrCodeLoginHeaderTitle" format="string" />
+        <attr name="qrCodeLoginHeaderDescription" format="string" />
+        <attr name="qrCodeLoginHeaderImageResource" format="reference" />
+        <attr name="qrCodeLoginHeaderImageBackgroundTint" format="color" />
+    </declare-styleable>
+
+</resources>

library/ui-styles/src/main/res/values/stylable_session_overview_entry_view.xml

@@ -6,4 +6,10 @@
         <attr name="sessionOverviewEntryDescription" format="string" />
     </declare-styleable>
 
+    <declare-styleable name="SessionOverviewEntrySwitchView">
+        <attr name="sessionOverviewEntrySwitchTitle" format="string" />
+        <attr name="sessionOverviewEntrySwitchDescription" format="string" />
+        <attr name="sessionOverviewEntrySwitchEnabled" format="boolean" />
+    </declare-styleable>
+
 </resources>

library/ui-styles/src/main/res/values/styles_edit_text.xml

@@ -11,4 +11,14 @@
         <item name="android:textColor">?vctr_message_text_color</item>
     </style>
 
+    <style name="Widget.Vector.EditText.RichTextComposer" parent="Widget.AppCompat.EditText">
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:inputType">textCapSentences|textMultiLine</item>
+        <item name="android:maxLines">12</item>
+        <item name="android:minHeight">20dp</item>
+        <item name="android:padding">0dp</item>
+        <item name="android:textSize">15sp</item>
+        <item name="android:textColor">?vctr_message_text_color</item>
+    </style>
+
 </resources>

library/ui-styles/src/main/res/values/theme_dark.xml

@@ -192,6 +192,9 @@
 
         <!-- Material 3 -->
         <item name="collapsingToolbarLayoutMediumSize">@dimen/collapsing_toolbar_layout_medium_size</item>
+
+        <!-- WYSIWYG Editor -->
+        <item name="vctr_rich_text_editor_menu_button_background">@color/vctr_rich_text_editor_menu_button_background_dark</item>
     </style>
 
     <style name="Theme.Vector.Dark" parent="Base.Theme.Vector.Dark" />

library/ui-styles/src/main/res/values/theme_light.xml

@@ -193,6 +193,9 @@
 
         <!-- Material 3 -->
         <item name="collapsingToolbarLayoutMediumSize">@dimen/collapsing_toolbar_layout_medium_size</item>
+
+        <!-- WYSIWYG Editor -->
+        <item name="vctr_rich_text_editor_menu_button_background">@color/vctr_rich_text_editor_menu_button_background_light</item>
     </style>
 
     <style name="Theme.Vector.Light" parent="Base.Theme.Vector.Light" />

matrix-sdk-android-flow/build.gradle

@@ -5,6 +5,8 @@ plugins {
 }
 
 android {
+    namespace "org.matrix.android.sdk.flow"
+
     compileSdk versions.compileSdk
 
     defaultConfig {

matrix-sdk-android-flow/src/main/AndroidManifest.xml

@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
-    package="org.matrix.android.sdk.flow">
-
-</manifest>

matrix-sdk-android/build.gradle

@@ -43,6 +43,8 @@ dokkaHtml {
 }
 
 android {
+    namespace "org.matrix.android.sdk"
+
     testOptions.unitTests.includeAndroidResources = true
 
     compileSdk versions.compileSdk
@@ -60,7 +62,7 @@ android {
         // that the app's state is completely cleared between tests.
         testInstrumentationRunnerArguments clearPackageData: 'true'
 
-        buildConfigField "String", "SDK_VERSION", "\"1.5.2\""
+        buildConfigField "String", "SDK_VERSION", "\"1.5.4\""
 
         buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
         buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\""

matrix-sdk-android/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools">
-    package="org.matrix.android.sdk">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/account/LocalNotificationSettingsContent.kt

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.account
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class LocalNotificationSettingsContent(
+        @Json(name = "is_silenced") val isSilenced: Boolean = false
+)

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt

@@ -124,4 +124,24 @@ interface AuthenticationService {
             initialDeviceName: String,
             deviceId: String? = null
     ): Session
+
+    /**
+     * @param homeServerConnectionConfig the information about the homeserver and other configuration
+     * Return true if qr code login is supported by the server, false otherwise.
+     */
+    suspend fun isQrLoginSupported(homeServerConnectionConfig: HomeServerConnectionConfig): Boolean
+
+    /**
+     * Authenticate using m.login.token method during sign in with QR code.
+     * @param homeServerConnectionConfig the information about the homeserver and other configuration
+     * @param loginToken the m.login.token
+     * @param initialDeviceName the initial device name
+     * @param deviceId the device id, optional. If not provided or null, the server will generate one.
+     */
+    suspend fun loginUsingQrLoginToken(
+            homeServerConnectionConfig: HomeServerConnectionConfig,
+            loginToken: String,
+            initialDeviceName: String? = null,
+            deviceId: String? = null
+    ): Session
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/LoginType.kt

@@ -22,7 +22,8 @@ enum class LoginType {
     UNSUPPORTED,
     CUSTOM,
     DIRECT,
-    UNKNOWN;
+    UNKNOWN,
+    QR;
 
     companion object {
 
@@ -32,6 +33,7 @@ enum class LoginType {
             UNSUPPORTED.name -> UNSUPPORTED
             CUSTOM.name -> CUSTOM
             DIRECT.name -> DIRECT
+            QR.name -> QR
             else -> UNKNOWN
         }
     }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataTypes.kt

@@ -29,4 +29,5 @@ object UserAccountDataTypes {
     const val TYPE_ACCEPTED_TERMS = "m.accepted_terms"
     const val TYPE_OVERRIDE_COLORS = "im.vector.setting.override_colors"
     const val TYPE_EMOTE_ROOMS = "im.ponies.emote_rooms"
+    const val TYPE_LOCAL_NOTIFICATION_SETTINGS = "org.matrix.msc3890.local_notification_settings."
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt

@@ -31,6 +31,7 @@ import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.model.message.MessagePollContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageStickerContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.api.session.room.model.message.asMessageAudioEvent
 import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
 import org.matrix.android.sdk.api.session.room.model.relation.shouldRenderInThread
 import org.matrix.android.sdk.api.session.room.send.SendState
@@ -357,6 +358,10 @@ fun Event.isAudioMessage(): Boolean {
     }
 }
 
+fun Event.isVoiceMessage(): Boolean {
+    return this.asMessageAudioEvent()?.content?.voiceMessageIndicator != null
+}
+
 fun Event.isFileMessage(): Boolean {
     return when (getMsgType()) {
         MessageType.MSGTYPE_FILE -> true

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt

@@ -59,7 +59,12 @@ data class HomeServerCapabilities(
         /**
          * True if the home server supports controlling the logout of all devices when changing password.
          */
-        val canControlLogoutDevices: Boolean = false
+        val canControlLogoutDevices: Boolean = false,
+
+        /**
+         * True if the home server supports login via qr code, false otherwise.
+         */
+        val canLoginWithQrCode: Boolean = false,
 ) {
 
     enum class RoomCapabilitySupport {

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/HttpPusher.kt

@@ -58,6 +58,16 @@ data class HttpPusher(
          */
         val url: String,
 
+        /**
+         * Whether the pusher should actively create push notifications.
+         */
+        val enabled: Boolean,
+
+        /**
+         * The device ID of the session that registered the pusher.
+         */
+        val deviceId: String,
+
         /**
          * If true, the homeserver should add another pusher with the given pushkey and App ID in addition
          * to any others with different user IDs. Otherwise, the homeserver must remove any other pushers

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/Pusher.kt

@@ -24,8 +24,9 @@ data class Pusher(
         val profileTag: String? = null,
         val lang: String?,
         val data: PusherData,
-
+        val enabled: Boolean,
-        val state: PusherState
+        val deviceId: String?,
+        val state: PusherState,
 ) {
     companion object {
 

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt

@@ -67,6 +67,14 @@ interface PushersService {
             append: Boolean = true
     )
 
+    /**
+     * Enables or disables a registered pusher.
+     *
+     * @param pusher The pusher being toggled
+     * @param enable Whether the pusher should be enabled or disabled
+     */
+    suspend fun togglePusher(pusher: Pusher, enable: Boolean)
+
     /**
      * Directly ask the push gateway to send a push to this device.
      * If successful, the push gateway has accepted the request. In this case, the app should receive a Push with the provided eventId.

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageAudioEvent.kt

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.room.model.message
+
+import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+
+/**
+ * [Event] wrapper for [EventType.MESSAGE] event type.
+ * Provides additional fields and functions related to this event type.
+ */
+@JvmInline
+value class MessageAudioEvent(val root: Event) {
+
+    /**
+     * The mapped [MessageAudioContent] model of the event content.
+     */
+    val content: MessageAudioContent
+        get() = root.getClearContent().toModel<MessageContent>() as MessageAudioContent
+
+    init {
+        require(tryOrNull { content } != null)
+    }
+}
+
+/**
+ * Map a [EventType.MESSAGE] event to a [MessageAudioEvent].
+ */
+fun Event.asMessageAudioEvent() = if (getClearType() == EventType.MESSAGE) {
+    tryOrNull { MessageAudioEvent(this) }
+} else null

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt

@@ -43,4 +43,7 @@ object MessageType {
     // Fake message types for live location events to be able to inherit them from MessageContent
     const val MSGTYPE_BEACON_INFO = "org.matrix.android.sdk.beacon.info"
     const val MSGTYPE_BEACON_LOCATION_DATA = "org.matrix.android.sdk.beacon.location.data"
+
+    // Fake message types for voice broadcast events to be able to inherit them from MessageContent
+    const val MSGTYPE_VOICE_BROADCAST_INFO = "io.element.voicebroadcast.info"
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt

@@ -91,7 +91,8 @@ interface RelationService {
      * Edit a text message body. Limited to "m.text" contentType.
      * @param targetEvent The event to edit
      * @param msgType the message type
-     * @param newBodyText The edited body
+     * @param newBodyText The edited body in plain text
+     * @param newFormattedBodyText The edited body with format
      * @param newBodyAutoMarkdown true to parse markdown on the new body
      * @param compatibilityBodyText The text that will appear on clients that don't support yet edition
      */
@@ -99,6 +100,7 @@ interface RelationService {
             targetEvent: TimelineEvent,
             msgType: String,
             newBodyText: CharSequence,
+            newFormattedBodyText: CharSequence? = null,
             newBodyAutoMarkdown: Boolean,
             compatibilityBodyText: String = "* $newBodyText"
     ): Cancelable
@@ -108,13 +110,15 @@ interface RelationService {
      * This method will take the new body (stripped from fallbacks) and re-add them before sending.
      * @param replyToEdit The event to edit
      * @param originalTimelineEvent the message that this reply (being edited) is relating to
-     * @param newBodyText The edited body (stripped from in reply to content)
+     * @param newBodyText The plain text edited body (stripped from in reply to content)
+     * @param newFormattedBodyText The formatted edited body (stripped from in reply to content)
      * @param compatibilityBodyText The text that will appear on clients that don't support yet edition
      */
     fun editReply(
             replyToEdit: TimelineEvent,
             originalTimelineEvent: TimelineEvent,
             newBodyText: String,
+            newFormattedBodyText: String? = null,
             compatibilityBodyText: String = "* $newBodyText"
     ): Cancelable
 
@@ -133,6 +137,7 @@ interface RelationService {
      * by the sdk into pills.
      * @param eventReplied the event referenced by the reply
      * @param replyText the reply text
+     * @param replyFormattedText the reply text, formatted
      * @param autoMarkdown If true, the SDK will generate a formatted HTML message from the body text if markdown syntax is present
      * @param showInThread If true, relation will be added to the reply in order to be visible from within threads
      * @param rootThreadEventId If show in thread is true then we need the rootThreadEventId to generate the relation
@@ -140,6 +145,7 @@ interface RelationService {
     fun replyToMessage(
             eventReplied: TimelineEvent,
             replyText: CharSequence,
+            replyFormattedText: CharSequence? = null,
             autoMarkdown: Boolean = false,
             showInThread: Boolean = false,
             rootThreadEventId: String? = null

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt

@@ -21,6 +21,7 @@ import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.model.message.MessageType
 import org.matrix.android.sdk.api.session.room.model.message.PollType
+import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.util.Cancelable
 
@@ -44,28 +45,49 @@ interface SendService {
      * @param text the text message to send
      * @param msgType the message type: MessageType.MSGTYPE_TEXT (default) or MessageType.MSGTYPE_EMOTE
      * @param autoMarkdown If true, the SDK will generate a formatted HTML message from the body text if markdown syntax is present
+     * @param additionalContent additional content to put in the event content
      * @return a [Cancelable]
      */
-    fun sendTextMessage(text: CharSequence, msgType: String = MessageType.MSGTYPE_TEXT, autoMarkdown: Boolean = false): Cancelable
+    fun sendTextMessage(
+            text: CharSequence,
+            msgType: String = MessageType.MSGTYPE_TEXT,
+            autoMarkdown: Boolean = false,
+            additionalContent: Content? = null,
+    ): Cancelable
 
     /**
      * Method to send a text message with a formatted body.
      * @param text the text message to send
      * @param formattedText The formatted body using MessageType#FORMAT_MATRIX_HTML
      * @param msgType the message type: MessageType.MSGTYPE_TEXT (default) or MessageType.MSGTYPE_EMOTE
+     * @param additionalContent additional content to put in the event content
      * @return a [Cancelable]
      */
-    fun sendFormattedTextMessage(text: String, formattedText: String, msgType: String = MessageType.MSGTYPE_TEXT): Cancelable
+    fun sendFormattedTextMessage(
+            text: String,
+            formattedText: String,
+            msgType: String = MessageType.MSGTYPE_TEXT,
+            additionalContent: Content? = null,
+    ): Cancelable
 
     /**
      * Method to quote an events content.
      * @param quotedEvent The event to which we will quote it's content.
-     * @param text the text message to send
+     * @param text the plain text message to send
+     * @param formattedText the formatted text message to send
      * @param autoMarkdown If true, the SDK will generate a formatted HTML message from the body text if markdown syntax is present
      * @param rootThreadEventId when this param is not null, the message will be sent in this specific thread
+     * @param additionalContent additional content to put in the event content
      * @return a [Cancelable]
      */
-    fun sendQuotedTextMessage(quotedEvent: TimelineEvent, text: String, autoMarkdown: Boolean, rootThreadEventId: String? = null): Cancelable
+    fun sendQuotedTextMessage(
+            quotedEvent: TimelineEvent,
+            text: String,
+            formattedText: String? = null,
+            autoMarkdown: Boolean,
+            rootThreadEventId: String? = null,
+            additionalContent: Content? = null,
+    ): Cancelable
 
     /**
      * Method to send a media asynchronously.
@@ -74,13 +96,17 @@ interface SendService {
      * @param roomIds set of roomIds to where the media will be sent. The current roomId will be add to this set if not present.
      *                It can be useful to send media to multiple room. It's safe to include the current roomId in this set
      * @param rootThreadEventId when this param is not null, the Media will be sent in this specific thread
+     * @param relatesTo add a relation content to the media event
+     * @param additionalContent additional content to put in the event content
      * @return a [Cancelable]
      */
     fun sendMedia(
             attachment: ContentAttachmentData,
             compressBeforeSending: Boolean,
             roomIds: Set<String>,
-            rootThreadEventId: String? = null
+            rootThreadEventId: String? = null,
+            relatesTo: RelationDefaultContent? = null,
+            additionalContent: Content? = null,
     ): Cancelable
 
     /**
@@ -90,13 +116,15 @@ interface SendService {
      * @param roomIds set of roomIds to where the media will be sent. The current roomId will be add to this set if not present.
      *                It can be useful to send media to multiple room. It's safe to include the current roomId in this set
      * @param rootThreadEventId when this param is not null, all the Media will be sent in this specific thread
+     * @param additionalContent additional content to put in the event content
      * @return a [Cancelable]
      */
     fun sendMedias(
             attachments: List<ContentAttachmentData>,
             compressBeforeSending: Boolean,
             roomIds: Set<String>,
-            rootThreadEventId: String? = null
+            rootThreadEventId: String? = null,
+            additionalContent: Content? = null,
     ): Cancelable
 
     /**
@@ -104,31 +132,35 @@ interface SendService {
      * @param pollType indicates open or closed polls
      * @param question the question
      * @param options list of options
+     * @param additionalContent additional content to put in the event content
      * @return a [Cancelable]
      */
-    fun sendPoll(pollType: PollType, question: String, options: List<String>): Cancelable
+    fun sendPoll(pollType: PollType, question: String, options: List<String>, additionalContent: Content? = null): Cancelable
 
     /**
      * Method to send a poll response.
      * @param pollEventId the poll currently replied to
      * @param answerId The id of the answer
+     * @param additionalContent additional content to put in the event content
      * @return a [Cancelable]
      */
-    fun voteToPoll(pollEventId: String, answerId: String): Cancelable
+    fun voteToPoll(pollEventId: String, answerId: String, additionalContent: Content? = null): Cancelable
 
     /**
      * End a poll in the room.
      * @param pollEventId event id of the poll
+     * @param additionalContent additional content to put in the event content
      * @return a [Cancelable]
      */
-    fun endPoll(pollEventId: String): Cancelable
+    fun endPoll(pollEventId: String, additionalContent: Content? = null): Cancelable
 
     /**
      * Redact (delete) the given event.
      * @param event The event to redact
      * @param reason Optional reason string
+     * @param additionalContent additional content to put in the event content
      */
-    fun redactEvent(event: Event, reason: String?): Cancelable
+    fun redactEvent(event: Event, reason: String?, additionalContent: Content? = null): Cancelable
 
     /**
      * Schedule this message to be resent.

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt

@@ -33,6 +33,7 @@ import org.matrix.android.sdk.api.session.room.model.ReadReceipt
 import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconInfoContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconLocationDataContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageContentWithFormattedBody
 import org.matrix.android.sdk.api.session.room.model.message.MessagePollContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageStickerContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
@@ -180,8 +181,13 @@ fun TimelineEvent.isRootThread(): Boolean {
 /**
  * Get the latest message body, after a possible edition, stripping the reply prefix if necessary.
  */
-fun TimelineEvent.getTextEditableContent(): String {
+fun TimelineEvent.getTextEditableContent(formatted: Boolean): String {
-    val lastContentBody = getLastMessageContent()?.body ?: return ""
+    val lastMessageContent = getLastMessageContent()
+    val lastContentBody = if (formatted && lastMessageContent is MessageContentWithFormattedBody) {
+        lastMessageContent.formattedBody
+    } else {
+        lastMessageContent?.body
+    } ?: return ""
     return if (isReply()) {
         extractUsefulTextFromReply(lastContentBody)
     } else {

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt

@@ -55,4 +55,9 @@ interface TimelineService {
      * Returns a snapshot list of TimelineEvent with EventType.MESSAGE and MessageType.MSGTYPE_IMAGE or MessageType.MSGTYPE_VIDEO.
      */
     fun getAttachmentMessages(): List<TimelineEvent>
+
+    /**
+     * Returns a snapshot list of TimelineEvent with a content relation of the given type to the given eventId.
+     */
+    fun getTimelineEventsRelatedTo(relationType: String, eventId: String): List<TimelineEvent>
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Compat.kt

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.util
+
+import android.content.pm.ApplicationInfo
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import android.os.Build
+
+fun PackageManager.getApplicationInfoCompat(packageName: String, flags: Int): ApplicationInfo {
+    return when {
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> getApplicationInfo(
+                packageName,
+                PackageManager.ApplicationInfoFlags.of(flags.toLong())
+        )
+        else -> @Suppress("DEPRECATION") getApplicationInfo(packageName, flags)
+    }
+}
+
+fun PackageManager.getPackageInfoCompat(packageName: String, flags: Int): PackageInfo {
+    return when {
+        Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> getPackageInfo(
+                packageName,
+                PackageManager.PackageInfoFlags.of(flags.toLong())
+        )
+        else -> @Suppress("DEPRECATION") getPackageInfo(packageName, flags)
+    }
+}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Optional.kt

@@ -15,15 +15,13 @@
  */
 package org.matrix.android.sdk.api.util
 
-data class Optional<T : Any> constructor(private val value: T?) {
+data class Optional<T : Any>(private val value: T?) {
 
-    fun get(): T {
+    fun get(): T = value!!
-        return value!!
-    }
 
-    fun getOrNull(): T? {
+    fun orNull(): T? = value
-        return value
+
-    }
+    fun getOrNull(): T? = value
 
     fun <U : Any> map(fn: (T) -> U?): Optional<U> {
         return if (value == null) {
@@ -33,23 +31,19 @@ data class Optional<T : Any> constructor(private val value: T?) {
         }
     }
 
-    fun getOrElse(fn: () -> T): T {
+    fun orElse(fn: () -> T): T {
         return value ?: fn()
     }
 
-    fun hasValue(): Boolean {
+    fun hasValue(): Boolean = value != null
-        return value != null
-    }
 
     companion object {
-        fun <T : Any> from(value: T?): Optional<T> {
+        fun <T : Any> from(value: T?): Optional<T> = Optional(value)
-            return Optional(value)
-        }
 
-        fun <T : Any> empty(): Optional<T> {
+        fun <T : Any> empty(): Optional<T> = Optional(null)
-            return Optional(null)
-        }
     }
 }
 
+fun <T : Any> T?.toOption() = Optional(this)
+
 fun <T : Any> T?.toOptional() = Optional(this)

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt

@@ -29,7 +29,9 @@ import org.matrix.android.sdk.internal.auth.db.AuthRealmModule
 import org.matrix.android.sdk.internal.auth.db.RealmPendingSessionStore
 import org.matrix.android.sdk.internal.auth.db.RealmSessionParamsStore
 import org.matrix.android.sdk.internal.auth.login.DefaultDirectLoginTask
+import org.matrix.android.sdk.internal.auth.login.DefaultQrLoginTokenTask
 import org.matrix.android.sdk.internal.auth.login.DirectLoginTask
+import org.matrix.android.sdk.internal.auth.login.QrLoginTokenTask
 import org.matrix.android.sdk.internal.database.RealmKeysUtils
 import org.matrix.android.sdk.internal.di.AuthDatabase
 import org.matrix.android.sdk.internal.legacy.DefaultLegacySessionImporter
@@ -94,4 +96,7 @@ internal abstract class AuthModule {
 
     @Binds
     abstract fun bindHomeServerHistoryService(service: DefaultHomeServerHistoryService): HomeServerHistoryService
+
+    @Binds
+    abstract fun bindQrLoginTokenTask(task: DefaultQrLoginTokenTask): QrLoginTokenTask
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt

@@ -30,6 +30,7 @@ import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 import org.matrix.android.sdk.api.auth.login.LoginWizard
 import org.matrix.android.sdk.api.auth.registration.RegistrationWizard
 import org.matrix.android.sdk.api.auth.wellknown.WellknownResult
+import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.MatrixIdFailure
 import org.matrix.android.sdk.api.session.Session
@@ -39,9 +40,11 @@ import org.matrix.android.sdk.internal.auth.data.WebClientConfig
 import org.matrix.android.sdk.internal.auth.db.PendingSessionData
 import org.matrix.android.sdk.internal.auth.login.DefaultLoginWizard
 import org.matrix.android.sdk.internal.auth.login.DirectLoginTask
+import org.matrix.android.sdk.internal.auth.login.QrLoginTokenTask
 import org.matrix.android.sdk.internal.auth.registration.DefaultRegistrationWizard
 import org.matrix.android.sdk.internal.auth.version.Versions
 import org.matrix.android.sdk.internal.auth.version.doesServerSupportLogoutDevices
+import org.matrix.android.sdk.internal.auth.version.doesServerSupportQrCodeLogin
 import org.matrix.android.sdk.internal.auth.version.isLoginAndRegistrationSupportedBySdk
 import org.matrix.android.sdk.internal.auth.version.isSupportedBySdk
 import org.matrix.android.sdk.internal.di.Unauthenticated
@@ -62,7 +65,8 @@ internal class DefaultAuthenticationService @Inject constructor(
         private val sessionCreator: SessionCreator,
         private val pendingSessionStore: PendingSessionStore,
         private val getWellknownTask: GetWellknownTask,
-        private val directLoginTask: DirectLoginTask
+        private val directLoginTask: DirectLoginTask,
+        private val qrLoginTokenTask: QrLoginTokenTask
 ) : AuthenticationService {
 
     private var pendingSessionData: PendingSessionData? = pendingSessionStore.getPendingSessionData()
@@ -404,6 +408,36 @@ internal class DefaultAuthenticationService @Inject constructor(
         )
     }
 
+    override suspend fun isQrLoginSupported(homeServerConnectionConfig: HomeServerConnectionConfig): Boolean {
+        val authAPI = buildAuthAPI(homeServerConnectionConfig)
+        val versions = runCatching {
+            executeRequest(null) {
+                authAPI.versions()
+            }
+        }
+        return if (versions.isSuccess) {
+            versions.getOrNull()?.doesServerSupportQrCodeLogin().orFalse()
+        } else {
+            false
+        }
+    }
+
+    override suspend fun loginUsingQrLoginToken(
+            homeServerConnectionConfig: HomeServerConnectionConfig,
+            loginToken: String,
+            initialDeviceName: String?,
+            deviceId: String?,
+    ): Session {
+        return qrLoginTokenTask.execute(
+                QrLoginTokenTask.Params(
+                        homeServerConnectionConfig = homeServerConnectionConfig,
+                        loginToken = loginToken,
+                        deviceName = initialDeviceName,
+                        deviceId = deviceId
+                )
+        )
+    }
+
     private fun buildAuthAPI(homeServerConnectionConfig: HomeServerConnectionConfig): AuthAPI {
         val retrofit = retrofitFactory.create(buildClient(homeServerConnectionConfig), homeServerConnectionConfig.homeServerUriBase.toString())
         return retrofit.create(AuthAPI::class.java)

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginParams.kt

@@ -18,4 +18,6 @@ package org.matrix.android.sdk.internal.auth.data
 
 internal interface LoginParams {
     val type: String
+    val deviceDisplayName: String?
+    val deviceId: String?
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt

@@ -30,8 +30,8 @@ internal data class PasswordLoginParams(
         @Json(name = "identifier") val identifier: Map<String, String>,
         @Json(name = "password") val password: String,
         @Json(name = "type") override val type: String,
-        @Json(name = "initial_device_display_name") val deviceDisplayName: String?,
+        @Json(name = "initial_device_display_name") override val deviceDisplayName: String?,
-        @Json(name = "device_id") val deviceId: String?
+        @Json(name = "device_id") override val deviceId: String?
 ) : LoginParams {
 
     companion object {

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt

@@ -23,5 +23,7 @@ import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 @JsonClass(generateAdapter = true)
 internal data class TokenLoginParams(
         @Json(name = "type") override val type: String = LoginFlowTypes.TOKEN,
-        @Json(name = "token") val token: String
+        @Json(name = "token") val token: String,
+        @Json(name = "initial_device_display_name") override val deviceDisplayName: String? = null,
+        @Json(name = "device_id") override val deviceId: String? = null
 ) : LoginParams

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/QrLoginTokenTask.kt

@@ -0,0 +1,88 @@
+/*
+ * Copyright 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.auth.login
+
+import dagger.Lazy
+import okhttp3.OkHttpClient
+import org.matrix.android.sdk.api.auth.LoginType
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.internal.auth.AuthAPI
+import org.matrix.android.sdk.internal.auth.SessionCreator
+import org.matrix.android.sdk.internal.auth.data.TokenLoginParams
+import org.matrix.android.sdk.internal.di.Unauthenticated
+import org.matrix.android.sdk.internal.network.RetrofitFactory
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.network.httpclient.addSocketFactory
+import org.matrix.android.sdk.internal.network.ssl.UnrecognizedCertificateException
+import org.matrix.android.sdk.internal.task.Task
+import javax.inject.Inject
+
+internal interface QrLoginTokenTask : Task<QrLoginTokenTask.Params, Session> {
+    data class Params(
+            val homeServerConnectionConfig: HomeServerConnectionConfig,
+            val loginToken: String,
+            val deviceName: String?,
+            val deviceId: String?
+    )
+}
+
+internal class DefaultQrLoginTokenTask @Inject constructor(
+        @Unauthenticated
+        private val okHttpClient: Lazy<OkHttpClient>,
+        private val retrofitFactory: RetrofitFactory,
+        private val sessionCreator: SessionCreator,
+) : QrLoginTokenTask {
+
+    override suspend fun execute(params: QrLoginTokenTask.Params): Session {
+        val client = buildClient(params.homeServerConnectionConfig)
+        val homeServerUrl = params.homeServerConnectionConfig.homeServerUriBase.toString()
+
+        val authAPI = retrofitFactory.create(client, homeServerUrl)
+                .create(AuthAPI::class.java)
+
+        val loginParams = TokenLoginParams(
+                token = params.loginToken,
+                deviceDisplayName = params.deviceName,
+                deviceId = params.deviceId
+        )
+
+        val credentials = try {
+            executeRequest(null) {
+                authAPI.login(loginParams)
+            }
+        } catch (throwable: Throwable) {
+            throw when (throwable) {
+                is UnrecognizedCertificateException -> Failure.UnrecognizedCertificateFailure(
+                        homeServerUrl,
+                        throwable.fingerprint
+                )
+                else -> throwable
+            }
+        }
+
+        return sessionCreator.createSession(credentials, params.homeServerConnectionConfig, LoginType.QR)
+    }
+
+    private fun buildClient(homeServerConnectionConfig: HomeServerConnectionConfig): OkHttpClient {
+        return okHttpClient.get()
+                .newBuilder()
+                .addSocketFactory(homeServerConnectionConfig)
+                .build()
+    }
+}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt

@@ -53,6 +53,7 @@ private const val FEATURE_ID_ACCESS_TOKEN = "m.id_access_token"
 private const val FEATURE_SEPARATE_ADD_AND_BIND = "m.separate_add_and_bind"
 private const val FEATURE_THREADS_MSC3440 = "org.matrix.msc3440"
 private const val FEATURE_THREADS_MSC3440_STABLE = "org.matrix.msc3440.stable"
+private const val FEATURE_QR_CODE_LOGIN = "org.matrix.msc3882"
 
 /**
  * Return true if the SDK supports this homeserver version.
@@ -78,6 +79,10 @@ internal fun Versions.doesServerSupportThreads(): Boolean {
     return unstableFeatures?.get(FEATURE_THREADS_MSC3440_STABLE) ?: false
 }
 
+internal fun Versions.doesServerSupportQrCodeLogin(): Boolean {
+    return unstableFeatures?.get(FEATURE_QR_CODE_LOGIN) ?: false
+}
+
 /**
  * Return true if the server support the lazy loading of room members.
  *

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt

@@ -659,14 +659,7 @@ internal class RealmCryptoStore @Inject constructor(
     }
 
     override fun saveMyDevicesInfo(info: List<DeviceInfo>) {
-        val entities = info.map {
+        val entities = info.map { myDeviceLastSeenInfoEntityMapper.map(it) }
-            MyDeviceLastSeenInfoEntity(
-                    lastSeenTs = it.lastSeenTs,
-                    lastSeenIp = it.lastSeenIp,
-                    displayName = it.displayName,
-                    deviceId = it.deviceId
-            )
-        }
         doRealmTransactionAsync(realmConfiguration) { realm ->
             realm.where<MyDeviceLastSeenInfoEntity>().findAll().deleteAllFromRealm()
             entities.forEach {

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt

@@ -36,6 +36,7 @@ import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo
 import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo017
 import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo018
 import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo019
+import org.matrix.android.sdk.internal.crypto.store.db.migration.MigrateCryptoTo020
 import org.matrix.android.sdk.internal.util.database.MatrixRealmMigration
 import org.matrix.android.sdk.internal.util.time.Clock
 import javax.inject.Inject
@@ -50,7 +51,7 @@ internal class RealmCryptoStoreMigration @Inject constructor(
         private val clock: Clock,
 ) : MatrixRealmMigration(
         dbName = "Crypto",
-        schemaVersion = 19L,
+        schemaVersion = 20L,
 ) {
     /**
      * Forces all RealmCryptoStoreMigration instances to be equal.
@@ -79,5 +80,6 @@ internal class RealmCryptoStoreMigration @Inject constructor(
         if (oldVersion < 17) MigrateCryptoTo017(realm).perform()
         if (oldVersion < 18) MigrateCryptoTo018(realm).perform()
         if (oldVersion < 19) MigrateCryptoTo019(realm).perform()
+        if (oldVersion < 20) MigrateCryptoTo020(realm).perform()
     }
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/MyDeviceLastSeenInfoEntityMapper.kt

@@ -27,7 +27,18 @@ internal class MyDeviceLastSeenInfoEntityMapper @Inject constructor() {
                 deviceId = entity.deviceId,
                 lastSeenIp = entity.lastSeenIp,
                 lastSeenTs = entity.lastSeenTs,
-                displayName = entity.displayName
+                displayName = entity.displayName,
+                unstableLastSeenUserAgent = entity.lastSeenUserAgent,
+        )
+    }
+
+    fun map(deviceInfo: DeviceInfo): MyDeviceLastSeenInfoEntity {
+        return MyDeviceLastSeenInfoEntity(
+                deviceId = deviceInfo.deviceId,
+                lastSeenIp = deviceInfo.lastSeenIp,
+                lastSeenTs = deviceInfo.lastSeenTs,
+                displayName = deviceInfo.displayName,
+                lastSeenUserAgent = deviceInfo.getBestLastSeenUserAgent(),
         )
     }
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo019.kt

@@ -30,7 +30,7 @@ import org.matrix.android.sdk.internal.util.database.RealmMigrator
  * mark existing keys as safe.
  * This migration can take long depending on the account
  */
-internal class MigrateCryptoTo019(realm: DynamicRealm) : RealmMigrator(realm, 18) {
+internal class MigrateCryptoTo019(realm: DynamicRealm) : RealmMigrator(realm, 19) {
 
     override fun doMigrate(realm: DynamicRealm) {
         realm.schema.get("CrossSigningInfoEntity")

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/migration/MigrateCryptoTo020.kt

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.crypto.store.db.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.crypto.store.db.model.MyDeviceLastSeenInfoEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+/**
+ * This migration adds a new field into MyDeviceLastSeenInfoEntity corresponding to the last seen user agent.
+ */
+internal class MigrateCryptoTo020(realm: DynamicRealm) : RealmMigrator(realm, 20) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("MyDeviceLastSeenInfoEntity")
+                ?.addField(MyDeviceLastSeenInfoEntityFields.LAST_SEEN_USER_AGENT, String::class.java)
+    }
+}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/MyDeviceLastSeenInfoEntity.kt

@@ -27,7 +27,9 @@ internal open class MyDeviceLastSeenInfoEntity(
         /** The last time this device has been seen. */
         var lastSeenTs: Long? = null,
         /** The last ip address. */
-        var lastSeenIp: String? = null
+        var lastSeenIp: String? = null,
+        /** The last user agent. */
+        var lastSeenUserAgent: String? = null,
 ) : RealmObject() {
 
     companion object

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt

@@ -61,6 +61,8 @@ import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo034
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo035
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo036
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo037
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo038
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo039
 import org.matrix.android.sdk.internal.util.Normalizer
 import org.matrix.android.sdk.internal.util.database.MatrixRealmMigration
 import timber.log.Timber
@@ -84,7 +86,7 @@ internal class RealmSessionStoreMigration @Inject constructor(
         private val scSchemaVersion = 7L
         private val scSchemaVersionOffset = (1L shl 12)
 
-        val schemaVersion = 37L +
+        val schemaVersion = 39L +
                 scSchemaVersion * scSchemaVersionOffset
     }
 
@@ -138,6 +140,8 @@ internal class RealmSessionStoreMigration @Inject constructor(
         if (oldVersion < 35) MigrateSessionTo035(realm).perform()
         if (oldVersion < 36) MigrateSessionTo036(realm).perform()
         if (oldVersion < 37) MigrateSessionTo037(realm).perform()
+        if (oldVersion < 38) MigrateSessionTo038(realm).perform()
+        if (oldVersion < 39) MigrateSessionTo039(realm).perform()
 
         if (oldScVersion <= 0) MigrateScSessionTo001(realm).perform()
         if (oldScVersion <= 1) MigrateScSessionTo002(realm).perform()

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt

@@ -43,7 +43,8 @@ internal object HomeServerCapabilitiesMapper {
                 defaultIdentityServerUrl = entity.defaultIdentityServerUrl,
                 roomVersions = mapRoomVersion(entity.roomVersionsJson),
                 canUseThreading = entity.canUseThreading,
-                canControlLogoutDevices = entity.canControlLogoutDevices
+                canControlLogoutDevices = entity.canControlLogoutDevices,
+                canLoginWithQrCode = entity.canLoginWithQrCode,
         )
     }
 

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushersMapper.kt

@@ -33,7 +33,9 @@ internal object PushersMapper {
                 profileTag = pushEntity.profileTag,
                 lang = pushEntity.lang,
                 data = PusherData(pushEntity.data?.url, pushEntity.data?.format),
-                state = pushEntity.state
+                enabled = pushEntity.enabled,
+                deviceId = pushEntity.deviceId,
+                state = pushEntity.state,
         )
     }
 
@@ -46,7 +48,9 @@ internal object PushersMapper {
                 deviceDisplayName = pusher.deviceDisplayName,
                 profileTag = pusher.profileTag,
                 lang = pusher.lang,
-                data = PusherDataEntity(pusher.data?.url, pusher.data?.format)
+                data = PusherDataEntity(pusher.data?.url, pusher.data?.format),
+                enabled = pusher.enabled,
+                deviceId = pusher.deviceId,
         )
     }
 }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo038.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.database.model.PusherEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+internal class MigrateSessionTo038(realm: DynamicRealm) : RealmMigrator(realm, 38) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("PusherEntity")
+                ?.addField(PusherEntityFields.ENABLED, Boolean::class.java)
+                ?.addField(PusherEntityFields.DEVICE_ID, String::class.java)
+                ?.transform { obj -> obj.set(PusherEntityFields.ENABLED, true) }
+    }
+}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo039.kt

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntityFields
+import org.matrix.android.sdk.internal.extensions.forceRefreshOfHomeServerCapabilities
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+internal class MigrateSessionTo039(realm: DynamicRealm) : RealmMigrator(realm, 39) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("HomeServerCapabilitiesEntity")
+                ?.addField(HomeServerCapabilitiesEntityFields.CAN_LOGIN_WITH_QR_CODE, Boolean::class.java)
+                ?.transform { obj ->
+                    obj.set(HomeServerCapabilitiesEntityFields.CAN_LOGIN_WITH_QR_CODE, false)
+                }
+                ?.forceRefreshOfHomeServerCapabilities()
+    }
+}