diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index a5ae0539ad..2fc02add88 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -881,13 +881,9 @@
     <string name="room_participants_idle">خامل</string>
 
     <string name="settings_notification_privacy">خصوصيّة الإخطارات</string>
-    <string name="settings_notification_privacy_warning">يعمل Riot.im في الخلفية ليُبقي محتوى رسائل الإخطارات خاصًّا. يمكنك تغيير هذا الخيار لتقليل استخدام البطارية.</string>
     <string name="settings_notification_privacy_normal">طبيعية</string>
-    <string name="settings_notification_privacy_power_saving">خيارات حِفظ الطاقة</string>
-    <string name="settings_notification_privacy_low_detail">إخطارات بتفاصيل أقل</string>
     <string name="settings_notification_privacy_reduced">خصوصية أقل</string>
     <string name="settings_notification_privacy_need_permission">يحتاج التطبيق تصريحًا ليعمل في الخلفية</string>
-    <string name="settings_notification_privacy_no_permission"><b>لا</b> تحتاج التطبيقات تصريحًا لتعمل في الخلفية</string>
     <string name="settings_notification_privacy_fcm">• تُرسل الإخطارات عبر «رسائل غوغل السحابية Google Cloud Messaging»</string>
     <string name="settings_notification_privacy_metadata">• تحتوي الإخطارات بيانات وصفية فحسب</string>
     <string name="settings_notification_privacy_nosecure_message_content">• تحتوي الإخطارات <b>بيانات وصفية وبيانات الرسائل</b></string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 1ed26523d6..e276238143 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -834,13 +834,9 @@
     <string name="receipt_avatar">Профилна снимка</string>
     <string name="notice_avatar">Профилна снимка</string>
     <string name="open_chat_header">Отвори заглавие</string>
-    <string name="settings_notification_privacy_warning">Riot.im работи във фонов режим за да е конфиденциално съдържанието на известията. Може да смените тази настройка, за да намалите консумацията на енергия.</string>
-    <string name="settings_notification_privacy_power_saving">Настройки за енергоспестяване</string>
-    <string name="settings_notification_privacy_low_detail">Известия без подробности</string>
     <string name="settings_notification_privacy_reduced">Намалена конфиденциалност</string>
     <string name="settings_notification_privacy_need_permission">Приложението се нуждае от достъп за работа във фонов режим</string>
-    <string name="settings_notification_privacy_no_permission">Приложението <b>не</b> се нуждае от достъп за работа във фонов режим</string>
-    <string name="settings_notification_privacy_fcm">• Известията се изпращат чрез Google Cloud Messaging</string>
+    <string name="settings_notification_privacy_fcm">• Уведомления се изпращат чрез Google Cloud Messaging</string>
     <string name="settings_notification_privacy_metadata">• Уведомленията съдържат само метаданни</string>
     <string name="settings_notification_privacy_secure_message_content">• Съдържанието на известията се <b>извлича по защитен път директно от Matrix сървъра</b></string>
     <string name="settings_notification_privacy_nosecure_message_content">• Уведомленията съдържат <b>метаданни и съдържания на съобщения</b></string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 1ba603065a..23a5fc7573 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -936,12 +936,8 @@ Tingueu en compte que aquesta acció reiniciarà l\'aplicació i pot trigar una
     </plurals>
     <string name="room_sliding_menu_version_x">Versió %s</string>
     <string name="settings_notification_privacy">Notificació de privacitat</string>
-    <string name="settings_notification_privacy_warning">Riot.im funciona en segon pla per mantenir el contingut de les notificacions dels missatges privats. Podeu canviar aquesta opció per tal de reduir l\'ús de bateria.</string>
-    <string name="settings_notification_privacy_power_saving">Opcions d\'estalvi d\'energia</string>
-    <string name="settings_notification_privacy_low_detail">Notificacions poc detallades</string>
     <string name="settings_notification_privacy_reduced">Privacitat reduïda</string>
     <string name="settings_notification_privacy_need_permission">L\'aplicació necessita permisos per funcionar en segon pla</string>
-    <string name="settings_notification_privacy_no_permission">L\'aplicació <b>no</b> necessita cap permís per funcionar en segon pla</string>
     <string name="settings_notification_privacy_fcm">• Les notificacions s\'envien via Google Cloud Messaging</string>
     <string name="settings_notification_privacy_metadata">• Les notificacions contenen només meta dades</string>
     <string name="settings_notification_privacy_secure_message_content">• El contingut dels missatges de les notificacions s\'obté <b>de forma segura des del servidor de Matrix</b></string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e825057cb8..86182d5b48 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -898,13 +898,9 @@ Unbekannte Geräte:</string>
     <string name="receipt_avatar">Profilbild für Lesebestätigungen</string>
     <string name="notice_avatar">Profilbild für Bemerkungen</string>
     <string name="settings_notification_privacy">Datenschutz für Benachrichtigungen</string>
-    <string name="settings_notification_privacy_warning">Riot.im läuft im Hintergrund um den Benachrichtigungsinhalt privat zu halten. Du kannst diese Option ändern um den Stromverbrauch zu reduzieren.</string>
     <string name="settings_notification_privacy_normal">Normal</string>
-    <string name="settings_notification_privacy_power_saving">Energiesparoptionen</string>
-    <string name="settings_notification_privacy_low_detail">Informationsarme Benachrichtigung</string>
     <string name="settings_notification_privacy_reduced">Verringerter Datenschutz</string>
     <string name="settings_notification_privacy_need_permission">Dies App braucht die Berechtigung im Hintergrund zu laufen</string>
-    <string name="settings_notification_privacy_no_permission">Die App braucht die Berechtigung im Hintergrund zu laufen <b>nicht</b></string>
     <string name="settings_notification_privacy_fcm">• Benachrichtigungen werden über Google Cloud Messaging versendet</string>
     <string name="settings_notification_privacy_metadata">• Benachrichtigungen enthalten nur Metadaten</string>
     <string name="settings_notification_privacy_secure_message_content">• Der Nachrichteninhalt der Benachrichtigung wird <b>sicher vom Matrix-Heimserver abgerufen</b></string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 0f37c45284..23713fe7a1 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -925,13 +925,9 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="deactivate_account_submit">Desactivar Cuenta</string>
 
     <string name="settings_notification_privacy">Privacidad de notificaciones</string>
-    <string name="settings_notification_privacy_warning">Riot.im se ejecuta en segundo plano para mantener privado el contenido del mensaje de la notificación. Puedes cambiar esta opción para reducir el uso de la batería.</string>
     <string name="settings_notification_privacy_normal">Normal</string>
-    <string name="settings_notification_privacy_power_saving">Opciones de Ahorro de Energía</string>
-    <string name="settings_notification_privacy_low_detail">Notificaciones simples</string>
     <string name="settings_notification_privacy_reduced">Privacidad reducida</string>
     <string name="settings_notification_privacy_need_permission">La aplicación necesita permiso para ejecutarse en segundo plano</string>
-    <string name="settings_notification_privacy_no_permission">La aplicación <b> no </b> necesita permiso para ejecutarse en segundo plano</string>
     <string name="settings_notification_privacy_fcm">• Las notificaciones se envían a través de Google Cloud Messaging</string>
     <string name="settings_notification_privacy_metadata">• Las notificaciones solo contienen metadatos</string>
     <string name="settings_notification_privacy_secure_message_content">• El contenido del mensaje de la notificación está <b>ubicado de forma segura directamente desde el servidor doméstico de Matrix</b></string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 780b83216a..b5407444f4 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -846,13 +846,9 @@ Gailu ezezagunak:</string>
     <string name="avatar">Abatarra</string>
 
     <string name="settings_notification_privacy">Jakinarazpenen pribatutasuna</string>
-    <string name="settings_notification_privacy_warning">Riot.im bigarren planoan dabil zure jakinarazpen mezuaren edukia pribatu mantentzeko. Aukera hau aldatu dezakezu bateria aurrezteko.</string>
     <string name="settings_notification_privacy_normal">Arrunta</string>
-    <string name="settings_notification_privacy_power_saving">Energia aurrezteko aukerak</string>
-    <string name="settings_notification_privacy_low_detail">Xehetasun gutxiko jakinarazpenak</string>
     <string name="settings_notification_privacy_reduced">Pribatutasun murriztua</string>
     <string name="settings_notification_privacy_need_permission">Aplikazioak bigarren planoan aritzeko baimenak behar ditu</string>
-    <string name="settings_notification_privacy_no_permission">Aplikazioak <b>ez</b> du bigarren planoan aritzeko baimenik behar</string>
     <string name="settings_notification_privacy_fcm">• Jakinarazpenak Google Cloud Messaging bidez bidaltzen dira</string>
     <string name="settings_notification_privacy_metadata">• Jakinarazpenek meta-datuak besterik ez dituzte</string>
     <string name="settings_notification_privacy_secure_message_content">• Jakinarazpen mezuaren edukia <b>Matrix hasiera-zerbitzarian gorde da seguru</b></string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 352e3c5b34..f47d29ea7e 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -1083,13 +1083,9 @@ Haluatko lisätä paketteja?</string>
     <string name="settings_troubleshoot_test_battery_failed">Jos käyttäjä jättää laitteen ilman latausjohtoa niin, että näyttö on pois päältä, laite siirtyy torkkutilaan. Tämä estää sovelluksia käyttämästä verkkoyhteyksiä ja lykkää niiden töitä, synkronointeja ja perushälytyksiä.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Jätä optimointi huomiotta</string>
 
-    <string name="settings_notification_privacy_warning">Riot.im käyttää taustapalvelua pitääksesi viestisi sisällön yksityisenä. Voit vaihtaa tämän asetuksen vähentääksesi akun käyttöä.</string>
     <string name="settings_notification_privacy_normal">Normaali</string>
-    <string name="settings_notification_privacy_power_saving">Virransäästöasetukset</string>
-    <string name="settings_notification_privacy_low_detail">Epätarkat ilmoitukset</string>
     <string name="settings_notification_privacy_reduced">Heikentynyt yksityisyys</string>
     <string name="settings_notification_privacy_need_permission">Tämä sovellus tarvitsee oikeuden ajaakseen taustapalveluaan</string>
-    <string name="settings_notification_privacy_no_permission">Tämä sovellus <b>ei</b> tarvitse oikeutta ajaakseen taustapalveluaan</string>
     <string name="settings_notification_privacy_fcm">• ilmoitukset lähetetään Google Cloud Messaging -palvelun kautta</string>
     <string name="settings_notification_privacy_metadata">• ilmoitukset sisältävät vain metadataa</string>
     <string name="settings_notification_privacy_secure_message_content">• ilmoituksessa olevan viestin sisältö <b>haetaan turvallisesti suoraan Matrix-kotipalvelimelta</b></string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index be31f4c771..d7a8d2c5cc 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -849,13 +849,9 @@ Appareils inconnus :</string>
     <string name="open_chat_header">Développer l’entête</string>
     <string name="receipt_avatar">Avatar de réception</string>
     <string name="settings_notification_privacy">Confidentialité des notifications</string>
-    <string name="settings_notification_privacy_warning">Riot.im fonctionne en arrière-plan pour que le contenu du message de notification reste privé. Vous pouvez désactiver cette option pour réduire l’utilisation de la batterie.</string>
     <string name="settings_notification_privacy_normal">Normal</string>
-    <string name="settings_notification_privacy_power_saving">Options d’économie d’énergie</string>
-    <string name="settings_notification_privacy_low_detail">Notifications avec peu de détails</string>
     <string name="settings_notification_privacy_reduced">Confidentialité réduite</string>
-    <string name="settings_notification_privacy_need_permission">L’application a besoin de la permission de fonctionner en arrière-plan</string>
-    <string name="settings_notification_privacy_no_permission">L’application <b>n’</b>a <b>pas</b> besoin de la permission pour fonctionner en arrière-plan</string>
+    <string name="settings_notification_privacy_need_permission">L\'application a besoin de la permission de fonctionner en arrière-plan</string>
     <string name="settings_notification_privacy_fcm">• Les notifications sont envoyées via Google Cloud Messaging</string>
     <string name="settings_notification_privacy_metadata">• Les notifications ne contiennent que des métadonnées</string>
     <string name="settings_notification_privacy_secure_message_content">• Le contenu du message de notification est <b>issu directement du serveur d’accueil Matrix</b></string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index f6a3ab30e2..cafceca47b 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -643,13 +643,9 @@ Seguramente queira conectarse cunha conta distinta, ou engadir este correo a sú
     </plurals>
     <string name="room_sliding_menu_term_and_conditions">Termos e condicións</string>
     <string name="settings_notification_privacy">Segredo das notificacións</string>
-    <string name="settings_notification_privacy_warning">Riot.im traballa agochado, en segundo plano, para garantir que o contido das súas mensaxes sexa segredo. Pode cambiar esta opción para que reducir o consumo das baterías.</string>
     <string name="settings_notification_privacy_normal">Normal</string>
-    <string name="settings_notification_privacy_power_saving">Opcións de aforro de batería</string>
-    <string name="settings_notification_privacy_low_detail">Notificacións con pouco detalle</string>
     <string name="settings_notification_privacy_reduced">Reducir a privacidade</string>
     <string name="settings_notification_privacy_need_permission">Esta aplicación necesita de permisos para traballar en segundo plano</string>
-    <string name="settings_notification_privacy_no_permission">Esta aplicación <b>non</b> ten permisos para traballar en segundo plano</string>
     <string name="settings_notification_privacy_fcm">• Notificacións enviadas a través de Cloud Messaging de Google</string>
     <string name="settings_notification_privacy_metadata">• Notificacións que só conteñen metadatos</string>
     <string name="settings_notification_privacy_secure_message_content">• O contido da mensaxe das notificacións está <b>provén dun xeito seguro e directo do servidor local de Matrix</b></string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 61f7f17624..b08963ea40 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -848,11 +848,7 @@ Ismeretlen eszközök:</string>
 
     <string name="receipt_avatar">Címzett profilképe</string>
     <string name="notice_avatar">Észlelési profilkép</string>
-    <string name="settings_notification_privacy_warning">Riot.im a háttérben fut azért, hogy az értesítések tartalma titokban maradhasson. Ezt a beállítást megváltoztathatod kisebb akkumulátor használathoz.</string>
     <string name="settings_notification_privacy_normal">Normál</string>
-    <string name="settings_notification_privacy_power_saving">Akkumulátor kímélő beállítások</string>
-    <string name="settings_notification_privacy_low_detail">Értesítések kevés részlettel</string>
-    <string name="settings_notification_privacy_no_permission">Az alkalmazásnak <b>nincs</b> szüksége engedélyre a háttérben való futáshoz</string>
     <string name="settings_notification_privacy_fcm">• Az értesítések a Google Cloud Messaging rendszeren keresztül lesznek elküldve</string>
     <string name="settings_notification_privacy_metadata">• Az értesítések csak metaadatokat tartalmaznak</string>
     <string name="settings_notification_privacy_secure_message_content">• Az értesítés tartalma <b>közvetlenül a Matrix szerverről kerül letöltésre</b></string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 55e82effe2..849e5ecb58 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -544,13 +544,9 @@ Perhatikan bahwa tindakan ini akan memulai ulang aplikasi dan mungkin cukup mema
     <string name="settings_app_info_link_title">Info aplikasi</string>
 
     <string name="settings_notification_privacy">Kerahasiaan pemberitahuan</string>
-    <string name="settings_notification_privacy_warning">Riot.im beroperasi di balik layar untuk menjaga kerahasiaan isi pesan pemberitahuan. Anda dapat mengubah pengaturan untuk mengurangi penggunaan baterai.</string>
     <string name="settings_notification_privacy_normal">Normal</string>
-    <string name="settings_notification_privacy_power_saving">Opsi Hemat Tenaga</string>
-    <string name="settings_notification_privacy_low_detail">Pemberitahuan minim detail</string>
     <string name="settings_notification_privacy_reduced">Kerahasiaan diperlemah</string>
     <string name="settings_notification_privacy_need_permission">Aplikasi ini membutuhkan permisi untuk beroperasi di balik layar</string>
-    <string name="settings_notification_privacy_no_permission">Aplikasi ini <b>tidak</b> membutuhkan permisi untuk beroperasi di balik layar</string>
     <string name="settings_notification_privacy_fcm">• Pemberitahuan dikirim melalui Google Cloud Messaging</string>
     <string name="settings_notification_privacy_metadata">• Pemberitahuan hanya memuat meta data</string>
     <string name="settings_notification_privacy_secure_message_content">• Isi pesan pemberitahuan <b> tersimpan langsung dengan aman di homeserver Matrix</b></string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 55e82effe2..849e5ecb58 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -544,13 +544,9 @@ Perhatikan bahwa tindakan ini akan memulai ulang aplikasi dan mungkin cukup mema
     <string name="settings_app_info_link_title">Info aplikasi</string>
 
     <string name="settings_notification_privacy">Kerahasiaan pemberitahuan</string>
-    <string name="settings_notification_privacy_warning">Riot.im beroperasi di balik layar untuk menjaga kerahasiaan isi pesan pemberitahuan. Anda dapat mengubah pengaturan untuk mengurangi penggunaan baterai.</string>
     <string name="settings_notification_privacy_normal">Normal</string>
-    <string name="settings_notification_privacy_power_saving">Opsi Hemat Tenaga</string>
-    <string name="settings_notification_privacy_low_detail">Pemberitahuan minim detail</string>
     <string name="settings_notification_privacy_reduced">Kerahasiaan diperlemah</string>
     <string name="settings_notification_privacy_need_permission">Aplikasi ini membutuhkan permisi untuk beroperasi di balik layar</string>
-    <string name="settings_notification_privacy_no_permission">Aplikasi ini <b>tidak</b> membutuhkan permisi untuk beroperasi di balik layar</string>
     <string name="settings_notification_privacy_fcm">• Pemberitahuan dikirim melalui Google Cloud Messaging</string>
     <string name="settings_notification_privacy_metadata">• Pemberitahuan hanya memuat meta data</string>
     <string name="settings_notification_privacy_secure_message_content">• Isi pesan pemberitahuan <b> tersimpan langsung dengan aman di homeserver Matrix</b></string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 5ca838c162..9d17e8fa1b 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -591,7 +591,6 @@
 
     <string name="settings_notification_privacy">Friðhelgi tilkynninga</string>
     <string name="settings_notification_privacy_normal">Venjulegt</string>
-    <string name="settings_notification_privacy_power_saving">Valkostir aflstjórnunar</string>
     <string name="settings_notification_privacy_reduced">Minnkuð friðhelgi</string>
     <string name="settings_notification_ringtone">Hljóð með tilkynningu</string>
     <string name="settings_enable_all_notif">Virkja tilkynningar fyrir þennan notandaaðgang</string>
@@ -681,7 +680,6 @@ Til að halda áfram skaltu setja inn lykilorðið þitt.</string>
         <item quantity="other">%1$s spjallrásir fundust fyrir %2$s</item>
     </plurals>
     <string name="settings_notification_privacy_need_permission">Forritið þarf heimild til að keyra í bakgrunni</string>
-    <string name="settings_notification_privacy_no_permission">Forritið <b>þarf ekki</b> heimild til að keyra í bakgrunni</string>
     <string name="settings_notification_privacy_fcm">• Tilkynningar eru sendar í gegnum Google Cloud Messaging</string>
     <string name="settings_notification_privacy_metadata">• Tilkynningar innihalda einungis lýsigögn</string>
     <string name="settings_notification_privacy_secure_message_content">• Efni skilaboða í tilkynningum er <b>staðsett beint og öruggt á Matrix heimavefþjóninum</b></string>
@@ -717,8 +715,6 @@ Ertu alveg viss?</string>
     <string name="people_search_invite_by_id_dialog_description">Settu inn eitt eða fleir tölvupóstföng eða Matrix auðkenni</string>
     <string name="room_unsent_messages_notification">Skilaboð ekki send. %1$s eða %2$s núna?</string>
     <string name="room_unknown_devices_messages_notification">Skilaboð ekki send vegna þess að vart var við óþekkt tæki. %1$s eða %2$s núna?</string>
-    <string name="settings_notification_privacy_warning">Riot.im keyrir í bakgrunni til að halda efni tilkynninga út af fyrir sig. YÞú getur breytt þessum valkosti til að minnka rafhlöðunotkun.</string>
-    <string name="settings_notification_privacy_low_detail">Tilkynningar án smáatriða</string>
     <string name="settings_set_sync_delay">Hlé milli tveggja samstillingarbeiðna</string>
     <string name="settings_keep_media">Halda gögnum</string>
 
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 59373d804b..38886943f8 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -894,14 +894,10 @@ Attenzione: questo file può essere eliminato se l\'applicazione viene disinstal
         <item quantity="other">%d cambi d\'appartenenza</item>
     </plurals>
 
-    <string name="settings_notification_privacy_warning">Riot.im funziona in sottofondo per mantenere privato il contenuto delle notifiche. Puoi cambiare questa opzione per ridurre il consumo della batteria.</string>
     <string name="settings_notification_privacy">Privacy delle notifiche</string>
     <string name="settings_notification_privacy_normal">Normale</string>
-    <string name="settings_notification_privacy_power_saving">Opzioni risparmio energetico</string>
-    <string name="settings_notification_privacy_low_detail">Notifiche poco dettagliate</string>
     <string name="settings_notification_privacy_reduced">Privacy ridotta</string>
     <string name="settings_notification_privacy_need_permission">L\'app richiede il permesso per funzionare in sottofondo</string>
-    <string name="settings_notification_privacy_no_permission">Le app <b>non</b> richiedono il permesso per funzionare in sottofondo</string>
     <string name="settings_notification_privacy_fcm">• Le notifiche vengono inviate via Google Cloud Messaging</string>
     <string name="settings_notification_privacy_metadata">• Le notifiche contengono solo metadati</string>
     <string name="settings_notification_privacy_secure_message_content">• Il contenuto del messaggio di una notifica <b>si trova al sicuro direttamente dal server home di Matrix</b></string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index c81db69546..440ecf816a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -810,13 +810,9 @@ Riotアプリがあなたの電話帳へアクセスすることを許可しま
 
     <string name="room_settings_mention_only">名前があがったときのみ</string>
     <string name="settings_notification_privacy">通知のプライバシー</string>
-    <string name="settings_notification_privacy_warning">Riot.imは通知のメッセージの内容の秘密を守るため、バックグラウンドで動作します。電池の使用を削減するために、このオプションを変えることができます。</string>
     <string name="settings_notification_privacy_normal">標準</string>
-    <string name="settings_notification_privacy_power_saving">省電力設定</string>
-    <string name="settings_notification_privacy_low_detail">簡単な通知</string>
     <string name="settings_notification_privacy_need_permission">このアプリはバックグラウンド動作の権限が必要です</string>
     <string name="settings_notification_privacy_fcm">•通知はGoogle Cloud Messaging経由で送られます</string>
-    <string name="settings_notification_privacy_no_permission">このアプリにバックグラウンド動作の権限は<b>必要ありません</b></string>
     <string name="settings_notification_privacy_metadata">• 通知はメタデータのみを含みます</string>
     <string name="title_activity_choose_sticker">スタンプを送る</string>
 
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 09cba1c5b1..f7957ebaca 100755
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -889,13 +889,9 @@ Je kan het nu, of later, doen vanuit de programma-instellingen.</string>
 Wil je er nu een paar toevoegen?</string>
 
     <string name="settings_notification_privacy">Notificatie privacy</string>
-    <string name="settings_notification_privacy_warning">Riot.im werkt in de achtergrond om de inhoud van de berichten in de notificatie privé te houden. Je kan deze optie uitzetten om batterijverbruik te verminderen.</string>
     <string name="settings_notification_privacy_normal">Normaal</string>
-    <string name="settings_notification_privacy_power_saving">Energie-besparende Opties</string>
-    <string name="settings_notification_privacy_low_detail">Notificaties met weinig details</string>
     <string name="settings_notification_privacy_reduced">Gereduceerde privacy</string>
     <string name="settings_notification_privacy_need_permission">De applicatie heeft toestemming nodig om in de achtergrond te werken</string>
-    <string name="settings_notification_privacy_no_permission">De apps hebben <b>geen</b> toestemming nodig om in de achtergrond te werken</string>
     <string name="settings_notification_privacy_fcm">• Notifications worden verstuurd via Google Cloud Messaging</string>
     <string name="settings_notification_privacy_metadata">• Notificaties bevatten alleen metadata</string>
     <string name="settings_notification_privacy_secure_message_content">• De inhoud van de berichten in de notificatie is <b>veilig overgebracht rechtstreeks vanaf de Matrix thuisserver</b></string>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index 78812c3773..9cdce469a8 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -505,13 +505,9 @@ Merk at denne handlinga vil starta æppen på nytt og kan taka litt tid.</string
     <string name="settings_app_info_link_title">Æppinfo</string>
 
     <string name="settings_notification_privacy">Varselpersonvern</string>
-    <string name="settings_notification_privacy_warning">Riot.im køyrer i bakgrunnen for å halde varselinnhaldet ditt privat. Du kan forandra på denne innstillinga for å senka batteribruket.</string>
     <string name="settings_notification_privacy_normal">Vanleg</string>
-    <string name="settings_notification_privacy_power_saving">Straumsparings-Innstillingar</string>
-    <string name="settings_notification_privacy_low_detail">Lågdetaljerte varsel</string>
     <string name="settings_notification_privacy_reduced">Minska personvern</string>
     <string name="settings_notification_privacy_need_permission">Æppen treng tilgang til å køyra i bakgrunnen</string>
-    <string name="settings_notification_privacy_no_permission">Æppen treng <b>ikkje</b> tillating til å køyra i bakgrunnen</string>
     <string name="settings_notification_privacy_fcm">• Varsel vert sende gjennom Google Cloud-Meldingar</string>
     <string name="settings_notification_privacy_metadata">• Varsel inneheld berre metadata</string>
     <string name="settings_notification_privacy_secure_message_content">• Meldingsinnhald i varselet <b>hentast trygt direkte frå Matrix-heimtenaren</b></string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index cd627fbac9..e4e1f37815 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -754,13 +754,9 @@ Jesteś pewien?</string>
     <string name="e2e_re_request_encryption_key_dialog_content">Uruchom proszę Riot na innym urządzeniu, które może odszyfrować wiadomość, aby wysłać klucze do tego urządzenia.</string>
 
     <string name="settings_notification_privacy">Prywatność powiadomień</string>
-    <string name="settings_notification_privacy_warning">Riot.im działa w tle aby zachować prywatność Twoich powiadomień. Możesz zmienić tę opcję aby zmniejszyć zużycie baterii.</string>
     <string name="settings_notification_privacy_normal">Standardowa</string>
-    <string name="settings_notification_privacy_power_saving">Opcje oszczędzania energii</string>
-    <string name="settings_notification_privacy_low_detail">Mało szczegółowe powiadomienia</string>
     <string name="settings_notification_privacy_reduced">Zmniejszona prywatność</string>
     <string name="settings_notification_privacy_need_permission">Aplikacja wymaga uprawnień do działania w tle</string>
-    <string name="settings_notification_privacy_no_permission">Aplikacja <b>nie</b> wymaga uprawnień do działania w tle</string>
     <string name="settings_notification_privacy_fcm">• Powiadomienia wysyłane za pomocą Google Cloud Messaging</string>
     <string name="settings_notification_privacy_metadata">• Powiadomienia zawierają tylko meta-dane</string>
     <string name="settings_notification_privacy_secure_message_content">• Treść powiadomienia jest <b>bezpiecznie pobierana z domowego serwera Matrix</b></string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 77741c77a7..793188b12f 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -886,11 +886,8 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
     <string name="send_bug_report_rage_shake">Agite com raiva para reportar uma falha (bug)</string>
 
     <string name="settings_notification_privacy_normal">Normal</string>
-    <string name="settings_notification_privacy_power_saving">Opções de economia de energia</string>
-    <string name="settings_notification_privacy_low_detail">Notificações de baixo detalhe</string>
     <string name="settings_notification_privacy_reduced">Privacidade reduzida</string>
     <string name="settings_notification_privacy_need_permission">O app necessita de permissão para rodar em segundo plano</string>
-    <string name="settings_notification_privacy_no_permission">Os aplicativos <b>não</b> precisam de permissão para rodar em segundo plano</string>
     <string name="title_activity_choose_sticker">Enviar um sticker</string>
 
     <string name="dialog_title_third_party_licences">Licenças de terceiros</string>
@@ -953,7 +950,6 @@ Note que esta ação vai reiniciar o aplicativo e isso pode tomar um certo tempo
         <item quantity="other">%d selecionados</item>
     </plurals>
     <string name="settings_notification_privacy">Privacidade das notificações</string>
-    <string name="settings_notification_privacy_warning">Riot.im funciona em segundo plano para manter sua mensagem de notificação privada. Você pode alterar esta opção para reduzir o uso da bateria.</string>
     <string name="settings_notification_privacy_fcm">• As notificações são enviadas pelo \"Google Cloud Messaging\"</string>
     <string name="settings_notification_privacy_metadata">• As notificações contém apenas metadados</string>
     <string name="settings_notification_privacy_secure_message_content">• O conteúdo das mensagens da notificação é <b>armazenado de forma segura diretamente no servidor Matrix</b></string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index b041106eb1..80ad31888e 100755
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -881,13 +881,9 @@ Note que esta acção reiniciará a aplicação e poderá demorar algum tempo.</
 
     <string name="room_sliding_menu_version_x">Versão %s</string>
     <string name="settings_notification_privacy">Privacidade das notificações</string>
-    <string name="settings_notification_privacy_warning">O Riot.im funciona em segundo plano para manter o conteúdo das notificações das mensagens privado. Poderá alterar esta opção se pretender reduzir a utilização da bateria.</string>
     <string name="settings_notification_privacy_normal">Normal</string>
-    <string name="settings_notification_privacy_power_saving">Opções de economia de energia</string>
-    <string name="settings_notification_privacy_low_detail">Notificações com pouco detalhe</string>
     <string name="settings_notification_privacy_reduced">Privacidade reduzida</string>
     <string name="settings_notification_privacy_need_permission">A aplicação precisa de permissão para executar em segundo plano</string>
-    <string name="settings_notification_privacy_no_permission">As aplicações <b>não</b> precisam de permissão para executar em segundo plano</string>
     <string name="settings_notification_privacy_fcm">• As notificações são enviadas pelo Google Cloud Messaging</string>
     <string name="settings_notification_privacy_metadata">• As notificações contêm apenas metadados</string>
     <string name="settings_notification_privacy_secure_message_content">• O conteúdo das mensagens da notificação <b>obtém-se de forma segura directamente do servidor Matrix doméstico</b></string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e83cd74b21..eb100e3811 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -921,11 +921,8 @@ Email также позволит вам при необходимости во
 
     <string name="room_settings_no_flair">Эта комната не показывает лычки сообществ</string>
     <string name="settings_notification_privacy">Конфиденциальность уведомлений</string>
-    <string name="settings_notification_privacy_warning">Riot.im работает в фоновом режиме для сохранения приватности ваших уведомлений. Вы можете изменить этот параметр, чтобы уменьшить потребление заряда батареи.</string>
     <string name="settings_notification_privacy_normal">Нормальный</string>
-    <string name="settings_notification_privacy_power_saving">Варианты энергосбережения</string>
     <string name="settings_notification_privacy_need_permission">Приложение нуждается в разрешении на работу в фоновом режиме</string>
-    <string name="settings_notification_privacy_no_permission">Приложениям <b>не</b> требуется разрешение на работу в фоновом режиме</string>
     <string name="settings_notification_privacy_fcm">• Уведомления отправляются через Google Cloud Messaging</string>
     <string name="settings_notification_privacy_metadata">• Уведомления содержат только метаданные</string>
     <string name="settings_notification_privacy_nosecure_message_content">• Уведомления содержат <b>метаданные и данные сообщения</b></string>
@@ -936,7 +933,6 @@ Email также позволит вам при необходимости во
     <string name="startup_notification_privacy_button_grant">Предоставить разрешение</string>
     <string name="startup_notification_privacy_button_other">Выбрать другой вариант</string>
 
-    <string name="settings_notification_privacy_low_detail">Уведомления без подробностей</string>
     <string name="settings_notification_privacy_reduced">Ограниченная конфиденциальность</string>
     <string name="settings_notification_privacy_secure_message_content"><b> надежно от Matrix-Homeserver получено </b></string>
     <string name="title_activity_choose_sticker">Отправить стикер</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 61400fe6d5..84f2870bcc 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -868,13 +868,9 @@ Neznáme zariadenia:</string>
     <string name="avatar">Obrázok</string>
 
     <string name="settings_notification_privacy">Súkromie oznámení</string>
-    <string name="settings_notification_privacy_warning">Riot.im ostane spustený na pozadí, aby bol obsah správ oznámení zachovaný v súkromí. Zmenou tejto voľby môžete predlžiť výdrž pri napájaní z batérie.</string>
-    <string name="settings_notification_privacy_power_saving">Nastavenia šetrenia energie</string>
-    <string name="settings_notification_privacy_low_detail">Stručné oznámenia</string>
     <string name="settings_notification_privacy_reduced">Nižšia úroveň súkromia</string>
     <string name="settings_notification_privacy_normal">Normálne</string>
     <string name="settings_notification_privacy_need_permission">Aplikácia vyžaduje povolenie bežať na pozadí</string>
-    <string name="settings_notification_privacy_no_permission">Aplikácia <b>ne</b>vyžaduje povolenie bežať na pozadí</string>
     <string name="settings_notification_privacy_fcm">• Oznámenia sú zasielané prostredníctvom cloudových služieb Google</string>
     <string name="settings_notification_privacy_metadata">• Oznámenia neobsahujú text správy, len meta údaje</string>
     <string name="settings_notification_privacy_secure_message_content">• Obsah správy oznámení je <b>bezpečne prevzatý priamo z domovského servera Matrix</b></string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 0ccf3b2434..287734b9fc 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -390,7 +390,6 @@
     <string name="settings_add_phone_number">Shtoni numër telefoni</string>
     <string name="settings_app_info_link_title">Të dhëna aplikacioni</string>
     <string name="settings_notification_privacy_normal">Normale</string>
-    <string name="settings_notification_privacy_power_saving">Mundësi Kursimi Energjie</string>
     <string name="settings_notification_privacy_reduced">Me privatësi të zvogëluar</string>
     <string name="settings_notification_privacy_message_content_not_shown">• Njoftimet <b>s’do të shfaqin lëndë mesazhi</b></string>
 
@@ -775,7 +774,6 @@ Email-in tuaj mund ta shtoni te profili juaj, te rregullimet.</string>
     <string name="malformed_id">ID e keqformuar. Duhet të jetë një adresë email ose ID Matrix, si \'@localpart:domain\'</string>
     <string name="room_settings_de_prioritize">Hiqi përparësinë</string>
     <string name="settings_notification_privacy">Privatësi njoftimesh</string>
-    <string name="settings_notification_privacy_low_detail">Njoftime me pak hollësi</string>
     <string name="settings_olm_version">version olm</string>
     <string name="settings_pin_missed_notifications">Fikso dhomat me njoftime të humbura</string>
 
@@ -969,9 +967,7 @@ Na ndjeni për belanë.</string>
 
     <string name="settings_app_info_link_summary">Shfaq te rregullimet e sistemit të dhëna të aplikacionit.</string>
 
-    <string name="settings_notification_privacy_warning">Riot.im xhiron në prapaskenë për ta mbajtur private lëndën e mesazheve të njoftimeve tuaja. Për të ulur harxhimin e baterisë, mund të ndryshoni këtë mundësi.</string>
     <string name="settings_notification_privacy_need_permission">Aplikacioni lyp leje për xhirim në prapaskenë</string>
-    <string name="settings_notification_privacy_no_permission">Aplikacionet <b>nuk</b> lypin leje për të xhiruar në prapaskenë</string>
     <string name="settings_notification_privacy_fcm">• Njoftimet dërgohen përmes Google Cloud Messaging</string>
     <string name="settings_notification_privacy_metadata">• Njoftimet përmbajnë vetëm tejtëdhëna</string>
     <string name="settings_notification_privacy_secure_message_content">• Lënda e mesazhit të njoftimit <b>gjendet e siguruar drejt e nga shërbyesi home Matrix</b></string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index d97d70d893..c0927b86c1 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -690,13 +690,9 @@ Ayrıca e-posta adresi, şifrenizi sıfırlamanıza da olanak tanır.</string>
     <string name="settings_troubleshoot_test_battery_failed">Eğer kullanıcı cihazını prize bağlanmamış sabit ve ekranı kapalı bir şekilde bir süre bırakırsa cihaz Derin uyku moduna geçer. Bu uygulamaların internete erişmesini engeller ve yapılacak işlerini, senkronizasyolarını, alarmını erteler</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Optimizasyonu Göz ardı et</string>
 
-    <string name="settings_notification_privacy_warning">Riot.im arkaplanda çalışarak bildirim mesajlarının içeriğini gizler. Bu ayarı değiştirerek batarya kullanımını azaltabilirsin.</string>
     <string name="settings_notification_privacy_normal">Normal</string>
-    <string name="settings_notification_privacy_power_saving">Güç-tasarrufu Seçenekleri</string>
-    <string name="settings_notification_privacy_low_detail">Düşük detaylı bildirimler</string>
     <string name="settings_notification_privacy_reduced">Azaltılmış gizlilik</string>
     <string name="settings_notification_privacy_need_permission">Uygulamanın arkaplanda çalışması için izne ihtiyacı var</string>
-    <string name="settings_notification_privacy_no_permission">Uygulamanın arkaplanda çalışması için izne ihtiyacı <b>yok</b></string>
     <string name="settings_notification_privacy_fcm">• Bildirimler Google Bulut Mesajlaşma ile gönderildi</string>
     <string name="settings_notification_privacy_metadata">• Bildirimler sadece meta verileri içeriyor</string>
     <string name="settings_notification_privacy_secure_message_content">• Bildirimin mesaj içeriği <b>direkt Matrix anamakinesinden güvenli bir şekilde bulundu</b></string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index c0791b1328..565aef07f2 100755
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -826,11 +826,8 @@
         <item quantity="other" />
     </plurals>
 
-    <string name="settings_notification_privacy_power_saving">"Варіанти  енергозабезпечення"</string>
-    <string name="settings_notification_privacy_low_detail">Повідомлення без подробиць</string>
     <string name="settings_notification_privacy_reduced">Обмежена конфіденційність</string>
     <string name="settings_notification_privacy_need_permission">Програма потребує дозвіл на роботу у фоновому режимі</string>
-    <string name="settings_notification_privacy_no_permission">"Програма  "<b>не</b> потребує дозвіл на роботу у фоновому режимі</string>
     <string name="settings_notification_privacy_fcm">• Повідомлення відправляються через Google Cloud Messaging</string>
     <string name="settings_notification_privacy_metadata">• Повідомлення містять тільки метаданні</string>
     <string name="settings_notification_privacy_secure_message_content">• Зміст сповіщення був <b> надійно віднайдений просто на домашньому сервері Matrix </b></string>
@@ -930,7 +927,6 @@
         <item quantity="other" />
     </plurals>
     <string name="room_sliding_menu_version_x">Версія %s</string>
-    <string name="settings_notification_privacy_warning">Riot.im запущено у фоновому режимі для забезпечення конфіденційності ваших сповіщень. Ви можете змінити цю опцію, щоб зменшити навантаження на батарею.</string>
     <string name="settings_notification_privacy_nosecure_message_content">• Сповіщення містять <b>метадані та дані повідомлення</b></string>
     <string name="settings_notification_privacy_message_content_not_shown">• Сповіщення <b>не будуть показувати вміст повідомлень</b></string>
 
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index f517285d85..42979c8838 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -793,7 +793,6 @@
         <item quantity="other">%d 个聊天室</item>
     </plurals>
     <string name="settings_notification_privacy">通知隐私</string>
-    <string name="settings_notification_privacy_warning">Riot.im 将在后台运行以保证通知消息内容的私密性。 您可以更改此选项以减少电池使用量。</string>
     <string name="settings_notification_privacy_need_permission">本应用需要在后台运行的权限</string>
     <string name="settings_flair">徽章</string>
 
@@ -839,7 +838,6 @@
     <string name="startup_notification_privacy_button_grant">获取权限</string>
     <string name="startup_notification_privacy_button_other">选择其他选项</string>
 
-    <string name="settings_notification_privacy_no_permission">这个应用<b>不</b>需要在后台运行的权限</string>
     <string name="settings_notification_privacy_fcm">• 通知通过 Google Cloud Messaging 发送</string>
     <string name="settings_notification_privacy_metadata">• 通知只含有元数据</string>
     <string name="settings_notification_privacy_message_content_not_shown">• 通知<b>不会显示消息内容</b></string>
@@ -848,8 +846,6 @@
     <string name="group_no_long_description">社区管理员没有提供这个社区的具体描述。</string>
 
     <string name="settings_notification_privacy_normal">标准</string>
-    <string name="settings_notification_privacy_power_saving">省电模式</string>
-    <string name="settings_notification_privacy_low_detail">简洁通知</string>
     <string name="settings_notification_privacy_reduced">低隐私模式</string>
     <string name="settings_deactivate_account_section">停用账户</string>
     <string name="settings_deactivate_my_account">停用我的账户</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 4ccfb98205..1bfc12cb51 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -496,13 +496,9 @@
     <string name="settings_app_info_link_title">應用程式資訊</string>
 
     <string name="settings_notification_privacy">通知隱私</string>
-    <string name="settings_notification_privacy_warning">Riot.im 將在後臺運行以保持通知訊息內容的私密。您可以更改此選項以減少電池使用量。</string>
     <string name="settings_notification_privacy_normal">標準</string>
-    <string name="settings_notification_privacy_power_saving">節電選項</string>
-    <string name="settings_notification_privacy_low_detail">簡單模式</string>
     <string name="settings_notification_privacy_reduced">低隱私模式</string>
     <string name="settings_notification_privacy_need_permission">應用程式需要權限以在後臺運行</string>
-    <string name="settings_notification_privacy_no_permission">此應用程式<b>不</b>需要權限在後臺運行</string>
     <string name="settings_notification_privacy_fcm">•通知將通過 GCM(Google Cloud Messaging) 發送</string>
     <string name="settings_notification_privacy_metadata">·通知僅包含中繼資料</string>
     <string name="settings_notification_privacy_secure_message_content">• 通知的消息內容<b>將從 Matrix 主服務器安全獲取</b></string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 026248be0e..c907f59316 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <!-- use to retrieve the supported languages list -->
     <!-- should the same value as the file name -->
 
@@ -690,14 +690,11 @@
     <string name="settings_troubleshoot_test_battery_failed">If a user leaves a device unplugged and stationary for a period of time, with the screen off, the device enters Doze mode. This prevents apps from accessing the network and defers their jobs, syncs, and standard alarms. </string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignore Optimization</string>
 
-    <string name="settings_notification_privacy_warning">Riot.im runs in the background to keep your notification message content private. You can change this option to reduce battery usage.</string>
     <string name="settings_notification_privacy_normal">Normal</string>
-    <string name="settings_notification_privacy_power_saving">Power-saving Options</string>
-    <string name="settings_notification_privacy_low_detail">Low detail notifications</string>
     <string name="settings_notification_privacy_reduced">Reduced privacy</string>
     <string name="settings_notification_privacy_need_permission">The app needs permission to run in the background</string>
-    <string name="settings_notification_privacy_no_permission">The apps does <b>not</b> need permission to run in the background</string>
-    <string name="settings_notification_privacy_fcm">• Notifications are sent via Google Cloud Messaging</string>
+    <string name="settings_notification_privacy_no_background_sync">The apps does <b>not</b> need to connect to the HomeServer in the background, it should reduce battery usage</string>
+    <string name="settings_notification_privacy_fcm">• Notifications are sent via Firebase Cloud Messaging</string>
     <string name="settings_notification_privacy_metadata">• Notifications only contain meta data</string>
     <string name="settings_notification_privacy_secure_message_content">• Message content of the notification is <b>located securely direct from the Matrix homeserver</b></string>
     <string name="settings_notification_privacy_nosecure_message_content">• Notifications contain <b>meta and message data</b></string>
@@ -1035,7 +1032,23 @@
         <item quantity="one">1 room</item>
         <item quantity="other">%d rooms</item>
     </plurals>
+
+    <plurals name="notification_compat_summary_line_for_room">
+        <item quantity="one">%1$s: 1 message</item>
+        <item quantity="other">%1$s: %2$d messages</item>
+    </plurals>
+    <plurals name="notification_compat_summary_title">
+        <item quantity="one">%d notification</item>
+        <item quantity="other">%d notifications</item>
+    </plurals>
+
     <string name="notification_unread_notified_messages_in_room">%1$s in %2$s"</string>
+    <string name="notification_unknown_new_event">New Event</string>
+    <string name="notification_unknown_room_name">Room</string>
+    <string name="notification_new_messages">New Messages</string>
+    <string name="notification_new_invitation">New Invitation</string>
+    <string name="notification_sender_me">Me</string>
+    <string name="notification_inline_reply_failed">** Failed to send - please open room</string>
 
     <!-- historical -->
     <string name="historical_placeholder">Search for historical</string>
diff --git a/matrix-sdk-android/src/main/res/values-ar/strings.xml b/matrix-sdk-android/src/main/res/values-ar/strings.xml
index e562007214..c15e644bc7 100644
--- a/matrix-sdk-android/src/main/res/values-ar/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-ar/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="matrix_sdk_app_name">عُدّة تطوير البرمجيات لِ‍«ماترِكس» على أندرويد</string>
+<resources>
 
     <string name="summary_user_sent_image">أرسل ⁨%1$s⁩ صورة.</string>
 
@@ -10,12 +10,12 @@
     <string name="notice_room_leave">غادر ⁨%1$s⁩</string>
     <string name="notice_room_reject">رفض ⁨%1$s⁩ الدعوة</string>
     <string name="notice_room_kick">طرد ⁨%1$s⁩ ⁨%2$s⁩</string>
-    <string name="notice_room_unban">رفع ⁨%1$s⁩ المنع عن ⁨%2$s⁩</string>
+    <string name="notice_room_unban">رفع ⁨%1$s⁩ الحظر عن ⁨%2$s⁩</string>
     <string name="notice_room_ban">منع ⁨%1$s⁩ ⁨%2$s⁩</string>
     <string name="notice_avatar_url_changed">غيّر ⁨%1$s⁩ صورته</string>
     <string name="notice_display_name_set">ضبط ⁨%1$s⁩ اسم العرض على ⁨%2$s⁩</string>
-    <string name="notice_display_name_changed_from">غيّر ⁨%1$s⁩ اسم العرض من ⁨%2$s⁩ إلى ⁨%3$s⁩</string>
-    <string name="notice_display_name_removed">أزال ⁨%1$s⁩ اسم العرض (⁨%2$s⁩)</string>
+    <string name="notice_display_name_changed_from">غيّر ⁨%1$s⁩ اسم الحساب المعروض من %2$s⁩ إلى %3$s⁩</string>
+    <string name="notice_display_name_removed">أزال ⁨%1$s⁩ اسم الحساب المعروض (⁨%2$s⁩)</string>
     <string name="notice_room_topic_changed">غيّر ⁨%1$s⁩ الموضوع إلى: ⁨%2$s⁩</string>
     <string name="notice_room_name_changed">غيّر ⁨%1$s⁩ اسم الغرفة إلى: ⁨%2$s⁩</string>
     <string name="notice_answered_call">ردّ ⁨%s⁩ على المكالمة.</string>
@@ -54,8 +54,8 @@
     <string name="medium_email">عنوان البريد الإلكتروني</string>
     <string name="medium_phone_number">رقم الهاتف</string>
 
-<string name="summary_message">‏‏⁨%1$s⁩: ‏⁨%2$s⁩</string>
-    <string name="notice_room_withdraw">انسحب ⁨%1$s⁩ من دعوة ⁨%2$s⁩</string>
+    <string name="summary_message">‏‏⁨%1$s⁩: ‏⁨%2$s⁩</string>
+    <string name="notice_room_withdraw">انسحب ⁨%1$s⁩ من الدعوة ⁨%2$s⁩</string>
     <string name="notice_placed_video_call">أجرى ⁨%s⁩ مكالمة مرئية.</string>
     <string name="notice_placed_voice_call">أجرى ⁨%s⁩ مكالمة صوتية.</string>
     <string name="notice_event_redacted">"هُذّبت ⁨%1$s⁩ "</string>
@@ -73,4 +73,19 @@
     <string name="reply_to_an_audio_file">أرسل ملف صوت.</string>
     <string name="reply_to_a_file">أرسل ملفًا.</string>
 
+    <string name="room_displayname_invite_from">دعوة من ⁨%s⁩</string>
+    <string name="room_displayname_empty_room">غرفة فارغة</string>
+
+    <string name="room_displayname_two_members">‏⁨%1$s⁩ و ⁨%2$s⁩</string>
+    <string name="room_displayname_room_invite">دعوة إلى غرفة</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="zero">صفر</item>
+        <item quantity="one">واحد</item>
+        <item quantity="two">اثنان</item>
+        <item quantity="few">قليل</item>
+        <item quantity="many">كثير</item>
+        <item quantity="other">اخرى</item>
+    </plurals>
+
 </resources>
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 c6a38c0dfc..a67c618473 100644
--- a/matrix-sdk-android/src/main/res/values-bg/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-bg/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="matrix_sdk_app_name">Matrix Android SDK</string>
+<resources>
 
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s изпрати снимка.</string>
@@ -39,9 +39,9 @@
     <string name="notice_avatar_changed_too">(профилната снимка също беше сменена)</string>
     <string name="notice_room_name_removed">%1$s премахна името на стаята</string>
     <string name="notice_room_topic_removed">%1$s премахна темата на стаята</string>
-    <string name="notice_event_redacted">"изтрито %1$s "</string>
-    <string name="notice_event_redacted_by">" от %1$s"</string>
-    <string name="notice_event_redacted_reason">" [причина: %1$s]"</string>
+    <string name="notice_event_redacted">премахнато %1$s</string>
+    <string name="notice_event_redacted_by">от %1$s</string>
+    <string name="notice_event_redacted_reason">[причина: %1$s]</string>
     <string name="notice_profile_change_redacted">%1$s обнови своя профил %2$s</string>
     <string name="notice_room_third_party_invite">%1$s изпрати покана на %2$s да се присъедини към стаята</string>
     <string name="notice_room_third_party_registered_invite">%1$s прие поканата за %2$s</string>
@@ -62,7 +62,7 @@
     <string name="medium_email">Имейл адрес</string>
     <string name="medium_phone_number">Телефонен номер</string>
 
-<string name="notice_crypto_error_unkwown_inbound_session_id">Устройството на подателя не изпрати ключовете за това съобщение.</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Устройството на подателя не изпрати ключовете за това съобщение.</string>
 
     <string name="summary_user_sent_sticker">%1$s изпрати стикер.</string>
 
@@ -73,4 +73,15 @@
     <string name="reply_to_an_audio_file">изпрати аудио файл.</string>
     <string name="reply_to_a_file">изпрати файл.</string>
 
+    <string name="room_displayname_invite_from">Покана от %s</string>
+    <string name="room_displayname_room_invite">Покана за стая</string>
+    <string name="room_displayname_two_members">%1$s и %2$s</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s и 1 друг</item>
+        <item quantity="other">%1$s и %2$d други</item>
+    </plurals>
+
+    <string name="room_displayname_empty_room">Празна стая</string>
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-bs/strings.xml b/matrix-sdk-android/src/main/res/values-bs/strings.xml
index a6b3daec93..6a6ee46d32 100644
--- a/matrix-sdk-android/src/main/res/values-bs/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-bs/strings.xml
@@ -1,2 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="room_displayname_invite_from">Pozovite iz %s</string>
+    <string name="room_displayname_room_invite">Poziv u Sobu</string>
+    <string name="room_displayname_two_members">%1$s i %2$s</string>
+    <string name="room_displayname_empty_room">Prazna soba</string>
+</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-ca/strings.xml b/matrix-sdk-android/src/main/res/values-ca/strings.xml
index 65ee606df7..4919f9f076 100644
--- a/matrix-sdk-android/src/main/res/values-ca/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-ca/strings.xml
@@ -1,20 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="summary_message">%1$s: %2$s</string>
+<resources>
+    <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s ha enviat una imatge.</string>
 
     <string name="notice_room_leave">%1s ha sortit</string>
     <string name="notice_room_join">%1s ha entrat</string>
     <string name="medium_phone_number">Número de telèfon</string>
 
-<string name="medium_email">Correu electrònic</string>
+    <string name="medium_email">Correu electrònic</string>
     <string name="encrypted_message">Missatge encriptat</string>
 
     <string name="notice_room_invite_no_invitee">la invitació de %s</string>
     <string name="notice_room_invite">%1$s ha convidat a %2$s</string>
-    <string name="notice_room_invite_you">%1$s vos ha convidat</string>
+    <string name="notice_room_invite_you">%1$s us ha convidat</string>
     <string name="notice_room_reject">%1$s ha rebutjat la invitació</string>
     <string name="notice_room_kick">%1$s ha fet fora a %2$s</string>
-    <string name="matrix_sdk_app_name">Android SDK de Matrix</string>
+
 
     <string name="notice_display_name_changed_from">%1$s ha canviat el seu nom visible de %2$s a %3$s</string>
     <string name="notice_display_name_removed">%1$s ha eliminat el seu nom visible (%2$s)</string>
@@ -33,7 +34,7 @@
     <string name="notice_room_withdraw">%1$s ha retirat la invitació de %2$s</string>
     <string name="notice_avatar_url_changed">%1$s ha canviat el seu avatar</string>
     <string name="notice_made_future_room_visibility">%1$s ha permès a %2$s veure l\'historial que es generi a partir d\'ara</string>
-    <string name="notice_room_visibility_joined">tots els membres de la sala des del punt en què hi entrin.</string>
+    <string name="notice_room_visibility_joined">tots els membres de la sala, des del punt en què hi entrin.</string>
     <string name="notice_room_visibility_world_readable">qualsevol.</string>
     <string name="notice_voip_started">S\'ha iniciat la conferència VoIP</string>
     <string name="notice_voip_finished">S\'ha finalitzat la conferència VoIP</string>
@@ -46,10 +47,10 @@
     <string name="notice_event_redacted_reason">" [raó: %1$s]"</string>
     <string name="notice_profile_change_redacted">%1$s ha actualitzat el seu perfil %2$s</string>
     <string name="notice_room_third_party_invite">%1$s ha enviat una invitació a l\'usuari %2$s per a entrar a la sala</string>
-    <string name="notice_room_third_party_registered_invite">%1$s ha acceptat la invitació de l\'usuari %2$s</string>
+    <string name="notice_room_third_party_registered_invite">%1$s ha acceptat la invitació per a %2$s</string>
 
     <string name="notice_crypto_unable_to_decrypt">** No s\'ha pogut desencriptar: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">El dispositiu del remitent no ha enviat les claus per aquest missatge.</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">El dispositiu del remitent no ens ha enviat les claus per aquest missatge.</string>
 
     <string name="could_not_redact">No s\'ha pogut redactar</string>
     <string name="unable_to_send_message">No s\'ha pogut enviar el missatge</string>
@@ -64,4 +65,25 @@
     <string name="notice_display_name_set">%1$s a canviat el seu nom visible a %2$s</string>
     <string name="notice_placed_video_call">%s ha iniciat una trucada de vídeo.</string>
     <string name="notice_placed_voice_call">%s ha iniciat una trucada de veu.</string>
-    </resources>
+
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Convidat per %s</string>
+    <string name="room_displayname_room_invite">Convideu a la sala</string>
+    <string name="room_displayname_two_members">%1$s i %2$s</string>
+    <string name="room_displayname_empty_room">Sala buida</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s i 1 altre</item>
+        <item quantity="other">%1$s i %2$d altres</item>
+    </plurals>
+
+
+    <string name="summary_user_sent_sticker">%1$s ha enviat un adhesiu.</string>
+
+    <string name="message_reply_to_prefix">En resposta a</string>
+
+    <string name="reply_to_an_image">ha enviat una imatge.</string>
+    <string name="reply_to_a_video">ha enviat un vídeo.</string>
+    <string name="reply_to_an_audio_file">ha enviat un fitxer d\'àudio.</string>
+    <string name="reply_to_a_file">ha enviat un fitxer.</string>
+
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-cs/strings.xml b/matrix-sdk-android/src/main/res/values-cs/strings.xml
index a6b3daec93..3c734eb342 100644
--- a/matrix-sdk-android/src/main/res/values-cs/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-cs/strings.xml
@@ -1,2 +1,88 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s poslal obrázek.</string>
+    <string name="summary_user_sent_sticker">%1$s poslal nálepku.</string>
+
+    <string name="notice_room_invite_no_invitee">Pozvánka od %s</string>
+    <string name="notice_room_invite">%1$s pozval %2$s</string>
+    <string name="notice_room_invite_you">%1$s Vás pozval</string>
+    <string name="notice_room_join">%1$s se připojil</string>
+    <string name="notice_room_leave">%1$s odešel</string>
+    <string name="notice_room_reject">%1$s odmítl pozvání</string>
+    <string name="notice_room_kick">%1$s vyhodil %2$s</string>
+    <string name="notice_room_unban">%1$s znovu povolil vstup %2$s</string>
+    <string name="notice_room_ban">%1$s zakázal vstup %2$s</string>
+    <string name="notice_room_withdraw">%1$s stáhnul pozvání pro %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s změnil svůj profilový obrázek</string>
+    <string name="notice_display_name_set">%1$s nastavil své zobrazované jméno na %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s změnil své zobrazované jméno z %2$s na %3$s</string>
+    <string name="notice_display_name_removed">%1$s odstranil své zobrazované jméno (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s změnil téma na: %2$s</string>
+    <string name="notice_room_name_changed">%1$s změnil název místnosti na: %2$s</string>
+    <string name="notice_placed_video_call">%s uskutečnil videohovor.</string>
+    <string name="notice_placed_voice_call">%s uskutečnil hlasový hovor.</string>
+    <string name="notice_answered_call">%s přijal hovor.</string>
+    <string name="notice_ended_call">%s ukončil hovor.</string>
+    <string name="notice_made_future_room_visibility">%1$s zviditelnil budoucí historii místnosti %2$s</string>
+    <string name="notice_room_visibility_invited">všem členům místnosti od doby kdy byli pozváni.</string>
+    <string name="notice_room_visibility_joined">všem členům místnosti od doby kdy se připojili.</string>
+    <string name="notice_room_visibility_shared">všem členům místnosti.</string>
+    <string name="notice_room_visibility_world_readable">komukoliv.</string>
+    <string name="notice_room_visibility_unknown">neznámým (%s).</string>
+    <string name="notice_end_to_end">%1$s zapnul E2E šifrování (%2$s)</string>
+
+    <string name="notice_requested_voip_conference">%1$s požádal o VoIP konferenci</string>
+    <string name="notice_voip_started">Začala VoIP konference</string>
+    <string name="notice_voip_finished">VoIP konference skončila</string>
+
+    <string name="notice_avatar_changed_too">(profilový obrázek byl také změněn)</string>
+    <string name="notice_room_name_removed">%1$s odstranil název místnosti</string>
+    <string name="notice_room_topic_removed">%1$s odstranil téma místnosti</string>
+    <string name="notice_event_redacted">"sloučeno %1$s "</string>
+    <string name="notice_event_redacted_by">" uživatelem %1$s"</string>
+    <string name="notice_event_redacted_reason">" [důvod: %1$s]"</string>
+    <string name="notice_profile_change_redacted">%1$s aktualizoval svůj profil %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s pozval %2$s aby se připojil do místnosti</string>
+    <string name="notice_room_third_party_registered_invite">%1$s přijal pozvání do %2$s</string>
+
+    <string name="notice_crypto_unable_to_decrypt">** Není možno dešifrovat: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Odesílatelovo zařízení nám neposlalo klíče pro tuto zprávu.</string>
+
+    <string name="message_reply_to_prefix">Odpověď na</string>
+
+    <string name="could_not_redact">Není možno sloučit</string>
+    <string name="unable_to_send_message">Není možné odeslat zprávu</string>
+
+    <string name="message_failed_to_upload">Nepodařilo se nahrát obrázek</string>
+
+    <string name="network_error">Chyba sítě</string>
+    <string name="matrix_error">Chyba v Matrixu</string>
+
+    <string name="room_error_join_failed_empty_room">V současnosti není možné se znovu připojit do prázdné místnosti.</string>
+
+    <string name="encrypted_message">Šifrovaná zpráva</string>
+
+    <string name="medium_email">E-mailová adresa</string>
+    <string name="medium_phone_number">Telefonní číslo</string>
+
+    <string name="reply_to_an_image">odeslal obrázek.</string>
+    <string name="reply_to_a_video">odeslal video.</string>
+    <string name="reply_to_an_audio_file">odeslal zvukový soubor.</string>
+    <string name="reply_to_a_file">odeslal soubor.</string>
+
+    <string name="room_displayname_invite_from">Pozvání od %s</string>
+    <string name="room_displayname_room_invite">Pozvání do místnosti</string>
+
+    <string name="room_displayname_two_members">%1$s a %2$s</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s a 1 další</item>
+        <item quantity="few">%1$s a %2$d další</item>
+        <item quantity="many">%1$s a %2$d dalších</item>
+        <item quantity="other" />
+    </plurals>
+
+    <string name="room_displayname_empty_room">Prázdná místnost</string>
+
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-da/strings.xml b/matrix-sdk-android/src/main/res/values-da/strings.xml
index 98e477394a..51f5f2902e 100644
--- a/matrix-sdk-android/src/main/res/values-da/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-da/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="matrix_sdk_app_name">Matrix Android SDK</string>
+<resources>
 
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s sendte et billede.</string>
@@ -64,4 +64,15 @@
     <string name="medium_email">mailadresse</string>
     <string name="medium_phone_number">Telefonnummer</string>
 
+    <string name="room_displayname_invite_from">Invitation fra %s</string>
+    <string name="room_displayname_room_invite">Invitation til rum</string>
+    <string name="room_displayname_two_members">%1$s og %2$s</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s og 1 anden</item>
+        <item quantity="other">%1$s og %2$d andre</item>
+    </plurals>
+
+    <string name="room_displayname_empty_room">Tomt rum</string>
+
 </resources>
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 27aaa30184..3fc3944669 100644
--- a/matrix-sdk-android/src/main/res/values-de/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-de/strings.xml
@@ -1,11 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <string name="matrix_sdk_app_name">Matrix-Android-SDK</string>
 
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s hat ein Bild gesendet.</string>
 
-    <string name="notice_room_invite_no_invitee">%s\'s Einladung</string>
+    <string name="notice_room_invite_no_invitee">Einladung von %s</string>
     <string name="notice_room_invite">%1$s hat %2$s eingeladen</string>
     <string name="notice_room_invite_you">%1$s hat dich eingeladen</string>
     <string name="notice_room_join">%1$s hat den Raum betreten</string>
@@ -75,13 +74,25 @@
     <string name="medium_email">E-Mail-Adresse</string>
     <string name="medium_phone_number">Telefonnummer</string>
 
-<string name="summary_user_sent_sticker">%1$s sandte einen Sticker.</string>
+    <string name="summary_user_sent_sticker">%1$s sandte einen Sticker.</string>
 
     <string name="message_reply_to_prefix">Als Antwort auf</string>
 
-    <string name="reply_to_an_image">sandte ein Bild.</string>
+    <string name="reply_to_an_image">hat ein Bild gesendet.</string>
     <string name="reply_to_a_video">sandte ein Video.</string>
-    <string name="reply_to_an_audio_file">sandte eine Audio-Datei.</string>
+    <string name="reply_to_an_audio_file">hat eine Audio-Datei gesendet.</string>
     <string name="reply_to_a_file">sandte eine Datei.</string>
 
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Einladung von %s</string>
+    <string name="room_displayname_room_invite">Raumeinladung</string>
+    <string name="room_displayname_two_members">%1$s und %2$s</string>
+    <string name="room_displayname_empty_room">Leerer Raum</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s und 1 andere(r)</item>
+        <item quantity="other">%1$s und %2$d andere</item>
+    </plurals>
+
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-el/strings.xml b/matrix-sdk-android/src/main/res/values-el/strings.xml
index 0cef845bdc..cf34d40453 100644
--- a/matrix-sdk-android/src/main/res/values-el/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-el/strings.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="medium_email">Ηλεκτρονική διεύθυνση</string>
+<resources>
+    <string name="medium_email">Ηλεκτρονική διεύθυνση</string>
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">Ο/Η %1$s έστειλε μια εικόνα.</string>
     <string name="summary_user_sent_sticker">Ο/Η %1$s έστειλε ένα αυτοκόλλητο.</string>
@@ -12,7 +13,7 @@
     <string name="notice_room_invite_no_invitee">Η πρόσκληση του/της %s</string>
     <string name="medium_phone_number">Αριθμός τηλεφώνου</string>
 
-<string name="notice_room_ban">Ο/Η %1$s απέκλεισε τον/την %2$s</string>
+    <string name="notice_room_ban">Ο/Η %1$s απέκλεισε τον/την %2$s</string>
     <string name="notice_room_withdraw">Ο/Η %1$s απέσυρε την πρόσκληση του/της %2$s</string>
     <string name="notice_avatar_url_changed">Ο/Η %1$s άλλαξε εικονίδιο χρήστη</string>
     <string name="notice_display_name_set">Ο/Η %1$s άλλαξε το εμφανιζόμενό του/της όνομα σε %2$s</string>
@@ -22,7 +23,6 @@
     <string name="notice_room_name_changed">Ο/Η %1$s άλλαξε το όνομα του δωματίου σε: %2$s</string>
     <string name="notice_answered_call">Ο/Η %s απάντησε στην κλήση.</string>
     <string name="notice_ended_call">Ο/Η %s τερμάτισε την κλήση.</string>
-    <string name="matrix_sdk_app_name">SDK για Android του Matrix</string>
 
     <string name="notice_placed_video_call">Ο/Η %s πραγματοποίησε μια κλήση βίντεο.</string>
     <string name="notice_placed_voice_call">Ο/Η %s πραγματοποίησε μια κλήση ήχου.</string>
@@ -57,4 +57,28 @@
     <string name="notice_voip_started">Η VoIP διάσκεψη ξεκίνησε</string>
     <string name="notice_voip_finished">Η VoIP διάσκεψη έληξε</string>
 
-    </resources>
+    <string name="notice_room_join">Ο/Η %1$s εισήλθε στο δωμάτιο</string>
+    <string name="reply_to_an_image">έστειλε μία εικόνα.</string>
+    <string name="reply_to_a_video">έστειλε ένα βίντεο.</string>
+    <string name="reply_to_an_audio_file">έστειλε ένα αρχείο ήχου.</string>
+    <string name="reply_to_a_file">έστειλε ένα αρχείο.</string>
+
+    <string name="room_displayname_invite_from">Πρόσκληση από %s</string>
+    <string name="room_displayname_room_invite">Πρόσκληση στο δωμάτιο</string>
+
+    <string name="room_displayname_two_members">%1$s και %2$s</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s και 1 ακόμα</item>
+        <item quantity="other">%1$s και %2$d ακόμα</item>
+    </plurals>
+
+    <string name="room_displayname_empty_room">Άδειο δωμάτιο</string>
+
+    <string name="notice_room_visibility_joined">όλα τα μέλη του δωματίου από την στιγμή που εισήλθαν.</string>
+    <string name="notice_end_to_end">Ο/Η %1$s ενεργοποίησε την κρυπτογράφηση απ\'άκρη σ\'άκρη (%2$s)</string>
+
+    <string name="notice_room_third_party_invite">Ο/Η %1$s έστειλε μία πρόσκληση στον/στην %2$s για να εισέλθει στο δωμάτιο</string>
+    <string name="room_error_join_failed_empty_room">Δεν είναι δυνατή ακόμα η επανείσοδος σε ένα άδειο δωμάτιο.</string>
+
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-eo/strings.xml b/matrix-sdk-android/src/main/res/values-eo/strings.xml
index 916ca209ad..a24f097336 100644
--- a/matrix-sdk-android/src/main/res/values-eo/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-eo/strings.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="summary_user_sent_image">%1$s sendis bildon.</string>
+<resources>
+    <string name="summary_user_sent_image">%1$s sendis bildon.</string>
     <string name="summary_user_sent_sticker">%1$s sendis glumarkon.</string>
 
     <string name="notice_room_invite_no_invitee">invito de %s</string>
@@ -13,4 +14,9 @@
     <string name="notice_room_ban">%1$s forbaris %2$s</string>
     <string name="notice_room_withdraw">%1$s malinvitis %2$s</string>
     <string name="notice_avatar_url_changed">%1$s ŝanĝis sian profilbildon</string>
+<string name="notice_crypto_unable_to_decrypt">** Ne eblas malĉifri: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">La aparato de la sendanto ne sendis al ni la ŝlosilojn por tiu mesaĝo.</string>
+
+    <string name="message_reply_to_prefix">Respondanta al</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 74734f89eb..8e0a909cc5 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
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <string name="matrix_sdk_app_name">Matrix Android SDK</string>
 
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s envió una imagen.</string>
@@ -15,17 +14,17 @@
     <string name="notice_room_unban">%1$s desprohibió a %2$s</string>
     <string name="notice_room_ban">%1$s prohibió %2$s</string>
     <string name="notice_room_withdraw">%1$s retiró la invitación de %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s cambio su foto de perfil</string>
+    <string name="notice_avatar_url_changed">%1$s cambió su foto de perfil</string>
     <string name="notice_display_name_set">%1$s estableció %2$s como su nombre visible</string>
     <string name="notice_display_name_changed_from">%1$s cambió su nombre visible de %2$s a %3$s</string>
-    <string name="notice_display_name_removed">%1$s retiró su nombre visible (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s cambio el tema a: %2$s</string>
+    <string name="notice_display_name_removed">%1$s eliminó su nombre visible (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s cambió el tema a: %2$s</string>
     <string name="notice_room_name_changed">%1$s cambió el nombre de la sala a: %2$s</string>
     <string name="notice_placed_video_call">%s comenzó una llamada de video.</string>
     <string name="notice_placed_voice_call">%s comenzó una llamada de voz.</string>
-    <string name="notice_answered_call">%s recibió la llmada.</string>
+    <string name="notice_answered_call">%s recibió la llamada.</string>
     <string name="notice_ended_call">%s terminó la llamada.</string>
-    <string name="notice_made_future_room_visibility">%1$s dejo que %2$s vea el historial del futuro</string>
+    <string name="notice_made_future_room_visibility">%1$s dejó que %2$s vea el historial del futuro</string>
     <string name="notice_room_visibility_invited">todos los miembros de la sala, desde su invitación.</string>
     <string name="notice_room_visibility_joined">todos los miembros de la sala, desde cuando entraron.</string>
     <string name="notice_room_visibility_shared">todos los miembros de la sala.</string>
@@ -38,14 +37,14 @@
     <string name="notice_voip_finished">conferencia VoIP finalizó</string>
 
     <string name="notice_avatar_changed_too">(foto de perfil también se cambió)</string>
-    <string name="notice_room_name_removed">%1$s retiró el nombre de la sala</string>
-    <string name="notice_room_topic_removed">%1$s retiro el tema de la sala</string>
+    <string name="notice_room_name_removed">%1$s eliminó el nombre de la sala</string>
+    <string name="notice_room_topic_removed">%1$s retiró el tema de la sala</string>
     <string name="notice_event_redacted">redactado %1$s </string>
     <string name="notice_event_redacted_by"> por %1$s</string>
     <string name="notice_event_redacted_reason">  [razón: %1$s]</string>
     <string name="notice_profile_change_redacted">%1$s actualizó su perfil %2$s</string>
     <string name="notice_room_third_party_invite">%1$s envió una invitación a %2$s para entrar a la sala</string>
-    <string name="notice_room_third_party_registered_invite">%1$s aceptó la invitacion de %2$s</string>
+    <string name="notice_room_third_party_registered_invite">%1$s aceptó la invitación de %2$s</string>
 
     <string name="notice_crypto_unable_to_decrypt">** No se puede descifrar: %s **</string>
     <string name="notice_crypto_error_unkwown_inbound_session_id">El dispositivo del remitente no nos ha enviado las claves de este mensaje.</string>
@@ -67,7 +66,7 @@
     <!-- call events -->
 
     <!-- room error messages -->
-    <string name="room_error_join_failed_empty_room">No es posible volver a entrar en una sala vacía.</string>
+    <string name="room_error_join_failed_empty_room">No es posible volver a unirse a una sala vacía.</string>
 
     <string name="encrypted_message">Mensaje cifrado</string>
 
@@ -75,13 +74,25 @@
     <string name="medium_email">Correo electrónico</string>
     <string name="medium_phone_number">Número telefónico</string>
 
-<string name="summary_user_sent_sticker">%1$s envió una pegatina.</string>
+    <string name="summary_user_sent_sticker">%1$s envió una calcomanía.</string>
 
     <string name="message_reply_to_prefix">En respuesta a</string>
 
     <string name="reply_to_an_image">envió una imagen.</string>
-    <string name="reply_to_a_video">envió un vídeo.</string>
+    <string name="reply_to_a_video">envió un video.</string>
     <string name="reply_to_an_audio_file">envió un archivo de audio.</string>
     <string name="reply_to_a_file">envió un archivo.</string>
 
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Invitación de %s</string>
+    <string name="room_displayname_room_invite">Invitación de Sala</string>
+    <string name="room_displayname_two_members">%1$s y %2$s</string>
+    <string name="room_displayname_empty_room">Sala vacía</string>
+
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s y otro</item>
+        <item quantity="other">%1$s y %2$d otros</item>
+    </plurals>
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-es/strings.xml b/matrix-sdk-android/src/main/res/values-es/strings.xml
index 255a2f4b1c..b6dc7c454b 100644
--- a/matrix-sdk-android/src/main/res/values-es/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-es/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <string name="matrix_sdk_app_name">SDK de Matrix Android</string>
 
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s envió una imagen.</string>
@@ -26,10 +25,10 @@
     <string name="notice_answered_call">%s contestó la llamada.</string>
     <string name="notice_ended_call">%s finalizó la llamada.</string>
     <string name="notice_made_future_room_visibility">%1$s hizo visible el historial futuro de la sala para %2$s</string>
-    <string name="notice_room_visibility_invited">todos los miembros de la sala, desde el momento en que son invitados.</string>
+    <string name="notice_room_visibility_invited">todos los miembros de la sala, desde su invitación.</string>
     <string name="notice_room_visibility_joined">todos los miembros de la sala, desde el momento en que se unieron.</string>
     <string name="notice_room_visibility_shared">todos los miembros de la sala.</string>
-    <string name="notice_room_visibility_world_readable">cualquier persona.</string>
+    <string name="notice_room_visibility_world_readable">todos.</string>
     <string name="notice_room_visibility_unknown">desconocido (%s).</string>
     <string name="notice_end_to_end">%1$s activó el cifrado de extremo a extremo (%2$s)</string>
 
@@ -84,4 +83,16 @@
     <string name="reply_to_an_audio_file">envió un archivo de audio.</string>
     <string name="reply_to_a_file">envió un archivo.</string>
 
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Invitación de %s</string>
+    <string name="room_displayname_room_invite">Invitación a Sala</string>
+    <string name="room_displayname_two_members">%1$s y %2$s</string>
+    <string name="room_displayname_empty_room">Sala vacía</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s y 1 otro</item>
+        <item quantity="other">%1$s y %2$d otros</item>
+    </plurals>
+
+
 </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 b0ed968774..5817201950 100644
--- a/matrix-sdk-android/src/main/res/values-eu/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-eu/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="matrix_sdk_app_name">Matrix Android SDK</string>
+<resources>
 
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s erabiltzaileak irudi bat bidali du.</string>
@@ -39,9 +39,9 @@
     <string name="notice_avatar_changed_too">(abatarra ere aldatu da)</string>
     <string name="notice_room_name_removed">%1$s erabiltzaileak gelaren izena kendu du</string>
     <string name="notice_room_topic_removed">%1$s erabiltzaileak gelaren mintzagaia kendu du</string>
-    <string name="notice_event_redacted">"kenduta %1$s "</string>
-    <string name="notice_event_redacted_by">" nork: %1$s"</string>
-    <string name="notice_event_redacted_reason">" [arrazoia: %1$s]"</string>
+    <string name="notice_event_redacted">%1$s kenduta</string>
+    <string name="notice_event_redacted_by">nork: %1$s</string>
+    <string name="notice_event_redacted_reason">[arrazoia: %1$s]</string>
     <string name="notice_profile_change_redacted">%1$s erabiltzaileak bere profila eguneratu du %2$s</string>
     <string name="notice_room_third_party_invite">%1$s erabiltzaileak gelara elkartzeko gonbidapen bat bidali dio %2$s erabiltzaileari</string>
     <string name="notice_room_third_party_registered_invite">%1$s erabiltzaileak %2$s gelarako gonbidapena onartu du</string>
@@ -56,7 +56,7 @@
 
     <string name="network_error">Sare errorea</string>
     <string name="matrix_error">Matrix errorea</string>
-    
+
     <string name="room_error_join_failed_empty_room">Ezin da oraingoz hutsik dagoen gela batetara berriro sartu.</string>
 
     <string name="encrypted_message">Zifratutako mezua</string>
@@ -64,7 +64,7 @@
     <string name="medium_email">E-mail helbidea</string>
     <string name="medium_phone_number">Telefono zenbakia</string>
 
-<string name="summary_user_sent_sticker">%1$s erabiltzaileak eranskailu bat bidali du.</string>
+    <string name="summary_user_sent_sticker">%1$s erabiltzaileak eranskailu bat bidali du.</string>
 
     <string name="message_reply_to_prefix">Honi erantzunez</string>
 
@@ -73,4 +73,15 @@
     <string name="reply_to_an_audio_file">audio fitxategi bat bidali du.</string>
     <string name="reply_to_a_file">fitxategi bat bidali du.</string>
 
+    <string name="room_displayname_invite_from">%s gelarako gonbidapena</string>
+    <string name="room_displayname_room_invite">Gela gonbidapena</string>
+    <string name="room_displayname_two_members">%1$s eta %2$s</string>
+    <string name="room_displayname_empty_room">Gela hutsa</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s eta beste bat</item>
+        <item quantity="other">%1$s eta beste %2$d</item>
+    </plurals>
+
+
 </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 44cf329ff0..c47c12d968 100644
--- a/matrix-sdk-android/src/main/res/values-fi/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-fi/strings.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="summary_user_sent_image">%1$s lähetti kuvan.</string>
+<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">%1$s kutsui %2$s</string>
@@ -27,7 +28,7 @@
     <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>
-    <string name="notice_end_to_end">%1$s kytki päälle päästä päähän-salauksen (%2$s)</string>
+    <string name="notice_end_to_end">%1$s otti käyttöön osapuolten välisen salauksen (%2$s)</string>
 
     <string name="notice_requested_voip_conference">%1$s lähetti VoIP konferenssi-pyynnön</string>
     <string name="notice_voip_started">VoIP konferenssi alkoi</string>
@@ -36,7 +37,7 @@
     <string name="notice_avatar_changed_too">(profiilikuva muuttui myös)</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_event_redacted_reason">" [syy: %1$s]"</string>
+    <string name="notice_event_redacted_reason">[syy: %1$s]</string>
     <string name="notice_profile_change_redacted">%1$s päivitti profiilinsa %2$s</string>
     <string name="notice_room_third_party_invite">%1$s lähetti liittymiskutsun käyttäjälle %2$s</string>
     <string name="notice_room_third_party_registered_invite">%1$s hyväksyi kutsun käyttäjän %2$s puolesta</string>
@@ -57,10 +58,31 @@
     <string name="medium_email">Sähköpostiosoite</string>
     <string name="medium_phone_number">Puhelinnumero</string>
 
-<string name="matrix_sdk_app_name">Matrix Android SDK</string>
 
-    <string name="notice_event_redacted_by">" käyttäjän %1$s toimesta"</string>
+    <string name="notice_event_redacted_by">käyttäjän %1$s toimesta</string>
     <string name="could_not_redact">Takaisinveto epäonnistui</string>
     <string name="summary_message">%1$s: %2$s</string>
-    <string name="notice_event_redacted">"veti takaisin %1$s "</string>
+    <string name="notice_event_redacted">veti takaisin %1$s</string>
+
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Kutsu käyttäjältä %s</string> <!-- Grammar problem -->
+    <string name="room_displayname_room_invite">Huonekutsu</string>
+    <string name="room_displayname_two_members">%1$s ja %2$s</string>
+    <string name="room_displayname_empty_room">Tyhjä huone</string>
+
+
+<string name="summary_user_sent_sticker">%1$s lähetti tarran.</string>
+
+    <string name="message_reply_to_prefix">Vastauksena käyttäjälle</string>
+
+    <string name="reply_to_an_image">lähetti kuvan.</string>
+    <string name="reply_to_a_video">lähetti videon.</string>
+    <string name="reply_to_an_audio_file">lähetti äänitiedoston.</string>
+    <string name="reply_to_a_file">lähetti tiedoston.</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+	<item quantity="one">%1$s ja yksi muu</item>
+	<item quantity="other">%1$s ja %2$d muuta</item>
+</plurals>
+
     </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 9a041fa539..9faee8634f 100644
--- a/matrix-sdk-android/src/main/res/values-fr/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-fr/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="matrix_sdk_app_name">SDK Matrix Android</string>
+<resources>
 
     <string name="summary_message">%1$s : %2$s</string>
     <string name="summary_user_sent_image">%1$s a envoyé une image.</string>
@@ -9,12 +9,12 @@
     <string name="notice_room_invite_you">%1$s vous a invité</string>
     <string name="notice_room_join">%1$s a rejoint la discussion</string>
     <string name="notice_room_leave">%1$s est parti</string>
-    <string name="notice_room_reject">%1$s a rejeté l\'invitation</string>
-    <string name="notice_room_kick">%1$s a exclu %2$s</string>
+    <string name="notice_room_reject">%1$s a rejeté l’invitation</string>
+    <string name="notice_room_kick">%1$s a expulsé %2$s</string>
     <string name="notice_room_unban">%1$s a révoqué le bannissement de %2$s</string>
     <string name="notice_room_ban">%1$s a banni %2$s</string>
-    <string name="notice_room_withdraw">%1$s a annulé l\'invitation de %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s a changé d\'avatar</string>
+    <string name="notice_room_withdraw">%1$s a annulé l’invitation de %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s a changé d’avatar</string>
     <string name="notice_display_name_set">%1$s a réglé son nom affiché en %2$s</string>
     <string name="notice_display_name_changed_from">%1$s a modifié son nom affiché %2$s en %3$s</string>
     <string name="notice_display_name_removed">%1$s a supprimé son nom affiché (%2$s)</string>
@@ -22,13 +22,13 @@
     <string name="notice_room_name_changed">%1$s a changé le nom du salon en : %2$s</string>
     <string name="notice_placed_video_call">%s a passé un appel vidéo.</string>
     <string name="notice_placed_voice_call">%s a passé un appel vocal.</string>
-    <string name="notice_answered_call">%s a répondu à l\'appel.</string>
+    <string name="notice_answered_call">%s a répondu à l’appel.</string>
     <string name="notice_ended_call">%s a raccroché.</string>
-    <string name="notice_made_future_room_visibility">%1$s a rendu l\'historique futur du salon visible pour %2$s</string>
-    <string name="notice_room_visibility_invited">tous les membres du salon, depuis qu\'ils ont été invités.</string>
-    <string name="notice_room_visibility_joined">tous les membres du salon, depuis qu\'ils l\'ont rejoint.</string>
+    <string name="notice_made_future_room_visibility">%1$s a rendu l’historique futur du salon visible pour %2$s</string>
+    <string name="notice_room_visibility_invited">tous les membres du salon, depuis qu’ils ont été invités.</string>
+    <string name="notice_room_visibility_joined">tous les membres du salon, depuis qu’ils l’ont rejoint.</string>
     <string name="notice_room_visibility_shared">tous les membres du salon.</string>
-    <string name="notice_room_visibility_world_readable">n\'importe qui.</string>
+    <string name="notice_room_visibility_world_readable">n’importe qui.</string>
     <string name="notice_room_visibility_unknown">inconnu (%s).</string>
     <string name="notice_end_to_end">%1$s a activé le chiffrement de bout en bout (%2$s)</string>
 
@@ -36,23 +36,23 @@
     <string name="notice_voip_started">Téléconférence VoIP démarrée</string>
     <string name="notice_voip_finished">Téléconférence VoIP terminée</string>
 
-    <string name="notice_avatar_changed_too">(l\'avatar a aussi changé)</string>
+    <string name="notice_avatar_changed_too">(l’avatar a aussi changé)</string>
     <string name="notice_room_name_removed">%1$s a supprimé le nom du salon</string>
     <string name="notice_room_topic_removed">%1$s a supprimé le sujet du salon</string>
     <string name="notice_event_redacted">"a effacé %1$s "</string>
-    <string name="notice_event_redacted_by">" de %1$s"</string>
-    <string name="notice_event_redacted_reason">" [motif : %1$s]"</string>
+    <string name="notice_event_redacted_by">de %1$s</string>
+    <string name="notice_event_redacted_reason">[motif : %1$s]</string>
     <string name="notice_profile_change_redacted">%1$s a mis à jour son profil %2$s</string>
     <string name="notice_room_third_party_invite">%1$s a envoyé une invitation à %2$s pour rejoindre le salon</string>
-    <string name="notice_room_third_party_registered_invite">%1$s a accepté l\'invitation pour %2$s</string>
+    <string name="notice_room_third_party_registered_invite">%1$s a accepté l’invitation pour %2$s</string>
 
     <string name="notice_crypto_unable_to_decrypt">** Déchiffrement impossible : %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">L\'appareil de l\'expéditeur ne nous a pas envoyé les clés pour ce message.</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">L’appareil de l’expéditeur ne nous a pas envoyé les clés pour ce message.</string>
 
     <string name="could_not_redact">Effacement impossible</string>
     <string name="unable_to_send_message">Envoi du message impossible</string>
 
-    <string name="message_failed_to_upload">L\'envoi de l\'image a échoué</string>
+    <string name="message_failed_to_upload">L’envoi de l’image a échoué</string>
 
     <string name="network_error">Erreur de réseau</string>
     <string name="matrix_error">Erreur de Matrix</string>
@@ -64,7 +64,7 @@
     <string name="medium_email">Adresse e-mail</string>
     <string name="medium_phone_number">Numéro de téléphone</string>
 
-<string name="summary_user_sent_sticker">%1$s a envoyé un sticker.</string>
+    <string name="summary_user_sent_sticker">%1$s a envoyé un sticker.</string>
 
     <string name="message_reply_to_prefix">En réponse à</string>
 
@@ -73,4 +73,15 @@
     <string name="reply_to_an_audio_file">a envoyé un fichier audio.</string>
     <string name="reply_to_a_file">a envoyé un fichier.</string>
 
+    <string name="room_displayname_invite_from">Invitation de %s</string>
+    <string name="room_displayname_room_invite">Invitation au salon</string>
+    <string name="room_displayname_empty_room">Salon vide</string>
+    <string name="room_displayname_two_members">%1$s et %2$s</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s et 1 autre</item>
+        <item quantity="other">%1$s et %2$d autres</item>
+    </plurals>
+
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-gl/strings.xml b/matrix-sdk-android/src/main/res/values-gl/strings.xml
index db4c1e8f02..8cdc413a12 100644
--- a/matrix-sdk-android/src/main/res/values-gl/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-gl/strings.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="medium_email">Enderezo de correo</string>
+<resources>
+    <string name="medium_email">Enderezo de correo</string>
     <string name="message_failed_to_upload">Fallo ao subir a páxina</string>
 
-    <string name="matrix_sdk_app_name">Matrix Android SDK</string>
 
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s enviou unha imaxe.</string>
@@ -67,9 +67,12 @@
 
     <string name="medium_phone_number">Número de teléfono</string>
 
-<string name="reply_to_an_image">Responder a</string>
+    <string name="reply_to_an_image">Responder a</string>
     <string name="reply_to_a_video">enviar un vídeo.</string>
     <string name="reply_to_an_audio_file">enviar un ficheiro de son.</string>
     <string name="reply_to_a_file">enviar un ficheiro.</string>
 
+    <string name="room_displayname_two_members">%1$s e %2$s</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 40548dbe90..09f73de920 100644
--- a/matrix-sdk-android/src/main/res/values-hu/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-hu/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="matrix_sdk_app_name">Matrix Android SDK</string>
-
+<resources>
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s küldött egy képet.</string>
 
@@ -40,8 +39,8 @@
     <string name="notice_room_name_removed">%1$s eltávolította a szoba nevét</string>
     <string name="notice_room_topic_removed">%1$s eltávolította a szoba témáját</string>
     <string name="notice_event_redacted">"szerkesztett %1$s "</string>
-    <string name="notice_event_redacted_by">" %1$s által"</string>
-    <string name="notice_event_redacted_reason">" [ok: %1$s]"</string>
+    <string name="notice_event_redacted_by">%1$s által</string>
+    <string name="notice_event_redacted_reason">[ok: %1$s]</string>
     <string name="notice_profile_change_redacted">%1$s megváltoztatták a profiljukat %2$s</string>
     <string name="notice_room_third_party_invite">"%1$s meghívót küldött %2$s -nak/-nek  hogy csatlakozzon a szobához"</string>
     <string name="notice_room_third_party_registered_invite">%1$s elfogadta a meghívót a %2$s -hoz</string>
@@ -64,7 +63,7 @@
     <string name="medium_email">Email cím</string>
     <string name="medium_phone_number">Telefonszám</string>
 
-<string name="summary_user_sent_sticker">%1$s küldött egy matricát.</string>
+    <string name="summary_user_sent_sticker">%1$s küldött egy matricát.</string>
 
     <string name="message_reply_to_prefix">Válasz erre:</string>
 
@@ -73,4 +72,15 @@
     <string name="reply_to_an_audio_file">hangfájl elküldve.</string>
     <string name="reply_to_a_file">fájl elküldve.</string>
 
+    <string name="room_displayname_invite_from">%s meghívott</string>
+    <string name="room_displayname_room_invite">Meghívó egy szobába</string>
+    <string name="room_displayname_two_members">%1$s és %2$s</string>
+    <string name="room_displayname_empty_room">Üres szoba</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s és 1 másik</item>
+        <item quantity="other">%1$s és %2$d másik</item>
+    </plurals>
+
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-id/strings.xml b/matrix-sdk-android/src/main/res/values-id/strings.xml
new file mode 100644
index 0000000000..157b23d401
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-id/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="room_displayname_invite_from">Undang dari %s</string>
+    <string name="room_displayname_room_invite">Undangan Ruang</string>
+    <string name="room_displayname_two_members">%1$s dan %2$s</string>
+
+    <string name="room_displayname_empty_room">Ruang kosong</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="other">%1$s dan %2$d yang lain</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-in/strings.xml b/matrix-sdk-android/src/main/res/values-in/strings.xml
new file mode 100644
index 0000000000..157b23d401
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-in/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="room_displayname_invite_from">Undang dari %s</string>
+    <string name="room_displayname_room_invite">Undangan Ruang</string>
+    <string name="room_displayname_two_members">%1$s dan %2$s</string>
+
+    <string name="room_displayname_empty_room">Ruang kosong</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="other">%1$s dan %2$d yang lain</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-is/strings.xml b/matrix-sdk-android/src/main/res/values-is/strings.xml
index 5c69d656a6..624ee67952 100644
--- a/matrix-sdk-android/src/main/res/values-is/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-is/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="matrix_sdk_app_name">Matrix Android SDK</string>
-
+<resources>
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s sendi mynd.</string>
     <string name="summary_user_sent_sticker">%1$s sendi límmerki.</string>
@@ -41,7 +40,7 @@
     <string name="medium_email">Tölvupóstfang</string>
     <string name="medium_phone_number">Símanúmer</string>
 
-<string name="notice_room_withdraw">%1$s tók til baka boð frá %2$s</string>
+    <string name="notice_room_withdraw">%1$s tók til baka boð frá %2$s</string>
     <string name="notice_display_name_set">%1$s setti birtingarnafn sitt sem %2$s</string>
     <string name="notice_display_name_changed_from">%1$s breytti birtingarnafni sínu úr %2$s í %3$s</string>
     <string name="notice_display_name_removed">%1$s fjarlægði birtingarnafn sitt (%2$s)</string>
@@ -67,4 +66,15 @@
     <string name="could_not_redact">Gat ekki ritstýrt</string>
     <string name="room_error_join_failed_empty_room">Ekki er í augnablikinu hægt að taka aftur þátt í spjallrás sem er tóm.</string>
 
-    </resources>
+    <string name="room_displayname_room_invite">Boð á spjallrás</string>
+    <string name="room_displayname_two_members">%1$s og %2$s</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s og 1 annar</item>
+        <item quantity="other">%1$s og %2$d aðrir</item>
+    </plurals>
+
+    <string name="room_displayname_empty_room">Tóm spjallrás</string>
+    <string name="room_displayname_invite_from">Boð frá %s</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 f0b04fd29b..c3186e03f0 100644
--- a/matrix-sdk-android/src/main/res/values-it/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-it/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="matrix_sdk_app_name">Matrix Android SDK</string>
-
+<resources>
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s ha inviato un\'immagine.</string>
 
@@ -39,8 +38,8 @@
     <string name="notice_avatar_changed_too">(anche l\'avatar è cambiato)</string>
     <string name="notice_room_name_removed">%1$s ha rimosso il nome della stanza</string>
     <string name="notice_room_topic_removed">%1$s ha rimosso l\'argomento della stanza</string>
-    <string name="notice_event_redacted_by">" da %1$s"</string>
-    <string name="notice_event_redacted_reason">" [motivo: %1$s]"</string>
+    <string name="notice_event_redacted_by">da %1$s</string>
+    <string name="notice_event_redacted_reason">[motivo: %1$s]</string>
     <string name="notice_profile_change_redacted">%1$s ha aggiornato il profilo %2$s</string>
     <string name="notice_room_third_party_invite">%1$s ha mandato un invito a %2$s per unirsi alla stanza</string>
     <string name="notice_room_third_party_registered_invite">%1$s ha accettato l\'invito per %2$s</string>
@@ -63,7 +62,7 @@
     <string name="medium_email">Indirizzo email</string>
     <string name="medium_phone_number">Numero di telefono</string>
 
-<string name="notice_event_redacted">"revisionato %1$s "</string>
+    <string name="notice_event_redacted">revisionato %1$s</string>
     <string name="summary_user_sent_sticker">%1$s ha inviato un adesivo.</string>
 
     <string name="message_reply_to_prefix">In risposta a</string>
@@ -73,4 +72,16 @@
     <string name="reply_to_an_audio_file">inviato un file audio.</string>
     <string name="reply_to_a_file">inviato un file.</string>
 
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Invito da %s</string>
+    <string name="room_displayname_room_invite">Invito nella stanza</string>
+    <string name="room_displayname_two_members">%1$s e %2$s</string>
+    <string name="room_displayname_empty_room">Stanza vuota</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s e 1 altro</item>
+        <item quantity="other">%1$s e %2$d altri</item>
+    </plurals>
+
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-ja/strings.xml b/matrix-sdk-android/src/main/res/values-ja/strings.xml
new file mode 100644
index 0000000000..79d5a626dc
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-ja/strings.xml
@@ -0,0 +1,84 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$sが画像を送信しました。</string>
+    <string name="summary_user_sent_sticker">%1$sがスタンプを送信しました。</string>
+
+    <string name="notice_room_invite_no_invitee">%sの招待</string>
+    <string name="notice_room_invite">%1$sが%2$sを招待しました</string>
+    <string name="notice_room_invite_you">%1$sがあなたを招待しました</string>
+    <string name="notice_room_join">%1$sが参加しました</string>
+    <string name="notice_room_leave">%1$sが退出しました</string>
+    <string name="notice_room_reject">%1$sが招待を断りました</string>
+    <string name="notice_room_kick">%1$sが%2$sを追放しました</string>
+    <string name="notice_room_unban">%1$sが%2$sをブロック解除しました</string>
+    <string name="notice_room_ban">%1$sが%2$sをブロックしました</string>
+    <string name="notice_room_withdraw">%1$sが%2$sの招待を撤回しました</string>
+    <string name="notice_avatar_url_changed">%1$sがアバターを変更しました</string>
+    <string name="notice_display_name_set">%1$sが表示名を%2$sに設定しました</string>
+    <string name="notice_display_name_changed_from">%1$sが表示名を%2$sから%3$sに変更しました</string>
+    <string name="notice_display_name_removed">%1$sが表示名 (%2$s) を削除しました</string>
+    <string name="notice_room_topic_changed">%1$sがテーマを%2$sに変更しました</string>
+    <string name="notice_room_name_changed">%1$sが部屋名を%2$sに変更しました</string>
+    <string name="notice_placed_video_call">%sがビデオ通話を開始しました。</string>
+    <string name="notice_placed_voice_call">%sが音声通話を開始しました。</string>
+    <string name="notice_answered_call">%sが電話に出ました。</string>
+    <string name="notice_ended_call">%sが通話を終了しました。</string>
+    <string name="room_displayname_invite_from">%sさんからの招待</string>
+    <string name="room_displayname_room_invite">部屋への招待</string>
+    <string name="room_displayname_two_members">%1$sと%2$s</string>
+    <string name="room_displayname_empty_room">空の部屋</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="other">%1$sと他%2$d名</item>
+    </plurals>
+
+    <string name="notice_made_future_room_visibility">%1$sは、今後の部屋履歴を%2$sに表示させました</string>
+    <string name="notice_room_visibility_invited">部屋のメンバー全員、招待された時点から。</string>
+    <string name="notice_room_visibility_joined">部屋のメンバー全員、参加した時点から。</string>
+    <string name="notice_room_visibility_shared">部屋のメンバー全員。</string>
+    <string name="notice_room_visibility_world_readable">誰でも。</string>
+    <string name="notice_room_visibility_unknown">不明 (%s)。</string>
+    <string name="notice_end_to_end">%1$sはエンドツーエンドの暗号化を有効にしました (%2$s)</string>
+
+    <string name="notice_requested_voip_conference">%1$s がVoIP会議をリクエストしました</string>
+    <string name="notice_voip_started">VoIP会議が開始されました</string>
+    <string name="notice_voip_finished">VoIP会議が終了しました</string>
+
+    <string name="notice_avatar_changed_too">(アバターも変更された)</string>
+    <string name="notice_room_name_removed">%1$s が部屋名を削除しました</string>
+    <string name="notice_room_topic_removed">%1$s がルームトピックを削除しました</string>
+    <string name="notice_event_redacted">"編集した %1$s "</string>
+    <string name="notice_event_redacted_by">" %1$s により"</string>
+    <string name="notice_event_redacted_reason">" [理由: %1$s]"</string>
+    <string name="notice_profile_change_redacted">%1$s がプロフィール %2$s を更新しました</string>
+    <string name="notice_room_third_party_invite">%1$s は %2$s に部屋に参加するよう招待状を送りました</string>
+    <string name="notice_room_third_party_registered_invite">%1$sは%2$sの招待を受け入れました</string>
+
+    <string name="notice_crypto_unable_to_decrypt">** 解読できません: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">送信者の端末からこのメッセージのキーが送信されていません。</string>
+
+    <string name="message_reply_to_prefix">に返信</string>
+
+    <string name="could_not_redact">修正できませんでした</string>
+    <string name="unable_to_send_message">メッセージを送信できません</string>
+
+    <string name="message_failed_to_upload">画像のアップロードに失敗しました</string>
+
+    <string name="network_error">ネットワークエラー</string>
+    <string name="matrix_error">Matrixエラー</string>
+
+    <string name="room_error_join_failed_empty_room">現在空の部屋に再参加することはできません。</string>
+
+    <string name="encrypted_message">暗号化されたメッセージ</string>
+
+    <string name="medium_email">メールアドレス</string>
+    <string name="medium_phone_number">電話番号</string>
+
+    <string name="reply_to_an_image">画像を送信しました。</string>
+    <string name="reply_to_a_video">動画を送りました。</string>
+    <string name="reply_to_an_audio_file">音声ファイルを送信しました。</string>
+    <string name="reply_to_a_file">ファイルを送信しました。</string>
+
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-ko/strings.xml b/matrix-sdk-android/src/main/res/values-ko/strings.xml
new file mode 100644
index 0000000000..ede965c176
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-ko/strings.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="notice_room_invite_no_invitee">%s\'의 초대</string>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-lv/strings.xml b/matrix-sdk-android/src/main/res/values-lv/strings.xml
index 72757e4985..921bbfb110 100644
--- a/matrix-sdk-android/src/main/res/values-lv/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-lv/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="matrix_sdk_app_name">Matrix Android SDK</string>
-
+<resources>
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s nosūtīja attēlu.</string>
 
@@ -64,4 +63,16 @@
     <string name="medium_email">Epasta adrese</string>
     <string name="medium_phone_number">Telefona numurs</string>
 
+    <string name="room_displayname_invite_from">Uzaicinājums no %s</string>
+    <string name="room_displayname_room_invite">Uzaicinājums uz istabu</string>
+    <string name="room_displayname_two_members">%1$s un %2$s</string>
+    <string name="room_displayname_empty_room">Tukša istaba</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="zero">%1$s un 1 cits</item>
+        <item quantity="one">%1$s un %2$d citi</item>
+        <item quantity="other">%1$s un %2$d citu</item>
+    </plurals>
+
+
 </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 6f43817623..ac8da6887d 100644
--- a/matrix-sdk-android/src/main/res/values-nl/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-nl/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <string name="matrix_sdk_app_name">Matrix Android SDK</string>
 
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s stuurde een afbeelding.</string>
@@ -73,7 +72,7 @@
     <string name="medium_email">E-mailadres</string>
     <string name="medium_phone_number">Telefoonnummer</string>
 
-<string name="summary_user_sent_sticker">%1$s heeft een sticker gestuurd.</string>
+    <string name="summary_user_sent_sticker">%1$s heeft een sticker gestuurd.</string>
 
     <string name="message_reply_to_prefix">Als antwoord op</string>
 
@@ -82,4 +81,16 @@
     <string name="reply_to_an_audio_file">verstuurde een audiobestand.</string>
     <string name="reply_to_a_file">verstuurde een bestand.</string>
 
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Uitnodiging van %s</string>
+    <string name="room_displayname_room_invite">Ruimte uitnodiging</string>
+    <string name="room_displayname_two_members">%1$s en %2$s</string>
+    <string name="room_displayname_empty_room">Lege ruimte</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s en 1 andere</item>
+        <item quantity="other">%1$s en %2$d anderen</item>
+    </plurals>
+
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-nn/strings.xml b/matrix-sdk-android/src/main/res/values-nn/strings.xml
index 19845ddfe6..9833b68f9c 100644
--- a/matrix-sdk-android/src/main/res/values-nn/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-nn/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="encrypted_message">Kryptert melding</string>
+<resources>
+    <string name="encrypted_message">Kryptert melding</string>
 
-    <string name="matrix_sdk_app_name">Matrix-Android-SDK</string>
 
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s sende eit bilete.</string>
@@ -72,4 +72,15 @@
     <string name="reply_to_an_audio_file">sende ein ljodfil.</string>
     <string name="reply_to_a_file">sende ei fil.</string>
 
+    <string name="room_displayname_invite_from">Byd inn frå %s</string>
+    <string name="room_displayname_room_invite">Rominnbyding</string>
+    <string name="room_displayname_two_members">%1$s og %2$s</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s og 1 til</item>
+        <item quantity="other">%1$s og %2$d til</item>
+    </plurals>
+
+    <string name="room_displayname_empty_room">Tomt rom</string>
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-pl/strings.xml b/matrix-sdk-android/src/main/res/values-pl/strings.xml
index 27821c7f4b..7cc0dd2c00 100644
--- a/matrix-sdk-android/src/main/res/values-pl/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-pl/strings.xml
@@ -1,23 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="matrix_sdk_app_name">Matrix Android SDK</string>
-
+<resources>
     <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s wysłał zdjęcie.</string>
+    <string name="summary_user_sent_image">%1$s wysłał(a) zdjęcie.</string>
 
     <string name="notice_room_invite_no_invitee">Zaproszenie od %s</string>
-    <string name="notice_room_invite">%1$s zaprosił %2$s</string>
-    <string name="notice_room_invite_you">%1$s zaprosił Cię</string>
-    <string name="notice_room_join">%1$s dołączył</string>
-    <string name="notice_room_leave">%1$s wyszedł</string>
-    <string name="notice_room_reject">%1$s odrzucił zaproszenie</string>
-    <string name="notice_room_kick">%1$s wyrzucił %2$s</string>
-    <string name="notice_room_unban">%1$s odblokował %2$s</string>
-    <string name="notice_room_ban">%1$s zablokował %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s zmienił awatar</string>
-    <string name="notice_display_name_set">%1$s zmienił wyświetlaną nazwę na %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s zmienił wyświetlaną nazwę z %2$s na %3$s</string>
-    <string name="notice_display_name_removed">%1$s usunął swoją wyświetlaną nazwę (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s zmienił temat na: %2$s</string>
+    <string name="notice_room_invite">%1$s zaprosił(a) %2$s</string>
+    <string name="notice_room_invite_you">%1$s zaprosił(a) Cię</string>
+    <string name="notice_room_join">%1$s dołączył(a)</string>
+    <string name="notice_room_leave">%1$s wyszedł(-ła)</string>
+    <string name="notice_room_reject">%1$s odrzucił(a) zaproszenie</string>
+    <string name="notice_room_kick">%1$s wyrzucił(a) %2$s</string>
+    <string name="notice_room_unban">%1$s odblokował(a) %2$s</string>
+    <string name="notice_room_ban">%1$s zablokował(a) %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s zmienił(a) awatar</string>
+    <string name="notice_display_name_set">%1$s zmienił(a) wyświetlaną nazwę na %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s zmienił(a) wyświetlaną nazwę z %2$s na %3$s</string>
+    <string name="notice_display_name_removed">%1$s usunął(-ęła) swoją wyświetlaną nazwę (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s zmienił(a) temat na: %2$s</string>
     <string name="unable_to_send_message">Nie udało się wysłać wiadomości</string>
 
     <string name="message_failed_to_upload">Nie udało się wysłać zdjęcia</string>
@@ -30,15 +29,59 @@
     <string name="medium_email">Adres e-mail</string>
     <string name="medium_phone_number">Numer telefonu</string>
 
-<string name="notice_room_visibility_shared">wszyscy członkowie pokoju.</string>
+    <string name="notice_room_visibility_shared">wszyscy członkowie pokoju.</string>
     <string name="notice_room_visibility_world_readable">wszyscy.</string>
-    <string name="notice_room_name_changed">%1$s zmienił znawę pokoju na: %2$s</string>
-    <string name="notice_ended_call">%s zakończył rozmowę.</string>
-    <string name="notice_room_name_removed">%1$s usunął nazwę pokoju</string>
-    <string name="notice_room_topic_removed">%1$s usunął temat pokoju</string>
+    <string name="notice_room_name_changed">%1$s zmienił(a) znawę pokoju na: %2$s</string>
+    <string name="notice_ended_call">%s zakończył(a) rozmowę.</string>
+    <string name="notice_room_name_removed">%1$s usunął(-ęła) nazwę pokoju</string>
+    <string name="notice_room_topic_removed">%1$s usunął(-ęła) temat pokoju</string>
     <string name="notice_event_redacted_reason">" [powód: %1$s]"</string>
-    <string name="summary_user_sent_sticker">%1$s wysłał naklejkę.</string>
+    <string name="summary_user_sent_sticker">%1$s wysłał(a) naklejkę.</string>
 
-    <string name="notice_end_to_end">%1$s włączył szyfrowanie end-to-end (%2$s)</string>
+    <string name="notice_end_to_end">%1$s włączył(a) szyfrowanie end-to-end (%2$s)</string>
 
-    </resources>
+    <string name="notice_room_withdraw">%1$s wycofał(a) zaproszenie %2$s</string>
+    <string name="notice_answered_call">%s odebrał(a) połączenie.</string>
+    <string name="notice_avatar_changed_too">(awatar też został zmieniony)</string>
+    <string name="message_reply_to_prefix">W odpowiedzi do</string>
+
+    <string name="room_displayname_invite_from">Zaproszenie od %s</string>
+    <string name="room_displayname_room_invite">Zaproszenie do pokoju</string>
+    <string name="room_displayname_two_members">%1$s i %2$s</string>
+    <string name="room_displayname_empty_room">Pusty pokój</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s i jeden inny</item>
+        <item quantity="few">%1$s i kilku innych</item>
+        <item quantity="many">%1$s i %2$d innych</item>
+        <item quantity="other" />
+    </plurals>
+
+    <string name="notice_crypto_unable_to_decrypt">** Nie można odszyfrować: %s **</string>
+    <string name="notice_placed_video_call">%s umieścił wideo rozmowe.</string>
+    <string name="notice_placed_voice_call">%s umieścił połączenie głosowe.</string>
+    <string name="notice_made_future_room_visibility">%1$s uczynił historię pokoju widoczną do %2$s</string>
+    <string name="notice_room_visibility_invited">wszyscy członkowie pokoju, od momentu w którym zostali zaproszeni.</string>
+    <string name="notice_room_visibility_joined">wszyscy członkowie pokoju, od momentu w którym dołączyli.</string>
+    <string name="notice_room_visibility_unknown">nieznane (%s).</string>
+    <string name="notice_requested_voip_conference">%1$s zażądał(a) grupowego połączenia VoIP</string>
+    <string name="notice_voip_started">Rozpoczęto grupowe połączenie głosowe VoIP</string>
+    <string name="notice_voip_finished">Zakończono grupowe połączenie głosowe VoIP</string>
+
+    <string name="notice_event_redacted">"zredagowane %1$s… "</string>
+    <string name="notice_event_redacted_by">" przez %1$s"</string>
+    <string name="notice_profile_change_redacted">%1$s zaktualizował swój profil %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s wysłał(a) zaproszenie do %2$s aby dołączył(a) do tego pokoju</string>
+    <string name="notice_room_third_party_registered_invite">%1$s zaakceptował(a) zaproszenie dla %2$s</string>
+
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Urządzenie nadawcy nie wysłało nam kluczy do tej wiadomości.</string>
+
+    <string name="could_not_redact">Nie można zredagować</string>
+    <string name="room_error_join_failed_empty_room">Obecnie nie jest możliwe ponowne dołączenie do pustego pokoju.</string>
+
+    <string name="reply_to_an_image">wyślij zdjęcie.</string>
+    <string name="reply_to_a_video">wyślij wideo.</string>
+    <string name="reply_to_an_audio_file">wyślij plik audio.</string>
+    <string name="reply_to_a_file">wyślij plik.</string>
+
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml b/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml
index 0feff860a0..d9cdc31634 100644
--- a/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <string name="matrix_sdk_app_name">Matrix Android SDK</string>
 
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s enviou uma imagem.</string>
@@ -74,9 +73,9 @@
     <!-- medium friendly name -->
     <string name="medium_email">Endereço de email</string>
     <string name="medium_phone_number">Número de telefone</string>
-    
-    
-<string name="summary_user_sent_sticker">%1$s enviou um sticker.</string>
+
+
+    <string name="summary_user_sent_sticker">%1$s enviou um sticker.</string>
 
     <string name="message_reply_to_prefix">Em resposta a</string>
 
@@ -85,4 +84,16 @@
     <string name="reply_to_an_audio_file">enviou um arquivo de áudio.</string>
     <string name="reply_to_a_file">enviou um arquivo.</string>
 
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Convite de %s</string>
+    <string name="room_displayname_room_invite">Convite para sala</string>
+    <string name="room_displayname_two_members">%1$s e %2$s</string>
+    <string name="room_displayname_empty_room">Sala vazia</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s e 1 outra/o</item>
+        <item quantity="other">%1$s e %2$d outras/os</item>
+    </plurals>
+
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-pt/strings.xml b/matrix-sdk-android/src/main/res/values-pt/strings.xml
index 1fc2d17d9b..340751c28e 100644
--- a/matrix-sdk-android/src/main/res/values-pt/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-pt/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <string name="matrix_sdk_app_name">Matrix Android SDK</string>
 
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s enviou uma imagem.</string>
@@ -74,6 +73,12 @@
     <!-- medium friendly name -->
     <string name="medium_email">Endereço de e-mail</string>
     <string name="medium_phone_number">Número de telefone</string>
-    
-    
+
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Convite de %s</string>
+    <string name="room_displayname_room_invite">Convite para sala</string>
+    <string name="room_displayname_two_members">%1$s e %2$s</string>
+    <string name="room_displayname_empty_room">Sala vazia</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 24ba2fc1bf..216c7b7ee2 100644
--- a/matrix-sdk-android/src/main/res/values-ru/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-ru/strings.xml
@@ -1,10 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <string name="matrix_sdk_app_name">Matrix Android SDK</string>
 
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s отправил(а) изображение.</string>
-    
+
     <string name="notice_room_invite_no_invitee">%s приглашение</string>
     <string name="notice_room_invite">%1$s пригласил(а) %2$s</string>
     <string name="notice_room_invite_you">%1$s пригласил(а) вас</string>
@@ -32,11 +31,11 @@
     <string name="notice_room_visibility_world_readable">всем.</string>
     <string name="notice_room_visibility_unknown">неизвестно (%s).</string>
     <string name="notice_end_to_end">%1$s включил(а) сквозное шифрование (%2$s)</string>
-    
+
     <string name="notice_requested_voip_conference">%1$s запросил(а) VoIP конференцию</string>
     <string name="notice_voip_started">VoIP-конференция начата</string>
     <string name="notice_voip_finished">VoIP-конференция завершена</string>
-    
+
     <string name="notice_avatar_changed_too">(аватар также был изменен)</string>
     <string name="notice_room_name_removed">%1$s удалил(а) название комнаты</string>
     <string name="notice_room_topic_removed">%1$s удалил(а) тему комнаты</string>
@@ -46,16 +45,16 @@
     <string name="notice_profile_change_redacted">%1$s обновил(а) свой профиль %2$s</string>
     <string name="notice_room_third_party_invite">%1$s отправил(а) приглашение %2$s присоединиться к комнате</string>
     <string name="notice_room_third_party_registered_invite">%1$s принял(а) приглашение от %2$s</string>
-    
+
     <string name="notice_crypto_unable_to_decrypt">** Невозможно расшифровать: %s **</string>
     <string name="notice_crypto_error_unkwown_inbound_session_id">Устройство отправителя не предоставило нам ключ для расшифровки этого сообщения.</string>
-    
+
     <!-- Room Screen -->
     <string name="could_not_redact">Не удалось изменить</string>
     <string name="unable_to_send_message">Не удалось отправить сообщение</string>
 
     <string name="message_failed_to_upload">Не удалось загрузить изображение</string>
-    
+
     <!-- general errors -->
     <string name="network_error">Сетевая ошибка</string>
     <string name="matrix_error">Ошибка Matrix</string>
@@ -68,9 +67,9 @@
 
     <!-- room error messages -->
     <string name="room_error_join_failed_empty_room">В настоящее время невозможно вновь присоединиться к пустой комнате.</string>
-    
+
     <string name="encrypted_message">Зашифрованное сообщение</string>
-    
+
     <!-- medium friendly name -->
     <string name="medium_email">Адрес электронной почты</string>
     <string name="medium_phone_number">Номер телефона</string>
@@ -84,4 +83,18 @@
     <string name="reply_to_an_audio_file">отправил аудиофайл.</string>
     <string name="reply_to_a_file">отправил файл.</string>
 
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Приглашение от %s</string>
+    <string name="room_displayname_room_invite">Приглашение в комнату</string>
+    <string name="room_displayname_two_members">%1$s и %2$s</string>
+    <string name="room_displayname_empty_room">Пустая комната</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s и 1 другой</item>
+        <item quantity="few">%1$s и %2$d другие</item>
+        <item quantity="many">%1$s и %2$d других</item>
+        <item quantity="other" />
+    </plurals>
+
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-sk/strings.xml b/matrix-sdk-android/src/main/res/values-sk/strings.xml
index 60caf5c354..c1dbf873c0 100644
--- a/matrix-sdk-android/src/main/res/values-sk/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-sk/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="matrix_sdk_app_name">Matrix Android SDK</string>
-
+<resources>
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s poslal obrázok.</string>
 
@@ -64,7 +63,7 @@
     <string name="medium_email">Emailová adresa</string>
     <string name="medium_phone_number">Telefónne číslo</string>
 
-<string name="summary_user_sent_sticker">%1$s poslal nálepku.</string>
+    <string name="summary_user_sent_sticker">%1$s poslal nálepku.</string>
 
     <string name="message_reply_to_prefix">Odpoveď na</string>
 
@@ -73,4 +72,17 @@
     <string name="reply_to_an_audio_file">odoslal zvukový súbor.</string>
     <string name="reply_to_a_file">Odoslal súbor.</string>
 
+    <string name="room_displayname_invite_from">Pozvanie od %s</string>
+    <string name="room_displayname_room_invite">Pozvanie do miestnosti</string>
+    <string name="room_displayname_two_members">%1$s a %2$s</string>
+    <string name="room_displayname_empty_room">Prázdna miestnosť</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s a 1 ďalší</item>
+        <item quantity="few">%1$s a %2$d ďalší</item>
+        <item quantity="many">%1$s a %2$d ďalších</item>
+        <item quantity="other" />
+    </plurals>
+
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-sq/strings.xml b/matrix-sdk-android/src/main/res/values-sq/strings.xml
index a6b3daec93..77d31a4390 100644
--- a/matrix-sdk-android/src/main/res/values-sq/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-sq/strings.xml
@@ -1,2 +1,86 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s dërgoi një figurë.</string>
+    <string name="notice_room_invite">%1$s ftoi %2$s</string>
+    <string name="notice_room_invite_you">%1$s ju ftoi</string>
+    <string name="notice_room_join">%1$s u bë pjesë</string>
+    <string name="notice_room_leave">%1$s iku</string>
+    <string name="notice_room_reject">%1$s hodhi tej ftesën</string>
+    <string name="notice_room_kick">%1$s përzuri %2$s</string>
+    <string name="notice_room_ban">%1$s dëboi %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s ndryshoi avatarin e vet</string>
+    <string name="notice_room_topic_changed">%1$s ndryshoi temën në: %2$s</string>
+    <string name="notice_room_name_changed">%1$s ndryshoi emrin e dhomës në: %2$s</string>
+    <string name="notice_placed_video_call">%s bëri një thirrje video.</string>
+    <string name="notice_placed_voice_call">%s bëri një thirrje zanore.</string>
+    <string name="notice_answered_call">%s iu përgjigj thirrjes.</string>
+    <string name="notice_ended_call">%s e përfundoi thirrjen.</string>
+    <string name="notice_made_future_room_visibility">%1$s e bëri historikun e ardhshëm të dhomës të dukshëm për %2$s</string>
+    <string name="notice_room_visibility_invited">për krejt anëtarët e dhomës, prej çastit kur janë ftuar.</string>
+    <string name="notice_room_visibility_joined">për krejt anëtarët e dhomës, prej çastit kur morën pjesë.</string>
+    <string name="notice_room_visibility_shared">krejt anëtarët e dhomës.</string>
+    <string name="notice_room_visibility_world_readable">cilido.</string>
+    <string name="notice_room_visibility_unknown">e panjohur (%s).</string>
+    <string name="notice_requested_voip_conference">%1$s kërkoi një konferencë VoIP</string>
+    <string name="notice_voip_started">Konferenca VoIP filloi</string>
+    <string name="notice_voip_finished">Konferenca VoIP përfundoi</string>
+
+    <string name="notice_avatar_changed_too">(u ndryshua edhe avatari)</string>
+    <string name="notice_room_name_removed">%1$s hoqi emrin e dhomës</string>
+    <string name="notice_event_redacted_by">" nga %1$s"</string>
+    <string name="notice_event_redacted_reason">" [arsye: %1$s]"</string>
+    <string name="notice_profile_change_redacted">%1$s përditësoi profilin e tij %2$s</string>
+    <string name="notice_room_third_party_registered_invite">%1$s pranoi ftesën tuaj për %2$s</string>
+
+    <string name="notice_crypto_unable_to_decrypt">** S’arrihet të shfshehtëzohet: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Pajisja e dërguesit nuk na ka dërguar kyçet për këtë mesazh.</string>
+
+    <string name="message_reply_to_prefix">Në përgjigje të</string>
+
+    <string name="could_not_redact">S’u redaktua dot</string>
+    <string name="unable_to_send_message">S’arrihet të dërgohet mesazh</string>
+
+    <string name="message_failed_to_upload">S’u arrit të ngarkohej figurë</string>
+
+    <string name="network_error">Gabim rrjeti</string>
+    <string name="matrix_error">Gabim Matrix</string>
+
+    <string name="room_error_join_failed_empty_room">Hëpërhë s’është e mundur të rihyhet në një dhomë të zbrazët.</string>
+
+    <string name="encrypted_message">U fshehtëzua mesazhi</string>
+
+    <string name="medium_email">Adresë email</string>
+    <string name="medium_phone_number">Numër telefoni</string>
+
+    <string name="reply_to_an_image">dërgoi një figurë.</string>
+    <string name="reply_to_a_video">dërgoi një video.</string>
+    <string name="reply_to_an_audio_file">dërgoi një kartelë audio.</string>
+    <string name="reply_to_a_file">dërgoi një kartelë.</string>
+
+    <string name="room_displayname_invite_from">Ftesë nga %s</string>
+    <string name="room_displayname_room_invite">Ftesë Dhome</string>
+
+    <string name="room_displayname_two_members">%1$s dhe %2$s</string>
+
+    <string name="room_displayname_empty_room">Dhomë e zbrazët</string>
+
+    <string name="summary_user_sent_sticker">%1$s dërgoi një ngjitës.</string>
+
+    <string name="notice_room_invite_no_invitee">Ftesë e %s</string>
+    <string name="notice_room_unban">%1$s hoqi dëbimin për %2$s</string>
+    <string name="notice_room_withdraw">%1$s tërhoqi mbrapsht ftesën për %2$s</string>
+    <string name="notice_display_name_set">%1$s caktoi për veten emër ekrani %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s ndryshoi emrin e tyre në ekran nga %2$s në %3$s</string>
+    <string name="notice_display_name_removed">%1$s hoqi emrin e tij në ekran (%2$s)</string>
+    <string name="notice_end_to_end">%1$s aktivizoi fshehtëzim skaj-më-skaj (%2$s)</string>
+
+    <string name="notice_room_topic_removed">%1$s hoqi temën e dhomës</string>
+    <string name="notice_event_redacted">"redaktoi %1$s "</string>
+    <string name="notice_room_third_party_invite">%1$s dërgoi një ftesë për %2$s që të marrë pjesë në dhomë</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s dhe 1 tjetër</item>
+        <item quantity="other">%1$s dhe %2$d të tjerë</item>
+    </plurals>
+
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-te/strings.xml b/matrix-sdk-android/src/main/res/values-te/strings.xml
index b5e7333691..53e530b727 100644
--- a/matrix-sdk-android/src/main/res/values-te/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-te/strings.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="notice_room_invite_no_invitee">%s\'s ఆహ్వానం</string>
+<resources>
+    <string name="notice_room_invite_no_invitee">%s\'s ఆహ్వానం</string>
     <string name="notice_room_invite">%1$s ఆహ్వానించారు %2$s</string>
     <string name="notice_room_leave">%1$s వదిలి వెళారు</string>
     <string name="notice_room_reject">%1$s ఆహ్వానాన్ని తిరస్కరించారు</string>
@@ -57,11 +58,17 @@
     <string name="medium_email">ఇమెయిల్ చిరునామా</string>
     <string name="medium_phone_number">ఫోను నంబరు</string>
 
-<string name="matrix_sdk_app_name">మ్యాట్రిక్స్ అండ్రొఇడ్ ఏస్ డి కె</string>
 
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s ఒక చిత్రం పంపారు.</string>
 
     <string name="notice_room_invite_you">%1$s మిమ్మల్ని ఆహ్వానించారు</string>
     <string name="notice_room_join">%1$s చేరారు</string>
-    </resources>
+
+    <string name="room_displayname_invite_from">%s నుండి ఆహ్వానించు</string>
+    <string name="room_displayname_two_members">%1$s మరియు %2$s</string>
+    <string name="room_displayname_room_invite">గదికి ఆహ్వానం</string>
+    <string name="room_displayname_empty_room">ఖాళీ గది</string>
+
+
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-th/strings.xml b/matrix-sdk-android/src/main/res/values-th/strings.xml
index d8374c668d..3abd948f77 100644
--- a/matrix-sdk-android/src/main/res/values-th/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-th/strings.xml
@@ -1,5 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="matrix_sdk_app_name">Matrix Android SDK</string>
-
+<resources>
     <string name="summary_message">%1$s: %2$s</string>
-    </resources>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-uk/strings.xml b/matrix-sdk-android/src/main/res/values-uk/strings.xml
index 24cf674461..3205542682 100644
--- a/matrix-sdk-android/src/main/res/values-uk/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-uk/strings.xml
@@ -1,11 +1,89 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="matrix_sdk_app_name">Matrix Android SDK</string>
-
+<resources>
     <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s відправив зображення.</string>
+    <string name="summary_user_sent_image">%1$s надіслав(ла) зображення.</string>
 
     <string name="notice_room_invite_no_invitee">%s запрошення</string>
     <string name="notice_room_invite">%1$s запросив(ла) %2$s</string>
-    <string name="encrypted_message">Закодоване повідомлення</string>
+    <string name="encrypted_message">Зашифроване повідомлення</string>
 
-    </resources>
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Запрошення від %s</string>
+    <string name="room_displayname_room_invite">Запрошення до кімнати</string>
+    <string name="room_displayname_two_members">%1$s і %2$s</string>
+    <string name="room_displayname_empty_room">Порожня кімната</string>
+
+
+    <string name="summary_user_sent_sticker">%1$s надіслав(ла) наліпку.</string>
+
+    <string name="notice_room_invite_you">%1$s запросив(ла) Вас</string>
+    <string name="notice_room_join">%1$s приєднався(лась)</string>
+    <string name="notice_room_leave">%1$s покинув(ла)</string>
+    <string name="notice_room_reject">%1$s відхилив(ла) запрошення</string>
+    <string name="notice_room_kick">%1$s копнув(ла) %2$s</string>
+    <string name="notice_room_unban">%1$s розблокував(ла) %2$s</string>
+    <string name="notice_room_ban">%1$s заблокував(ла) %2$s</string>
+    <string name="notice_room_withdraw">%1$s відкликав(ла) запрошення для %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s змінив(ла) свій аватар</string>
+    <string name="notice_display_name_set">%1$s встановив(ла) собі ім’я %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s змінив(ла) своє ім’я з %2$s на %3$s</string>
+    <string name="notice_display_name_removed">%1$s прибрав(ла) своє ім’я (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s змінив(ла) тему на: %2$s</string>
+    <string name="notice_room_name_changed">%1$s змінив(ла) назву кімнати на: %2$s</string>
+    <string name="notice_placed_video_call">%s розпочав(ла) відеодзвінок.</string>
+    <string name="notice_placed_voice_call">%s розпочав(ла) голосовий дзвінок.</string>
+    <string name="notice_answered_call">%s віпдовів(ла) на дзвінок.</string>
+    <string name="notice_ended_call">%s завершив(ла) дзвінок.</string>
+    <string name="notice_made_future_room_visibility">%1$s зробив(ла) майбутню історію кімнати видимою для %2$s</string>
+    <string name="notice_room_visibility_invited">усіх співрозмовників, з моменту їх запрошення.</string>
+    <string name="notice_room_visibility_joined">усіх співрозмовників, з моменту їх приєднання.</string>
+    <string name="notice_room_visibility_shared">усіх співрозмовників.</string>
+    <string name="notice_room_visibility_world_readable">будь-кого.</string>
+    <string name="notice_room_visibility_unknown">невідомо (%s).</string>
+    <string name="notice_end_to_end">%1$s увімкнув(ла) наскрізне шифрування (%2$s)</string>
+
+    <string name="notice_requested_voip_conference">%1$s запросив(ла) VoIP конференцію</string>
+    <string name="notice_voip_started">VoIP конференція розпочалась</string>
+    <string name="notice_voip_finished">VoIP конференція завершилась</string>
+
+    <string name="notice_avatar_changed_too">(аватар також змінено)</string>
+    <string name="notice_room_name_removed">%1$s прибрав(ла) назву кімнати</string>
+    <string name="notice_room_topic_removed">%1$s прибрав(ла) тему кімнати</string>
+    <string name="notice_event_redacted">"відредаговано %1$s "</string>
+    <string name="notice_event_redacted_by">" %1$s"</string>
+    <string name="notice_event_redacted_reason">" [причина: %1$s]"</string>
+    <string name="notice_profile_change_redacted">%1$s оновив(ла) свій профіль %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s надіслав(ла) запрошення %2$s приєднатися до кімнати</string>
+    <string name="notice_room_third_party_registered_invite">%1$s прийняв(ла) запрошення у %2$s</string>
+
+    <string name="notice_crypto_unable_to_decrypt">** Неможливо розшифрувати: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Пристрій відправника не надіслав нам ключ для цього повідомлення.</string>
+
+    <string name="message_reply_to_prefix">У відповідь на</string>
+
+    <string name="could_not_redact">Неможливо відредагувати</string>
+    <string name="unable_to_send_message">Не вдалося надіслати повідомлення</string>
+
+    <string name="message_failed_to_upload">Не вдалося завантажити зображення</string>
+
+    <string name="network_error">Помилка мережі</string>
+    <string name="matrix_error">Помилка Matrix</string>
+
+    <string name="room_error_join_failed_empty_room">Наразі неможливо переприєднатися до порожньої кімнати.</string>
+
+    <string name="medium_email">Адреса електронної пошти</string>
+    <string name="medium_phone_number">Номер телефону</string>
+
+    <string name="reply_to_an_image">надіслав зображення.</string>
+    <string name="reply_to_a_video">надіслав відео.</string>
+    <string name="reply_to_an_audio_file">надіслав аудіо файл.</string>
+    <string name="reply_to_a_file">надіслав файл.</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s та 1 інший</item>
+        <item quantity="few">%1$s та %2$d інші</item>
+        <item quantity="many">%1$s та %2$d інших</item>
+        <item quantity="other"></item>
+    </plurals>
+
+</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 299bb2babf..7c9ff164a3 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
@@ -1,11 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="summary_user_sent_image">%1$s 发送了一张图片。</string>
+<resources>
+    <string name="summary_user_sent_image">%1$s 发送了一张图片。</string>
 
     <string name="notice_room_invite_no_invitee">%s 的邀请</string>
     <string name="notice_room_invite">%1$s 邀请了 %2$s</string>
     <string name="notice_room_invite_you">%1$s 邀请了您</string>
-    <string name="notice_room_join">%1$s 加入了聊天室</string>
-    <string name="notice_room_leave">%1$s 退出了聊天室</string>
+    <string name="notice_room_join">%1$s 加入了</string>
+    <string name="notice_room_leave">%1$s 离开了</string>
     <string name="notice_room_reject">%1$s 拒绝了邀请</string>
     <string name="notice_room_kick">%1$s 移除了 %2$s</string>
     <string name="notice_room_unban">%1$s 解封了 %2$s</string>
@@ -34,7 +35,7 @@
     <string name="notice_avatar_changed_too">（头像也被更改）</string>
     <string name="notice_room_name_removed">%1$s 移除了聊天室名称</string>
     <string name="notice_room_topic_removed">%1$s 移除了聊天室主题</string>
-    <string name="notice_event_redacted_reason">" [理由：%1$s]"</string>
+    <string name="notice_event_redacted_reason">[理由：%1$s]</string>
     <string name="notice_crypto_unable_to_decrypt">** 无法解密：%s **</string>
     <string name="notice_crypto_error_unkwown_inbound_session_id">发送者的设备没有向我们发送此消息的密钥。</string>
 
@@ -49,19 +50,18 @@
 
     <string name="encrypted_message">已加密消息</string>
 
-    <string name="medium_email">邮箱地址</string>
-    <string name="medium_phone_number">电话号码</string>
+    <string name="medium_email">电子邮箱地址</string>
+    <string name="medium_phone_number">手机号码</string>
 
-<string name="notice_room_withdraw">%1$s 撤销了对 %2$s 的邀请</string>
+    <string name="notice_room_withdraw">%1$s 撤销了对 %2$s 的邀请</string>
     <string name="notice_made_future_room_visibility">%1$s 让之后的聊天室历史记录对 %2$s 可见</string>
-    <string name="notice_event_redacted">"删改了 %1$s "</string>
-    <string name="notice_event_redacted_by">" 被 %1$s"</string>
-    <string name="notice_profile_change_redacted">%1$s 更新了他们的配置文件 %2$s</string>
+    <string name="notice_event_redacted">撤回了 %1$s</string>
+    <string name="notice_event_redacted_by">被 %1$s</string>
+    <string name="notice_profile_change_redacted">%1$s 更新了他们的简介 %2$s</string>
     <string name="notice_room_third_party_invite">%1$s 向 %2$s 发送了加入聊天室的邀请</string>
     <string name="notice_room_third_party_registered_invite">%1$s 接受了 %2$s 的邀请</string>
 
     <string name="could_not_redact">无法撤回</string>
-    <string name="matrix_sdk_app_name">Matrix Android SDK</string>
 
     <string name="summary_message">%1$s：%2$s</string>
     <string name="summary_user_sent_sticker">%1$s 发送了一张贴纸。</string>
@@ -71,6 +71,14 @@
     <string name="reply_to_an_audio_file">发送了一段音频。</string>
     <string name="reply_to_a_file">发送了一个文件。</string>
 
-<string name="message_reply_to_prefix">回复</string>
+    <string name="message_reply_to_prefix">回复</string>
 
-    </resources>
+    <string name="room_displayname_empty_room">空聊天室</string>
+    <string name="room_displayname_invite_from">来自 %s 的邀请</string>
+    <string name="room_displayname_room_invite">聊天室邀请</string>
+    <string name="room_displayname_two_members">%1$s 和 %2$s</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="other">%1$s 与其他 %2$d 位</item>
+    </plurals>
+
+</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 4c4c77ef04..132bdea799 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
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="matrix_sdk_app_name">Matrix Android 軟體開發工具</string>
-
+<resources>
     <string name="summary_message">%1$s：%2$s</string>
     <string name="summary_user_sent_image">%1$s 傳送了一張圖片。</string>
 
@@ -40,8 +39,8 @@
     <string name="notice_room_name_removed">%1$s 移除了房間名稱</string>
     <string name="notice_room_topic_removed">%1$s 移除了房間主題</string>
     <string name="notice_event_redacted">"已編輯 %1$s "</string>
-    <string name="notice_event_redacted_by">" 由 %1$s"</string>
-    <string name="notice_event_redacted_reason">" [理由：%1$s]"</string>
+    <string name="notice_event_redacted_by">由 %1$s</string>
+    <string name="notice_event_redacted_reason">[理由： %1$s]</string>
     <string name="notice_profile_change_redacted">%1$s 更新了他們的基本資料 %2$s</string>
     <string name="notice_room_third_party_invite">%1$s 傳送加入房間的邀請給 %2$s</string>
     <string name="notice_room_third_party_registered_invite">%1$s 接受 %2$s 的邀請</string>
@@ -64,7 +63,7 @@
     <string name="medium_email">電子郵件</string>
     <string name="medium_phone_number">電話號碼</string>
 
-<string name="summary_user_sent_sticker">%1$s 傳送了一張貼圖。</string>
+    <string name="summary_user_sent_sticker">%1$s 傳送了一張貼圖。</string>
 
     <string name="message_reply_to_prefix">回覆</string>
 
@@ -73,4 +72,14 @@
     <string name="reply_to_an_audio_file">傳送了音訊檔案。</string>
     <string name="reply_to_a_file">傳送了檔案。</string>
 
+    <string name="room_displayname_invite_from">來自%s 的邀請</string>
+    <string name="room_displayname_room_invite">聊天室邀請</string>
+    <string name="room_displayname_two_members">%1$s 和 %2$s</string>
+
+    <string name="room_displayname_empty_room">空聊天室</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="other">%1$s 和 和其他 %2$d 個人</item>
+    </plurals>
+
+
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values/strings.xml b/matrix-sdk-android/src/main/res/values/strings.xml
index e5e08506eb..9ed5f5b5e7 100644
--- a/matrix-sdk-android/src/main/res/values/strings.xml
+++ b/matrix-sdk-android/src/main/res/values/strings.xml
@@ -1,6 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="matrix_sdk_app_name">Matrix Android SDK</string>
-
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s sent an image.</string>
     <string name="summary_user_sent_sticker">%1$s sent a sticker.</string>
@@ -19,7 +18,7 @@
     <string name="notice_display_name_set">%1$s set their display name to %2$s</string>
     <string name="notice_display_name_changed_from">%1$s changed their display name from %2$s to %3$s</string>
     <string name="notice_display_name_removed">%1$s removed their display name (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s changed the topic to: %2$s</string>
+    <string name="notice_topic_changed">%1$s changed the topic to: %2$s</string>
     <string name="notice_room_name_changed">%1$s changed the room name to: %2$s</string>
     <string name="notice_placed_video_call">%s placed a video call.</string>
     <string name="notice_placed_voice_call">%s placed a voice call.</string>
diff --git a/tools/import_strings.sh b/tools/import_strings.sh
new file mode 100755
index 0000000000..9f7ed43a1b
--- /dev/null
+++ b/tools/import_strings.sh
@@ -0,0 +1,112 @@
+#!/usr/bin/env bash
+
+#
+# Copyright 2018 New Vector Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Exit on any error
+set -e
+
+echo "Copy strings to SDK"
+echo
+
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values/strings.xml        ./matrix-sdk-android/src/main/res/values/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-ar/strings.xml     ./matrix-sdk-android/src/main/res/values-ar/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-bg/strings.xml     ./matrix-sdk-android/src/main/res/values-bg/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-bs/strings.xml     ./matrix-sdk-android/src/main/res/values-bs/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-ca/strings.xml     ./matrix-sdk-android/src/main/res/values-ca/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-cs/strings.xml     ./matrix-sdk-android/src/main/res/values-cs/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-da/strings.xml     ./matrix-sdk-android/src/main/res/values-da/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-de/strings.xml     ./matrix-sdk-android/src/main/res/values-de/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-el/strings.xml     ./matrix-sdk-android/src/main/res/values-el/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-eo/strings.xml     ./matrix-sdk-android/src/main/res/values-eo/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-es/strings.xml     ./matrix-sdk-android/src/main/res/values-es/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-es-rMX/strings.xml ./matrix-sdk-android/src/main/res/values-es-rMX/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-eu/strings.xml     ./matrix-sdk-android/src/main/res/values-eu/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-fi/strings.xml     ./matrix-sdk-android/src/main/res/values-fi/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-fr/strings.xml     ./matrix-sdk-android/src/main/res/values-fr/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-gl/strings.xml     ./matrix-sdk-android/src/main/res/values-gl/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-hu/strings.xml     ./matrix-sdk-android/src/main/res/values-hu/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-id/strings.xml     ./matrix-sdk-android/src/main/res/values-id/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-in/strings.xml     ./matrix-sdk-android/src/main/res/values-in/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-is/strings.xml     ./matrix-sdk-android/src/main/res/values-is/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-it/strings.xml     ./matrix-sdk-android/src/main/res/values-it/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-ja/strings.xml     ./matrix-sdk-android/src/main/res/values-ja/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-ko/strings.xml     ./matrix-sdk-android/src/main/res/values-ko/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-lv/strings.xml     ./matrix-sdk-android/src/main/res/values-lv/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-nl/strings.xml     ./matrix-sdk-android/src/main/res/values-nl/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-nn/strings.xml     ./matrix-sdk-android/src/main/res/values-nn/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-pl/strings.xml     ./matrix-sdk-android/src/main/res/values-pl/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-pt/strings.xml     ./matrix-sdk-android/src/main/res/values-pt/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-pt-rBR/strings.xml ./matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-ru/strings.xml     ./matrix-sdk-android/src/main/res/values-ru/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-sk/strings.xml     ./matrix-sdk-android/src/main/res/values-sk/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-sq/strings.xml     ./matrix-sdk-android/src/main/res/values-sq/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-te/strings.xml     ./matrix-sdk-android/src/main/res/values-te/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-th/strings.xml     ./matrix-sdk-android/src/main/res/values-th/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-uk/strings.xml     ./matrix-sdk-android/src/main/res/values-uk/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-zh-rCN/strings.xml ./matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml
+cp ../matrix-android-sdk/matrix-sdk/src/main/res/values-zh-rTW/strings.xml ./matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml
+
+echo
+echo "Copy strings to Riot"
+echo
+
+cp ../riot-android/vector/src/main/res/values/strings.xml        ./app/src/main/res/values/strings.xml
+cp ../riot-android/vector/src/main/res/values-ar/strings.xml     ./app/src/main/res/values-ar/strings.xml
+cp ../riot-android/vector/src/main/res/values-bg/strings.xml     ./app/src/main/res/values-bg/strings.xml
+cp ../riot-android/vector/src/main/res/values-bn-rIN/strings.xml ./app/src/main/res/values-bn-rIN/strings.xml
+cp ../riot-android/vector/src/main/res/values-bs/strings.xml     ./app/src/main/res/values-bs/strings.xml
+cp ../riot-android/vector/src/main/res/values-ca/strings.xml     ./app/src/main/res/values-ca/strings.xml
+cp ../riot-android/vector/src/main/res/values-cs/strings.xml     ./app/src/main/res/values-cs/strings.xml
+cp ../riot-android/vector/src/main/res/values-da/strings.xml     ./app/src/main/res/values-da/strings.xml
+cp ../riot-android/vector/src/main/res/values-de/strings.xml     ./app/src/main/res/values-de/strings.xml
+cp ../riot-android/vector/src/main/res/values-el/strings.xml     ./app/src/main/res/values-el/strings.xml
+cp ../riot-android/vector/src/main/res/values-eo/strings.xml     ./app/src/main/res/values-eo/strings.xml
+cp ../riot-android/vector/src/main/res/values-es/strings.xml     ./app/src/main/res/values-es/strings.xml
+cp ../riot-android/vector/src/main/res/values-es-rMX/strings.xml ./app/src/main/res/values-es-rMX/strings.xml
+cp ../riot-android/vector/src/main/res/values-eu/strings.xml     ./app/src/main/res/values-eu/strings.xml
+cp ../riot-android/vector/src/main/res/values-fa/strings.xml     ./app/src/main/res/values-fa/strings.xml
+cp ../riot-android/vector/src/main/res/values-fi/strings.xml     ./app/src/main/res/values-fi/strings.xml
+cp ../riot-android/vector/src/main/res/values-fr/strings.xml     ./app/src/main/res/values-fr/strings.xml
+cp ../riot-android/vector/src/main/res/values-fr-rCA/strings.xml ./app/src/main/res/values-fr-rCA/strings.xml
+cp ../riot-android/vector/src/main/res/values-gl/strings.xml     ./app/src/main/res/values-gl/strings.xml
+cp ../riot-android/vector/src/main/res/values-hu/strings.xml     ./app/src/main/res/values-hu/strings.xml
+cp ../riot-android/vector/src/main/res/values-id/strings.xml     ./app/src/main/res/values-id/strings.xml
+cp ../riot-android/vector/src/main/res/values-in/strings.xml     ./app/src/main/res/values-in/strings.xml
+cp ../riot-android/vector/src/main/res/values-is/strings.xml     ./app/src/main/res/values-is/strings.xml
+cp ../riot-android/vector/src/main/res/values-it/strings.xml     ./app/src/main/res/values-it/strings.xml
+cp ../riot-android/vector/src/main/res/values-ja/strings.xml     ./app/src/main/res/values-ja/strings.xml
+cp ../riot-android/vector/src/main/res/values-ko/strings.xml     ./app/src/main/res/values-ko/strings.xml
+cp ../riot-android/vector/src/main/res/values-lv/strings.xml     ./app/src/main/res/values-lv/strings.xml
+cp ../riot-android/vector/src/main/res/values-nl/strings.xml     ./app/src/main/res/values-nl/strings.xml
+cp ../riot-android/vector/src/main/res/values-nn/strings.xml     ./app/src/main/res/values-nn/strings.xml
+cp ../riot-android/vector/src/main/res/values-pl/strings.xml     ./app/src/main/res/values-pl/strings.xml
+cp ../riot-android/vector/src/main/res/values-pt/strings.xml     ./app/src/main/res/values-pt/strings.xml
+cp ../riot-android/vector/src/main/res/values-pt-rBR/strings.xml ./app/src/main/res/values-pt-rBR/strings.xml
+cp ../riot-android/vector/src/main/res/values-ru/strings.xml     ./app/src/main/res/values-ru/strings.xml
+cp ../riot-android/vector/src/main/res/values-sk/strings.xml     ./app/src/main/res/values-sk/strings.xml
+cp ../riot-android/vector/src/main/res/values-sq/strings.xml     ./app/src/main/res/values-sq/strings.xml
+cp ../riot-android/vector/src/main/res/values-te/strings.xml     ./app/src/main/res/values-te/strings.xml
+cp ../riot-android/vector/src/main/res/values-th/strings.xml     ./app/src/main/res/values-th/strings.xml
+cp ../riot-android/vector/src/main/res/values-tlh/strings.xml    ./app/src/main/res/values-tlh/strings.xml
+cp ../riot-android/vector/src/main/res/values-tr/strings.xml     ./app/src/main/res/values-tr/strings.xml
+cp ../riot-android/vector/src/main/res/values-uk/strings.xml     ./app/src/main/res/values-uk/strings.xml
+cp ../riot-android/vector/src/main/res/values-zh-rCN/strings.xml ./app/src/main/res/values-zh-rCN/strings.xml
+cp ../riot-android/vector/src/main/res/values-zh-rTW/strings.xml ./app/src/main/res/values-zh-rTW/strings.xml
+
+
+echo
+echo "Success!"