diff --git a/vector/src/main/res/values-bn-rIN/strings.xml b/vector/src/main/res/values-bn-rIN/strings.xml
index 057cad2f96..ac67c0aec5 100644
--- a/vector/src/main/res/values-bn-rIN/strings.xml
+++ b/vector/src/main/res/values-bn-rIN/strings.xml
@@ -264,7 +264,7 @@
 \nএটাই হলো একবার। 
 \nক্ষমা করবেন এটাই হলো অসুবিধা।</string>
 
-    <string name="e2e_re_request_encryption_key"><ও>পুনরায় অনুরোধ এনক্রিপশন চাবিগুলি</ও>আপনার অন্য সেশানগুলি থেকে।</string>
+    <string name="e2e_re_request_encryption_key"><u>পুনরায় অনুরোধ এনক্রিপশন চাবিগুলি</u>আপনার অন্য সেশানগুলি থেকে।</string>
 
     <string name="e2e_re_request_encryption_key_sent">চাবির অনুরোধ পাঠানো।</string>
 
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index e673279881..d99b4e725a 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -251,7 +251,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
 \nToto je nutné pouze jednou. 
 \nOmlouváme se za způsobené nepříjemnosti.</string>
 
-    <string name="e2e_re_request_encryption_key"><u>Znovu požádat o šifrovací klíče</u> z vašich ostatních relací.</string>
+    <string name="e2e_re_request_encryption_key">Znovu požádat o šifrovací klíče z vašich ostatních relací.</string>
 
     <string name="e2e_re_request_encryption_key_sent">Žádost o klíče odeslána.</string>
 
@@ -638,7 +638,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="settings_troubleshoot_diagnostic">Řešit diagnostiku</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">Spustit testy</string>
     <string name="settings_troubleshoot_diagnostic_running_status">Spouštím… (%1$d z %2$d)</string>
-    <string name="settings_troubleshoot_diagnostic_success_status">Základní diagnostika je ok. Pokud stále ještě nedostáváte oznámení, pomůžete nám s vyšetřováním, nahlásíte-li nám to jako chybu.</string>
+    <string name="settings_troubleshoot_diagnostic_success_status">Základní diagnostika je OK. Pokud stále ještě nedostáváte oznámení, pomůžete nám s vyšetřováním, nahlásíte-li nám to jako chybu.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Jeden či více testů selhalo, zkuste navržené opravy.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Jeden či více testů selhalo, prosím, pomůžete nám s vyšetřováním, nahlásíte-li chybu.</string>
 
@@ -1082,7 +1082,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
         <item quantity="other">Zálohuji %d klíčů…</item>
     </plurals>
 
-    <string name="import_e2e_keys_from_file">Importovat E2E klíče ze souboru \"%1$s\".</string>
+    <string name="import_e2e_keys_from_file">Importovat e2e klíče ze souboru \"%1$s\".</string>
 
     <string name="encryption_information_verify_device_warning">Abyste ověřili důvěryhodnost této relace, prosím, kontaktujte jejího majitele nějakým jiným způsobem (např. osobně nebo telefonátem) s otázkou, zda se klíč, jenž je zobrazen v jejich Nastavení uživatele, shoduje s klíčem níže:</string>
     <string name="encryption_information_verify_device_warning2">Pokud se shoduje, klepněte na tlačítko ověřit. Pokud ne, pak někdo jiný zachycuje tuto relaci a měli byste je snad zadat na černou listinu. V budoucnu bude tento ověřovací proces sofistikovanější.</string>
@@ -1340,4 +1340,298 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="no_valid_google_play_services_apk">Žádný platný APK Google Plaz Services nenalezen. Oznámení možná nebudou pracovat spolehlivě.</string>
 
     <string name="store_title">Riot.im - Komunikujte, svým způsobem</string>
+    <string name="store_whats_new">Stále měníme a vylepšujeme Riot.im. Úplný seznam změn je k nalezení zde: %1$s. Abyste zajistili, že nic nezmeškáte, ponechte aktualizace zapnuté.</string>
+    <string name="store_short_description">Univerzální zabezpečená chat aplikace zcela pod Vaší kontrolou.</string>
+    <string name="store_full_description">Chat aplikace pod Vaší kontrolou a zcela flexibilní. Riot Vás nechá komunikovat způsobem, kterým chcete. Vytvořena pro [matrix] - standard otevřené, decentralizované komunikace.
+\n
+\nZaložte si bezplatný účet u matrix.org, založte si svůj server na https://modular.im nebo použijte jiný Matrix server.
+\n
+\nProč zvolit Riot.im\?
+\n
+\n• KOMPLETNÍ KOMUNIKACE: Zakládejte místnosti pro své týmy, přátele, komunitu - jakkoli chcete! Chatujte, sdílejte soubory, přidávejte widgety, komunikujte hovorem či video hovorem - vše bezplatně.
+\n
+\n• HLUBOKÉ INTEGRACE: Používejte Riot.im s nástroji, jež znáte a máte rádi. S Riot.im můžete dokonce chatovat s uživateli a skupinami s jinými chat aplikacemi.
+\n
+\n• SOUKROMÁ A ZABEZBEČENÁ: Udržujte své konverzace tajné. Nejmodernější end-to-end šifrování zaručí, že soukromé konverzace soukromými zůstanou. 
+\n
+\n• OTEVŘENÁ, NE ZAVŘENÁ: Open source a postavená na Matrixu. Staňte se vlastníky svých dat tím, že si založíte vlastní server, nebo si zvolíte ten, jemuž důvěřujete.
+\n
+\n• KDEKOLI JSTE: Zůstaňte v kontaktu, ať už jste kdekoli, s plně synchronizovanou historií zpráv přes všechna svá zařízení nebo online u https://riot.im.</string>
+
+    <string name="passphrase_create_passphrase">Založit heslo</string>
+    <string name="passphrase_confirm_passphrase">Potvrdit heslo</string>
+    <string name="passphrase_enter_passphrase">Zadat heslo</string>
+    <string name="passphrase_passphrase_does_not_match">Heslo se neshoduje</string>
+    <string name="passphrase_empty_error_message">Prosím, zadejte heslo</string>
+    <string name="passphrase_passphrase_too_weak">Heslo je příliš slabé</string>
+
+    <string name="keys_backup_passphrase_not_empty_error_message">Prosím, smažte heslo, přejete-lis si, aby Riot generoval klíč pro obnovu.</string>
+    <string name="keys_backup_no_session_error">Žádná relace Matrix není dostupná</string>
+
+    <string name="keys_backup_setup_step1_title">Nikdy neztraťte šifrované zprávy</string>
+    <string name="keys_backup_setup_step1_description">Zprávy v šifrovaných místnostech jsou zabezpečeny pomocí end.to-end šifrováním. Pouze Vy a adresát(i) máte klíče ke čtení těchto zpráv.</string>
+    <string name="keys_backup_setup">Začít používat zálohu klíčů</string>
+    <string name="keys_backup_setup_step1_advanced">(Pokročilé)</string>
+    <string name="keys_backup_setup_step2_text_title">Zabezpečit zálohu heslem.</string>
+    <string name="keys_backup_setup_step2_text_description">Uložíme zašifrovanou kopii Vašich klíčů na Vašem homeserveru. Chraňte svoji zálohu heslem, abyste ji udrželi v bezpečí.
+\n
+\nZ důvodu nejvyšší bezpečnosti by se mělo lišit od hesla účtu.</string>
+    <string name="keys_backup_setup_step2_button_title">Nastavit heslo</string>
+    <string name="keys_backup_setup_creating_backup">Zálohuji</string>
+    <string name="keys_backup_setup_step1_recovery_key_alternative">Nebo zabezpečte svoji zálohu pomocí klíče obnovy, uloženého někde v bezpečí.</string>
+    <string name="keys_backup_setup_step2_skip_button_title">(Pokročilé) Nastavit s klíčem obnovy</string>
+    <string name="keys_backup_setup_step3_success_title">Podařilo se!</string>
+    <string name="keys_backup_setup_step3_text_line2">Váš klíč obnovy je záchranná síť - lze jej použít pro obnovu Vašich šifrovaných zpráv, pokud zapomenete své heslo.
+\nUchovávejte svůj klíč obnovy velmi bezpečně, např. ve správci hesel (nebo trezoru)</string>
+    <string name="keys_backup_setup_step3_text_line2_no_passphrase">Uchovávejte svůj klíč obnovy velmi bezpečně, např. ve správci hesel (nebo trezoru)</string>
+    <string name="keys_backup_setup_step3_button_title">Hotovo</string>
+    <string name="keys_backup_setup_step3_button_title_no_passphrase">Udělal jsem kopii</string>
+    <string name="keys_backup_setup_step3_copy_button_title">Uložit klíč obnovy</string>
+    <string name="keys_backup_setup_step3_share_recovery_file">Sdílet</string>
+    <string name="keys_backup_setup_step3_save_button_title">Uložit jako soubor</string>
+    <string name="recovery_key_export_saved_as_warning">Klíč obnovy byl uložen do %s\'.
+\n
+\nVarování: může dojít ke smazání tohoto souboru, pokud odstraníte aplikaci.</string>
+
+    <string name="keys_backup_setup_override_backup_prompt_tile">Záloha již existuje na Vašem homeserveru</string>
+    <string name="keys_backup_setup_override_backup_prompt_description">Vypadá to, že jste již nastavili zálohu klíče z jiné relace. Chcete ji nahradit zálohou, již právě provádíte\?</string>
+    <string name="keys_backup_setup_override_replace">Nahradit</string>
+    <string name="keys_backup_setup_override_stop">Zastavit</string>
+
+    <string name="keys_backup_setup_step3_please_make_copy">Prosím, udělat kopii</string>
+    <string name="keys_backup_setup_step3_share_intent_chooser_title">Sdílet klíč obnovy s…</string>
+    <string name="keys_backup_setup_step3_generating_key_status">Generuji klíč obnovy pomocí hesla, tento proces může trvat několi vteřin.</string>
+    <string name="recovery_key">Klíč obnovy</string>
+    <string name="unexpected_error">Neočekávaná chyba</string>
+    <string name="keys_backup_setup_backup_started_title">Zálohování se spustilo</string>
+    <string name="keys_backup_setup_skip_title">Jste si jisti\?</string>
+    <string name="keys_backup_setup_skip_msg">Můžete ztratit přístup ke svým zprávám, pokud se odhlásíte nebo ztratíte toto zařízení.</string>
+
+    <string name="keys_backup_restore_is_getting_backup_version">Načítám verzi zálohy…</string>
+    <string name="keys_backup_restore_with_passphrase">Použijte heslo obnovy k odemknutí historie svých šifrovaných zpráv</string>
+    <string name="keys_backup_restore_use_recovery_key">použít klíč obnovy</string>
+    <string name="keys_backup_restore_with_passphrase_helper_with_link">Neznám Vaše heslo obnovy, můžete %s.</string>
+
+    <string name="keys_backup_restore_with_recovery_key">Použijte svůj klíč obnovy k odemknutí historie svých šifrovaných zpráv</string>
+    <string name="keys_backup_restore_key_enter_hint">Zadat klíč obnovy</string>
+
+    <string name="keys_backup_restore_setup_recovery_key">Obnova zpráv</string>
+
+    <string name="keys_backup_restore_with_key_helper">Ztratili jste klíč obnovy\? Můžete nastavit nový v nastavení.</string>
+    <string name="keys_backup_passphrase_error_decrypt">Zálohu nebylo možno s tímto heslem dešifrovat: prosím, ověřit, že jste zadali správné heslo obnovy.</string>
+    <string name="network_error_please_check_and_retry">Síťová chyba: prosím, ověřte své spojení a opakujte.</string>
+
+    <string name="keys_backup_restoring_waiting_message">Obnovuji zálohu:</string>
+    <string name="keys_backup_restoring_computing_key_waiting_message">Kalkuluji klíč zálohy…</string>
+    <string name="keys_backup_unlock_button">Odemknout historii</string>
+    <string name="keys_backup_recovery_code_empty_error_message">Prosím, zadejte klíč obnovy</string>
+    <string name="keys_backup_recovery_code_error_decrypt">Zálohu nebylo možno s tímto heslem dešifrovat: prosím, ověřte, že jste zadali správný klíč obnovy.</string>
+
+    <string name="keys_backup_restore_success_title">Záloha obnovena %s !</string>
+    <string name="keys_backup_restore_success_description">Obnoveno %1$d relačních klíčů a doplněno %2$d nových klíčů, které této relaci nebyly známy</string>
+    <string name="keys_backup_get_version_error">Načtení poslední verze klíčů obnovy selhalo (%s).</string>
+    <string name="keys_backup_no_keysbackup_sdk_error">Krypto relace není zapnuto</string>
+
+
+    <string name="keys_backup_settings_restore_backup_button">Obnovit ze zálohy</string>
+    <string name="keys_backup_settings_delete_backup_button">Smazat zálohu</string>
+
+    <string name="keys_backup_settings_status_ok">Klíč zálohy byl pro tuto relaci správně nastaven.</string>
+    <string name="keys_backup_settings_status_ko">Záloha klíču není pro tuto relaci zapnuta.</string>
+    <string name="keys_backup_settings_status_not_setup">Vaše klíče nejsou z této relace zálohovány.</string>
+
+    <string name="keys_backup_settings_signature_from_unknown_device">Záloha je podepsána neznámou relací s ID %s.</string>
+    <string name="keys_backup_settings_valid_signature_from_this_device">Záloha má platný podpis z této relace.</string>
+    <string name="keys_backup_settings_valid_signature_from_verified_device">Záloha má platný podpis z ověřené relace %s.</string>
+    <string name="keys_backup_settings_valid_signature_from_unverified_device">Záloha má platný podpis z neověřené relace %s</string>
+    <string name="keys_backup_settings_invalid_signature_from_verified_device">Záloha má neplatný podpis z ověřené relace %s</string>
+    <string name="keys_backup_settings_invalid_signature_from_unverified_device">Záloha má neplatný podpis z neověřené relace %s</string>
+    <string name="keys_backup_get_trust_error">Načtení informace o důvěryhodnosti zálohy (%s) se nezdařilo.</string>
+
+    <string name="keys_backup_settings_untrusted_backup">Abyste použili zálohu klíčů na tuto relaci, obnovte nyní pomocí svého hesla nebo klíče obnovy.</string>
+    <string name="keys_backup_settings_deleting_backup">Odstraňuji zálohu…</string>
+    <string name="keys_backup_settings_delete_backup_error">Odstranění zálohy (%s) selhalo</string>
+
+    <string name="keys_backup_settings_checking_backup_state">Kontroluji stav zálohy</string>
+    <string name="keys_backup_settings_delete_confirm_title">Smazat zálohu</string>
+    <string name="keys_backup_settings_delete_confirm_message">Smazat Vaše zálohované šifrovací klíče ze serveru\? Ke čtení šifrované historie zpráv již nebude moci použít klíč obnovy.</string>
+
+    <string name="new_recovery_method_popup_title">Nová záloha klíče</string>
+    <string name="new_recovery_method_popup_description">Nová bezpečná záloha klíče zpráv byla nalezena.
+\n
+\nPokud jste nenastavili novou metodu obnovy, útočník se může pokoušet o přístup k Vašemu účtu. Ihned změňte heslo svého účtu a nastavte novou metodu obnovy v nastavení.</string>
+    <string name="new_recovery_method_popup_was_me">To jsem byl já</string>
+    <string name="keys_backup_banner_setup_line1">Nikdy neztraťte šifrované zprávy</string>
+    <string name="keys_backup_banner_setup_line2">Začněte používat zálohu klíče</string>
+
+    <string name="keys_backup_banner_recover_line1">Nikdy neztraťte šifrované zprávy</string>
+    <string name="keys_backup_banner_recover_line2">Použíjte zálohu klíče</string>
+
+    <string name="keys_backup_banner_update_line1">Nový bezpečný klíč zpráv</string>
+    <string name="keys_backup_banner_update_line2">Správa v záloze klíčů</string>
+
+    <string name="keys_backup_info_title_version">Verze</string>
+    <string name="keys_backup_info_title_algorithm">Algoritmus</string>
+    <string name="keys_backup_info_title_signature">Podpis</string>
+
+    <string name="autodiscover_invalid_response">Neplatná odpověď z hledání homeserverů</string>
+    <string name="autodiscover_well_known_autofill_dialog_title">Volby serveru automaticky</string>
+    <string name="autodiscover_well_known_autofill_dialog_message">"Riot nalezl vlastní konfiguraci serveru pro doménu Vašeho uživatelského Id  \"%1$s\":
+\n%2$s"</string>
+    <string name="autodiscover_well_known_autofill_confirm">Použít konfiguraci</string>
+
+    <string name="invalid_or_expired_credentials">Byli jste odhlášení kvůli chybným či neplatným ověřovacím údajům.</string>
+
+    <string name="sas_verify_title">Ověřit pomocí srovnání krátkého textového řetězce.</string>
+    <string name="sas_security_advise">Pro nejvyšší bezpečnost doporučujeme, abyste to provedli osobně nebo jiným způsobem důvěryhodné komunikace.</string>
+    <string name="sas_verify_start_button_title">Začít ověření</string>
+    <string name="sas_incoming_request_title">Příchozí požadavek na ověření</string>
+    <string name="sas_incoming_request_description">Ověřuji tuto relaci, abych ji označil za důvěryhodnou. Důvěřování relacím partnerů Vám dodá více klidu mysli, používáte-li end-to-end šifrované zprávy.</string>
+    <string name="sas_incoming_request_description_2">Ověření této relace ji označí za důvěryhodnou a také označí Vaši relaci důvěryhodnou Vašemu partnerovi.</string>
+
+    <string name="sas_emoji_description">Ověřit tuto relaci potvrzením, že se následující emoji ukáže na obrazovce partnera</string>
+    <string name="sas_decimal_description">Ověřit tuto relaci potvrzením, že se následující čísla ukážou na obrazovce partnera</string>
+
+    <string name="sas_incoming_verification_request_dialog">Obdrželi jste příchozí žádost o ověření.</string>
+    <string name="sas_view_request_action">Ukázat žádost</string>
+    <string name="sas_waiting_for_partner">Čekám na potvrzení od partnera…</string>
+
+    <string name="sas_verified">Ověřeno!</string>
+    <string name="sas_verified_successful">Úspěšně jste ověřili tuto relaci.</string>
+    <string name="sas_verified_successful_description">Zabezpečené zprávy s tímto uživatelem jsou end-to-end šifrovány a nemohou být čteny třetími stranami.</string>
+    <string name="sas_got_it">Rozumím</string>
+
+    <string name="sas_verifying_keys">Nic se neukazuje\? Dosud nepodporují všichni klienti interaktivní ověření. Použijte tradiční ověření.</string>
+    <string name="sas_legacy_verification_button_title">Použijte tradiční ověření.</string>
+
+    <string name="sas_verification_request_notification_channel_title">Ověření klíče</string>
+    <string name="sas_cancelled_dialog_title">Žádost zrušena</string>
+    <string name="sas_cancelled_by_other">Druhá strana zrušila ověření.
+\n%s</string>
+    <string name="sas_cancelled_by_me">Ověření je zrušeno.
+\nDůvod: %s</string>
+
+    <string name="sas_verification_request_notification_channel">Interaktivní ověření relace</string>
+    <string name="sas_incoming_request_notif_title">Žádost na ověření</string>
+    <string name="sas_incoming_request_notif_content">%s chce ověřit Vaši relaci</string>
+
+    <string name="sas_error_m_user">Uživatel zrušil ověření</string>
+    <string name="sas_error_m_timeout">Čas ověřovacího procesu vypršel</string>
+    <string name="sas_error_m_unknown_transaction">Tato relace neví o té transakci</string>
+    <string name="sas_error_m_unknown_method">Tato relace se nemůže shodnout na dohodě o klíčích, MAC nebo metodě SAS</string>
+    <string name="sas_error_m_mismatched_commitment">Závazek o haši se neshodnul</string>
+    <string name="sas_error_m_mismatched_sas">SAS se neshodnul</string>
+    <string name="sas_error_m_unexpected_message">Relace obdržela neočekávanou zprávu</string>
+    <string name="sas_error_m_invalid_message">Byla obdržena neplatná zpráva</string>
+    <string name="sas_error_m_key_mismatch">Neshoda klíčů</string>
+    <string name="sas_error_m_user_error">Neshoda uživatelů</string>
+    <string name="sas_error_unknown">Neznámá chyba</string>
+
+    <string name="identity_server_not_defined">Nepoužíváte žádný server pro identity</string>
+    <string name="identity_server_not_defined_for_password_reset">Není konfigurován žádný server pro identity, musíte přenastavit heslo.</string>
+
+    <string name="security_warning_identity_server">Předchozí verze Riotu měly bezpečnostní chybu, jež umožnila serveru pro identity (%1$s) přístup k Vašemu účtu. Pokud důvěřujete %2$s, můžete ignorovat; jinak se, prosím, odhlašte a znovu přihlašte.
+\n
+\nDetaily zde:
+\nhttps://medium.com/@RiotChat/36b4792ea0d6</string>
+
+    <string name="error_user_already_logged_in">Vypadá to, že se chcete připojit k jinému homeserveru. Chcete se odhlásit\?</string>
+
+    <string name="edit">Upravit</string>
+    <string name="reply">Odpovědět</string>
+
+    <string name="global_retry">Opakovat</string>
+    <string name="room_list_empty">Začněte používat aplikaci vstupem do mísnosti.</string>
+    <string name="send_you_invite">Poslali Vám pozvánku</string>
+    <string name="invited_by">%s Vás pozval</string>
+
+    <string name="room_list_catchup_empty_title">Vše jste dohnali!</string>
+    <string name="room_list_catchup_empty_body">Nemáte již žádné nepřečtené zprávy</string>
+    <string name="room_list_catchup_welcome_title">Vítejte doma!</string>
+    <string name="room_list_catchup_welcome_body">Zde doženete nepřečtené zprávy</string>
+    <string name="room_list_people_empty_title">Konverzace</string>
+    <string name="room_list_people_empty_body">Tady budou zobrazeny Vaše přímé konverzace</string>
+    <string name="room_list_rooms_empty_title">Místnosti</string>
+    <string name="room_list_rooms_empty_body">Tady budou zobrazeny Vaše místnosti</string>
+
+    <string name="title_activity_emoji_reaction_picker">Reakce</string>
+    <string name="reactions_agree">Souhlasit</string>
+    <string name="reactions_like">Líbí se</string>
+    <string name="message_add_reaction">Přidat reakci</string>
+    <string name="message_view_reaction">Ukázat reakce</string>
+    <string name="reactions">Reakce</string>
+
+    <string name="event_redacted_by_user_reason">Událost smazána uživatelem</string>
+    <string name="event_redacted_by_admin_reason">Událost moderována správcem místnosti</string>
+    <string name="last_edited_info_message">Naposledy upravil %1$s dne %2$s</string>
+
+
+    <string name="malformed_message">Nečitelná událost, nelze zobrazit</string>
+    <string name="create_new_room">Založit novou místnost</string>
+    <string name="error_no_network">Žádná síť. Prosím, zkontrolujte své spojení do internetu.</string>
+    <string name="action_change">Změnit</string>
+    <string name="change_room_directory_network">Změnit síť</string>
+    <string name="please_wait">Prosím, čekejte…</string>
+    <string name="group_all_communities">Všechny komunity</string>
+
+    <string name="room_preview_no_preview">Nelze provést náhled této místnosti</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">Náhled místnosti čitelné pro všechny zatím RiotX nepodporuje</string>
+
+    <string name="fab_menu_create_room">Místnosti</string>
+    <string name="fab_menu_create_chat">Přímé zprávy</string>
+
+    <string name="create_room_title">Nová místnost</string>
+    <string name="create_room_action_create">ZALOŽIT</string>
+    <string name="create_room_name_hint">Jméno místnosti</string>
+    <string name="create_room_public_title">Veřejná</string>
+    <string name="create_room_public_description">Kdokoli smí vstoupit do této místnosti</string>
+    <string name="create_room_directory_title">Adresář místností</string>
+    <string name="create_room_directory_description">Zveřejnit tuto místnost v adresáři místností</string>
+
+    <string name="keys_backup_unable_to_get_trust_info">Při načítání důvěryhodnosti došlo k chybě</string>
+    <string name="keys_backup_unable_to_get_keys_backup_data">Při načítání dat zálohy klíčů došlo k chybě</string>
+
+    <string name="alpha_disclaimer_title">Vítejte v betě!</string>
+    <string name="alpha_disclaimer_content_line_1">Protože RiotX je v raném vývoji, některé funkce mohou chybět a mohou se objevit i chyby.</string>
+    <string name="alpha_disclaimer_content_line_2_gplay">Seznam nejnovějších funkcí je vždy na %1$s a pokud nejdete chyby, prosím, zapište hlášení v levém horním menu na domovské obrazovce. Opravíme je tak brzy, jak jen můžeme.</string>
+    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Popis v Play Store</string>
+    <string name="alpha_disclaimer_content_line_2_fdroid">Pokud nejdete chyby, prosím, zapište hlášení v levém horním menu na domovské obrazovce. Opravíme je tak brzy, jak jen můžeme.</string>
+
+    <string name="settings_sdk_version">Verze Matrix SDK</string>
+    <string name="settings_other_third_party_notices">Jiná oznámení třetích stran</string>
+    <string name="navigate_to_room_when_already_in_the_room">Již se díváte do této místnosti!</string>
+
+    <string name="quick_reactions">Rychlé reakce</string>
+
+    <string name="settings_general_title">Obecná</string>
+    <string name="settings_preferences">Možnosti</string>
+    <string name="settings_security_and_privacy">Bezpečí &amp; Soukromí</string>
+    <string name="settings_expert">Expert</string>
+    <string name="settings_push_rules">Push pravidla</string>
+    <string name="settings_push_rules_no_rules">Žádná push pravidla nejsou definována</string>
+    <string name="settings_push_gateway_no_pushers">Žádné push brány nejsou registrovány</string>
+
+    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="push_gateway_item_push_key">push_klíč:</string>
+    <string name="push_gateway_item_app_display_name">app_display_name:</string>
+    <string name="push_gateway_item_device_name">jméno_relace:</string>
+    <string name="push_gateway_item_url">Url:</string>
+    <string name="push_gateway_item_format">Formát:</string>
+
+    <string name="preference_voice_and_video">Hlas &amp; Video</string>
+    <string name="preference_root_help_about">Nápověda &amp; O aplikaci</string>
+
+
+    <string name="settings_troubleshoot_test_token_registration_quick_fix">Registrovat token</string>
+
+    <string name="send_suggestion">Učinit návrh</string>
+    <string name="send_suggestion_content">Prosím, zapište svůj návrh níže.</string>
+    <string name="send_suggestion_report_placeholder">Popište svůj návrh tady</string>
+    <string name="send_suggestion_sent">Děkujeme, návrh byl úspěšně odeslán</string>
+    <string name="send_suggestion_failed">Odeslání návrhu selhalo (%s)</string>
+
+    <string name="settings_labs_show_hidden_events_in_timeline">Ukázat skryté události v časovém sledu</string>
+
+    <string name="store_riotx_title">RiotX - Klient Matrixu pro příští generaci</string>
+    <string name="store_riotx_short_description">Rychlejši a lehčí klient Matrixu s nejnovějšími konstrukcemi Androidu</string>
 </resources>
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 77d364b048..c7957dbd5b 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -9,7 +9,7 @@
     <string name="title_activity_home">Nachrichten</string>
     <string name="title_activity_room">"Raum</string>
     <string name="title_activity_settings">Einstellungen</string>
-    <string name="title_activity_member_details">Nutzerdetails</string>
+    <string name="title_activity_member_details">Benutzerdetails</string>
     <string name="title_activity_historical">Historisch</string>
 
     <!-- button names -->
@@ -934,7 +934,7 @@ Willst du welche hinzufügen?</string>
     <string name="download">Download</string>
     <string name="speak">Sprechen</string>
     <string name="clear">Leeren</string>
-    <string name="e2e_re_request_encryption_key">Verschlüsselungsschlüssel von deinen anderen Sitzungen <u>erneut anfragen</u>.</string>
+    <string name="e2e_re_request_encryption_key">Verschlüsselungsschlüssel von deinen anderen Sitzungen erneut anfragen.</string>
 
     <string name="e2e_re_request_encryption_key_sent">Schlüsselanfrage gesendet.</string>
 
@@ -1165,7 +1165,7 @@ Versuche die Anwendung neuzustarten.</string>
     <string name="settings_troubleshoot_test_battery_success">Riot wird nicht von Batterieoptimierungen beeinflusst.</string>
     <string name="settings_notification_troubleshoot">Fehler bei Benachrichtigungen finden</string>
     <string name="settings_troubleshoot_diagnostic">Diagnose von Fehlern</string>
-    <string name="settings_troubleshoot_diagnostic_success_status">Basisdiagnose ist OK. Wenn du immer noch keine Benachrichtigungen bekommst, sende bitte einen Fehlerbericht, damit dies untersucht werden kann.</string>
+    <string name="settings_troubleshoot_diagnostic_success_status">Basisdiagnose ist OK. Wenn du immer noch keine Benachrichtigungen bekommst, sende bitte einen Fehlerbericht, um uns beim nachforschen zu helfen.</string>
     <string name="settings_troubleshoot_test_play_services_title">Prüfung der Play-Dienste</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play-Dienste-APK ist verfügbar und aktuell.</string>
     <string name="settings_troubleshoot_test_token_registration_title">Token-Registrierung</string>
@@ -1378,7 +1378,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="keys_backup_banner_recover_line1">Verliere nie wieder verschlüsselte Nachrichten</string>
     <string name="keys_backup_banner_recover_line2">Benutze Schlüsselsicherung</string>
 
-    <string name="keys_backup_banner_update_line1">Neue Schlüssel für verschlüsselte Nachrichten</string>
+    <string name="keys_backup_banner_update_line1">Neue sichere Schlüssel für Nachrichten</string>
     <string name="keys_backup_banner_update_line2">Verwalte Schlüsselsicherung</string>
 
     <string name="keys_backup_banner_in_progress">Sichere Schlüssel…</string>
@@ -2202,7 +2202,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="crosssigning_other_user_not_trust">Andere Benutzer!nnen vertrauen ihr möglicherweise nicht</string>
     <string name="complete_security">Vollständige Sicherheit</string>
 
-    <string name="verification_open_other_to_verify">Öffne eine vorhandene Sitzung und verwende sie, um diese zu überprüfen und ihr Zugriff auf verschlüsselte Nachrichten zu gewähren.</string>
+    <string name="verification_open_other_to_verify">Nutze eine vorhandene Sitzung um diese Sitzung zu verifizieren und ihr Zugriff auf verschlüsselte Nachrichten zu gewähren.</string>
 
 
     <string name="verification_profile_verify">Verifizieren</string>
@@ -2224,6 +2224,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
 
     <string name="a11y_qr_code_for_verification">QR-Code</string>
 
+    <string name="qr_code_scanned_by_other_notice">Fast geschaft! Zeigt %s dasselbe Schild an\?</string>
     <string name="qr_code_scanned_by_other_yes">Ja</string>
     <string name="qr_code_scanned_by_other_no">Nein</string>
 
@@ -2241,8 +2242,8 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     </plurals>
     <string name="poll_item_selected_aria">Ausgewählte Option</string>
     <string name="command_description_poll">Erstellt eine einfache Umfrage</string>
-    <string name="verification_cannot_access_other_session">Kann nicht auf eine vorhandene Sitzung zugegriffen werden\?</string>
-    <string name="verification_use_passphrase">Verwende deinen Wiederherstellungsschlüssel oder deine Passphrase</string>
+    <string name="verification_cannot_access_other_session">Nutze eine Wiederherstellungsmethode</string>
+    <string name="verification_use_passphrase">Wenn du auf keine existierende Sitzung zugreifen kannst</string>
 
     <string name="new_signin">Neue Anmeldung</string>
 
@@ -2272,4 +2273,78 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="spoiler">Spoiler</string>
     <string name="room_member_power_level_custom_in">Benutzerdefiniert (%1$d) in %2$s</string>
 
+    <string name="login_mobile_device_riotx">RiotX Android</string>
+
+    <string name="settings_key_requests">Schlüsselanforderungen</string>
+
+    <string name="e2e_use_keybackup">Schalte den verschlüsselten Nachrichtenverlauf frei</string>
+
+    <string name="refresh">Neu laden</string>
+
+    <string name="new_session">Neue Sitzung</string>
+    <string name="new_session_review">Tippe für eine Überprüfung &amp; Verifikation</string>
+    <string name="verify_new_session_notice">Benutze diese Sitzung um deine neue zu verfizieren, damit sie auf verschlüsselte Nachrichten zugreifen kann.</string>
+    <string name="verify_new_session_was_not_me">Das war ich nicht</string>
+    <string name="verify_new_session_compromized">Dein Account ist möglicherweise komprimittiert</string>
+
+    <string name="verify_cancel_self_verification_from_untrusted">Wenn du abbrichst, wirst du auf diesem Gerät keine verschlüsselten Nachrichten lesen können, und andere Benutzer werden ihm nicht vertrauen</string>
+    <string name="verify_cancel_self_verification_from_trusted">Wenn du abbrichst, wirst du auf deinem neuen Gerät keine verschlüsselten Nachrichten lesen können, und andere Benutzer werden ihm nicht vertrauen</string>
+    <string name="verify_cancel_other">Du wirst %1$s (%2$s) nicht verifizieren, wenn du jetzt abbrichst. Beginne in deren Nutzerprofil erneut.</string>
+
+    <string name="verify_not_me_self_verification">Eines der folgenden könnte kom­pro­mit­tie­rt sein:
+\n
+\n- Dein Passwort
+\n- Dein Home-Server
+\n- Dieses Gerät, oder das andere Gerät
+\n- Die Internetverbindung, die von den Geräten genutzt wird
+\n
+\nWir empfehlen dir dein Passwort &amp; Wiederherstellungsschlüssel in den Einstellungen sofort zu ändern.</string>
+
+    <string name="verify_cancelled_notice">Verifiziere deine Geräte in den Einstellungen.</string>
+    <string name="verification_cancelled">Verifizierung abgebrochen</string>
+
+    <string name="generate_message_key">Generiere einen Nachrichtenschlüssel</string>
+
+    <string name="confirm_recovery_passphrase">Bestätige %s</string>
+
+    <string name="enter_account_password">Gibe dein %s ein um fortzufahren.</string>
+
+    <string name="bootstrap_info_confirm_text">Gebe deine %s für eine Bestätigung erneut ein.</string>
+    <string name="bootstrap_dont_reuse_pwd">Benutze dein Accountpasswort nicht mehrfach.</string>
+
+
+    <string name="bootstrap_loading_text">Dies könnte einige Sekunden dauern, gedulde dich bitte.</string>
+    <string name="bootstrap_loading_title">Wiederherstellung einrichten.</string>
+    <string name="your_recovery_key">Dein Wiederherstellungsschlüssel</string>
+    <string name="bootstrap_finish_title">Du bist fertig!</string>
+    <string name="keep_it_safe">Bewahre es sicher auf</string>
+    <string name="finish">Abschließen</string>
+
+    <string name="bootstrap_save_key_description">Benutze diesen %1$s als Sicherheit für den Fall, dass du deine %2$s vergisst.</string>
+
+    <string name="bootstrap_crosssigning_progress_initializing">Veröffentliche erstellte Identitätsschlüssel</string>
+    <string name="bootstrap_crosssigning_progress_pbkdf2">Generiere sicheren Schlüssel von der Passphrase</string>
+    <string name="bootstrap_crosssigning_progress_default_key">Definiere SSSS Standardschlüssel</string>
+    <string name="bootstrap_crosssigning_progress_save_msk">Synchronisiere Hauptschlüssel</string>
+    <string name="bootstrap_crosssigning_progress_save_usk">Synchronisiere Benutzerschlüssel</string>
+    <string name="bootstrap_crosssigning_progress_save_ssk">Synchronisiere selbstsignierenden Schlüssel</string>
+    <string name="bootstrap_crosssigning_progress_key_backup">Richte Schlüsselbackup ein</string>
+
+
+    <string name="bootstrap_cross_signing_success">Deine %2$s &amp; %1$s sind nun eingerichtet.
+\n
+\nBewahre sie sicher auf! Du wirst sie benötigen, um verschlüsselte Nachrichten und sichere Informationen freizuschalten, wenn du alle deine aktive Sitzungen verlierst.</string>
+
+    <string name="bootstrap_crosssigning_save_usb">Speichere ihn auf einem USB-Stick oder auf einem Sicherungslaufwerk</string>
+    <string name="error_failed_to_import_keys">Import der Schlüssel fehlgeschlagen</string>
+
+    <string name="settings_notification_configuration">Benachrichtigungskonfiguration</string>
+    <string name="settings_messages_at_room">\@raum enthaltende Nachrichten</string>
+    <string name="settings_messages_in_e2e_group_chat">Verschlüsselte Nachrichten in Gruppenchats</string>
+    <string name="settings_notification_advanced_summary_riotx">Setze die Benachrichtigungswichtigkeit abhängig vom Ereignistyp</string>
+
+    <string name="command_description_plain">Sendet eine Nachricht als einfachen Text, ohne sie als Markdown zu interpretieren</string>
+
+    <string name="auth_invalid_login_param_space_in_password">Inkorrekter Benutzername und/oder Passwort. Das eingegebene Passwort beginnt oder endet mit Leerzeichen, bitte kontrolliere es.</string>
+
 </resources>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index ea432d61bc..393e34604d 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -889,7 +889,7 @@ La visibilité des messages dans Matrix est identique à celle des e-mails. Si n
     <string name="download">Télécharger</string>
     <string name="speak">Parler</string>
     <string name="clear">Effacer</string>
-    <string name="e2e_re_request_encryption_key"><u>Redemander les clés de chiffrement</u> à vos autres sessions.</string>
+    <string name="e2e_re_request_encryption_key">Redemander les clés de chiffrement à vos autres sessions.</string>
 
     <string name="e2e_re_request_encryption_key_sent">Demande de clé envoyée.</string>
 
@@ -1060,7 +1060,7 @@ Veuillez noter que cette action redémarrera l’application et pourra prendre u
     <string name="settings_troubleshoot_diagnostic">Diagnostics de résolution de problème</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">Lancer les tests</string>
     <string name="settings_troubleshoot_diagnostic_running_status">"Exécution…  (%1$d sur %2$d)"</string>
-    <string name="settings_troubleshoot_diagnostic_success_status">Le diagnostic de base est passé. Si vous ne recevez toujours pas de notifications, veuillez envoyer un rapport d’anomalie pour nous aider à résoudre le problème.</string>
+    <string name="settings_troubleshoot_diagnostic_success_status">Le diagnostic de base est passé. Si vous ne recevez toujours pas de notifications, envoyez un rapport d’anomalie pour nous aider à résoudre le problème.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Au moins un test a échoué, essayez les solutions suggérées.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Au moins un test a échoué, veuillez envoyer un rapport d’anomalie pour nous aider à résoudre le problème.</string>
 
@@ -1325,7 +1325,7 @@ Conservez votre clé de récupération en lieu sûr, comme un gestionnaire de mo
     <string name="keys_backup_banner_recover_line1">Ne perdez jamais vos messages chiffrés</string>
     <string name="keys_backup_banner_recover_line2">Utiliser la sauvegarde de clés</string>
 
-    <string name="keys_backup_banner_update_line1">Nouvelles clés de messages chiffrés</string>
+    <string name="keys_backup_banner_update_line1">Nouvelles clés de message sécurisé</string>
     <string name="keys_backup_banner_update_line2">Gérer la sauvegarde de clés</string>
 
     <string name="keys_backup_banner_in_progress">Sauvegarde de clés…</string>
@@ -2152,7 +2152,7 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
     <string name="crosssigning_other_user_not_trust">Les autres utilisateurs ne lui font peut-être pas confiance</string>
     <string name="complete_security">Compléter la sécurité</string>
 
-    <string name="verification_open_other_to_verify">Ouvrez une session existante et utilisez-la pour vérifier celle-ci, pour lui permettre d’accéder aux messages chiffrés.</string>
+    <string name="verification_open_other_to_verify">Utilisez une session existante pour vérifier celle-ci, ce qui lui permettra d’avoir accès aux messages chiffrés.</string>
 
 
     <string name="verification_profile_verify">Vérifier</string>
@@ -2174,6 +2174,7 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 
     <string name="a11y_qr_code_for_verification">Code QR</string>
 
+    <string name="qr_code_scanned_by_other_notice">On y est presque ! Est-ce que %s affiche le même bouclier \?</string>
     <string name="qr_code_scanned_by_other_yes">Oui</string>
     <string name="qr_code_scanned_by_other_no">Non</string>
 
@@ -2191,16 +2192,16 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
     </plurals>
     <string name="poll_item_selected_aria">Option sélectionnée</string>
     <string name="command_description_poll">Crée un sondage simple</string>
-    <string name="verification_cannot_access_other_session">Vous n’avez pas accès à une session existante \?</string>
-    <string name="verification_use_passphrase">Utilisez votre clé de récupération ou votre phrase de passe</string>
+    <string name="verification_cannot_access_other_session">Utiliser une méthode de récupération</string>
+    <string name="verification_use_passphrase">Si vous n’avez pas accès à une session existante</string>
 
     <string name="new_signin">Nouvelle connexion</string>
 
     <string name="enter_secret_storage_invalid">Impossible de trouver les secrets dans le stockage</string>
-    <string name="enter_secret_storage_passphrase">Saisir la phrase de passe du coffre secret</string>
+    <string name="enter_secret_storage_passphrase">Saisir la phrase secrète du coffre secret</string>
     <string name="enter_secret_storage_passphrase_warning">Attention :</string>
     <string name="enter_secret_storage_passphrase_warning_text">Vous devriez accéder à votre coffre secret uniquement depuis un appareil de confiance</string>
-    <string name="enter_secret_storage_passphrase_reason_verify">Accédez à l’historique de vos messages sécurisés et à votre identité de signature croisée pour vérifier d’autres sessions en saisissant votre phrase de passe</string>
+    <string name="enter_secret_storage_passphrase_reason_verify">Accédez à l’historique de vos messages sécurisés et à votre identité de signature croisée pour vérifier d’autres sessions en saisissant votre phrase secrète</string>
 
     <string name="message_action_item_redact">Supprimer…</string>
     <string name="share_confirm_room">Voulez-vous envoyer cette pièce jointe à %1$s \?</string>
@@ -2219,4 +2220,109 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 
     <string name="keys_backup_restore_success_title_already_up_to_date">Les clés sont déjà à jour !</string>
 
+    <string name="login_mobile_device_riotx">RiotX Android</string>
+
+    <string name="settings_key_requests">Demandes de clé</string>
+
+    <string name="e2e_use_keybackup">Déverrouiller l’historique des messages chiffrés</string>
+
+    <string name="refresh">Actualiser</string>
+
+    <string name="new_session">Nouvelle session</string>
+    <string name="new_session_review">Appuyer pour examiner et vérifier</string>
+    <string name="verify_new_session_notice">Utilisez cette session pour vérifiez la nouvelle, ce qui lui permettra d’avoir accès aux messages chiffrés.</string>
+    <string name="verify_new_session_was_not_me">Ce n’était pas moi</string>
+    <string name="verify_new_session_compromized">Votre compte est peut-être compromis</string>
+
+    <string name="verify_cancel_self_verification_from_untrusted">Si vous annulez, vous ne pourrez pas lire les messages chiffrés sur cet appareil, et les autres utilisateurs ne lui feront pas confiance</string>
+    <string name="verify_cancel_self_verification_from_trusted">Si vous annulez, vous ne pourrez pas lire les messages chiffrés sur votre nouvel appareil, et les autres utilisateurs ne lui feront pas confiance</string>
+    <string name="verify_cancel_other">Vous ne vérifierez pas %1$s (%2$s) si vous annulez maintenant. Recommencez sur son profil utilisateur.</string>
+
+    <string name="verify_not_me_self_verification">Un des éléments suivants est peut-être compromis :
+\n
+\n- Votre mot de passe
+\n- Votre serveur d’accueil
+\n- Cet appareil ou l’autre appareil
+\n- La connexion internet utilisée par un des deux appareils
+\n
+\nNous vous recommandons de modifier immédiatement votre mot de passe et votre clé de récupération dans les paramètres.</string>
+
+    <string name="verify_cancelled_notice">Vérifiez vos appareils depuis les paramètres.</string>
+    <string name="verification_cancelled">Vérification annulée</string>
+
+    <string name="recovery_passphrase">mot de passe des messages</string>
+    <string name="message_key">clé des messages</string>
+    <string name="account_password">Mot de passe du compte</string>
+
+    <string name="set_recovery_passphrase">Définissez un %s</string>
+    <string name="generate_message_key">Générez une clé de messages</string>
+
+    <string name="confirm_recovery_passphrase">Confirmez le %s</string>
+
+    <string name="enter_account_password">Saisissez votre %s pour continuer.</string>
+
+    <string name="bootstrap_info_text">Sécurisez et débloquez vos messages chiffrés et vos vérifications avec un %s.</string>
+    <string name="bootstrap_info_confirm_text">Saisissez à nouveau votre %s pour le confirmer.</string>
+    <string name="bootstrap_dont_reuse_pwd">Ne réutilisez pas votre mot de passe de compte.</string>
+
+
+    <string name="bootstrap_loading_text">Cela peut prendre plusieurs secondes, veuillez patienter.</string>
+    <string name="bootstrap_loading_title">Configuration de la récupération.</string>
+    <string name="your_recovery_key">Votre clé de récupération</string>
+    <string name="bootstrap_finish_title">Vous avez terminé !</string>
+    <string name="keep_it_safe">Conservez-le en lieu sûr</string>
+    <string name="finish">Terminer</string>
+
+    <string name="bootstrap_save_key_description">Utilisez cette %1$s comme filet de sécurité au cas où vous oublieriez votre %2$s.</string>
+
+    <string name="bootstrap_crosssigning_progress_initializing">Publication des clés d’identité créées</string>
+    <string name="bootstrap_crosssigning_progress_pbkdf2">Génération d’une clé sécurisée depuis la phrase secrète</string>
+    <string name="bootstrap_crosssigning_progress_default_key">Définition de la clé par défaut du SSSS</string>
+    <string name="bootstrap_crosssigning_progress_save_msk">Synchronisation de la clé maîtresse</string>
+    <string name="bootstrap_crosssigning_progress_save_usk">Synchronisation de la clé de l’utilisateur</string>
+    <string name="bootstrap_crosssigning_progress_save_ssk">Synchronisation de la clé d’auto-signature</string>
+    <string name="bootstrap_crosssigning_progress_key_backup">Configuration de la sauvegarde de clés</string>
+
+
+    <string name="bootstrap_cross_signing_success">Votre %2$s et votre %1$s sont bien réglés.
+\n
+\nConservez-les en lieu sûr ! Vous en aurez besoin pour débloquer les messages chiffrés et vos informations sécurisées si vous perdez toutes vos sessions actives.</string>
+
+    <string name="bootstrap_crosssigning_print_it">Imprimez-le et conservez-le en lieu sûr</string>
+    <string name="bootstrap_crosssigning_save_usb">Sauvegardez-le sur une clé USB ou un disque de sauvegarde</string>
+    <string name="bootstrap_crosssigning_save_cloud">Copiez-le sur votre stockage dans le cloud personnel</string>
+
+    <string name="auth_flow_not_supported">Vous ne pouvez pas faire ça depuis votre portable</string>
+
+    <string name="bootstrap_skip_text">La configuration d’un mot de passe de messages vous permet des sécuriser et déverrouiller les messages chiffrés et les vérifications.
+\n
+\nSi vous ne voulez pas définir un mot de passe de messages, générez plutôt une clé de messages.</string>
+    <string name="bootstrap_skip_text_no_gen_key">La configuration d’un mot de passe de messages vous permet des sécuriser et déverrouiller les messages chiffrés et les vérifications.</string>
+
+
+    <string name="encryption_enabled">Chiffrement activé</string>
+    <string name="encryption_enabled_tile_description">Les messages de ce salon sont chiffrés de bout en bout. Apprenez-en plus et vérifiez les utilisateurs sur leur profil.</string>
+    <string name="encryption_not_enabled">Chiffrement pas activé</string>
+    <string name="encryption_unknown_algorithm_tile_description">Le chiffrement utilisé par ce salon n’est pas pris en charge</string>
+
+    <string name="room_created_summary_item">%s a créé et configuré ce salon.</string>
+
+    <string name="qr_code_scanned_self_verif_notice">On y est presque ! L’autre appareil affiche-t-il le même bouclier \?</string>
+    <string name="qr_code_scanned_verif_waiting_notice">On y est presque ! En attente de la confirmation…</string>
+    <string name="qr_code_scanned_verif_waiting">En attente de %s…</string>
+
+    <string name="error_failed_to_import_keys">Échec de l’importation des clés</string>
+
+    <string name="settings_notification_configuration">Configuration des notifications</string>
+    <string name="settings_messages_at_room">Messages contenant @room</string>
+    <string name="settings_messages_in_e2e_one_to_one">Messages chiffrés dans les discussions individuelles</string>
+    <string name="settings_messages_in_e2e_group_chat">Messages chiffrés dans les discussions de groupe</string>
+    <string name="settings_when_rooms_are_upgraded">Quand les salons sont mis à niveau</string>
+    <string name="settings_troubleshoot_title">Résolution de problèmes</string>
+    <string name="settings_notification_advanced_summary_riotx">Définir l’importance des notifications par évènement</string>
+
+    <string name="command_description_plain">Envoie un message en texte simple, sans l’interpréter comme du Markdown</string>
+
+    <string name="auth_invalid_login_param_space_in_password">Nom et/ou mot de passe incorrect(s). Le mot de passe saisi commence ou se termine par des espaces, veuillez le vérifier.</string>
+
 </resources>
diff --git a/vector/src/main/res/values-gl/strings.xml b/vector/src/main/res/values-gl/strings.xml
index e708f27c70..c01d8afcf4 100644
--- a/vector/src/main/res/values-gl/strings.xml
+++ b/vector/src/main/res/values-gl/strings.xml
@@ -460,7 +460,7 @@ Pode engadir a dirección de correo na sección de configuración de perfil.</st
     <string name="event_formatter_widget_removed">%1$s eliminado por %2$s</string>
     <plurals name="active_widgets">
         <item quantity="one">1 trebello activo</item>
-        <item quantity="other">%1 trebellos activos</item>
+        <item quantity="other">%d trebellos activos</item>
     </plurals>
 
     <string name="widget_integration_unable_to_create">Non se puido crear o trebello.</string>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index c40bd860b8..f0bd199894 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -884,7 +884,7 @@ Matrixban az üzenetek láthatósága hasonlít az e-mailre. Az üzenet törlés
     <string name="download">Letöltés</string>
     <string name="speak">Beszélj</string>
     <string name="clear">Törlés</string>
-    <string name="e2e_re_request_encryption_key">Végpontok közötti titkosításhoz használt <u>kulcsok újrakérése</u> a többi munkamenetedtől.</string>
+    <string name="e2e_re_request_encryption_key">Végpontok közötti titkosításhoz használt kulcsok újrakérése a többi munkamenetedtől.</string>
 
     <string name="e2e_re_request_encryption_key_sent">Kulcs újrakérve.</string>
 
@@ -1319,7 +1319,7 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="keys_backup_banner_recover_line1">Soha ne veszíts el titkosított üzenetet</string>
     <string name="keys_backup_banner_recover_line2">Kulcs Mentés használata</string>
 
-    <string name="keys_backup_banner_update_line1">Új titkosítási kulcsok</string>
+    <string name="keys_backup_banner_update_line1">Új titkosított üzenet kulcsok</string>
     <string name="keys_backup_banner_update_line2">Kulcs Mentések kezelése</string>
 
     <string name="keys_backup_banner_in_progress">Kulcsok mentése…</string>
@@ -2169,6 +2169,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 
     <string name="a11y_qr_code_for_verification">QR kód</string>
 
+    <string name="qr_code_scanned_by_other_notice">Majdnem kész! %s is ugyanazt a pajzsot mutatja\?</string>
     <string name="qr_code_scanned_by_other_yes">Igen</string>
     <string name="qr_code_scanned_by_other_no">Nem</string>
 
@@ -2186,8 +2187,8 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     </plurals>
     <string name="poll_item_selected_aria">Kiválasztott Beállítások</string>
     <string name="command_description_poll">Egyszerű szavazás készítése</string>
-    <string name="verification_cannot_access_other_session">A létező munkamenet nem érhető el\?</string>
-    <string name="verification_use_passphrase">Használd a visszaállítási kulcsot vagy jelmondatot</string>
+    <string name="verification_cannot_access_other_session">Használd a visszaállítási eljárást</string>
+    <string name="verification_use_passphrase">Ha nem érsz el létező munkamenetet</string>
 
     <string name="new_signin">Új Bejelentkezés</string>
 
@@ -2214,4 +2215,109 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 
     <string name="keys_backup_restore_success_title_already_up_to_date">A kulcsok már frissek!</string>
 
+    <string name="login_mobile_device_riotx">RiotX Android</string>
+
+    <string name="settings_key_requests">Kulcs kérések</string>
+
+    <string name="e2e_use_keybackup">Régi titkosított üzenetek feloldása</string>
+
+    <string name="refresh">Frissítés</string>
+
+    <string name="new_session">Új munkamenet</string>
+    <string name="new_session_review">A megtekintéshez és ellenőrzéshez koppints</string>
+    <string name="verify_new_session_notice">Az új munkamenet ellenőrzéséhez használd ezt, amivel hozzáférést adsz a titkosított üzenetekhez.</string>
+    <string name="verify_new_session_was_not_me">Nem én voltam</string>
+    <string name="verify_new_session_compromized">A fiókodat lehet, hogy feltörték</string>
+
+    <string name="verify_cancel_self_verification_from_untrusted">Ha megszakítod akkor ezen az eszközön nem tudod majd elolvasni a titkosított üzeneteket és mások nem fogják megbízhatónak látni</string>
+    <string name="verify_cancel_self_verification_from_trusted">Ha megszakítod akkor az eszközödön nem tudod majd elolvasni a titkosított üzeneteket és mások nem fogják megbízhatónak látni</string>
+    <string name="verify_cancel_other">Ha most megszakítod akkor ezt nem fogod ellenőrizni: %1$s (%2$s). A felhasználói profilból újrakezdheted.</string>
+
+    <string name="verify_not_me_self_verification">Az egyik az alábbiak közül kompromittálódhatott:
+\n
+\n- A jelszavad
+\n- A matrix szervered
+\n- Ez vagy egy másik eszköz
+\n- Valamelyik eszköz által használt internet elérés
+\n
+\nJavasoljuk, hogy azonnal cseréld le a jelszavadat és a visszaállítási kulcsot a Beállításokban.</string>
+
+    <string name="verify_cancelled_notice">Ellenőrizd az eszközödet a Beállításokból.</string>
+    <string name="verification_cancelled">Ellenőrzés megszakítva</string>
+
+    <string name="recovery_passphrase">Üzenet Jelszó</string>
+    <string name="message_key">Üzenet Kulcs</string>
+    <string name="account_password">Fiók Jelszó</string>
+
+    <string name="set_recovery_passphrase">Beállítás: %s</string>
+    <string name="generate_message_key">Üzenet kulcs létrehozása</string>
+
+    <string name="confirm_recovery_passphrase">Megerősít: %s</string>
+
+    <string name="enter_account_password">A továbblépéshez add meg: %s.</string>
+
+    <string name="bootstrap_info_text">Helyezd biztonságba és férj hozzá a titkosított üzenetekhez valamint bízz meg benne ezzel: %s.</string>
+    <string name="bootstrap_info_confirm_text">A megerősítéshez add meg újra ezt: %s.</string>
+    <string name="bootstrap_dont_reuse_pwd">Ne a fiók jelszavadat használd.</string>
+
+
+    <string name="bootstrap_loading_text">Ez eltarthat néhány másodpercig, kérlek legyél türelmes.</string>
+    <string name="bootstrap_loading_title">Visszaállítás beállítása.</string>
+    <string name="your_recovery_key">Visszaállítási kulcsod</string>
+    <string name="bootstrap_finish_title">Kész vagy!</string>
+    <string name="keep_it_safe">Tartsd biztonságban</string>
+    <string name="finish">Befejez</string>
+
+    <string name="bootstrap_save_key_description">A biztonság kedvéért használd ezt: %1$s arra az esetre ha elfelejtenéd ezt: %2$s.</string>
+
+    <string name="bootstrap_crosssigning_progress_initializing">Az elkészített azonosítási kulcsok közzé tétele</string>
+    <string name="bootstrap_crosssigning_progress_pbkdf2">Biztonságos kulcs készítése a jelmondatból</string>
+    <string name="bootstrap_crosssigning_progress_default_key">SSSS alapértelmezett kulcs meghatározása</string>
+    <string name="bootstrap_crosssigning_progress_save_msk">Mester kulcs szinkronizálása</string>
+    <string name="bootstrap_crosssigning_progress_save_usk">Felhasználói kulcs szinkronizálása</string>
+    <string name="bootstrap_crosssigning_progress_save_ssk">Saját magával aláírt kulcs szinkronizálása</string>
+    <string name="bootstrap_crosssigning_progress_key_backup">Kulcs Mentés beállítása</string>
+
+
+    <string name="bootstrap_cross_signing_success">Ezek lettek beállítva: %2$s és %1$s.
+\n
+\nTartsd őket biztonságban! Szükség lesz rájuk a titkosított üzenetek és biztonsági információk eléréséhez ha minden aktív munkameneted megszűnik.</string>
+
+    <string name="bootstrap_crosssigning_print_it">Nyomtasd ki és tárold valahol biztonságos helyen</string>
+    <string name="bootstrap_crosssigning_save_usb">Mentsd el egy USB kulcsra vagy mentő eszközre</string>
+    <string name="bootstrap_crosssigning_save_cloud">Másold fel a személyes felhő tárhelyedre</string>
+
+    <string name="auth_flow_not_supported">Mobilról ezt nem tudod megtenni</string>
+
+    <string name="bootstrap_skip_text">Az Üzenet Jelszó beállításával biztonságba helyezheted és hozzáférhetsz a titkosított üzeneteidhez valamint a bizalomhoz.
+\n
+\nHa nem akarsz Üzenet Jelszót beállítani, hozz létre inkább Üzenet Kulcsot.</string>
+    <string name="bootstrap_skip_text_no_gen_key">Az Üzenet Jelszó beállításával biztonságba helyezheted és hozzáférhetsz a titkosított üzeneteidhez valamint a bizalomhoz.</string>
+
+
+    <string name="encryption_enabled">Titkosítás bekapcsolva</string>
+    <string name="encryption_enabled_tile_description">Ebben a szobában az üzenetek végpontok között titkosítottak. További információkért és ellenőrzéshez nyisd meg a felhasználók profilját.</string>
+    <string name="encryption_not_enabled">Titkosítás nincs engedélyezve</string>
+    <string name="encryption_unknown_algorithm_tile_description">A szobában használt titkosítás nem támogatott</string>
+
+    <string name="room_created_summary_item">%s elkészítette és beállította a szobát.</string>
+
+    <string name="qr_code_scanned_self_verif_notice">Majdnem kész! A többi eszközöd is ugyanazt a pajzsot mutatja\?</string>
+    <string name="qr_code_scanned_verif_waiting_notice">Majdnem kész! Várakozás a megerősítésre…</string>
+    <string name="qr_code_scanned_verif_waiting">Várakozás erre: %s…</string>
+
+    <string name="error_failed_to_import_keys">A kulcsok betöltése sikertelen</string>
+
+    <string name="settings_notification_configuration">Értesítések beállítása</string>
+    <string name="settings_messages_at_room">Az üzenetek „@room”-ot tartalmaznak</string>
+    <string name="settings_messages_in_e2e_one_to_one">Titkosított üzenetek közvetlen csevegésekben</string>
+    <string name="settings_messages_in_e2e_group_chat">Titkosított üzenetek a csoportos beszélgetésekben</string>
+    <string name="settings_when_rooms_are_upgraded">Ha a szobák fejlesztésre kerülnek</string>
+    <string name="settings_troubleshoot_title">Hibakeresés</string>
+    <string name="settings_notification_advanced_summary_riotx">Értesítés fontosságának beállítása eseménynél</string>
+
+    <string name="command_description_plain">Az üzenet elküldése sima szövegként anélkül, hogy „markdown” formázás lenne</string>
+
+    <string name="auth_invalid_login_param_space_in_password">Felhasználói név és/vagy jelszó hibás. A beírt jelszó szóközzel kezdődik vagy ér véget, kérlek ellenőrizd.</string>
+
 </resources>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 65e78c601f..d673406407 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -939,7 +939,7 @@
     <string name="download">Scarica</string>
     <string name="speak">Parla</string>
     <string name="clear">Svuota</string>
-    <string name="e2e_re_request_encryption_key"><u>Richiedi di nuovo le chiavi di crittografia</u> dalle tue altre sessioni.</string>
+    <string name="e2e_re_request_encryption_key">Richiedi di nuovo le chiavi di crittografia dalle tue altre sessioni.</string>
 
     <string name="e2e_re_request_encryption_key_sent">La richiesta della chiave è stata inviata.</string>
 
@@ -1392,7 +1392,7 @@
     <string name="keys_backup_banner_recover_line1">Non perdere mai i messaggi cifrati</string>
     <string name="keys_backup_banner_recover_line2">Usa il Backup delle chiavi</string>
 
-    <string name="keys_backup_banner_update_line1">Nuove chiavi di crittografia</string>
+    <string name="keys_backup_banner_update_line1">Nuove chiavi per messaggi sicuri</string>
     <string name="keys_backup_banner_update_line2">Gestisci nel Backup delle chiavi</string>
 
     <string name="keys_backup_banner_in_progress">Backup chiavi in corso…</string>
@@ -2197,7 +2197,7 @@
     <string name="crosssigning_other_user_not_trust">Gli altri utenti potrebbero non fidarsi</string>
     <string name="complete_security">Completa la sicurezza</string>
 
-    <string name="verification_open_other_to_verify">Apri una sessione esistente e usala per verificare questa, dandole l\'accesso ai messaggi cifrati.</string>
+    <string name="verification_open_other_to_verify">Usa una sessione esistente per verificare questa, dandole l\'accesso ai messaggi cifrati.</string>
 
 
     <string name="verification_profile_verify">Verifica</string>
@@ -2219,6 +2219,7 @@
 
     <string name="a11y_qr_code_for_verification">Codice QR</string>
 
+    <string name="qr_code_scanned_by_other_notice">Quasi fatto! %s sta mostrando lo stesso scudo\?</string>
     <string name="qr_code_scanned_by_other_yes">Sì</string>
     <string name="qr_code_scanned_by_other_no">No</string>
 
@@ -2236,8 +2237,8 @@
     </plurals>
     <string name="poll_item_selected_aria">Opzione selezionata</string>
     <string name="command_description_poll">Crea un semplice sondaggio</string>
-    <string name="verification_cannot_access_other_session">Non puoi accedere ad una sessione esistente\?</string>
-    <string name="verification_use_passphrase">Usa la chiave di recupero o la password</string>
+    <string name="verification_cannot_access_other_session">Usa un metodo di recupero</string>
+    <string name="verification_use_passphrase">Se non puoi accedere a una sessione esistente</string>
 
     <string name="new_signin">Nuovo accesso</string>
 
@@ -2264,4 +2265,109 @@
 
     <string name="keys_backup_restore_success_title_already_up_to_date">Le chiavi sono già aggiornate!</string>
 
+    <string name="login_mobile_device_riotx">RiotX Android</string>
+
+    <string name="settings_key_requests">Richieste di chiavi</string>
+
+    <string name="e2e_use_keybackup">Sblocca la cronologia dei messaggi cifrati</string>
+
+    <string name="refresh">Ricarica</string>
+
+    <string name="new_session">Nuova sessione</string>
+    <string name="new_session_review">Tocca per controllare e verificare</string>
+    <string name="verify_new_session_notice">Usa questa sessione per verificare quella nuova, dandole l\'accesso ai messaggi cifrati.</string>
+    <string name="verify_new_session_was_not_me">Non ero io</string>
+    <string name="verify_new_session_compromized">Il tuo account potrebbe essere compromesso</string>
+
+    <string name="verify_cancel_self_verification_from_untrusted">Se annulli, non potrai leggere i messaggi cifrati su questo dispositivo e altri utenti non si fideranno di esso</string>
+    <string name="verify_cancel_self_verification_from_trusted">Se annulli, non potrai leggere i messaggi cifrati sul tuo nuovo dispositivo e altri utenti non si fideranno di esso</string>
+    <string name="verify_cancel_other">Non verificherai %1$s (%2$s) se annulli adesso. Ricomincia nel suo profilo utente.</string>
+
+    <string name="verify_not_me_self_verification">Uno dei seguenti potrebbe essere compromesso:
+\n
+\n- La tua password
+\n- Il tuo homeserver
+\n- Questo dispositivo, o l\'altro
+\n- La connessione internet usata da uno dei dispositivi
+\n
+\nTi consigliamo di cambiare immediatamente la password e le chiavi di recupero nelle impostazioni.</string>
+
+    <string name="verify_cancelled_notice">Verifica i tuoi dispositivi dalle impostazioni.</string>
+    <string name="verification_cancelled">Verifica annullata</string>
+
+    <string name="recovery_passphrase">password dei messaggi</string>
+    <string name="message_key">chiave dei messaggi</string>
+    <string name="account_password">password dell\'account</string>
+
+    <string name="set_recovery_passphrase">Imposta una %s</string>
+    <string name="generate_message_key">Genera una chiave dei messaggi</string>
+
+    <string name="confirm_recovery_passphrase">Conferma la %s</string>
+
+    <string name="enter_account_password">Inserisci la tua %s per continuare.</string>
+
+    <string name="bootstrap_info_text">Proteggi e sblocca i messaggi cifrati e fidati con una %s.</string>
+    <string name="bootstrap_info_confirm_text">Inserisci la tua %s di nuovo per confermarla.</string>
+    <string name="bootstrap_dont_reuse_pwd">Non riutilizzare la tua password dell\'account.</string>
+
+
+    <string name="bootstrap_loading_text">Potrebbe impiegarci qualche secondo, porta pazienza.</string>
+    <string name="bootstrap_loading_title">Inizializzazione del ripristino.</string>
+    <string name="your_recovery_key">La tua chiave di recupero</string>
+    <string name="bootstrap_finish_title">Hai finito!</string>
+    <string name="keep_it_safe">Tienila al sicuro</string>
+    <string name="finish">Fine</string>
+
+    <string name="bootstrap_save_key_description">Usa questa %1$s come una rete di salvataggio in caso ti dimentichi la tua %2$s.</string>
+
+    <string name="bootstrap_crosssigning_progress_initializing">Pubblicazione delle chiavi di identità create</string>
+    <string name="bootstrap_crosssigning_progress_pbkdf2">Generazione della chiave sicura dalla password</string>
+    <string name="bootstrap_crosssigning_progress_default_key">Definizione della chiave predefinita SSSS</string>
+    <string name="bootstrap_crosssigning_progress_save_msk">Sincronizzazione della chiave principale</string>
+    <string name="bootstrap_crosssigning_progress_save_usk">Sincronizzazione della chiave utente</string>
+    <string name="bootstrap_crosssigning_progress_save_ssk">Sincronizzazione della chiave di auto-firma</string>
+    <string name="bootstrap_crosssigning_progress_key_backup">Inizializzazione del backup chiavi</string>
+
+
+    <string name="bootstrap_cross_signing_success">La tua %2$s e la %1$s sono ora impostate.
+\n
+\nTienile al sicuro! Ti serviranno per sbloccare i messaggi cifrati e informazioni sicure se perdi tutte le tue sessioni attive.</string>
+
+    <string name="bootstrap_crosssigning_print_it">Stampala e conservala in un posto sicuro</string>
+    <string name="bootstrap_crosssigning_save_usb">Salvala in una penna USB o disco di backup</string>
+    <string name="bootstrap_crosssigning_save_cloud">Copiala nella tua archiviazione online</string>
+
+    <string name="auth_flow_not_supported">Non puoi farlo da mobile</string>
+
+    <string name="bootstrap_skip_text">Impostare una password dei messaggi ti consente di proteggere e sbloccare i messaggi cifrati e di fidarti.
+\n
+\nSe non vuoi impostare una password dei messaggi, genera una chiave dei messaggi.</string>
+    <string name="bootstrap_skip_text_no_gen_key">Impostare una password dei messaggi ti consente di proteggere e sbloccare i messaggi cifrati e di fidarti.</string>
+
+
+    <string name="encryption_enabled">Cifratura attiva</string>
+    <string name="encryption_enabled_tile_description">I messaggi in questa stanza sono cifrati end-to-end. Maggiori info e verifica degli utenti nel loro profilo.</string>
+    <string name="encryption_not_enabled">Cifratura non attiva</string>
+    <string name="encryption_unknown_algorithm_tile_description">La cifratura usata da questa stanza non è supportata</string>
+
+    <string name="room_created_summary_item">%s ha creato e configurato la stanza.</string>
+
+    <string name="qr_code_scanned_self_verif_notice">Quasi fatto! L\'altro dispositivo sta mostrando lo stesso scudo\?</string>
+    <string name="qr_code_scanned_verif_waiting_notice">Quasi fatto! In attesa della conferma…</string>
+    <string name="qr_code_scanned_verif_waiting">In attesa di %s…</string>
+
+    <string name="error_failed_to_import_keys">Importazione chiavi fallita</string>
+
+    <string name="settings_notification_configuration">Configurazione delle notifiche</string>
+    <string name="settings_messages_at_room">Messaggi contenenti @room</string>
+    <string name="settings_messages_in_e2e_one_to_one">Messaggi cifrati in conversazioni private</string>
+    <string name="settings_messages_in_e2e_group_chat">Messaggi cifrati in chat di gruppo</string>
+    <string name="settings_when_rooms_are_upgraded">Quando le stanze vengono aggiornate</string>
+    <string name="settings_troubleshoot_title">Risoluzione problemi</string>
+    <string name="settings_notification_advanced_summary_riotx">Imposta l\'importanza della notifica per evento</string>
+
+    <string name="command_description_plain">Invia un messaggio come testo semplice, senza interpretarlo come markdown</string>
+
+    <string name="auth_invalid_login_param_space_in_password">Nome utente e/o password errati. La password inserita inizia o termina con spazi, controllala.</string>
+
 </resources>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 427eeee332..cd453c83b1 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -1811,6 +1811,8 @@
     <string name="room_widget_permission_room_id">ID комнаты</string>
 
 
+    <string name="resources_script">Cyrl</string>
+
     <string name="settings_integrations_summary">Используйте менеджер интеграций чтобы управлять ботами, мостами, виджетами и наборами стикеров.
 \nМенеджеры интеграций получают данные о конфигурации, могут изменять виджеты, отправлять приглашения в комнаты и устанавливать права от вашего имени.</string>
     <string name="room_widget_permission_webview_shared_info_title">"Использование может оставить cookie на вашем устройстве и отправить данные в  %s:"</string>
@@ -1828,4 +1830,20 @@
     <string name="room_widget_webview_access_microphone">Использовать микрофон</string>
     <string name="room_widget_webview_read_protected_media">Получать доступ к медиа, защищённым DRM</string>
 
+    <string name="a11y_create_room">Создать новую комнату</string>
+    <string name="a11y_show_password">Показать пароль</string>
+    <string name="a11y_hide_password">Скрыть пароль</string>
+    <string name="attachment_type_file">Файл</string>
+    <string name="attachment_type_camera">Камера</string>
+    <string name="attachment_type_audio">Звук</string>
+    <string name="attachment_type_gallery">Галерея</string>
+    <string name="report_content_spam">Это спам</string>
+    <string name="message_ignore_user">Заблокировать пользователя</string>
+
+    <string name="room_list_quick_actions_notifications_all">Все сообщения</string>
+    <string name="room_list_quick_actions_notifications_mentions">Только упоминания</string>
+    <string name="room_list_quick_actions_settings">Настройки</string>
+    <string name="room_list_quick_actions_leave">Покинуть комнату</string>
+    <string name="room_join_rules_public">%1$s сделал комнату доступной для всех, у кого есть ссылка.</string>
+    <string name="room_join_rules_invite">%1$s сделал комнату доступной только по приглашению.</string>
 </resources>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index 15164a6e90..453de4cda3 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -831,7 +831,7 @@
     <string name="login_error_limit_exceeded">Janë dërguar shumë kërkesa</string>
     <string name="login_error_login_email_not_yet">Lidhja email që s’është klikuar ende</string>
 
-    <string name="e2e_re_request_encryption_key"><u>Rikërkoni kyçe fshehtëzimi</u> prej sesionesh tuaj të tjerë.</string>
+    <string name="e2e_re_request_encryption_key">Rikërkoni kyçe fshehtëzimi prej sesionesh tuaj të tjerë.</string>
 
     <plurals name="membership_changes">
         <item quantity="one">1 ndryshim anëtarësie</item>
@@ -1283,7 +1283,7 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="keys_backup_banner_recover_line1">Mos humbni kurrë mesazhe të fshehtëzuar</string>
     <string name="keys_backup_banner_recover_line2">Përdor Kopjeruajtje Kyçesh</string>
 
-    <string name="keys_backup_banner_update_line1">Kyçe të rinj mesazhesh të fshehtëzuar</string>
+    <string name="keys_backup_banner_update_line1">Kyçe të rinj mesazhesh të sigurt</string>
     <string name="keys_backup_banner_update_line2">Administroni Kopjeruajtje Kyçesh</string>
 
     <string name="keys_backup_banner_in_progress">Po kopjeruhen kyçet…</string>
@@ -1313,7 +1313,7 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="keys_backup_restoring_computing_key_waiting_message">Po përllogariten kyçe rimarrjesh…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">Po shkarkohen kyçe…</string>
     <string name="keys_backup_restoring_importing_keys_waiting_message">Po importohen kyçe…</string>
-    <string name="keys_backup_settings_untrusted_backup">Që të përdorni Kopjeruajtje Kyçesh në këtë sesion, rikthejeni tani përmes frazëkalimit tuaj ose kyçit të rikthimeve.</string>
+    <string name="keys_backup_settings_untrusted_backup">Që të përdorni Kopjeruajtje Kyçesh në këtë sesion, rikthejeni tani përmes frazëkalimit tuaj ose kyçi rimarrjesh.</string>
     <string name="new_recovery_method_popup_title">Kopjeruajtje e Re Kyçesh</string>
     <string name="new_recovery_method_popup_description">U pikas një kopjeruajtje e re kyçesh mesazhesh të sigurt. 
 \n 
@@ -2120,7 +2120,7 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
 \nKyçet privatë nuk njihen</string>
     <string name="settings_active_sessions_unverified_device_desc">Verifikojeni këtë sesion që t’i vihet shenjë si i besuar &amp; dhe t’i akordohet hyrje te mesazhe të fshehtëzuar. Nëse s’keni bërë hyrjen në këtë sesion, llogaria juaj mund të jetë komprometuar:</string>
 
-    <string name="verification_open_other_to_verify">Hapni një sesion ekzistues &amp; përdoreni për të verifikuar këtë, duke i akorduar hyrje te mesazhe të fshehtëzuar.</string>
+    <string name="verification_open_other_to_verify">Përdorni një sesion ekzistues që të verifikoni këtë këtu, duke i akorduar hyrje te mesazhe të fshehtëzuar.</string>
 
 
     <string name="not_trusted">Jo i Besuar</string>
@@ -2129,6 +2129,7 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="initialize_cross_signing">Gatit <em>CrossSigning</em></string>
     <string name="reset_cross_signing">Zeroji Kyçet</string>
 
+    <string name="qr_code_scanned_by_other_notice">Thuaje mbërritëm! A shfaq %s të njëjtën mburojë\?</string>
     <string name="qr_code_scanned_by_other_no">Jo</string>
 
     <string name="no_connectivity_to_the_server_indicator">Humbi lidhja me shërbyesin</string>
@@ -2146,8 +2147,8 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     </plurals>
     <string name="poll_item_selected_aria">Mundësi e Përzgjedhur</string>
     <string name="command_description_poll">Krijoni një pyetësor të thjeshtë</string>
-    <string name="verification_cannot_access_other_session">S’hyni dot në një sesion ekzistues\?</string>
-    <string name="verification_use_passphrase">Përdorni kyçin ose frazëkalimin tuaj të rimarrjes</string>
+    <string name="verification_cannot_access_other_session">Përdorni metodë rimarrjesh</string>
+    <string name="verification_use_passphrase">Nëse s’hyni dot në një sesion ekzistues</string>
 
     <string name="new_signin">Hyrje e Re</string>
 
@@ -2174,4 +2175,108 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
 
     <string name="keys_backup_restore_success_title_already_up_to_date">Kyçet janë tashmë të përditësuar!</string>
 
+    <string name="login_mobile_device_riotx">RiotX Android</string>
+
+    <string name="settings_key_requests">Kërkesa Kyçi</string>
+
+    <string name="e2e_use_keybackup">Shkyçni historik mesazhesh të fshehtëzuar</string>
+
+    <string name="refresh">Rifreskoje</string>
+
+    <string name="new_session">Sesion i Ri</string>
+    <string name="new_session_review">Prekeni, që ta shqyrtoni &amp; verifikoni</string>
+    <string name="verify_new_session_notice">Përdoreni këtë sesion që të verifikoni atë të riun tuaj, duke i akorduar hyrje te mesazhe të fshehtëzuar.</string>
+    <string name="verify_new_session_was_not_me">Ky s’qeshë unë</string>
+    <string name="verify_new_session_compromized">Llogaria juaj mund të jetë komprometuar</string>
+
+    <string name="verify_cancel_self_verification_from_untrusted">Nëse e anuloni, s’do të jeni në gjendje të lexoni mesazhe të fshehtëzuar në këtë pajisje, dhe përdoruesit e tjerë s’do ta besojnë</string>
+    <string name="verify_cancel_self_verification_from_trusted">Nëse e anuloni, s’do të jeni në gjendje të lexoni mesazhe të fshehtëzuar në pajisjen tuaj të re, dhe përdoruesit e tjerë s’do ta besojnë</string>
+    <string name="verify_cancel_other">S’do ta verifikoni %1$s (%2$s), nëse e anuloni tani. Fillojani sërish te profili i tij i përdoruesit.</string>
+
+    <string name="verify_not_me_self_verification">Një nga sa vijon mund të jetë komprometuar:
+\n
+\n- Fjalëkalimi juaj
+\n- Shërbyesi juaj Home
+\n- Kjo pajisje, ose pajisja tjetër
+\n- Lidhja internet që përdor njëra pajisje, ose tjetra
+\n
+\nKëshillojmë të ndryshoni menjëherë fjalëkalimin &amp; kyçin tuaj të rimarrjeve te Rregullimet.</string>
+
+    <string name="verify_cancelled_notice">Verifikoni pajisjet tuaja që prej Rregullimeve.</string>
+    <string name="verification_cancelled">Verifikimi u Anulua</string>
+
+    <string name="recovery_passphrase">Fjalëkalim Mesazhesh</string>
+    <string name="message_key">Kyç Mesazhesh</string>
+    <string name="account_password">Fjalëkalim Llogarie</string>
+
+    <string name="set_recovery_passphrase">Caktoni një %s</string>
+    <string name="generate_message_key">Prodhoni një Kyç Mesazhesh</string>
+
+    <string name="confirm_recovery_passphrase">Ripohoni %s</string>
+
+    <string name="enter_account_password">Që të vazhdohet, jepni % tuaj.</string>
+
+    <string name="bootstrap_info_text">Siguroni &amp; shkyçni mesazhet tuaj të fshehtëzuar dhe besim me një %s.</string>
+    <string name="bootstrap_info_confirm_text">Për ta ripohuar, rijepni %s tuaj.</string>
+    <string name="bootstrap_dont_reuse_pwd">Mos ripërdorni fjalëkalimin e llogarisë tuaj.</string>
+
+
+    <string name="bootstrap_loading_text">Kjo mund dojë disa sekonda, ju lutemi, jini i durueshëm.</string>
+    <string name="bootstrap_loading_title">Po ujdiset rimarrje.</string>
+    <string name="your_recovery_key">Kyçi juaj i rimarrjeve</string>
+    <string name="bootstrap_finish_title">Mbaruat!</string>
+    <string name="keep_it_safe">Mbajeni të sigurt</string>
+    <string name="finish">Përfundoje</string>
+
+    <string name="bootstrap_save_key_description">Përdoreni këtë %1$s si një rrjetë sigurie, në rast se harroni %2$s tuaj.</string>
+
+    <string name="bootstrap_crosssigning_progress_pbkdf2">Po prodhohet kyç i sigurt prej frazëkalimi</string>
+    <string name="bootstrap_crosssigning_progress_default_key">Po përcaktohet Kyç parazgjedhje SSSS</string>
+    <string name="bootstrap_crosssigning_progress_save_msk">Po njëkohësohet kyçi i Përgjithshëm</string>
+    <string name="bootstrap_crosssigning_progress_save_usk">Po njëkohësohet kyç Përdoruesi</string>
+    <string name="bootstrap_crosssigning_progress_save_ssk">Po njëkohësohet kyç Vetënënshkrues</string>
+    <string name="bootstrap_crosssigning_progress_key_backup">Po Ujdiset Kopjeruajtje Kyçesh</string>
+
+
+    <string name="bootstrap_cross_signing_success">%2$s &amp; %1$s tani janë ujdisur.
+\n
+\nMbajini të parrezikuar! Do t’ju duhen për të shkyçur mesazhe të fshehtëzuar dhe informacione të sigurta, nëse humbni krejt sesionet tuaja aktive.</string>
+
+    <string name="bootstrap_crosssigning_print_it">Shtypeni dhe ruajeni diku në një vend të parrezik</string>
+    <string name="bootstrap_crosssigning_save_usb">Ruajeni në një diskth USB ose pajisje kopjeruajtjesh</string>
+    <string name="bootstrap_crosssigning_save_cloud">Kopjojeni te depozita juaj personale në re</string>
+
+    <string name="auth_flow_not_supported">Këtë s’e bëni dot prej celulari</string>
+
+    <string name="bootstrap_skip_text">Ujdisja e një Fjalëkalimi Mesazhesh ju lejon të siguroni &amp; shkyçni mesazhe të fshehtëzuar dhe besim.
+\n
+\nNëse s’doni të ujdisni një Fjalëkalim Mesazhesh, prodhoni atëherë një Kyç Mesazhesh.</string>
+    <string name="bootstrap_skip_text_no_gen_key">Ujdisja e një Fjalëkalimi Mesazhesh ju lejon të siguroni &amp; shkyçni mesazhe të fshehtëzuar dhe besim.</string>
+
+
+    <string name="encryption_enabled">Fshehtëzimi u aktivizua</string>
+    <string name="encryption_enabled_tile_description">Mesazhet në këtë dhomë janë të fshehtëzuara skaj-më-skaj. Mësoni më tepër &amp; verifikoni përdorues te profilet e tyre.</string>
+    <string name="encryption_not_enabled">Fshehtëzim jo i aktivizuar</string>
+    <string name="encryption_unknown_algorithm_tile_description">Fshehtëzimi i përdorur nga kjo dhomë nuk mbulohet</string>
+
+    <string name="room_created_summary_item">%s krijoi dhe formësoi dhomën.</string>
+
+    <string name="qr_code_scanned_self_verif_notice">Thuajse mbërritëm! A shfaq pajisja juaj tjetër të njëjtën mburojë\?</string>
+    <string name="qr_code_scanned_verif_waiting_notice">Thuajse mbërritëm! Po pritet për ripohim…</string>
+    <string name="qr_code_scanned_verif_waiting">Po pritet për %s…</string>
+
+    <string name="error_failed_to_import_keys">S’u arrit të importohen kyçe</string>
+
+    <string name="settings_notification_configuration">Formësim njoftimesh</string>
+    <string name="settings_messages_at_room">Mesazhe që përmbajnë @room</string>
+    <string name="settings_messages_in_e2e_one_to_one">Mesazhe të fshehtëzuar në biseda tek-për-tek</string>
+    <string name="settings_messages_in_e2e_group_chat">Mesazhe të fshehtëzuar te biseda në grup</string>
+    <string name="settings_when_rooms_are_upgraded">Kur dhomat përditësohen</string>
+    <string name="settings_troubleshoot_title">Diagnostikoje</string>
+    <string name="settings_notification_advanced_summary_riotx">Caktoni rëndësi njoftimi sipas aktesh</string>
+
+    <string name="command_description_plain">E dërgon një mesazh si tekst të thjeshtë, pa interpretuar elementët Markdown</string>
+
+    <string name="auth_invalid_login_param_space_in_password">Emër përdoruesi dhe/ose fjalëkalim i pasaktë. Fjalëkalimi i dhënë fillon ose mbaron me hapësirë, ju lutemi, kontrollojeni.</string>
+
 </resources>
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 4311c2cc24..6f6d809624 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -191,7 +191,7 @@
     <string name="cannot_start_call">无法开始通话，请稍后重试</string>
     <string name="missing_permissions_warning">由于缺少权限，某些功能将无法使用…</string>
     <string name="missing_permissions_title_to_start_conf_call">无法发起通话</string>
-    <string name="device_information">设备信息</string>
+    <string name="device_information">会话信息</string>
     <string name="room_no_conference_call_in_encrypted_rooms">加密的聊天室不支持电话会议</string>
     <string name="action_open">打开</string>
     <string name="action_close">关闭</string>
@@ -1480,4 +1480,19 @@ Riot 在后台时的工作将被显著的限制，这可能会影响消息通知
     <string name="people_no_identity_server">没有设置身份服务器。</string>
 
     <string name="call_failed_no_ice_title">服务器的错误配置导致通话失败</string>
+    <string name="resources_script">Latn</string>
+
+    <string name="call_failed_no_ice_description">请要求您的家庭服务器（%1$s）的管理员配置TURN服务器，以使通话可靠地工作。
+\n
+\n 或者，您可以尝试使用%2$s的公共服务器，但这将不那么可靠，并且它将与该服务器共享您的IP地址。 您也可以在“设置”中进行管理。</string>
+    <string name="call_failed_no_ice_use_alt">尝试使用 %s</string>
+    <string name="call_failed_dont_ask_again">不要再问我</string>
+
+    <string name="auth_add_email_message_2">设置用于帐户恢复的电子邮件，然后就可以让认识您的人选择性探索到您。</string>
+    <string name="auth_add_phone_message_2">设定电话，然后就可以让认识您的人选择性探索到您。</string>
+    <string name="auth_add_email_phone_message_2">设定电子邮件以供帐号复原。 然后就可以让认识您的人用电子邮件或电话选择性探索到您。</string>
+    <string name="auth_add_email_and_phone_message_2">设定电子邮件以供帐号复原。 然后就可以让认识您的人用电子邮件或电话选择性探索到您。</string>
+    <string name="login_error_no_homeserver_found">這不是有效的 Matrix 服务器位置</string>
+    <string name="login_error_homeserver_not_found">无法在此 URL 找到家庭服务器，请检查</string>
+    <string name="settings_call_ringtone_use_default_stun">允许后备呼叫协助服务器</string>
 </resources>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 479265bb22..dc8ed59ea9 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -398,7 +398,7 @@
     <string name="go_on_with">使用…打開</string>
     <string name="error_no_external_application_found">對不起，沒有應用程式可以完成此操作。</string>
 
-    <string name="e2e_re_request_encryption_key">從其他工作階段<u>重新請求金鑰</u>。</string>
+    <string name="e2e_re_request_encryption_key">從其他工作階段重新請求金鑰。<u>重新請求金鑰</u>。</string>
 
     <string name="e2e_re_request_encryption_key_sent">已發送金鑰分享請求。</string>
 
@@ -1276,7 +1276,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="keys_backup_banner_recover_line1">永遠不失去加密訊息</string>
     <string name="keys_backup_banner_recover_line2">使用金鑰備份</string>
 
-    <string name="keys_backup_banner_update_line1">新加密訊息金鑰</string>
+    <string name="keys_backup_banner_update_line1">新安全訊息金鑰</string>
     <string name="keys_backup_banner_update_line2">管理金鑰備份</string>
 
     <string name="keys_backup_banner_in_progress">正在備份金鑰……</string>
@@ -2097,7 +2097,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="crosssigning_other_user_not_trust">其他使用者可能不會信任它</string>
     <string name="complete_security">全面的安全性</string>
 
-    <string name="verification_open_other_to_verify">開啟既有的工作階段並使用它來驗證這個，讓它可以存取已加密的訊息。</string>
+    <string name="verification_open_other_to_verify">使用既有的工作階段來驗證這個，讓它可以存取已加密的訊息。</string>
 
 
     <string name="verification_profile_verify">驗證</string>
@@ -2119,6 +2119,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="a11y_qr_code_for_verification">QR code</string>
 
+    <string name="qr_code_scanned_by_other_notice">就快完成了！%s 有顯示相同的盾牌嗎？</string>
     <string name="qr_code_scanned_by_other_yes">是</string>
     <string name="qr_code_scanned_by_other_no">否</string>
 
@@ -2134,8 +2135,8 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     </plurals>
     <string name="poll_item_selected_aria">已選取的選項</string>
     <string name="command_description_poll">建立簡易投票</string>
-    <string name="verification_cannot_access_other_session">無法存取既有的工作階段？</string>
-    <string name="verification_use_passphrase">使用您的復原金鑰或通關密語</string>
+    <string name="verification_cannot_access_other_session">使用復原方法</string>
+    <string name="verification_use_passphrase">如果您無法存取既有的工作階段的話</string>
 
     <string name="new_signin">新登入</string>
 
@@ -2161,4 +2162,109 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="keys_backup_restore_success_title_already_up_to_date">金鑰已為最新！</string>
 
+    <string name="login_mobile_device_riotx">RiotX Android</string>
+
+    <string name="settings_key_requests">金鑰請求</string>
+
+    <string name="e2e_use_keybackup">解鎖已加密的訊息歷史</string>
+
+    <string name="refresh">重新整理</string>
+
+    <string name="new_session">新工作階段</string>
+    <string name="new_session_review">輕觸即可以審閱並驗證</string>
+    <string name="verify_new_session_notice">使用此工作階段來驗證新的，讓它可以存取已加密的訊息。</string>
+    <string name="verify_new_session_was_not_me">這不是我</string>
+    <string name="verify_new_session_compromized">您的帳號可能已被盜用</string>
+
+    <string name="verify_cancel_self_verification_from_untrusted">如果您取消，您可能無法在此裝置上讀取已加密的訊息，而其他使用者也不會信任它</string>
+    <string name="verify_cancel_self_verification_from_trusted">如果您取消，您可能無法在您新的裝置上讀取已加密的訊息，而其他使用者也不會信任它</string>
+    <string name="verify_cancel_other">如果您現在取消，您將無法驗證 %1$s (%2$s)。在他們的使用者檔案中重新開始。</string>
+
+    <string name="verify_not_me_self_verification">下列其中一項可能已被盜用：
+\n
+\n- 您的密碼
+\n- 您的家伺服器
+\n- 此裝置或其他裝置
+\n- 任一裝置正在使用的網際網路連線
+\n
+\n我們建議您立刻在設定中變更您的密碼與復原金鑰。</string>
+
+    <string name="verify_cancelled_notice">透過設定驗證您的裝置。</string>
+    <string name="verification_cancelled">驗證已取消</string>
+
+    <string name="recovery_passphrase">訊息密碼</string>
+    <string name="message_key">訊息金鑰</string>
+    <string name="account_password">帳號密碼</string>
+
+    <string name="set_recovery_passphrase">設定 %s</string>
+    <string name="generate_message_key">生成訊息金鑰</string>
+
+    <string name="confirm_recovery_passphrase">確認 %s</string>
+
+    <string name="enter_account_password">輸入您的 %s 以繼續。</string>
+
+    <string name="bootstrap_info_text">保護與解鎖已加密的訊息並信任 %s。</string>
+    <string name="bootstrap_info_confirm_text">再次輸入您的 %s 以確認。</string>
+    <string name="bootstrap_dont_reuse_pwd">不要重用您的帳號密碼。</string>
+
+
+    <string name="bootstrap_loading_text">這可能需要數秒，請稍候。</string>
+    <string name="bootstrap_loading_title">設定復原。</string>
+    <string name="your_recovery_key">您的復原金鑰</string>
+    <string name="bootstrap_finish_title">已完成！</string>
+    <string name="keep_it_safe">把它放在安全的地方</string>
+    <string name="finish">完成</string>
+
+    <string name="bootstrap_save_key_description">使用這個 %1$s 做為安全網以避免您忘記您的 %2$s。</string>
+
+    <string name="bootstrap_crosssigning_progress_initializing">正在發佈已建立的識別金鑰</string>
+    <string name="bootstrap_crosssigning_progress_pbkdf2">正在從通關密語生成安全金鑰</string>
+    <string name="bootstrap_crosssigning_progress_default_key">正在定義 SSSS 預設金鑰</string>
+    <string name="bootstrap_crosssigning_progress_save_msk">正在同步主控金鑰</string>
+    <string name="bootstrap_crosssigning_progress_save_usk">正在同步使用者金鑰</string>
+    <string name="bootstrap_crosssigning_progress_save_ssk">正在同步自行簽署金鑰</string>
+    <string name="bootstrap_crosssigning_progress_key_backup">設定金鑰備份</string>
+
+
+    <string name="bootstrap_cross_signing_success">您的 %2$s 與 %1$s 設定好了。
+\n
+\n請保護它們的安全！如果您遺失所有作用中的工作階段，您將會需要它們來解鎖已加密的訊息並保護資訊。</string>
+
+    <string name="bootstrap_crosssigning_print_it">列印並將其存放在安全的地方</string>
+    <string name="bootstrap_crosssigning_save_usb">將其儲存在 USB 隨身碟或備份磁碟上</string>
+    <string name="bootstrap_crosssigning_save_cloud">將其複製到您的私人雲端儲存空間</string>
+
+    <string name="auth_flow_not_supported">您不能從行動裝置上做這件事</string>
+
+    <string name="bootstrap_skip_text">設定訊息密碼可讓您保護並解鎖已加密的訊息並信任。
+\n
+\n如果您不想要設定訊息密碼，請生成訊息金鑰來代替。</string>
+    <string name="bootstrap_skip_text_no_gen_key">設定訊息密碼可讓您保護並解鎖已加密的訊息並信任。</string>
+
+
+    <string name="encryption_enabled">加密已啟用</string>
+    <string name="encryption_enabled_tile_description">在此聊天室中的訊息已端到端加密。取得更多資訊並在使用者的個人檔案中驗證他們。</string>
+    <string name="encryption_not_enabled">加密未啟用</string>
+    <string name="encryption_unknown_algorithm_tile_description">用於此聊天室的加密未受支援</string>
+
+    <string name="room_created_summary_item">%s 建立並設定聊天室。</string>
+
+    <string name="qr_code_scanned_self_verif_notice">就快完成了！其他裝置有顯示相同的盾牌嗎？</string>
+    <string name="qr_code_scanned_verif_waiting_notice">就快完成了！正在等待確認……</string>
+    <string name="qr_code_scanned_verif_waiting">正在等待 %s……</string>
+
+    <string name="error_failed_to_import_keys">匯入金鑰失敗</string>
+
+    <string name="settings_notification_configuration">通知設定</string>
+    <string name="settings_messages_at_room">訊息包含 @room</string>
+    <string name="settings_messages_in_e2e_one_to_one">在一對一的聊天中已加密的訊息</string>
+    <string name="settings_messages_in_e2e_group_chat">群組聊天中的已加密訊息</string>
+    <string name="settings_when_rooms_are_upgraded">當聊天室升級時</string>
+    <string name="settings_troubleshoot_title">疑難排解</string>
+    <string name="settings_notification_advanced_summary_riotx">按事件設定通知重要性</string>
+
+    <string name="command_description_plain">傳送純文字訊息，不將它們解譯為 markdown</string>
+
+    <string name="auth_invalid_login_param_space_in_password">不正確的使用者名稱及／或密碼。輸入的密碼以空格開頭或結尾，請檢查。</string>
+
 </resources>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 66638e5d62..b37e7fd729 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2298,4 +2298,43 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
 
     <string name="auth_invalid_login_param_space_in_password">Incorrect username and/or password. The entered password starts or ends with spaces, please check it.</string>
 
+    <string name="room_message_placeholder">Message…</string>
+
+    <string name="upgrade_security">Encryption upgrade available</string>
+    <string name="security_prompt_text">Verify yourself &amp; others to keep your chats safe</string>
+
+    <!-- %s will be replaced by recovery_key -->
+    <string name="bootstrap_enter_recovery">Enter your %s to continue</string>
+    <string name="use_file">Use File</string>
+
+    <!-- %s will be replaced by recovery_passphrase -->
+    <!--    <string name="upgrade_account_desc">Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.</string>-->
+    <string name="enter_backup_passphrase">Enter %s</string>
+    <string name="backup_recovery_passphrase">Recovery Passphrase</string>
+    <string name="bootstrap_invalid_recovery_key">"It's not a valid recovery key"</string>
+    <string name="recovery_key_empty_error_message">Please enter a recovery key</string>
+
+    <string name="bootstrap_progress_checking_backup">Checking backup Key</string>
+    <string name="bootstrap_progress_checking_backup_with_info">Checking backup Key (%s)</string>
+    <string name="bootstrap_progress_compute_curve_key">Getting curve key</string>
+    <string name="bootstrap_progress_generating_ssss">Generating SSSS key from passphrase</string>
+    <string name="bootstrap_progress_generating_ssss_with_info">Generating SSSS key from passphrase (%s)</string>
+    <string name="bootstrap_progress_generating_ssss_recovery">Generating SSSS key from recovery key</string>
+    <string name="bootstrap_progress_storing_in_sss">Storing keybackup secret in SSSS</string>
+    <!-- To produce things like 'RiotX Android (IQDHUVJTTV)' -->
+    <string name="new_session_review_with_info">%1$s (%2$s)</string>
+
+    <string name="bootstrap_migration_enter_backup_password">Enter your Key Backup Passphrase to continue.</string>
+    <string name="bootstrap_migration_use_recovery_key">use your Key Backup recovery key</string>
+    <!-- %s will be replaced by the value of bootstrap_migration_use_recovery_key  -->
+    <string name="bootstrap_migration_with_passphrase_helper_with_link">Don’t know your Key Backup Passphrase, you can %s.</string>
+    <string name="bootstrap_migration_backup_recovery_key">Key Backup recovery key</string>
+
+    <string name="settings_security_prevent_screenshots_title">Prevent screenshots of the application</string>
+    <string name="settings_security_prevent_screenshots_summary">Enabling this setting adds the FLAG_SECURE to all Activities. Restart the application for the change to take effect.</string>
+
+    <string name="media_file_added_to_gallery">Media file added to the Gallery</string>
+    <string name="error_adding_media_file_to_gallery">Could not add media file to the Gallery</string>
+    <string name="change_password_summary">Set a new account password…</string>
+
 </resources>
diff --git a/vector/src/main/res/values/strings_riotX.xml b/vector/src/main/res/values/strings_riotX.xml
index 5eae9f226f..3e23f61acf 100644
--- a/vector/src/main/res/values/strings_riotX.xml
+++ b/vector/src/main/res/values/strings_riotX.xml
@@ -3,40 +3,9 @@
 
     <!-- Strings not defined in Riot -->
 
-    <!-- Sections has been created to avoid merge conflict. Let's see if it's better -->
+    <!-- Sections has been created to limit merge conflicts. -->
 
     <!-- BEGIN Strings added by Valere -->
-    <string name="room_message_placeholder">Message…</string>
-
-    <string name="upgrade_security">Encryption upgrade available</string>
-    <string name="security_prompt_text">Verify yourself &amp; others to keep your chats safe</string>
-
-    <!-- %s will be replaced by recovery_key -->
-    <string name="bootstrap_enter_recovery">Enter your %s to continue</string>
-    <string name="use_file">Use File</string>
-
-    <!-- %s will be replaced by recovery_passphrase -->
-    <!--    <string name="upgrade_account_desc">Upgrade this session to allow it to verify other sessions, granting them access to encrypted messages and marking them as trusted for other users.</string>-->
-    <string name="enter_backup_passphrase">Enter %s</string>
-    <string name="backup_recovery_passphrase">Recovery Passphrase</string>
-    <string name="bootstrap_invalid_recovery_key">"It's not a valid recovery key"</string>
-    <string name="recovery_key_empty_error_message">Please enter a recovery key</string>
-
-    <string name="bootstrap_progress_checking_backup">Checking backup Key</string>
-    <string name="bootstrap_progress_checking_backup_with_info">Checking backup Key (%s)</string>
-    <string name="bootstrap_progress_compute_curve_key">Getting curve key</string>
-    <string name="bootstrap_progress_generating_ssss">Generating SSSS key from passphrase</string>
-    <string name="bootstrap_progress_generating_ssss_with_info">Generating SSSS key from passphrase (%s)</string>
-    <string name="bootstrap_progress_generating_ssss_recovery">Generating SSSS key from recovery key</string>
-    <string name="bootstrap_progress_storing_in_sss">Storing keybackup secret in SSSS</string>
-    <!-- To produce things like 'RiotX Android (IQDHUVJTTV)' -->
-    <string name="new_session_review_with_info">%1$s (%2$s)</string>
-
-    <string name="bootstrap_migration_enter_backup_password">Enter your Key Backup Passphrase to continue.</string>
-    <string name="bootstrap_migration_use_recovery_key">use your Key Backup recovery key</string>
-    <!-- %s will be replaced by the value of bootstrap_migration_use_recovery_key  -->
-    <string name="bootstrap_migration_with_passphrase_helper_with_link">Don’t know your Key Backup Passphrase, you can %s.</string>
-    <string name="bootstrap_migration_backup_recovery_key">Key Backup recovery key</string>
 
     <!-- END Strings added by Valere -->
 
@@ -45,12 +14,6 @@
 
     <!-- END Strings added by Benoit -->
 
-    <!-- BEGIN Strings added by Benoit2 -->
-    <string name="settings_security_prevent_screenshots_title">Prevent screenshots of the application</string>
-    <string name="settings_security_prevent_screenshots_summary">Enabling this setting adds the FLAG_SECURE to all Activities. Restart the application for the change to take effect.</string>
-
-    <!-- END Strings added by Benoit2 -->
-
 
     <!-- BEGIN Strings added by Ganfra -->
 
@@ -58,8 +21,7 @@
 
 
     <!-- BEGIN Strings added by Onuray -->
-    <string name="media_file_added_to_gallery">Media file added to the Gallery</string>
-    <string name="error_adding_media_file_to_gallery">Could not add media file to the Gallery</string>
+
     <!-- END Strings added by Onuray -->
 
 
@@ -67,7 +29,4 @@
 
     <!-- END Strings added by Others -->
 
-    <!-- BEGIN Strings added by Benoit -->
-    <string name="change_password_summary">Set a new account password…</string>
-    <!---->
 </resources>