diff --git a/matrix-sdk-android/src/main/res/values-eu/strings.xml b/matrix-sdk-android/src/main/res/values-eu/strings.xml
index 00bcf69ecd..a211ea04af 100644
--- a/matrix-sdk-android/src/main/res/values-eu/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-eu/strings.xml
@@ -119,7 +119,7 @@
     <string name="verification_emoji_robot">Robota</string>
     <string name="verification_emoji_hat">Txanoa</string>
     <string name="verification_emoji_glasses">Betaurrekoak</string>
-    <string name="verification_emoji_wrench">Giltza ingelesa</string>
+    <string name="verification_emoji_wrench">Giltza</string>
     <string name="verification_emoji_santa">Santa</string>
     <string name="verification_emoji_thumbsup">Ederto</string>
     <string name="verification_emoji_umbrella">Aterkia</string>
diff --git a/matrix-sdk-android/src/main/res/values-ko/strings.xml b/matrix-sdk-android/src/main/res/values-ko/strings.xml
index ede965c176..faf1840a8d 100644
--- a/matrix-sdk-android/src/main/res/values-ko/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-ko/strings.xml
@@ -2,4 +2,5 @@
 <resources>
     <string name="summary_message">%1$s: %2$s</string>
     <string name="notice_room_invite_no_invitee">%s\'의 초대</string>
+    <string name="verification_emoji_headphone">헤드폰</string>
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values/strings.xml b/matrix-sdk-android/src/main/res/values/strings.xml
index be64a65974..5459cf9124 100644
--- a/matrix-sdk-android/src/main/res/values/strings.xml
+++ b/matrix-sdk-android/src/main/res/values/strings.xml
@@ -228,4 +228,14 @@
     <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
     <string name="verification_emoji_pin">Pin</string>
 
+    <!-- Strings for RiotX -->
+    <string name="initial_sync_start_importing_account">Initial Sync:\nImporting account…</string>
+    <string name="initial_sync_start_importing_account_crypto">Initial Sync:\nImporting crypto</string>
+    <string name="initial_sync_start_importing_account_rooms">Initial Sync:\nImporting Rooms</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Initial Sync:\nImporting Joined Rooms</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Initial Sync:\nImporting Invited Rooms</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Initial Sync:\nImporting Left Rooms</string>
+    <string name="initial_sync_start_importing_account_groups">Initial Sync:\nImporting Communities</string>
+    <string name="initial_sync_start_importing_account_data">Initial Sync:\nImporting Account Data</string>
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values/strings_RiotX.xml b/matrix-sdk-android/src/main/res/values/strings_RiotX.xml
index d03dfa79b9..0d2c4cc409 100644
--- a/matrix-sdk-android/src/main/res/values/strings_RiotX.xml
+++ b/matrix-sdk-android/src/main/res/values/strings_RiotX.xml
@@ -1,10 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="initial_sync_start_importing_account">Initial Sync:\nImporting account…</string>
-    <string name="initial_sync_start_importing_account_crypto">Initial Sync:\nImporting crypto</string>
-    <string name="initial_sync_start_importing_account_rooms">Initial Sync:\nImporting Rooms</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Initial Sync:\nImporting Joined Rooms</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Initial Sync:\nImporting Invited Rooms</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Initial Sync:\nImporting Left Rooms</string>
-    <string name="initial_sync_start_importing_account_groups">Initial Sync:\nImporting Communities</string>
-    <string name="initial_sync_start_importing_account_data">Initial Sync:\nImporting Account Data</string>
+
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml
index b2f1bd8903..9f6fad407c 100644
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/vector/src/main/res/values-bg/strings.xml
@@ -1515,4 +1515,57 @@
     <string name="keys_backup_unable_to_get_trust_info">Случи се грешка при извличане на информацията за довереността</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Случи се грешка при извличане на резервните данни за ключовете</string>
 
+    <string name="alpha_disclaimer_title">Добре дошли в beta версията!</string>
+    <string name="alpha_disclaimer_content_line_1">Докато RiotX е в ранен стадий на разработка някои функции може да липсват или да има бъгове.</string>
+    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Play Store описание</string>
+    <string name="alpha_disclaimer_content_line_2_fdroid">Ако намерите бъгове, моля докладвайте ги от най-горното ляво меню на началния екран и ще ги разрешим възможно най-бързо.</string>
+
+    <string name="import_e2e_keys_from_file">Импортирай e2e ключове от файл \"%1$s\".</string>
+
+    <string name="settings_sdk_version">Matrix SDK версия</string>
+    <string name="navigate_to_room_when_already_in_the_room">Вече гледате тази стая!</string>
+
+    <string name="quick_reactions">Бързи реакции</string>
+
+    <string name="settings_general_title">Основни</string>
+    <string name="settings_preferences">Настройки</string>
+    <string name="settings_security_and_privacy">Сигурност и поверителност</string>
+    <string name="settings_expert">Експертни</string>
+    <string name="settings_push_rules">Правила за уведомление</string>
+    <string name="settings_push_rules_no_rules">Не са дефинирани правила за уведомление</string>
+    <string name="alpha_disclaimer_content_line_2_gplay">Списъкът с последни функции винаги е в %1$s. Ако намерите бъг, изпратете доклад за грешка от менюто горе в ляво, и ще го поправим възможно най-скоро.</string>
+    <string name="settings_other_third_party_notices">Други известия</string>
+    <string name="settings_push_gateway_no_pushers">Не са регистрирани адреси за push уведомления</string>
+
+    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="push_gateway_item_push_key">push_key:</string>
+    <string name="push_gateway_item_app_display_name">app_display_name:</string>
+    <string name="push_gateway_item_device_name">device_name:</string>
+    <string name="push_gateway_item_url">Адрес:</string>
+    <string name="push_gateway_item_format">Формат:</string>
+
+    <string name="preference_voice_and_video">Глас и Видео</string>
+    <string name="preference_root_help_about">Помощ и Относно</string>
+
+
+    <string name="settings_troubleshoot_test_token_registration_quick_fix">Регистрирай токен</string>
+
+    <string name="send_suggestion">Направи предложение</string>
+    <string name="send_suggestion_content">Напишете предложението си долу.</string>
+    <string name="send_suggestion_report_placeholder">Опишете предложението тук</string>
+    <string name="send_suggestion_sent">Благодаря! Предложението ви беше изпратено</string>
+    <string name="send_suggestion_failed">Предложението не беше изпратено (%s)</string>
+
+    <string name="settings_labs_show_hidden_events_in_timeline">Показвай скрити събития в чата</string>
+
+    <string name="store_riotx_title">RiotX - следващо поколение Matrix клиент</string>
+    <string name="store_riotx_short_description">По-бърз и по-лек Matrix клиент, използващ последните Android технологии</string>
+    <string name="store_riotx_full_description">RiotX в нов клиент за Matrix протокола (Matrix.org): отворена мрежа за сигурна, децентрализирана комуникация. RiotX е изцяло пренаписан Riot Android клиент, базиран на изцяло пренаписан Matrix Android SDK.
+\n
+\nЗабележка: Това е бета версия. RiotX в момента се разработва активно и все още има ограничения и (надяваме се не прекалено много) бъгове. Всякаква обратна връзка е добре дошла!
+\n
+\nRiotX поддържа: • Вход в съществуващ акаунт • Създаване на стая и влизане в публични стаи • Приемане и отхвърляне на покани • Показване на списък със стаите • Преглеждане на информация за стая • Изпращане на текстови съобщения • Изпращане на прикачени файлове • Четене и писане на съобщения в шифровани стаи • Шифроване: резервни копия на E2E ключове, потвърждение на устройства, заявяване и отговаряне на заявки за споделяне на ключове • Уведомления • Светла, Тъмна и Черна тема
+\n
+\nЗасега не всички функции на Riot са налични в RiotX. Основни липсващи (и скоро пристигащи!) функции са: • Създаване на нов профил • Настройки на стаи (показване на членове и т.н.) • Създаване на директни чатове • Обаждания • Приспособления • …</string>
+
 </resources>
diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml
index 393b7a0d7e..a3846d5d35 100644
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/vector/src/main/res/values-eu/strings.xml
@@ -1476,7 +1476,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="send_you_invite">Gonbidapen bat bidali dizu</string>
     <string name="invited_by">%s erabiltzaileak gonbidatuta</string>
 
-    <string name="room_list_catchup_empty_title">Arrapatu zaituztete!</string>
+    <string name="room_list_catchup_empty_title">Egunean zaude!</string>
     <string name="room_list_catchup_empty_body">Ez duzu irakurri gabeko mezu gehiagorik</string>
     <string name="room_list_catchup_welcome_title">Ongi etorri etxera!</string>
     <string name="room_list_catchup_welcome_body">Jarri egunean hemengo irakurri gabeko mezuekin</string>
@@ -1522,4 +1522,57 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="keys_backup_unable_to_get_trust_info">Errore bat gertatu da konfiantzazko informazioa jasotzean</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Errore bat gertatu da gakoen babes-kopiaren datuak jasotzean</string>
 
+    <string name="alpha_disclaimer_title">Ongi etorri betara!</string>
+    <string name="alpha_disclaimer_content_line_1">Riot X oraindik garapenean dagoenez, ezaugarri batzuk faltan bota ditzakezu eta akatsen bat aurkitu dezakezu.</string>
+    <string name="alpha_disclaimer_content_line_2_gplay">Azken ezaugarrien zerrenda hemen dago beti : %1$s, eta akatsak aurkitzen badituzu bidali mesedez akatsen txosten bat Hasiera pantailako goi ezkerreko menua erabiliz, eta ahalik eta lasterren konponduko dugu.</string>
+    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Play Store-ko deskripzioa</string>
+    <string name="alpha_disclaimer_content_line_2_fdroid">Akatsak aurkitzen badituzu bidali mesedez akatsen txosten bat Hasiera pantailako goi ezkerreko menua erabiliz, eta ahalik eta lasterren konponduko dugu.</string>
+
+    <string name="import_e2e_keys_from_file">"Inportatu e2e gakoak \"%1$s\"  fitxategitik."</string>
+
+    <string name="settings_sdk_version">Matrix SDK bertsioa</string>
+    <string name="settings_other_third_party_notices">Beste hirugarrengoen adierazpenak</string>
+    <string name="navigate_to_room_when_already_in_the_room">Gela hau ikusten ari zara dagoeneko!</string>
+
+    <string name="quick_reactions">Erreakzio azkarrak</string>
+
+    <string name="settings_general_title">Orokorra</string>
+    <string name="settings_preferences">Hobespenak</string>
+    <string name="settings_security_and_privacy">Segurtasuna eta pribatutasuna</string>
+    <string name="settings_expert">Aditua</string>
+    <string name="settings_push_rules">Push arauak</string>
+    <string name="settings_push_rules_no_rules">Ez da push araurik zehaztu</string>
+    <string name="settings_push_gateway_no_pushers">Ez dago push arauentzako erregistratutako atebiderik</string>
+
+    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="push_gateway_item_push_key">push_gakoa:</string>
+    <string name="push_gateway_item_device_name">gailu_izena:</string>
+    <string name="push_gateway_item_url">Url-a:</string>
+    <string name="push_gateway_item_format">Formatua:</string>
+
+    <string name="preference_voice_and_video">Ahotsa eta bideoa</string>
+    <string name="preference_root_help_about">Laguntza eta honi buruz</string>
+
+
+    <string name="settings_troubleshoot_test_token_registration_quick_fix">Erregistratu token-a</string>
+
+    <string name="send_suggestion">Egin iradokizun bat</string>
+    <string name="send_suggestion_content">Idatzi zure iradokizuna azpian.</string>
+    <string name="send_suggestion_report_placeholder">Deskribatu zure iradokizuna hemen</string>
+    <string name="send_suggestion_sent">Eskerrik asko, iradokizuna ongi bidali da</string>
+    <string name="send_suggestion_failed">Huts egin su iradokizuna bidaltzean (%s)</string>
+
+    <string name="settings_labs_show_hidden_events_in_timeline">Erakutsi ezkutatutako gertaerak denbora lerroan</string>
+
+    <string name="store_riotx_title">RiotX - Hurrengo belaunaldiko Matrix bezeroa</string>
+    <string name="store_riotx_short_description">Matrix-erako bezero azkarrago eta arinago bat azken Android tresnak erabiliz eginak</string>
+    <string name="store_riotx_full_description">RiotX bezero berri bat da Matrix protokoloarentzako (Matrix.org): komunikazioa seguru eta deszentralizatuarentzako sare libre bat. RiotX Android plataformarako Riot bezeroaren berridazketa oso bat da, erabat berridatzitako Android SDK-n oinarritua.
+\n
+\nAbisua: hau beta bertsio bat da. RiotX garapen aktiboan dago eta baditu mugak zein akatsak (gehiegi ez espero dugu). Iruzkin guztiak ongi etorriak dira!
+\n
+\nRiotX bezeroak honakoa ahalbidetzen du: • Badagoen kontu batean saioa hasi • Gelak sortu eta gela publikoetara elkartu • Gonbidapenak onartu edo ukatu • Erabiltzailearen gelak zerrendatu • Gelaren xehetasunak ikusi • Testuzko mezuak bidali • Eranskinak bidali • Zifratutako geletan mezuak irakurri eta idatzi • Zifratzea: E2Egakoen babeskopia, gailuaren egiaztaketa aurreratua, gakoa partekatzeko eskaria eta erantzuna • Push jakinarazpena • Gai argia, iluna eta beltza
+\n
+\nEz dira oraindik Riot bezeroaren ezaugarri guztiak ezarri RiotX bezeroan. Falta diren (eta laster etorriko direnen) artean nabarmenak dira: • Kontua sortzea • Gelaren ezarpenak (gelako kideak zerrendatzea, eta abar.) • Txat zuzenerako gelak sortzea • Deiak • Trepetak • …</string>
+
+    <string name="push_gateway_item_app_display_name">app_display_name:</string>
 </resources>
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index d84267a0de..9e2418416d 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -768,10 +768,10 @@
 
     <!-- conference call -->
     <string name="conference_call_warning_title">Varoitus!</string>
-    <string name="conference_call_warning_message">Konferenssipuhelu on yhtä kehitysvaiheessa eikä välttämättä ole luotettava.</string>
+    <string name="conference_call_warning_message">Konferenssipuhelut ovat kehitysvaiheessa eivätkä välttämättä luotettavia.</string>
 
     <!-- slash commands -->
-    <string name="command_error">Virheellinen komento</string>
+    <string name="command_error">Komentovirhe</string>
     <string name="unrecognized_command">Tuntematon komento: %s</string>
 
     <!-- notification statuses -->
@@ -1166,7 +1166,7 @@ Haluatko lisätä paketteja?</string>
     <string name="settings_labs_keyboard_options_to_send_message">Käytä näppäimistön rivinvaihtopainiketta viestin lähettämiseen</string>
     <string name="settings_labs_enable_send_voice_summary">Tämä vaihtoehto vaatii kolmannen osapuolen sovelluksen viestien tallennukseen.</string>
 
-    <string name="command_problem_with_parameters">Komento ”%s” vaatii enemmän parametreja, tai jotkinparametrit ovat väärin.</string>
+    <string name="command_problem_with_parameters">Komento ”%s” vaatii enemmän parametreja, tai jotkin parametrit ovat virheellisiä.</string>
     <string name="command_description_emote">Näyttää toiminnon</string>
     <string name="command_description_ban_user">Estää käyttäjän annetulla id:llä</string>
     <string name="command_description_unban_user">Sallii käyttäjän annetulla id:llä</string>
@@ -1520,4 +1520,17 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="keys_backup_unable_to_get_trust_info">Luottamustietoa haettaessa tapahtui virhe</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Avainten varmuuskopioinnin tietoja haettaessa tapahtui virhe</string>
 
+    <string name="your_unverified_device_requesting_with_info">Tuntematon laite pyytää salausavaimia
+\nLaitteen nimi: %1$s
+\nViimeksi nähty: %2$s
+\nJos et kirjautunut toisella laitteella, voit jättää tämän pyynnön huomiotta.</string>
+
+    <string name="alpha_disclaimer_title">Tervetuloa beetaan!</string>
+    <string name="alpha_disclaimer_content_line_1">Riot X on varhaisessa kehitysvaiheessa, mistä johtuen osa ominaisuuksista puuttuu ja saatat kohdata virheitä.</string>
+    <string name="settings_sdk_version">Matrix SDK:n versio</string>
+    <string name="settings_other_third_party_notices">Muut kolmansien osapuolten huomautukset</string>
+    <string name="quick_reactions">Pikareaktiot</string>
+
+    <string name="settings_preferences">Asetukset</string>
+    <string name="settings_security_and_privacy">Tietoturva ja yksityisyys</string>
 </resources>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index cd91650b2b..d0f39271bc 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -1527,4 +1527,57 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
     <string name="keys_backup_unable_to_get_trust_info">Une erreur est survenue lors de la récupération des informations de confiance</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Une erreur est survenue lors de la récupération des données de sauvegarde de clés</string>
 
+    <string name="alpha_disclaimer_title">Bienvenue à la bêta !</string>
+    <string name="alpha_disclaimer_content_line_1">Comme RiotX est au début de son développement, il se peut que certaines fonctionnalités soient manquantes et que vous rencontriez quelques anomalies.</string>
+    <string name="alpha_disclaimer_content_line_2_gplay">La dernière liste de fonctionnalités est toujours dans la %1$s, et si vous rencontrez des anomalies, envoyez un rapport dans le menu en haut à gauche de l’accueil et nous les règlerons aussi vite que possible.</string>
+    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">description du Play Store</string>
+    <string name="alpha_disclaimer_content_line_2_fdroid">Si vous rencontrez des anomalies, envoyez un rapport dans le menu en haut à gauche de l’accueil et nous les règlerons aussi vite que possible.</string>
+
+    <string name="import_e2e_keys_from_file">Importer les clés de chiffrement depuis le fichier « %1$s ».</string>
+
+    <string name="settings_sdk_version">Version du SDK de Matrix</string>
+    <string name="settings_other_third_party_notices">Licences tierces</string>
+    <string name="navigate_to_room_when_already_in_the_room">Vous êtes déjà en train de visualiser ce salon !</string>
+
+    <string name="quick_reactions">Réactions rapides</string>
+
+    <string name="settings_general_title">Général</string>
+    <string name="settings_preferences">Préférences</string>
+    <string name="settings_security_and_privacy">Sécurité &amp; vie privée</string>
+    <string name="settings_expert">Expert</string>
+    <string name="settings_push_rules">Règles de notification</string>
+    <string name="settings_push_rules_no_rules">Aucune règle de notification définie</string>
+    <string name="settings_push_gateway_no_pushers">Aucune passerelle de notification enregistrée</string>
+
+    <string name="push_gateway_item_app_id">app_id :</string>
+    <string name="push_gateway_item_push_key">push_key :</string>
+    <string name="push_gateway_item_app_display_name">app_display_name :</string>
+    <string name="push_gateway_item_device_name">device_name :</string>
+    <string name="push_gateway_item_url">URL :</string>
+    <string name="push_gateway_item_format">Format :</string>
+
+    <string name="preference_voice_and_video">Voix &amp; vidéo</string>
+    <string name="preference_root_help_about">Aide &amp; à propos</string>
+
+
+    <string name="settings_troubleshoot_test_token_registration_quick_fix">Inscrire le jeton</string>
+
+    <string name="send_suggestion">Faire une suggestion</string>
+    <string name="send_suggestion_content">Saisissez votre suggestion ci-dessous.</string>
+    <string name="send_suggestion_report_placeholder">Décrivez votre suggestion ici</string>
+    <string name="send_suggestion_sent">Merci, la suggestion a bien été envoyée</string>
+    <string name="send_suggestion_failed">Échec d’envoi de la suggestion (%s)</string>
+
+    <string name="settings_labs_show_hidden_events_in_timeline">Afficher les évènements cachés dans l’historique</string>
+
+    <string name="store_riotx_title">RiotX − Client Matrix nouvelle génération</string>
+    <string name="store_riotx_short_description">Un client pour Matrix plus rapide et plus léger utilisant les derniers frameworks Android</string>
+    <string name="store_riotx_full_description">RiotX est un nouveau client pour le protocole Matrix (Matrix.org) : un réseau ouvert pour des communications sécurisées et décentralisées. RiotX est une réécriture complète du client Android Riot, basée sur une réécriture complète du SDK Android de Matrix.
+\n
+\nMise en garde : Ceci est une version bêta. RiotX est actuellement en plein développement et a des limites et (peu, nous l’espérons) des anomalies. Tout commentaire est le bienvenu !
+\n
+\nRiotX prend en charge : • Se connecter à un compte existant • Créer de salons et rejoindre des salons publics • Accepter et refuser des invitations • Lister les salons des utilisateurs • Voir les informations des salons • Envoyer des messages texte • Envoyer des pièces jointes • Lire et écrire des messages dans les salons chiffrés • Chiffrement : sauvegarde des clés de chiffrement, vérification avancée des appareils, demande et réponse de partage de clé • Notifications • Thèmes clair, sombre et noir
+\n
+\nToutes les fonctionnalités de Riot ne sont pas encore implémentées dans RiotX. Principales fonctionnalités manquantes (et qui arrivent bientôt !) : • Création de compte • Réglages des salons (lister les membres du salon etc.) • Création de salons de discussion directe • Appels • Widgets • …</string>
+
 </resources>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index b8e19998c6..2f761b7ad4 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -1526,4 +1526,57 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="keys_backup_unable_to_get_trust_info">A megbízhatósági információ beszerzésekor hiba történt</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">A kulcs mentés adatainak beszerzésekor hiba történt</string>
 
+    <string name="alpha_disclaimer_title">Üdv a béta verzióban!</string>
+    <string name="alpha_disclaimer_content_line_1">Amíg a Riot X újdonsült fejlesztés, néhány funkció hiányozhat és találkozhatsz hibákkal.</string>
+    <string name="alpha_disclaimer_content_line_2_gplay">A legfrissebb funkciók listáját itt találod: %1$s, és ha hibát találsz kérlek küldj egy jelentést róla a Kezdő oldal bal felső sarkában lévő menüvel és ahogy tudjuk javítjuk.</string>
+    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Play áruház leírás</string>
+    <string name="alpha_disclaimer_content_line_2_fdroid">Ha hibát találsz kérlek küldj egy jelentést róla a Kezdő oldal bal felső sarkában lévő menüvel és ahogy tudjuk javítjuk.</string>
+
+    <string name="import_e2e_keys_from_file">Végponttól végpontig titkosítás kulcsainak betöltése ebből a fájlból: \"%1$s\".</string>
+
+    <string name="settings_sdk_version">Matrix SDK Verzió</string>
+    <string name="settings_other_third_party_notices">Harmadik fél megjegyzések</string>
+    <string name="navigate_to_room_when_already_in_the_room">Már nézed ezt a szobát!</string>
+
+    <string name="quick_reactions">Gyors Reakció</string>
+
+    <string name="settings_general_title">Általános</string>
+    <string name="settings_preferences">Beállítások</string>
+    <string name="settings_security_and_privacy">Biztonság &amp; Adatvédelem</string>
+    <string name="settings_expert">Haladó</string>
+    <string name="settings_push_rules">„Push” szabályok</string>
+    <string name="settings_push_rules_no_rules">„Push” szabályok nincsenek</string>
+    <string name="settings_push_gateway_no_pushers">„Push” átjárók nincsenek regisztrálva</string>
+
+    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="push_gateway_item_push_key">push_key:</string>
+    <string name="push_gateway_item_app_display_name">app_display_name:</string>
+    <string name="push_gateway_item_device_name">device_name:</string>
+    <string name="push_gateway_item_url">Url:</string>
+    <string name="push_gateway_item_format">Formátum:</string>
+
+    <string name="preference_voice_and_video">Hang &amp; Videó</string>
+    <string name="preference_root_help_about">Segítség &amp; Névjegy</string>
+
+
+    <string name="settings_troubleshoot_test_token_registration_quick_fix">„Token” regisztrálás</string>
+
+    <string name="send_suggestion">Javaslat tétel</string>
+    <string name="send_suggestion_content">A javaslatodat kérlek ír le alulra.</string>
+    <string name="send_suggestion_report_placeholder">Ír le a javaslatodat ide</string>
+    <string name="send_suggestion_sent">Köszönjük, a javaslatodat sikeresen elküldtük</string>
+    <string name="send_suggestion_failed">A javaslatot nem sikerült elküldeni (%s)</string>
+
+    <string name="settings_labs_show_hidden_events_in_timeline">Rejtett események megjelenítése az idővonalon</string>
+
+    <string name="store_riotx_title">RiotX - Matrix Kliens Új Nemzedéke</string>
+    <string name="store_riotx_short_description">A gyorsabb és kisebb Matrix kliens ami a legfrissebb Android keretrendszert használja</string>
+    <string name="store_riotx_full_description">RiotX a Matrix protokollhoz (Matrix.org) készült új kliens: nyílt hálózat biztonságos és decentralizált kommunikációhoz. RiotX a Riot Android kliens teljesen újraírt változata ami a teljesen újraírt Matrix Android SDK-ra épül.
+\n
+\nFigyelmeztetés: Ez egy béta verzió. RiotX aktív fejlesztés alatt áll és vannak korlátai és (reméljük nem olyan sok) hibái. Minden visszajelzést szívesen fogadunk!
+\n
+\nRiotX ezeket támogatja: • Bejelentkezés létező fiókba • Szoba készítés és nyilvános szobába való belépés • Meghívók fogadása és elutasítás • Felhasználók szobáinak listázása • Szoba adatainak megtekintése • Szöveges üzenet küldése • Csatolmány küldése • Titkosított szobákban üzenetek olvasása és írása • Titkosítás: Végponttól végpontig titkosító kulcsok mentése, fejlett eszköz ellenőrzés, kulcs megosztás kérése és válasz • „Push” értesítések • Világos, sötét és fekete téma
+\n
+\nNem minden Riot funkció támogatott a RiotX-ben jelenleg. A fő hiányzó (és hamarosan elérhető!) funkciók: • Felhasználói fiók létrehozása • Szoba beállítások (szoba tagság mutatása, stb…) • Közvetlen beszélgetések indítása • Hívások • Kisalkalmazások • …</string>
+
 </resources>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index fd71786433..c2971aeb7c 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -1570,4 +1570,57 @@ Per essere certo di non perdere nulla, mantieni gli aggiornamenti attivi."</stri
     <string name="keys_backup_unable_to_get_trust_info">Si è verificato un errore nell\'ottenere informazioni sulla fiducia</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Si è verificato un errore nell\'ottenere i dati del backup chiavi</string>
 
+    <string name="alpha_disclaimer_title">Benvenuti nella beta!</string>
+    <string name="alpha_disclaimer_content_line_1">Mentre Riot X si trova nella fase iniziale dello sviluppo, potrebbero mancare alcune funzioni e potrebbero verificarsi errori.</string>
+    <string name="alpha_disclaimer_content_line_2_gplay">L\'elenco di funzioni più recenti è sempre nel %1$s, se trovi errori ti preghiamo segnalarli nel menu in alto a sinistra della Pagina Iniziale e noi li correggeremo appena possibile.</string>
+    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Descrizione nel Play Store</string>
+    <string name="alpha_disclaimer_content_line_2_fdroid">Se trovi errori ti preghiamo segnalarli nel menu in alto a sinistra della Pagina Iniziale e noi li correggeremo appena possibile.</string>
+
+    <string name="import_e2e_keys_from_file">Importa chiavi e2e dal file \"%1$s\".</string>
+
+    <string name="settings_sdk_version">Versione SDK Matrix</string>
+    <string name="settings_other_third_party_notices">Altre note di terze parti</string>
+    <string name="navigate_to_room_when_already_in_the_room">Stai già visualizzando questa stanza!</string>
+
+    <string name="quick_reactions">Reazioni rapide</string>
+
+    <string name="settings_general_title">Generali</string>
+    <string name="settings_preferences">Preferenze</string>
+    <string name="settings_security_and_privacy">Sicurezza e privacy</string>
+    <string name="settings_expert">Esperto</string>
+    <string name="settings_push_rules">Regole di push</string>
+    <string name="settings_push_rules_no_rules">Nessuna regola di push definita</string>
+    <string name="settings_push_gateway_no_pushers">Nessun gateway di push registrato</string>
+
+    <string name="push_gateway_item_app_id">id_app:</string>
+    <string name="push_gateway_item_push_key">chiave_push:</string>
+    <string name="push_gateway_item_app_display_name">nome_visualizzato_app:</string>
+    <string name="push_gateway_item_device_name">nome_dispositivo:</string>
+    <string name="push_gateway_item_url">Url:</string>
+    <string name="push_gateway_item_format">Formato:</string>
+
+    <string name="preference_voice_and_video">Voce e video</string>
+    <string name="preference_root_help_about">Aiuto e informazioni</string>
+
+
+    <string name="settings_troubleshoot_test_token_registration_quick_fix">Registra token</string>
+
+    <string name="send_suggestion">Suggerisci qualcosa</string>
+    <string name="send_suggestion_content">Scrivi qua sotto il tuo suggerimento.</string>
+    <string name="send_suggestion_report_placeholder">Descrivi qui il tuo suggerimento</string>
+    <string name="send_suggestion_sent">Grazie, il suggerimento è stato inviato correttamente</string>
+    <string name="send_suggestion_failed">L\'invio del suggerimento è fallito (%s)</string>
+
+    <string name="settings_labs_show_hidden_events_in_timeline">Mostra eventi nascosti nella cronologia</string>
+
+    <string name="store_riotx_title">RiotX - Client Matrix di nuova generazione</string>
+    <string name="store_riotx_short_description">Un client per Matrix più veloce e leggero usando gli ultimi framework di Android</string>
+    <string name="store_riotx_full_description">RiotX è un nuovo client per il protocollo Matrix (Matrix.org): una rete aperta per comunicazioni sicure e decentralizzate. RiotX è una riscrittura totale del client Riot Android, basata su una riscrittura completa dell\'SDK Android di Matrix.
+\n
+\nDisclaimer: questa è una versione beta. RiotX è attualmente in uno sviluppo attivo e contiene limitazioni ed errori (speriamo non troppi). I suggerimenti sono ben accetti!
+\n
+\nRiotX supporta: • Accesso ad account esistente • Crea stanze ed entra in stanze pubbliche • Accetta e rifiuta inviti • Elenca stanze utenti • Vedi dettagli stanza • Invia messaggi di testo • Invia allegati • Leggi e scrivi messaggi in stanze cifrate • Crypto: backup chiavi E2E, verifica avanzata dispositivi, richiesta e risposta condivisione chiavi • Notifiche push • Tema chiaro, scuro e nero
+\n
+\nNon tutte le funzioni di Riot sono già implementate in RiotX. Principali funzioni mancanti (prossimamente!): • Creazione account • Impostazioni stanza (elenca membri stanza, ecc.) • Creazione di stanze di chat diretta • Chiamate • Widget • …</string>
+
 </resources>
diff --git a/vector/src/main/res/values-ko/strings.xml b/vector/src/main/res/values-ko/strings.xml
index eeabcc7a4e..5e357eb69b 100644
--- a/vector/src/main/res/values-ko/strings.xml
+++ b/vector/src/main/res/values-ko/strings.xml
@@ -7,7 +7,7 @@
     <string name="dark_theme">어두운 테마</string>
     <string name="black_them">검정 테마</string>
 
-    <string name="notification_sync_in_progress">동기화</string>
+    <string name="notification_sync_in_progress">동기화하는중…</string>
     <string name="title_activity_home">메시지</string>
     <string name="title_activity_room">방</string>
     <string name="title_activity_settings">설정</string>
@@ -26,7 +26,7 @@
     <string name="send">보내기</string>
     <string name="copy">복사</string>
     <string name="resend">다시 보내기</string>
-    <string name="redact">삭제하기</string>
+    <string name="redact">지우기</string>
     <string name="quote">인용</string>
     <string name="download">받기</string>
     <string name="share">공유</string>
@@ -38,7 +38,7 @@
     <string name="report_content">컨텐츠 신고</string>
     <string name="ongoing_conference_call_voice">음성</string>
     <string name="ongoing_conference_call_video">영상</string>
-    <string name="cannot_start_call">전화를 걸 수 없습니다, 나중에 다시 시도해주세요.</string>
+    <string name="cannot_start_call">전화를 걸 수 없습니다, 나중에 다시 시도해주세요</string>
     <string name="missing_permissions_warning">권한이 없어졌기 때문에, 일부 기능이 빠졌을 수 있습니다…</string>
     <string name="missing_permissions_error">권한이 없어졌기 때문에, 이 행동을 할 수 없습니다.</string>
     <string name="missing_permissions_title_to_start_conf_call">전화를 걸 수 없습니다</string>
@@ -80,13 +80,13 @@
     <string name="send_bug_report_include_logs">로그 보내기</string>
     <string name="send_bug_report_include_crash_logs">충돌 로그 보내기</string>
     <string name="send_bug_report_include_screenshot">스크린샷 보내기</string>
-    <string name="send_bug_report">버그 보고서</string>
+    <string name="send_bug_report">버그 보고하기</string>
     <string name="send_bug_report_description">버그에 대해 설명해주세요. 무엇을 했나요? 어떤 일이 일어나길 바라고 한 건가요? 실제로는 어떤 일이 일어났나요?</string>
     <string name="send_bug_report_description_in_english">가능하다면, 영어로 설명해주세요.</string>
     <string name="send_bug_report_placeholder">여기에 문제를 설명해주세요</string>
     <string name="send_bug_report_sent">버그 보고서를 보내는데 성공했습니다</string>
     <string name="send_bug_report_failed">버그 보고서를 보내는데 실패했습니다 (%s)</string>
-    <string name="create_account">등록하기</string>
+    <string name="create_account">계정 만들기</string>
     <string name="login">로그인</string>
     <string name="logout">로그아웃</string>
     <string name="hs_url">홈서버 URL</string>
@@ -108,7 +108,7 @@
     <string name="option_take_video">영상 찍기</string>
 
     <string name="auth_login">로그인</string>
-    <string name="auth_register">등록하기</string>
+    <string name="auth_register">계정 만들기</string>
     <string name="auth_submit">제출하기</string>
     <string name="auth_skip">건너뛰기</string>
     <string name="auth_user_id_placeholder">이메일이나 이용자 이름</string>
@@ -117,4 +117,65 @@
     <string name="auth_user_name_placeholder">이용자 이름</string>
     <string name="auth_add_email_message">이용자가 당신을 찾고 재설정 비밀번호를 보낼 수 있게 이메일 주소를 적어주세요.</string>
     <string name="auth_add_phone_message">이용자가 당신을 찾을 수 있게 계정에 전화번호를 추가해주세요.</string>
+    <string name="status_theme">Status.im 테마</string>
+
+    <string name="notification_sync_init">서비스 초기화 중</string>
+    <string name="notification_noisy_notifications">소리로 알림</string>
+    <string name="notification_silent_notifications">소리 없이 알림</string>
+
+    <string name="title_activity_member_details">구성원 정보</string>
+    <string name="title_activity_group_details">커뮤니티 정보</string>
+    <string name="title_activity_keys_backup_setup">키 백업</string>
+    <string name="title_activity_keys_backup_restore">키 백업하기</string>
+    <string name="title_activity_verify_device">인증 기기</string>
+
+    <string name="keys_backup_is_not_finished_please_wait">키 백업이 끝나지 않았습니다, 기다려주세요…</string>
+    <string name="sign_out_bottom_sheet_warning_no_backup">지금 로그아웃하면 암호화된 메세지가 사라집니다</string>
+    <string name="keys_backup_activate">키 백업하기</string>
+    <string name="are_you_sure">정말이세요\?</string>
+    <string name="backup">백업</string>
+    <string name="stay">머물기</string>
+    <string name="skip">넘기기</string>
+    <string name="done">완료</string>
+    <string name="action_sign_out_confirmation_simple">정말 로그아웃하시겠어요\?</string>
+    <string name="action_mark_room_read">읽었다고 표시</string>
+    <string name="no_contact_access_placeholder">Riot이 주소록에 접근할 수 없게 되어 있습니다</string>
+    <plurals name="public_room_nb_users">
+        <item quantity="other">%d 사람들</item>
+    </plurals>
+
+    <string name="groups_invite_header">초대</string>
+    <string name="groups_header">커뮤니티</string>
+    <string name="send_bug_report_app_crashed">최근에 애플리케이션이 충돌한 것 같습니다. 충돌 보고서를 열까요\?</string>
+    <string name="read_receipt">읽기</string>
+
+    <string name="username">사용자 이름</string>
+    <string name="option_send_voice">음성 보내기</string>
+
+    <string name="no_sticker_application_dialog_content">스티커팩이 하나도 없습니다.
+\n
+\n뭐라도 추가할까요\?</string>
+
+    <string name="auth_return_to_login">로그인 화면으로 돌아가기</string>
+    <string name="auth_email_placeholder">이메일 주소</string>
+    <string name="auth_opt_email_placeholder">이메일 주소 (선택)</string>
+    <string name="auth_phone_number_placeholder">전화번호</string>
+    <string name="auth_opt_phone_number_placeholder">전화번호 (선택)</string>
+    <string name="auth_repeat_password_placeholder">비밀번호 확인</string>
+    <string name="auth_repeat_new_password_placeholder">새 비밀번호 확인</string>
+    <string name="auth_invalid_login_param">알맞지 않은 사용자 이름이나 비밀번호</string>
+    <string name="auth_invalid_password">비밀번호가 너무 짧아요 (최소 6자)</string>
+    <string name="auth_invalid_email">유효한 이메일 주소가 아닌 것 같아요</string>
+    <string name="auth_invalid_phone">유효한 전화번호가 아닌 것 같아요</string>
+    <string name="auth_password_dont_match">비밀번호가 맞지 않아요</string>
+    <string name="auth_forgot_password">비밀번호를 잊어버리셨나요\?</string>
+    <string name="auth_username_in_use">사용중인 사용자 이름입니다</string>
+    <string name="auth_home_server">홈서버:</string>
+    <string name="auth_reset_password_message">비밀번호를 초기화하려면, 계정에 이메일을 등록해야합니다:</string>
+    <string name="auth_reset_password_missing_password">새 비밀번호를 입력해야합니다.</string>
+    <string name="auth_reset_password_success_message">비밀번호가 초기화되었습니다.
+\n
+\n모든 기기에서 로그아웃되고 알림도 가지 않을 거에요. 다시 알림을 받으려면, 각 기기에 다시 로그인하세요.</string>
+    <string name="login_mobile_device">모바일</string>
+
 </resources>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index 82f4423e86..57baf24679 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -1484,4 +1484,51 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="keys_backup_unable_to_get_trust_info">Ndodhi një gabim gjatë marrjes së të dhënave të besueshmërisë</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Ndodhi një gabim teksa merreshin të dhëna kopjeruajtjeje kyçesh</string>
 
+    <string name="alpha_disclaimer_title">Mirë se vini në beta!</string>
+    <string name="alpha_disclaimer_content_line_1">Teksa Riot X është në fillimet e zhvillimit, disa veçori mund të mos jenë gati dhe mund të hasni të meta.</string>
+    <string name="alpha_disclaimer_content_line_2_gplay">Lista e veçorive më të reja gjendet te %1$s, dhe nëse gjeni të meta, ju lutemi, parashtroni një njoftim te menuja majtas sipër te Home, dhe do t’i ndreqim sa më shpejt të mundemi.</string>
+    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Përshkrim në Play Store</string>
+    <string name="alpha_disclaimer_content_line_2_fdroid">Nëse gjeni të meta, ju lutemi, parashtroni një njoftim te menuja majtas sipër te Home, dhe do t’i ndreqim sa më shpejt të mundemi.</string>
+
+    <string name="import_e2e_keys_from_file">Importo kyçe e2e prej kartelës \"%1$s\".</string>
+
+    <string name="settings_sdk_version">Versioni Matrix SDK</string>
+    <string name="settings_other_third_party_notices">Shënime të tjera palësh të treta</string>
+    <string name="navigate_to_room_when_already_in_the_room">Po e shihni tashmë këtë dhomë!</string>
+
+    <string name="quick_reactions">Reagime të Shpejta</string>
+
+    <string name="settings_general_title">Të përgjithshme</string>
+    <string name="settings_preferences">Parapëlqime</string>
+    <string name="settings_security_and_privacy">Siguri &amp; Privatësi</string>
+    <string name="settings_expert">Ekspert</string>
+    <string name="settings_push_rules">Rregulla për Push</string>
+    <string name="settings_push_rules_no_rules">S’ka të përcaktuara rregulla për push</string>
+    <string name="settings_push_gateway_no_pushers">Pa kanale push të regjistruar</string>
+
+    <string name="push_gateway_item_url">Url:</string>
+    <string name="push_gateway_item_format">Format:</string>
+
+    <string name="preference_voice_and_video">Zë &amp; Video</string>
+    <string name="preference_root_help_about">Ndihmë &amp; Mbi</string>
+
+
+    <string name="send_suggestion">Bëni një sugjerim</string>
+    <string name="send_suggestion_content">Ju lutemi, shkruajeni sugjerimin tuaj më poshtë.</string>
+    <string name="send_suggestion_report_placeholder">Përshkruani këtu sugjerimin tuaj</string>
+    <string name="send_suggestion_sent">Faleminderit, sugjerimi u dërgua me sukses</string>
+    <string name="send_suggestion_failed">S’u arrit të dërgohej sugjerimi (%s)</string>
+
+    <string name="settings_labs_show_hidden_events_in_timeline">Shfaq te rrjedha kohore akte të fshehura</string>
+
+    <string name="store_riotx_title">RiotX - Klient Matrix i Brezit të Ardhshëm</string>
+    <string name="store_riotx_short_description">Një klient më i shpejtë dhe më i lehtë për Matrix, që përdor mekanizmat më të rinj Android</string>
+    <string name="store_riotx_full_description">RiotX është një klient i ri për protokollin Matrix (Matrix.org): një rrjet i hapur për komunikim të sigurt, të centralizuar. RiotX është një rishkrim i plotë i klientit Riot Android, bazuar në një rishkrim të plotë të Matrix Android SDK-së.
+\n
+\nKlauzolë: Ky është një version beta. RiotX-i është ende nën zhivillim aktiv dhe përmban kufizime dhe (shpresojmë të mos jenë shumë) të meta. Mirëpresim krejt përshtypjet dhe sugjerimet!
+\n
+\nRiotX-i mbulon: • Hyrje në një llogari ekzistuese • Krijim dhome dhe pjesëmarrje në dhoma publike • Pranim dhe hedhje poshtë ftesash • Njohje të dhomave të përdoruesve • Parje hollësish dhome • Dërgim mesazhesh tekst • Dërgim bashkëngjitjesh • Lexim dhe shkrim mesazhesh në dhoma të fshehtëzuara • Kriptografi: kopjeruajtje kyçesh E2E, verifikim i thelluar pajisjesh, kërkesa dhe përgjigje për ndarje kyçesh • Njoftime push • Tema të Çelëta, të Errëta dhe të Zeza
+\n
+\nNë RiotX s’janë sendërtuar ende krejt veçoritë e Riot-it. Veçori kryesore që mungojnë (dhe që do të vijnë së shpejti!): • Krijim llogarish • Rregullime dhome (shfaqje anëtarësh dhome, etj.) • Krijim dhomash fjalosjeje të drejtpërdrejtë • Thirrje • Widget-es • …</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 a7152c10f3..cb06508b83 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -1479,4 +1479,57 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="keys_backup_unable_to_get_trust_info">取得信任資訊時發生錯誤</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">取得金鑰備份資料時發生錯誤</string>
 
+    <string name="alpha_disclaimer_title">歡迎使用測試版！</string>
+    <string name="alpha_disclaimer_content_line_1">Riot X 還在早期開發階段，可能會缺少某些功能，您可能會遇到臭蟲。</string>
+    <string name="alpha_disclaimer_content_line_2_gplay">最新的功能清單一直都會在 %1$s，如果您發現臭蟲，請在首頁左上角的選單中遞交回報，我們將會盡快修復。</string>
+    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">Play 商店描述</string>
+    <string name="alpha_disclaimer_content_line_2_fdroid">如果您發現臭蟲，請在首頁左上角的選單中遞交回報，我們將會盡快修復。</string>
+
+    <string name="import_e2e_keys_from_file">從檔案「%1$s」匯入 e2e 金鑰。</string>
+
+    <string name="settings_sdk_version">Matrix SDK 版本</string>
+    <string name="settings_other_third_party_notices">其他第三方提醒</string>
+    <string name="navigate_to_room_when_already_in_the_room">您已在檢視此聊天室了！</string>
+
+    <string name="quick_reactions">快速反應</string>
+
+    <string name="settings_general_title">一般</string>
+    <string name="settings_preferences">偏好設定</string>
+    <string name="settings_security_and_privacy">安全與隱私</string>
+    <string name="settings_expert">專家</string>
+    <string name="settings_push_rules">推送規則</string>
+    <string name="settings_push_rules_no_rules">未定義通送規則</string>
+    <string name="settings_push_gateway_no_pushers">沒有已註冊的推送閘道</string>
+
+    <string name="push_gateway_item_app_id">app_id：</string>
+    <string name="push_gateway_item_push_key">push_key：</string>
+    <string name="push_gateway_item_app_display_name">app_display_name：</string>
+    <string name="push_gateway_item_device_name">device_name：</string>
+    <string name="push_gateway_item_url">Url：</string>
+    <string name="push_gateway_item_format">格式：</string>
+
+    <string name="preference_voice_and_video">音訊與視訊</string>
+    <string name="preference_root_help_about">說明與關於</string>
+
+
+    <string name="settings_troubleshoot_test_token_registration_quick_fix">註冊代符</string>
+
+    <string name="send_suggestion">建議</string>
+    <string name="send_suggestion_content">請在下面編寫您的建議。</string>
+    <string name="send_suggestion_report_placeholder">在此描述您的建議</string>
+    <string name="send_suggestion_sent">感謝，建議已成功傳送</string>
+    <string name="send_suggestion_failed">建議傳送失敗 (%s)</string>
+
+    <string name="settings_labs_show_hidden_events_in_timeline">在時間軸中顯示隱藏的活動</string>
+
+    <string name="store_riotx_title">RiotX - 下一代的 Matrix 客戶端</string>
+    <string name="store_riotx_short_description">使用最新 Android 框架的 Matrix 較快且輕量的客戶端</string>
+    <string name="store_riotx_full_description">RiotX 是 Matrix 協定 (Matrix.org) 的新客戶端：安全、去中心化通訊的開放網路。RiotX 是 Riot Android 客戶端的完全重寫，以 Matrix Android SDK 的完全重寫為基礎。
+\n
+\n免責聲明：這是測試版。RiotX 目前仍在積極開發中，包含限制與（我們希望不多的）臭蟲。所有的回饋都很歡迎！
+\n
+\nRiotX 支援：• 登入到既有的帳號 • 建立聊天室與加入公開聊天室 • 接受與回絕邀請 • 列出使用者聊天室 • 檢視聊天室詳細資訊 • 傳送文字訊息 • 傳送附件 • 讀取與編寫已加密的聊天室 • 加密：E2E 金鑰備份、進階裝置驗證、金鑰分享請求與回應 • 推送通知 • 亮、暗與黑色主題
+\n
+\n不是所有 Riot 的功能都已在 RiotX 中實作。主要缺少（會在稍後到來！）的功能：• 建立帳號 • 聊天室設定（列出聊天室成員等） • 直接聊天室建立 • 通話 • 小工具 • …</string>
+
 </resources>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 71672eb216..4c26e8ce0b 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1534,6 +1534,7 @@ Why choose Riot.im?
     <string name="settings_other_third_party_notices">Other third party notices</string>
     <string name="navigate_to_room_when_already_in_the_room">You are already viewing this room!</string>
 
+    <string name="quick_reactions">Quick Reactions</string>
 
     <!-- Settings -->
     <string name="settings_general_title">General</string>
@@ -1593,4 +1594,38 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
 • Widgets
 • …"</string>
 
+    <string name="bottom_action_people_x">Direct Messages</string>
+
+    <string name="send_file_step_idle">Waiting…</string>
+    <string name="send_file_step_encrypting_thumbnail">Encrypting thumbnail…</string>
+    <string name="send_file_step_sending_thumbnail">Sending thumbnail (%1$s / %2$s)</string>
+    <string name="send_file_step_encrypting_file">Encrypting file…</string>
+    <string name="send_file_step_sending_file">Sending file (%1$s / %2$s)</string>
+
+    <string name="downloading_file">Downloading file %1$s…</string>
+    <string name="downloaded_file">File %1$s has been downloaded!</string>
+
+    <string name="edited_suffix">"(edited)"</string>
+
+    <!-- param will be replaced by the value of riotx_no_registration_notice_colored_part -->
+    <string name="riotx_no_registration_notice">%1$s to create an account.</string>
+    <string name="riotx_no_registration_notice_colored_part">Use the old app</string>
+
+
+    <string name="message_edits">Message Edits</string>
+    <string name="no_message_edits_found">No edits found</string>
+
+    <!-- Room filtering -->
+    <string name="room_filtering_filter_hint">Filter conversations…</string>
+    <string name="room_filtering_footer_title">Can’t find what you’re looking for?</string>
+    <string name="room_filtering_footer_create_new_room">Create a new room</string>
+    <string name="room_filtering_footer_create_new_direct_message">Send a new direct message</string>
+    <string name="room_filtering_footer_open_room_directory">View the room directory</string>
+
+    <string name="room_directory_search_hint">Name or ID (#example:matrix.org)</string>
+
+    <string name="labs_swipe_to_reply_in_timeline">Enable swipe to reply in timeline</string>
+
+    <string name="link_copied_to_clipboard">Link copied to clipboard</string>
+
 </resources>
diff --git a/vector/src/main/res/values/strings_riotX.xml b/vector/src/main/res/values/strings_riotX.xml
index f6ec489276..118fde8442 100644
--- a/vector/src/main/res/values/strings_riotX.xml
+++ b/vector/src/main/res/values/strings_riotX.xml
@@ -3,40 +3,4 @@
 
     <!-- Strings not defined in Riot -->
 
-    <string name="bottom_action_people_x">Direct Messages</string>
-
-    <string name="send_file_step_idle">Waiting…</string>
-    <string name="send_file_step_encrypting_thumbnail">Encrypting thumbnail…</string>
-    <string name="send_file_step_sending_thumbnail">Sending thumbnail (%1$s / %2$s)</string>
-    <string name="send_file_step_encrypting_file">Encrypting file…</string>
-    <string name="send_file_step_sending_file">Sending file (%1$s / %2$s)</string>
-
-    <string name="downloading_file">Downloading file %1$s…</string>
-    <string name="downloaded_file">File %1$s has been downloaded!</string>
-
-    <string name="edited_suffix">"(edited)"</string>
-
-    <!-- param will be replaced by the value of riotx_no_registration_notice_colored_part -->
-    <string name="riotx_no_registration_notice">%1$s to create an account.</string>
-    <string name="riotx_no_registration_notice_colored_part">Use the old app</string>
-
-
-
-    <string name="message_edits">Message Edits</string>
-    <string name="no_message_edits_found">No edits found</string>
-
-    <!-- Room filtering -->
-    <string name="room_filtering_filter_hint">Filter conversations…</string>
-    <string name="room_filtering_footer_title">Can’t find what you’re looking for?</string>
-    <string name="room_filtering_footer_create_new_room">Create a new room</string>
-    <string name="room_filtering_footer_create_new_direct_message">Send a new direct message</string>
-    <string name="room_filtering_footer_open_room_directory">View the room directory</string>
-
-    <string name="room_directory_search_hint">Name or ID (#example:matrix.org)</string>
-
-
-    <string name="labs_swipe_to_reply_in_timeline">Enable swipe to reply in timeline</string>
-
-    <string name="link_copied_to_clipboard">Link copied to clipboard</string>
-
 </resources>
\ No newline at end of file