diff --git a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt b/app/src/main/kotlin/io/element/android/x/di/AppModule.kt
index b57542354b..93f65cb58a 100644
--- a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/AppModule.kt
@@ -23,6 +23,7 @@ import androidx.preference.PreferenceManager
 import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module
 import dagger.Provides
+import io.element.android.appconfig.ApplicationConfig
 import io.element.android.features.messages.impl.timeline.components.customreaction.DefaultEmojibaseProvider
 import io.element.android.features.messages.impl.timeline.components.customreaction.EmojibaseProvider
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
@@ -84,7 +85,9 @@ object AppModule {
     fun providesBuildMeta(@ApplicationContext context: Context, buildType: BuildType) = BuildMeta(
         isDebuggable = BuildConfig.DEBUG,
         buildType = buildType,
-        applicationName = context.getString(R.string.app_name),
+        applicationName = ApplicationConfig.APPLICATION_NAME.takeIf { it.isNotEmpty() } ?: context.getString(R.string.app_name),
+        productionApplicationName = ApplicationConfig.PRODUCTION_APPLICATION_NAME,
+        desktopApplicationName = ApplicationConfig.DESKTOP_APPLICATION_NAME,
         applicationId = BuildConfig.APPLICATION_ID,
         // TODO EAx Config.LOW_PRIVACY_LOG_ENABLE,
         lowPrivacyLoggingEnabled = false,
diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/ApplicationConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/ApplicationConfig.kt
new file mode 100644
index 0000000000..21af158ad6
--- /dev/null
+++ b/appconfig/src/main/kotlin/io/element/android/appconfig/ApplicationConfig.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2023 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 io.element.android.appconfig
+
+object ApplicationConfig {
+    /**
+     * Application name used in the UI for string. If empty, the value is taken from the resources `R.string.app_name`.
+     * Note that this value is not used for the launcher icon.
+     * For Element, the value is empty, and so read from `R.string.app_name`, which depends on the build variant:
+     * - "Element X" for release builds;
+     * - "Element X dbg" for debug builds;
+     * - "Element X nightly" for nightly builds.
+     */
+    const val APPLICATION_NAME: String = ""
+
+    /**
+     * Used in the strings to reference the Element client.
+     * Cannot be empty.
+     * For Element, the value is "Element".
+     */
+    const val PRODUCTION_APPLICATION_NAME: String = "Element"
+
+    /**
+     * Used in the strings to reference the Element Desktop client, for instance Element Web.
+     * Cannot be empty.
+     * For Element, the value is "Element". We use the same name for desktop and mobile for now.
+     */
+    const val DESKTOP_APPLICATION_NAME: String = "Element"
+}
diff --git a/features/createroom/impl/src/main/res/values-be/translations.xml b/features/createroom/impl/src/main/res/values-be/translations.xml
index 3c81815d7d..1ab27b86e4 100644
--- a/features/createroom/impl/src/main/res/values-be/translations.xml
+++ b/features/createroom/impl/src/main/res/values-be/translations.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Новы пакой"</string>
-  <string name="screen_create_room_action_invite_people">"Запрасіце сяброў у Element"</string>
   <string name="screen_create_room_add_people_title">"Запрасіць карыстальникаў"</string>
   <string name="screen_create_room_error_creating_room">"Пры стварэнні пакоя адбылася памылка"</string>
   <string name="screen_create_room_private_option_description">"Паведамленні ў гэтым пакоі зашыфраваны. Гэта шыфраванне нельга адключыць."</string>
diff --git a/features/createroom/impl/src/main/res/values-bg/translations.xml b/features/createroom/impl/src/main/res/values-bg/translations.xml
index df991482be..28f42b4156 100644
--- a/features/createroom/impl/src/main/res/values-bg/translations.xml
+++ b/features/createroom/impl/src/main/res/values-bg/translations.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Нова стая"</string>
-  <string name="screen_create_room_action_invite_people">"Поканване на хора в Element"</string>
   <string name="screen_create_room_add_people_title">"Поканване на хора"</string>
   <string name="screen_create_room_error_creating_room">"Възникна грешка при създаването на стаята"</string>
   <string name="screen_create_room_private_option_description">"Съобщенията в тази стая са шифровани. Шифроването не може да бъде изключено впоследствие."</string>
diff --git a/features/createroom/impl/src/main/res/values-cs/translations.xml b/features/createroom/impl/src/main/res/values-cs/translations.xml
index b015abbffe..7ea28fc293 100644
--- a/features/createroom/impl/src/main/res/values-cs/translations.xml
+++ b/features/createroom/impl/src/main/res/values-cs/translations.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Nová místnost"</string>
-  <string name="screen_create_room_action_invite_people">"Pozvat přátele do Elementu"</string>
   <string name="screen_create_room_add_people_title">"Pozvat přátele"</string>
   <string name="screen_create_room_error_creating_room">"Při vytváření místnosti došlo k chybě"</string>
   <string name="screen_create_room_private_option_description">"Zprávy v této místnosti jsou šifrované. Šifrování nelze později vypnout."</string>
diff --git a/features/createroom/impl/src/main/res/values-de/translations.xml b/features/createroom/impl/src/main/res/values-de/translations.xml
index 903d3f4122..03b45ffa56 100644
--- a/features/createroom/impl/src/main/res/values-de/translations.xml
+++ b/features/createroom/impl/src/main/res/values-de/translations.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Neuer Raum"</string>
-  <string name="screen_create_room_action_invite_people">"Zu Element einladen"</string>
   <string name="screen_create_room_add_people_title">"Personen einladen"</string>
   <string name="screen_create_room_error_creating_room">"Beim Erstellen des Raums ist ein Fehler aufgetreten"</string>
   <string name="screen_create_room_private_option_description">"Die Nachrichten in diesem Raum sind verschlüsselt. Die Verschlüsselung kann nicht nachträglich deaktiviert werden."</string>
diff --git a/features/createroom/impl/src/main/res/values-es/translations.xml b/features/createroom/impl/src/main/res/values-es/translations.xml
index 50fe3c6a72..5946dab102 100644
--- a/features/createroom/impl/src/main/res/values-es/translations.xml
+++ b/features/createroom/impl/src/main/res/values-es/translations.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Nueva sala"</string>
-  <string name="screen_create_room_action_invite_people">"Invita a alguien a Element"</string>
   <string name="screen_create_room_add_people_title">"Invitar personas"</string>
   <string name="screen_create_room_error_creating_room">"Se ha producido un error al crear la sala"</string>
   <string name="screen_create_room_private_option_description">"Los mensajes de esta sala están cifrados. La encriptación no se puede desactivar después."</string>
diff --git a/features/createroom/impl/src/main/res/values-fr/translations.xml b/features/createroom/impl/src/main/res/values-fr/translations.xml
index f65cb22ebc..51d335571b 100644
--- a/features/createroom/impl/src/main/res/values-fr/translations.xml
+++ b/features/createroom/impl/src/main/res/values-fr/translations.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Nouveau salon"</string>
-  <string name="screen_create_room_action_invite_people">"Inviter des amis sur Element"</string>
   <string name="screen_create_room_add_people_title">"Inviter des amis"</string>
   <string name="screen_create_room_error_creating_room">"Une erreur s’est produite lors de la création du salon"</string>
   <string name="screen_create_room_private_option_description">"Les messages dans ce salon sont chiffrés. Le chiffrement ne pourra pas être désactivé par la suite."</string>
diff --git a/features/createroom/impl/src/main/res/values-hu/translations.xml b/features/createroom/impl/src/main/res/values-hu/translations.xml
index 9549d6b848..e00de669a6 100644
--- a/features/createroom/impl/src/main/res/values-hu/translations.xml
+++ b/features/createroom/impl/src/main/res/values-hu/translations.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Új szoba"</string>
-  <string name="screen_create_room_action_invite_people">"Hívja meg ismerőseit az Elementbe"</string>
   <string name="screen_create_room_add_people_title">"Ismerősök meghívása"</string>
   <string name="screen_create_room_error_creating_room">"Hiba történt a szoba létrehozásakor"</string>
   <string name="screen_create_room_private_option_description">"A szobában lévő üzenetek titkosítottak. A titkosítást utólag nem lehet kikapcsolni."</string>
diff --git a/features/createroom/impl/src/main/res/values-in/translations.xml b/features/createroom/impl/src/main/res/values-in/translations.xml
index e76d0af727..fba0e8aa3f 100644
--- a/features/createroom/impl/src/main/res/values-in/translations.xml
+++ b/features/createroom/impl/src/main/res/values-in/translations.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Ruangan baru"</string>
-  <string name="screen_create_room_action_invite_people">"Undang orang-orang ke Element"</string>
   <string name="screen_create_room_add_people_title">"Undang orang-orang"</string>
   <string name="screen_create_room_error_creating_room">"Terjadi kesalahan saat membuat ruangan"</string>
   <string name="screen_create_room_private_option_description">"Pesan di ruangan ini dienkripsi. Enkripsi tidak dapat dinonaktifkan setelahnya."</string>
diff --git a/features/createroom/impl/src/main/res/values-it/translations.xml b/features/createroom/impl/src/main/res/values-it/translations.xml
index 89b15f6d87..205f1db36a 100644
--- a/features/createroom/impl/src/main/res/values-it/translations.xml
+++ b/features/createroom/impl/src/main/res/values-it/translations.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Nuova stanza"</string>
-  <string name="screen_create_room_action_invite_people">"Invita persone su Element"</string>
   <string name="screen_create_room_add_people_title">"Invita persone"</string>
   <string name="screen_create_room_error_creating_room">"Si è verificato un errore durante la creazione della stanza"</string>
   <string name="screen_create_room_private_option_description">"I messaggi in questa stanza sono cifrati. La crittografia non può essere disattivata in seguito."</string>
diff --git a/features/createroom/impl/src/main/res/values-ro/translations.xml b/features/createroom/impl/src/main/res/values-ro/translations.xml
index 79eca6984f..baf7661fb8 100644
--- a/features/createroom/impl/src/main/res/values-ro/translations.xml
+++ b/features/createroom/impl/src/main/res/values-ro/translations.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Cameră nouă"</string>
-  <string name="screen_create_room_action_invite_people">"Invitați prieteni în Element"</string>
   <string name="screen_create_room_add_people_title">"Invitați prieteni"</string>
   <string name="screen_create_room_error_creating_room">"A apărut o eroare la crearea camerei"</string>
   <string name="screen_create_room_private_option_description">"Mesajele din această cameră sunt criptate. Criptarea nu poate fi dezactivată ulterior."</string>
diff --git a/features/createroom/impl/src/main/res/values-ru/translations.xml b/features/createroom/impl/src/main/res/values-ru/translations.xml
index bd0459ff09..f6da7fffa0 100644
--- a/features/createroom/impl/src/main/res/values-ru/translations.xml
+++ b/features/createroom/impl/src/main/res/values-ru/translations.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Новая комната"</string>
-  <string name="screen_create_room_action_invite_people">"Пригласите друзей в Element"</string>
   <string name="screen_create_room_add_people_title">"Пригласить друзей"</string>
   <string name="screen_create_room_error_creating_room">"Произошла ошибка при создании комнаты"</string>
   <string name="screen_create_room_private_option_description">"Сообщения в этой комнате зашифрованы. Отключить шифрование позже будет невозможно."</string>
diff --git a/features/createroom/impl/src/main/res/values-sk/translations.xml b/features/createroom/impl/src/main/res/values-sk/translations.xml
index 6191275471..932e463e32 100644
--- a/features/createroom/impl/src/main/res/values-sk/translations.xml
+++ b/features/createroom/impl/src/main/res/values-sk/translations.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Nová miestnosť"</string>
-  <string name="screen_create_room_action_invite_people">"Pozvať ľudí na Element"</string>
   <string name="screen_create_room_add_people_title">"Pozvať ľudí"</string>
   <string name="screen_create_room_error_creating_room">"Pri vytváraní miestnosti došlo k chybe"</string>
   <string name="screen_create_room_private_option_description">"Správy v tejto miestnosti sú šifrované. Šifrovanie už potom nie je možné vypnúť."</string>
diff --git a/features/createroom/impl/src/main/res/values-sv/translations.xml b/features/createroom/impl/src/main/res/values-sv/translations.xml
index d1e3047d8a..70d1740592 100644
--- a/features/createroom/impl/src/main/res/values-sv/translations.xml
+++ b/features/createroom/impl/src/main/res/values-sv/translations.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Nytt rum"</string>
-  <string name="screen_create_room_action_invite_people">"Bjud in personer till Element"</string>
   <string name="screen_create_room_add_people_title">"Bjud in personer"</string>
   <string name="screen_create_room_error_creating_room">"Ett fel uppstod när rummet skapades"</string>
   <string name="screen_create_room_private_option_description">"Meddelanden i det här rummet är krypterade. Kryptering kan inte inaktiveras efteråt."</string>
diff --git a/features/createroom/impl/src/main/res/values-uk/translations.xml b/features/createroom/impl/src/main/res/values-uk/translations.xml
index 4fee58b885..139abe5ccc 100644
--- a/features/createroom/impl/src/main/res/values-uk/translations.xml
+++ b/features/createroom/impl/src/main/res/values-uk/translations.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"Нова кімната"</string>
-  <string name="screen_create_room_action_invite_people">"Запросити людей до Element"</string>
   <string name="screen_create_room_add_people_title">"Запросити людей"</string>
   <string name="screen_create_room_error_creating_room">"Під час створення кімнати сталася помилка"</string>
   <string name="screen_create_room_private_option_description">"Повідомлення в цій кімнаті зашифровані. Пізніше шифрування вимкнути не можна."</string>
diff --git a/features/createroom/impl/src/main/res/values-zh-rTW/translations.xml b/features/createroom/impl/src/main/res/values-zh-rTW/translations.xml
index bd81974b6f..68fd480b97 100644
--- a/features/createroom/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/createroom/impl/src/main/res/values-zh-rTW/translations.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"建立聊天室"</string>
-  <string name="screen_create_room_action_invite_people">"邀請朋友使用 Element"</string>
   <string name="screen_create_room_add_people_title">"邀請夥伴"</string>
   <string name="screen_create_room_error_creating_room">"建立聊天室時發生錯誤"</string>
   <string name="screen_create_room_private_option_description">"聊天室裡的訊息會被加密。聊天室建立後，無法停用加密功能。"</string>
diff --git a/features/createroom/impl/src/main/res/values/localazy.xml b/features/createroom/impl/src/main/res/values/localazy.xml
index c9f5686c49..251541f610 100644
--- a/features/createroom/impl/src/main/res/values/localazy.xml
+++ b/features/createroom/impl/src/main/res/values/localazy.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_room_action_create_room">"New room"</string>
-  <string name="screen_create_room_action_invite_people">"Invite people to Element"</string>
   <string name="screen_create_room_add_people_title">"Invite people"</string>
   <string name="screen_create_room_error_creating_room">"An error occurred when creating the room"</string>
   <string name="screen_create_room_private_option_description">"Messages in this room are encrypted. Encryption can’t be disabled afterwards."</string>
diff --git a/features/ftue/impl/src/main/res/values-be/translations.xml b/features/ftue/impl/src/main/res/values-be/translations.xml
index 0b46417dd3..0079bcf36d 100644
--- a/features/ftue/impl/src/main/res/values-be/translations.xml
+++ b/features/ftue/impl/src/main/res/values-be/translations.xml
@@ -2,13 +2,18 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_notification_optin_subtitle">"Вы можаце змяніць налады пазней."</string>
   <string name="screen_notification_optin_title">"Дазвольце апавяшчэнні і ніколі не прапускайце іх"</string>
-  <string name="screen_qr_code_login_initial_state_item_1">"Адкрыйце Element на настольнай прыладзе"</string>
+  <string name="screen_qr_code_login_connecting_subtitle">"Устанаўленне злучэння"</string>
+  <string name="screen_qr_code_login_initial_state_item_1">"Адкрыйце %1$s на настольнай прыладзе"</string>
   <string name="screen_qr_code_login_initial_state_item_2">"Націсніце на свой аватар"</string>
   <string name="screen_qr_code_login_initial_state_item_3">"Выберыце %1$s"</string>
   <string name="screen_qr_code_login_initial_state_item_3_action">"“Звязаць новую прыладу”"</string>
   <string name="screen_qr_code_login_initial_state_item_4">"Выберыце %1$s"</string>
   <string name="screen_qr_code_login_initial_state_item_4_action">"“Паказаць QR-код”"</string>
-  <string name="screen_qr_code_login_initial_state_title">"Адкрыйце Element на іншай прыладзе, каб атрымаць QR-код"</string>
+  <string name="screen_qr_code_login_initial_state_title">"Адкрыйце %1$s на іншай прыладзе, каб атрымаць QR-код"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Выкарыстоўвайце QR-код, паказаны на іншай прыладзе."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Паўтарыць спробу"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Няправільны QR-код"</string>
+  <string name="screen_qr_code_login_scanning_state_title">"Сканаваць QR-код"</string>
   <string name="screen_welcome_bullet_1">"Званкі, апытанні, пошук і многае іншае будзе дададзена пазней у гэтым годзе."</string>
   <string name="screen_welcome_bullet_2">"Гісторыя паведамленняў для зашыфраваных пакояў пакуль недаступна."</string>
   <string name="screen_welcome_bullet_3">"Мы будзем рады пачуць вашае меркаванне, паведаміце нам аб гэтым праз старонку налад."</string>
diff --git a/features/ftue/impl/src/main/res/values-de/translations.xml b/features/ftue/impl/src/main/res/values-de/translations.xml
index 151500adda..e647e37686 100644
--- a/features/ftue/impl/src/main/res/values-de/translations.xml
+++ b/features/ftue/impl/src/main/res/values-de/translations.xml
@@ -2,6 +2,13 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_notification_optin_subtitle">"Du kannst deine Einstellungen später ändern."</string>
   <string name="screen_notification_optin_title">"Erlaube Benachrichtigungen und verpasse keine Nachricht"</string>
+  <string name="screen_qr_code_login_initial_state_item_1">"%1$s auf einem Desktop-Gerät öffnen"</string>
+  <string name="screen_qr_code_login_initial_state_item_2">"Klick auf deinen Avatar"</string>
+  <string name="screen_qr_code_login_initial_state_item_3">"Wähle %1$s"</string>
+  <string name="screen_qr_code_login_initial_state_item_3_action">"\"Neues Gerät verknüpfen\""</string>
+  <string name="screen_qr_code_login_initial_state_item_4">"Wähle %1$s"</string>
+  <string name="screen_qr_code_login_initial_state_item_4_action">"\"QR-Code anzeigen\""</string>
+  <string name="screen_qr_code_login_initial_state_title">"Öffne %1$s auf einem anderen Gerät, um den QR-Code zu erhalten"</string>
   <string name="screen_welcome_bullet_1">"Anrufe, Umfragen, Suchfunktionen und mehr werden im Laufe des Jahres hinzugefügt."</string>
   <string name="screen_welcome_bullet_2">"Der Nachrichtenverlauf für verschlüsselte Räume wird in diesem Update nicht verfügbar sein."</string>
   <string name="screen_welcome_bullet_3">"Wir würden uns freuen, von dir zu hören. Teile uns deine Meinung über die Einstellungsseite mit."</string>
diff --git a/features/ftue/impl/src/main/res/values-fr/translations.xml b/features/ftue/impl/src/main/res/values-fr/translations.xml
index 9fc11413cb..cc2809b4a8 100644
--- a/features/ftue/impl/src/main/res/values-fr/translations.xml
+++ b/features/ftue/impl/src/main/res/values-fr/translations.xml
@@ -2,6 +2,18 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_notification_optin_subtitle">"Vous pourrez modifier vos paramètres ultérieurement."</string>
   <string name="screen_notification_optin_title">"Autorisez les notifications et ne manquez aucun message"</string>
+  <string name="screen_qr_code_login_connecting_subtitle">"Établissement de la connexion"</string>
+  <string name="screen_qr_code_login_initial_state_item_1">"Ouvrez %1$s sur un ordinateur"</string>
+  <string name="screen_qr_code_login_initial_state_item_2">"Cliquez sur votre image de profil"</string>
+  <string name="screen_qr_code_login_initial_state_item_3">"Choisissez %1$s"</string>
+  <string name="screen_qr_code_login_initial_state_item_3_action">"“Associer une nouvelle session”"</string>
+  <string name="screen_qr_code_login_initial_state_item_4">"Choisissez %1$s"</string>
+  <string name="screen_qr_code_login_initial_state_item_4_action">"“Afficher le QR code”"</string>
+  <string name="screen_qr_code_login_initial_state_title">"Ouvrez %1$s sur un autre appareil pour obtenir le QR code"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Scannez le QR code affiché sur l’autre appareil."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Réessayer"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"QR code erroné"</string>
+  <string name="screen_qr_code_login_scanning_state_title">"Scannez le QR code"</string>
   <string name="screen_welcome_bullet_1">"Les appels, les sondages, les recherches et plus encore seront ajoutés plus tard cette année."</string>
   <string name="screen_welcome_bullet_2">"L’historique des messages pour les salons chiffrés ne sera pas disponible dans cette mise à jour."</string>
   <string name="screen_welcome_bullet_3">"N’hésitez pas à nous faire part de vos commentaires via l’écran des paramètres."</string>
diff --git a/features/ftue/impl/src/main/res/values-in/translations.xml b/features/ftue/impl/src/main/res/values-in/translations.xml
index 1004f8a643..56c4b86fe3 100644
--- a/features/ftue/impl/src/main/res/values-in/translations.xml
+++ b/features/ftue/impl/src/main/res/values-in/translations.xml
@@ -2,6 +2,13 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_notification_optin_subtitle">"Anda dapat mengubah pengaturan Anda nanti."</string>
   <string name="screen_notification_optin_title">"Izinkan pemberitahuan dan jangan pernah melewatkan pesan"</string>
+  <string name="screen_qr_code_login_initial_state_item_1">"Buka %1$s di perangkat desktop"</string>
+  <string name="screen_qr_code_login_initial_state_item_2">"Klik pada avatar Anda"</string>
+  <string name="screen_qr_code_login_initial_state_item_3">"Pilih %1$s"</string>
+  <string name="screen_qr_code_login_initial_state_item_3_action">"“Tautkan perangkat baru”"</string>
+  <string name="screen_qr_code_login_initial_state_item_4">"Pilih %1$s"</string>
+  <string name="screen_qr_code_login_initial_state_item_4_action">"“Tampilkan kode QR”"</string>
+  <string name="screen_qr_code_login_initial_state_title">"Buka %1$s di perangkat lain untuk mendapatkan kode QR"</string>
   <string name="screen_welcome_bullet_1">"Panggilan, pemungutan suara, pencarian, dan lainnya akan ditambahkan di tahun ini."</string>
   <string name="screen_welcome_bullet_2">"Riwayat pesan untuk ruangan terenkripsi tidak akan tersedia dalam pembaruan ini."</string>
   <string name="screen_welcome_bullet_3">"Kami ingin mendengar dari Anda, beri tahu kami pendapat Anda melalui halaman pengaturan."</string>
diff --git a/features/ftue/impl/src/main/res/values-ru/translations.xml b/features/ftue/impl/src/main/res/values-ru/translations.xml
index 895c7068ff..6dc9c5c543 100644
--- a/features/ftue/impl/src/main/res/values-ru/translations.xml
+++ b/features/ftue/impl/src/main/res/values-ru/translations.xml
@@ -2,13 +2,13 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_notification_optin_subtitle">"Вы можете изменить настройки позже."</string>
   <string name="screen_notification_optin_title">"Разрешите уведомления и никогда не пропустите сообщение"</string>
-  <string name="screen_qr_code_login_initial_state_item_1">"Откройте Element на настольном устройстве"</string>
+  <string name="screen_qr_code_login_initial_state_item_1">"Откройте %1$s на настольном устройстве"</string>
   <string name="screen_qr_code_login_initial_state_item_2">"Нажмите на свое изображение"</string>
   <string name="screen_qr_code_login_initial_state_item_3">"Выбрать %1$s"</string>
   <string name="screen_qr_code_login_initial_state_item_3_action">"\"Привязать новое устройство\""</string>
   <string name="screen_qr_code_login_initial_state_item_4">"Выбрать %1$s"</string>
   <string name="screen_qr_code_login_initial_state_item_4_action">"\"Показать QR-код\""</string>
-  <string name="screen_qr_code_login_initial_state_title">"Откройте Element на другом устройстве, чтобы получить QR-код"</string>
+  <string name="screen_qr_code_login_initial_state_title">"Откройте %1$s на другом устройстве, чтобы получить QR-код"</string>
   <string name="screen_welcome_bullet_1">"Звонки, опросы, поиск и многое другое будут добавлены позже в этом году."</string>
   <string name="screen_welcome_bullet_2">"История сообщений для зашифрованных комнат в этом обновлении будет недоступна."</string>
   <string name="screen_welcome_bullet_3">"Мы будем рады услышать ваше мнение, сообщите нам об этом через страницу настроек."</string>
diff --git a/features/ftue/impl/src/main/res/values-sk/translations.xml b/features/ftue/impl/src/main/res/values-sk/translations.xml
index d963dbd734..7dd1d5e867 100644
--- a/features/ftue/impl/src/main/res/values-sk/translations.xml
+++ b/features/ftue/impl/src/main/res/values-sk/translations.xml
@@ -2,6 +2,13 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_notification_optin_subtitle">"Svoje nastavenia môžete neskôr zmeniť."</string>
   <string name="screen_notification_optin_title">"Povoľte oznámenia a nikdy nezmeškajte žiadnu správu"</string>
+  <string name="screen_qr_code_login_initial_state_item_1">"Otvorte %1$s na stolnom zariadení"</string>
+  <string name="screen_qr_code_login_initial_state_item_2">"Kliknite na svoj obrázok"</string>
+  <string name="screen_qr_code_login_initial_state_item_3">"Vyberte %1$s"</string>
+  <string name="screen_qr_code_login_initial_state_item_3_action">"„Prepojiť nové zariadenie“"</string>
+  <string name="screen_qr_code_login_initial_state_item_4">"Vyberte %1$s"</string>
+  <string name="screen_qr_code_login_initial_state_item_4_action">"„Zobraziť QR kód“"</string>
+  <string name="screen_qr_code_login_initial_state_title">"Ak chcete získať QR kód, otvorte %1$s na inom zariadení"</string>
   <string name="screen_welcome_bullet_1">"Hovory, ankety, vyhľadávanie a ďalšie funkcie pribudnú neskôr v tomto roku."</string>
   <string name="screen_welcome_bullet_2">"História správ pre zašifrované miestnosti nebude v tejto aktualizácii k dispozícii."</string>
   <string name="screen_welcome_bullet_3">"Radi by sme od vás počuli, dajte nám vedieť, čo si myslíte, prostredníctvom stránky nastavení."</string>
diff --git a/features/ftue/impl/src/main/res/values/localazy.xml b/features/ftue/impl/src/main/res/values/localazy.xml
index ba227878c1..8c43ef0a81 100644
--- a/features/ftue/impl/src/main/res/values/localazy.xml
+++ b/features/ftue/impl/src/main/res/values/localazy.xml
@@ -2,13 +2,18 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_notification_optin_subtitle">"You can change your settings later."</string>
   <string name="screen_notification_optin_title">"Allow notifications and never miss a message"</string>
-  <string name="screen_qr_code_login_initial_state_item_1">"Open Element on a desktop device"</string>
+  <string name="screen_qr_code_login_connecting_subtitle">"Establishing connection"</string>
+  <string name="screen_qr_code_login_initial_state_item_1">"Open %1$s on a desktop device"</string>
   <string name="screen_qr_code_login_initial_state_item_2">"Click on your avatar"</string>
   <string name="screen_qr_code_login_initial_state_item_3">"Select %1$s"</string>
   <string name="screen_qr_code_login_initial_state_item_3_action">"“Link new device”"</string>
   <string name="screen_qr_code_login_initial_state_item_4">"Select %1$s"</string>
   <string name="screen_qr_code_login_initial_state_item_4_action">"“Show QR code”"</string>
-  <string name="screen_qr_code_login_initial_state_title">"Open Element on another device to get the QR code"</string>
+  <string name="screen_qr_code_login_initial_state_title">"Open %1$s on another device to get the QR code"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Use the QR code shown on the other device."</string>
+  <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Try Again"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Wrong QR code"</string>
+  <string name="screen_qr_code_login_scanning_state_title">"Scan the QR code"</string>
   <string name="screen_welcome_bullet_1">"Calls, polls, search and more will be added later this year."</string>
   <string name="screen_welcome_bullet_2">"Message history for encrypted rooms isn’t available yet."</string>
   <string name="screen_welcome_bullet_3">"We’d love to hear from you, let us know what you think via the settings page."</string>
diff --git a/features/lockscreen/impl/src/main/res/values-de/translations.xml b/features/lockscreen/impl/src/main/res/values-de/translations.xml
index 40f22c7cab..c24e9744c4 100644
--- a/features/lockscreen/impl/src/main/res/values-de/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-de/translations.xml
@@ -16,7 +16,7 @@
   <string name="screen_app_lock_setup_confirm_pin">"PIN bestätigen"</string>
   <string name="screen_app_lock_setup_pin_blacklisted_dialog_content">"Aus Sicherheitsgründen kann dieser PIN-Code nicht verwendet werden."</string>
   <string name="screen_app_lock_setup_pin_blacklisted_dialog_title">"Bitte eine andere PIN verwenden."</string>
-  <string name="screen_app_lock_setup_pin_context">"Sperre %1$s, mit einem PIN Code um den Zugriff auf Element X zu beschränken.
+  <string name="screen_app_lock_setup_pin_context">"Sperre %1$s mit einem PIN Code, um den Zugriff auf Deine Chats zu beschränken.
 
 Wähle etwas Einprägsames. Bei falscher Eingabe wirst du aus der App ausgeloggt."</string>
   <string name="screen_app_lock_setup_pin_mismatch_dialog_content">"Bitte gib die gleiche PIN wie zuvor ein."</string>
diff --git a/features/lockscreen/impl/src/main/res/values-sv/translations.xml b/features/lockscreen/impl/src/main/res/values-sv/translations.xml
index c0ffcd9cdf..ac64f04efa 100644
--- a/features/lockscreen/impl/src/main/res/values-sv/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-sv/translations.xml
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_app_lock_forgot_pin">"Glömt PIN-kod?"</string>
   <string name="screen_app_lock_settings_change_pin">"Byt PIN-kod"</string>
   <string name="screen_app_lock_settings_enable_biometric_unlock">"Tillåt biometrisk upplåsning"</string>
   <string name="screen_app_lock_settings_remove_pin">"Ta bort PIN-kod"</string>
+  <string name="screen_app_lock_settings_remove_pin_alert_message">"Är du säker på att du vill ta bort PIN-koden?"</string>
   <string name="screen_app_lock_settings_remove_pin_alert_title">"Ta bort PIN-koden?"</string>
+  <string name="screen_app_lock_signout_alert_title">"Du blir utloggad"</string>
+  <plurals name="screen_app_lock_subtitle">
+    <item quantity="one">"Du har %1$d försök att låsa upp"</item>
+    <item quantity="other">"Du har %1$d försök att låsa upp"</item>
+  </plurals>
+  <plurals name="screen_app_lock_subtitle_wrong_pin">
+    <item quantity="one">"Fel PIN-kod. Du har %1$d försök kvar"</item>
+    <item quantity="other">"Fel PIN-kod. Du har %1$d försök kvar"</item>
+  </plurals>
   <string name="screen_signout_in_progress_dialog_content">"Loggar ut …"</string>
 </resources>
diff --git a/features/login/impl/src/main/res/values-hu/translations.xml b/features/login/impl/src/main/res/values-hu/translations.xml
index d469e76630..f81e84a86f 100644
--- a/features/login/impl/src/main/res/values-hu/translations.xml
+++ b/features/login/impl/src/main/res/values-hu/translations.xml
@@ -13,19 +13,19 @@
   <string name="screen_change_account_provider_other">"Egyéb"</string>
   <string name="screen_change_account_provider_subtitle">"Másik fiókszolgáltató, például a saját privát kiszolgáló vagy egy munkahelyi fiók használata."</string>
   <string name="screen_change_account_provider_title">"Fiókszolgáltató módosítása"</string>
-  <string name="screen_change_server_error_invalid_homeserver">"Nem sikerült elérni ezt a Matrix-kiszolgálót. Ellenőrizze, hogy helyesen adta-e meg a Matrix-kiszolgáló webcímét. Ha a webcím helyes, akkor további segítségért lépjen kapcsolatba a Matrix-kiszolgáló rendszergazdájával."</string>
+  <string name="screen_change_server_error_invalid_homeserver">"Nem sikerült elérni ezt a Matrix-kiszolgálót. Ellenőrizze, hogy helyesen adta-e meg a Matrix-kiszolgáló webcímét. Ha a webcím helyes, akkor további segítségért lépjen kapcsolatba a Matrix-kiszolgáló adminisztrátorával."</string>
   <string name="screen_change_server_error_invalid_well_known">"A Sliding sync protokoll a well-known fájl problémája miatt nem érhető el:
 %1$s"</string>
   <string name="screen_change_server_error_no_sliding_sync_message">"A kiszolgáló jelenleg nem támogatja a Sliding sync protokollt."</string>
   <string name="screen_change_server_form_header">"Matrix-kiszolgáló webcíme"</string>
-  <string name="screen_change_server_form_notice">"Csak olyan meglévő kiszolgálóhoz csatlakozhat, amely támogatja a Sliding sync protokollt. Ezt a Matrix-kiszolgáló rendszergazdájának kell beállítania. %1$s"</string>
+  <string name="screen_change_server_form_notice">"Csak olyan meglévő kiszolgálóhoz csatlakozhat, amely támogatja a Sliding sync protokollt. Ezt a Matrix-kiszolgáló adminisztrátorának kell beállítania. %1$s"</string>
   <string name="screen_change_server_subtitle">"Mi a kiszolgálója címe?"</string>
   <string name="screen_change_server_title">"Válassza ki a kiszolgálóját"</string>
   <string name="screen_login_error_deactivated_account">"Ez a fiók deaktiválva lett."</string>
   <string name="screen_login_error_invalid_credentials">"Helytelen felhasználónév vagy jelszó"</string>
   <string name="screen_login_error_invalid_user_id">"Ez nem érvényes felhasználóazonosító. A várt formátum: „@user:homeserver.org”"</string>
   <string name="screen_login_error_refresh_tokens">"Ez a kiszolgáló frissítési tokenek használatára van beállítva. Ezek jelszó alapú bejelentkezés esetén nem támogatottak."</string>
-  <string name="screen_login_error_unsupported_authentication">"A kiválasztott Matrix-kiszolgáló nem támogatja a jelszavas vagy OIDC-alapú bejelentkezést. Lépjen kapcsolatba a kiszolgáló rendszergazdájával, vagy válasszon másik Matrix-kiszolgálót."</string>
+  <string name="screen_login_error_unsupported_authentication">"A kiválasztott Matrix-kiszolgáló nem támogatja a jelszavas vagy OIDC-alapú bejelentkezést. Lépjen kapcsolatba a kiszolgáló adminisztrátorával, vagy válasszon másik Matrix-kiszolgálót."</string>
   <string name="screen_login_form_header">"Adja meg adatait"</string>
   <string name="screen_login_subtitle">"A Matrix egy nyitott hálózat a biztonságos, decentralizált kommunikációhoz."</string>
   <string name="screen_login_title">"Örülünk, hogy visszatért!"</string>
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerStateProvider.kt
index fb7f616e12..82a4692a53 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerStateProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerStateProvider.kt
@@ -22,6 +22,7 @@ import io.element.android.features.messages.impl.mentions.MentionSuggestion
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
 import io.element.android.libraries.matrix.api.permalink.PermalinkParser
+import io.element.android.libraries.textcomposer.aRichTextEditorState
 import io.element.android.libraries.textcomposer.model.MessageComposerMode
 import io.element.android.wysiwyg.compose.RichTextEditorState
 import kotlinx.collections.immutable.ImmutableList
@@ -35,7 +36,7 @@ open class MessageComposerStateProvider : PreviewParameterProvider<MessageCompos
 }
 
 fun aMessageComposerState(
-    richTextEditorState: RichTextEditorState = RichTextEditorState(""),
+    richTextEditorState: RichTextEditorState = aRichTextEditorState(),
     isFullScreen: Boolean = false,
     mode: MessageComposerMode = MessageComposerMode.Normal,
     showTextFormatting: Boolean = false,
diff --git a/features/messages/impl/src/main/res/values-hu/translations.xml b/features/messages/impl/src/main/res/values-hu/translations.xml
index f3c1cddf8c..4c2a66334f 100644
--- a/features/messages/impl/src/main/res/values-hu/translations.xml
+++ b/features/messages/impl/src/main/res/values-hu/translations.xml
@@ -10,7 +10,7 @@
   <string name="emoji_picker_category_symbols">"Szimbólumok"</string>
   <string name="screen_report_content_block_user">"Felhasználó letiltása"</string>
   <string name="screen_report_content_block_user_hint">"Jelölje be, ha el akarja rejteni az összes jelenlegi és jövőbeli üzenetet ettől a felhasználótól"</string>
-  <string name="screen_report_content_explanation">"Ez az üzenet jelentve lesz a Matrix-kiszolgáló rendszergazdájának. Nem fogja tudni elolvasni a titkosított üzeneteket."</string>
+  <string name="screen_report_content_explanation">"Ez az üzenet jelentve lesz a Matrix-kiszolgáló adminisztrátorának. Nem fogja tudni elolvasni a titkosított üzeneteket."</string>
   <string name="screen_report_content_hint">"A tartalom jelentésének oka"</string>
   <string name="screen_room_attachment_source_camera">"Kamera"</string>
   <string name="screen_room_attachment_source_camera_photo">"Fénykép készítése"</string>
diff --git a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenter.kt b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenter.kt
index a514637026..bfe6c06e00 100644
--- a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenter.kt
+++ b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenter.kt
@@ -33,6 +33,7 @@ class OnBoardingPresenter @Inject constructor(
     override fun present(): OnBoardingState {
         return OnBoardingState(
             isDebugBuild = buildMeta.buildType != BuildType.RELEASE,
+            productionApplicationName = buildMeta.productionApplicationName,
             canLoginWithQrCode = OnBoardingConfig.CAN_LOGIN_WITH_QR_CODE,
             canCreateAccount = OnBoardingConfig.CAN_CREATE_ACCOUNT,
         )
diff --git a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingState.kt b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingState.kt
index 5bd7718033..7b7b9f7eec 100644
--- a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingState.kt
+++ b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingState.kt
@@ -18,6 +18,7 @@ package io.element.android.features.onboarding.impl
 
 data class OnBoardingState(
     val isDebugBuild: Boolean,
+    val productionApplicationName: String,
     val canLoginWithQrCode: Boolean,
     val canCreateAccount: Boolean,
 )
diff --git a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingStateProvider.kt b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingStateProvider.kt
index 926d2a2303..2e29a881aa 100644
--- a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingStateProvider.kt
+++ b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingStateProvider.kt
@@ -31,10 +31,12 @@ open class OnBoardingStateProvider : PreviewParameterProvider<OnBoardingState> {
 
 fun anOnBoardingState(
     isDebugBuild: Boolean = false,
+    productionApplicationName: String = "Element",
     canLoginWithQrCode: Boolean = false,
     canCreateAccount: Boolean = false
 ) = OnBoardingState(
     isDebugBuild = isDebugBuild,
+    productionApplicationName = productionApplicationName,
     canLoginWithQrCode = canLoginWithQrCode,
     canCreateAccount = canCreateAccount
 )
diff --git a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingView.kt b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingView.kt
index 2e122898e1..d87fb36c03 100644
--- a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingView.kt
+++ b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingView.kt
@@ -129,7 +129,7 @@ private fun OnBoardingContent(
                 )
                 Spacer(modifier = Modifier.height(8.dp))
                 Text(
-                    text = stringResource(id = R.string.screen_onboarding_welcome_message),
+                    text = stringResource(id = R.string.screen_onboarding_welcome_message, state.productionApplicationName),
                     color = ElementTheme.materialColors.secondary,
                     style = ElementTheme.typography.fontBodyLgRegular.copy(fontSize = 17.sp),
                     textAlign = TextAlign.Center
diff --git a/features/onboarding/impl/src/main/res/values-be/translations.xml b/features/onboarding/impl/src/main/res/values-be/translations.xml
index e6605b9378..1ca6c172bb 100644
--- a/features/onboarding/impl/src/main/res/values-be/translations.xml
+++ b/features/onboarding/impl/src/main/res/values-be/translations.xml
@@ -3,7 +3,7 @@
   <string name="screen_onboarding_sign_in_manually">"Увайдзіце ўручную"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Увайдзіце з QR-кодам"</string>
   <string name="screen_onboarding_sign_up">"Стварыць уліковы запіс"</string>
-  <string name="screen_onboarding_welcome_message">"Сардэчна запрашаем у самы хуткі Element. Перавага ў хуткасці і прастаце."</string>
+  <string name="screen_onboarding_welcome_message">"Сардэчна запрашаем у самы хуткі %1$s. Перавага ў хуткасці і прастаце."</string>
   <string name="screen_onboarding_welcome_subtitle">"Сардэчна запрашаем у %1$s. Зараджаны, для хуткасці і прастаты."</string>
   <string name="screen_onboarding_welcome_title">" Адчуйце сябе ў сваім element"</string>
 </resources>
diff --git a/features/onboarding/impl/src/main/res/values-bg/translations.xml b/features/onboarding/impl/src/main/res/values-bg/translations.xml
index 0eff69eacf..67a3fe4a28 100644
--- a/features/onboarding/impl/src/main/res/values-bg/translations.xml
+++ b/features/onboarding/impl/src/main/res/values-bg/translations.xml
@@ -3,7 +3,7 @@
   <string name="screen_onboarding_sign_in_manually">"Влизане ръчно"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Влизане с QR код"</string>
   <string name="screen_onboarding_sign_up">"Създаване на акаунт"</string>
-  <string name="screen_onboarding_welcome_message">"Добре дошли в най-бързия Element досега. Супер зареден за скорост и простота."</string>
+  <string name="screen_onboarding_welcome_message">"Добре дошли в най-бързия %1$s досега. Супер зареден за скорост и простота."</string>
   <string name="screen_onboarding_welcome_subtitle">"Добре дошли в %1$s. Супер зареден за скорост и простота."</string>
   <string name="screen_onboarding_welcome_title">"Бъдете в стихията си"</string>
 </resources>
diff --git a/features/onboarding/impl/src/main/res/values-cs/translations.xml b/features/onboarding/impl/src/main/res/values-cs/translations.xml
index de8b00cd70..057fdff4ee 100644
--- a/features/onboarding/impl/src/main/res/values-cs/translations.xml
+++ b/features/onboarding/impl/src/main/res/values-cs/translations.xml
@@ -3,7 +3,7 @@
   <string name="screen_onboarding_sign_in_manually">"Ruční přihlášení"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Přihlásit se pomocí QR kódu"</string>
   <string name="screen_onboarding_sign_up">"Vytvořit účet"</string>
-  <string name="screen_onboarding_welcome_message">"Vítejte u dosud nejrychlejšího Elementu. Vylepšený pro rychlost a jednoduchost."</string>
+  <string name="screen_onboarding_welcome_message">"Vítejte u dosud nejrychlejšího %1$su. Vylepšený pro rychlost a jednoduchost."</string>
   <string name="screen_onboarding_welcome_subtitle">"Vítejte v %1$s. Vylepšený, pro rychlost a jednoduchost."</string>
   <string name="screen_onboarding_welcome_title">"Buďte ve svém živlu"</string>
 </resources>
diff --git a/features/onboarding/impl/src/main/res/values-de/translations.xml b/features/onboarding/impl/src/main/res/values-de/translations.xml
index ec802a1ba1..56edc949a1 100644
--- a/features/onboarding/impl/src/main/res/values-de/translations.xml
+++ b/features/onboarding/impl/src/main/res/values-de/translations.xml
@@ -3,7 +3,7 @@
   <string name="screen_onboarding_sign_in_manually">"Manuell anmelden"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Mit QR-Code anmelden"</string>
   <string name="screen_onboarding_sign_up">"Konto erstellen"</string>
-  <string name="screen_onboarding_welcome_message">"Willkommen beim schnellsten Element aller Zeiten. Optimiert für Geschwindigkeit und Einfachheit."</string>
+  <string name="screen_onboarding_welcome_message">"Willkommen beim schnellsten %1$s aller Zeiten. Optimiert für Geschwindigkeit und Einfachheit."</string>
   <string name="screen_onboarding_welcome_subtitle">"Willkommen zu %1$s. Aufgeladen, für Geschwindigkeit und Einfachheit."</string>
   <string name="screen_onboarding_welcome_title">"Sei in deinem Element"</string>
 </resources>
diff --git a/features/onboarding/impl/src/main/res/values-es/translations.xml b/features/onboarding/impl/src/main/res/values-es/translations.xml
index fb348b123d..c794e3b9ab 100644
--- a/features/onboarding/impl/src/main/res/values-es/translations.xml
+++ b/features/onboarding/impl/src/main/res/values-es/translations.xml
@@ -3,7 +3,7 @@
   <string name="screen_onboarding_sign_in_manually">"Iniciar sesión manualmente"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Iniciar sesión con un código QR"</string>
   <string name="screen_onboarding_sign_up">"Crear cuenta"</string>
-  <string name="screen_onboarding_welcome_message">"Bienvenido al Element más rápido de todos los tiempos. Diseñado para la velocidad y la simplicidad."</string>
+  <string name="screen_onboarding_welcome_message">"Bienvenido al %1$s más rápido de todos los tiempos. Diseñado para la velocidad y la simplicidad."</string>
   <string name="screen_onboarding_welcome_subtitle">"Bienvenido a %1$s. Vitaminado, para mayor rapidez y sencillez."</string>
   <string name="screen_onboarding_welcome_title">"Siéntete en tu Elemento"</string>
 </resources>
diff --git a/features/onboarding/impl/src/main/res/values-fr/translations.xml b/features/onboarding/impl/src/main/res/values-fr/translations.xml
index 94b9461a88..0d8a7fa347 100644
--- a/features/onboarding/impl/src/main/res/values-fr/translations.xml
+++ b/features/onboarding/impl/src/main/res/values-fr/translations.xml
@@ -3,7 +3,7 @@
   <string name="screen_onboarding_sign_in_manually">"Se connecter manuellement"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Se connecter avec un QR code"</string>
   <string name="screen_onboarding_sign_up">"Créer un compte"</string>
-  <string name="screen_onboarding_welcome_message">"Bienvenue dans l’Element le plus rapide de tous les temps. Boosté pour plus de rapidité et de simplicité."</string>
+  <string name="screen_onboarding_welcome_message">"Bienvenue dans l’application %1$s la plus rapide de tous les temps. Boosté pour plus de rapidité et de simplicité."</string>
   <string name="screen_onboarding_welcome_subtitle">"Bienvenue sur %1$s. Boosté, pour plus de rapidité et de simplicité."</string>
   <string name="screen_onboarding_welcome_title">"Soyez dans votre Element"</string>
 </resources>
diff --git a/features/onboarding/impl/src/main/res/values-hu/translations.xml b/features/onboarding/impl/src/main/res/values-hu/translations.xml
index 8acd47c566..308478f88b 100644
--- a/features/onboarding/impl/src/main/res/values-hu/translations.xml
+++ b/features/onboarding/impl/src/main/res/values-hu/translations.xml
@@ -3,7 +3,7 @@
   <string name="screen_onboarding_sign_in_manually">"Kézi bejelentkezés"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Bejelentkezés QR-kóddal"</string>
   <string name="screen_onboarding_sign_up">"Fiók létrehozása"</string>
-  <string name="screen_onboarding_welcome_message">"Üdvözöljük a valaha volt leggyorsabb Elementben. Felturbózva, a sebesség és az egyszerűség érdekében."</string>
+  <string name="screen_onboarding_welcome_message">"Üdvözöljük a valaha volt leggyorsabb %1$sben. Felturbózva, a sebesség és az egyszerűség érdekében."</string>
   <string name="screen_onboarding_welcome_subtitle">"Üdvözli az %1$s. Felturbózva, a sebesség és az egyszerűség jegyében."</string>
   <string name="screen_onboarding_welcome_title">"Legyen elemében"</string>
 </resources>
diff --git a/features/onboarding/impl/src/main/res/values-in/translations.xml b/features/onboarding/impl/src/main/res/values-in/translations.xml
index 06946a3cd8..e9b7b479a8 100644
--- a/features/onboarding/impl/src/main/res/values-in/translations.xml
+++ b/features/onboarding/impl/src/main/res/values-in/translations.xml
@@ -3,7 +3,7 @@
   <string name="screen_onboarding_sign_in_manually">"Masuk secara manual"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Masuk dengan kode QR"</string>
   <string name="screen_onboarding_sign_up">"Buat akun"</string>
-  <string name="screen_onboarding_welcome_message">"Selamat datang di Element tercepat yang pernah ada. Berdaya besar untuk kecepatan dan kesederhanaan."</string>
+  <string name="screen_onboarding_welcome_message">"Selamat datang di %1$s tercepat yang pernah ada. Berdaya besar untuk kecepatan dan kesederhanaan."</string>
   <string name="screen_onboarding_welcome_subtitle">"Selamat datang di %1$s. Berdaya penuh, untuk kecepatan dan kesederhanaan."</string>
   <string name="screen_onboarding_welcome_title">"Berada di elemen Anda"</string>
 </resources>
diff --git a/features/onboarding/impl/src/main/res/values-it/translations.xml b/features/onboarding/impl/src/main/res/values-it/translations.xml
index 738c4c8947..e134337d64 100644
--- a/features/onboarding/impl/src/main/res/values-it/translations.xml
+++ b/features/onboarding/impl/src/main/res/values-it/translations.xml
@@ -3,7 +3,7 @@
   <string name="screen_onboarding_sign_in_manually">"Accedi manualmente"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Accedi con codice QR"</string>
   <string name="screen_onboarding_sign_up">"Crea account"</string>
-  <string name="screen_onboarding_welcome_message">"Benvenuti nell\'Element più veloce di sempre. Potenziato per velocità e semplicità."</string>
+  <string name="screen_onboarding_welcome_message">"Benvenuti nell\'%1$s più veloce di sempre. Potenziato per velocità e semplicità."</string>
   <string name="screen_onboarding_welcome_subtitle">"Benvenuto su %1$s. Potenziato in velocità e semplicità."</string>
   <string name="screen_onboarding_welcome_title">"Sii nel tuo elemento"</string>
 </resources>
diff --git a/features/onboarding/impl/src/main/res/values-ro/translations.xml b/features/onboarding/impl/src/main/res/values-ro/translations.xml
index b6db94d213..7275680729 100644
--- a/features/onboarding/impl/src/main/res/values-ro/translations.xml
+++ b/features/onboarding/impl/src/main/res/values-ro/translations.xml
@@ -3,7 +3,7 @@
   <string name="screen_onboarding_sign_in_manually">"Conectați-vă manual"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Conectați-vă cu un cod QR"</string>
   <string name="screen_onboarding_sign_up">"Creați un cont"</string>
-  <string name="screen_onboarding_welcome_message">"Bine ați venit la cel mai rapid Element din toate timpurile. Supraalimentat pentru viteză și simplitate."</string>
+  <string name="screen_onboarding_welcome_message">"Bine ați venit la cel mai rapid %1$s din toate timpurile. Supraalimentat pentru viteză și simplitate."</string>
   <string name="screen_onboarding_welcome_subtitle">"Bun venit în %1$s. Supraalimentat, pentru viteză și simplitate."</string>
   <string name="screen_onboarding_welcome_title">"Fii în Elementul tău"</string>
 </resources>
diff --git a/features/onboarding/impl/src/main/res/values-ru/translations.xml b/features/onboarding/impl/src/main/res/values-ru/translations.xml
index 2a0ab37e1d..201687b0cf 100644
--- a/features/onboarding/impl/src/main/res/values-ru/translations.xml
+++ b/features/onboarding/impl/src/main/res/values-ru/translations.xml
@@ -3,7 +3,7 @@
   <string name="screen_onboarding_sign_in_manually">"Вход в систему вручную"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Войти с помощью QR-кода"</string>
   <string name="screen_onboarding_sign_up">"Создать учетную запись"</string>
-  <string name="screen_onboarding_welcome_message">"Добро пожаловать в самый быстрый Element. Сверхзаряженность на скорость и простоту."</string>
+  <string name="screen_onboarding_welcome_message">"Добро пожаловать в самый быстрый %1$s. Сверхзаряженность на скорость и простоту."</string>
   <string name="screen_onboarding_welcome_subtitle">"Добро пожаловать в %1$s. Сверхзаряжен для скорости и простоты."</string>
   <string name="screen_onboarding_welcome_title">"Будьте в своем element"</string>
 </resources>
diff --git a/features/onboarding/impl/src/main/res/values-sk/translations.xml b/features/onboarding/impl/src/main/res/values-sk/translations.xml
index 9639f7c903..7ed548d025 100644
--- a/features/onboarding/impl/src/main/res/values-sk/translations.xml
+++ b/features/onboarding/impl/src/main/res/values-sk/translations.xml
@@ -3,7 +3,7 @@
   <string name="screen_onboarding_sign_in_manually">"Prihlásiť sa manuálne"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Prihlásiť sa pomocou QR kódu"</string>
   <string name="screen_onboarding_sign_up">"Vytvoriť účet"</string>
-  <string name="screen_onboarding_welcome_message">"Vitajte v najrýchlejšom Element vôbec. Nadupaný pre rýchlosť a jednoduchosť."</string>
+  <string name="screen_onboarding_welcome_message">"Vitajte v najrýchlejšom %1$s vôbec. Nadupaný pre rýchlosť a jednoduchosť."</string>
   <string name="screen_onboarding_welcome_subtitle">"Vitajte v %1$s. Nadupaný, pre rýchlosť a jednoduchosť."</string>
   <string name="screen_onboarding_welcome_title">"Buďte vo svojom elemente"</string>
 </resources>
diff --git a/features/onboarding/impl/src/main/res/values-sv/translations.xml b/features/onboarding/impl/src/main/res/values-sv/translations.xml
index e37264f74f..6ffadf355b 100644
--- a/features/onboarding/impl/src/main/res/values-sv/translations.xml
+++ b/features/onboarding/impl/src/main/res/values-sv/translations.xml
@@ -3,7 +3,7 @@
   <string name="screen_onboarding_sign_in_manually">"Logga in manuellt"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Logga in med QR-kod"</string>
   <string name="screen_onboarding_sign_up">"Skapa konto"</string>
-  <string name="screen_onboarding_welcome_message">"Välkommen till den snabbaste Element någonsin. Superladdad för snabbhet och enkelhet."</string>
+  <string name="screen_onboarding_welcome_message">"Välkommen till den snabbaste %1$s någonsin. Superladdad för snabbhet och enkelhet."</string>
   <string name="screen_onboarding_welcome_subtitle">"Välkommen till %1$s. Superladdad, för snabbhet och enkelhet."</string>
   <string name="screen_onboarding_welcome_title">"Var i ditt rätta element"</string>
 </resources>
diff --git a/features/onboarding/impl/src/main/res/values-uk/translations.xml b/features/onboarding/impl/src/main/res/values-uk/translations.xml
index 4195ef2a6a..8c834d9bd0 100644
--- a/features/onboarding/impl/src/main/res/values-uk/translations.xml
+++ b/features/onboarding/impl/src/main/res/values-uk/translations.xml
@@ -3,7 +3,7 @@
   <string name="screen_onboarding_sign_in_manually">"Увійти вручну"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Увійти за допомогою QR-коду"</string>
   <string name="screen_onboarding_sign_up">"Створити обліковий запис"</string>
-  <string name="screen_onboarding_welcome_message">"Ласкаво просимо до найшвидшого Element. Заряджений для швидкості та простоти."</string>
+  <string name="screen_onboarding_welcome_message">"Ласкаво просимо до найшвидшого %1$s. Заряджений для швидкості та простоти."</string>
   <string name="screen_onboarding_welcome_subtitle">"Ласкаво просимо до %1$s. Заряджений, для швидкості та простоти."</string>
   <string name="screen_onboarding_welcome_title">"Будьте у своєму element"</string>
 </resources>
diff --git a/features/onboarding/impl/src/main/res/values-zh-rTW/translations.xml b/features/onboarding/impl/src/main/res/values-zh-rTW/translations.xml
index 22c9d70004..885e557409 100644
--- a/features/onboarding/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/onboarding/impl/src/main/res/values-zh-rTW/translations.xml
@@ -3,6 +3,6 @@
   <string name="screen_onboarding_sign_in_manually">"手動登入"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"使用 QR code 登入"</string>
   <string name="screen_onboarding_sign_up">"建立帳號"</string>
-  <string name="screen_onboarding_welcome_message">"歡迎使用有史以來最快的 Element。速度超快，操作簡便。"</string>
+  <string name="screen_onboarding_welcome_message">"歡迎使用有史以來最快的 %1$s。速度超快，操作簡便。"</string>
   <string name="screen_onboarding_welcome_title">"Be in your element"</string>
 </resources>
diff --git a/features/onboarding/impl/src/main/res/values/localazy.xml b/features/onboarding/impl/src/main/res/values/localazy.xml
index 2e8d8724d4..78acc7ffb4 100644
--- a/features/onboarding/impl/src/main/res/values/localazy.xml
+++ b/features/onboarding/impl/src/main/res/values/localazy.xml
@@ -3,7 +3,7 @@
   <string name="screen_onboarding_sign_in_manually">"Sign in manually"</string>
   <string name="screen_onboarding_sign_in_with_qr_code">"Sign in with QR code"</string>
   <string name="screen_onboarding_sign_up">"Create account"</string>
-  <string name="screen_onboarding_welcome_message">"Welcome to the fastest Element ever. Supercharged for speed and simplicity."</string>
+  <string name="screen_onboarding_welcome_message">"Welcome to the fastest %1$s ever. Supercharged for speed and simplicity."</string>
   <string name="screen_onboarding_welcome_subtitle">"Welcome to %1$s. Supercharged, for speed and simplicity."</string>
   <string name="screen_onboarding_welcome_title">"Be in your element"</string>
 </resources>
diff --git a/features/onboarding/impl/src/test/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenterTest.kt b/features/onboarding/impl/src/test/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenterTest.kt
index 51d1ccc932..1eaf60a8f9 100644
--- a/features/onboarding/impl/src/test/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenterTest.kt
+++ b/features/onboarding/impl/src/test/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenterTest.kt
@@ -33,12 +33,19 @@ class OnBoardingPresenterTest {
 
     @Test
     fun `present - initial state`() = runTest {
-        val presenter = OnBoardingPresenter(aBuildMeta())
+        val presenter = OnBoardingPresenter(
+            aBuildMeta(
+                applicationName = "A",
+                productionApplicationName = "B",
+                desktopApplicationName = "C",
+            )
+        )
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
             val initialState = awaitItem()
             assertThat(initialState.isDebugBuild).isTrue()
+            assertThat(initialState.productionApplicationName).isEqualTo("B")
             assertThat(initialState.canLoginWithQrCode).isFalse()
             assertThat(initialState.canCreateAccount).isFalse()
         }
diff --git a/features/roomdetails/impl/src/main/res/values-be/translations.xml b/features/roomdetails/impl/src/main/res/values-be/translations.xml
index be2ac558fd..85fb82b96a 100644
--- a/features/roomdetails/impl/src/main/res/values-be/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-be/translations.xml
@@ -31,6 +31,7 @@
   <string name="screen_room_change_role_confirm_demote_self_title">"Панізіць сябе?"</string>
   <string name="screen_room_change_role_invited_member_name">"%1$s (У чаканні)"</string>
   <string name="screen_room_change_role_invited_member_name_android">"(У чаканні)"</string>
+  <string name="screen_room_change_role_moderators_admin_section_footer">"Адміністратары аўтаматычна маюць права мадэратара"</string>
   <string name="screen_room_change_role_moderators_title">"Рэдагаваць мадэратараў"</string>
   <string name="screen_room_change_role_section_administrators">"Адміністратары"</string>
   <string name="screen_room_change_role_section_moderators">"Мадэратары"</string>
@@ -58,6 +59,7 @@
   <string name="screen_room_details_room_name_label">"Назва пакоя"</string>
   <string name="screen_room_details_security_title">"Бяспека"</string>
   <string name="screen_room_details_share_room_title">"Падзяліцца пакоем"</string>
+  <string name="screen_room_details_title">"Інфармацыя аб пакоі"</string>
   <string name="screen_room_details_topic_title">"Тэма"</string>
   <string name="screen_room_details_updating_room">"Ідзе абнаўленне пакоя…"</string>
   <string name="screen_room_member_list_ban_member_confirmation_action">"Заблакіраваць"</string>
@@ -66,9 +68,9 @@
   <string name="screen_room_member_list_banned_empty">"У гэтым пакоі няма заблакіраваных удзельнікаў."</string>
   <string name="screen_room_member_list_banning_user">"Блакіроўка %1$s"</string>
   <plurals name="screen_room_member_list_header_title">
-    <item quantity="one">"%1$d карыстальнік"</item>
-    <item quantity="few">"%1$d карыстальніка"</item>
-    <item quantity="many">"%1$d карыстальнікаў"</item>
+    <item quantity="one">"%1$d удзельнік"</item>
+    <item quantity="few">"%1$d удзельніка"</item>
+    <item quantity="many">"%1$d удзельнікаў"</item>
   </plurals>
   <string name="screen_room_member_list_manage_member_ban">"Выдаліць і заблакіраваць удзельніка"</string>
   <string name="screen_room_member_list_manage_member_remove">"Выдаліць удзельніка з пакоя"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-cs/translations.xml b/features/roomdetails/impl/src/main/res/values-cs/translations.xml
index 93e7fcf389..f44cdd210a 100644
--- a/features/roomdetails/impl/src/main/res/values-cs/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-cs/translations.xml
@@ -30,6 +30,8 @@
   <string name="screen_room_change_role_confirm_demote_self_description">"Tuto změnu nebudete moci vrátit zpět, protože sami degradujete, pokud jste posledním privilegovaným uživatelem v místnosti, nebude možné znovu získat oprávnění."</string>
   <string name="screen_room_change_role_confirm_demote_self_title">"Degradovat se?"</string>
   <string name="screen_room_change_role_invited_member_name">"%1$s (čekající)"</string>
+  <string name="screen_room_change_role_invited_member_name_android">"(Čeká na vyřízení)"</string>
+  <string name="screen_room_change_role_moderators_admin_section_footer">"Správci mají automaticky oprávnění moderátora"</string>
   <string name="screen_room_change_role_moderators_title">"Upravit moderátory"</string>
   <string name="screen_room_change_role_section_administrators">"Správci"</string>
   <string name="screen_room_change_role_section_moderators">"Moderátoři"</string>
@@ -57,6 +59,7 @@
   <string name="screen_room_details_room_name_label">"Název místnosti"</string>
   <string name="screen_room_details_security_title">"Zabezpečení"</string>
   <string name="screen_room_details_share_room_title">"Sdílet místnost"</string>
+  <string name="screen_room_details_title">"Informace o místnosti"</string>
   <string name="screen_room_details_topic_title">"Téma"</string>
   <string name="screen_room_details_updating_room">"Aktualizace místnosti…"</string>
   <string name="screen_room_member_list_ban_member_confirmation_action">"Vykázat"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-de/translations.xml b/features/roomdetails/impl/src/main/res/values-de/translations.xml
index 980f149bad..5a403643c6 100644
--- a/features/roomdetails/impl/src/main/res/values-de/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-de/translations.xml
@@ -24,12 +24,14 @@
   <string name="screen_room_change_permissions_room_topic">"Raumthema ändern"</string>
   <string name="screen_room_change_permissions_send_messages">"Nachrichten senden"</string>
   <string name="screen_room_change_role_administrators_title">"Admins bearbeiten"</string>
-  <string name="screen_room_change_role_confirm_add_admin_description">"Du vergibst das selbe Rolle, die auch Du hast. Diese Aktion kann daher nicht mehr rückgängig gemacht werden."</string>
+  <string name="screen_room_change_role_confirm_add_admin_description">"Du kannst diese Aktion nicht mehr rückgängig machen. Du vergibst dieselbe Rolle, wie auch Du sie hast."</string>
   <string name="screen_room_change_role_confirm_add_admin_title">"Als Administrator hinzufügen?"</string>
   <string name="screen_room_change_role_confirm_demote_self_action">"Zurückstufen"</string>
   <string name="screen_room_change_role_confirm_demote_self_description">"Du stufst dich selbst herab. Diese Änderung kann nicht rückgängig gemacht werden. Wenn du der letzte Benutzer mit dieser Rolle bist, ist es nicht möglich, diese Rolle wiederzuerlangen."</string>
   <string name="screen_room_change_role_confirm_demote_self_title">"Möchtest Du Dich selbst herabstufen?"</string>
   <string name="screen_room_change_role_invited_member_name">"%1$s (Ausstehend)"</string>
+  <string name="screen_room_change_role_invited_member_name_android">"(Ausstehend)"</string>
+  <string name="screen_room_change_role_moderators_admin_section_footer">"Administratoren haben automatisch Moderatorenrechte"</string>
   <string name="screen_room_change_role_moderators_title">"Moderatoren bearbeiten"</string>
   <string name="screen_room_change_role_section_administrators">"Administratoren"</string>
   <string name="screen_room_change_role_section_moderators">"Moderatoren"</string>
@@ -57,6 +59,7 @@
   <string name="screen_room_details_room_name_label">"Raumname"</string>
   <string name="screen_room_details_security_title">"Sicherheit"</string>
   <string name="screen_room_details_share_room_title">"Raum teilen"</string>
+  <string name="screen_room_details_title">"Raum Informationen"</string>
   <string name="screen_room_details_topic_title">"Thema"</string>
   <string name="screen_room_details_updating_room">"Raum wird aktualisiert…"</string>
   <string name="screen_room_member_list_ban_member_confirmation_action">"Sperren"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-fr/translations.xml b/features/roomdetails/impl/src/main/res/values-fr/translations.xml
index 005531b3db..d4f4cab64c 100644
--- a/features/roomdetails/impl/src/main/res/values-fr/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-fr/translations.xml
@@ -31,6 +31,7 @@
   <string name="screen_room_change_role_confirm_demote_self_title">"Vous rétrograder ?"</string>
   <string name="screen_room_change_role_invited_member_name">"%1$s (En attente)"</string>
   <string name="screen_room_change_role_invited_member_name_android">"(En attente)"</string>
+  <string name="screen_room_change_role_moderators_admin_section_footer">"Les administrateurs ont automatiquement les privilèges des modérateurs"</string>
   <string name="screen_room_change_role_moderators_title">"Modifier les modérateurs"</string>
   <string name="screen_room_change_role_section_administrators">"Administrateurs"</string>
   <string name="screen_room_change_role_section_moderators">"Modérateurs"</string>
@@ -58,6 +59,7 @@
   <string name="screen_room_details_room_name_label">"Nom du salon"</string>
   <string name="screen_room_details_security_title">"Sécurité"</string>
   <string name="screen_room_details_share_room_title">"Partager le salon"</string>
+  <string name="screen_room_details_title">"Informations du salon"</string>
   <string name="screen_room_details_topic_title">"Sujet"</string>
   <string name="screen_room_details_updating_room">"Mise à jour du salon…"</string>
   <string name="screen_room_member_list_ban_member_confirmation_action">"Bannir"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-hu/translations.xml b/features/roomdetails/impl/src/main/res/values-hu/translations.xml
index 66c05c38a7..4fa200ee58 100644
--- a/features/roomdetails/impl/src/main/res/values-hu/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-hu/translations.xml
@@ -9,29 +9,31 @@
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Hiba történt az értesítési beállítás frissítésekor."</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"A Matrix-kiszolgálója nem támogatja ezt a beállítást a titkosított szobákban, előfordulhat, hogy egyes szobákban nem kap értesítést."</string>
   <string name="screen_polls_history_title">"Szavazások"</string>
-  <string name="screen_room_change_permissions_administrators">"Csak rendszergazdák"</string>
+  <string name="screen_room_change_permissions_administrators">"Csak adminisztrátorok"</string>
   <string name="screen_room_change_permissions_ban_people">"Emberek kitiltása"</string>
   <string name="screen_room_change_permissions_delete_messages">"Üzenetek eltávolítása"</string>
   <string name="screen_room_change_permissions_everyone">"Mindenki"</string>
   <string name="screen_room_change_permissions_invite_people">"Emberek meghívása"</string>
   <string name="screen_room_change_permissions_member_moderation">"Tagok moderálása"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Üzenetek és tartalom"</string>
-  <string name="screen_room_change_permissions_moderators">"Rendszergazdák és moderátorok"</string>
+  <string name="screen_room_change_permissions_moderators">"Adminisztrátorok és moderátorok"</string>
   <string name="screen_room_change_permissions_remove_people">"Emberek eltávolítása"</string>
   <string name="screen_room_change_permissions_room_avatar">"Szoba profilképének módosítása"</string>
   <string name="screen_room_change_permissions_room_details">"Szoba részletei"</string>
   <string name="screen_room_change_permissions_room_name">"Szoba nevének módosítása"</string>
   <string name="screen_room_change_permissions_room_topic">"Szoba témájának módosítása"</string>
   <string name="screen_room_change_permissions_send_messages">"Üzenetek küldése"</string>
-  <string name="screen_room_change_role_administrators_title">"Rendszergazdák szerkesztése"</string>
+  <string name="screen_room_change_role_administrators_title">"Adminisztrátorok szerkesztése"</string>
   <string name="screen_room_change_role_confirm_add_admin_description">"Ezt a műveletet nem fogja tudja visszavonni. Ugyanarra a szintre lépteti elő a felhasználót, mint amellyel Ön is rendelkezik."</string>
-  <string name="screen_room_change_role_confirm_add_admin_title">"Rendszergazda hozzáadása?"</string>
+  <string name="screen_room_change_role_confirm_add_admin_title">"Adminisztrátor hozzáadása?"</string>
   <string name="screen_room_change_role_confirm_demote_self_action">"Lefokozás"</string>
   <string name="screen_room_change_role_confirm_demote_self_description">"Ezt a változtatást nem fogja tudni visszavonni, mivel lefokozza magát, ha Ön az utolsó jogosultságokkal rendelkező felhasználó a szobában, akkor lehetetlen lesz visszaszerezni a jogosultságokat."</string>
   <string name="screen_room_change_role_confirm_demote_self_title">"Lefokozza magát?"</string>
   <string name="screen_room_change_role_invited_member_name">"%1$s (függőben)"</string>
+  <string name="screen_room_change_role_invited_member_name_android">"(Függőben)"</string>
+  <string name="screen_room_change_role_moderators_admin_section_footer">"Az adminisztrátorok automatikusan moderátori jogosultságokkal rendelkeznek"</string>
   <string name="screen_room_change_role_moderators_title">"Moderátorok szerkesztése"</string>
-  <string name="screen_room_change_role_section_administrators">"Rendszergazdák"</string>
+  <string name="screen_room_change_role_section_administrators">"Adminisztrátorok"</string>
   <string name="screen_room_change_role_section_moderators">"Moderátorok"</string>
   <string name="screen_room_change_role_section_users">"Tagok"</string>
   <string name="screen_room_change_role_unsaved_changes_description">"Mentetlen módosításai vannak."</string>
@@ -57,6 +59,7 @@
   <string name="screen_room_details_room_name_label">"Szoba neve"</string>
   <string name="screen_room_details_security_title">"Biztonság"</string>
   <string name="screen_room_details_share_room_title">"Szoba megosztása"</string>
+  <string name="screen_room_details_title">"Szobainformációk"</string>
   <string name="screen_room_details_topic_title">"Téma"</string>
   <string name="screen_room_details_updating_room">"Szoba frissítése…"</string>
   <string name="screen_room_member_list_ban_member_confirmation_action">"Kitiltás"</string>
@@ -81,7 +84,7 @@
   <string name="screen_room_member_list_mode_members">"Tagok"</string>
   <string name="screen_room_member_list_pending_header_title">"Függőben"</string>
   <string name="screen_room_member_list_removing_user">"%1$s eltávolítása…"</string>
-  <string name="screen_room_member_list_role_administrator">"Rendszergazda"</string>
+  <string name="screen_room_member_list_role_administrator">"Adminisztrátor"</string>
   <string name="screen_room_member_list_role_moderator">"Moderátor"</string>
   <string name="screen_room_member_list_room_members_header_title">"Szoba tagjai"</string>
   <string name="screen_room_member_list_unbanning_user">"%1$s tiltásának feloldása"</string>
@@ -99,7 +102,7 @@
   <string name="screen_room_notification_settings_mode_all_messages">"Összes üzenet"</string>
   <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Csak említések és kulcsszavak"</string>
   <string name="screen_room_notification_settings_room_custom_settings_title">"Ebben a szobában, értesítés ezekről:"</string>
-  <string name="screen_room_roles_and_permissions_admins">"Rendszergazdák"</string>
+  <string name="screen_room_roles_and_permissions_admins">"Adminisztrátorok"</string>
   <string name="screen_room_roles_and_permissions_change_my_role">"Saját szerepkör módosítása"</string>
   <string name="screen_room_roles_and_permissions_change_role_demote_to_member">"Lefokozás taggá"</string>
   <string name="screen_room_roles_and_permissions_change_role_demote_to_moderator">"Lefokozás moderátorrá"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-in/translations.xml b/features/roomdetails/impl/src/main/res/values-in/translations.xml
index ddfd4859ea..c9aedeefd1 100644
--- a/features/roomdetails/impl/src/main/res/values-in/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-in/translations.xml
@@ -30,6 +30,8 @@
   <string name="screen_room_change_role_confirm_demote_self_description">"Anda tidak akan dapat mengurungkan perubahan ini karena Anda sedang menurunkan Anda sendiri, jika Anda merupakan pengguna dengan hak khusus dalam ruangan maka tidak akan memungkinkan untuk mendapatkan hak tersebut lagi."</string>
   <string name="screen_room_change_role_confirm_demote_self_title">"Turunkan Anda sendiri?"</string>
   <string name="screen_room_change_role_invited_member_name">"%1$s (Tertunda)"</string>
+  <string name="screen_room_change_role_invited_member_name_android">"(Tertunda)"</string>
+  <string name="screen_room_change_role_moderators_admin_section_footer">"Admin secara otomatis memiliki hak moderator"</string>
   <string name="screen_room_change_role_moderators_title">"Sunting Moderator"</string>
   <string name="screen_room_change_role_section_administrators">"Admin"</string>
   <string name="screen_room_change_role_section_moderators">"Moderator"</string>
@@ -57,6 +59,7 @@
   <string name="screen_room_details_room_name_label">"Nama ruangan"</string>
   <string name="screen_room_details_security_title">"Keamanan"</string>
   <string name="screen_room_details_share_room_title">"Bagikan ruangan"</string>
+  <string name="screen_room_details_title">"Info ruangan"</string>
   <string name="screen_room_details_topic_title">"Topik"</string>
   <string name="screen_room_details_updating_room">"Memperbarui ruangan…"</string>
   <string name="screen_room_member_list_ban_member_confirmation_action">"Cekal"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-it/translations.xml b/features/roomdetails/impl/src/main/res/values-it/translations.xml
index 77b46cdeda..8326d592e8 100644
--- a/features/roomdetails/impl/src/main/res/values-it/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-it/translations.xml
@@ -11,7 +11,7 @@
   <string name="screen_polls_history_title">"Sondaggi"</string>
   <string name="screen_room_change_permissions_administrators">"Solo amministratori"</string>
   <string name="screen_room_change_permissions_ban_people">"Escludi membri"</string>
-  <string name="screen_room_change_permissions_delete_messages">"Eliminare messaggi"</string>
+  <string name="screen_room_change_permissions_delete_messages">"Rimuovi messaggi"</string>
   <string name="screen_room_change_permissions_everyone">"Tutti"</string>
   <string name="screen_room_change_permissions_invite_people">"Invitare persone"</string>
   <string name="screen_room_change_permissions_member_moderation">"Moderazione dei membri"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-ru/translations.xml b/features/roomdetails/impl/src/main/res/values-ru/translations.xml
index 200b2ef3c7..9e6b963efb 100644
--- a/features/roomdetails/impl/src/main/res/values-ru/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ru/translations.xml
@@ -30,6 +30,8 @@
   <string name="screen_room_change_role_confirm_demote_self_description">"Вы не сможете отменить это изменение, так как понижаете себя статус. Если вы являетесь последним привилегированным пользователем в комнате, восстановить привилегии будет невозможно."</string>
   <string name="screen_room_change_role_confirm_demote_self_title">"Понизить свой уровень?"</string>
   <string name="screen_room_change_role_invited_member_name">"%1$s (Ожидание)"</string>
+  <string name="screen_room_change_role_invited_member_name_android">"(В ожидании)"</string>
+  <string name="screen_room_change_role_moderators_admin_section_footer">"Администраторы автоматически получают права модератора"</string>
   <string name="screen_room_change_role_moderators_title">"Редактировать роль модераторов"</string>
   <string name="screen_room_change_role_section_administrators">"Администраторы"</string>
   <string name="screen_room_change_role_section_moderators">"Модераторы"</string>
@@ -57,6 +59,7 @@
   <string name="screen_room_details_room_name_label">"Название комнаты"</string>
   <string name="screen_room_details_security_title">"Безопасность"</string>
   <string name="screen_room_details_share_room_title">"Поделиться комнатой"</string>
+  <string name="screen_room_details_title">"Информация о комнате"</string>
   <string name="screen_room_details_topic_title">"Тема"</string>
   <string name="screen_room_details_updating_room">"Обновление комнаты…"</string>
   <string name="screen_room_member_list_ban_member_confirmation_action">"Заблокировать"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-sk/translations.xml b/features/roomdetails/impl/src/main/res/values-sk/translations.xml
index c85b04017c..7feb1d4e41 100644
--- a/features/roomdetails/impl/src/main/res/values-sk/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-sk/translations.xml
@@ -30,6 +30,8 @@
   <string name="screen_room_change_role_confirm_demote_self_description">"Túto zmenu nebudete môcť vrátiť späť, pretože znižujete svoju úroveň. Ak ste posledným privilegovaným používateľom v miestnosti, nebude možné získať znova oprávnenia."</string>
   <string name="screen_room_change_role_confirm_demote_self_title">"Znížiť svoju úroveň?"</string>
   <string name="screen_room_change_role_invited_member_name">"%1$s (Čaká sa)"</string>
+  <string name="screen_room_change_role_invited_member_name_android">"(Čaká sa)"</string>
+  <string name="screen_room_change_role_moderators_admin_section_footer">"Správcovia majú automaticky oprávnenia moderátora"</string>
   <string name="screen_room_change_role_moderators_title">"Upraviť moderátorov"</string>
   <string name="screen_room_change_role_section_administrators">"Správcovia"</string>
   <string name="screen_room_change_role_section_moderators">"Moderátori"</string>
@@ -57,6 +59,7 @@
   <string name="screen_room_details_room_name_label">"Názov miestnosti"</string>
   <string name="screen_room_details_security_title">"Bezpečnosť"</string>
   <string name="screen_room_details_share_room_title">"Zdieľať miestnosť"</string>
+  <string name="screen_room_details_title">"Informácie o miestnosti"</string>
   <string name="screen_room_details_topic_title">"Téma"</string>
   <string name="screen_room_details_updating_room">"Aktualizácia miestnosti…"</string>
   <string name="screen_room_member_list_ban_member_confirmation_action">"Zakázať"</string>
diff --git a/features/roomdirectory/impl/src/main/res/values-it/translations.xml b/features/roomdirectory/impl/src/main/res/values-it/translations.xml
new file mode 100644
index 0000000000..04a9602d78
--- /dev/null
+++ b/features/roomdirectory/impl/src/main/res/values-it/translations.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_room_directory_search_loading_error">"Caricamento fallito"</string>
+  <string name="screen_room_directory_search_title">"Elenco delle stanze"</string>
+</resources>
diff --git a/features/roomlist/impl/src/main/res/values-be/translations.xml b/features/roomlist/impl/src/main/res/values-be/translations.xml
index 39cbd31bc6..8da1365931 100644
--- a/features/roomlist/impl/src/main/res/values-be/translations.xml
+++ b/features/roomlist/impl/src/main/res/values-be/translations.xml
@@ -11,6 +11,8 @@
   <string name="screen_roomlist_filter_favourites_empty_state_subtitle">"Дадаць чат у абранае можна ў наладах чата.
 На дадзены момант вы можаце прыбраць фільтры, каб убачыць іншыя вашыя чаты."</string>
   <string name="screen_roomlist_filter_favourites_empty_state_title">"У вас пакуль няма абраных чатаў"</string>
+  <string name="screen_roomlist_filter_invites">"Запрашэнні"</string>
+  <string name="screen_roomlist_filter_invites_empty_state_title">"У вас няма непрынятых запрашэнняў."</string>
   <string name="screen_roomlist_filter_low_priority">"Нізкі прыярытэт"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"Вы можаце прыбраць фільтры, каб убачыць іншыя вашыя чаты."</string>
   <string name="screen_roomlist_filter_mixed_empty_state_title">"У вас няма чатаў для гэтай катэгорыі"</string>
diff --git a/features/roomlist/impl/src/main/res/values-cs/translations.xml b/features/roomlist/impl/src/main/res/values-cs/translations.xml
index 417e64863b..3a91eb04dc 100644
--- a/features/roomlist/impl/src/main/res/values-cs/translations.xml
+++ b/features/roomlist/impl/src/main/res/values-cs/translations.xml
@@ -11,6 +11,8 @@
   <string name="screen_roomlist_filter_favourites_empty_state_subtitle">"V nastavení chatu můžete přidat chat k oblíbeným.
 Prozatím můžete zrušit výběr filtrů, abyste viděli své další chaty"</string>
   <string name="screen_roomlist_filter_favourites_empty_state_title">"Zatím nemáte oblíbené chaty"</string>
+  <string name="screen_roomlist_filter_invites">"Pozvánky"</string>
+  <string name="screen_roomlist_filter_invites_empty_state_title">"Nemáte žádné nevyřízené pozvánky."</string>
   <string name="screen_roomlist_filter_low_priority">"Nízká priorita"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"Můžete zrušit výběr filtrů, abyste viděli své další chaty"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_title">"Nemáte chaty pro tento výběr"</string>
diff --git a/features/roomlist/impl/src/main/res/values-de/translations.xml b/features/roomlist/impl/src/main/res/values-de/translations.xml
index a2cf494b1b..d02870ccd1 100644
--- a/features/roomlist/impl/src/main/res/values-de/translations.xml
+++ b/features/roomlist/impl/src/main/res/values-de/translations.xml
@@ -11,6 +11,8 @@
   <string name="screen_roomlist_filter_favourites_empty_state_subtitle">"In den Chat-Einstellungen kannst du einen Chat als Favorit hinzufügen.
 Um deine anderen Chats zu sehen wähle diesen Filter ab."</string>
   <string name="screen_roomlist_filter_favourites_empty_state_title">"Du hast noch keine Chats als Favorit markiert."</string>
+  <string name="screen_roomlist_filter_invites">"Einladungen"</string>
+  <string name="screen_roomlist_filter_invites_empty_state_title">"Du hast keine ausstehenden Einladungen."</string>
   <string name="screen_roomlist_filter_low_priority">"Niedrige Priorität"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"Wähle Filter ab, um Deine Chats zu sehen."</string>
   <string name="screen_roomlist_filter_mixed_empty_state_title">"Du hast keine Chats für diese Auswahl"</string>
diff --git a/features/roomlist/impl/src/main/res/values-fr/translations.xml b/features/roomlist/impl/src/main/res/values-fr/translations.xml
index 602b1ccd35..fd8606c96b 100644
--- a/features/roomlist/impl/src/main/res/values-fr/translations.xml
+++ b/features/roomlist/impl/src/main/res/values-fr/translations.xml
@@ -11,6 +11,8 @@
   <string name="screen_roomlist_filter_favourites_empty_state_subtitle">"Vous pouvez ajouter une discussion aux favoris depuis les paramètres de la discussion.
 En attendant, vous pouvez désélectionner des filtres pour voir vos autres salons."</string>
   <string name="screen_roomlist_filter_favourites_empty_state_title">"Vous n’avez pas encore de discussions favorites"</string>
+  <string name="screen_roomlist_filter_invites">"Invitations"</string>
+  <string name="screen_roomlist_filter_invites_empty_state_title">"Vous n’avez aucune invitation en attente."</string>
   <string name="screen_roomlist_filter_low_priority">"Priorité basse"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"Veuillez désélectionner des filtres pour voir vos discussions"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_title">"Vous n’avez pas de discussions pour cette sélection"</string>
diff --git a/features/roomlist/impl/src/main/res/values-hu/translations.xml b/features/roomlist/impl/src/main/res/values-hu/translations.xml
index 559a481246..e25c493b13 100644
--- a/features/roomlist/impl/src/main/res/values-hu/translations.xml
+++ b/features/roomlist/impl/src/main/res/values-hu/translations.xml
@@ -11,6 +11,8 @@
   <string name="screen_roomlist_filter_favourites_empty_state_subtitle">"A csevegési beállításokban csevegéseket adhat hozzá a kedvencekhez.
 Egyelőre törölheti a szűrőket a többi csevegés megtekintéséhez."</string>
   <string name="screen_roomlist_filter_favourites_empty_state_title">"Még nincsenek kedvenc csevegései"</string>
+  <string name="screen_roomlist_filter_invites">"Meghívások"</string>
+  <string name="screen_roomlist_filter_invites_empty_state_title">"Nincsenek függőben lévő meghívásai."</string>
   <string name="screen_roomlist_filter_low_priority">"Alacsony prioritás"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"Kikapcsolhatja a szűrőket a többi csevegés megtekintéséhez"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_title">"Ehhez a kiválasztáshoz nem tartoznak csevegések"</string>
diff --git a/features/roomlist/impl/src/main/res/values-in/translations.xml b/features/roomlist/impl/src/main/res/values-in/translations.xml
index 74c90c1319..8f194e1e34 100644
--- a/features/roomlist/impl/src/main/res/values-in/translations.xml
+++ b/features/roomlist/impl/src/main/res/values-in/translations.xml
@@ -11,6 +11,8 @@
   <string name="screen_roomlist_filter_favourites_empty_state_subtitle">"Anda dapat menambahkan percakapan ke favorit Anda dalam pengaturan percakapan.
 Untuk sementara, Anda dapat membatalkan pilihan saringan untuk melihat percakapan Anda yang lain"</string>
   <string name="screen_roomlist_filter_favourites_empty_state_title">"Anda belum memiliki percakapan favorit"</string>
+  <string name="screen_roomlist_filter_invites">"Undangan"</string>
+  <string name="screen_roomlist_filter_invites_empty_state_title">"Anda tidak memiliki undangan yang tertunda."</string>
   <string name="screen_roomlist_filter_low_priority">"Prioritas Rendah"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"Anda dapat membatalkan pilihan saringan untuk melihat percakapan Anda yang lain"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_title">"Anda tidak memiliki percakapan untuk pemilihan ini"</string>
diff --git a/features/roomlist/impl/src/main/res/values-it/translations.xml b/features/roomlist/impl/src/main/res/values-it/translations.xml
index cd1261f3b3..05e41594a2 100644
--- a/features/roomlist/impl/src/main/res/values-it/translations.xml
+++ b/features/roomlist/impl/src/main/res/values-it/translations.xml
@@ -24,6 +24,7 @@ Non hai messaggi non letti!"</string>
   <string name="screen_roomlist_main_space_title">"Tutte le conversazioni"</string>
   <string name="screen_roomlist_mark_as_read">"Segna come letto"</string>
   <string name="screen_roomlist_mark_as_unread">"Segna come non letto"</string>
+  <string name="screen_roomlist_room_directory_button_title">"Sfoglia tutte le stanze"</string>
   <string name="session_verification_banner_message">"Sembra che tu stia usando un nuovo dispositivo. Verificati con un altro dispositivo per accedere ai tuoi messaggi cifrati."</string>
   <string name="session_verification_banner_title">"Verifica che sei tu"</string>
 </resources>
diff --git a/features/roomlist/impl/src/main/res/values-ru/translations.xml b/features/roomlist/impl/src/main/res/values-ru/translations.xml
index d18fc1fd03..68cb98436d 100644
--- a/features/roomlist/impl/src/main/res/values-ru/translations.xml
+++ b/features/roomlist/impl/src/main/res/values-ru/translations.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="confirm_recovery_key_banner_message">"В настоящее время резервная копия вашего чата не синхронизирована. Требуется подтвердить вашим ключом восстановления, чтобы сохранить доступ к резервной копии чата."</string>
-  <string name="confirm_recovery_key_banner_title">"Подтвердите ключ восстановления"</string>
+  <string name="confirm_recovery_key_banner_title">
+    "Введите "
+    <b>"ключ восстановления"</b>
+  </string>
   <string name="screen_migration_message">"Это одноразовый процесс, спасибо, что подождали."</string>
   <string name="screen_migration_title">"Настройка учетной записи."</string>
   <string name="screen_roomlist_a11y_create_message">"Создайте новую беседу или комнату"</string>
@@ -11,6 +14,8 @@
   <string name="screen_roomlist_filter_favourites_empty_state_subtitle">"Добавить чат в избранное можно в настройках чата.
 На данный момент вы можете убрать фильтры, чтобы увидеть другие ваши чаты."</string>
   <string name="screen_roomlist_filter_favourites_empty_state_title">"У вас пока нет избранных чатов"</string>
+  <string name="screen_roomlist_filter_invites">"Приглашает"</string>
+  <string name="screen_roomlist_filter_invites_empty_state_title">"У вас нет отложенных приглашений."</string>
   <string name="screen_roomlist_filter_low_priority">"Низкий приоритет"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"Вы можете убрать фильтры, чтобы увидеть другие ваши чаты."</string>
   <string name="screen_roomlist_filter_mixed_empty_state_title">"У вас нет чатов для этой подборки"</string>
diff --git a/features/roomlist/impl/src/main/res/values-sk/translations.xml b/features/roomlist/impl/src/main/res/values-sk/translations.xml
index 08320d1c30..101df1792d 100644
--- a/features/roomlist/impl/src/main/res/values-sk/translations.xml
+++ b/features/roomlist/impl/src/main/res/values-sk/translations.xml
@@ -11,6 +11,8 @@
   <string name="screen_roomlist_filter_favourites_empty_state_subtitle">"Môžete pridať konverzáciu medzi obľúbené v nastaveniach konverzácie.
 Zatiaľ môžete zrušiť výber filtrov, aby ste videli ostatné konverzácie"</string>
   <string name="screen_roomlist_filter_favourites_empty_state_title">"Zatiaľ nemáte obľúbené konverzácie"</string>
+  <string name="screen_roomlist_filter_invites">"Pozvánky"</string>
+  <string name="screen_roomlist_filter_invites_empty_state_title">"Nemáte žiadne čakajúce pozvánky."</string>
   <string name="screen_roomlist_filter_low_priority">"Nízka priorita"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"Môžete zrušiť výber filtrov, aby ste videli svoje ostatné konverzácie"</string>
   <string name="screen_roomlist_filter_mixed_empty_state_title">"Nemáte konverzácie pre tento výber"</string>
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/createkey/CreateNewRecoveryKeyNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/createkey/CreateNewRecoveryKeyNode.kt
index df1e2d9528..33b52a4497 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/createkey/CreateNewRecoveryKeyNode.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/createkey/CreateNewRecoveryKeyNode.kt
@@ -24,16 +24,19 @@ import com.bumble.appyx.core.plugin.Plugin
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
+import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.di.SessionScope
 
 @ContributesNode(SessionScope::class)
 class CreateNewRecoveryKeyNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
+    private val buildMeta: BuildMeta,
 ) : Node(buildContext, plugins = plugins) {
     @Composable
     override fun View(modifier: Modifier) {
         CreateNewRecoveryKeyView(
+            desktopApplicationName = buildMeta.desktopApplicationName,
             modifier = modifier,
             onBackClicked = ::navigateUp,
         )
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/createkey/CreateNewRecoveryKeyView.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/createkey/CreateNewRecoveryKeyView.kt
index ed3a5cd339..8974d1faa2 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/createkey/CreateNewRecoveryKeyView.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/createkey/CreateNewRecoveryKeyView.kt
@@ -49,6 +49,7 @@ import io.element.android.libraries.designsystem.theme.components.TopAppBar
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun CreateNewRecoveryKeyView(
+    desktopApplicationName: String,
     onBackClicked: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -66,15 +67,15 @@ fun CreateNewRecoveryKeyView(
                 title = stringResource(R.string.screen_create_new_recovery_key_title),
                 iconStyle = BigIcon.Style.Default(CompoundIcons.Computer())
             )
-            Content()
+            Content(desktopApplicationName = desktopApplicationName)
         }
     }
 }
 
 @Composable
-private fun Content() {
+private fun Content(desktopApplicationName: String) {
     Column(modifier = Modifier.padding(horizontal = 16.dp), verticalArrangement = Arrangement.spacedBy(24.dp)) {
-        Item(index = 1, text = AnnotatedString(stringResource(R.string.screen_create_new_recovery_key_list_item_1)))
+        Item(index = 1, text = AnnotatedString(stringResource(R.string.screen_create_new_recovery_key_list_item_1, desktopApplicationName)))
         Item(index = 2, text = AnnotatedString(stringResource(R.string.screen_create_new_recovery_key_list_item_2)))
         Item(
             index = 3,
@@ -129,6 +130,7 @@ private fun ItemNumber(
 internal fun CreateNewRecoveryKeyViewPreview() {
     ElementPreview {
         CreateNewRecoveryKeyView(
+            desktopApplicationName = "Element",
             onBackClicked = {},
         )
     }
diff --git a/features/securebackup/impl/src/main/res/values-be/translations.xml b/features/securebackup/impl/src/main/res/values-be/translations.xml
index 58011bad6e..9710ac77b1 100644
--- a/features/securebackup/impl/src/main/res/values-be/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-be/translations.xml
@@ -9,7 +9,7 @@
   <string name="screen_chat_backup_recovery_action_confirm_description">"Ваша рэзервовая копія чата зараз не сінхранізавана."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Наладзьце аднаўленне"</string>
   <string name="screen_chat_backup_recovery_action_setup_description">"Атрымайце доступ да зашыфраваных паведамленняў, калі вы страціце ўсе свае прылады або выйдзеце з сістэмы %1$s усюды."</string>
-  <string name="screen_create_new_recovery_key_list_item_1">"Адкрыйце Element на настольнай прыладзе"</string>
+  <string name="screen_create_new_recovery_key_list_item_1">"Адкрыйце %1$s на настольнай прыладзе"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Увайдзіце ў свой уліковы запіс яшчэ раз"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"Калі будзе прапанавана пацвердзіць вашу прыладу, выберыце %1$s"</string>
   <string name="screen_create_new_recovery_key_list_item_3_reset_all">"“Скінуць усе”"</string>
@@ -20,8 +20,8 @@
   <string name="screen_key_backup_disable_confirmation_description">"Вы страціце зашыфраваныя паведамленні, калі выйдзеце з усіх прылад."</string>
   <string name="screen_key_backup_disable_confirmation_title">"Вы ўпэўнены, што хочаце адключыць рэзервовае капіраванне?"</string>
   <string name="screen_key_backup_disable_description">"Адключэнне рэзервовага капіравання прывядзе да выдалення бягучай рэзервовай копіі ключа шыфравання і адключэння іншых функцый бяспекі. У гэтым выпадку вы:"</string>
-  <string name="screen_key_backup_disable_description_point_1">"Няма зашыфраванай гісторыі паведамленняў на новых прыладах"</string>
-  <string name="screen_key_backup_disable_description_point_2">"Калі вы выходзіце з сістэмы, то губляеце доступ да зашыфраваных паведамленняў %1$s усюды"</string>
+  <string name="screen_key_backup_disable_description_point_1">"Не будзеце мець зашыфраванай гісторыі паведамленняў на новых прыладах"</string>
+  <string name="screen_key_backup_disable_description_point_2">"Страціце доступ да зашыфраваных паведамленняў, калі вы выйдзеце з усіх %1$s сеансаў"</string>
   <string name="screen_key_backup_disable_title">"Вы ўпэўнены, што хочаце адключыць рэзервовае капіраванне?"</string>
   <string name="screen_recovery_key_change_description">"Атрымайце новы ключ аднаўлення, калі вы страцілі існуючы. Пасля змены ключа аднаўлення ваш стары больш не будзе працаваць."</string>
   <string name="screen_recovery_key_change_generate_key">"Стварыць новы ключ аднаўлення"</string>
diff --git a/features/securebackup/impl/src/main/res/values-cs/translations.xml b/features/securebackup/impl/src/main/res/values-cs/translations.xml
index f8a2fe8747..5f9ef80e54 100644
--- a/features/securebackup/impl/src/main/res/values-cs/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-cs/translations.xml
@@ -9,7 +9,7 @@
   <string name="screen_chat_backup_recovery_action_confirm_description">"Vaše záloha chatu není aktuálně synchronizována."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Nastavení obnovy"</string>
   <string name="screen_chat_backup_recovery_action_setup_description">"Získejte přístup ke svým zašifrovaným zprávám, pokud ztratíte všechna zařízení nebo jste všude odhlášeni z %1$s."</string>
-  <string name="screen_create_new_recovery_key_list_item_1">"Otevřít Element na stolním počítači"</string>
+  <string name="screen_create_new_recovery_key_list_item_1">"Otevřít %1$s na stolním počítači"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Znovu se přihlaste ke svému účtu"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"Když budete vyzváni k ověření vašeho zařízení, vyberte %1$s"</string>
   <string name="screen_create_new_recovery_key_list_item_3_reset_all">"\"Resetovat vše\""</string>
diff --git a/features/securebackup/impl/src/main/res/values-de/translations.xml b/features/securebackup/impl/src/main/res/values-de/translations.xml
index 7336b28b70..f78f0cb3e3 100644
--- a/features/securebackup/impl/src/main/res/values-de/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-de/translations.xml
@@ -11,7 +11,7 @@
   <string name="screen_chat_backup_recovery_action_setup_description">"Erhalte Zugriff auf deine verschlüsselten Nachrichten, wenn du alle deine Geräte verlierst oder von %1$s überall abgemeldet bist."</string>
   <string name="screen_create_new_recovery_key_list_item_1">
     "Öffne "
-    <b>"Element"</b>
+    <b>"%1$s"</b>
     " auf einem "
     <b>"Desktop-Gerät"</b>
   </string>
diff --git a/features/securebackup/impl/src/main/res/values-fr/translations.xml b/features/securebackup/impl/src/main/res/values-fr/translations.xml
index 9f3f304b25..5cedec5328 100644
--- a/features/securebackup/impl/src/main/res/values-fr/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-fr/translations.xml
@@ -9,6 +9,13 @@
   <string name="screen_chat_backup_recovery_action_confirm_description">"La sauvegarde des discussions est désynchronisée."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Configurer la récupération"</string>
   <string name="screen_chat_backup_recovery_action_setup_description">"Accédez à vos messages chiffrés si vous perdez tous vos appareils ou que vous êtes déconnectés de %1$s partout."</string>
+  <string name="screen_create_new_recovery_key_list_item_1">"Ouvrez %1$s sur un ordinateur"</string>
+  <string name="screen_create_new_recovery_key_list_item_2">"Connectez-vous à nouveau à votre compte"</string>
+  <string name="screen_create_new_recovery_key_list_item_3">"Lorsque vous devrez vérifier la session, choisissez %1$s"</string>
+  <string name="screen_create_new_recovery_key_list_item_3_reset_all">"“Réinitialiser”"</string>
+  <string name="screen_create_new_recovery_key_list_item_4">"Suivez les instructions pour créer une nouvelle clé de récupération"</string>
+  <string name="screen_create_new_recovery_key_list_item_5">"Enregistrez votre nouvelle clé dans un gestionnaire de mots de passe ou dans une note chiffrée"</string>
+  <string name="screen_create_new_recovery_key_title">"Réinitialisez le chiffrement de votre compte en utilisant un autre appareil"</string>
   <string name="screen_key_backup_disable_confirmation_action_turn_off">"Désactiver"</string>
   <string name="screen_key_backup_disable_confirmation_description">"Vous perdrez vos messages chiffrés si vous vous déconnectez de toutes vos sessions."</string>
   <string name="screen_key_backup_disable_confirmation_title">"Êtes-vous certain de vouloir désactiver la sauvegarde?"</string>
@@ -21,13 +28,15 @@
   <string name="screen_recovery_key_change_generate_key_description">"Assurez-vous de conserver la clé dans un endroit sûr."</string>
   <string name="screen_recovery_key_change_success">"Clé de récupération modifée"</string>
   <string name="screen_recovery_key_change_title">"Changer la clé de récupération?"</string>
-  <string name="screen_recovery_key_confirm_description">"Saisissez votre clé de récupération pour accéder à l’historique de vos discussions."</string>
+  <string name="screen_recovery_key_confirm_create_new_recovery_key">"Créer une nouvelle clé de récupération"</string>
+  <string name="screen_recovery_key_confirm_description">"Assurez vous que personne d’autre ne regarde l’écran!"</string>
   <string name="screen_recovery_key_confirm_error_content">"Veuillez réessayer pour accéder à votre historique chiffré."</string>
   <string name="screen_recovery_key_confirm_error_title">"Clé de récupération incorrecte"</string>
-  <string name="screen_recovery_key_confirm_key_description">"Saisissez la clé à 48 caractères."</string>
+  <string name="screen_recovery_key_confirm_key_description">"Si vous avez une clé de sécurité ou une phrase de sécurité, cela fonctionnera également."</string>
+  <string name="screen_recovery_key_confirm_key_label">"Clé de récupération"</string>
   <string name="screen_recovery_key_confirm_key_placeholder">"Saisissez la clé ici…"</string>
   <string name="screen_recovery_key_confirm_success">"Clé de récupération confirmée"</string>
-  <string name="screen_recovery_key_confirm_title">"Confirmez votre clé de récupération"</string>
+  <string name="screen_recovery_key_confirm_title">"Saisissez votre clé de récupération"</string>
   <string name="screen_recovery_key_copied_to_clipboard">"Clé de récupération copiée"</string>
   <string name="screen_recovery_key_generating_key">"Génération…"</string>
   <string name="screen_recovery_key_save_action">"Enregistrer la clé"</string>
diff --git a/features/securebackup/impl/src/main/res/values-hu/translations.xml b/features/securebackup/impl/src/main/res/values-hu/translations.xml
index 1bd37c4b64..a3fed4e584 100644
--- a/features/securebackup/impl/src/main/res/values-hu/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-hu/translations.xml
@@ -9,7 +9,7 @@
   <string name="screen_chat_backup_recovery_action_confirm_description">"A csevegéselőzményei nincsenek szinkronban."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Helyreállítás beállítása"</string>
   <string name="screen_chat_backup_recovery_action_setup_description">"Szerezzen hozzáférést a titkosított üzeneteihez, ha elvesztette az összes eszközét, vagy ha mindenütt kijelentkezett az %1$sből."</string>
-  <string name="screen_create_new_recovery_key_list_item_1">"Nyissa meg az Elementet egy asztali eszközön"</string>
+  <string name="screen_create_new_recovery_key_list_item_1">"Nyissa meg az %1$set egy asztali eszközön"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Jelentkezzen be újra a fiókjába"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"Amikor az eszköz ellenőrzését kéri, válassza ezt a lehetőséget: %1$s"</string>
   <string name="screen_create_new_recovery_key_list_item_3_reset_all">"„Minden visszaállítása”"</string>
diff --git a/features/securebackup/impl/src/main/res/values-in/translations.xml b/features/securebackup/impl/src/main/res/values-in/translations.xml
index 016d0e3057..60c277d6c3 100644
--- a/features/securebackup/impl/src/main/res/values-in/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-in/translations.xml
@@ -9,7 +9,7 @@
   <string name="screen_chat_backup_recovery_action_confirm_description">"Pencadangan percakapan Anda saat ini tidak tersinkron."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Siapkan pemulihan"</string>
   <string name="screen_chat_backup_recovery_action_setup_description">"Dapatkan akses ke pesan terenkripsi Anda jika Anda kehilangan semua perangkat Anda atau keluar dari %1$s di mana pun."</string>
-  <string name="screen_create_new_recovery_key_list_item_1">"Buka Element di perangkat desktop"</string>
+  <string name="screen_create_new_recovery_key_list_item_1">"Buka %1$s di perangkat desktop"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Masuk ke akun Anda lagi"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"Saat diminta untuk memverifikasi perangkat Anda, pilih %1$s"</string>
   <string name="screen_create_new_recovery_key_list_item_3_reset_all">"“Atur ulang semua”"</string>
@@ -32,7 +32,7 @@
   <string name="screen_recovery_key_confirm_description">"Pastikan tidak ada yang bisa melihat layar ini!"</string>
   <string name="screen_recovery_key_confirm_error_content">"Silakan coba lagi untuk mengonfirmasi akses ke cadangan percakapan Anda."</string>
   <string name="screen_recovery_key_confirm_error_title">"Kunci pemulihan salah"</string>
-  <string name="screen_recovery_key_confirm_key_description">"Jika Anda memiliki frasa sandi pemulihan atau frasa/kunci sandi rahasia, ini juga dapat digunakan."</string>
+  <string name="screen_recovery_key_confirm_key_description">"Jika Anda memiliki kunci keamanan atau frasa keamanan, ini juga bisa digunakan."</string>
   <string name="screen_recovery_key_confirm_key_label">"Kunci pemulihan atau kode sandi"</string>
   <string name="screen_recovery_key_confirm_key_placeholder">"Masukkan…"</string>
   <string name="screen_recovery_key_confirm_success">"Kunci pemulihan dikonfirmasi"</string>
diff --git a/features/securebackup/impl/src/main/res/values-ru/translations.xml b/features/securebackup/impl/src/main/res/values-ru/translations.xml
index acacc8d60b..b311575c4b 100644
--- a/features/securebackup/impl/src/main/res/values-ru/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-ru/translations.xml
@@ -15,7 +15,7 @@
   <string name="screen_chat_backup_recovery_action_confirm_description">"Резервная копия чата в настоящее время не синхронизирована."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Настроить восстановление"</string>
   <string name="screen_chat_backup_recovery_action_setup_description">"Получите доступ к зашифрованным сообщениям, если вы потеряете все свои устройства или выйдете из системы %1$s отовсюду."</string>
-  <string name="screen_create_new_recovery_key_list_item_1">"Откройте Element на настольном устройстве"</string>
+  <string name="screen_create_new_recovery_key_list_item_1">"Откройте %1$s на настольном устройстве"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Войдите в свой аккаунт еще раз"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"Когда вас попросят подтвердить устройство, выберите %1$s"</string>
   <string name="screen_create_new_recovery_key_list_item_3_reset_all">"“Сбросить все”"</string>
diff --git a/features/securebackup/impl/src/main/res/values-sk/translations.xml b/features/securebackup/impl/src/main/res/values-sk/translations.xml
index fdc70027b3..8b6be92219 100644
--- a/features/securebackup/impl/src/main/res/values-sk/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-sk/translations.xml
@@ -9,7 +9,7 @@
   <string name="screen_chat_backup_recovery_action_confirm_description">"Vaša záloha konverzácie nie je momentálne synchronizovaná."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Nastaviť obnovovanie"</string>
   <string name="screen_chat_backup_recovery_action_setup_description">"Získajte prístup k vašim šifrovaným správam aj keď stratíte všetky svoje zariadenia alebo sa odhlásite zo všetkých %1$s zariadení."</string>
-  <string name="screen_create_new_recovery_key_list_item_1">"Otvoriť Element v stolnom počítači"</string>
+  <string name="screen_create_new_recovery_key_list_item_1">"Otvoriť %1$s v stolnom počítači"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Znova sa prihláste do svojho účtu"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"Keď sa zobrazí výzva na overenie vášho zariadenia, vyberte %1$s"</string>
   <string name="screen_create_new_recovery_key_list_item_3_reset_all">"\"Obnoviť všetko\""</string>
@@ -32,7 +32,7 @@
   <string name="screen_recovery_key_confirm_description">"Uistite sa, že túto obrazovku nikto nevidí!"</string>
   <string name="screen_recovery_key_confirm_error_content">"Skúste prosím znova potvrdiť prístup k vašej zálohe konverzácie."</string>
   <string name="screen_recovery_key_confirm_error_title">"Nesprávny kľúč na obnovenie"</string>
-  <string name="screen_recovery_key_confirm_key_description">"Ak máte frázu na obnovenie alebo tajné heslo/kľúč, bude to tiež fungovať."</string>
+  <string name="screen_recovery_key_confirm_key_description">"Ak máte bezpečnostný kľúč alebo bezpečnostnú frázu, bude to fungovať tiež."</string>
   <string name="screen_recovery_key_confirm_key_label">"Kľúč na obnovenie alebo prístupový kód"</string>
   <string name="screen_recovery_key_confirm_key_placeholder">"Zadať…"</string>
   <string name="screen_recovery_key_confirm_success">"Kľúč na obnovu potvrdený"</string>
diff --git a/features/securebackup/impl/src/main/res/values/localazy.xml b/features/securebackup/impl/src/main/res/values/localazy.xml
index 9e188d1251..d3fb41857e 100644
--- a/features/securebackup/impl/src/main/res/values/localazy.xml
+++ b/features/securebackup/impl/src/main/res/values/localazy.xml
@@ -9,7 +9,7 @@
   <string name="screen_chat_backup_recovery_action_confirm_description">"Your chat backup is currently out of sync."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Set up recovery"</string>
   <string name="screen_chat_backup_recovery_action_setup_description">"Get access to your encrypted messages if you lose all your devices or are signed out of %1$s everywhere."</string>
-  <string name="screen_create_new_recovery_key_list_item_1">"Open Element in a desktop device"</string>
+  <string name="screen_create_new_recovery_key_list_item_1">"Open %1$s in a desktop device"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"Sign into your account again"</string>
   <string name="screen_create_new_recovery_key_list_item_3">"When asked to verify your device, select %1$s"</string>
   <string name="screen_create_new_recovery_key_list_item_3_reset_all">"“Reset all”"</string>
diff --git a/features/signedout/impl/src/main/res/values-hu/translations.xml b/features/signedout/impl/src/main/res/values-hu/translations.xml
index a73be9ea55..2b8bd3528e 100644
--- a/features/signedout/impl/src/main/res/values-hu/translations.xml
+++ b/features/signedout/impl/src/main/res/values-hu/translations.xml
@@ -2,7 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_signed_out_reason_1">"Megváltoztatta a jelszavát egy másik munkamenetben"</string>
   <string name="screen_signed_out_reason_2">"Törölte a munkamenetet egy másik munkamenetből"</string>
-  <string name="screen_signed_out_reason_3">"A kiszolgáló rendszergazdája érvénytelenítette a hozzáférését"</string>
-  <string name="screen_signed_out_subtitle">"Előfordulhat, hogy az alábbiakban felsorolt okok valamelyike miatt került kijelentkezésre. Kérjük, jelentkezzen be újra, hogy folytatni tudja a %s használatát."</string>
+  <string name="screen_signed_out_reason_3">"A kiszolgáló adminisztrátora érvénytelenítette a hozzáférését"</string>
+  <string name="screen_signed_out_subtitle">"Előfordulhat, hogy az alábbiakban felsorolt okok valamelyike miatt került kijelentkeztetésre. Jelentkezzen be újra, hogy folytatni tudja az %s használatát."</string>
   <string name="screen_signed_out_title">"Kijelentkezett"</string>
 </resources>
diff --git a/features/verifysession/impl/src/main/res/values-fr/translations.xml b/features/verifysession/impl/src/main/res/values-fr/translations.xml
index a37a51f8c5..9f75e36ad9 100644
--- a/features/verifysession/impl/src/main/res/values-fr/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-fr/translations.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_identity_confirmation_create_new_recovery_key">"Créer une nouvelle clé de récupération"</string>
   <string name="screen_identity_confirmation_subtitle">"Vérifier cette session pour configurer votre messagerie sécurisée."</string>
   <string name="screen_identity_confirmation_title">"Confirmez votre identité"</string>
   <string name="screen_identity_confirmed_subtitle">"Vous pouvez désormais lire ou envoyer des messages en toute sécurité, et toute personne avec qui vous discutez peut également faire confiance à cette session."</string>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a4cb123520..f638e4d4fc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -38,7 +38,7 @@ serialization_json = "1.6.3"
 showkase = "1.0.2"
 appyx = "1.4.0"
 sqldelight = "2.0.2"
-wysiwyg = "2.36.0"
+wysiwyg = "2.37.0"
 telephoto = "0.9.0"
 
 # DI
@@ -175,7 +175,7 @@ opusencoder = "io.element.android:opusencoder:1.1.0"
 kotlinpoet = "com.squareup:kotlinpoet:1.16.0"
 
 # Analytics
-posthog = "com.posthog:posthog-android:3.1.16"
+posthog = "com.posthog:posthog-android:3.1.17"
 sentry = "io.sentry:sentry-android:7.8.0"
 # Note: only 0.19.0 will compile properly
 # main branch can be tested replacing the version with main-SNAPSHOT
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/meta/BuildMeta.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/meta/BuildMeta.kt
index cac30e02e4..ad5581f631 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/meta/BuildMeta.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/meta/BuildMeta.kt
@@ -20,6 +20,8 @@ data class BuildMeta(
     val buildType: BuildType,
     val isDebuggable: Boolean,
     val applicationName: String,
+    val productionApplicationName: String,
+    val desktopApplicationName: String,
     val applicationId: String,
     val lowPrivacyLoggingEnabled: Boolean,
     val versionName: String,
diff --git a/libraries/eventformatter/impl/src/main/res/values-hu/translations.xml b/libraries/eventformatter/impl/src/main/res/values-hu/translations.xml
index 5bcb239126..c23e973217 100644
--- a/libraries/eventformatter/impl/src/main/res/values-hu/translations.xml
+++ b/libraries/eventformatter/impl/src/main/res/values-hu/translations.xml
@@ -11,7 +11,7 @@
   <string name="state_event_display_name_removed_by_you">"Eltávolította a megjelenítendő nevét (ez volt: %1$s)"</string>
   <string name="state_event_display_name_set">"%1$s beállította a megjelenítendő nevét: %2$s"</string>
   <string name="state_event_display_name_set_by_you">"Beállította a megjelenítendő nevét: %1$s"</string>
-  <string name="state_event_promoted_to_administrator">"%1$s elő lett léptetve rendszergazdává"</string>
+  <string name="state_event_promoted_to_administrator">"%1$s elő lett léptetve adminisztrátorrá"</string>
   <string name="state_event_promoted_to_moderator">"%1$s elő lett léptetve moderátorrá"</string>
   <string name="state_event_room_avatar_changed">"%1$s megváltoztatta a szoba profilképét"</string>
   <string name="state_event_room_avatar_changed_by_you">"Megváltoztatta a szoba profilképét"</string>
diff --git a/libraries/eventformatter/impl/src/main/res/values-ru/translations.xml b/libraries/eventformatter/impl/src/main/res/values-ru/translations.xml
index 459b4919a6..5e1cde283e 100644
--- a/libraries/eventformatter/impl/src/main/res/values-ru/translations.xml
+++ b/libraries/eventformatter/impl/src/main/res/values-ru/translations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="state_event_avatar_changed_too">"(аватар тоже был изменен)"</string>
-  <string name="state_event_avatar_url_changed">"%1$s сменили свой аватар"</string>
+  <string name="state_event_avatar_changed_too">"(изображение тоже было изменено)"</string>
+  <string name="state_event_avatar_url_changed">"%1$s сменили свое изображение"</string>
   <string name="state_event_avatar_url_changed_by_you">"Вы сменили изображение"</string>
   <string name="state_event_demoted_to_member">"%1$s был понижен в должности до участника"</string>
   <string name="state_event_demoted_to_moderator">"%1$s был понижен в должности до модератора"</string>
@@ -13,10 +13,10 @@
   <string name="state_event_display_name_set_by_you">"Вы установили отображаемое имя на %1$s"</string>
   <string name="state_event_promoted_to_administrator">"%1$s был повышен до уровня администратора"</string>
   <string name="state_event_promoted_to_moderator">"%1$s был повышен до модератора"</string>
-  <string name="state_event_room_avatar_changed">"%1$s изменил аватар комнаты"</string>
-  <string name="state_event_room_avatar_changed_by_you">"Вы изменили аватар комнаты"</string>
-  <string name="state_event_room_avatar_removed">"%1$s удалил аватар комнаты"</string>
-  <string name="state_event_room_avatar_removed_by_you">"Вы удалили аватар комнаты"</string>
+  <string name="state_event_room_avatar_changed">"%1$s изменил изображение комнаты"</string>
+  <string name="state_event_room_avatar_changed_by_you">"Вы изменили изображение комнаты"</string>
+  <string name="state_event_room_avatar_removed">"%1$s удалил изображение комнаты"</string>
+  <string name="state_event_room_avatar_removed_by_you">"Вы удалили изображение комнаты"</string>
   <string name="state_event_room_ban">"%1$s заблокировал %2$s"</string>
   <string name="state_event_room_ban_by_you">"Вы заблокировали %1$s"</string>
   <string name="state_event_room_created">"%1$s создал комнату"</string>
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/BuildMeta.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/BuildMeta.kt
index f3a704ddc5..2a70a56051 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/BuildMeta.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/BuildMeta.kt
@@ -23,6 +23,8 @@ fun aBuildMeta(
     buildType: BuildType = BuildType.DEBUG,
     isDebuggable: Boolean = true,
     applicationName: String = "",
+    productionApplicationName: String = applicationName,
+    desktopApplicationName: String = applicationName,
     applicationId: String = "",
     lowPrivacyLoggingEnabled: Boolean = true,
     versionName: String = "",
@@ -32,15 +34,17 @@ fun aBuildMeta(
     flavorDescription: String = "",
     flavorShortDescription: String = "",
 ) = BuildMeta(
-    buildType,
-    isDebuggable,
-    applicationName,
-    applicationId,
-    lowPrivacyLoggingEnabled,
-    versionName,
-    versionCode,
-    gitRevision,
-    gitBranchName,
-    flavorDescription,
-    flavorShortDescription
+    buildType = buildType,
+    isDebuggable = isDebuggable,
+    applicationName = applicationName,
+    productionApplicationName = productionApplicationName,
+    desktopApplicationName = desktopApplicationName,
+    applicationId = applicationId,
+    lowPrivacyLoggingEnabled = lowPrivacyLoggingEnabled,
+    versionName = versionName,
+    versionCode = versionCode,
+    gitRevision = gitRevision,
+    gitBranchName = gitBranchName,
+    flavorDescription = flavorDescription,
+    flavorShortDescription = flavorShortDescription
 )
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt
index caa5e9f96b..2ac322827c 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt
@@ -637,7 +637,7 @@ internal fun TextComposerSimplePreview() = ElementPreview {
             },
             {
                 ATextComposer(
-                    aRichTextEditorState(initialText = "A message without focus", initialFocus = false),
+                    aRichTextEditorState(initialText = "A message without focus"),
                     voiceMessageState = VoiceMessageState.Idle,
                     composerMode = MessageComposerMode.Normal,
                     enableTextFormatting = true,
@@ -654,7 +654,7 @@ internal fun TextComposerSimplePreview() = ElementPreview {
 internal fun TextComposerFormattingPreview() = ElementPreview {
     PreviewColumn(items = persistentListOf({
         ATextComposer(
-            aRichTextEditorState(initialText = "", initialFocus = false),
+            aRichTextEditorState(),
             voiceMessageState = VoiceMessageState.Idle,
             showTextFormatting = true,
             composerMode = MessageComposerMode.Normal,
@@ -664,7 +664,7 @@ internal fun TextComposerFormattingPreview() = ElementPreview {
         )
     }, {
         ATextComposer(
-            aRichTextEditorState(initialText = "A message", initialFocus = false),
+            aRichTextEditorState(initialText = "A message"),
             voiceMessageState = VoiceMessageState.Idle,
             showTextFormatting = true,
             composerMode = MessageComposerMode.Normal,
@@ -676,7 +676,6 @@ internal fun TextComposerFormattingPreview() = ElementPreview {
         ATextComposer(
             aRichTextEditorState(
                 initialText = "A message\nWith several lines\nTo preview larger textfields and long lines with overflow",
-                initialFocus = false
             ),
             voiceMessageState = VoiceMessageState.Idle,
             showTextFormatting = true,
@@ -710,7 +709,7 @@ internal fun TextComposerReplyPreview() = ElementPreview {
         items = persistentListOf(
             {
                 ATextComposer(
-                    aRichTextEditorState(""),
+                    aRichTextEditorState(),
                     voiceMessageState = VoiceMessageState.Idle,
                     composerMode = MessageComposerMode.Reply(
                         isThreaded = false,
@@ -728,7 +727,7 @@ internal fun TextComposerReplyPreview() = ElementPreview {
             },
             {
                 ATextComposer(
-                    RichTextEditorState(""),
+                    aRichTextEditorState(),
                     voiceMessageState = VoiceMessageState.Idle,
                     composerMode = MessageComposerMode.Reply(
                         isThreaded = true,
@@ -839,7 +838,7 @@ internal fun TextComposerVoicePreview() = ElementPreview {
     fun VoicePreview(
         voiceMessageState: VoiceMessageState
     ) = ATextComposer(
-        RichTextEditorState("", initialFocus = true),
+        aRichTextEditorState(initialFocus = true),
         voiceMessageState = voiceMessageState,
         composerMode = MessageComposerMode.Normal,
         enableTextFormatting = true,
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/TextFormatting.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/TextFormatting.kt
index 670bb96049..7662828a14 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/TextFormatting.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/TextFormatting.kt
@@ -35,6 +35,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.textcomposer.R
 import io.element.android.libraries.textcomposer.TextComposerLinkDialog
+import io.element.android.libraries.textcomposer.aRichTextEditorState
 import io.element.android.wysiwyg.compose.RichTextEditorState
 import io.element.android.wysiwyg.view.models.InlineFormat
 import io.element.android.wysiwyg.view.models.LinkAction
@@ -209,5 +210,5 @@ private fun ActionState?.toButtonState(): FormattingOptionState =
 @PreviewsDayNight
 @Composable
 internal fun TextFormattingPreview() = ElementPreview {
-    TextFormatting(state = RichTextEditorState())
+    TextFormatting(state = aRichTextEditorState())
 }
diff --git a/libraries/ui-strings/src/main/res/values-be/translations.xml b/libraries/ui-strings/src/main/res/values-be/translations.xml
index 659f71e754..31ce0e9ffe 100644
--- a/libraries/ui-strings/src/main/res/values-be/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-be/translations.xml
@@ -192,7 +192,7 @@
   <string name="common_saved_changes">"Захаваныя змены"</string>
   <string name="common_saving">"Захаванне"</string>
   <string name="common_screen_lock">"Блакіроўка экрана"</string>
-  <string name="common_search_for_someone">"Шукаць карыстальніка"</string>
+  <string name="common_search_for_someone">"Шукаць кагосьці"</string>
   <string name="common_search_results">"Вынікі пошуку"</string>
   <string name="common_security">"Бяспека"</string>
   <string name="common_seen_by">"Прагледжана"</string>
@@ -249,6 +249,12 @@
   <string name="invite_friends_text">"Гэй, пагавары са мной у %1$s: %2$s"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
   <string name="preference_rageshake">"Паведаміць аб памылцы з дапамогай Rageshake"</string>
+  <string name="screen_join_room_join_action">"Далучыцца да пакоя"</string>
+  <string name="screen_join_room_knock_action">"Націсніце, каб далучыцца"</string>
+  <string name="screen_join_room_subtitle_knock">"Націсніце кнопку ніжэй, і адміністратар пакоя атрымае апавяшчэнне. Вы зможаце далучыцца да размовы пасля зацвярджэння."</string>
+  <string name="screen_join_room_subtitle_no_preview">"Вы павінны быць удзельнікам гэтага пакоя каб прагледзець гісторыю паведамленняў."</string>
+  <string name="screen_join_room_title_knock">"Вы хочаце далучыцца да гэтага пакоя?"</string>
+  <string name="screen_join_room_title_no_preview">"Папярэдні прагляд недаступны"</string>
   <string name="screen_media_picker_error_failed_selection">"Не ўдалося выбраць носьбіт, паўтарыце спробу."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Не атрымалася апрацаваць медыяфайл для загрузкі, паспрабуйце яшчэ раз."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Не атрымалася загрузіць медыяфайлы, паспрабуйце яшчэ раз."</string>
diff --git a/libraries/ui-strings/src/main/res/values-de/translations.xml b/libraries/ui-strings/src/main/res/values-de/translations.xml
index b7f24c80c6..9de81a7beb 100644
--- a/libraries/ui-strings/src/main/res/values-de/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-de/translations.xml
@@ -247,6 +247,12 @@
   <string name="invite_friends_text">"Hey, sprich mit mir auf %1$s: %2$s"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
   <string name="preference_rageshake">"Schüttel heftig zum Melden von Fehlern"</string>
+  <string name="screen_join_room_join_action">"Raum beitreten"</string>
+  <string name="screen_join_room_knock_action">"Anklopfen"</string>
+  <string name="screen_join_room_subtitle_knock">"Klopfe an um einen Raumadministrator zu benachrichtigen. Nach der Freigabe kannst du dich an der Unterhaltung beteiligen."</string>
+  <string name="screen_join_room_subtitle_no_preview">"Du musst Mitglied in diesem Raum sein, um den Nachrichtenverlauf zu sehen."</string>
+  <string name="screen_join_room_title_knock">"Willst du diesem Raum beitreten?"</string>
+  <string name="screen_join_room_title_no_preview">"Vorschau nicht verfügbar"</string>
   <string name="screen_media_picker_error_failed_selection">"Medienauswahl fehlgeschlagen, bitte versuche es erneut."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Fehler beim Verarbeiten des hochgeladenen Mediums. Bitte versuche es erneut."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Das Hochladen der Medien ist fehlgeschlagen. Bitte versuche es erneut."</string>
diff --git a/libraries/ui-strings/src/main/res/values-fr/translations.xml b/libraries/ui-strings/src/main/res/values-fr/translations.xml
index 1b9befbc45..037634e46b 100644
--- a/libraries/ui-strings/src/main/res/values-fr/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-fr/translations.xml
@@ -245,6 +245,12 @@
   <string name="invite_friends_text">"Salut, parle-moi sur %1$s : %2$s"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
   <string name="preference_rageshake">"Rageshake pour signaler un problème"</string>
+  <string name="screen_join_room_join_action">"Rejoindre"</string>
+  <string name="screen_join_room_knock_action">"Demander à joindre"</string>
+  <string name="screen_join_room_subtitle_knock">"Cliquez ci-dessous et un administrateur sera prévenu. Une fois votre demande approuvée, pour pourrez rejoindre la discussion."</string>
+  <string name="screen_join_room_subtitle_no_preview">"Vous devez être un membre du salon pour pouvoir lire l’historique des messages."</string>
+  <string name="screen_join_room_title_knock">"Vous souhaitez rejoindre ce salon?"</string>
+  <string name="screen_join_room_title_no_preview">"La prévisualisation n’est pas disponible"</string>
   <string name="screen_media_picker_error_failed_selection">"Échec de la sélection du média, veuillez réessayer."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Échec du traitement des médias à télécharger, veuillez réessayer."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Échec du téléchargement du média, veuillez réessayer."</string>
@@ -253,6 +259,7 @@
   <string name="screen_room_member_details_block_alert_action">"Bloquer"</string>
   <string name="screen_room_member_details_block_alert_description">"Les utilisateurs bloqués ne pourront pas vous envoyer de messages et tous leurs messages seront masqués. Vous pouvez les débloquer à tout moment."</string>
   <string name="screen_room_member_details_block_user">"Bloquer l’utilisateur"</string>
+  <string name="screen_room_member_details_title">"Profil"</string>
   <string name="screen_room_member_details_unblock_alert_action">"Débloquer"</string>
   <string name="screen_room_member_details_unblock_alert_description">"Vous pourrez à nouveau voir tous ses messages."</string>
   <string name="screen_room_member_details_unblock_user">"Débloquer l’utilisateur"</string>
diff --git a/libraries/ui-strings/src/main/res/values-in/translations.xml b/libraries/ui-strings/src/main/res/values-in/translations.xml
index fdbf31da25..4968a05e1f 100644
--- a/libraries/ui-strings/src/main/res/values-in/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-in/translations.xml
@@ -241,6 +241,12 @@
   <string name="invite_friends_text">"Hai, bicaralah dengan saya di %1$s: %2$s"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
   <string name="preference_rageshake">"Rageshake untuk melaporkan kutu"</string>
+  <string name="screen_join_room_join_action">"Gabung dengan ruangan"</string>
+  <string name="screen_join_room_knock_action">"Ketuk untuk bergabung"</string>
+  <string name="screen_join_room_subtitle_knock">"Klik tombol di bawah ini dan administrator kamar akan diberi tahu. Anda akan dapat bergabung dengan percakapan setelah disetujui."</string>
+  <string name="screen_join_room_subtitle_no_preview">"Anda harus menjadi anggota ruangan ini untuk melihat riwayat pesan."</string>
+  <string name="screen_join_room_title_knock">"Ingin bergabung dengan ruangan ini?"</string>
+  <string name="screen_join_room_title_no_preview">"Pratinjau tidak tersedia"</string>
   <string name="screen_media_picker_error_failed_selection">"Gagal memilih media, silakan coba lagi."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Gagal memproses media untuk diunggah, silakan coba lagi."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Gagal mengunggah media, silakan coba lagi."</string>
diff --git a/libraries/ui-strings/src/main/res/values-sk/translations.xml b/libraries/ui-strings/src/main/res/values-sk/translations.xml
index f777ed6b31..591b2ad7b8 100644
--- a/libraries/ui-strings/src/main/res/values-sk/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-sk/translations.xml
@@ -248,6 +248,12 @@
   <string name="invite_friends_text">"Ahoj, porozprávajte sa so mnou na %1$s: %2$s"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
   <string name="preference_rageshake">"Zúrivo potriasť pre nahlásenie chyby"</string>
+  <string name="screen_join_room_join_action">"Pripojiť sa do miestnosti"</string>
+  <string name="screen_join_room_knock_action">"Zaklopaním sa pripojíte"</string>
+  <string name="screen_join_room_subtitle_knock">"Kliknite na tlačidlo nižšie a správca miestnosti bude informovaný. Po schválení sa budete môcť pripojiť ku konverzácii."</string>
+  <string name="screen_join_room_subtitle_no_preview">"Ak chcete zobraziť históriu správ, musíte byť členom tejto miestnosti."</string>
+  <string name="screen_join_room_title_knock">"Chcete sa pripojiť do tejto miestnosti?"</string>
+  <string name="screen_join_room_title_no_preview">"Náhľad nie je k dispozícii"</string>
   <string name="screen_media_picker_error_failed_selection">"Nepodarilo sa vybrať médium, skúste to prosím znova."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Nepodarilo sa spracovať médiá na odoslanie, skúste to prosím znova."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Nepodarilo sa nahrať médiá, skúste to prosím znova."</string>
diff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml
index f19696065a..c927eec7cd 100644
--- a/libraries/ui-strings/src/main/res/values/localazy.xml
+++ b/libraries/ui-strings/src/main/res/values/localazy.xml
@@ -245,6 +245,12 @@
   <string name="invite_friends_text">"Hey, talk to me on %1$s: %2$s"</string>
   <string name="login_initial_device_name_android">"%1$s Android"</string>
   <string name="preference_rageshake">"Rageshake to report bug"</string>
+  <string name="screen_join_room_join_action">"Join room"</string>
+  <string name="screen_join_room_knock_action">"Knock to join"</string>
+  <string name="screen_join_room_subtitle_knock">"Click the button below and a room administrator will be notified. You’ll be able to join the conversation once approved."</string>
+  <string name="screen_join_room_subtitle_no_preview">"You must be a member of this room to view the message history."</string>
+  <string name="screen_join_room_title_knock">"Want to join this room?"</string>
+  <string name="screen_join_room_title_no_preview">"Preview is not available"</string>
   <string name="screen_media_picker_error_failed_selection">"Failed selecting media, please try again."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Failed processing media to upload, please try again."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Failed uploading media, please try again."</string>
diff --git a/plugins/src/main/kotlin/Versions.kt b/plugins/src/main/kotlin/Versions.kt
index d1c61e4285..5489393e86 100644
--- a/plugins/src/main/kotlin/Versions.kt
+++ b/plugins/src/main/kotlin/Versions.kt
@@ -56,7 +56,7 @@ private const val versionMinor = 4
 // Note: even values are reserved for regular release, odd values for hotfix release.
 // When creating a hotfix, you should decrease the value, since the current value
 // is the value for the next regular release.
-private const val versionPatch = 8
+private const val versionPatch = 9
 
 object Versions {
     val versionCode = 4_000_000 + versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch
diff --git a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt
index 06e8fb02f4..9c09d0bc98 100644
--- a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt
+++ b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt
@@ -33,6 +33,8 @@ object Singleton {
         isDebuggable = true,
         buildType = BuildType.DEBUG,
         applicationName = "EAX-Minimal",
+        productionApplicationName = "EAX-Minimal",
+        desktopApplicationName = "EAX-Minimal-Desktop",
         applicationId = "io.element.android.samples.minimal",
         lowPrivacyLoggingEnabled = false,
         versionName = "0.1.0",
diff --git a/screenshots/html/script.js b/screenshots/html/script.js
index 763d4b1abf..5e4fb18133 100644
--- a/screenshots/html/script.js
+++ b/screenshots/html/script.js
@@ -18,6 +18,7 @@ import { screenshots } from './data.js';
 const URL_PARAM_LANGUAGES = "l";
 const URL_PARAM_IMAGE_WIDTH = "w";
 const URL_PARAM_ALL_SCREENSHOTS = "a";
+const URL_PARAM_IF_MODIFIED_AFTER = "d";
 
 // Get the base url of the current page
 const baseUrl = window.location.href.split('/').slice(0, -1).join('/');
@@ -53,6 +54,8 @@ if (width) {
 }
 // Read showAllScreenshots from the url params
 let showAllScreenshots = urlParams.get(URL_PARAM_ALL_SCREENSHOTS) === 1;
+// Read the minimum date of modification from the url params
+let minModifiedDayTime = urlParams.get(URL_PARAM_IF_MODIFIED_AFTER);
 
 function updatePageUrl() {
     // Update the URL displayed in the browser without loading again the page
@@ -74,6 +77,11 @@ function updatePageUrl() {
     } else {
         queryParams.delete(URL_PARAM_ALL_SCREENSHOTS);
     }
+    if (minModifiedDayTime > 0) {
+        queryParams.set(URL_PARAM_IF_MODIFIED_AFTER, minModifiedDayTime);
+    } else {
+        queryParams.delete(URL_PARAM_IF_MODIFIED_AFTER);
+    }
     // Replace the current URL with the new one, including the fragment
     history.replaceState(null, '', `${window.location.pathname}?${queryParams}${window.location.hash}`);
 }
@@ -141,6 +149,30 @@ function addForm() {
   };
   label2.appendChild(input2);
   form.appendChild(label2);
+  // Add a date picker to input the minimum date of modification
+  const label3 = document.createElement('label');
+  label3.textContent = 'If modified since:';
+  form.appendChild(label3);
+  const dateInput = document.createElement('input');
+  dateInput.type = 'date';
+  if (minModifiedDayTime > 0) {
+    dateInput.value = new Date(minModifiedDayTime * 86400000).toISOString().split('T')[0];
+  }
+  dateInput.onchange = (e) => {
+      if (e.target.value === "") {
+          minModifiedDayTime = 0;
+      } else {
+          minModifiedDayTime = new Date(e.target.value).getTime() / 86400000;
+      }
+      updatePageUrl();
+      addTable();
+  };
+  form.appendChild(dateInput);
+  // Add a span with id result to display the number of lines
+  const lines = document.createElement('span');
+  lines.id = 'lines';
+  lines.textContent = "...";
+  form.appendChild(lines);
   document.getElementById('form_container').appendChild(form);
 }
 
@@ -159,17 +191,27 @@ function createMissingImageElement() {
     return text;
 }
 
-function createImageElement(fullFile) {
+function convertToHumanReadableDate(modifiedDayTime) {
+    var date = new Date(modifiedDayTime * 86400000);
+    return date.toLocaleDateString();
+}
+
+function createImageElement(fullFile, modifiedDayTime) {
     const img = document.createElement('img');
     img.className = "screenshot";
     img.src = `${baseUrl}/${fullFile}`;
-    img.title = fullFile;
+    if(modifiedDayTime > 0) {
+        img.title = fullFile + "\n\nModified on " + convertToHumanReadableDate(modifiedDayTime);
+    } else {
+        img.title = fullFile;
+    }
     img.alt = "Missing image";
     img.width = imageWidth;
     return img;
 }
 
 function addTable() {
+  var linesCounter = 0;
   // Remove any previous table
   document.getElementById('screenshots_container').innerHTML = '';
   // screenshots contains a table of screenshots, lets convert to an html table
@@ -209,30 +251,31 @@ function addTable() {
       const td = document.createElement('td');
       if (languageIndex == 0) {
         // English file
-        td.appendChild(createImageElement(`${englishBasePath}/${englishFile}.png`));
+        td.appendChild(createImageElement(`${englishBasePath}/${englishFile}.png`, 0));
       } else if (languageIndex == 1) {
         // Dark English file
         if (screenshots[screenshotIndex][1].length > 0) {
           hasTranslatedFiles = true;
-          td.appendChild(createImageElement(`${englishBasePath}/${screenshots[screenshotIndex][1]}.png`));
+          td.appendChild(createImageElement(`${englishBasePath}/${screenshots[screenshotIndex][1]}.png`, 0));
         } else {
           td.appendChild(createMissingImageElement());
         }
       } else {
-        let hasFile = screenshots[screenshotIndex][languageIndex];
-        if (hasFile === 0) {
+        let modifiedDayTime = screenshots[screenshotIndex][languageIndex];
+        if (modifiedDayTime === 0) {
           td.appendChild(createMissingImageElement());
-        } else {
+        } else if(modifiedDayTime >= minModifiedDayTime) {
           hasTranslatedFiles = true;
           // Foreign file is the same as the english file, replacing the language
           const foreignFile = englishFile.replace("en]", `${dataLanguages[languageIndex]}]`).replace("_S_", "_T_")
           const fullForeignFile = `${dataLanguages[languageIndex]}/${foreignFile}.png`;
-          td.appendChild(createImageElement(fullForeignFile));
+          td.appendChild(createImageElement(fullForeignFile, modifiedDayTime));
         }
       }
       tr.appendChild(td);
     }
     if (showAllScreenshots || hasTranslatedFiles) {
+      linesCounter++;
       // Add a header for row, if different from previous
       if (niceName != currentHeaderValue) {
         currentHeaderValue = niceName;
@@ -255,6 +298,8 @@ function addTable() {
 
   // Add the table to the div with id screenshots_container
   document.getElementById('screenshots_container').appendChild(table);
+  // Update the number of lines
+  document.getElementById('lines').textContent = `${linesCounter} lines`;
 }
 
 addForm();
diff --git a/tools/localazy/checkForbiddenTerms.py b/tools/localazy/checkForbiddenTerms.py
new file mode 100755
index 0000000000..e642f32c54
--- /dev/null
+++ b/tools/localazy/checkForbiddenTerms.py
@@ -0,0 +1,62 @@
+#!/usr/bin/env python3
+
+import sys
+from xml.dom import minidom
+
+file = sys.argv[1]
+
+# Dict of forbidden terms, with exceptions for some String name
+# Keys are the terms, values are the exceptions.
+forbiddenTerms = {
+    "Element": [
+        # Those 2 strings are only used in debug version
+        "screen_advanced_settings_element_call_base_url",
+        "screen_advanced_settings_element_call_base_url_description",
+        # only used for element.io homeserver, so it's fine
+        "screen_server_confirmation_message_login_element_dot_io",
+        # "Be in your element", will probably be changed on the forks, so we can ignore.
+        "screen_onboarding_welcome_title",
+    ]
+}
+
+content = minidom.parse(file)
+
+errors = []
+
+### Strings
+for elem in content.getElementsByTagName('string'):
+    name = elem.attributes['name'].value
+    # Continue if value is empty
+    child = elem.firstChild
+    if child is None:
+        # Should not happen
+        continue
+    value = child.nodeValue
+    # If value contains a forbidden term, add the error to errors
+    for (term, exceptions) in forbiddenTerms.items():
+        if term in value and name not in exceptions:
+            errors.append('Forbidden term "' + term + '" in string: "' + name + '": ' + value)
+
+### Plurals
+for elem in content.getElementsByTagName('plurals'):
+    name = elem.attributes['name'].value
+    for it in elem.childNodes:
+        if it.nodeType != it.ELEMENT_NODE:
+            continue
+        # Continue if value is empty
+        child = it.firstChild
+        if child is None:
+            # Should not happen
+            continue
+        value = child.nodeValue
+        # If value contains a forbidden term, add the error to errors
+        for (term, exceptions) in forbiddenTerms.items():
+            if term in value and name not in exceptions:
+                errors.append('Forbidden term "' + term + '" in plural: "' + name + '": ' + value)
+
+# If errors is not empty print the report
+if errors:
+    print('Error(s) in file ' + file + ":", file=sys.stderr)
+    for error in errors:
+        print(" - " + error, file=sys.stderr)
+    sys.exit(1)
diff --git a/tools/localazy/downloadStrings.sh b/tools/localazy/downloadStrings.sh
index 43e916a8a4..a447a5c16f 100755
--- a/tools/localazy/downloadStrings.sh
+++ b/tools/localazy/downloadStrings.sh
@@ -40,6 +40,9 @@ fi
 echo "Importing the strings..."
 localazy download --config ./tools/localazy/localazy.json
 
+echo "Removing the generated config"
+rm ./tools/localazy/localazy.json
+
 echo "Formatting the resources files..."
 find . -name 'localazy.xml' -exec ./tools/localazy/formatXmlResourcesFile.py {} \;
 if [[ $allFiles == 1 ]]; then
@@ -54,7 +57,10 @@ echo "Deleting all the folders values-id..."
 find . -type d -name 'values-id' -exec rm -rf {} 2> /dev/null \;
 set -e
 
-echo "Removing the generated config"
-rm ./tools/localazy/localazy.json
+echo "Checking forbidden terms..."
+find . -name 'localazy.xml' -exec ./tools/localazy/checkForbiddenTerms.py {} \;
+if [[ $allFiles == 1 ]]; then
+  find . -name 'translations.xml' -exec ./tools/localazy/checkForbiddenTerms.py {} \;
+fi
 
 echo "Success!"
diff --git a/tools/test/generateAllScreenshots.py b/tools/test/generateAllScreenshots.py
index 89050f88e9..e92f69b0fd 100755
--- a/tools/test/generateAllScreenshots.py
+++ b/tools/test/generateAllScreenshots.py
@@ -103,7 +103,7 @@ def detectRecordedLanguages():
 def computeDarkFileName(lightFileName):
     if "-Day_0" in lightFileName:
         return lightFileName.replace("-Day_0", "-Night_1")
-    match = re.match("(.*)-Day-(\d+)_(\d+)(.*)", lightFileName, flags=re.ASCII)
+    match = re.match("(.*)-Day-(\\d+)_(\\d+)(.*)", lightFileName, flags=re.ASCII)
     if match:
         return match.group(1) + "-Night-" + match.group(2) + "_" + str((int(match.group(3)) + 1)) + match.group(4)
     return ""
@@ -132,7 +132,10 @@ def generateJavascriptFile():
             simpleFile = file[:3] + "T" + file[4:-7] + l + file[-5:-4]
             translatedFile = "./screenshots/" + l + "/" + simpleFile + ".png"
             if os.path.exists(translatedFile):
-                dataForFile.append(1)
+                # Get the last modified date of the file in seconds and round to days
+                date = os.popen("git log -1 --format=%ct -- \"" + translatedFile + "\"").read().strip()
+                dateDay = int(date) // 86400
+                dataForFile.append(dateDay)
             else:
                 dataForFile.append(0)
         data.append(dataForFile)
diff --git a/upstream_infra/CHANGES.md b/upstream_infra/CHANGES.md
index cdb2e4006e..72c9a9cf65 100644
--- a/upstream_infra/CHANGES.md
+++ b/upstream_infra/CHANGES.md
@@ -1,3 +1,8 @@
+Changes in Element X v0.4.9 (2024-04-12)
+========================================
+
+- Synchronize Localazy Strings.
+
 Changes in Element X v0.4.8 (2024-04-10)
 ========================================
 
diff --git a/upstream_infra/CONTRIBUTING.md b/upstream_infra/CONTRIBUTING.md
index c65cd25105..5c541bc199 100644
--- a/upstream_infra/CONTRIBUTING.md
+++ b/upstream_infra/CONTRIBUTING.md
@@ -9,6 +9,7 @@
 * [Strings](#strings)
   * [I want to add new strings to the project](#i-want-to-add-new-strings-to-the-project)
   * [I want to help translating Element](#i-want-to-help-translating-element)
+  * [Element X Android Gallery](#element-x-android-gallery)
 * [I want to submit a PR to fix an issue](#i-want-to-submit-a-pr-to-fix-an-issue)
   * [Kotlin](#kotlin)
   * [Changelog](#changelog)
@@ -69,6 +70,14 @@ To help translating, please go to [https://localazy.com/p/element](https://local
 
 More information can be found [in this README.md](./tools/localazy/README.md).
 
+Once a language is sufficiently translated, it will be added to the app. The core team will decide when a language is sufficiently translated.
+
+### Element X Android Gallery
+
+Once added to Localazy, translations can be checked screen per screen using our tool Element X Android Gallery, available at https://element-hq.github.io/element-x-android/.
+
+Localazy syncs occur every Monday and the screenshots on this page are generated every Tuesday, so you'll have to wait to see your change appearing on Element X Android Gallery.
+
 ## I want to submit a PR to fix an issue
 
 Please have a look in the [dedicated documentation](./docs/pull_request.md) about pull request.
diff --git a/upstream_infra/README.md b/upstream_infra/README.md
index 77d76adc3e..0029966aa7 100644
--- a/upstream_infra/README.md
+++ b/upstream_infra/README.md
@@ -19,6 +19,7 @@ Learn more about why we are building Element X in our blog post: [https://elemen
 <!--- TOC -->
 
 * [Screenshots](#screenshots)
+* [Translations](#translations)
 * [Rust SDK](#rust-sdk)
 * [Status](#status)
 * [Contributing](#contributing)
@@ -50,6 +51,16 @@ adb shell am broadcast -a com.android.systemui.demo -e command exit
 |-|-|-|-|
 |<img src=./docs/images-lfs/screen_1_dark.png width=280 />|<img src=./docs/images-lfs/screen_2_dark.png width=280 />|<img src=./docs/images-lfs/screen_3_dark.png width=280 />|<img src=./docs/images-lfs/screen_4_dark.png width=280 />|
 
+## Translations
+
+Element X Android supports many languages. You can help us to translate the app in your language by joining our [Localazy project](https://localazy.com/p/element). You can also help us to improve the existing translations.
+
+Note that for now, we keep control on the French and German translations.
+
+Translations can be checked screen per screen using our tool Element X Android Gallery, available at https://element-hq.github.io/element-x-android/. Note that this page is updated every Tuesday. 
+
+More instructions about translating the application can be found at [CONTRIBUTING.md](CONTRIBUTING.md#strings).
+
 ## Rust SDK
 
 Element X leverages the [Matrix Rust SDK](https://github.com/matrix-org/matrix-rust-sdk) through an FFI layer that the final client can directly import and use.
diff --git a/upstream_infra/fastlane/metadata/android/en-US/changelogs/40004090.txt b/upstream_infra/fastlane/metadata/android/en-US/changelogs/40004090.txt
new file mode 100644
index 0000000000..06f69e53ea
--- /dev/null
+++ b/upstream_infra/fastlane/metadata/android/en-US/changelogs/40004090.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Enable room moderation feature.
+Full changelog: https://github.com/element-hq/element-x-android/releases