diff --git a/features/analytics/impl/src/main/res/values-de/translations.xml b/features/analytics/impl/src/main/res/values-de/translations.xml
index 44890927a4..7ef2ff2500 100644
--- a/features/analytics/impl/src/main/res/values-de/translations.xml
+++ b/features/analytics/impl/src/main/res/values-de/translations.xml
@@ -5,6 +5,6 @@
   <string name="screen_analytics_prompt_read_terms">"Du kannst alle unsere Nutzerbedingungen %1$s lesen."</string>
   <string name="screen_analytics_prompt_read_terms_content_link">"hier"</string>
   <string name="screen_analytics_prompt_settings">"Du kannst dies jederzeit deaktivieren"</string>
-  <string name="screen_analytics_prompt_third_party_sharing">"Wir geben "<b>"keine"</b>" Informationen an Dritte weiter"</string>
+  <string name="screen_analytics_prompt_third_party_sharing">"Wir geben deine Daten nicht an Dritte weiter"</string>
   <string name="screen_analytics_prompt_title">"Hilf uns, %1$s zu verbessern"</string>
 </resources>
diff --git a/features/ftue/impl/src/main/res/values-cs/translations.xml b/features/ftue/impl/src/main/res/values-cs/translations.xml
new file mode 100644
index 0000000000..38bbf4dacb
--- /dev/null
+++ b/features/ftue/impl/src/main/res/values-cs/translations.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_welcome_bullet_1">"Hovory, hlasování, vyhledávání a další budou přidány koncem tohoto roku."</string>
+  <string name="screen_welcome_bullet_2">"Historie zpráv šifrovaných místností nebude v této aktualizaci k dispozici."</string>
+  <string name="screen_welcome_bullet_3">"Rádi bychom se od vás dozvěděli, co si o tom myslíte, dejte nám vědět prostřednictvím stránky s nastavením."</string>
+  <string name="screen_welcome_button">"Jdeme na to!"</string>
+  <string name="screen_welcome_subtitle">"Zde je to, co potřebujete vědět:"</string>
+  <string name="screen_welcome_title">"Vítá vás %1$s!"</string>
+</resources>
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 0f2efc1c57..d0ebbc31e7 100644
--- a/features/ftue/impl/src/main/res/values-de/translations.xml
+++ b/features/ftue/impl/src/main/res/values-de/translations.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_welcome_bullet_1">"Anrufe, Standortfreigabe, Suche und mehr werden später in diesem Jahr hinzugefügt."</string>
+  <string name="screen_welcome_bullet_1">"Anrufe, Umfragen, Suche und mehr werden später in diesem Jahr 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, wenn du uns über die Einstellungsseite deine Meinung mitteilst."</string>
   <string name="screen_welcome_button">"Los geht\'s!"</string>
diff --git a/features/login/impl/src/main/res/values-cs/translations.xml b/features/login/impl/src/main/res/values-cs/translations.xml
index 02581401bf..5d697bf34a 100644
--- a/features/login/impl/src/main/res/values-cs/translations.xml
+++ b/features/login/impl/src/main/res/values-cs/translations.xml
@@ -9,7 +9,7 @@
   <string name="screen_account_provider_signin_title">"Chystáte se přihlásit do %s"</string>
   <string name="screen_account_provider_signup_subtitle">"Zde budou uloženy vaše konverzace - podobně jako u poskytovatele e-mailových služeb uchováváte své e-maily."</string>
   <string name="screen_account_provider_signup_title">"Chystáte se vytvořit účet na %s"</string>
-  <string name="screen_change_account_provider_matrix_org_subtitle">"Matrix.org je otevřená síť pro bezpečnou, decentralizovanou komunikaci."</string>
+  <string name="screen_change_account_provider_matrix_org_subtitle">"Matrix.org je velký bezplatný server ve veřejné síti Matrix pro bezpečnou decentralizovanou komunikaci, který provozuje nadace Matrix.org."</string>
   <string name="screen_change_account_provider_other">"Jiný"</string>
   <string name="screen_change_account_provider_subtitle">"Použijte jiného poskytovatele účtu, například vlastní soukromý server nebo pracovní účet."</string>
   <string name="screen_change_account_provider_title">"Změnit poskytovatele účtu"</string>
diff --git a/features/login/impl/src/main/res/values-de/translations.xml b/features/login/impl/src/main/res/values-de/translations.xml
index 099d00e83b..7464e17f8d 100644
--- a/features/login/impl/src/main/res/values-de/translations.xml
+++ b/features/login/impl/src/main/res/values-de/translations.xml
@@ -9,7 +9,7 @@
   <string name="screen_account_provider_signin_title">"Du bist dabei dich bei %s anzumelden"</string>
   <string name="screen_account_provider_signup_subtitle">"Hier werden deine Konversationen stattfinden — genauso wie du einen E-Mail-Anbieter verwenden würdest, um deine E-Mails aufzubewahren."</string>
   <string name="screen_account_provider_signup_title">"Du bist dabei ein Konto auf %s zu erstellen"</string>
-  <string name="screen_change_account_provider_matrix_org_subtitle">"Matrix.org ist ein offenes Netzwerk für sichere, dezentralisierte Kommunikation."</string>
+  <string name="screen_change_account_provider_matrix_org_subtitle">"Matrix.org ist ein großer, kostenloser Server im öffentlichen Matrix-Netzwerk für sichere, dezentrale Kommunikation, der von der Matrix.org Foundation betrieben wird."</string>
   <string name="screen_change_account_provider_other">"Andere"</string>
   <string name="screen_change_account_provider_subtitle">"Verwende einen anderen Kontoanbieter, z. B. deinen eigenen privaten Server oder ein Arbeitskonto."</string>
   <string name="screen_change_account_provider_title">"Kontoanbieter ändern"</string>
diff --git a/features/login/impl/src/main/res/values-fr/translations.xml b/features/login/impl/src/main/res/values-fr/translations.xml
index 77d171bdf6..74f23cc5c9 100644
--- a/features/login/impl/src/main/res/values-fr/translations.xml
+++ b/features/login/impl/src/main/res/values-fr/translations.xml
@@ -9,7 +9,6 @@
   <string name="screen_account_provider_signin_title">"Vous êtes sur le point de vous connecter à %s"</string>
   <string name="screen_account_provider_signup_subtitle">"C\'est ici que vos conversations seront stockées - tout comme vous utiliseriez un fournisseur de messagerie pour conserver vos e-mails."</string>
   <string name="screen_account_provider_signup_title">"Vous êtes sur le point de créer un compte sur %s"</string>
-  <string name="screen_change_account_provider_matrix_org_subtitle">"Matrix.org est un réseau ouvert pour des communications sécurisées et décentralisées."</string>
   <string name="screen_change_account_provider_other">"Autre"</string>
   <string name="screen_change_account_provider_subtitle">"Utilisez un autre fournisseur de compte, tel que votre propre serveur ou un compte professionnel."</string>
   <string name="screen_change_account_provider_title">"Changer de fournisseur"</string>
diff --git a/features/login/impl/src/main/res/values-ro/translations.xml b/features/login/impl/src/main/res/values-ro/translations.xml
index 46596f2b95..0c58c45d03 100644
--- a/features/login/impl/src/main/res/values-ro/translations.xml
+++ b/features/login/impl/src/main/res/values-ro/translations.xml
@@ -9,7 +9,6 @@
   <string name="screen_account_provider_signin_title">"Sunteți pe cale să vă conectați la %s"</string>
   <string name="screen_account_provider_signup_subtitle">"Aici vor trăi conversațiile - la fel cum ați folosi un furnizor de e-mail pentru a vă păstra e-mailurile."</string>
   <string name="screen_account_provider_signup_title">"Sunteți pe cale să creați un cont pe %s"</string>
-  <string name="screen_change_account_provider_matrix_org_subtitle">"Matrix.org este o rețea deschisă pentru o comunicare sigură și descentralizată."</string>
   <string name="screen_change_account_provider_other">"Altul"</string>
   <string name="screen_change_account_provider_subtitle">"Utilizați un alt furnizor de cont, cum ar fi propriul server privat sau un cont de serviciu."</string>
   <string name="screen_change_account_provider_title">"Schimbați furnizorul contului"</string>
diff --git a/features/login/impl/src/main/res/values-ru/translations.xml b/features/login/impl/src/main/res/values-ru/translations.xml
index aa8b459f59..242ec4bb2c 100644
--- a/features/login/impl/src/main/res/values-ru/translations.xml
+++ b/features/login/impl/src/main/res/values-ru/translations.xml
@@ -9,7 +9,6 @@
   <string name="screen_account_provider_signin_title">"Вы собираетесь войти в %s"</string>
   <string name="screen_account_provider_signup_subtitle">"Здесь будут храниться ваши разговоры - точно так же, как вы используете почтового провайдера для хранения своих писем."</string>
   <string name="screen_account_provider_signup_title">"Вы собираетесь создать учетную запись на %s"</string>
-  <string name="screen_change_account_provider_matrix_org_subtitle">"Matrix.org — это открытая сеть для безопасной децентрализованной связи."</string>
   <string name="screen_change_account_provider_other">"Другое"</string>
   <string name="screen_change_account_provider_subtitle">"Используйте другого поставщика учетных записей, например, собственный частный сервер или рабочую учетную запись."</string>
   <string name="screen_change_account_provider_title">"Сменить поставщика учетной записи"</string>
diff --git a/features/login/impl/src/main/res/values-sk/translations.xml b/features/login/impl/src/main/res/values-sk/translations.xml
index a48fed0fd5..14a5407055 100644
--- a/features/login/impl/src/main/res/values-sk/translations.xml
+++ b/features/login/impl/src/main/res/values-sk/translations.xml
@@ -9,7 +9,6 @@
   <string name="screen_account_provider_signin_title">"Chystáte sa prihlásiť do %s"</string>
   <string name="screen_account_provider_signup_subtitle">"Tu budú žiť vaše konverzácie — podobne ako používate poskytovateľa e-mailových služieb na uchovávanie e-mailov."</string>
   <string name="screen_account_provider_signup_title">"Chystáte sa vytvoriť účet na %s"</string>
-  <string name="screen_change_account_provider_matrix_org_subtitle">"Matrix.org je otvorená sieť pre bezpečnú a decentralizovanú komunikáciu."</string>
   <string name="screen_change_account_provider_other">"Iný"</string>
   <string name="screen_change_account_provider_subtitle">"Použite iného poskytovateľa účtu, ako napríklad vlastný súkromný server alebo pracovný účet."</string>
   <string name="screen_change_account_provider_title">"Zmeniť poskytovateľa účtu"</string>
diff --git a/features/login/impl/src/main/res/values/localazy.xml b/features/login/impl/src/main/res/values/localazy.xml
index 236de68212..e09f4fe693 100644
--- a/features/login/impl/src/main/res/values/localazy.xml
+++ b/features/login/impl/src/main/res/values/localazy.xml
@@ -9,7 +9,7 @@
   <string name="screen_account_provider_signin_title">"You’re about to sign in to %s"</string>
   <string name="screen_account_provider_signup_subtitle">"This is where your conversations will live — just like you would use an email provider to keep your emails."</string>
   <string name="screen_account_provider_signup_title">"You’re about to create an account on %s"</string>
-  <string name="screen_change_account_provider_matrix_org_subtitle">"Matrix.org is an open network for secure, decentralized communication."</string>
+  <string name="screen_change_account_provider_matrix_org_subtitle">"Matrix.org is a large, free server on the public Matrix network for secure, decentralised communication, run by the Matrix.org Foundation."</string>
   <string name="screen_change_account_provider_other">"Other"</string>
   <string name="screen_change_account_provider_subtitle">"Use a different account provider, such as your own private server or a work account."</string>
   <string name="screen_change_account_provider_title">"Change account provider"</string>
diff --git a/features/messages/impl/src/main/res/values-cs/translations.xml b/features/messages/impl/src/main/res/values-cs/translations.xml
index 8da8200bd5..7ca02ef21c 100644
--- a/features/messages/impl/src/main/res/values-cs/translations.xml
+++ b/features/messages/impl/src/main/res/values-cs/translations.xml
@@ -5,19 +5,43 @@
     <item quantity="few">"%1$d změny místnosti"</item>
     <item quantity="other">"%1$d změn místnosti"</item>
   </plurals>
+  <plurals name="screen_room_timeline_more_reactions">
+    <item quantity="one">"%1$d další"</item>
+    <item quantity="few">"%1$d další"</item>
+    <item quantity="other">"%1$d dalších"</item>
+  </plurals>
   <string name="screen_room_attachment_source_camera">"Fotoaparát"</string>
   <string name="screen_room_attachment_source_camera_photo">"Vyfotit"</string>
   <string name="screen_room_attachment_source_camera_video">"Natočit video"</string>
   <string name="screen_room_attachment_source_files">"Příloha"</string>
   <string name="screen_room_attachment_source_gallery">"Knihovna fotografií a videí"</string>
   <string name="screen_room_attachment_source_location">"Poloha"</string>
+  <string name="screen_room_attachment_source_poll">"Hlasování"</string>
+  <string name="screen_room_encrypted_history_banner">"Historie zpráv je momentálně v této místnosti nedostupná"</string>
   <string name="screen_room_error_failed_retrieving_user_details">"Nepodařilo se načíst údaje o uživateli"</string>
   <string name="screen_room_invite_again_alert_message">"Chtěli byste je pozvat zpět?"</string>
   <string name="screen_room_invite_again_alert_title">"V tomto chatu jste sami"</string>
   <string name="screen_room_message_copied">"Zpráva zkopírována"</string>
   <string name="screen_room_no_permission_to_post">"Nemáte oprávnění zveřejňovat příspěvky v této místnosti"</string>
+  <string name="screen_room_notification_settings_allow_custom">"Povolit vlastní nastavení"</string>
+  <string name="screen_room_notification_settings_allow_custom_footnote">"Zapnutím této funkce přepíšete výchozí nastavení"</string>
+  <string name="screen_room_notification_settings_custom_settings_title">"Upozornit mě v tomto chatu na"</string>
+  <string name="screen_room_notification_settings_default_setting_footnote">"Můžete změnit ve vašem %1$s."</string>
+  <string name="screen_room_notification_settings_default_setting_footnote_content_link">"globální nastavení"</string>
+  <string name="screen_room_notification_settings_default_setting_title">"Výchozí nastavení"</string>
+  <string name="screen_room_notification_settings_edit_remove_setting">"Odebrat vlastní nastavení"</string>
+  <string name="screen_room_notification_settings_error_loading_settings">"Při načítání nastavení oznámení došlo k chybě."</string>
+  <string name="screen_room_notification_settings_error_restoring_default">"Obnovení výchozího režimu se nezdařilo, zkuste to prosím znovu."</string>
+  <string name="screen_room_notification_settings_error_setting_mode">"Nastavení režimu se nezdařilo, zkuste to prosím znovu."</string>
+  <string name="screen_room_notification_settings_mode_all_messages">"Všechny zprávy"</string>
+  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Pouze zmínky a klíčová slova"</string>
+  <string name="screen_room_notification_settings_room_custom_settings_title">"V této místnosti mě upozornit na"</string>
+  <string name="screen_room_reactions_show_less">"Zobrazit méně"</string>
+  <string name="screen_room_reactions_show_more">"Zobrazit více"</string>
   <string name="screen_room_retry_send_menu_send_again_action">"Odeslat znovu"</string>
   <string name="screen_room_retry_send_menu_title">"Vaši zprávu se nepodařilo odeslat"</string>
+  <string name="screen_room_timeline_add_reaction">"Přidat emoji"</string>
+  <string name="screen_room_timeline_less_reactions">"Zobrazit méně"</string>
   <string name="screen_room_error_failed_processing_media">"Nahrání média se nezdařilo, zkuste to prosím znovu."</string>
   <string name="screen_room_retry_send_menu_remove_action">"Odstranit"</string>
 </resources>
diff --git a/features/messages/impl/src/main/res/values-de/translations.xml b/features/messages/impl/src/main/res/values-de/translations.xml
index 84c903844e..482065c887 100644
--- a/features/messages/impl/src/main/res/values-de/translations.xml
+++ b/features/messages/impl/src/main/res/values-de/translations.xml
@@ -10,16 +10,32 @@
   <string name="screen_room_attachment_source_files">"Anhang"</string>
   <string name="screen_room_attachment_source_gallery">"Foto- &amp; Video-Bibliothek"</string>
   <string name="screen_room_attachment_source_location">"Standort"</string>
+  <string name="screen_room_attachment_source_poll">"Umfrage"</string>
   <string name="screen_room_encrypted_history_banner">"Der Nachrichtenverlauf ist in diesem Raum derzeit nicht verfügbar"</string>
   <string name="screen_room_error_failed_retrieving_user_details">"Benutzerdetails konnten nicht abgerufen werden"</string>
   <string name="screen_room_invite_again_alert_message">"Möchtest du sie wieder einladen?"</string>
   <string name="screen_room_invite_again_alert_title">"Du bist allein in diesem Chat"</string>
   <string name="screen_room_message_copied">"Nachricht kopiert"</string>
   <string name="screen_room_no_permission_to_post">"Du bist keine Berechtigung, um in diesem Raum zu posten"</string>
+  <string name="screen_room_notification_settings_allow_custom">"Benutzerdefinierte Einstellung zulassen"</string>
+  <string name="screen_room_notification_settings_allow_custom_footnote">"Das Aktivieren dieser Option wird die Standardeinstellungen überschreiben."</string>
+  <string name="screen_room_notification_settings_custom_settings_title">"Benachrichtige mich in diesem Chat für"</string>
+  <string name="screen_room_notification_settings_default_setting_footnote">"Du kannst es in deinem %1$s ändern."</string>
+  <string name="screen_room_notification_settings_default_setting_footnote_content_link">"Globale Einstellungen"</string>
+  <string name="screen_room_notification_settings_default_setting_title">"Standardeinstellung"</string>
+  <string name="screen_room_notification_settings_edit_remove_setting">"Benutzerdefinierte Einstellung entfernen"</string>
+  <string name="screen_room_notification_settings_error_loading_settings">"Beim Laden der Benachrichtigungseinstellungen ist ein Fehler aufgetreten."</string>
+  <string name="screen_room_notification_settings_error_restoring_default">"Wiederherstellung des Standardmodus fehlgeschlagen. Bitte versuche es erneut."</string>
+  <string name="screen_room_notification_settings_error_setting_mode">"Fehler beim Einstellen des Modus. Bitte versuche es erneut."</string>
+  <string name="screen_room_notification_settings_mode_all_messages">"Alle Nachrichten"</string>
+  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Nur Erwähnungen und Schlüsselwörter"</string>
+  <string name="screen_room_notification_settings_room_custom_settings_title">"In diesem Raum, benachrichtige mich für"</string>
   <string name="screen_room_reactions_show_less">"Weniger anzeigen"</string>
   <string name="screen_room_reactions_show_more">"Mehr anzeigen"</string>
   <string name="screen_room_retry_send_menu_send_again_action">"Erneut senden"</string>
   <string name="screen_room_retry_send_menu_title">"Ihre Nachricht konnte nicht gesendet werden"</string>
+  <string name="screen_room_timeline_add_reaction">"Emoji hinzufügen"</string>
+  <string name="screen_room_timeline_less_reactions">"Weniger anzeigen"</string>
   <string name="screen_room_error_failed_processing_media">"Fehler bei der Verarbeitung von Medien zum Hochladen, bitte versuche es erneut."</string>
   <string name="screen_room_retry_send_menu_remove_action">"Entfernen"</string>
 </resources>
diff --git a/features/messages/impl/src/main/res/values-ru/translations.xml b/features/messages/impl/src/main/res/values-ru/translations.xml
index c3ed526564..33147f8ea2 100644
--- a/features/messages/impl/src/main/res/values-ru/translations.xml
+++ b/features/messages/impl/src/main/res/values-ru/translations.xml
@@ -5,6 +5,11 @@
     <item quantity="few">"%1$d изменения в комнате"</item>
     <item quantity="many">"%1$d изменений в комнате"</item>
   </plurals>
+  <plurals name="screen_room_timeline_more_reactions">
+    <item quantity="one">"И ещё %1$d"</item>
+    <item quantity="few">"И ещё %1$d"</item>
+    <item quantity="many">"И ещё %1$d"</item>
+  </plurals>
   <string name="screen_room_attachment_source_camera">"Камера"</string>
   <string name="screen_room_attachment_source_camera_photo">"Сделать фото"</string>
   <string name="screen_room_attachment_source_camera_video">"Записать видео"</string>
@@ -24,11 +29,13 @@
   <string name="screen_room_notification_settings_default_setting_footnote">"Вы можете изменить его в своем %1$s."</string>
   <string name="screen_room_notification_settings_default_setting_footnote_content_link">"Основные Настройки"</string>
   <string name="screen_room_notification_settings_default_setting_title">"Настройка по умолчанию"</string>
+  <string name="screen_room_notification_settings_edit_remove_setting">"Удалить пользовательскую настройку"</string>
   <string name="screen_room_notification_settings_error_loading_settings">"Произошла ошибка при загрузке настроек уведомлений."</string>
   <string name="screen_room_notification_settings_error_restoring_default">"Не удалось восстановить режим по умолчанию, попробуйте еще раз."</string>
   <string name="screen_room_notification_settings_error_setting_mode">"Не удалось настроить режим, попробуйте еще раз."</string>
   <string name="screen_room_notification_settings_mode_all_messages">"Все сообщения"</string>
   <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Только упоминания и ключевые слова"</string>
+  <string name="screen_room_notification_settings_room_custom_settings_title">"В этой комнате уведомить меня о"</string>
   <string name="screen_room_reactions_show_less">"Показать меньше"</string>
   <string name="screen_room_reactions_show_more">"Показать больше"</string>
   <string name="screen_room_retry_send_menu_send_again_action">"Отправить снова"</string>
diff --git a/features/messages/impl/src/main/res/values-sk/translations.xml b/features/messages/impl/src/main/res/values-sk/translations.xml
index 07e62e9a4d..03a32f847f 100644
--- a/features/messages/impl/src/main/res/values-sk/translations.xml
+++ b/features/messages/impl/src/main/res/values-sk/translations.xml
@@ -16,6 +16,7 @@
   <string name="screen_room_attachment_source_files">"Príloha"</string>
   <string name="screen_room_attachment_source_gallery">"Knižnica fotografií a videí"</string>
   <string name="screen_room_attachment_source_location">"Poloha"</string>
+  <string name="screen_room_attachment_source_poll">"Anketa"</string>
   <string name="screen_room_encrypted_history_banner">"História správ v tejto miestnosti nie je momentálne k dispozícii"</string>
   <string name="screen_room_error_failed_retrieving_user_details">"Nepodarilo sa získať údaje o používateľovi"</string>
   <string name="screen_room_invite_again_alert_message">"Chceli by ste ich pozvať späť?"</string>
@@ -28,11 +29,13 @@
   <string name="screen_room_notification_settings_default_setting_footnote">"Môžete to zmeniť vo svojich %1$s."</string>
   <string name="screen_room_notification_settings_default_setting_footnote_content_link">"všeobecných nastaveniach"</string>
   <string name="screen_room_notification_settings_default_setting_title">"Predvolené nastavenie"</string>
+  <string name="screen_room_notification_settings_edit_remove_setting">"Odstrániť vlastné nastavenie"</string>
   <string name="screen_room_notification_settings_error_loading_settings">"Pri načítavaní nastavení oznámení došlo k chybe."</string>
   <string name="screen_room_notification_settings_error_restoring_default">"Nepodarilo sa obnoviť predvolený režim, skúste to prosím znova."</string>
   <string name="screen_room_notification_settings_error_setting_mode">"Nepodarilo sa nastaviť režim, skúste to prosím znova."</string>
   <string name="screen_room_notification_settings_mode_all_messages">"Všetky správy"</string>
   <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Iba zmienky a kľúčové slová"</string>
+  <string name="screen_room_notification_settings_room_custom_settings_title">"V tejto miestnosti ma upozorniť na"</string>
   <string name="screen_room_reactions_show_less">"Zobraziť menej"</string>
   <string name="screen_room_reactions_show_more">"Zobraziť viac"</string>
   <string name="screen_room_retry_send_menu_send_again_action">"Odoslať znova"</string>
diff --git a/features/rageshake/impl/src/main/res/values-cs/translations.xml b/features/rageshake/impl/src/main/res/values-cs/translations.xml
index d95752e91c..bfea484240 100644
--- a/features/rageshake/impl/src/main/res/values-cs/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-cs/translations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_bug_report_attach_screenshot">"Připojit snímek obrazovky"</string>
-  <string name="screen_bug_report_contact_me">"V případě dalších dotazů se na mě můžete obrátit"</string>
+  <string name="screen_bug_report_contact_me">"V případě dalších dotazů se na mě můžete obrátit."</string>
   <string name="screen_bug_report_contact_me_title">"Kontaktujte mě"</string>
   <string name="screen_bug_report_edit_screenshot">"Upravit snímek obrazovky"</string>
   <string name="screen_bug_report_editor_description">"Popište prosím chybu. Co jste udělali? Co jste očekávali, že se stane? Co se ve skutečnosti stalo? Uveďte co nejvíce podrobností."</string>
diff --git a/features/rageshake/impl/src/main/res/values-de/translations.xml b/features/rageshake/impl/src/main/res/values-de/translations.xml
index b316d8b45e..51b331a86f 100644
--- a/features/rageshake/impl/src/main/res/values-de/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-de/translations.xml
@@ -10,6 +10,6 @@
   <string name="screen_bug_report_include_crash_logs">"Absturzprotokolle senden"</string>
   <string name="screen_bug_report_include_logs">"Logs zulassen"</string>
   <string name="screen_bug_report_include_screenshot">"Bildschirmfoto senden"</string>
-  <string name="screen_bug_report_logs_description">"Um zu überprüfen, ob alles wie vorgesehen funktioniert, werden Protokolle mit deiner Nachricht gesendet. Diese werden privat sein. Um nur Ihre Nachricht zu senden, schalte diese Einstellung aus."</string>
+  <string name="screen_bug_report_logs_description">"Deiner Nachricht werden Protokolle beigefügt, um sicherzustellen, dass alles ordnungsgemäß funktioniert. Um deine Nachricht ohne Logs zu senden, deaktiviere diese Einstellung."</string>
   <string name="screen_bug_report_rash_logs_alert_title">"%1$s ist bei der letzten Verwendung abgestürzt. Möchtest du uns einen Absturzbericht senden?"</string>
 </resources>
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 6e92891c70..90a9bb0190 100644
--- a/features/roomdetails/impl/src/main/res/values-cs/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-cs/translations.xml
@@ -13,7 +13,12 @@
   <string name="screen_room_details_edition_error_title">"Nelze aktualizovat místnost"</string>
   <string name="screen_room_details_encryption_enabled_subtitle">"Zprávy jsou zabezpečeny zámky. Pouze vy a příjemci máte jedinečné klíče k jejich odemčení."</string>
   <string name="screen_room_details_encryption_enabled_title">"Šifrování zpráv povoleno"</string>
+  <string name="screen_room_details_error_loading_notification_settings">"Při načítání nastavení oznámení došlo k chybě."</string>
+  <string name="screen_room_details_error_muting">"Ztišení této místnosti se nezdařilo, zkuste to prosím znovu."</string>
+  <string name="screen_room_details_error_unmuting">"Nepodařilo se zrušit ztišení této místnosti, zkuste to prosím znovu."</string>
   <string name="screen_room_details_invite_people_title">"Pozvat lidi"</string>
+  <string name="screen_room_details_notification_mode_custom">"Vlastní"</string>
+  <string name="screen_room_details_notification_mode_default">"Výchozí"</string>
   <string name="screen_room_details_notification_title">"Oznámení"</string>
   <string name="screen_room_details_room_name_label">"Název místnosti"</string>
   <string name="screen_room_details_share_room_title">"Sdílet místnost"</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 992ca94b85..8ae23e8152 100644
--- a/features/roomdetails/impl/src/main/res/values-de/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-de/translations.xml
@@ -1,18 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <plurals name="screen_room_member_list_header_title">
-    <item quantity="one">"1 Person"</item>
+    <item quantity="one">"%1$d Person"</item>
     <item quantity="other">"%1$d Personen"</item>
   </plurals>
   <string name="screen_room_details_add_topic_title">"Thema hinzufügen"</string>
   <string name="screen_room_details_already_a_member">"Bereits Mitglied"</string>
   <string name="screen_room_details_already_invited">"Bereits eingeladen"</string>
   <string name="screen_room_details_edit_room_title">"Raum bearbeiten"</string>
-  <string name="screen_room_details_edition_error">"Wir konnten nicht alle Informationen für diesen Raum aktualisieren."</string>
+  <string name="screen_room_details_edition_error">"Es gab einen unbekannten Fehler und die Informationen konnten nicht geändert werden."</string>
   <string name="screen_room_details_edition_error_title">"Raum konnte nicht aktualisiert werden"</string>
   <string name="screen_room_details_encryption_enabled_subtitle">"Nachrichten sind mit Schlössern gesichert. Nur du und der Empfänger haben die eindeutigen Schlüssel, um sie zu entsperren."</string>
   <string name="screen_room_details_encryption_enabled_title">"Nachrichtenverschlüsselung aktiviert"</string>
+  <string name="screen_room_details_error_loading_notification_settings">"Beim Laden der Benachrichtigungseinstellungen ist ein Fehler aufgetreten."</string>
+  <string name="screen_room_details_error_muting">"Das Stummschalten dieses Raums ist fehlgeschlagen. Bitte versuche es erneut."</string>
+  <string name="screen_room_details_error_unmuting">"Die Stummschaltung dieses Raums konnte nicht aufgehoben werden. Bitte versuchen Sie es erneut."</string>
   <string name="screen_room_details_invite_people_title">"Personen einladen"</string>
+  <string name="screen_room_details_notification_mode_custom">"Benutzerdefiniert"</string>
+  <string name="screen_room_details_notification_mode_default">"Standard"</string>
   <string name="screen_room_details_notification_title">"Benachrichtigungen"</string>
   <string name="screen_room_details_room_name_label">"Raumname"</string>
   <string name="screen_room_details_share_room_title">"Raum teilen"</string>
@@ -20,10 +25,10 @@
   <string name="screen_room_member_list_pending_header_title">"Ausstehend"</string>
   <string name="screen_room_member_list_room_members_header_title">"Raummitglieder"</string>
   <string name="screen_dm_details_block_alert_action">"Blockieren"</string>
-  <string name="screen_dm_details_block_alert_description">"Blockierte Benutzer können dir keine Nachrichten senden und alle Nachrichten von ihnen werden ausgeblendet. Du kannst diese Aktion jederzeit rückgängig machen."</string>
+  <string name="screen_dm_details_block_alert_description">"Blockierte Benutzer können dir keine Nachrichten senden und alle ihre Nachrichten werden ausgeblendet. Du kannst sie jederzeit entsperren."</string>
   <string name="screen_dm_details_block_user">"Nutzer blockieren"</string>
   <string name="screen_dm_details_unblock_alert_action">"Blockierung aufheben"</string>
-  <string name="screen_dm_details_unblock_alert_description">"Wenn du den Benutzer entsperrst, kannst du wieder alle Nachrichten von ihm sehen."</string>
+  <string name="screen_dm_details_unblock_alert_description">"Du wirst alle ihre Nachrichten wieder sehen."</string>
   <string name="screen_dm_details_unblock_user">"Nutzer entblockieren"</string>
   <string name="screen_room_details_leave_room_title">"Raum verlassen"</string>
   <string name="screen_room_details_people_title">"Personen"</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 d355d2c70c..cdf719e00f 100644
--- a/features/roomlist/impl/src/main/res/values-cs/translations.xml
+++ b/features/roomlist/impl/src/main/res/values-cs/translations.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_roomlist_a11y_create_message">"Vytvořte novou konverzaci nebo místnost"</string>
+  <string name="screen_roomlist_empty_message">"Začněte tím, že někomu pošnete zprávu."</string>
+  <string name="screen_roomlist_empty_title">"Zatím žádné konverzace."</string>
   <string name="screen_roomlist_main_space_title">"Všechny chaty"</string>
   <string name="session_verification_banner_message">"Zdá se, že používáte nové zařízení. Ověřte přihlášení, abyste měli přístup k zašifrovaným zprávám."</string>
-  <string name="session_verification_banner_title">"Přístup k historii zpráv"</string>
+  <string name="session_verification_banner_title">"Ověřte, že jste to vy"</string>
 </resources>
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 2ed1cd0263..49a400b138 100644
--- a/features/roomlist/impl/src/main/res/values-de/translations.xml
+++ b/features/roomlist/impl/src/main/res/values-de/translations.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_roomlist_a11y_create_message">"Ein neues Gespräch oder einen neuen Raum erstellen"</string>
+  <string name="screen_roomlist_empty_message">"Beginnen, indem du jemandem eine Nachricht sendest."</string>
+  <string name="screen_roomlist_empty_title">"Noch keine Chats."</string>
   <string name="screen_roomlist_main_space_title">"Alle Chats"</string>
   <string name="session_verification_banner_message">"Es sieht so aus, als ob du ein neues Gerät verwendest. Verifiziere, dass du es bist, um auf deine verschlüsselten Nachrichten zuzugreifen."</string>
-  <string name="session_verification_banner_title">"Greife auf deine Nachrichten-Historie zu"</string>
+  <string name="session_verification_banner_title">"Verifiziere, dass du es bist"</string>
 </resources>
diff --git a/libraries/push/impl/src/main/res/values-de/translations.xml b/libraries/push/impl/src/main/res/values-de/translations.xml
index a2ae094731..04c7521d9e 100644
--- a/libraries/push/impl/src/main/res/values-de/translations.xml
+++ b/libraries/push/impl/src/main/res/values-de/translations.xml
@@ -7,7 +7,7 @@
   <string name="notification_inline_reply_failed">"** Senden fehlgeschlagen - bitte Raum öffnen"</string>
   <string name="notification_invitation_action_join">"Beitreten"</string>
   <string name="notification_invitation_action_reject">"Ablehnen"</string>
-  <string name="notification_invite_body">"Hat dich eingeladen"</string>
+  <string name="notification_invite_body">"Hat dich zum Chatten eingeladen"</string>
   <string name="notification_new_messages">"Neue Nachrichten"</string>
   <string name="notification_reaction_body">"Reagierte mit %1$s"</string>
   <string name="notification_room_action_mark_as_read">"Als gelesen markieren"</string>
diff --git a/libraries/textcomposer/src/main/res/values-cs/translations.xml b/libraries/textcomposer/src/main/res/values-cs/translations.xml
index 8e0524b69a..c37f419ec4 100644
--- a/libraries/textcomposer/src/main/res/values-cs/translations.xml
+++ b/libraries/textcomposer/src/main/res/values-cs/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="rich_text_editor_a11y_add_attachment">"Přidat přílohu"</string>
   <string name="rich_text_editor_bullet_list">"Přepnout seznam s odrážkami"</string>
   <string name="rich_text_editor_code_block">"Přepnout blok kódu"</string>
   <string name="rich_text_editor_composer_placeholder">"Zpráva…"</string>
diff --git a/libraries/textcomposer/src/main/res/values-de/translations.xml b/libraries/textcomposer/src/main/res/values-de/translations.xml
index a28c784792..dea872d7c0 100644
--- a/libraries/textcomposer/src/main/res/values-de/translations.xml
+++ b/libraries/textcomposer/src/main/res/values-de/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="rich_text_editor_a11y_add_attachment">"Anhang hinzufügen"</string>
   <string name="rich_text_editor_bullet_list">"Aufzählungsliste ein-/ausschalten"</string>
   <string name="rich_text_editor_code_block">"Codeblock umschalten"</string>
   <string name="rich_text_editor_composer_placeholder">"Nachricht…"</string>
diff --git a/libraries/ui-strings/src/main/res/values-cs/translations.xml b/libraries/ui-strings/src/main/res/values-cs/translations.xml
index 9d897db9d8..ee1b221ad7 100644
--- a/libraries/ui-strings/src/main/res/values-cs/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-cs/translations.xml
@@ -24,7 +24,7 @@
   <string name="action_edit">"Upravit"</string>
   <string name="action_enable">"Povolit"</string>
   <string name="action_forgot_password">"Zapomněli jste heslo?"</string>
-  <string name="action_forward">"Vpřed"</string>
+  <string name="action_forward">"Přeposlat"</string>
   <string name="action_invite">"Pozvat"</string>
   <string name="action_invite_friends">"Pozvat přátele"</string>
   <string name="action_invite_friends_to_app">"Pozvat přátele do %1$s"</string>
@@ -40,6 +40,7 @@
   <string name="action_open_with">"Otevřít v aplikaci"</string>
   <string name="action_quick_reply">"Rychlá odpověď"</string>
   <string name="action_quote">"Citovat"</string>
+  <string name="action_react">"Reagovat"</string>
   <string name="action_remove">"Odstranit"</string>
   <string name="action_reply">"Odpovědět"</string>
   <string name="action_report_bug">"Nahlásit chybu"</string>
@@ -94,6 +95,9 @@
   <string name="common_password">"Heslo"</string>
   <string name="common_people">"Lidé"</string>
   <string name="common_permalink">"Trvalý odkaz"</string>
+  <string name="common_poll_final_votes">"Konečné hlasy: %1$s"</string>
+  <string name="common_poll_total_votes">"Celkový počet hlasů: %1$s"</string>
+  <string name="common_poll_undisclosed_text">"Výsledky se zobrazí po skončení hlasování"</string>
   <string name="common_privacy_policy">"Zásady ochrany osobních údajů"</string>
   <string name="common_reactions">"Reakce"</string>
   <string name="common_refreshing">"Obnovování…"</string>
@@ -140,7 +144,11 @@
   <string name="emoji_picker_category_places">"Cestování a místa"</string>
   <string name="emoji_picker_category_symbols">"Symboly"</string>
   <string name="error_failed_creating_the_permalink">"Vytvoření trvalého odkazu se nezdařilo"</string>
+  <string name="error_failed_loading_map">"%1$s nemohl načíst mapu. Zkuste to prosím později."</string>
   <string name="error_failed_loading_messages">"Načítání zpráv se nezdařilo"</string>
+  <string name="error_failed_locating_user">"%1$s nemá přístup k vaší poloze. Zkuste to prosím později."</string>
+  <string name="error_missing_location_auth_android">"%1$s nemá oprávnění k přístupu k vaší poloze. Přístup můžete povolit v Nastavení."</string>
+  <string name="error_missing_location_rationale_android">"%1$s nemá oprávnění k přístupu k vaší poloze. Povolit přístup níže."</string>
   <string name="error_some_messages_have_not_been_sent">"Některé zprávy nebyly odeslány"</string>
   <string name="error_unknown">"Omlouváme se, došlo k chybě"</string>
   <string name="invite_friends_rich_title">"🔐️ Připojte se ke mně na %1$s"</string>
@@ -154,6 +162,11 @@
     <item quantity="few">"%1$d členové"</item>
     <item quantity="other">"%1$d členů"</item>
   </plurals>
+  <plurals name="common_poll_votes_count">
+    <item quantity="one">"%d hlas"</item>
+    <item quantity="few">"%d hlasy"</item>
+    <item quantity="other">"%d hlasů"</item>
+  </plurals>
   <string name="preference_rageshake">"Zatřeste zařízením pro nahlášení chyby"</string>
   <string name="rageshake_dialog_content">"Zdá se, že jste frustrovaně třásli telefonem. Chcete otevřít obrazovku pro nahlášení chyby?"</string>
   <string name="report_content_explanation">"Tato zpráva bude nahlášena správci vašeho domovského serveru. Nebude si moci přečíst žádné šifrované zprávy."</string>
@@ -167,7 +180,35 @@
   <string name="screen_media_upload_preview_error_failed_sending">"Nahrání média se nezdařilo, zkuste to prosím znovu."</string>
   <string name="screen_migration_message">"Toto je jednorázový proces, děkujeme za čekání."</string>
   <string name="screen_migration_title">"Nastavení vašeho účtu"</string>
+  <string name="screen_notification_settings_additional_settings_section_title">"Další nastavení"</string>
+  <string name="screen_notification_settings_calls_label">"Halsové a video hovory"</string>
+  <string name="screen_notification_settings_configuration_mismatch">"Neshoda konfigurace"</string>
+  <string name="screen_notification_settings_configuration_mismatch_description">"Zjednodušili jsme nastavení oznámení, abychom usnadnili hledání možností. 
+
+Některá vlastní nastavení, která jste si vybrali v minulosti, se zde nezobrazují, ale jsou stále aktivní. 
+
+Pokud budete pokračovat, některá nastavení se mohou změnit."</string>
+  <string name="screen_notification_settings_direct_chats">"Přímé zprávy"</string>
+  <string name="screen_notification_settings_edit_custom_settings_section_title">"Vlastní nastavení pro chat"</string>
+  <string name="screen_notification_settings_edit_failed_updating_default_mode">"Při aktualizaci nastavení oznámení došlo k chybě."</string>
+  <string name="screen_notification_settings_edit_mode_all_messages">"Všechny zprávy"</string>
+  <string name="screen_notification_settings_edit_mode_mentions_and_keywords">"Pouze zmínky a klíčová slova"</string>
+  <string name="screen_notification_settings_edit_screen_direct_section_header">"V přímých zprávách mě upozornit na"</string>
+  <string name="screen_notification_settings_edit_screen_group_section_header">"Ve skupinových chatech mě upozornit na"</string>
+  <string name="screen_notification_settings_enable_notifications">"Povolit oznámení na tomto zařízení"</string>
+  <string name="screen_notification_settings_failed_fixing_configuration">"Konfigurace nebyla opravena, zkuste to prosím znovu."</string>
+  <string name="screen_notification_settings_group_chats">"Skupinové chaty"</string>
+  <string name="screen_notification_settings_mentions_section_title">"Zmínky"</string>
+  <string name="screen_notification_settings_mode_all">"Vše"</string>
+  <string name="screen_notification_settings_mode_mentions">"Zmínky"</string>
+  <string name="screen_notification_settings_notification_section_title">"Upozornit mě na"</string>
+  <string name="screen_notification_settings_room_mention_label">"Upozornit mě na @room"</string>
+  <string name="screen_notification_settings_system_notifications_action_required">"Chcete-li dostávat oznámení, změňte prosím svůj %1$s."</string>
+  <string name="screen_notification_settings_system_notifications_action_required_content_link">"systémová nastavení"</string>
+  <string name="screen_notification_settings_system_notifications_turned_off">"Systémová oznámení byla vypnuta"</string>
+  <string name="screen_notification_settings_title">"Oznámení"</string>
   <string name="screen_report_content_block_user_hint">"Zaškrtněte, pokud chcete skrýt všechny aktuální a budoucí zprávy od tohoto uživatele"</string>
+  <string name="screen_settings_oidc_account">"Účet a zařízení"</string>
   <string name="screen_share_location_title">"Sdílet polohu"</string>
   <string name="screen_share_my_location_action">"Sdílet moji polohu"</string>
   <string name="screen_share_open_apple_maps">"Otevřít v Mapách Apple"</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 0f5259e663..68223c8513 100644
--- a/libraries/ui-strings/src/main/res/values-de/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-de/translations.xml
@@ -8,7 +8,7 @@
   <string name="action_back">"Zurück"</string>
   <string name="action_cancel">"Abbrechen"</string>
   <string name="action_choose_photo">"Foto auswählen"</string>
-  <string name="action_clear">"Löschen"</string>
+  <string name="action_clear">"Zurücksetzen"</string>
   <string name="action_close">"Schließen"</string>
   <string name="action_complete_verification">"Verifizierung abschließen"</string>
   <string name="action_confirm">"Bestätigen"</string>
@@ -37,9 +37,10 @@
   <string name="action_no">"Nein"</string>
   <string name="action_not_now">"Nicht jetzt"</string>
   <string name="action_ok">"OK"</string>
-  <string name="action_open_with">"Öffne mit"</string>
+  <string name="action_open_with">"Öffnen mit"</string>
   <string name="action_quick_reply">"Schnellantwort"</string>
   <string name="action_quote">"Zitieren"</string>
+  <string name="action_react">"Reagieren"</string>
   <string name="action_remove">"Entfernen"</string>
   <string name="action_reply">"Antworten"</string>
   <string name="action_report_bug">"Fehler melden"</string>
@@ -56,7 +57,7 @@
   <string name="action_start">"Starten"</string>
   <string name="action_start_chat">"Chat starten"</string>
   <string name="action_start_verification">"Verifizierung starten"</string>
-  <string name="action_static_map_load">"Tippe, um die Karte zu laden"</string>
+  <string name="action_static_map_load">"Zum Karte laden tippen"</string>
   <string name="action_take_photo">"Foto aufnehmen"</string>
   <string name="action_view_source">"Quelltext anzeigen"</string>
   <string name="action_yes">"Ja"</string>
@@ -80,25 +81,28 @@
   <string name="common_forward_message">"Nachricht weiterleiten"</string>
   <string name="common_gif">"GIF"</string>
   <string name="common_image">"Bild"</string>
-  <string name="common_invite_unknown_profile">"Wir können die Matrix-ID dieses Benutzers nicht validieren. Die Einladung wurde möglicherweise nicht empfangen."</string>
-  <string name="common_leaving_room">"Raum verlassen"</string>
+  <string name="common_invite_unknown_profile">"Diese Matrix-ID kann nicht gefunden werden, daher wird die Einladung möglicherweise nicht empfangen."</string>
+  <string name="common_leaving_room">"Verlasse Raum"</string>
   <string name="common_link_copied_to_clipboard">"Link in Zwischenablage kopiert"</string>
-  <string name="common_loading">"Wird geladen…"</string>
+  <string name="common_loading">"Lädt…"</string>
   <string name="common_message">"Nachricht"</string>
   <string name="common_message_layout">"Nachrichtenlayout"</string>
-  <string name="common_message_removed">"Nachricht wurde entfernt"</string>
+  <string name="common_message_removed">"Nachricht entfernt"</string>
   <string name="common_modern">"Modern"</string>
   <string name="common_mute">"Stummschalten"</string>
   <string name="common_no_results">"Keine Ergebnisse"</string>
   <string name="common_offline">"Offline"</string>
   <string name="common_password">"Passwort"</string>
   <string name="common_people">"Personen"</string>
-  <string name="common_permalink">"Permalink"</string>
+  <string name="common_permalink">"Dauerlink"</string>
+  <string name="common_poll_final_votes">"Endgültige Stimmen: %1$s"</string>
+  <string name="common_poll_total_votes">"Stimmen insgesamt: %1$s"</string>
+  <string name="common_poll_undisclosed_text">"Ergebnisse werden nach Ende der Umfrage angezeigt"</string>
   <string name="common_privacy_policy">"Datenschutz­erklärung"</string>
   <string name="common_reactions">"Reaktionen"</string>
   <string name="common_refreshing">"Aktualisiere…"</string>
   <string name="common_replying_to">"Auf %1$s antworten"</string>
-  <string name="common_report_a_bug">"Melde einen Fehler"</string>
+  <string name="common_report_a_bug">"Einen Fehler melden"</string>
   <string name="common_report_submitted">"Bericht gesendet"</string>
   <string name="common_room_name">"Raumname"</string>
   <string name="common_room_name_placeholder">"z.B. dein Projektname"</string>
@@ -106,12 +110,12 @@
   <string name="common_search_results">"Suchergebnisse"</string>
   <string name="common_security">"Sicherheit"</string>
   <string name="common_select_your_server">"Wählen deinen Server"</string>
-  <string name="common_sending">"Senden…"</string>
+  <string name="common_sending">"Sendet…"</string>
   <string name="common_server_not_supported">"Server wird nicht unterstützt"</string>
   <string name="common_server_url">"Server-URL"</string>
   <string name="common_settings">"Einstellungen"</string>
   <string name="common_shared_location">"Geteilter Standort"</string>
-  <string name="common_starting_chat">"Chat wird gestartet…"</string>
+  <string name="common_starting_chat">"Starte Chat…"</string>
   <string name="common_sticker">"Sticker"</string>
   <string name="common_success">"Erfolg"</string>
   <string name="common_suggestions">"Vorschläge"</string>
@@ -120,7 +124,7 @@
   <string name="common_topic">"Thema"</string>
   <string name="common_topic_placeholder">"Worum geht es in diesem Raum?"</string>
   <string name="common_unable_to_decrypt">"Entschlüsselung nicht möglich"</string>
-  <string name="common_unable_to_invite_message">"Wir konnten Einladungen nicht erfolgreich an einen oder mehrere Benutzer senden."</string>
+  <string name="common_unable_to_invite_message">"Einladungen konnten nicht an einen oder mehrere Benutzer gesendet werden."</string>
   <string name="common_unable_to_invite_title">"Einladung(en) können nicht gesendet werden"</string>
   <string name="common_unmute">"Stummschaltung aufheben"</string>
   <string name="common_unsupported_event">"Nicht unterstütztes Ereignis"</string>
@@ -128,7 +132,7 @@
   <string name="common_verification_cancelled">"Verifizierung abgebrochen"</string>
   <string name="common_verification_complete">"Verifizierung abgeschlossen"</string>
   <string name="common_video">"Video"</string>
-  <string name="common_waiting">"Warten…"</string>
+  <string name="common_waiting">"Warte…"</string>
   <string name="dialog_title_confirmation">"Bestätigung"</string>
   <string name="dialog_title_warning">"Warnung"</string>
   <string name="emoji_picker_category_activity">"Aktivitäten"</string>
@@ -139,10 +143,12 @@
   <string name="emoji_picker_category_people">"Smileys &amp; Personen"</string>
   <string name="emoji_picker_category_places">"Reisen &amp; Orte"</string>
   <string name="emoji_picker_category_symbols">"Symbole"</string>
-  <string name="error_failed_creating_the_permalink">"Fehler beim Erstellen des Permalinks"</string>
+  <string name="error_failed_creating_the_permalink">"Fehler beim Erstellen des Dauerlinks"</string>
   <string name="error_failed_loading_map">"%1$s konnte die Karte nicht laden. Bitte versuche es später erneut."</string>
   <string name="error_failed_loading_messages">"Fehler beim Laden der Nachrichten"</string>
   <string name="error_failed_locating_user">"%1$s konnte nicht auf deinen Standort zugreifen. Bitte versuche es später erneut."</string>
+  <string name="error_missing_location_auth_android">"%1$s hat keine Berechtigung, auf deinen Standort zuzugreifen. Du kannst den Zugriff in den Einstellungen aktivieren."</string>
+  <string name="error_missing_location_rationale_android">"%1$s hat keine Berechtigung, auf deinen Standort zuzugreifen. Aktiviere den Zugriff unten."</string>
   <string name="error_some_messages_have_not_been_sent">"Einige Nachrichten wurden nicht gesendet"</string>
   <string name="error_unknown">"Entschuldigung, ein Fehler ist aufgetreten."</string>
   <string name="invite_friends_rich_title">"🔐️ Besuche mich auf %1$s"</string>
@@ -155,9 +161,13 @@
     <item quantity="one">"%1$d Mitglied"</item>
     <item quantity="other">"%1$d Mitglieder"</item>
   </plurals>
-  <string name="preference_rageshake">"Rageshake zum Melden von Fehlern"</string>
+  <plurals name="common_poll_votes_count">
+    <item quantity="one">"%d Stimme"</item>
+    <item quantity="other">"%d Stimmen"</item>
+  </plurals>
+  <string name="preference_rageshake">"Schütteln zum Melden von Fehlern"</string>
   <string name="rageshake_dialog_content">"Du scheinst frustriert das Telefon zu schütteln. Möchtest du den Fehlerberichtsbildschirm öffnen?"</string>
-  <string name="report_content_explanation">"Diese Nachricht wird an deinen Heimserver-Admin gemeldet werden. Er wird nicht in der Lage sein, verschlüsselte Nachrichten zu lesen."</string>
+  <string name="report_content_explanation">"Diese Nachricht wird an deinen Heimserver-Admin gemeldet. Er wird nicht in der Lage sein, verschlüsselte Nachrichten zu lesen."</string>
   <string name="report_content_hint">"Grund für die Meldung dieses Inhalts"</string>
   <string name="room_timeline_beginning_of_room">"Dies ist der Anfang von %1$s."</string>
   <string name="room_timeline_beginning_of_room_no_name">"Dies ist der Beginn dieser Konversation."</string>
@@ -168,7 +178,35 @@
   <string name="screen_media_upload_preview_error_failed_sending">"Hochladen von Medien fehlgeschlagen, bitte versuchen Sie es erneut."</string>
   <string name="screen_migration_message">"Dies ist ein einmaliger Vorgang, danke fürs Warten."</string>
   <string name="screen_migration_title">"Dein Konto einrichten"</string>
+  <string name="screen_notification_settings_additional_settings_section_title">"Zusätzliche Einstellungen"</string>
+  <string name="screen_notification_settings_calls_label">"Audio- und Videoanrufe"</string>
+  <string name="screen_notification_settings_configuration_mismatch">"Konfigurationskonflikt"</string>
+  <string name="screen_notification_settings_configuration_mismatch_description">"Wir haben die Benachrichtigungseinstellungen vereinfacht, damit Optionen leichter zu finden sind.
+
+Einige benutzerdefinierte Einstellungen, die du in der Vergangenheit ausgewählt hast, werden hier nicht angezeigt, sind aber immer noch aktiv.
+
+Wenn du fortfährst, ändern sich möglicherweise einige deine Einstellungen."</string>
+  <string name="screen_notification_settings_direct_chats">"Direkte Chats"</string>
+  <string name="screen_notification_settings_edit_custom_settings_section_title">"Benutzerdefinierte Einstellung pro Chat"</string>
+  <string name="screen_notification_settings_edit_failed_updating_default_mode">"Beim Aktualisieren der Benachrichtigungseinstellung ist ein Fehler aufgetreten."</string>
+  <string name="screen_notification_settings_edit_mode_all_messages">"Alle Nachrichten"</string>
+  <string name="screen_notification_settings_edit_mode_mentions_and_keywords">"Nur Erwähnungen und Schlüsselwörter"</string>
+  <string name="screen_notification_settings_edit_screen_direct_section_header">"Bei direkten Chats, benachrichtigen mich für"</string>
+  <string name="screen_notification_settings_edit_screen_group_section_header">"Bei Gruppenchats, benachrichtigte mich für"</string>
+  <string name="screen_notification_settings_enable_notifications">"Benachrichtigungen auf diesem Gerät aktivieren"</string>
+  <string name="screen_notification_settings_failed_fixing_configuration">"Die Konfiguration wurde nicht korrigiert. Bitte versuche es erneut."</string>
+  <string name="screen_notification_settings_group_chats">"Gruppenchats"</string>
+  <string name="screen_notification_settings_mentions_section_title">"Erwähnungen"</string>
+  <string name="screen_notification_settings_mode_all">"Alle"</string>
+  <string name="screen_notification_settings_mode_mentions">"Erwähnungen"</string>
+  <string name="screen_notification_settings_notification_section_title">"Benachrichtige mich für"</string>
+  <string name="screen_notification_settings_room_mention_label">"Benachrichtige mich bei @room"</string>
+  <string name="screen_notification_settings_system_notifications_action_required">"Um Benachrichtigungen zu erhalten, ändern bitte deine %1$s."</string>
+  <string name="screen_notification_settings_system_notifications_action_required_content_link">"Systemeinstellungen"</string>
+  <string name="screen_notification_settings_system_notifications_turned_off">"Systembenachrichtigungen deaktiviert"</string>
+  <string name="screen_notification_settings_title">"Benachrichtigungen"</string>
   <string name="screen_report_content_block_user_hint">"Prüfe, ob du alle aktuellen und zukünftigen Nachrichten dieses Benutzers ausblenden möchtest"</string>
+  <string name="screen_settings_oidc_account">"Konto und Geräte"</string>
   <string name="screen_share_location_title">"Standort teilen"</string>
   <string name="screen_share_my_location_action">"Meinen Standort teilen"</string>
   <string name="screen_share_open_apple_maps">"In Apple Maps öffnen"</string>
diff --git a/libraries/ui-strings/src/main/res/values-ru/translations.xml b/libraries/ui-strings/src/main/res/values-ru/translations.xml
index 77c2df4268..865eace823 100644
--- a/libraries/ui-strings/src/main/res/values-ru/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-ru/translations.xml
@@ -182,11 +182,21 @@
   <string name="screen_migration_title">"Настройка учетной записи."</string>
   <string name="screen_notification_settings_additional_settings_section_title">"Дополнительные параметры"</string>
   <string name="screen_notification_settings_calls_label">"Аудио и видео звонки"</string>
+  <string name="screen_notification_settings_configuration_mismatch">"Несоответствие конфигурации"</string>
+  <string name="screen_notification_settings_configuration_mismatch_description">"Мы упростили настройки уведомлений, чтобы упростить поиск опций. 
+
+Некоторые пользовательские настройки, выбранные вами ранее, не отображаются в данном меню, но они все еще активны. 
+
+Если вы продолжите, некоторые настройки могут быть изменены."</string>
   <string name="screen_notification_settings_direct_chats">"Прямые чаты"</string>
+  <string name="screen_notification_settings_edit_custom_settings_section_title">"Индивидуальные настройки для каждого чата"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"При обновлении настроек уведомления произошла ошибка."</string>
+  <string name="screen_notification_settings_edit_mode_all_messages">"Все сообщения"</string>
+  <string name="screen_notification_settings_edit_mode_mentions_and_keywords">"Только упоминания и ключевые слова"</string>
   <string name="screen_notification_settings_edit_screen_direct_section_header">"Уведомлять меня в личных чатах"</string>
   <string name="screen_notification_settings_edit_screen_group_section_header">"Уведомлять меня в групповых чатах"</string>
   <string name="screen_notification_settings_enable_notifications">"Включить уведомления на данном устройстве"</string>
+  <string name="screen_notification_settings_failed_fixing_configuration">"Конфигурация не была исправлена, попробуйте еще раз."</string>
   <string name="screen_notification_settings_group_chats">"Групповые чаты"</string>
   <string name="screen_notification_settings_mentions_section_title">"Упоминания"</string>
   <string name="screen_notification_settings_mode_all">"Все"</string>
@@ -198,6 +208,7 @@
   <string name="screen_notification_settings_system_notifications_turned_off">"Системные уведомления выключены"</string>
   <string name="screen_notification_settings_title">"Уведомления"</string>
   <string name="screen_report_content_block_user_hint">"Отметьте, хотите ли вы скрыть все текущие и будущие сообщения от этого пользователя"</string>
+  <string name="screen_settings_oidc_account">"Учетная запись и устройства"</string>
   <string name="screen_share_location_title">"Поделиться местоположением"</string>
   <string name="screen_share_my_location_action">"Поделиться моим местоположением"</string>
   <string name="screen_share_open_apple_maps">"Открыть в Apple Maps"</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 14dd5626c8..a070f874e9 100644
--- a/libraries/ui-strings/src/main/res/values-sk/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-sk/translations.xml
@@ -182,10 +182,21 @@
   <string name="screen_migration_title">"Nastavenie vášho účtu."</string>
   <string name="screen_notification_settings_additional_settings_section_title">"Ďalšie nastavenia"</string>
   <string name="screen_notification_settings_calls_label">"Audio a video hovory"</string>
+  <string name="screen_notification_settings_configuration_mismatch">"Nezhoda konfigurácie"</string>
+  <string name="screen_notification_settings_configuration_mismatch_description">"Zjednodušili sme Nastavenia oznámení, aby ste ľahšie našli možnosti.
+
+Niektoré vlastné nastavenia, ktoré ste si nastavili v minulosti, sa tu nezobrazujú, ale sú stále aktívne.
+
+Ak budete pokračovať, niektoré z vašich nastavení sa môžu zmeniť."</string>
   <string name="screen_notification_settings_direct_chats">"Priame konverzácie"</string>
+  <string name="screen_notification_settings_edit_custom_settings_section_title">"Vlastné nastavenie pre konverzácie"</string>
+  <string name="screen_notification_settings_edit_failed_updating_default_mode">"Pri aktualizácii nastavenia oznámenia došlo k chybe."</string>
+  <string name="screen_notification_settings_edit_mode_all_messages">"Všetky správy"</string>
+  <string name="screen_notification_settings_edit_mode_mentions_and_keywords">"Iba zmienky a kľúčové slová"</string>
   <string name="screen_notification_settings_edit_screen_direct_section_header">"Pri priamych rozhovoroch ma upozorniť na"</string>
   <string name="screen_notification_settings_edit_screen_group_section_header">"Pri skupinových rozhovoroch ma upozorniť na"</string>
   <string name="screen_notification_settings_enable_notifications">"Povoliť oznámenia na tomto zariadení"</string>
+  <string name="screen_notification_settings_failed_fixing_configuration">"Konfigurácia nebola opravená, skúste to prosím znova."</string>
   <string name="screen_notification_settings_group_chats">"Skupinové rozhovory"</string>
   <string name="screen_notification_settings_mentions_section_title">"Zmienky"</string>
   <string name="screen_notification_settings_mode_all">"Všetky"</string>
@@ -197,6 +208,7 @@
   <string name="screen_notification_settings_system_notifications_turned_off">"Systémové oznámenia sú vypnuté"</string>
   <string name="screen_notification_settings_title">"Oznámenia"</string>
   <string name="screen_report_content_block_user_hint">"Označte, či chcete skryť všetky aktuálne a budúce správy od tohto používateľa"</string>
+  <string name="screen_settings_oidc_account">"Účet a zariadenia"</string>
   <string name="screen_share_location_title">"Zdieľať polohu"</string>
   <string name="screen_share_my_location_action">"Zdieľať moju polohu"</string>
   <string name="screen_share_open_apple_maps">"Otvoriť v Apple Maps"</string>
diff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml
index e38c4fc6b8..db58894472 100644
--- a/libraries/ui-strings/src/main/res/values/localazy.xml
+++ b/libraries/ui-strings/src/main/res/values/localazy.xml
@@ -181,9 +181,9 @@
   <string name="screen_notification_settings_additional_settings_section_title">"Additional settings"</string>
   <string name="screen_notification_settings_calls_label">"Audio and video calls"</string>
   <string name="screen_notification_settings_configuration_mismatch">"Configuration mismatch"</string>
-  <string name="screen_notification_settings_configuration_mismatch_description">"We’ve simplified Notifications Settings to make options easier to find. 
+  <string name="screen_notification_settings_configuration_mismatch_description">"We’ve simplified Notifications Settings to make options easier to find.
 
-Some custom settings you’ve chosen in the past are not shown here, but they’re still active. 
+Some custom settings you’ve chosen in the past are not shown here, but they’re still active.
 
 If you proceed, some of your settings may change."</string>
   <string name="screen_notification_settings_direct_chats">"Direct chats"</string>
diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.login.impl.screens.changeaccountprovider_null_ChangeAccountProviderViewDark_0_null_0,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.login.impl.screens.changeaccountprovider_null_ChangeAccountProviderViewDark_0_null_0,NEXUS_5,1.0,en].png
index ab3bc3ee7f..bc067f20c1 100644
--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.login.impl.screens.changeaccountprovider_null_ChangeAccountProviderViewDark_0_null_0,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.login.impl.screens.changeaccountprovider_null_ChangeAccountProviderViewDark_0_null_0,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7aba18d2003a96a34e6eecf4fc6d0ee139fa8073549033da04eff3fa20b4c93
-size 40454
+oid sha256:a7f1d73aa1698bb02c03773ca9c3ec8494089d03c26d52b3b6f1aaa40a081528
+size 49266
diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.login.impl.screens.changeaccountprovider_null_ChangeAccountProviderViewLight_0_null_0,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.login.impl.screens.changeaccountprovider_null_ChangeAccountProviderViewLight_0_null_0,NEXUS_5,1.0,en].png
index 87a527b090..3b94b23ab9 100644
--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.login.impl.screens.changeaccountprovider_null_ChangeAccountProviderViewLight_0_null_0,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.login.impl.screens.changeaccountprovider_null_ChangeAccountProviderViewLight_0_null_0,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0422cc4e2bae580a88dacd711570e0c5ba105d5baae103313e42a07991823083
-size 42103
+oid sha256:f2154c7d196058a0a47aa46658ad9d2ea3edf6b89e5973396980178a2399179a
+size 50726
diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.login.impl.screens.searchaccountprovider_null_SearchAccountProviderViewDark_0_null_1,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.login.impl.screens.searchaccountprovider_null_SearchAccountProviderViewDark_0_null_1,NEXUS_5,1.0,en].png
index e36afba0a8..3b68e95447 100644
--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.login.impl.screens.searchaccountprovider_null_SearchAccountProviderViewDark_0_null_1,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.login.impl.screens.searchaccountprovider_null_SearchAccountProviderViewDark_0_null_1,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:64e67ea3130d0e70bdc8d0edc0bfa92763673c15b3235d4332f554a0e7a4840a
-size 45553
+oid sha256:b6344d9976849f1e56782a463fcca625943a7c6adf74c598c7a58245809b9db5
+size 53642
diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.login.impl.screens.searchaccountprovider_null_SearchAccountProviderViewLight_0_null_1,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.login.impl.screens.searchaccountprovider_null_SearchAccountProviderViewLight_0_null_1,NEXUS_5,1.0,en].png
index f589e41a6d..2e35a8461c 100644
--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.login.impl.screens.searchaccountprovider_null_SearchAccountProviderViewLight_0_null_1,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.login.impl.screens.searchaccountprovider_null_SearchAccountProviderViewLight_0_null_1,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7f2fd6d2fccd68abec9d829ccd673b72a0f1277644a1affb09faed7be8b8a416
-size 47021
+oid sha256:fd7e6fc09011429e0fe19bff73d3c48124b1f3bed74d3cb12c9f3f0405f53980
+size 55728
diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components_null_TimelineItemEventTimestampBelow_0_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components_null_TimelineItemEventTimestampBelow_0_null,NEXUS_5,1.0,en].png
index 3db42b6e0c..c1d740b8cb 100644
--- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components_null_TimelineItemEventTimestampBelow_0_null,NEXUS_5,1.0,en].png
+++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.timeline.components_null_TimelineItemEventTimestampBelow_0_null,NEXUS_5,1.0,en].png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5af81e5f2081b949673c5f08282b5165eb7df4bb970c1db485376c86543e1a96
-size 57313
+oid sha256:f689d80043e7d5121d072b928c866a3bde0358b5d5df06e1d4f0ceeb9a11dfef
+size 56344