diff --git a/matrix-sdk-android/src/main/res/values-bg/strings.xml b/matrix-sdk-android/src/main/res/values-bg/strings.xml
index 106febb9..743f38e6 100644
--- a/matrix-sdk-android/src/main/res/values-bg/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-bg/strings.xml
@@ -150,4 +150,21 @@
     <string name="verification_emoji_folder">Папка</string>
     <string name="verification_emoji_pin">Карфица</string>
 
+    <string name="initial_sync_start_importing_account">Начална синхронизация:
+\nИмпортиране на профил…</string>
+    <string name="initial_sync_start_importing_account_crypto">Начална синхронизация:
+\nИмпортиране на данни за шифроване</string>
+    <string name="initial_sync_start_importing_account_rooms">Начална синхронизация:
+\nИмпортиране на стаи</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Начална синхронизация:
+\nИмпортиране на стаи, от които съм част</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Начална синхронизация:
+\nИмпортиране на стаи, към които съм поканен</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Начална синхронизация:
+\nИмпортиране на стаи, които съм напуснал</string>
+    <string name="initial_sync_start_importing_account_groups">Начална синхронизация:
+\nИмпортиране на общности</string>
+    <string name="initial_sync_start_importing_account_data">Начална синхронизация:
+\nИмпортиране на данни за профила</string>
+
 </resources>
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 a211ea04..5339cf01 100644
--- a/matrix-sdk-android/src/main/res/values-eu/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-eu/strings.xml
@@ -150,4 +150,21 @@
     <string name="verification_emoji_folder">Karpeta</string>
     <string name="verification_emoji_pin">Txintxeta</string>
 
+    <string name="initial_sync_start_importing_account">Hasierako sinkronizazioa:
+\nKontua inportatzen…</string>
+    <string name="initial_sync_start_importing_account_crypto">Hasierako sinkronizazioa:
+\nZifratzea inportatzen</string>
+    <string name="initial_sync_start_importing_account_rooms">Hasierako sinkronizazioa:
+\nGelak inportatzen</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Hasierako sinkronizazioa:
+\nElkartutako gelak inportatzen</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Hasierako sinkronizazioa:
+\nGonbidatutako gelak inportatzen</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Hasierako sinkronizazioa:
+\nUtzitako gelak inportatzen</string>
+    <string name="initial_sync_start_importing_account_groups">Hasierako sinkronizazioa:
+\nKomunitateak inportatzen</string>
+    <string name="initial_sync_start_importing_account_data">Hasierako sinkronizazioa:
+\nKontuaren datuak inportatzen</string>
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-fi/strings.xml b/matrix-sdk-android/src/main/res/values-fi/strings.xml
index a405c14c..2f3e73c7 100644
--- a/matrix-sdk-android/src/main/res/values-fi/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-fi/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="summary_user_sent_image">%1$s lähetti kuvan.</string>
 
-    <string name="notice_room_invite_no_invitee">%s:n kutsu</string>
+    <string name="notice_room_invite_no_invitee">Käyttäjän %s kutsu</string>
     <string name="notice_room_invite">%1$s kutsui käyttäjän %2$s</string>
     <string name="notice_room_invite_you">%1$s kutsui sinut</string>
     <string name="notice_room_join">%1$s liittyi</string>
@@ -16,15 +16,15 @@
     <string name="notice_display_name_set">%1$s asetti näyttönimekseen %2$s</string>
     <string name="notice_display_name_changed_from">%1$s muutti näyttönimensä nimestä %2$s nimeen %3$s</string>
     <string name="notice_display_name_removed">%1$s poisti näyttönimensä (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s muutti aiheeksi %2$s</string>
-    <string name="notice_room_name_changed">%1$s muutti huoneen nimeksi %2$s</string>
+    <string name="notice_room_topic_changed">%1$s vaihtoi aiheeksi %2$s</string>
+    <string name="notice_room_name_changed">%1$s vaihtoi huoneen nimeksi %2$s</string>
     <string name="notice_placed_video_call">%s soitti videopuhelun.</string>
     <string name="notice_placed_voice_call">%s soitti äänipuhelun.</string>
     <string name="notice_answered_call">%s vastasi puheluun.</string>
     <string name="notice_ended_call">%s lopetti puhelun.</string>
     <string name="notice_made_future_room_visibility">%1$s muutti tulevan huonehistorian näkyväksi käyttäjälle %2$s</string>
-    <string name="notice_room_visibility_invited">kaikki huoneen jäsenet, heidän kutsumisestaan asti.</string>
-    <string name="notice_room_visibility_joined">kaikki huoneen jäsenet, heidän liittymisestään asti.</string>
+    <string name="notice_room_visibility_invited">kaikki huoneen jäsenet, kutsumisestaan asti.</string>
+    <string name="notice_room_visibility_joined">kaikki huoneen jäsenet, liittymisestään asti.</string>
     <string name="notice_room_visibility_shared">kaikki huoneen jäsenet.</string>
     <string name="notice_room_visibility_world_readable">kaikki.</string>
     <string name="notice_room_visibility_unknown">tuntematon (%s).</string>
@@ -34,7 +34,7 @@
     <string name="notice_voip_started">VoIP-konferenssi alkoi</string>
     <string name="notice_voip_finished">VoIP-konferenssi päättyi</string>
 
-    <string name="notice_avatar_changed_too">(profiilikuva muuttui myös)</string>
+    <string name="notice_avatar_changed_too">(myös profiilikuva vaihdettiin)</string>
     <string name="notice_room_name_removed">%1$s poisti huoneen nimen</string>
     <string name="notice_room_topic_removed">%1$s poisti huoneen aiheen</string>
     <string name="notice_profile_change_redacted">%1$s päivitti profiilinsa %2$s</string>
@@ -151,4 +151,21 @@
     <string name="verification_emoji_folder">Kansio</string>
     <string name="verification_emoji_pin">Nuppineula</string>
 
+    <string name="initial_sync_start_importing_account">Alkusynkronointi:
+\nTuodaan tiliä…</string>
+    <string name="initial_sync_start_importing_account_crypto">Alkusynkronointi:
+\nTuodaan kryptoa</string>
+    <string name="initial_sync_start_importing_account_rooms">Alkusynkronointi:
+\nTuodaan huoneita</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Alkusynkronointi:
+\nTuodaan liityttyjä huoneita</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Alkusynkronointi:
+\nTuodaan kutsuttuja huoneita</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Alkusynkronointi:
+\nTuodaan poistuttuja huoneita</string>
+    <string name="initial_sync_start_importing_account_groups">Alkusynkronointi:
+\nTuodaan yhteisöjä</string>
+    <string name="initial_sync_start_importing_account_data">Alkusynkronointi:
+\nTuodaan tilin tietoja</string>
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-fr/strings.xml b/matrix-sdk-android/src/main/res/values-fr/strings.xml
index 542f0174..5d211e01 100644
--- a/matrix-sdk-android/src/main/res/values-fr/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-fr/strings.xml
@@ -150,4 +150,21 @@
     <string name="verification_emoji_folder">Dossier</string>
     <string name="verification_emoji_pin">Épingle</string>
 
+    <string name="initial_sync_start_importing_account">Synchronisation initiale :
+\nImportation du compte…</string>
+    <string name="initial_sync_start_importing_account_crypto">Synchronisation initiale :
+\nImportation de la cryptographie</string>
+    <string name="initial_sync_start_importing_account_rooms">Synchronisation initiale :
+\nImportation des salons</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Synchronisation initiale :
+\nImportation des salons que vous avez rejoints</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Synchronisation initiale :
+\nImportation des salons où vous avez été invités</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Synchronisation initiale :
+\nImportation des salons que vous avez quittés</string>
+    <string name="initial_sync_start_importing_account_groups">Synchronisation initiale :
+\nImportation des communautés</string>
+    <string name="initial_sync_start_importing_account_data">Synchronisation initiale :
+\nImportation des données du compte</string>
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-hu/strings.xml b/matrix-sdk-android/src/main/res/values-hu/strings.xml
index cf257cab..b183a1b4 100644
--- a/matrix-sdk-android/src/main/res/values-hu/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-hu/strings.xml
@@ -149,4 +149,21 @@
     <string name="verification_emoji_folder">Mappa</string>
     <string name="verification_emoji_pin">Tű</string>
 
+    <string name="initial_sync_start_importing_account">Induló szinkronizáció:
+\nFiók betöltése…</string>
+    <string name="initial_sync_start_importing_account_crypto">Induló szinkronizáció:
+\nTitkosítás betöltése</string>
+    <string name="initial_sync_start_importing_account_rooms">Induló szinkronizáció:
+\nSzobák betöltése</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Induló szinkronizáció:
+\nCsatlakozott szobák betöltése</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Induló szinkronizáció:
+\nMeghívott szobák betöltése</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Induló szinkronizáció:
+\nElhagyott szobák betöltése</string>
+    <string name="initial_sync_start_importing_account_groups">Induló szinkronizáció:
+\nKözösségek betöltése</string>
+    <string name="initial_sync_start_importing_account_data">Induló szinkronizáció:
+\nFiók adatok betöltése</string>
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-it/strings.xml b/matrix-sdk-android/src/main/res/values-it/strings.xml
index 7adc3638..3f067c2a 100644
--- a/matrix-sdk-android/src/main/res/values-it/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-it/strings.xml
@@ -150,4 +150,21 @@
     <string name="verification_emoji_folder">Cartella</string>
     <string name="verification_emoji_pin">Spillo</string>
 
+    <string name="initial_sync_start_importing_account">Sync iniziale:
+\nImportazione account…</string>
+    <string name="initial_sync_start_importing_account_crypto">Sync iniziale:
+\nImportazione cifratura</string>
+    <string name="initial_sync_start_importing_account_rooms">Sync iniziale:
+\nImportazione stanze</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Sync iniziale:
+\nImportazione stanze partecipate</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Sync iniziale:
+\nImportazione stanze invitate</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Sync iniziale:
+\nImportazione stanze lasciate</string>
+    <string name="initial_sync_start_importing_account_groups">Sync iniziale:
+\nImportazione comunità</string>
+    <string name="initial_sync_start_importing_account_data">Sync iniziale:
+\nImportazione dati account</string>
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-nl/strings.xml b/matrix-sdk-android/src/main/res/values-nl/strings.xml
index c20124d1..b46b79ea 100644
--- a/matrix-sdk-android/src/main/res/values-nl/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-nl/strings.xml
@@ -159,4 +159,21 @@
     <string name="verification_emoji_folder">Map</string>
     <string name="verification_emoji_pin">Speld</string>
 
+    <string name="initial_sync_start_importing_account">Initiële synchronisatie:
+\nAccount wordt geïmporteerd…</string>
+    <string name="initial_sync_start_importing_account_crypto">Initiële synchronisatie:
+\nCrypto wordt geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_rooms">Initiële synchronisatie:
+\nGesprekken worden geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Initiële synchronisatie:
+\nDeelgenomen gesprekken worden geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Initiële synchronisatie:
+\nUitgenodigde gesprekken worden geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Initiële synchronisatie:
+\nVerlaten gesprekken worden geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_groups">Initiële synchronisatie:
+\nGemeenschappen worden geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_data">Initiële synchronisatie:
+\nAccountgegevens worden geïmporteerd</string>
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-ru/strings.xml b/matrix-sdk-android/src/main/res/values-ru/strings.xml
index 63a45655..4563fa89 100644
--- a/matrix-sdk-android/src/main/res/values-ru/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-ru/strings.xml
@@ -159,8 +159,25 @@
     <string name="verification_emoji_trumpet">Труба</string>
     <string name="verification_emoji_bell">Колокол</string>
     <string name="verification_emoji_anchor">Якорь</string>
-    <string name="verification_emoji_headphone">Гарнитура</string>
+    <string name="verification_emoji_headphone">Наушники</string>
     <string name="verification_emoji_folder">Папка</string>
     <string name="verification_emoji_pin">Булавка</string>
 
+    <string name="initial_sync_start_importing_account">Начальная синхронизация:
+\nИмпорт учетной записи…</string>
+    <string name="initial_sync_start_importing_account_crypto">Начальная синхронизация:
+\nИмпорт криптографии</string>
+    <string name="initial_sync_start_importing_account_rooms">Начальная синхронизация:
+\nИмпорт комнат</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Начальная синхронизация:
+\nИмпорт присоединенных комнат</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Начальная синхронизация:
+\nИмпорт приглашенных комнат</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Начальная синхронизация:
+\nИмпорт покинутых комнат</string>
+    <string name="initial_sync_start_importing_account_groups">Начальная синхронизация:
+\nИмпорт сообществ</string>
+    <string name="initial_sync_start_importing_account_data">Начальная синхронизация:
+\nИмпорт данных учетной записи</string>
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-vls/strings.xml b/matrix-sdk-android/src/main/res/values-vls/strings.xml
index 61da5173..29e66940 100644
--- a/matrix-sdk-android/src/main/res/values-vls/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-vls/strings.xml
@@ -150,4 +150,21 @@
     <string name="verification_emoji_folder">Mappe</string>
     <string name="verification_emoji_pin">Pinne</string>
 
+    <string name="initial_sync_start_importing_account">Initiële synchronisoatie:
+\nAccount wor geïmporteerd…</string>
+    <string name="initial_sync_start_importing_account_crypto">Initiële synchronisoatie:
+\nCrypto wor geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_rooms">Initiële synchronisoatie:
+\nGesprekkn wordn geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Initiële synchronisoatie:
+\nDeelgenoomn gesprekken wordn geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Initiële synchronisoatie:
+\nUutgenodigde gesprekkn wordn geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Initiële synchronisoatie:
+\nVerloatn gesprekkn wordn geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_groups">Initiële synchronisoatie:
+\nGemeenschappn wordn geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_data">Initiële synchronisoatie:
+\nAccountgegeevns wordn geïmporteerd</string>
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml b/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml
index b92c72e5..70c99089 100644
--- a/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml
@@ -82,4 +82,84 @@
     <string name="notice_event_redacted_by">消息已被 %1$s 移除</string>
     <string name="notice_event_redacted_with_reason">消息已被移除 [原因: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">消息已被 %1$s 移除 [原因: %2$s]</string>
+    <string name="verification_emoji_dog">狗</string>
+    <string name="verification_emoji_cat">猫</string>
+    <string name="verification_emoji_lion">狮子</string>
+    <string name="verification_emoji_horse">马</string>
+    <string name="verification_emoji_unicorn">独角兽</string>
+    <string name="verification_emoji_pig">猪</string>
+    <string name="verification_emoji_elephant">大象</string>
+    <string name="verification_emoji_rabbit">兔子</string>
+    <string name="verification_emoji_panda">熊猫</string>
+    <string name="verification_emoji_rooster">公鸡</string>
+    <string name="verification_emoji_penguin">企鹅</string>
+    <string name="verification_emoji_turtle">乌龟</string>
+    <string name="verification_emoji_fish">鱼</string>
+    <string name="verification_emoji_octopus">章鱼</string>
+    <string name="verification_emoji_butterfly">蝴蝶</string>
+    <string name="verification_emoji_flower">花</string>
+    <string name="verification_emoji_tree">树</string>
+    <string name="verification_emoji_cactus">仙人掌</string>
+    <string name="verification_emoji_mushroom">蘑菇</string>
+    <string name="verification_emoji_globe">地球</string>
+    <string name="verification_emoji_moon">月亮</string>
+    <string name="verification_emoji_cloud">云</string>
+    <string name="verification_emoji_fire">火</string>
+    <string name="verification_emoji_banana">香蕉</string>
+    <string name="verification_emoji_apple">苹果</string>
+    <string name="verification_emoji_strawberry">草莓</string>
+    <string name="verification_emoji_corn">玉米</string>
+    <string name="verification_emoji_pizza">披萨</string>
+    <string name="verification_emoji_cake">蛋糕</string>
+    <string name="verification_emoji_heart">心</string>
+    <string name="verification_emoji_smiley">微笑</string>
+    <string name="verification_emoji_robot">机器人</string>
+    <string name="verification_emoji_hat">帽子</string>
+    <string name="verification_emoji_glasses">眼镜</string>
+    <string name="verification_emoji_wrench">扳手</string>
+    <string name="verification_emoji_santa">圣诞老人</string>
+    <string name="verification_emoji_thumbsup">点赞</string>
+    <string name="verification_emoji_umbrella">雨伞</string>
+    <string name="verification_emoji_hourglass">沙漏</string>
+    <string name="verification_emoji_clock">钟</string>
+    <string name="verification_emoji_gift">礼物</string>
+    <string name="verification_emoji_lightbulb">灯泡</string>
+    <string name="verification_emoji_book">书</string>
+    <string name="verification_emoji_pencil">铅笔</string>
+    <string name="verification_emoji_paperclip">回形针</string>
+    <string name="verification_emoji_scissors">剪刀</string>
+    <string name="verification_emoji_lock">锁</string>
+    <string name="verification_emoji_key">钥匙</string>
+    <string name="verification_emoji_hammer">锤子</string>
+    <string name="verification_emoji_telephone">电话</string>
+    <string name="verification_emoji_flag">旗子</string>
+    <string name="verification_emoji_train">火车</string>
+    <string name="verification_emoji_bicycle">自行车</string>
+    <string name="verification_emoji_airplane">飞机</string>
+    <string name="verification_emoji_rocket">火箭</string>
+    <string name="verification_emoji_trophy">奖杯</string>
+    <string name="verification_emoji_ball">球</string>
+    <string name="verification_emoji_guitar">吉他</string>
+    <string name="verification_emoji_trumpet">喇叭</string>
+    <string name="verification_emoji_bell">铃铛</string>
+    <string name="verification_emoji_anchor">锚</string>
+    <string name="verification_emoji_headphone">耳机</string>
+    <string name="verification_emoji_folder">文件夹</string>
+    <string name="initial_sync_start_importing_account">初始化同步：
+\n正在导入账号…</string>
+    <string name="initial_sync_start_importing_account_crypto">初始化同步：
+\n正在导入加密数据</string>
+    <string name="initial_sync_start_importing_account_rooms">初始化同步：
+\n正在导入聊天室</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">初始化同步：
+\n正在导入已加入的聊天室</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">初始化同步：
+\n正在导入已邀请的聊天室</string>
+    <string name="initial_sync_start_importing_account_left_rooms">初始化同步：
+\n正在导入已离开的聊天室</string>
+    <string name="initial_sync_start_importing_account_groups">初始化同步：
+\n正在导入社区</string>
+    <string name="initial_sync_start_importing_account_data">初始化同步：
+\n正在导入账号数据</string>
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml b/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml
index 22cf1c0f..0a8f0b45 100644
--- a/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml
@@ -148,4 +148,21 @@
     <string name="verification_emoji_folder">資料夾</string>
     <string name="verification_emoji_pin">別針</string>
 
+    <string name="initial_sync_start_importing_account">初始化同步：
+\n正在匯入帳號……</string>
+    <string name="initial_sync_start_importing_account_crypto">初始化同步：
+\n正在匯入 crypto</string>
+    <string name="initial_sync_start_importing_account_rooms">初始化同步：
+\n正在匯入聊天室</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">初始化同步：
+\n正在匯入已加入的聊天室</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">初始化同步：
+\n正在匯入已邀請的聊天室</string>
+    <string name="initial_sync_start_importing_account_left_rooms">初始化同步：
+\n正在匯入已離開的聊天室</string>
+    <string name="initial_sync_start_importing_account_groups">初始化同步：
+\n正在匯入社群</string>
+    <string name="initial_sync_start_importing_account_data">初始化同步：
+\n正在匯入帳號資料</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 8e5fc6d6..40d35907 100644
--- a/matrix-sdk-android/src/main/res/values/strings.xml
+++ b/matrix-sdk-android/src/main/res/values/strings.xml
@@ -239,4 +239,7 @@
     <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>
 
+    <string name="event_status_sending_message">Sending message…</string>
+    <string name="clear_timeline_send_queue">Clear sending queue</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 1010c83b..134b699a 100644
--- a/matrix-sdk-android/src/main/res/values/strings_RiotX.xml
+++ b/matrix-sdk-android/src/main/res/values/strings_RiotX.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="event_status_sending_message">Sending message…</string>
-    <string name="clear_timeline_send_queue">Clear sending queue</string>
+
+
+
 </resources>
\ No newline at end of file
diff --git a/tools/import_from_riot.sh b/tools/import_from_riot.sh
index 194d9c65..cdc42750 100755
--- a/tools/import_from_riot.sh
+++ b/tools/import_from_riot.sh
@@ -96,6 +96,7 @@ cp ../riot-android/vector/src/main/res/values-nn/strings.xml     ./vector/src/ma
 cp ../riot-android/vector/src/main/res/values-pl/strings.xml     ./vector/src/main/res/values-pl/strings.xml
 cp ../riot-android/vector/src/main/res/values-pt/strings.xml     ./vector/src/main/res/values-pt/strings.xml
 cp ../riot-android/vector/src/main/res/values-pt-rBR/strings.xml ./vector/src/main/res/values-pt-rBR/strings.xml
+cp ../riot-android/vector/src/main/res/values-ro/strings.xml     ./vector/src/main/res/values-ro/strings.xml
 cp ../riot-android/vector/src/main/res/values-ru/strings.xml     ./vector/src/main/res/values-ru/strings.xml
 cp ../riot-android/vector/src/main/res/values-sk/strings.xml     ./vector/src/main/res/values-sk/strings.xml
 cp ../riot-android/vector/src/main/res/values-sq/strings.xml     ./vector/src/main/res/values-sq/strings.xml
diff --git a/vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt b/vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt
index 5a4aa36c..a8e1c2cd 100755
--- a/vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt
+++ b/vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt
@@ -153,7 +153,7 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
                 Timber.w("## Can't sync from push, no current session")
             } else {
                 if (isEventAlreadyKnown(eventId, roomId)) {
-                    Timber.i("Ignoring push, event already knwown")
+                    Timber.i("Ignoring push, event already known")
                 } else {
                     Timber.v("Requesting background sync")
                     session.requireBackgroundSync()
diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml
index 9f6fad40..7f93b37a 100644
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/vector/src/main/res/values-bg/strings.xml
@@ -1517,7 +1517,7 @@
 
     <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_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>
@@ -1550,7 +1550,7 @@
 
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Регистрирай токен</string>
 
-    <string name="send_suggestion">Направи предложение</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>
@@ -1568,4 +1568,36 @@
 \n
 \nЗасега не всички функции на Riot са налични в RiotX. Основни липсващи (и скоро пристигащи!) функции са: • Създаване на нов профил • Настройки на стаи (показване на членове и т.н.) • Създаване на директни чатове • Обаждания • Приспособления • …</string>
 
+    <string name="bottom_action_people_x">Директни съобщения</string>
+
+    <string name="send_file_step_idle">Изчакване…</string>
+    <string name="send_file_step_encrypting_thumbnail">Шифроване на малката снимка…</string>
+    <string name="send_file_step_sending_thumbnail">Изпращане на малка снимка (%1$s / %2$s)</string>
+    <string name="send_file_step_encrypting_file">Шифроване на файл…</string>
+    <string name="send_file_step_sending_file">Изпращане на файл (%1$s / %2$s)</string>
+
+    <string name="downloading_file">Изтегляне на файл %1$s…</string>
+    <string name="downloaded_file">Файлът %1$s беше изтеглен!</string>
+
+    <string name="edited_suffix">(редактирано)</string>
+
+    <string name="riotx_no_registration_notice">%1$s за да създадете профил.</string>
+    <string name="riotx_no_registration_notice_colored_part">Използвай старото приложение</string>
+
+
+    <string name="message_edits">Редакции на съобщението</string>
+    <string name="no_message_edits_found">Не са открити редакции</string>
+
+    <string name="room_filtering_filter_hint">Филтриране на чатове…</string>
+    <string name="room_filtering_footer_title">Не можете да намерите това, което търсите\?</string>
+    <string name="room_filtering_footer_create_new_room">Създай нова стая</string>
+    <string name="room_filtering_footer_create_new_direct_message">Изпрати ново директно съобщение</string>
+    <string name="room_filtering_footer_open_room_directory">Виж директорията със стаи</string>
+
+    <string name="room_directory_search_hint">Име или ID (#example:matrix.org)</string>
+
+    <string name="labs_swipe_to_reply_in_timeline">Активирай отговаряне от списъка с чатове при приплъзване</string>
+
+    <string name="link_copied_to_clipboard">Връзката беше копирана</string>
+
 </resources>
diff --git a/vector/src/main/res/values-es-rMX/strings.xml b/vector/src/main/res/values-es-rMX/strings.xml
index 37c885a9..f9196688 100644
--- a/vector/src/main/res/values-es-rMX/strings.xml
+++ b/vector/src/main/res/values-es-rMX/strings.xml
@@ -33,8 +33,8 @@
     <string name="report_content">Reportar contenido</string>
     <string name="active_call">Llamada activa</string>
     <string name="ongoing_conference_call">Llamada de conferencia en proceso.\nUnirse con %1$s o %2$s.</string>
-    <string name="ongoing_conference_call_voice">voz</string>
-    <string name="ongoing_conference_call_video">video</string>
+    <string name="ongoing_conference_call_voice">Voz</string>
+    <string name="ongoing_conference_call_video">Video</string>
     <string name="cannot_start_call">No se puede iniciar la llamada, inténtalo más tarde</string>
     <string name="missing_permissions_warning">Debido a permisos que faltan, algunas características podrían estar ausentes…</string>
     <string name="missing_permissions_to_start_conf_call">Necesitas permiso para realizar una llamada de conferencia en esta sala</string>
@@ -69,10 +69,10 @@
     <string name="bottom_action_rooms">Salas</string>
 
     <!-- Home screen -->
-    <string name="home_filter_placeholder_home">Buscar salas</string>
-    <string name="home_filter_placeholder_favorites">Buscar favoritos</string>
-    <string name="home_filter_placeholder_people">Buscar personas</string>
-    <string name="home_filter_placeholder_rooms">Buscar salas</string>
+    <string name="home_filter_placeholder_home">Filtrar salas</string>
+    <string name="home_filter_placeholder_favorites">Filtrar favoritos</string>
+    <string name="home_filter_placeholder_people">Filtrar personas</string>
+    <string name="home_filter_placeholder_rooms">Filtrar salas</string>
 
     <!-- Home fragment -->
     <string name="invitations_header">Invitaciones</string>
@@ -103,7 +103,7 @@
     <string name="send_bug_report_description">Por favor describe el error. ¿Qué hiciste? ¿Qué esperabas que sucediera, qué sucedió realmente?</string>
     <string name="send_bug_report_placeholder">Describe tu problema aquí</string>
     <string name="send_bug_report_logs_description">Para diagnosticar problemas, informes de este cliente se enviarán junto a este reporte de error. Este informe, inclusive los registros y la captura de pantalla, no será visible públicamente. Si prefieres solamente enviar el texto de arriba, por favor desmarca:</string>
-    <string name="send_bug_report_alert_message">Pareces estar temblando de frustración. ¿Te gustaría enviar un reporte de error?</string>
+    <string name="send_bug_report_alert_message">Pareces estar temblando de frustración. ¿Te gustaría abrir un reporte de error\?</string>
     <string name="send_bug_report_sent">El reporte de error ha sido enviado</string>
     <string name="send_bug_report_failed">El reporte de error no se pudo enviar (%s)</string>
     <string name="send_bug_report_progress">Progreso (%s%%)</string>
@@ -114,7 +114,7 @@
 
     <string name="join_room">Entrar Sala</string>
     <string name="username">Nombre</string>
-    <string name="create_account">Registrar</string>
+    <string name="create_account">Crear Cuenta</string>
     <string name="login">Iniciar sesión</string>
     <string name="logout">Cerrar sesión</string>
     <string name="hs_url">Enlace de el Servidor</string>
@@ -184,7 +184,7 @@
     <string name="login_error_registration_network_error">Inscripción falló: error con la red</string>
     <string name="login_error_unable_register">Inscripción falló</string>
     <string name="login_error_unable_register_mail_ownership">Inscripción falló : el correo electrónico ya esta utilizado por otra cuenta</string>
-    <string name="login_error_invalid_home_server">Escribe enlace válido</string>
+    <string name="login_error_invalid_home_server">Escribe un enlace válido</string>
 
     <string name="login_error_forbidden">Nombre/Contraseña inválido</string>
     <string name="login_error_unknown_token">El token de acceso especificado no fue reconocido</string>
@@ -234,7 +234,7 @@ Disculpe por la inconveniencia.</string>
     <string name="incoming_call">Llamada Entrante</string>
     <string name="incoming_video_call">Llamada de Video Entrante</string>
     <string name="incoming_voice_call">Llamada de Voz Entrante</string>
-    <string name="call_in_progress">Llamada en Processo</string>
+    <string name="call_in_progress">Llamada en Curso…</string>
 
     <string name="call_error_user_not_responding">El lado remoto no pudo contestar.</string>
     <string name="call_error_ice_failed">Conexión de media falló</string>
@@ -258,11 +258,11 @@ Disculpe por la inconveniencia.</string>
 
 ¿Permitir el acceso a Riot para leer tus contactos ?</string>
 
-    <string name="permissions_action_not_performed_missing_permissions">Perdon.. Operación no realizada, debido a permisos faltantes</string>
+    <string name="permissions_action_not_performed_missing_permissions">Perdón. Operación no realizada debido a permisos faltantes</string>
 
     <!-- medias slider string -->
     <string name="media_slider_saved">Guardado</string>
-    <string name="media_slider_saved_message">Guardar en Descargas</string>
+    <string name="media_slider_saved_message">¿Guardar en Descargas\?</string>
     <string name="yes">SÍ</string>
     <string name="no">NO</string>
     <string name="_continue">Continuar</string>
@@ -370,7 +370,8 @@ Disculpe por la inconveniencia.</string>
 
     <!-- Room events -->
     <string name="room_event_action_report_prompt_reason">Razón por reportar este contenido</string>
-    <string name="room_event_action_report_prompt_ignore_user">¿Desea ocultar todos los mensajes de este usuario?</string>
+    <string name="room_event_action_report_prompt_ignore_user">¿Desea ocultar todos los mensajes de este usuario\?
+\nConsidere que esta acción reiniciará la aplicación y tardar un tiempo.</string>
     <string name="room_event_action_cancel_upload">Cancelar Subida</string>
     <string name="room_event_action_cancel_download">Cancelar Descarga</string>
 
@@ -398,7 +399,7 @@ Disculpe por la inconveniencia.</string>
 
     <!-- Directory -->
     <string name="directory_search_results_title">Buscar directorio</string>
-    <string name="directory_searching_title">Buscando directorio..</string>
+    <string name="directory_searching_title">Buscando directorio…</string>
 
     <!-- home room settings -->
     <string name="room_settings_favourite">Destacar</string>
@@ -440,7 +441,7 @@ Disculpe por la inconveniencia.</string>
     <string name="settings_background_sync">Sincronización interna</string>
     <string name="settings_enable_background_sync">Encender sincronización interna</string>
     <string name="settings_set_sync_timeout">Vencimiento de peticiones de sincronización</string>
-    <string name="settings_set_sync_delay">El tardar entre dos peticiones de sincronización</string>
+    <string name="settings_set_sync_delay">Demora entre cada petición de sincronización</string>
     <string name="settings_second">segundo</string>
     <string name="settings_seconds">segundos</string>
 
@@ -487,14 +488,14 @@ Disculpe por la inconveniencia.</string>
     <string name="account_email_validation_message">Por favor vea su correo electrónico y sigue el enlace que contiene. Una vez hecho, escoje Continuar.</string>
     <string name="account_email_validation_error">"No fue posible verificar su dirección de correo. Por favor revise su casilla y siga el enlace que contiene. Una vez hecho, haga clic en  continuar"</string>
 
-    <string name="account_email_already_used_error">This email address is already in use</string>
-    <string name="account_email_not_found_error">Failed to send email: This email address was not found</string>
-    <string name="account_phone_number_already_used_error">This phone number is already in use</string>
+    <string name="account_email_already_used_error">La dirección de correo electrónico ya está en uso.</string>
+    <string name="account_email_not_found_error">Esta dirección de correo electrónico no fue encontrada.</string>
+    <string name="account_phone_number_already_used_error">Este teléfono ya está en uso.</string>
 
     <string name="settings_change_password">Cambiar Contraseña</string>
-    <string name="settings_old_password">Contraseña anterior</string>
+    <string name="settings_old_password">Contraseña actual</string>
     <string name="settings_new_password">Contraseña nueva</string>
-    <string name="settings_confirm_password">confirmar contraseña</string>
+    <string name="settings_confirm_password">Confirmar nueva contraseña</string>
     <string name="settings_fail_to_update_password">La actualización de su contraseña falló</string>
     <string name="settings_password_updated">Su contraseña fue actualizada</string>
     <string name="settings_unignore_user">¿Mostrar todo los mensajes de %s?</string>
@@ -661,7 +662,7 @@ Dispositivos desconocidos:</string>
 
     <!-- historical -->
     <string name="historical_placeholder">Search for historical</string>
-    <string name="notification_sync_in_progress">Sincronizando</string>
+    <string name="notification_sync_in_progress">Sincronizando…</string>
     <string name="loading">Cargando…</string>
 
     <string name="download">Descargar</string>
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index a606294d..ce983090 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -665,7 +665,7 @@ Advertencia: este archivo puede ser eliminado si la aplicación se desinstala.</
 
     <string name="encryption_information_verify_device">Verificar dispositivo</string>
     <string name="encryption_information_verify_device_warning">Para verificar que este dispositivo es confiable, por favor contacta a su dueño por algún otro medio (ej. cara a cara o por teléfono) y pregúntale si la clave que ve en sus Ajustes de Usuario para este dispositivo coincide con la clave a continuación:</string>
-    <string name="encryption_information_verify_device_warning2">Si coincide, presione el botón de verificar a continuación. Si no coincide, entonces alguien más está interceptando este dispositivo y probablemente debería prohibirlo. En el futuro, este proceso de verificación será más sofisticado.</string>
+    <string name="encryption_information_verify_device_warning2">Si coincide, presione el botón de verificar a continuación. Si no coincide, entonces alguien está interceptando este dispositivo y probablemente debería prohibirlo. En el futuro, este proceso de verificación será más sofisticado.</string>
     <string name="encryption_information_verify_key_match">Verifico que las claves coinciden</string>
 
     <string name="e2e_enabling_on_app_update">Riot ahora admite cifrado de extremo a extremo pero debes volver a iniciar sesión para habilitarlo.
@@ -1568,4 +1568,12 @@ Ten en cuenta que esta acción reiniciará la aplicación y puede tardar algo de
     <string name="keys_backup_unable_to_get_trust_info">Error obteniendo información de confiabilidad</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Error obteniendo claves para copias de respaldo</string>
 
+    <string name="room_list_catchup_empty_title">!Estás al día!</string>
+    <string name="alpha_disclaimer_content_line_1">Mientras RiotX esté en desarrollo, algunas características pueden faltar y existir fallas.</string>
+    <string name="settings_preferences">Preferencias</string>
+    <string name="settings_security_and_privacy">Seguridad &amp; Privacidad</string>
+    <string name="preference_voice_and_video">Voz &amp; Video</string>
+    <string name="send_suggestion">Haz una sugerencia</string>
+    <string name="send_suggestion_content">Por favor escriba su sugerencia a continuación.</string>
+    <string name="send_suggestion_report_placeholder">Describa su sugerencia aquí</string>
 </resources>
diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml
index 0736e1b8..3fa89265 100644
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/vector/src/main/res/values-eu/strings.xml
@@ -1575,4 +1575,36 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 \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>
+    <string name="bottom_action_people_x">Mezu zuzenak</string>
+
+    <string name="send_file_step_idle">Itxaroten…</string>
+    <string name="send_file_step_encrypting_thumbnail">Iruditxoa zifratzen…</string>
+    <string name="send_file_step_sending_thumbnail">"Iruditxoa bidaltzen  (%1$s / %2$s)"</string>
+    <string name="send_file_step_encrypting_file">Fitxategia zifratzen…</string>
+    <string name="send_file_step_sending_file">"Fitxategia bidaltzen  (%1$s / %2$s)"</string>
+
+    <string name="downloading_file">%1$s fitxategia deskargatzen…</string>
+    <string name="downloaded_file">%1$s fitxategia deskargatu da!</string>
+
+    <string name="edited_suffix">(editatua)</string>
+
+    <string name="riotx_no_registration_notice">%1$s kontua sortzeko.</string>
+    <string name="riotx_no_registration_notice_colored_part">Erabili aplikazio zaharra</string>
+
+
+    <string name="message_edits">Mezuen edizioak</string>
+    <string name="no_message_edits_found">Ez da ediziorik aurkitu</string>
+
+    <string name="room_filtering_filter_hint">Iragazi elkarrizketak…</string>
+    <string name="room_filtering_footer_title">Ezin duzu bilatzen ari zarena aurkitu\?</string>
+    <string name="room_filtering_footer_create_new_room">Sortu gela berria</string>
+    <string name="room_filtering_footer_create_new_direct_message">Bidali mezu zuzen berri bat</string>
+    <string name="room_filtering_footer_open_room_directory">Ikusi gelen direktorioa</string>
+
+    <string name="room_directory_search_hint">Izena edo ID-a (#adibidea:matrix.org)</string>
+
+    <string name="labs_swipe_to_reply_in_timeline">Gaitu hatza pasatzea denbora-lerroan erantzuteko</string>
+
+    <string name="link_copied_to_clipboard">Esteka arbelera kopiatu da</string>
+
 </resources>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index d0f39271..1b60f5a1 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -1580,4 +1580,36 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 \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>
 
+    <string name="bottom_action_people_x">Messages directs</string>
+
+    <string name="send_file_step_idle">Attente…</string>
+    <string name="send_file_step_encrypting_thumbnail">Chiffrement de la miniature…</string>
+    <string name="send_file_step_sending_thumbnail">Envoi de la miniature (%1$s / %2$s)</string>
+    <string name="send_file_step_encrypting_file">Chiffrement du fichier…</string>
+    <string name="send_file_step_sending_file">Envoi du fichier (%1$s / %2$s)</string>
+
+    <string name="downloading_file">Téléchargement du fichier %1$s…</string>
+    <string name="downloaded_file">Le fichier %1$s a été téléchargé !</string>
+
+    <string name="edited_suffix">(édité)</string>
+
+    <string name="riotx_no_registration_notice">%1$s pour créer un compte.</string>
+    <string name="riotx_no_registration_notice_colored_part">Utilisez l’ancienne application</string>
+
+
+    <string name="message_edits">Éditions de message</string>
+    <string name="no_message_edits_found">Aucune édition trouvée</string>
+
+    <string name="room_filtering_filter_hint">Filtrer les conversations…</string>
+    <string name="room_filtering_footer_title">Vous ne trouvez pas ce que vous cherchez \?</string>
+    <string name="room_filtering_footer_create_new_room">Créer un nouveau salon</string>
+    <string name="room_filtering_footer_create_new_direct_message">Envoyer un nouveau message direct</string>
+    <string name="room_filtering_footer_open_room_directory">Voir le répertoire des salons</string>
+
+    <string name="room_directory_search_hint">Nom ou identifiant (#exemple:matrix.org)</string>
+
+    <string name="labs_swipe_to_reply_in_timeline">Activer le balayement pour répondre dans l’historique</string>
+
+    <string name="link_copied_to_clipboard">Lien copié dans le presse-papiers</string>
+
 </resources>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 035cae08..9f477da3 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -1579,4 +1579,36 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 \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>
 
+    <string name="bottom_action_people_x">Közvetlen beszélgetés</string>
+
+    <string name="send_file_step_idle">Várakozik…</string>
+    <string name="send_file_step_encrypting_thumbnail">Bélyegképek titkosítása…</string>
+    <string name="send_file_step_sending_thumbnail">Bélyegképek küldése (%1$s / %2$s)</string>
+    <string name="send_file_step_encrypting_file">Fájl titkosítása…</string>
+    <string name="send_file_step_sending_file">Fájl küldése (%1$s / %2$s)</string>
+
+    <string name="downloading_file">Fájl letöltése %1$s…</string>
+    <string name="downloaded_file">%1$s fájl letöltve!</string>
+
+    <string name="edited_suffix">(szerkesztve)</string>
+
+    <string name="riotx_no_registration_notice">%1$s fiók készítéshez.</string>
+    <string name="riotx_no_registration_notice_colored_part">Használd a régi alkalmazást</string>
+
+
+    <string name="message_edits">Üzenet szerkesztések</string>
+    <string name="no_message_edits_found">Szerkesztések nem találhatók</string>
+
+    <string name="room_filtering_filter_hint">Beszélgetések szűrése…</string>
+    <string name="room_filtering_footer_title">Nem találod amit keresel\?</string>
+    <string name="room_filtering_footer_create_new_room">Új szoba készítése</string>
+    <string name="room_filtering_footer_create_new_direct_message">Új közvetlen üzenet küldése</string>
+    <string name="room_filtering_footer_open_room_directory">Szoba lista megjelenítése</string>
+
+    <string name="room_directory_search_hint">Név vagy azonosító (#pelda:matrix.org)</string>
+
+    <string name="labs_swipe_to_reply_in_timeline">Válasz engedélyezése húzással az idővonalon</string>
+
+    <string name="link_copied_to_clipboard">Hivatkozás a vágólapra másolva</string>
+
 </resources>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index cb5141ce..c414f38d 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -1623,4 +1623,37 @@ Per essere certo di non perdere nulla, mantieni gli aggiornamenti attivi."</stri
 \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>
 
+    <string name="room_list_catchup_empty_title">Non hai nulla di nuovo da vedere!</string>
+    <string name="bottom_action_people_x">Messaggi diretti</string>
+
+    <string name="send_file_step_idle">In attesa…</string>
+    <string name="send_file_step_encrypting_thumbnail">Criptazione miniatura…</string>
+    <string name="send_file_step_sending_thumbnail">Invio miniatura (%1$s / %2$s)</string>
+    <string name="send_file_step_encrypting_file">Criptazione file…</string>
+    <string name="send_file_step_sending_file">Invio file (%1$s / %2$s)</string>
+
+    <string name="downloading_file">Scaricamento file %1$s…</string>
+    <string name="downloaded_file">Il file %1$s è stato scaricato!</string>
+
+    <string name="edited_suffix">(modificato)</string>
+
+    <string name="riotx_no_registration_notice">%1$s per creare un account.</string>
+    <string name="riotx_no_registration_notice_colored_part">Usa la vecchia app</string>
+
+
+    <string name="message_edits">Modifiche messaggio</string>
+    <string name="no_message_edits_found">Nessuna modifica trovata</string>
+
+    <string name="room_filtering_filter_hint">Filtra conversazioni…</string>
+    <string name="room_filtering_footer_title">Non trovi quello che cerchi\?</string>
+    <string name="room_filtering_footer_create_new_room">Crea un nuova stanza</string>
+    <string name="room_filtering_footer_create_new_direct_message">Invia un nuovo messaggio diretto</string>
+    <string name="room_filtering_footer_open_room_directory">Vedi l\'elenco delle stanze</string>
+
+    <string name="room_directory_search_hint">Nome o ID (#esempio:matrix.org)</string>
+
+    <string name="labs_swipe_to_reply_in_timeline">Attiva swipe per rispondere nella timeline</string>
+
+    <string name="link_copied_to_clipboard">Collegamento copiato negli appunti</string>
+
 </resources>
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index ae7da359..3298e5dd 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -27,7 +27,7 @@
     <string name="active_call">Aktywne połączenie</string>
     <string name="ongoing_conference_call">Przychodzące połączenie grupowe.
 \nDołącz z %1$s lub %2$s</string>
-    <string name="ongoing_conference_call_voice">mikrofonem</string>
+    <string name="ongoing_conference_call_voice">Głos</string>
     <string name="ongoing_conference_call_video">kamerą</string>
     <string name="cannot_start_call">Nie można rozpocząć połączenia, spróbuj ponownie później</string>
     <string name="missing_permissions_warning">Ze względu na brak pewnych uprawnień, niektóre funkcje mogą nie działać…</string>
@@ -95,7 +95,7 @@
     <string name="send_bug_report_placeholder">Opisz swój problem tutaj</string>
     <string name="send_bug_report_logs_description">W celu zdiagnozowania problemów, logi z tego klienta zostaną wysłane wraz z tym raportem o błędzie. Ten raport o błędzie, w tym dzienniki i zrzut ekranu, nie będzie publicznie widoczny. Jeśli wolisz wysłać tylko powyższy tekst, odznacz:</string>
     <string name="send_bug_report_alert_message">Wygląda na to, że potrząsasz telefonem ze zdenerwowania. Czy chcesz otworzyć ekran zgłaszania błędu\?</string>
-    <string name="send_bug_report_app_crashed">Aplikacja nie została poprawnie zamknięta za ostatnim razem. Czy chcesz zgłosić raport o nieoczekiwanym zamknięciu?</string>
+    <string name="send_bug_report_app_crashed">Przy wcześniejszym użyciu aplikacja napotkała błąd. Czy chcesz zgłosić raport o nieoczekiwanym zamknięciu\?</string>
 
     <string name="send_bug_report_sent">Pomyślnie zgłoszono błąd</string>
     <string name="send_bug_report_failed">Nie udało się zgłosić błędu (%s)</string>
@@ -543,8 +543,8 @@ Zauważ, że ta czynność spowoduje ponowne uruchomienie aplikacji i może to t
     <string name="create">Utwórz</string>
     <string name="notification_off">Off</string>
     <string name="conference_call_warning_title">Uwaga!</string>
-    <string name="notification_sync_in_progress">W trakcie synchronizacji</string>
-    <string name="notification_listening_for_events">Nasłuchuj zdarzeń</string>
+    <string name="notification_sync_in_progress">Synchronizowanie…</string>
+    <string name="notification_listening_for_events">Nasłuchiwanie zdarzeń</string>
     <string name="notification_noisy_notifications">Głośne powiadomienia</string>
     <string name="notification_silent_notifications">Ciche powiadomienia</string>
 
@@ -614,9 +614,7 @@ Zezwól na dostęp w następnym oknie aby móc wykonać połączenie.</string>
     <string name="permissions_rationale_msg_camera_and_audio">Riot wymaga dostępu do kamery i mikrofonu, aby przeprowadzać rozmowy wideo.
 
 Przyznaj dostęp w następnym oknie.</string>
-    <string name="permissions_rationale_msg_contacts">Riot wymaga dostępu do kontaktów, aby znajdywać innych użytkowników Matrixa bazując na adresie e-mail i numerze telefonu.
-
-Proszę przyznaj dostęp w następnym oknie, aby odkryć użytkowników książki adresowej osiągalnych z Riot.</string>
+    <string name="permissions_rationale_msg_contacts">Riot może sprawdzić Twoją książkę adresową, aby znajdywać innych użytkowników Matrixa bazując na ich adresie e-mail i numerze telefonu. Jeśli zgadzasz się na udostępnienie Twojej książki adresowej w tym celu, zezwól na dostęp w następnym okienku.</string>
     <string name="permissions_msg_contacts_warning_other_androids">Riot wymaga dostępu do kontaktów, aby znajdywać innych użytkowników Matrixa bazując na adresie e-mail i numerze telefonu.
 
 Zezwolić Riot na dostęp do kontaktów?</string>
@@ -1132,7 +1130,7 @@ Aby upewnić się, że niczego nie przegapisz, po prostu miej włączone aktuali
     <string name="settings_troubleshoot_test_foreground_service_startedt_success">Usługa Powiadomień jest uruchomiona.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_failed">Usługa Powiadomień nie jest uruchomiona.
 Spróbuj uruchomić ponownie aplikację.</string>
-    <string name="video_call_in_progress">W trakcie połączenia wideo…</string>
+    <string name="video_call_in_progress">Połączenie wideo trwa…</string>
 
     <string name="title_activity_keys_backup_setup">Kopia Zapasowa Klucza</string>
     <string name="keys_backup_is_not_finished_please_wait">Kopia zapasowa kluczy nie jest zakończona, proszę czekać…</string>
@@ -1229,4 +1227,9 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="fab_menu_create_room">Pokoje</string>
     <string name="create_room_directory_description">Opublikuj pokój do spisu pokojów</string>
 
+    <string name="sign_out_bottom_sheet_warning_backup_not_active">Aby nie utracić dostępu do Twoich zaszyfrowanych wiadomości, powinienieś aktywować kopię zapasową klucza na wszystkich swoich urządzeniach.</string>
+    <string name="sign_out_bottom_sheet_backing_up_keys">Tworzenie kopii zapasowej kluczy…</string>
+    <string name="backup">Utwórz kopię zapasową</string>
+    <string name="login_error_ssl_handshake">Twoje urządzenie używa przestarzałego protokołu bezpieczeństwa TSL, podatnego na ataki, dlatego dla Twojego bezpieczeństwa nie będziesz mógł się połączyć</string>
+    <string name="keys_backup_settings_status_ok">Kopia zapasowa klucza została prawidłowo skonfigurowana dla tego urządzenia.</string>
 </resources>
diff --git a/vector/src/main/res/values-ro/strings.xml b/vector/src/main/res/values-ro/strings.xml
new file mode 100644
index 00000000..09561894
--- /dev/null
+++ b/vector/src/main/res/values-ro/strings.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+    <string name="resources_language">ro</string>
+    <string name="resources_country_code">RO</string>
+
+    <string name="light_theme">Temă luminoasă</string>
+    <string name="dark_theme">Temă întunecată</string>
+    <string name="black_them">Temă Neagră</string>
+    <string name="status_theme">Tema Status.im</string>
+
+    <string name="notification_sync_init">Inițializează serviciu</string>
+    <string name="notification_sync_in_progress">Sincronizează…</string>
+    <string name="notification_listening_for_events">Așteaptă evenimente</string>
+    <string name="notification_noisy_notifications">Notificări zgomotoase</string>
+    <string name="notification_silent_notifications">Notificări liniștite</string>
+
+    <string name="title_activity_home">Mesaje</string>
+    <string name="title_activity_room">Cameră</string>
+    <string name="title_activity_settings">Setări</string>
+</resources>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 838d826b..90c2cba1 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -264,12 +264,10 @@ Email также позволит вам при необходимости во
     <string name="permissions_rationale_msg_camera_and_audio">Riot необходимы разрешения на доступ к камере и микрофону для видеовызовов.
 
 Пожалуйста дайте разрешение в следующем окне для звонка.</string>
-    <string name="permissions_rationale_msg_contacts">Райоту необходимы разрешения на доступ к контактам, чтобы найти других пользователей сети по email или телефонному номеру.
-
-Пожалуйста разрешите доступ в следующем окне, чтобы ваши контакты были доступны в приложении.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot необходимы разрешения на доступ к контактам, чтобы найти других пользователей сети по email или телефонному номеру.
-
-Разрешить Riot доступ к контактам?</string>
+    <string name="permissions_rationale_msg_contacts">Riot необходимы разрешения на доступ к контактам, чтобы найти других пользователей сети по email или телефонному номеру. Пожалуйста разрешите доступ в следующем окне, чтобы ваши контакты были доступны в приложении.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Riot может проверить Вашу адресную книгу, чтобы найти других пользователей сети по email или телефонному номеру. 
+\n
+\nСогласны ли вы поделиться своей адресной книгой для этой цели\?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Извините. Действие не выполнено из-за недостаточных разрешений</string>
 
@@ -1509,7 +1507,7 @@ Email также позволит вам при необходимости во
     <string name="key_share_request">Запрос поделится ключем</string>
     <string name="ignore_request_short_label">Игнорировать</string>
 
-    <string name="autodiscover_invalid_response">Недействительный ответ обнаружения сервера</string>
+    <string name="autodiscover_invalid_response">Ошибка отклика сервера</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Дополнить параметры сервера</string>
     <string name="autodiscover_well_known_autofill_dialog_message">Riot обнаружил пользовательскую конфигурацию сервера для вашего userID домена\"%1$s\":
 \n%2$s</string>
@@ -1561,4 +1559,31 @@ Email также позволит вам при необходимости во
     <string name="keys_backup_setup_override_backup_prompt_tile">Резервная копия существует на домашнем сервере</string>
     <string name="keys_backup_setup_override_backup_prompt_description">Похоже, что у вас уже есть резервное копирование ключа настройки с другого устройства. Вы хотите заменить его на тот, который вы создаете\?</string>
     <string name="keys_backup_setup_override_replace">Заменить</string>
+    <string name="keys_backup_setup_override_stop">Стоп</string>
+
+    <string name="keys_backup_settings_checking_backup_state">Проверка состояния резервного копирования</string>
+    <string name="invalid_or_expired_credentials">Вы вышли из системы из-за недействительных или истекших учетных данных.</string>
+
+    <string name="edit">Редактировать</string>
+    <string name="reply">Ответ</string>
+
+    <string name="global_retry">Повторить</string>
+    <string name="room_list_empty">Присоединитесь к комнате, чтобы начать использовать приложение.</string>
+    <string name="send_you_invite">Отправил вам приглашение</string>
+    <string name="invited_by">Приглашен %s</string>
+
+    <string name="room_list_catchup_empty_title">Вы в курсе!</string>
+    <string name="room_list_catchup_empty_body">У вас больше нет непрочитанных сообщений</string>
+    <string name="room_list_catchup_welcome_title">Добро пожаловать домой!</string>
+    <string name="room_list_catchup_welcome_body">Узнайте больше о непрочитанных сообщениях здесь</string>
+    <string name="room_list_people_empty_title">Беседа</string>
+    <string name="room_list_people_empty_body">Ваше прямое сообщение будет отображаться здесь</string>
+    <string name="room_list_rooms_empty_title">Комнаты</string>
+    <string name="room_list_rooms_empty_body">Ваши комнаты будут отображаться здесь</string>
+
+    <string name="title_activity_emoji_reaction_picker">Реакция</string>
+    <string name="reactions_agree">Соглашаться</string>
+    <string name="reactions_like">Нравиться</string>
+    <string name="message_add_reaction">Добавить реакцию</string>
+    <string name="message_view_reaction">Посмотреть реакции</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 bdf08a55..32610986 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -682,9 +682,9 @@
     <string name="widget_integration_failed_to_send_request">发送请求失败。</string>
     <string name="widget_integration_positive_power_level">特权级别必须是正整数。</string>
     <string name="widget_integration_must_be_in_room">您不在这个聊天室。</string>
-    <string name="widget_integration_no_permission_in_room">您没有在这个聊天室里执行此操作的权限。</string>
-    <string name="widget_integration_missing_room_id">请求中没有 room_id.</string>
-    <string name="widget_integration_missing_user_id">请求中没有 user_id.</string>
+    <string name="widget_integration_no_permission_in_room">您没有在当前聊天室中执行此操作的权限。</string>
+    <string name="widget_integration_missing_room_id">请求中缺失 room_id。</string>
+    <string name="widget_integration_missing_user_id">请求中缺失 user_id。</string>
     <string name="widget_integration_room_not_visible">聊天室 %s 不可见。</string>
     <string name="room_add_matrix_apps">添加 Matrix 应用</string>
     <string name="notification_sync_in_progress">正在同步…</string>
@@ -882,7 +882,7 @@ Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意
     <string name="dialog_user_consent_content">要想继续使用主服务器 %1$s 您必须阅读并同意其服务条款。</string>
     <string name="dialog_user_consent_submit">现在阅读</string>
 
-    <string name="dialog_title_third_party_licences">第三方协议</string>
+    <string name="dialog_title_third_party_licences">第三方开源协议</string>
 
     <string name="download">下载</string>
     <string name="clear">清除</string>
@@ -913,7 +913,7 @@ Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意
     <string name="room_message_placeholder_reply_to_not_encrypted">发送回复（未加密）…</string>
     <string name="settings_preview_media_before_sending">发送前预览媒体文件</string>
 
-    <string name="settings_labs_keyboard_options_to_send_message">使用键盘的回车键发送消息</string>
+    <string name="settings_labs_keyboard_options_to_send_message">使用回车键发送消息</string>
     <string name="command_description_emote">显示动作</string>
     <string name="command_description_ban_user">依照 ID 封禁用户</string>
     <string name="command_description_unban_user">依照 ID 解禁用户</string>
@@ -1058,7 +1058,7 @@ Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意
 请尝试重启本应用程序。</string>
     <string name="settings_troubleshoot_test_foreground_service_started_quickfix">启动服务</string>
 
-    <string name="settings_labs_native_camera_summary">调用系统相机应用而不是打开 Riot 内置的相机界面。</string>
+    <string name="settings_labs_native_camera_summary">调用系统相机应用而非使用 Riot 内置的相机界面。</string>
     <string name="settings_labs_enable_send_voice_summary">此选项需要第三方应用程序来录制语音消息。</string>
 
     <string name="settings_troubleshoot_test_service_boot_title">开机时启动</string>
@@ -1159,7 +1159,7 @@ Riot 在后台时的工作将被显著的限制，这可能会影响消息通知
     <string name="title_activity_keys_backup_restore">使用备份密钥</string>
 
     <string name="keys_backup_is_not_finished_please_wait">密钥备份尚未完成，请等待…</string>
-    <string name="sign_out_bottom_sheet_warning_no_backup">如果您此时登出账号将会失去您的已加密信息</string>
+    <string name="sign_out_bottom_sheet_warning_no_backup">如果您此时登出账号，您将会失去您的已加密信息</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">密钥备份进行中。如果您此时登出账号将无法再访问您的已加密信息。</string>
     <string name="sign_out_bottom_sheet_warning_backup_not_active">您的所有设备都应当启用安全密钥备份以确保您不会失去您的已加密信息的访问权。</string>
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">我不想要我的已加密信息</string>
@@ -1341,7 +1341,7 @@ Riot 在后台时的工作将被显著的限制，这可能会影响消息通知
 
     <string name="auth_login_sso">以单点登录方式登入</string>
     <string name="login_error_unknown_host">无法连接到此 URL，请检查</string>
-    <string name="login_error_ssl_handshake">您的设备因使用了过时的 TLS 安全协议而容易受到攻击，为了安全您将无法连接</string>
+    <string name="login_error_ssl_handshake">您的设备使用了过时的 TLS 安全协议，容易受到攻击，为保证安全，您将无法进行连接</string>
     <string name="settings_send_message_with_enter">按回车发送消息</string>
     <string name="settings_send_message_with_enter_summary">软键盘的 Enter 按钮将发送消息而不是添加换行符</string>
 
@@ -1379,6 +1379,104 @@ Riot 在后台时的工作将被显著的限制，这可能会影响消息通知
     <string name="notification_sender_me">我</string>
     <string name="notification_inline_reply_failed">** 发送失败 - 请打开聊天室</string>
 
-    <string name="error_jitsi_not_supported_on_old_device">抱歉，旧设备 （安卓系统版本低于 5.0）不支持使用 Jitsi 创建电话会议</string>
+    <string name="error_jitsi_not_supported_on_old_device">抱歉，旧设备 （Android 系统版本低于 5.0）不支持使用 Jitsi 创建电话会议</string>
+
+    <string name="title_activity_verify_device">验证设备</string>
+
+    <string name="encryption_information_unknown_ip">未知 IP</string>
+    <string name="you_added_a_new_device_with_info">一个新设备正在请求加密密钥。
+\n设备名称：%1$s
+\n最近上线于：%2$s
+\n若您未曾在另一个设备上登录，请忽略此请求。</string>
+    <string name="your_unverified_device_requesting_with_info">一个未验证的设备正在请求加密密钥。
+\n设备名称：%1$s
+\n最近上线于：%2$s
+\n若您未曾在另一个设备上登录，请忽略此请求。</string>
+
+    <string name="start_verification_short_label">验证</string>
+    <string name="share_without_verifying_short_label">分享</string>
+    <string name="key_share_request">密钥分享请求</string>
+    <string name="ignore_request_short_label">忽略</string>
+
+    <string name="keys_backup_setup_override_replace">替换</string>
+    <string name="keys_backup_setup_override_stop">终止</string>
+
+    <string name="keys_backup_settings_checking_backup_state">正在检查备份状态</string>
+    <string name="sas_verify_title">通过对比一段简短的文本字符串来验证设备。</string>
+    <string name="sas_security_advise">为保证尽可能高的安全性，我们建议您与对方当面交换，或使用另一种可信任的通讯方式。</string>
+    <string name="sas_verify_start_button_title">开始验证</string>
+    <string name="sas_incoming_request_title">传入的验证请求</string>
+    <string name="sas_view_request_action">查看请求</string>
+    <string name="sas_waiting_for_partner">正在等待对方确认…</string>
+
+    <string name="sas_verified">已验证！</string>
+    <string name="sas_verified_successful">您已成功验证此设备。</string>
+    <string name="sas_got_it">了解了</string>
+
+    <string name="sas_verifying_keys">什么都没有出现？并非所有的客户端都已支持交互式验证。使用旧版验证吧。</string>
+    <string name="sas_legacy_verification_button_title">使用旧版验证。</string>
+
+    <string name="sas_verification_request_notification_channel_title">密钥验证</string>
+    <string name="sas_cancelled_dialog_title">请求已取消</string>
+    <string name="sas_verification_request_notification_channel">交互式设备验证</string>
+    <string name="sas_incoming_request_notif_title">验证请求</string>
+    <string name="sas_incoming_request_notif_content">%s 想验证您的装置</string>
+
+    <string name="sas_error_unknown">未知错误</string>
+
+
+    <string name="edit">编辑</string>
+    <string name="reply">回复</string>
+
+    <string name="global_retry">重试</string>
+    <string name="send_you_invite">向您发送邀请</string>
+    <string name="invited_by">由 %s 邀请</string>
+
+    <string name="room_list_catchup_welcome_title">欢迎回家！</string>
+    <string name="room_list_people_empty_title">对话</string>
+    <string name="room_list_rooms_empty_title">聊天室</string>
+    <string name="title_activity_emoji_reaction_picker">响应</string>
+    <string name="reactions_agree">同意</string>
+    <string name="reactions_like">喜欢</string>
+    <string name="message_add_reaction">响应</string>
+    <string name="message_view_reaction">查看响应</string>
+    <string name="reactions">响应</string>
+
+    <string name="event_redacted_by_user_reason">由用户删除的事件</string>
+    <string name="create_new_room">创建新聊天室</string>
+    <string name="action_change">修改</string>
+    <string name="please_wait">请稍候…</string>
+    <string name="group_all_communities">所有社区</string>
+
+    <string name="room_preview_no_preview">无法预览此聊天室</string>
+    <string name="fab_menu_create_room">聊天室</string>
+    <string name="create_room_action_create">创建</string>
+    <string name="create_room_name_hint">聊天室名称</string>
+    <string name="create_room_directory_title">聊天室目录</string>
+    <string name="alpha_disclaimer_title">欢迎使用 测试版！</string>
+    <string name="settings_sdk_version">Matrix SDK 版本</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="store_riotx_title">RiotX - -下一代 Matrix 客户端</string>
+    <string name="edited_suffix">（已编辑）</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 3f755c20..5be107e9 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -1532,4 +1532,36 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 \n
 \n不是所有 Riot 的功能都已在 RiotX 中實作。主要缺少（會在稍後到來！）的功能：• 建立帳號 • 聊天室設定（列出聊天室成員等） • 直接聊天室建立 • 通話 • 小工具 • …</string>
 
+    <string name="bottom_action_people_x">直接訊息</string>
+
+    <string name="send_file_step_idle">正在等待……</string>
+    <string name="send_file_step_encrypting_thumbnail">正在加密縮圖……</string>
+    <string name="send_file_step_sending_thumbnail">正在傳送縮圖 (%1$s / %2$s)</string>
+    <string name="send_file_step_encrypting_file">正在加密檔案……</string>
+    <string name="send_file_step_sending_file">正在傳送檔案 (%1$s / %2$s)</string>
+
+    <string name="downloading_file">正在下載檔案 %1$s……</string>
+    <string name="downloaded_file">檔案 %1$s 已下載！</string>
+
+    <string name="edited_suffix">（已編輯）</string>
+
+    <string name="riotx_no_registration_notice">%1$s 以建立帳號。</string>
+    <string name="riotx_no_registration_notice_colored_part">使用舊的應用程式</string>
+
+
+    <string name="message_edits">訊息編輯</string>
+    <string name="no_message_edits_found">找不到編輯</string>
+
+    <string name="room_filtering_filter_hint">過濾對話……</string>
+    <string name="room_filtering_footer_title">找不到您要尋找的東西？</string>
+    <string name="room_filtering_footer_create_new_room">建立新聊天室</string>
+    <string name="room_filtering_footer_create_new_direct_message">傳送新直接訊息</string>
+    <string name="room_filtering_footer_open_room_directory">檢視聊天室目錄</string>
+
+    <string name="room_directory_search_hint">名稱或 ID (#example:matrix.org)</string>
+
+    <string name="labs_swipe_to_reply_in_timeline">啟用滑動以在時間軸上回覆</string>
+
+    <string name="link_copied_to_clipboard">連結已複製到剪貼簿</string>
+
 </resources>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index f5d11432..c701387d 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -809,6 +809,7 @@
     <string name="settings_logged_in">Logged in as</string>
     <string name="settings_home_server">Home Server</string>
     <string name="settings_identity_server">Identity Server</string>
+    <string name="settings_integration_manager">Integration Manager</string>
 
     <string name="settings_user_interface">User interface</string>
     <string name="settings_interface_language">Language</string>
@@ -1091,6 +1092,7 @@
     <string name="widget_integration_room_not_visible">Room %s is not visible.</string>
     <string name="widget_integration_missing_parameter">A required parameter is missing.</string>
     <string name="widget_integration_invalid_parameter">A parameter is not valid.</string>
+    <string name="integration_manager_not_configured">No integration manager configured.</string>
     <string name="room_add_matrix_apps">Add Matrix apps</string>
     <string name="settings_labs_native_camera">Use native camera</string>
     <string name="settings_labs_native_camera_summary">Start the system camera instead of the custom camera screen.</string>
@@ -1628,4 +1630,14 @@ Not all features in Riot are implemented in RiotX yet. Main missing (and coming
 
     <string name="link_copied_to_clipboard">Link copied to clipboard</string>
 
+    <string name="add_by_matrix_id">Add by matrix ID</string>
+    <string name="creating_direct_room">"Creating room…"</string>
+    <string name="direct_room_no_known_users">"No result found, use Add by matrix ID to search on server."</string>
+    <string name="direct_room_start_search">"Start typing to get results"</string>
+    <string name="direct_room_filter_hint">"Filter by username or ID…"</string>
+
+    <string name="joining_room">"Joining room…"</string>
+
+    <string name="message_view_edit_history">View Edit History</string>
+
 </resources>
diff --git a/vector/src/main/res/values/strings_riotX.xml b/vector/src/main/res/values/strings_riotX.xml
index efa6d2cc..118fde84 100644
--- a/vector/src/main/res/values/strings_riotX.xml
+++ b/vector/src/main/res/values/strings_riotX.xml
@@ -2,14 +2,5 @@
 <resources>
 
     <!-- Strings not defined in Riot -->
-    <string name="add_by_matrix_id">Add by matrix ID</string>
-    <string name="creating_direct_room">"Creating room…"</string>
-    <string name="direct_room_no_known_users">"No result found, use Add by matrix ID to search on server."</string>
-    <string name="direct_room_start_search">"Start typing to get results"</string>
-    <string name="direct_room_filter_hint">"Filter by username or ID…"</string>
-
-    <string name="joining_room">"Joining room…"</string>
-
-    <string name="message_view_edit_history">View Edit History</string>
 
 </resources>
\ No newline at end of file