diff --git a/matrix-sdk-android/src/main/res/values-de/strings.xml b/matrix-sdk-android/src/main/res/values-de/strings.xml
index e6022cac..3c1b61b3 100644
--- a/matrix-sdk-android/src/main/res/values-de/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-de/strings.xml
@@ -92,4 +92,17 @@
     </plurals>
 
 
+    <string name="notice_event_redacted">Nachricht entfernt</string>
+    <string name="notice_event_redacted_by">Nachricht entfernt von %1$s</string>
+    <string name="notice_event_redacted_with_reason">Nachricht entfernt [Grund: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Nachricht entfernt von %1$s [Grund: %2$s]</string>
+    <string name="verification_emoji_pizza">Pizza</string>
+    <string name="verification_emoji_dog">Hund</string>
+    <string name="verification_emoji_cat">Katze</string>
+    <string name="verification_emoji_lion">Löwe</string>
+    <string name="verification_emoji_horse">Pferd</string>
+    <string name="verification_emoji_unicorn">Einhorn</string>
+    <string name="verification_emoji_pig">Schwein</string>
+    <string name="verification_emoji_elephant">Elefant</string>
+    <string name="verification_emoji_rabbit">Hase</string>
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-es-rMX/strings.xml b/matrix-sdk-android/src/main/res/values-es-rMX/strings.xml
index f3019770..56cbe6ac 100644
--- a/matrix-sdk-android/src/main/res/values-es-rMX/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-es-rMX/strings.xml
@@ -92,4 +92,12 @@
         <item quantity="other">%1$s y %2$d otros</item>
     </plurals>
 
+    <string name="notice_event_redacted">Mensaje eliminado</string>
+    <string name="notice_event_redacted_by">Mensaje eliminado por %1$s</string>
+    <string name="notice_event_redacted_with_reason">Mensaje eliminado [motivo: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Mensaje eliminado por %1$s [motivo: %2$s]</string>
+    <string name="verification_emoji_dog">Perro</string>
+    <string name="verification_emoji_cat">Gato</string>
+    <string name="verification_emoji_lion">León</string>
+    <string name="verification_emoji_horse">Caballo</string>
 </resources>
diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml
index b813f007..b2f1bd89 100644
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/vector/src/main/res/values-bg/strings.xml
@@ -689,12 +689,12 @@
     <string name="permissions_rationale_msg_camera_and_audio">Riot иска разшерение за достъп до микрофона и камерата Ви, за да извърши видео разговор.
 
 Моля, разрешете достъпа от следващия прозорец, който ще се покаже, за да можете да се обадите.</string>
-    <string name="permissions_rationale_msg_contacts">Riot иска разшерение за достъп до контактите Ви, за да намери други Matrix потребители по имейл или телефонен номер.
-
-Моля, разрешете достъпа от следващия прозорец, който ще се покаже, за да можете да намирате потребители на Riot от Вашите контакти.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot иска разрешение за достъп до контактите Ви, за да намери други Matrix потребители по имейл или телефонен номер.
-
-Позволяване на достъп до контактите Ви?</string>
+    <string name="permissions_rationale_msg_contacts">Riot може да провери контактите ви, за да намери други Matrix потребители по имейл или телефонен номер.
+\n
+\nАко сте съгласни да споделите списъка с контактите си за тази цел, моля разрешете достъп при предстоящото запитване.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Riot може да провери контактите ви, за да намери други Matrix потребители по имейл и телефонен номер.
+\n
+\nРазрешавате ли да се сподели списъка с контакти за тази цел\?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Извинете. Операцията не е извършена поради липсващи разрешения за достъп</string>
 
@@ -1453,4 +1453,66 @@
     <string name="sas_error_m_user_error">Несъответствие в потребителя</string>
     <string name="sas_error_unknown">Неизвестна грешка</string>
 
+    <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>
+    <string name="reactions">Реакции</string>
+
+    <string name="event_redacted_by_user_reason">Събитие изтрито от потребителя</string>
+    <string name="event_redacted_by_admin_reason">Събитие модерирано от администратор на стаята</string>
+    <string name="last_edited_info_message">Последно редактирано от %s на %s</string>
+
+
+    <string name="malformed_message">Повредено събитие, не може да се покаже</string>
+    <string name="create_new_room">Създай нова стая</string>
+    <string name="error_no_network">Няма мрежа. Проверете интернет връзката си.</string>
+    <string name="action_change">Промени</string>
+    <string name="change_room_directory_network">Промени мрежата</string>
+    <string name="please_wait">Изчакайте…</string>
+    <string name="group_all_communities">Всички общности</string>
+
+    <string name="room_preview_no_preview">Тази стая не може да бъде прегледана</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">Прегледа на стаи четими от цял свят все още не се поддържа от RiotX</string>
+
+    <string name="fab_menu_create_room">Стаи</string>
+    <string name="fab_menu_create_chat">Директни съобщения</string>
+
+    <string name="create_room_title">Нова стая</string>
+    <string name="create_room_action_create">СЪЗДАЙ</string>
+    <string name="create_room_name_hint">Име на стая</string>
+    <string name="create_room_public_title">Публична</string>
+    <string name="create_room_public_description">Всеки ще може да се присъедини към стаята</string>
+    <string name="create_room_directory_title">Директория със стаи</string>
+    <string name="create_room_directory_description">Публикувай стаята в директорията със стаи</string>
+
+    <string name="keys_backup_unable_to_get_trust_info">Случи се грешка при извличане на информацията за довереността</string>
+    <string name="keys_backup_unable_to_get_keys_backup_data">Случи се грешка при извличане на резервните данни за ключовете</string>
+
 </resources>
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 1ba3b058..912063a6 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -263,12 +263,9 @@ Bitte erlaube den Zugriff im nächsten Dialog, um den Anruf durchzuführen.</str
     <string name="permissions_rationale_msg_camera_and_audio">Riot benötigt die Berechtigung, auf deine Kamera und dein Mikrofon zugreifen zu können, um Video-Anrufe durchführen zu können.
 
 Bitte erlaube den Zugriff im nächsten Dialog, um den Anruf durchzuführen.</string>
-    <string name="permissions_rationale_msg_contacts">Riot benötigt die Berechtigung, auf deine Kontakte im Adressbuch zugreifen zu können, um andere Matrix-Benutzer mit Hilfe ihrer E-Mail-Adresse oder Telefonnummer zu finden.
-
-Bitte erlaube den Zugriff im nächsten Dialog, um Kontakte im Adressbuch zu finden, die über Riot erreichbar sind.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot benötigt die Berechtigung, auf deine Adressbuch-Kontakte zugreifen zu dürfen, um andere Matrix-Benutzer mit Hilfe ihrer E-Mail-Adresse und/oder ihrer Telefonnummer finden zu können.
-
-Soll Riot der Zugriff auf deine Kontakte erlaubt werden?</string>
+    <string name="permissions_rationale_msg_contacts">Riot kann dein Adressbuch durchsuchen, um andere Matrix-Nutzer anhand ihrer Email-Adresse und Telefonnummer zu finden. Wenn du der Nutzung deines Adressbuchs zu diesem Zweck zustimmst, erlaube den Zugriff im nächsten Popup-Fenster.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Riot kann dein Adressbuch durchsuchen, um andere Matrix-Nutzer anhand ihrer Email-Adresse und Telefonnummer zu finden.
+\nStimmst du der Nutzung deines Adressbuchs zu diesem Zweck zu\?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Entschuldige. Die Aktion wurde aufgrund fehlender Berechtigungen nicht ausgeführt</string>
 
@@ -1455,4 +1452,103 @@ Wenn du diese neue Wiederherstellungsmethode nicht eingerichtet hast, kann ein A
 
     <string name="error_jitsi_not_supported_on_old_device">Entschuldige, doch Konferenzgespräche mittels Jitsi wird auf alten Geräten nicht unterstützt (älter als Android 5.0)</string>
 
+    <string name="title_activity_verify_device">Gerät verifizieren</string>
+
+    <string name="encryption_information_unknown_ip">Unbekannte IP-Adresse</string>
+    <string name="you_added_a_new_device_with_info">Ein neues Gerät fordert Verschlüsselungs-Schlüssel an.
+\nGerätename: %1$s
+\nZuletzt gesehen: %2$s
+\nWenn du dich nicht auf einem anderen Gerät angemeldet hast, ignoriere diese Anfrage.</string>
+    <string name="your_unverified_device_requesting_with_info">Ein unverifiziertes Gerät fordert Verschlüsselungs-Schlüssel an.
+\nGerätename: %1$s
+\nZuletzt gesehen: %2$s
+\nWenn du dich nicht auf einem anderen Gerät angemeldet hast, ignoriere diese Anfrage.</string>
+
+    <string name="start_verification_short_label">Verifizieren</string>
+    <string name="share_without_verifying_short_label">Teilen</string>
+    <string name="ignore_request_short_label">Ignorieren</string>
+
+    <string name="keys_backup_setup_override_backup_prompt_tile">Auf deinem HomeServer existiert bereits eine Sicherung</string>
+    <string name="keys_backup_setup_override_replace">Ersetzen</string>
+    <string name="keys_backup_setup_override_stop">Stopp</string>
+
+    <string name="keys_backup_settings_checking_backup_state">Überprüfe Sicherungsstatus</string>
+    <string name="invalid_or_expired_credentials">Du wurdest abgemeldet, da deine Anmeldedaten falsch oder abgelaufen sind.</string>
+
+    <string name="sas_verify_title">Verifizieren durch Vergleichen eines kurzen Satzes.</string>
+    <string name="sas_verify_start_button_title">Starte Verifizierung</string>
+    <string name="sas_incoming_request_title">Eingehende Verifizierungsanfrage</string>
+    <string name="sas_incoming_verification_request_dialog">Du hast eine eingehende Verifikationsanfrage erhalten.</string>
+    <string name="sas_view_request_action">Anfragen ansehen</string>
+    <string name="sas_waiting_for_partner">Warte auf Bestätigung des Partners…</string>
+
+    <string name="sas_verified">Verifiziert!</string>
+    <string name="sas_verified_successful">Du hast dieses Gerät erfolgreich verifiziert.</string>
+    <string name="sas_verified_successful_description">Sichere Nachrichten mit diesem Benutzer sind Ende-zu-Ende-verschlüsselt und können nicht von Dritten mitgelesen werden.</string>
+    <string name="sas_got_it">Verstanden</string>
+
+    <string name="sas_verification_request_notification_channel_title">Schlüsselverifikation</string>
+    <string name="sas_cancelled_dialog_title">Anfrage abgebrochen</string>
+    <string name="sas_cancelled_by_me">Die Verifizierung ist abgebrochen.
+\nGrund: %s</string>
+
+    <string name="sas_verification_request_notification_channel">Interaktive Geräteverifizierung</string>
+    <string name="sas_incoming_request_notif_title">Verifikationsanfrage</string>
+    <string name="sas_incoming_request_notif_content">%s möchte dein Gerät verifizieren</string>
+
+    <string name="sas_error_m_user">Der Benutzer hat die Verifizierung abgebrochen</string>
+    <string name="sas_error_m_timeout">Der Verifizierungsprozess ist abgelaufen</string>
+    <string name="sas_error_m_unexpected_message">Das Gerät hat eine unerwartete Nachricht erhalten</string>
+    <string name="sas_error_m_invalid_message">Eine ungültige Nachricht wurde empfangen</string>
+    <string name="sas_error_unknown">Unbekannter Fehler</string>
+
+
+    <string name="edit">Bearbeiten</string>
+    <string name="reply">Antworten</string>
+
+    <string name="global_retry">Wiederholen</string>
+    <string name="room_list_empty">Trete einem Raum bei um die App zu benutzen.</string>
+    <string name="send_you_invite">Hat dir eine Einladung gesendet</string>
+    <string name="invited_by">Eingeladen von %s</string>
+
+    <string name="room_list_catchup_empty_title">Du bist auf dem neuesten Stand!</string>
+    <string name="room_list_catchup_empty_body">Du hast keine weiteren, ungelesenen Nachrichten</string>
+    <string name="room_list_catchup_welcome_title">Willkommen zu Hause!</string>
+    <string name="room_list_people_empty_title">Unterhaltungen</string>
+    <string name="room_list_rooms_empty_title">Räume</string>
+    <string name="room_list_rooms_empty_body">Deine Räume werden hier angezeigt</string>
+
+    <string name="title_activity_emoji_reaction_picker">Reaktionen</string>
+    <string name="reactions_agree">Zustimmen</string>
+    <string name="reactions_like">Mag ich</string>
+    <string name="message_add_reaction">Reaktion hinzufügen</string>
+    <string name="message_view_reaction">Reaktionen ansehen</string>
+    <string name="reactions">Reaktionen</string>
+
+    <string name="event_redacted_by_user_reason">Ereignis von Benutzer gelöscht</string>
+    <string name="event_redacted_by_admin_reason">Ereignis moderiert durch Raum-Administrator</string>
+    <string name="last_edited_info_message">Zuletzt bearbeitet von %s am %s</string>
+
+
+    <string name="create_new_room">Neuen Raum erstellen</string>
+    <string name="error_no_network">Kein Netzwerk. Bitte überprüfe deine Internetverbindung.</string>
+    <string name="action_change">Ändern</string>
+    <string name="change_room_directory_network">Netzwerk wechseln</string>
+    <string name="please_wait">Bitte warten…</string>
+    <string name="group_all_communities">Alle Gemeinschaften</string>
+
+    <string name="room_preview_no_preview">Für diesen Raum kann keine Vorschau angezeigt werden</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">Die Vorschau von öffentlichen Räumen wird von RiotX noch nicht unterstützt</string>
+
+    <string name="fab_menu_create_room">Räume</string>
+    <string name="fab_menu_create_chat">Direktnachrichten</string>
+
+    <string name="create_room_title">Neuer Raum</string>
+    <string name="create_room_action_create">ERSTELLEN</string>
+    <string name="create_room_name_hint">Raumname</string>
+    <string name="create_room_public_title">Öffentlich</string>
+    <string name="create_room_public_description">Jeder wird diesem Raum beitreten können</string>
+    <string name="create_room_directory_title">Raumverzeichnis</string>
+    <string name="create_room_directory_description">Veröffentliche diesen Raum ins Raumverzeichnis</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 21fc5a93..37c885a9 100644
--- a/vector/src/main/res/values-es-rMX/strings.xml
+++ b/vector/src/main/res/values-es-rMX/strings.xml
@@ -107,7 +107,7 @@
     <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>
-    <string name="send_bug_report_app_crashed">La aplicación se suspenió en la ultima sesión. ¿Te gustaría enviar un informe de fallas?</string>
+    <string name="send_bug_report_app_crashed">La aplicación se suspendió en la ultima sesión. ¿Te gustaría enviar un informe de fallas\?</string>
 
     <string name="send_files_in">Enviar a</string>
     <string name="read_receipt">Leer</string>
@@ -116,7 +116,7 @@
     <string name="username">Nombre</string>
     <string name="create_account">Registrar</string>
     <string name="login">Iniciar sesión</string>
-    <string name="logout">Salir</string>
+    <string name="logout">Cerrar sesión</string>
     <string name="hs_url">Enlace de el Servidor</string>
     <string name="identity_url">Enlace del Servidor Entidad</string>
     <string name="search">Buscar</string>
@@ -130,7 +130,7 @@
 
     <!-- Authentication -->
     <string name="auth_login">Iniciar sesión</string>
-    <string name="auth_register">Registrar</string>
+    <string name="auth_register">Crear cuenta</string>
     <string name="auth_submit">Entregar</string>
     <string name="auth_skip">Omitir</string>
     <string name="auth_send_reset_email">Enviar Correo Electrónico de Reinicio</string>
@@ -263,7 +263,7 @@ Disculpe por la inconveniencia.</string>
     <!-- medias slider string -->
     <string name="media_slider_saved">Guardado</string>
     <string name="media_slider_saved_message">Guardar en Descargas</string>
-    <string name="yes">SI</string>
+    <string name="yes">SÍ</string>
     <string name="no">NO</string>
     <string name="_continue">Continuar</string>
 
@@ -331,7 +331,7 @@ Disculpe por la inconveniencia.</string>
 
     <!--  Chat -->
     <string name="room_menu_search">Buscar</string>
-    <string name="room_one_user_is_typing">%s esta escribiendo…</string>
+    <string name="room_one_user_is_typing">%s está escribiendo…</string>
     <string name="room_two_users_are_typing">%1$s &amp; %2$s están escribiendo…</string>
     <string name="room_many_users_are_typing">%1$s &amp; %2$s &amp; otros están escribiendo…</string>
     <string name="room_message_placeholder_encrypted">Enviar mensaje cifrado…</string>
@@ -756,7 +756,7 @@ Dispositivos desconocidos:</string>
 
     <string name="dialog_title_error">Error</string>
 
-    <string name="home_filter_placeholder_groups">Buscar comunidades</string>
+    <string name="home_filter_placeholder_groups">Filtrar nombres de comunidades</string>
 
     <string name="system_alerts_header">Alertas de Sistema</string>
 
@@ -771,4 +771,15 @@ Dispositivos desconocidos:</string>
     <string name="settings_containing_my_display_name">Mensajes que contienen mi nombre público</string>
     <string name="settings_containing_my_user_name">Mensajes que contienen mi nombre de usuario</string>
     <string name="call_anyway">Llamar de todos modos</string>
+    <string name="title_activity_verify_device">Verificar dispositivo</string>
+
+    <string name="settings_call_category">Llamadas</string>
+    <string name="settings_call_ringtone_use_riot_ringtone">Usar el tono de llamada normal de Riot para llamadas entrantes</string>
+    <string name="settings_call_ringtone_title">Tono para llamadas entrantes</string>
+    <string name="settings_call_ringtone_dialog_title">Elegir sonido de llamadas:</string>
+
+    <string name="reason_hint">Razón</string>
+
+    <string name="room_message_placeholder_reply_to_encrypted">Enviar una respuesta cifrada…</string>
+    <string name="room_message_placeholder_reply_to_not_encrypted">Enviar una respuesta (sin cifrar)…</string>
 </resources>
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index 4528e337..a606294d 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -1083,7 +1083,7 @@ Ten en cuenta que esta acción reiniciará la aplicación y puede tardar algo de
     <string name="settings_call_category">Llamadas</string>
     <string name="settings_call_ringtone_use_riot_ringtone">Usar el tono de llamada normal de Riot para llamadas entrantes</string>
     <string name="settings_call_ringtone_title">Tono para llamadas entrantes</string>
-    <string name="settings_call_ringtone_dialog_title">Eligir sonido de llamadas:</string>
+    <string name="settings_call_ringtone_dialog_title">Elegir sonido de llamadas:</string>
 
     <string name="video_call_in_progress">Llamada de video en proceso…</string>
 
@@ -1106,7 +1106,7 @@ Ten en cuenta que esta acción reiniciará la aplicación y puede tardar algo de
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">No quiero mis mensajes cifrados</string>
     <string name="sign_out_bottom_sheet_backing_up_keys">Creando copia de seguridad de las claves…</string>
     <string name="keys_backup_activate">Usar copia de seguridad de la clave</string>
-    <string name="are_you_sure">¿Esta seguro\?</string>
+    <string name="are_you_sure">¿Estás seguro\?</string>
     <string name="backup">Copia de seguridad</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Perderá el acceso a sus mensajes cifrados si cierra sesión sin hacer una copia de seguridad de sus claves.</string>
 
@@ -1449,4 +1449,123 @@ Ten en cuenta que esta acción reiniciará la aplicación y puede tardar algo de
     <string name="autodiscover_invalid_response">Respuesta inválida del descubrimiento del servidor doméstico</string>
     <string name="settings_play_shutter_sound">Reproducir sonido de cámara</string>
 
+    <string name="title_activity_verify_device">Verificar dispositivo</string>
+
+    <string name="encryption_information_unknown_ip">ip desconocida</string>
+    <string name="you_added_a_new_device_with_info">Un nuevo dispositivo solicita claves de cifrado.
+\nDispositivo: %1$s
+\nVisto por última vez: %2$s
+\nSi no inicias sesión en otros dispositivos ignora esta solicitud.</string>
+    <string name="your_unverified_device_requesting_with_info">Un dispositivo no verificado solicita claves de cifrado.
+\nDispositivo: %1$s
+\nVisto por última vez: %2$s
+\nSi no inicias sesión en otros dispositivos ignora esta solicitud.</string>
+
+    <string name="start_verification_short_label">Verificar</string>
+    <string name="share_without_verifying_short_label">Compartir</string>
+    <string name="key_share_request">Petición de compartición de clave</string>
+    <string name="ignore_request_short_label">Ignorar</string>
+
+    <string name="keys_backup_setup_override_backup_prompt_tile">Ya existe una copia de respaldo en tu servidor</string>
+    <string name="keys_backup_setup_override_backup_prompt_description">Parece que ya habías configurado una clave para copias de respaldo en otro dispositivo. ¿Quieres reemplazarla por la nueva que has creado\?</string>
+    <string name="keys_backup_setup_override_replace">Reemplazar</string>
+    <string name="keys_backup_setup_override_stop">Parar</string>
+
+    <string name="keys_backup_settings_checking_backup_state">Comprobando copias de respaldo</string>
+    <string name="invalid_or_expired_credentials">Tu sesión ha terminado por credenciales caducadas o inválidas.</string>
+
+    <string name="sas_verify_title">Verificar comparando un texto corto.</string>
+    <string name="sas_security_advise">Para más seguridad, te recomendamos que hagas esto en persona o por otros medios confiables.</string>
+    <string name="sas_verify_start_button_title">Empezar verificación</string>
+    <string name="sas_incoming_request_title">Solicitud de verificación</string>
+    <string name="sas_incoming_request_description">Verifica este dispositivo para marcarlo como confiable. Confiar en dispositivos de otros te da aún más tranquilidad cuando usas cifrado punto a punto de mensajes.</string>
+    <string name="sas_incoming_request_description_2">Verificar este dispositivo lo marcará como confiable, y también marcará como confiable tu dispositivo para la contraparte.</string>
+
+    <string name="sas_emoji_description">Verifica este dispositivo confirmando el emoji que aparece en la pantalla de la contraparte.</string>
+    <string name="sas_decimal_description">Verifica este dispositivo confirmando que los siguietes números aparecen en la pantalla de la contraparte</string>
+
+    <string name="sas_incoming_verification_request_dialog">Se ha recibido una solicitud de verificación.</string>
+    <string name="sas_view_request_action">Ver solicitud</string>
+    <string name="sas_waiting_for_partner">Esperando confirmación de la contraparte…</string>
+
+    <string name="sas_verified">¡Verificado!</string>
+    <string name="sas_verified_successful">Has verificado correctamente este dispositivo.</string>
+    <string name="sas_verified_successful_description">Los mensajes con este usuario están cifrados punto a punto y no son legible por terceros.</string>
+    <string name="sas_got_it">Ok</string>
+
+    <string name="sas_verifying_keys">¿No aparece nada\? No todas las aplicaciones cliente soportan verificación interactiva. Usa la verificación clásica.</string>
+    <string name="sas_legacy_verification_button_title">Usar verificación clásica</string>
+
+    <string name="sas_verification_request_notification_channel_title">Verificación de clave</string>
+    <string name="sas_cancelled_dialog_title">Solicitud cancelada</string>
+    <string name="sas_cancelled_by_other">La contraparte canceló la verificación.
+\n%s</string>
+    <string name="sas_cancelled_by_me">La verificación ha sido cancelada.
+\nRazón: %s</string>
+
+    <string name="sas_verification_request_notification_channel">Verificación de dispositivo interactiva</string>
+    <string name="sas_incoming_request_notif_title">Solicitud de verificación</string>
+    <string name="sas_incoming_request_notif_content">%s quiere verificar tu dispositivo</string>
+
+    <string name="sas_error_m_user">El usuario canceló la verificación</string>
+    <string name="sas_error_m_timeout">La verificación ha superado el límite de espera</string>
+    <string name="sas_error_m_unexpected_message">El dispositivo recibió un mensaje inesperado</string>
+    <string name="sas_error_m_invalid_message">Se ha recibido un mensaje inválido</string>
+    <string name="sas_error_m_key_mismatch">Error en clave</string>
+    <string name="sas_error_m_user_error">Error en usuario</string>
+    <string name="sas_error_unknown">Error desconocido</string>
+
+
+    <string name="edit">Editar</string>
+    <string name="reply">Responder</string>
+
+    <string name="global_retry">Reintentar</string>
+    <string name="room_list_empty">Unirse a una sala y empezar a usar la app.</string>
+    <string name="send_you_invite">Alguien te envió una invitación</string>
+    <string name="invited_by">Invitado por %s</string>
+
+    <string name="room_list_catchup_empty_body">No tienes más mensajes sin leer</string>
+    <string name="room_list_catchup_welcome_title">¡Bienvenido!</string>
+    <string name="room_list_people_empty_title">Conversaciones</string>
+    <string name="room_list_people_empty_body">Tus conversaciones 1 a 1 se mostrarán aquí</string>
+    <string name="room_list_rooms_empty_title">Salas</string>
+    <string name="room_list_rooms_empty_body">Tus salas se mostrarán aquí</string>
+
+    <string name="title_activity_emoji_reaction_picker">Reacciones</string>
+    <string name="reactions_agree">De acuerdo</string>
+    <string name="reactions_like">Me gusta</string>
+    <string name="message_add_reaction">Añadir reacción</string>
+    <string name="message_view_reaction">Ver reacciones</string>
+    <string name="reactions">Reacciones</string>
+
+    <string name="event_redacted_by_user_reason">Evento borrado por el usuario</string>
+    <string name="event_redacted_by_admin_reason">Evento moderado por el administrador de la sala</string>
+    <string name="last_edited_info_message">Última edición por %s on %s</string>
+
+
+    <string name="malformed_message">Evento con error, no se puede mostrar</string>
+    <string name="create_new_room">Crear sala</string>
+    <string name="error_no_network">No hay red, por favor comprueba tu conexión a internet.</string>
+    <string name="action_change">Cambiar</string>
+    <string name="change_room_directory_network">Cambiar red</string>
+    <string name="please_wait">Espere por favor…</string>
+    <string name="group_all_communities">Todas la comunidades</string>
+
+    <string name="room_preview_no_preview">Esta sala no se puede previsualizar</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">La previsualización de salas públicas no es posible todavía con RiotX</string>
+
+    <string name="fab_menu_create_room">Salas</string>
+    <string name="fab_menu_create_chat">Mensajes directos</string>
+
+    <string name="create_room_title">Nueva sala</string>
+    <string name="create_room_action_create">CREAR</string>
+    <string name="create_room_name_hint">Nombre de la sala</string>
+    <string name="create_room_public_title">Público</string>
+    <string name="create_room_public_description">Cualquiera puede unirse a esta sala</string>
+    <string name="create_room_directory_title">Directorio de salas</string>
+    <string name="create_room_directory_description">Publicar esta sala en el directorio de salas</string>
+
+    <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>
+
 </resources>
diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml
index 84a6edb9..393b7a0d 100644
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/vector/src/main/res/values-eu/strings.xml
@@ -94,7 +94,7 @@
     <string name="send_bug_report_placeholder">Azaldu zure arazoa hemen</string>
     <string name="send_bug_report_logs_description">Akatsak aztertzeari begira, bezero honen egunkariak arazte-txosten honekin batera bidaliko dira. Arazte-txosten hau, egunkariak eta pantaila-argazkia barne, ez dira publikoki ikusgai egongo. Goiko testua besterik ez baduzu bidali nahi, desmarkatu:</string>
     <string name="send_bug_report_alert_message">Telefonoa amorruz astintzen zabiltzala dirudi. Arazte-txostena ireki nahi duzu?</string>
-    <string name="send_bug_report_app_crashed">Azken aldian aplikazioa kraskatu da. Kraskatze-txostena ireki nahi duzu?</string>
+    <string name="send_bug_report_app_crashed">Aurrekoan aplikazioa kraskatu da. Kraskatze-txostena ireki nahi duzu\?</string>
 
     <string name="send_bug_report_sent">Arazte-txostena ongi bidali da</string>
     <string name="send_bug_report_failed">Huts egin du arazte-txostenaren bidalketak (%s)</string>
@@ -262,12 +262,10 @@ Barkatu eragozpenak.</string>
     <string name="permissions_rationale_msg_storage">Riotek zure argazki eta bideoen liburutegia atzitzeko baimena behar du eranskinak gorde ahal izateko.
 
 Baimendu sarbidea hurrengo laster-leihoan zure telefonotik fitxategiak bidali ahal izateko.</string>
-    <string name="permissions_rationale_msg_contacts">Riotek zure helbide-liburua atzitzeko baimen behar du beste Matrix erabiltzaileak bere e-mail helbide edo telefono zenbakiaren bidez aurkitzeko.
-
-Baimendu sarbidea hurrengo laster-leihoan Riot bitartez kontaktatu ditzakezun erabiltzaileak aurkitzeko.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riotek zure helbide-liburua atzitzeko baimen behar du beste Matrix erabiltzaileak bere e-mail helbide eta telefono zenbakiaren bidez aurkitzeko.
-
-Baimendu Riotek zure kontaktuak atzitzea?</string>
+    <string name="permissions_rationale_msg_contacts">Riot-ek zure helbide-liburua egiaztatu dezake Matrix erabiltzaileak bere e-mail helbide edo telefono zenbakiaren bidez aurkitzeko. Honetarako zure helbide-liburua partekatzea onartzen baduzu, sakatu onartu hurrengo laster-leihoan.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Riot-ek zure helbide-liburua egiaztatu dezake Matrix erabiltzaileak bere e-mail helbide edo telefono zenbakiaren bidez aurkitzeko. 
+\n
+\nHonetarako zure helbide-liburua partekatzea onartzen duzu\?</string>
 
     <string name="room_preview_unlinked_email_warning">Zure gonbidapena bidali da %s helbidera, hau ez dago kontu honetara lotuta. Beste kontu batekin hasi dezakezu saioa, edo e-mail hau zure kontura gehitu.</string>
     <string name="room_preview_try_join_an_unknown_room">%s taldera sartzen saiatzen ari zara. Elkartu taldera elkarrizketan parte hartzeko?</string>
@@ -1462,4 +1460,66 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="sas_error_m_user_error">Erabiltzailea ez dator bat</string>
     <string name="sas_error_unknown">Errore ezezaguna</string>
 
+    <string name="keys_backup_setup_override_backup_prompt_tile">Badago babes-kopia bat zure hasiera-zerbitzarian</string>
+    <string name="keys_backup_setup_override_backup_prompt_description">Badirudi gakoen babes-kopia ezarri duzula beste gailu betetik. Orain sortzen ari zarenarekin ordeztu nahi duzu\?</string>
+    <string name="keys_backup_setup_override_replace">Ordeztu</string>
+    <string name="keys_backup_setup_override_stop">Gelditu</string>
+
+    <string name="keys_backup_settings_checking_backup_state">Babes-kopiaren egoera egiaztatzen</string>
+    <string name="invalid_or_expired_credentials">Zure saioa amaitu da baliogabeko edo iraungitako kredentzialak direla eta.</string>
+
+    <string name="edit">Editatu</string>
+    <string name="reply">Erantzun</string>
+
+    <string name="global_retry">Saiatu berriro</string>
+    <string name="room_list_empty">Elkartu gelaren batetara aplikazioa erabiltzen hasteko.</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_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>
+    <string name="room_list_people_empty_title">Elkarrizketak</string>
+    <string name="room_list_people_empty_body">Zure mezu zuzenetako elkarrizketak hemen bistaratuko dira</string>
+    <string name="room_list_rooms_empty_title">Gelak</string>
+    <string name="room_list_rooms_empty_body">Zure gelak hemen bistaratuko dira</string>
+
+    <string name="title_activity_emoji_reaction_picker">Erreakzioak</string>
+    <string name="reactions_agree">Ados</string>
+    <string name="reactions_like">Gogokoa</string>
+    <string name="message_add_reaction">Gehitu erreakzioa</string>
+    <string name="message_view_reaction">Ikusi errekzioak</string>
+    <string name="reactions">Erreakzioak</string>
+
+    <string name="event_redacted_by_user_reason">Gertaera ezabatu du erabiltzaileak</string>
+    <string name="event_redacted_by_admin_reason">Gertaera moderatu du gelako administratzaileak</string>
+    <string name="last_edited_info_message">%s erabiltzaileak editatuta, azkenekoz: %s</string>
+
+
+    <string name="malformed_message">Gaizki formatutako gertaera, ezin da bistaratu</string>
+    <string name="create_new_room">Sortu gela berria</string>
+    <string name="error_no_network">Sarerik ez. Egiaztatu zure internet konexioa.</string>
+    <string name="action_change">Aldatu</string>
+    <string name="change_room_directory_network">Aldatu sarea</string>
+    <string name="please_wait">Itxaron mesedez…</string>
+    <string name="group_all_communities">Komunitate guztiak</string>
+
+    <string name="room_preview_no_preview">Gela hau ezin da aurreikusi</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">Munduak irakurtzeko moduko gelaren aurrebista ez da oraindik onartzen RiotX bezeroan</string>
+
+    <string name="fab_menu_create_room">Gelak</string>
+    <string name="fab_menu_create_chat">Mezu zuzenak</string>
+
+    <string name="create_room_title">Gela berria</string>
+    <string name="create_room_action_create">SORTU</string>
+    <string name="create_room_name_hint">Gelaren izena</string>
+    <string name="create_room_public_title">Publikoa</string>
+    <string name="create_room_public_description">Edonor elkartu daiteke gela honetara</string>
+    <string name="create_room_directory_title">Gelen direktorioa</string>
+    <string name="create_room_directory_description">Argitaratu gela hau gelen direktorioan</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>
+
 </resources>
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index 809ff94a..d84267a0 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -187,7 +187,7 @@
     <string name="auth_reset_password_missing_email">Anna tilisi sähköpostiosoite.</string>
     <string name="auth_reset_password_missing_password">Anna uusi salasana.</string>
     <string name="auth_reset_password_email_validation_message">Osoitteeseen %s on lähetetty sähköposti. Kun olet avannut siinä olevan linkin, paina alla olevaa nappia.</string> <!-- ???? -->
-    <string name="auth_reset_password_error_unauthorized">Sähköpostiosoitteesi vahvistaminen epäonnistui. Varmista, että klikkasit sähköpostissa olevaa linkkiä.</string>
+    <string name="auth_reset_password_error_unauthorized">Sähköpostiosoitteesi vahvistaminen epäonnistui. Varmista, että klikkasit sähköpostissa olevaa linkkiä</string>
     <string name="auth_reset_password_success_message">Salasanasi on vaihdettu.\n\nSinut on kirjauduttu ulos kaikista laitteistasi, etkä enää saa viesti-ilmoituksia. Ottaaksesi käyttöön ilmoitukset uudelleen, kirjaudu sisään uudelleen kaikilla laitteillasi.</string>
 
     <!-- Login Screen -->
@@ -265,18 +265,17 @@
     <string name="permissions_rationale_msg_camera">Riot tarvitsee käyttöluvan kameraan ottaakseen kuvia ja suorittakseen videopuheluita.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
-\nSalli kameran käyttö seuraavalla näytöllä aloittaaksesi tämän puhelun."</string>
+\nSalli kameran käyttö seuraavassa ponnahdusikkunassa soittaaksesi puhelun."</string>
     <string name="permissions_rationale_msg_record_audio">Riot tarvitsee käyttöluvan mikrofoniin suorittakseen puheluita.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
-\nSalli mikrofonin käyttö seuraavalla näytöllä aloittaaksesi tämän puhelun."</string>
+\nSalli mikrofonin käyttö seuraavassa ponnahdusikkunassa soittaaksesi puhelun."</string>
     <string name="permissions_rationale_msg_camera_and_audio">Riot tarvitsee käyttöluvan kameraan ja mikrofoniin suorittakseen videopuheluita.
 \n
 \nSalli mikrofonin ja kameran käyttö seuraavilla näytöillä aloittaaksesi tämän puhelun.</string>
-    <string name="permissions_rationale_msg_contacts">Riot tarvitsee luvan käyttää yhteystietojasi löytääkseen muita Matrix-käyttäjiä sähköpostiosoitteiden ja puhelinnumeroiden perusteella.
-
-Salli yhteystietojen käyttö seuraavalla näytöllä löytääksesi Matrix-tilit.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot tarvitsee käyttöluvan yhteystietoihin löytääkseen muita Matrix-käyttäjiä sähköpostiosoitteiden sekä puhelinnumeroiden avulla. Salli Riotin käyttää yhteystietojasi\?</string>
+    <string name="permissions_rationale_msg_contacts">Riot voi tarkistaa yhteystietosi löytääkseen muita Matrixin käyttäjiä sähköpostiosoitteiden ja puhelinnumeroiden perusteella. Jos suostut jakamaan yhteystietosi tätä tarkoitusta varten, salli yhteystietojen käyttö seuraavassa ponnahdusikkunassa.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Riot voi tarkistaa yhteystietosi löytääkseen muita Matrixin käyttäjiä sähköpostiosoitteiden sekä puhelinnumeroiden perusteella.
+\nAnnatko Riotin käyttää yhteystietojasi tätä varten\?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Toimenpide epäonnistui puuttuvien käyttölupien takia</string>
 
@@ -1466,4 +1465,59 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="sas_error_m_user_error">Käyttäjä ei täsmää</string>
     <string name="sas_error_unknown">Tuntematon virhe</string>
 
+    <string name="keys_backup_setup_override_backup_prompt_tile">Kotipalvelimellasi on jo varmuuskopio</string>
+    <string name="keys_backup_setup_override_backup_prompt_description">Näyttää, että olet jo asettanut avainten varmuuskopioinnin toiselta laitteelta. Halutatko korvata sen tällä\?</string>
+    <string name="keys_backup_setup_override_replace">Korvaa</string>
+    <string name="keys_backup_setup_override_stop">Seis</string>
+
+    <string name="keys_backup_settings_checking_backup_state">Tarkistetaan varmuuskopion tilaa</string>
+    <string name="sas_waiting_for_partner">Odotetaan vastapuolen varmistusta…</string>
+
+    <string name="sas_error_m_unknown_transaction">Laite ei ole tietoinen kyseisestä transaktiosta</string>
+    <string name="sas_error_m_mismatched_sas">SAS ei täsmännyt</string>
+    <string name="edit">Muokkaa</string>
+    <string name="reply">Vastaa</string>
+
+    <string name="global_retry">Yritä uudelleen</string>
+    <string name="room_list_empty">Aloita sovelluksen käyttö liittymällä huoneeseen.</string>
+    <string name="send_you_invite">Lähetti sinulle kutsun</string>
+    <string name="invited_by">%s kutsui</string>
+
+    <string name="room_list_catchup_empty_body">Sinulla ei ole enempää lukemattomia viestejä</string>
+    <string name="room_list_catchup_welcome_title">Tervetuloa kotiin!</string>
+    <string name="room_list_catchup_welcome_body">Löydät täältä lukemattomat viestit</string>
+    <string name="room_list_people_empty_title">Keskustelut</string>
+    <string name="room_list_people_empty_body">Yksityiset keskustelusi näytetään tässä</string>
+    <string name="room_list_rooms_empty_title">Huoneet</string>
+    <string name="room_list_rooms_empty_body">Huoneesi näytetään tässä</string>
+
+    <string name="title_activity_emoji_reaction_picker">Reaktiot</string>
+    <string name="reactions_agree">Samaa mieltä</string>
+    <string name="reactions_like">Tykkää</string>
+    <string name="message_add_reaction">Lisää reaktio</string>
+    <string name="message_view_reaction">Näytä reaktiot</string>
+    <string name="reactions">Reaktiot</string>
+
+    <string name="event_redacted_by_user_reason">Käyttäjä poisti tapahtuman</string>
+    <string name="event_redacted_by_admin_reason">Huoneen ylläpitäjä moderoi tapahtuman</string>
+    <string name="malformed_message">Epämuotoinen tapahtuma, ei voida näyttää</string>
+    <string name="create_new_room">Luo uusi huone</string>
+    <string name="error_no_network">Ei verkkoa. Tarkista internet-yhteytesi.</string>
+    <string name="please_wait">Odota…</string>
+    <string name="group_all_communities">Kaikki yhteisöt</string>
+
+    <string name="room_preview_no_preview">Tätä huonetta ei voi esikatsella</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">RiotX ei vielä tue täysin julkisen huoneen esikatselua</string>
+
+    <string name="fab_menu_create_room">Huoneet</string>
+    <string name="fab_menu_create_chat">Yksityisviestit</string>
+
+    <string name="create_room_title">Uusi huone</string>
+    <string name="create_room_action_create">LUO</string>
+    <string name="create_room_name_hint">Huoneen nimi</string>
+    <string name="create_room_public_title">Julkinen</string>
+    <string name="create_room_public_description">Kuka tahansa voi liittyä tähän huoneeseen</string>
+    <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>
+
 </resources>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 2f703bb8..cd91650b 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -502,12 +502,10 @@ Veuillez autoriser l’accès dans la prochaine fenêtre contextuelle pour pouvo
     <string name="permissions_rationale_msg_camera_and_audio">Riot a besoin d’accéder à votre appareil photo et à votre microphone pour passer des appels vidéo.
 
 Veuillez autoriser l’accès dans les prochaines fenêtres contextuelles pour pouvoir effectuer l’appel.</string>
-    <string name="permissions_rationale_msg_contacts">Riot a besoin d’accéder aux contacts de votre carnet d’adresses pour trouver d’autres utilisateurs de Matrix avec leur numéro de téléphone et leur adresse e-mail.
-
-Veuillez autoriser l’accès dans la prochaine fenêtre contextuelle pour découvrir les utilisateurs du carnet d’adresses joignables avec Riot.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot a besoin d’accéder aux contacts de votre carnet d’adresses pour trouver d’autres utilisateurs de Matrix avec leur numéro de téléphone et leur adresse e-mail.
-
-Autorisez-vous Riot à accéder à vos contacts ?</string>
+    <string name="permissions_rationale_msg_contacts">Riot peut accéder à votre carnet d’adresses pour trouver d’autres utilisateurs de Matrix avec leur numéro de téléphone et leur adresse e-mail. Veuillez autoriser l’accès dans la prochaine fenêtre contextuelle pour découvrir les utilisateurs du carnet d’adresses joignables via Riot.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Riot peut accéder à votre carnet d’adresses pour trouver d’autres utilisateurs de Matrix avec leur leur adresse e-mail et leur numéro de téléphone.
+\n
+\nAutorisez-vous Riot à accéder à vos contacts \?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Désolé. L’action n’a pas été réalisée, faute d’autorisations</string>
 
@@ -1467,4 +1465,66 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
     <string name="sas_error_m_user_error">Non-concordance d’utilisateur</string>
     <string name="sas_error_unknown">Erreur inconnue</string>
 
+    <string name="keys_backup_setup_override_backup_prompt_tile">Une sauvegarde est déjà disponible sur votre serveur d’accueil</string>
+    <string name="keys_backup_setup_override_replace">Remplacer</string>
+    <string name="keys_backup_setup_override_stop">Arrêter</string>
+
+    <string name="keys_backup_settings_checking_backup_state">Vérification de l’état de la sauvegarde</string>
+    <string name="invalid_or_expired_credentials">Vous avez été déconnecté(e) car vos identifiants sont incorrects ou ont expiré.</string>
+
+    <string name="edit">Éditer</string>
+    <string name="reply">Répondre</string>
+
+    <string name="global_retry">Réessayer</string>
+    <string name="send_you_invite">Vous a envoyé une invitation</string>
+    <string name="invited_by">Invité(e) par %s</string>
+
+    <string name="room_list_catchup_empty_title">Vous êtes à jour !</string>
+    <string name="room_list_catchup_empty_body">Vous n’avez plus de messages non lus</string>
+    <string name="room_list_people_empty_title">Discussions</string>
+    <string name="change_room_directory_network">Changer de réseau</string>
+    <string name="please_wait">Veuillez patienter…</string>
+    <string name="keys_backup_setup_override_backup_prompt_description">On dirait que vous avez déjà configuré une sauvegarde de clé depuis un autre appareil. Voulez-vous la remplacer par celle que vous êtes en train de créer \?</string>
+    <string name="room_list_empty">Rejoignez un salon pour commencer à utiliser l’application.</string>
+    <string name="room_list_catchup_welcome_title">Bienvenue chez vous !</string>
+    <string name="room_list_catchup_welcome_body">Rattrapez votre retard sur vos messages non lus ici</string>
+    <string name="room_list_people_empty_body">Vos conversations directes seront affichées ici</string>
+    <string name="room_list_rooms_empty_title">Salons</string>
+    <string name="room_list_rooms_empty_body">Vos salons seront affichés ici</string>
+
+    <string name="title_activity_emoji_reaction_picker">Réactions</string>
+    <string name="reactions_agree">D’accord</string>
+    <string name="reactions_like">J’aime</string>
+    <string name="message_add_reaction">Ajouter une réaction</string>
+    <string name="message_view_reaction">Voir les réactions</string>
+    <string name="reactions">Réactions</string>
+
+    <string name="event_redacted_by_user_reason">Évènement supprimé par l’utilisateur</string>
+    <string name="event_redacted_by_admin_reason">Évènement modéré par l’administrateur du salon</string>
+    <string name="last_edited_info_message">Dernière édition par %s le %s</string>
+
+
+    <string name="malformed_message">Évènement malformé, affichage impossible</string>
+    <string name="create_new_room">Créer un nouveau salon</string>
+    <string name="error_no_network">Aucun réseau. Vérifiez votre connexion Internet.</string>
+    <string name="action_change">Changer</string>
+    <string name="group_all_communities">Toutes les communautés</string>
+
+    <string name="room_preview_no_preview">Impossible d’avoir un aperçu de ce salon</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">L’aperçu des salons visibles par tout le monde n’est pas encore pris en charge par RiotX</string>
+
+    <string name="fab_menu_create_room">Salons</string>
+    <string name="fab_menu_create_chat">Messages directs</string>
+
+    <string name="create_room_title">Nouveau salon</string>
+    <string name="create_room_action_create">CRÉER</string>
+    <string name="create_room_name_hint">Nom du salon</string>
+    <string name="create_room_public_title">Public</string>
+    <string name="create_room_public_description">Tout le monde pourra rejoindre ce salon</string>
+    <string name="create_room_directory_title">Annuaire des salons</string>
+    <string name="create_room_directory_description">Publier ce salon dans l’annuaire des salons</string>
+
+    <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>
+
 </resources>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 397b5bd3..b8e19998 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -246,12 +246,10 @@ Elnézést a kellemetlenségért.</string>
     <string name="permissions_rationale_msg_camera_and_audio">"A Riot-nak engedély szükséges a mikrofonod  és kamerád eléréséhez, hogy tudj videóhívást kezdeményezni.
 
 Kérlek engedélyezd a hozzáférést a következő felugró ablakban, hogy tudj hívást kezdeményezni."</string>
-    <string name="permissions_rationale_msg_contacts">A Riot-nak engedély szükséges a címjegyzék-kapcsolatok eléréséhez, hogy tudj Matrix felhasználókat találni e-mail és telefonszám alapján.
-
-Kérlek engedélyezd a hozzáférést a következő felugró ablakban, hogy tudj címjegyzék-kapcsolatok találni a Riot-tal.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">A Riot-nak engedély szükséges a címjegyzék-kapcsolatok eléréséhez, hogy tudj Matrix felhasználókat találni e-mail és telefonszám alapján.
-
-Engedélyezed Riot-nak a hozzáférést kapcsolataidhoz?</string>
+    <string name="permissions_rationale_msg_contacts">A Riot a névjegyekben lévő e-mail és telefonszám alapján képes felkutatni más Matrix felhasználókar. Ha egyetértesz a névjegyek ilyen célú megosztásával, kérlek engedélyezd a hozzáférést a következő felugró üzenetben.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">A Riot a névjegyekben lévő e-mail és telefonszám alapján képes felkutatni más Matrix felhasználókar. 
+\n
+\nEgyetértesz a névjegyek ilyen célú megosztásával\?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">"Elnézést.  A művelet nem lett végre hajtva hiányzó engedélyek miatt"</string>
 
@@ -1466,4 +1464,66 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="sas_error_m_user_error">A felhasználó nem egyezik</string>
     <string name="sas_error_unknown">Ismeretlen Hiba</string>
 
+    <string name="keys_backup_setup_override_backup_prompt_tile">Mentés már létezik a Matrix szervereden</string>
+    <string name="keys_backup_setup_override_backup_prompt_description">Úgy látszik már rendelkezel kulcs mentéssel egy másik eszközön. Lecseréled azzal amit most készítesz\?</string>
+    <string name="keys_backup_setup_override_replace">Csere</string>
+    <string name="keys_backup_setup_override_stop">Állj</string>
+
+    <string name="keys_backup_settings_checking_backup_state">Mentés állapot ellenőrzése</string>
+    <string name="invalid_or_expired_credentials">Érvénytelen vagy lejárt jelszó miatt kiléptél.</string>
+
+    <string name="edit">Szerkeszt</string>
+    <string name="reply">Válasz</string>
+
+    <string name="global_retry">Újra</string>
+    <string name="room_list_empty">Lépj be egy szobába, hogy kezd el használni az alkalmazást.</string>
+    <string name="send_you_invite">Meghívód elküldve</string>
+    <string name="invited_by">Meghívta: %s</string>
+
+    <string name="room_list_catchup_empty_title">Minden megvan!</string>
+    <string name="room_list_catchup_empty_body">Nincs olvasatlan üzeneted</string>
+    <string name="room_list_catchup_welcome_title">Üdvözöllek itthon!</string>
+    <string name="room_list_catchup_welcome_body">Olvasd el az olvasatlan üzeneteket itt</string>
+    <string name="room_list_people_empty_title">Beszélgetések</string>
+    <string name="room_list_people_empty_body">A közvetlen beszélgetéseidet itt láthatod</string>
+    <string name="room_list_rooms_empty_title">Szobák</string>
+    <string name="room_list_rooms_empty_body">A szobáidat itt láthatod</string>
+
+    <string name="title_activity_emoji_reaction_picker">Reakciók</string>
+    <string name="reactions_agree">Egyetértek</string>
+    <string name="reactions_like">Kedvelem</string>
+    <string name="message_add_reaction">Reakció hozzáadása</string>
+    <string name="message_view_reaction">Reakciók megjelenítése</string>
+    <string name="reactions">Reakciók</string>
+
+    <string name="event_redacted_by_user_reason">Az eseményt a felhasználó törölte</string>
+    <string name="event_redacted_by_admin_reason">Az eseményt a szoba adminisztrátora moderálta</string>
+    <string name="last_edited_info_message">Utoljára szerkesztette: %s ekkor: %s</string>
+
+
+    <string name="malformed_message">Hibás esemény, nem lehet megjeleníteni</string>
+    <string name="create_new_room">Új szoba készítése</string>
+    <string name="error_no_network">Nincs hálózat. Ellenőrizd az Internet kapcsolatodat.</string>
+    <string name="action_change">Változtat</string>
+    <string name="change_room_directory_network">Hálózat megváltoztatása</string>
+    <string name="please_wait">Kérlek várj…</string>
+    <string name="group_all_communities">Minden közösség</string>
+
+    <string name="room_preview_no_preview">Ennek a szobának nincs előnézete</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">A RiotX-ben a nyilvános szoba előnézete egyenlőre nem támogatott</string>
+
+    <string name="fab_menu_create_room">Szobák</string>
+    <string name="fab_menu_create_chat">Közvetlen üzenetek</string>
+
+    <string name="create_room_title">Új szoba</string>
+    <string name="create_room_action_create">KÉSZÍT</string>
+    <string name="create_room_name_hint">Szoba neve</string>
+    <string name="create_room_public_title">Nyilvános</string>
+    <string name="create_room_public_description">Bárki csatlakozhat ehhez a szobához</string>
+    <string name="create_room_directory_title">Szobák listája</string>
+    <string name="create_room_directory_description">A szoba közzététele a szobák listájában</string>
+
+    <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>
+
 </resources>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 39d37c5e..fd717864 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -273,12 +273,10 @@ Per favore dai l\'autorizzazione nella prossima finestra al fine di effettuare l
     <string name="permissions_rationale_msg_camera_and_audio">Riot necessita del permesso di accedere alla fotocamera ed al microfono per eseguire videochiamate.
 
 Per favore consenti l\'accesso nella prossima finestra per potere effettuare la chiamata.</string>
-    <string name="permissions_rationale_msg_contacts">Riot necessita del permesso di accedere alla tua rubrica per trovare altri utenti Matrix basandosi sulla loro email e sul numero di telefono.
-
-Per favore consenti l\'accesso nella prossima finestra in modo da scoprire i contatti in rubrica raggiungibili da Riot.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot necessita del permesso di accedere alla tua rubrica per trovare altri utenti Matrix basandosi sulla loro email e sul numero di telefono.
-
-Consentire a Riot di accedere ai tuoi contatti?</string>
+    <string name="permissions_rationale_msg_contacts">Riot può accedere alla tua rubrica per trovare altri utenti Matrix basandosi sulla loro email e sul numero di telefono. Se sei d\'accordo sulla condivisione della tua rubrica a questo scopo, consenti l\'accesso nella prossima finestra.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Riot può accedere alla tua rubrica per trovare altri utenti Matrix basandosi sulla loro email e sul numero di telefono.
+\n
+\nSei d\'accordo sulla condivisione della tua rubrica a questo scopo\?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Spiacente. Azione non eseguita a causa di mancate autorizzazioni</string>
 
@@ -1511,4 +1509,65 @@ Per essere certo di non perdere nulla, mantieni gli aggiornamenti attivi."</stri
     <string name="sas_error_m_user_error">Utente non corrispondente</string>
     <string name="sas_error_unknown">Errore sconosciuto</string>
 
+    <string name="keys_backup_setup_override_backup_prompt_tile">Esiste già un backup sul tuo HomeServer</string>
+    <string name="keys_backup_setup_override_backup_prompt_description">Sembra che tu abbia già impostato un backup chiavi da un altro dispositivo. Vuoi sostituirlo con quello che stai creando\?</string>
+    <string name="keys_backup_setup_override_replace">Sostituisci</string>
+    <string name="keys_backup_setup_override_stop">Ferma</string>
+
+    <string name="keys_backup_settings_checking_backup_state">Controllo stato del backup</string>
+    <string name="invalid_or_expired_credentials">Sei stato disconnesso a causa di credenziali non valide o scadute.</string>
+
+    <string name="edit">Modifica</string>
+    <string name="reply">Rispondi</string>
+
+    <string name="global_retry">Riprova</string>
+    <string name="room_list_empty">Entra in una stanza per iniziare a usare l\'app.</string>
+    <string name="send_you_invite">Ti ha inviato un invito</string>
+    <string name="invited_by">Invitato da %s</string>
+
+    <string name="room_list_catchup_empty_body">Non hai più messaggi non letti</string>
+    <string name="room_list_catchup_welcome_title">Benvenuti a casa!</string>
+    <string name="room_list_catchup_welcome_body">Recupera i messaggi non letti qui</string>
+    <string name="room_list_people_empty_title">Conversazioni</string>
+    <string name="room_list_people_empty_body">La tua conversazione diretta verrà mostrata qui</string>
+    <string name="room_list_rooms_empty_title">Stanze</string>
+    <string name="room_list_rooms_empty_body">Le tue stanze verranno mostrate qui</string>
+
+    <string name="title_activity_emoji_reaction_picker">Reazioni</string>
+    <string name="reactions_agree">D\'accordo</string>
+    <string name="reactions_like">Piace</string>
+    <string name="message_add_reaction">Aggiungi reazione</string>
+    <string name="message_view_reaction">Vedi le reazioni</string>
+    <string name="reactions">Reazioni</string>
+
+    <string name="event_redacted_by_user_reason">Evento eliminato dall\'utente</string>
+    <string name="event_redacted_by_admin_reason">Evento moderato da un admin della stanza</string>
+    <string name="last_edited_info_message">Ultima modifica di %s il %s</string>
+
+
+    <string name="malformed_message">Evento malformato, impossibile visualizzarlo</string>
+    <string name="create_new_room">Crea nuova stanza</string>
+    <string name="error_no_network">Nessuna rete. Controlla la tua connessione internet.</string>
+    <string name="action_change">Cambia</string>
+    <string name="change_room_directory_network">Cambia rete</string>
+    <string name="please_wait">Attendere prego…</string>
+    <string name="group_all_communities">Tutte le comunità</string>
+
+    <string name="room_preview_no_preview">Anteprima non disponibile per questa stanza</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">L\'anteprima di stanze leggibili da tutti non è ancora supportata in RiotX</string>
+
+    <string name="fab_menu_create_room">Stanze</string>
+    <string name="fab_menu_create_chat">Messaggi diretti</string>
+
+    <string name="create_room_title">Nuova stanza</string>
+    <string name="create_room_action_create">CREA</string>
+    <string name="create_room_name_hint">Nome stanza</string>
+    <string name="create_room_public_title">Pubblica</string>
+    <string name="create_room_public_description">Tutti potranno entrare in questa stanza</string>
+    <string name="create_room_directory_title">Elenco stanze</string>
+    <string name="create_room_directory_description">Pubblica questa stanza nell\'elenco stanze</string>
+
+    <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>
+
 </resources>
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index e645a771..ae7da359 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -1205,4 +1205,28 @@ Spróbuj uruchomić ponownie aplikację.</string>
 
     <string name="keys_backup_info_keys_all_backup_up">Wszystkie klucze mają kopię zapasową</string>
     <string name="settings_change_password_submit">Zaktualizuj hasło</string>
+    <string name="done">Zrobione</string>
+    <string name="keys_backup_setup_step3_button_title">Zrobione</string>
+    <string name="edit">Edytuj</string>
+    <string name="reply">Odpowiedz</string>
+
+    <string name="room_list_rooms_empty_title">Pokoje</string>
+    <string name="message_add_reaction">Dodaj reakcję</string>
+    <string name="create_new_room">Utwórz nowy pokój</string>
+    <string name="group_all_communities">Wszystkie społeczności</string>
+
+    <string name="fab_menu_create_chat">Rozmowy bezpośrednie</string>
+
+    <string name="create_room_title">Nowy pokój</string>
+    <string name="create_room_action_create">STWÓRZ</string>
+    <string name="create_room_name_hint">Nazwa pokoju</string>
+    <string name="create_room_public_title">Publiczny</string>
+    <string name="create_room_public_description">Każdy będzie mógł dołączyć do tego pokoju</string>
+    <string name="global_retry">Ponów</string>
+    <string name="room_list_people_empty_title">Rozmowy</string>
+    <string name="action_change">Zmień</string>
+    <string name="change_room_directory_network">Zmień sieć</string>
+    <string name="fab_menu_create_room">Pokoje</string>
+    <string name="create_room_directory_description">Opublikuj pokój do spisu pokojów</string>
+
 </resources>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index f2fd3109..838d826b 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -1558,4 +1558,7 @@ Email также позволит вам при необходимости во
     <string name="sas_error_m_user_error">Несоответствие пользователя</string>
     <string name="sas_error_unknown">Неизвестная ошибка</string>
 
+    <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>
 </resources>
diff --git a/vector/src/main/res/values-sk/strings.xml b/vector/src/main/res/values-sk/strings.xml
index 83d41ffc..44653d2a 100644
--- a/vector/src/main/res/values-sk/strings.xml
+++ b/vector/src/main/res/values-sk/strings.xml
@@ -1312,4 +1312,6 @@ Objavte skutočne výkonné možnosti otvorenej spolupráce s Riot.im!</string>
 
     <string name="notification_silent">Tiché</string>
     <string name="error_empty_field_enter_user_name">Prosím zadajte meno používateľa.</string>
+    <string name="title_activity_verify_device">Overiť zariadenie</string>
+
 </resources>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index dd285c7d..82f4423e 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -863,12 +863,10 @@
     <string name="permissions_rationale_msg_camera_and_audio">Për të kryer thirrje video, Riot-i lyp leje të përdorë kamerën dhe mikrofonin tuaj.
 \n
 \nJu lutemi, lejoni përdorimin, që nga flluskat pasuese, që të jetë në gjendje të bëjë thirrjen.</string>
-    <string name="permissions_rationale_msg_contacts">Për të gjetur përdorues të tjerë Matrix, bazuar në email-et apo numrat e tyre të telefonit, Riot-i lyp leje të përdorë kontaktet e librit tuaj të adresave.
-\n
-\nJu lutemi, lejoni përdorimin, që nga flluska pasuese, që të zbulohen te libri i adresave përdorues të kapshëm që nga Riot.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Për të gjetur përdorues të tjerë Matrix, bazuar në email-et apo numrat e tyre të telefonit, Riot-i lyp leje të përdorë kontakte nga libri juaj i adresave.
-\n
-\nTë lejohet Riot-i të hyjë në kontaktet tuaja\?</string>
+    <string name="permissions_rationale_msg_contacts">Për të gjetur përdorues të tjerë Matrix, bazuar në email-et apo numrat e tyre të telefonit, Riot-i mund të kërkojë në librin tuaj të adresave. Nëse jeni dakord të lejohet hyrja në librin tuaj të adresave për këtë qëllim, ju lutemi, lejojeni hyrjen gjatë flluskës pasuese.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Për të gjetur përdorues të tjerë Matrix, bazuar në email-et apo numrat e tyre të telefonit, Riot-i mund të kërkojë në librin tuaj të adresave. 
+\n 
+\nJeni dakord të lejohet hyrja në librin tuaj të adresave për këtë qëllim\?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Na ndjeni. Veprimi nuk u krye, për shkak lejesh që mungojnë</string>
 
@@ -1387,10 +1385,10 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="sas_incoming_request_description">Që t’i vihet shenjë si e besuar, verifikojeni këtë pajisje. Besimi i pajisjeve të partnerëve ju jep ca qetësi më tepër kur përdoren mesazhe të fshehtëzuar skaj-më-skaj.</string>
     <string name="sas_incoming_request_description_2">Verifikimi i kësaj pajisje do ta shënojë atë të besuar, dhe tuajën si të besuar te partneri.</string>
 
-    <string name="sas_emoji_description">Verifikojeni këtë pajisje duke ripohuar shfaqjen e emoji-t vijues në skenën e partnerit.</string>
+    <string name="sas_emoji_description">Verifikojeni këtë pajisje duke ripohuar shfaqjen e emoji-t vijues në skenën e partnerit</string>
     <string name="sas_decimal_description">Verifikojeni këtë pajisje duke ripohuar se numri vijues shfaqet në ekranin e partnerit</string>
 
-    <string name="sas_incoming_verification_request_dialog">Morët një kërkesë verifikimi të ardhur</string>
+    <string name="sas_incoming_verification_request_dialog">Morët një kërkesë verifikimi të ardhur.</string>
     <string name="sas_view_request_action">Shihni kërkesën</string>
     <string name="sas_waiting_for_partner">Po pritet ripohimi nga partneri…</string>
 
@@ -1424,4 +1422,66 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="sas_error_m_user_error">Mospërputhje përdoruesish</string>
     <string name="sas_error_unknown">Gabim i Panjohur</string>
 
+    <string name="keys_backup_setup_override_backup_prompt_tile">Ka tashmë një kopjeruajtje te Shërbyesi juaj Home</string>
+    <string name="keys_backup_setup_override_backup_prompt_description">Duket sikur keni tashmë kopjeruajtje kyçesh nga një pajisje tjetër. Doni të zëvendësohet me atë që po krijoni\?</string>
+    <string name="keys_backup_setup_override_replace">Zëvendësoje</string>
+    <string name="keys_backup_setup_override_stop">Ndale</string>
+
+    <string name="keys_backup_settings_checking_backup_state">Po kontrollohet gjendje kopjeruajtje</string>
+    <string name="invalid_or_expired_credentials">Jeni nxjerrë nga llogari për shkak kredencialesh të pavlefshme ose të skaduara.</string>
+
+    <string name="edit">Përpunoni</string>
+    <string name="reply">Përgjigjuni</string>
+
+    <string name="global_retry">Riprovo</string>
+    <string name="room_list_empty">Që të filloni të përdorni aplikacionin, merrni pjesë në një dhomë.</string>
+    <string name="send_you_invite">Ju dërgoi një ftesë</string>
+    <string name="invited_by">Ftuar nga %s</string>
+
+    <string name="room_list_catchup_empty_title">S’keni më!</string>
+    <string name="room_list_catchup_empty_body">S’keni më mesazhe të palexuar</string>
+    <string name="room_list_catchup_welcome_title">Mirë se vini në vatër!</string>
+    <string name="room_list_catchup_welcome_body">Mbaroni punë me mesazhet e palexuara</string>
+    <string name="room_list_people_empty_title">Biseda</string>
+    <string name="room_list_people_empty_body">Biseda përmes mesazhesh të drejtpërdrejta do të shfaqet këtu</string>
+    <string name="room_list_rooms_empty_title">Dhoma</string>
+    <string name="room_list_rooms_empty_body">Dhomat tuaja do të shfaqen këtu</string>
+
+    <string name="title_activity_emoji_reaction_picker">Reagime</string>
+    <string name="reactions_agree">Pajtohem</string>
+    <string name="reactions_like">E pëlqej</string>
+    <string name="message_add_reaction">Shtoni Reagim</string>
+    <string name="message_view_reaction">Shihni Reagime</string>
+    <string name="reactions">Reagime</string>
+
+    <string name="event_redacted_by_user_reason">Veprimtari e fshirë nga përdorues</string>
+    <string name="event_redacted_by_admin_reason">Veprimtari e moderuar nga përgjegjës dhome</string>
+    <string name="last_edited_info_message">Përpunuar së fundi nga %s më %s</string>
+
+
+    <string name="malformed_message">Veprimtari e keqformuar, s’mund të shfaqet</string>
+    <string name="create_new_room">Krijoni Dhomë të Re</string>
+    <string name="error_no_network">S’ka rrjet. Ju lutemi, kontrolloni lidhjen tuaj në Internet.</string>
+    <string name="action_change">Ndryshoje</string>
+    <string name="change_room_directory_network">Ndryshoni rrjetin</string>
+    <string name="please_wait">Ju lutemi, pritni…</string>
+    <string name="group_all_communities">Krejt Bashkësitë</string>
+
+    <string name="room_preview_no_preview">Kjo dhomë s’mund të parashihet</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">Paraparja e dhomave të lexueshme nga bota nuk mbulohet ende në RiotX</string>
+
+    <string name="fab_menu_create_room">Dhoma</string>
+    <string name="fab_menu_create_chat">Mesazhe të Drejtpërdrejtë</string>
+
+    <string name="create_room_title">Dhomë e Re</string>
+    <string name="create_room_action_create">KRIJOJE</string>
+    <string name="create_room_name_hint">Emër dhome</string>
+    <string name="create_room_public_title">Publike</string>
+    <string name="create_room_public_description">Kushdo do të jetë në gjendje të marrë pjesë në këtë dhomë</string>
+    <string name="create_room_directory_title">Drejtori Dhomash</string>
+    <string name="create_room_directory_description">Bëje publike këtë dhomë te drejtoria e dhomave</string>
+
+    <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>
+
 </resources>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 21a52266..a7152c10 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -280,12 +280,10 @@
     <string name="permissions_rationale_msg_camera_and_audio">Riot 需要權限來存取相機及麥克風來撥打視訊通話。
 
 為了要通話，請在下個彈跳視窗中允許存取。</string>
-    <string name="permissions_rationale_msg_contacts">Riot 需要權限來存取您的聯絡簿，以利用電子郵件及電話號碼來尋找 Matrix 使用者。
-
-為了尋找聯絡簿中的 Riot.im 的好友，請在下個彈跳視窗允許存取。</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot 需要權限來存取您的通訊錄，以利用電子郵件及電話號碼來尋找 Matrix 使用者。
-
-是否允許 Riot 存取聯絡人？</string>
+    <string name="permissions_rationale_msg_contacts">Riot 可以檢查您的電話簿並以電子郵件與電話號碼為基礎來尋找其他 Matrix 使用者。如果您同意為此用途分享您的電話簿，請在下一個彈出式視窗中允許存取權限。</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Riot 可以檢查您的電話簿並以電子郵件與電話號碼為基礎來尋找其他 Matrix 使用者。
+\n
+\n您同意為此用途分享您的電話簿嗎？</string>
 
     <string name="permissions_action_not_performed_missing_permissions">抱歉。由於缺少權限，所以無法執行動作</string>
 
@@ -1419,4 +1417,66 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="sas_error_m_user_error">使用者不符合</string>
     <string name="sas_error_unknown">未知錯誤</string>
 
+    <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>
+    <string name="reactions">反應</string>
+
+    <string name="event_redacted_by_user_reason">由使用者刪除的活動</string>
+    <string name="event_redacted_by_admin_reason">由聊天室管理員審核的活動</string>
+    <string name="last_edited_info_message">最後編輯由 %s 於 %s</string>
+
+
+    <string name="malformed_message">活動格式錯誤，無法顯示</string>
+    <string name="create_new_room">建立新聊天室</string>
+    <string name="error_no_network">沒有網路。請檢查您的網路連線。</string>
+    <string name="action_change">變更</string>
+    <string name="change_room_directory_network">變更網路</string>
+    <string name="please_wait">請稍候……</string>
+    <string name="group_all_communities">所有社群</string>
+
+    <string name="room_preview_no_preview">無法預覽此聊天室</string>
+    <string name="room_preview_world_readable_room_not_supported_yet">RiotX 尚不支援預覽所有人皆可讀的聊天室</string>
+
+    <string name="fab_menu_create_room">聊天室</string>
+    <string name="fab_menu_create_chat">直接訊息</string>
+
+    <string name="create_room_title">新聊天室</string>
+    <string name="create_room_action_create">建立</string>
+    <string name="create_room_name_hint">聊天室名稱</string>
+    <string name="create_room_public_title">公開</string>
+    <string name="create_room_public_description">任何人都可以加入此聊天室</string>
+    <string name="create_room_directory_title">聊天室目錄</string>
+    <string name="create_room_directory_description">將此聊天室公開於聊天室目錄中</string>
+
+    <string name="keys_backup_unable_to_get_trust_info">取得信任資訊時發生錯誤</string>
+    <string name="keys_backup_unable_to_get_keys_backup_data">取得金鑰備份資料時發生錯誤</string>
+
 </resources>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index cf34df26..96404fe6 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1521,4 +1521,77 @@ Why choose Riot.im?
     <string name="keys_backup_unable_to_get_trust_info">"An error occurred getting trust info"</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">"An error occurred getting keys backup data"</string>
 
+    <string name="alpha_disclaimer_title">Welcome to the beta!</string>
+    <string name="alpha_disclaimer_content_line_1">"While Riot X is in early development, some features may be missing and you may experience bugs."</string>
+    <!-- The parameter will be replaced by the value of string alpha_disclaimer_content_line_2_gplay_colored_part -->
+    <string name="alpha_disclaimer_content_line_2_gplay">"The latest feature list is always in the %1$s, and if you find bugs please submit a report in the top left menu of Home, and we’ll fix them as quickly as we can."</string>
+    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">"Play Store description"</string>
+    <string name="alpha_disclaimer_content_line_2_fdroid">"If you find bugs please submit a report in the top left menu of Home, and we’ll fix them as quickly as we can."</string>
+
+    <string name="import_e2e_keys_from_file">"Import e2e keys from file \"%1$s\"."</string>
+
+    <string name="settings_sdk_version">Matrix SDK Version</string>
+    <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>
+    <string name="settings_preferences">Preferences</string>
+    <string name="settings_security_and_privacy">Security &amp; Privacy</string>
+    <string name="settings_expert">Expert</string>
+    <string name="settings_push_rules">Push Rules</string>
+    <string name="settings_push_rules_no_rules">No push rules defined</string>
+    <string name="settings_push_gateway_no_pushers">No registered push gateways</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">Voice &amp; Video</string>
+    <string name="preference_root_help_about">Help &amp; About</string>
+
+
+    <string name="settings_troubleshoot_test_token_registration_quick_fix">Register token</string>
+
+    <string name="send_suggestion">Make a suggestion</string>
+    <string name="send_suggestion_content">Please write your suggestion below.</string>
+    <string name="send_suggestion_report_placeholder">Describe your suggestion here</string>
+    <string name="send_suggestion_sent">Thanks, the suggestion has been successfully sent</string>
+    <string name="send_suggestion_failed">The suggestion failed to be sent (%s)</string>
+
+    <string name="settings_labs_show_hidden_events_in_timeline">Show hidden events in timeline</string>
+
+    <!-- String for Play Store, for RiotX -->
+    <string name="store_riotx_title">RiotX - Next Generation Matrix Client</string>
+    <string name="store_riotx_short_description">A faster and lighter client for Matrix using the latest Android frameworks</string>
+    <string name="store_riotx_full_description">"RiotX is a new client for the Matrix protocol (Matrix.org): an open network for secure, decentralised communication. RiotX is a full rewrite of the Riot Android client, based on a full rewrite of the Matrix Android SDK.
+
+Disclaimer: This is a beta version. RiotX is currently in active development and contains limitations and (we hope not too many) bugs. All feedback is welcome!
+
+RiotX supports:
+• Login to an existing account
+• Create room and join public rooms
+• Accept and reject invitations
+• List users rooms
+• View room details
+• Send text messages
+• Send attachment
+• Read and write messages in encrypted rooms
+• Crypto: E2E keys backup, advance device verification, key share request and answer
+• Push notification
+• Light, Dark and Black themes
+
+Not all features in Riot are implemented in RiotX yet. Main missing (and coming soon!) features:
+• Account creation
+• Room settings (list room members, etc.)
+• Creation of direct chat rooms
+• Calls
+• Widgets
+• …"</string>
+
 </resources>
diff --git a/vector/src/main/res/values/strings_riotX.xml b/vector/src/main/res/values/strings_riotX.xml
index f8eeee24..a3c5206b 100644
--- a/vector/src/main/res/values/strings_riotX.xml
+++ b/vector/src/main/res/values/strings_riotX.xml
@@ -3,49 +3,5 @@
 
     <!-- Strings not defined in Riot -->
 
-    <string name="alpha_disclaimer_title">Welcome to the beta!</string>
-    <string name="alpha_disclaimer_content_line_1">"While Riot X is in early development, some features may be missing and you may experience bugs."</string>
-    <!-- The parameter will be replaced by the value of string alpha_disclaimer_content_line_2_gplay_colored_part -->
-    <string name="alpha_disclaimer_content_line_2_gplay">"The latest feature list is always in the %1$s, and if you find bugs please submit a report in the top left menu of Home, and we’ll fix them as quickly as we can."</string>
-    <string name="alpha_disclaimer_content_line_2_gplay_colored_part">"Play Store description"</string>
-    <string name="alpha_disclaimer_content_line_2_fdroid">"If you find bugs please submit a report in the top left menu of Home, and we’ll fix them as quickly as we can."</string>
-
-    <string name="import_e2e_keys_from_file">"Import e2e keys from file \"%1$s\"."</string>
-
-    <string name="settings_sdk_version">Matrix SDK Version</string>
-    <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>
-    <string name="settings_preferences">Preferences</string>
-    <string name="settings_security_and_privacy">Security &amp; Privacy</string>
-    <string name="settings_expert">Expert</string>
-    <string name="settings_push_rules">Push Rules</string>
-    <string name="settings_push_rules_no_rules">No push rules defined</string>
-    <string name="settings_push_gateway_no_pushers">No registered push gateways</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">Voice &amp; Video</string>
-    <string name="preference_root_help_about">Help &amp; About</string>
-
-
-    <string name="settings_troubleshoot_test_token_registration_quick_fix">Register token</string>
-
-    <string name="send_suggestion">Make a suggestion</string>
-    <string name="send_suggestion_content">Please write your suggestion below.</string>
-    <string name="send_suggestion_report_placeholder">Describe your suggestion here</string>
-    <string name="send_suggestion_sent">Thanks, the suggestion has been successfully sent</string>
-    <string name="send_suggestion_failed">The suggestion failed to be sent (%s)</string>
-
-    <string name="settings_labs_show_hidden_events_in_timeline">Show hidden events in timeline</string>
 
 </resources>
\ No newline at end of file