From 57cea677e47c25e190e538f2f2727222d3366062 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 5 Apr 2019 10:14:45 +0200
Subject: [PATCH] Import resource from Riot

---
 .../src/main/res/values-ar/strings.xml        |  3 --
 .../src/main/res/values-bg/strings.xml        |  3 --
 .../src/main/res/values-ca/strings.xml        |  3 --
 .../src/main/res/values-cs/strings.xml        |  3 --
 .../src/main/res/values-da/strings.xml        |  3 --
 .../src/main/res/values-de/strings.xml        |  3 --
 .../src/main/res/values-el/strings.xml        |  2 --
 .../src/main/res/values-es-rMX/strings.xml    |  3 --
 .../src/main/res/values-es/strings.xml        |  3 --
 .../src/main/res/values-eu/strings.xml        |  3 --
 .../src/main/res/values-fi/strings.xml        |  3 --
 .../src/main/res/values-fr/strings.xml        |  3 --
 .../src/main/res/values-gl/strings.xml        |  3 --
 .../src/main/res/values-hu/strings.xml        |  3 --
 .../src/main/res/values-is/strings.xml        |  3 --
 .../src/main/res/values-it/strings.xml        |  3 --
 .../src/main/res/values-ja/strings.xml        |  3 --
 .../src/main/res/values-lv/strings.xml        |  3 --
 .../src/main/res/values-nl/strings.xml        |  3 --
 .../src/main/res/values-nn/strings.xml        |  3 --
 .../src/main/res/values-pl/strings.xml        |  3 --
 .../src/main/res/values-pt-rBR/strings.xml    |  3 --
 .../src/main/res/values-pt/strings.xml        |  3 --
 .../src/main/res/values-ru/strings.xml        |  3 --
 .../src/main/res/values-sk/strings.xml        |  3 --
 .../src/main/res/values-sq/strings.xml        |  3 --
 .../src/main/res/values-te/strings.xml        |  3 --
 .../src/main/res/values-uk/strings.xml        |  3 --
 .../src/main/res/values-zh-rCN/strings.xml    |  3 --
 .../src/main/res/values-zh-rTW/strings.xml    |  3 --
 .../src/main/res/values/strings.xml           |  7 ++--
 vector/src/main/res/values-fi/strings.xml     |  2 ++
 vector/src/main/res/values-fr/strings.xml     |  2 ++
 vector/src/main/res/values-hu/strings.xml     |  4 ++-
 vector/src/main/res/values-it/strings.xml     |  4 ++-
 vector/src/main/res/values-nl/strings.xml     |  2 ++
 vector/src/main/res/values-sq/strings.xml     |  4 ++-
 vector/src/main/res/values-zh-rTW/strings.xml | 32 ++++++++++---------
 38 files changed, 36 insertions(+), 110 deletions(-)

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 c15e644b..ab48ea99 100644
--- a/matrix-sdk-android/src/main/res/values-ar/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-ar/strings.xml
@@ -34,7 +34,6 @@
 
     <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_profile_change_redacted">حدّث ⁨%1$s⁩ اللاحة ⁨%2$s⁩</string>
     <string name="notice_room_third_party_invite">أرسل ⁨%1$s⁩ دعوة إلى ⁨%2$s⁩ للانضمام إلى الغرفة</string>
     <string name="notice_crypto_unable_to_decrypt">** تعذّر فك التعمية: ⁨%s⁩ **</string>
@@ -58,8 +57,6 @@
     <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>
-    <string name="notice_event_redacted_by">" على يد ⁨%1$s⁩"</string>
     <string name="notice_room_third_party_registered_invite">قبل ⁨%1$s⁩ دعوة ⁨%2$s⁩</string>
 
     <string name="could_not_redact">تعذر التهذيب</string>
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 a67c6184..16f17103 100644
--- a/matrix-sdk-android/src/main/res/values-bg/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-bg/strings.xml
@@ -39,9 +39,6 @@
     <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>
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 835ed38a..4c2f4a8a 100644
--- a/matrix-sdk-android/src/main/res/values-ca/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-ca/strings.xml
@@ -42,9 +42,6 @@
     <string name="notice_avatar_changed_too">(s\'ha canviat també l\'avatar)</string>
     <string name="notice_room_name_removed">%1$s ha eliminat el nom de la sala</string>
     <string name="notice_room_topic_removed">%1$s ha eliminat el tema de la sala</string>
-    <string name="notice_event_redacted">"ha redactat %1$s "</string>
-    <string name="notice_event_redacted_by">per %1$s</string>
-    <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ó per a %2$s</string>
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 3c734eb3..f6e23752 100644
--- a/matrix-sdk-android/src/main/res/values-cs/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-cs/strings.xml
@@ -39,9 +39,6 @@
     <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>
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 51f5f290..510fa231 100644
--- a/matrix-sdk-android/src/main/res/values-da/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-da/strings.xml
@@ -39,9 +39,6 @@
     <string name="notice_avatar_changed_too">(avatar blev også ændret)</string>
     <string name="notice_room_name_removed">%1$s fjernede navnet på rummet</string>
     <string name="notice_room_topic_removed">%1$s fjernede emnet for rummet</string>
-    <string name="notice_event_redacted">"hemmeligholdte %1$s "</string>
-    <string name="notice_event_redacted_by">" af %1$s"</string>
-    <string name="notice_event_redacted_reason">" [årsag: %1$s]"</string>
     <string name="notice_profile_change_redacted">%1$s opdaterede sin profil %2$s</string>
     <string name="notice_room_third_party_invite">%1$s inviterede %2$s til rummet</string>
     <string name="notice_room_third_party_registered_invite">%1$s accepterede invitationen til %2$s</string>
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 f1d8fcbc..e6022cac 100644
--- a/matrix-sdk-android/src/main/res/values-de/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-de/strings.xml
@@ -39,9 +39,6 @@
     <string name="notice_avatar_changed_too">(Profilbild wurde ebenfalls geändert)</string>
     <string name="notice_room_name_removed">%1$s hat den Raumnamen entfernt</string>
     <string name="notice_room_topic_removed">%1$s hat das Raum-Thema entfernt</string>
-    <string name="notice_event_redacted">%1$s verborgen</string>
-    <string name="notice_event_redacted_by"> durch %1$s</string>
-    <string name="notice_event_redacted_reason">  [Grund: %1$s]</string>
     <string name="notice_profile_change_redacted">%1$s hat das Benutzerprofil aktualisiert %2$s</string>
     <string name="notice_room_third_party_invite">%1$s hat eine Einladung an %2$s gesendet</string>
     <string name="notice_room_third_party_registered_invite">%1$s hat die Einladung für %2$s akzeptiert</string>
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 cf34d404..37eac535 100644
--- a/matrix-sdk-android/src/main/res/values-el/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-el/strings.xml
@@ -34,8 +34,6 @@
     <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_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_registered_invite">Ο/Η %1$s δέχτηκε την πρόσκληση για το %2$s</string>
 
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 8e0a909c..f3019770 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
@@ -39,9 +39,6 @@
     <string name="notice_avatar_changed_too">(foto de perfil también se cambió)</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 invitación de %2$s</string>
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 b6dc7c45..232ae0d4 100644
--- a/matrix-sdk-android/src/main/res/values-es/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-es/strings.xml
@@ -39,9 +39,6 @@
     <string name="notice_avatar_changed_too">(el avatar también se cambió)</string>
     <string name="notice_room_name_removed">%1$s eliminó el nombre de la sala</string>
     <string name="notice_room_topic_removed">%1$s eliminó 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 invitó a %2$s a unirse a la sala</string>
     <string name="notice_room_third_party_registered_invite">%1$s aceptó la invitación para %2$s</string>
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 58172019..c123936a 100644
--- a/matrix-sdk-android/src/main/res/values-eu/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-eu/strings.xml
@@ -39,9 +39,6 @@
     <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">%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>
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 c47c12d9..cee8489c 100644
--- a/matrix-sdk-android/src/main/res/values-fi/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-fi/strings.xml
@@ -37,7 +37,6 @@
     <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_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>
@@ -59,10 +58,8 @@
     <string name="medium_phone_number">Puhelinnumero</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>
 
     <!-- Room display name -->
     <string name="room_displayname_invite_from">Kutsu käyttäjältä %s</string> <!-- Grammar problem -->
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 9faee863..f6a00e36 100644
--- a/matrix-sdk-android/src/main/res/values-fr/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-fr/strings.xml
@@ -39,9 +39,6 @@
     <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_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>
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 8cdc413a..907730f1 100644
--- a/matrix-sdk-android/src/main/res/values-gl/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-gl/strings.xml
@@ -43,9 +43,6 @@
     <string name="notice_avatar_changed_too">(o avatar tamén foi cambiado)</string>
     <string name="notice_room_name_removed">%1$s borrou o nome da sala</string>
     <string name="notice_room_topic_removed">%1$s removeu o tema da sala</string>
-    <string name="notice_event_redacted">"redactou %1$s "</string>
-    <string name="notice_event_redacted_by">" de %1s"</string>
-    <string name="notice_event_redacted_reason">" [motivo: %1$s]"</string>
     <string name="notice_profile_change_redacted">%1$s actualizou o seu perfil %2$s</string>
     <string name="notice_room_third_party_invite">%1$s envioulle un convite a %2$s para que entre na sala</string>
     <string name="notice_room_third_party_registered_invite">%1$s aceptou o convite para %2$s</string>
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 09f73de9..a235f131 100644
--- a/matrix-sdk-android/src/main/res/values-hu/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-hu/strings.xml
@@ -38,9 +38,6 @@
     <string name="notice_avatar_changed_too">(profilképp is meg lett változtatva)</string>
     <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_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>
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 624ee679..01954ae2 100644
--- a/matrix-sdk-android/src/main/res/values-is/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-is/strings.xml
@@ -23,8 +23,6 @@
     <string name="notice_voip_finished">VoIP-símafundi lokið</string>
 
     <string name="notice_avatar_changed_too">(einnig var skipt um auðkennismynd)</string>
-    <string name="notice_event_redacted_by">" af %1$s"</string>
-    <string name="notice_event_redacted_reason">" [ástæða: %1$s]"</string>
     <string name="notice_crypto_unable_to_decrypt">** Mistókst að afkóða: %s **</string>
     <string name="message_reply_to_prefix">Sem svar til</string>
 
@@ -56,7 +54,6 @@
     <string name="notice_room_name_removed">%1$s fjarlægði heiti spjallrásar</string>
     <string name="notice_room_topic_removed">%1$s fjarlægði umfjöllunarefni spjallrásar</string>
     <string name="notice_made_future_room_visibility">%1$s gerði ferilskrá spjallrásar héðan í frá sýnilega fyrir %2$s</string>
-    <string name="notice_event_redacted">"ritstýrði %1$s "</string>
     <string name="notice_profile_change_redacted">%1$s uppfærði notandasniðið sitt %2$s</string>
     <string name="notice_room_third_party_invite">%1$s sendi boð til %2$s um þátttöku í spjallrásinni</string>
     <string name="notice_room_third_party_registered_invite">%1$s samþykkti boð um að taka þátt í %2$s</string>
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 c3186e03..df881bfc 100644
--- a/matrix-sdk-android/src/main/res/values-it/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-it/strings.xml
@@ -38,8 +38,6 @@
     <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_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>
@@ -62,7 +60,6 @@
     <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="summary_user_sent_sticker">%1$s ha inviato un adesivo.</string>
 
     <string name="message_reply_to_prefix">In risposta a</string>
diff --git a/matrix-sdk-android/src/main/res/values-ja/strings.xml b/matrix-sdk-android/src/main/res/values-ja/strings.xml
index 79d5a626..d2a051ca 100644
--- a/matrix-sdk-android/src/main/res/values-ja/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-ja/strings.xml
@@ -49,9 +49,6 @@
     <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>
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 921bbfb1..b14cbb4b 100644
--- a/matrix-sdk-android/src/main/res/values-lv/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-lv/strings.xml
@@ -38,9 +38,6 @@
     <string name="notice_avatar_changed_too">(arī profila attēls mainījās)</string>
     <string name="notice_room_name_removed">%1$s dzēsa istabas nosaukumu</string>
     <string name="notice_room_topic_removed">%1$s dzēsa istabas tēmas nosaukumu</string>
-    <string name="notice_event_redacted">"rediģēts %1$s "</string>
-    <string name="notice_event_redacted_by">" no %1$s"</string>
-    <string name="notice_event_redacted_reason">" [iemesls: %1$s]"</string>
     <string name="notice_profile_change_redacted">%1$s atjaunoja profila informāciju %2$s</string>
     <string name="notice_room_third_party_invite">%1$s nosūtīja uzaicinājumu %2$s pievienoties istabai</string>
     <string name="notice_room_third_party_registered_invite">%1$s apstiprināja uzaicinājumu priekš %2$s</string>
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 56df1738..81357f94 100644
--- a/matrix-sdk-android/src/main/res/values-nl/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-nl/strings.xml
@@ -39,9 +39,6 @@
     <string name="notice_avatar_changed_too">(avatar is ook veranderd)</string>
     <string name="notice_room_name_removed">%1$s heeft de gespreksnaam verwijderd</string>
     <string name="notice_room_topic_removed">%1$s heeft het gespreksonderwerp verwijderd</string>
-    <string name="notice_event_redacted">heeft %1$s verwijderd</string>
-    <string name="notice_event_redacted_by"> door %1$s</string>
-    <string name="notice_event_redacted_reason">  [reden: %1$s]</string>
     <string name="notice_profile_change_redacted">%1$s heeft zijn/haar profiel %2$s bijgewerkt</string>
     <string name="notice_room_third_party_invite">%1$s heeft een uitnodiging naar %2$s gestuurd om het gesprek toe te treden</string>
     <string name="notice_room_third_party_registered_invite">%1$s heeft de uitnodiging voor %2$s aanvaard</string>
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 9833b68f..ea13ece8 100644
--- a/matrix-sdk-android/src/main/res/values-nn/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-nn/strings.xml
@@ -42,9 +42,6 @@
     <string name="notice_avatar_changed_too">(avataren vart endra òg)</string>
     <string name="notice_room_name_removed">%1$s fjerna romnamnet</string>
     <string name="notice_room_topic_removed">%1$s fjerna romemnet</string>
-    <string name="notice_event_redacted">"gjorde om på %1$s "</string>
-    <string name="notice_event_redacted_by">" av %1$s"</string>
-    <string name="notice_event_redacted_reason">" [grunnlag: %1$s]"</string>
     <string name="notice_profile_change_redacted">%1$s oppdaterte profilbiletet sitt %2$s</string>
     <string name="notice_room_third_party_invite">%1$s baud %2$s inn i rommet</string>
     <string name="notice_room_third_party_registered_invite">%1$s sa ja til innbydinga til %2$s</string>
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 b6194feb..ec8774b9 100644
--- a/matrix-sdk-android/src/main/res/values-pl/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-pl/strings.xml
@@ -35,7 +35,6 @@
     <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ł(a) naklejkę.</string>
 
     <string name="notice_end_to_end">%1$s włączył(a) szyfrowanie end-to-end (%2$s)</string>
@@ -68,8 +67,6 @@
     <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>
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 d9cdc316..17e7ae33 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
@@ -39,9 +39,6 @@
     <string name="notice_avatar_changed_too">(o avatar também foi alterado)</string>
     <string name="notice_room_name_removed">%1$s apagou o nome da sala</string>
     <string name="notice_room_topic_removed">%1$s apagou o tópico da sala</string>
-    <string name="notice_event_redacted">removeu a mensagem %1$s </string>
-    <string name="notice_event_redacted_by"> por %1$s</string>
-    <string name="notice_event_redacted_reason">  [razão: %1$s]</string>
     <string name="notice_profile_change_redacted">%1$s atualizou o seu perfil %2$s</string>
     <string name="notice_room_third_party_invite">%1$s enviou um convite para que %2$s se junte à sala</string>
     <string name="notice_room_third_party_registered_invite">%1$s aceitou o convite para %2$s</string>
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 340751c2..adfed47e 100644
--- a/matrix-sdk-android/src/main/res/values-pt/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-pt/strings.xml
@@ -39,9 +39,6 @@
     <string name="notice_avatar_changed_too">(o avatar também foi alterado)</string>
     <string name="notice_room_name_removed">%1$s removeu o nome da sala</string>
     <string name="notice_room_topic_removed">%1$s removeu o tópico da sala</string>
-    <string name="notice_event_redacted">"apagou a mensagem %1$s "</string>
-    <string name="notice_event_redacted_by"> por %1$s</string>
-    <string name="notice_event_redacted_reason">  [razão: %1$s]</string>
     <string name="notice_profile_change_redacted">%1$s atualizou o seu perfil %2$s</string>
     <string name="notice_room_third_party_invite">%1$s enviou um convite para que %2$s se junte à sala</string>
     <string name="notice_room_third_party_registered_invite">%1$s aceitou o convite para %2$s</string>
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 216c7b7e..4799ecfd 100644
--- a/matrix-sdk-android/src/main/res/values-ru/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-ru/strings.xml
@@ -39,9 +39,6 @@
     <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>
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 dabc86f7..b1a0a4f8 100644
--- a/matrix-sdk-android/src/main/res/values-sk/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-sk/strings.xml
@@ -38,9 +38,6 @@
     <string name="notice_avatar_changed_too">(a tiež obrázok v profile)</string>
     <string name="notice_room_name_removed">%1$s odstránil názov miestnosti</string>
     <string name="notice_room_topic_removed">%1$s odstránil tému miestnosti</string>
-    <string name="notice_event_redacted">"vymazané %1$s "</string>
-    <string name="notice_event_redacted_by">používateľom %1$s</string>
-    <string name="notice_event_redacted_reason">[dôvod: %1$s]</string>
     <string name="notice_profile_change_redacted">%1$s aktualizoval svoj profil %2$s</string>
     <string name="notice_room_third_party_invite">%1$s pozval %2$s vstúpiť do miestnosti</string>
     <string name="notice_room_third_party_registered_invite">%1$s prijal pozvanie do %2$s</string>
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 7231a7ce..31c1a408 100644
--- a/matrix-sdk-android/src/main/res/values-sq/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-sq/strings.xml
@@ -28,8 +28,6 @@
 
     <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>
 
@@ -76,7 +74,6 @@
     <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>
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 53e530b7..62f58c9e 100644
--- a/matrix-sdk-android/src/main/res/values-te/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-te/strings.xml
@@ -33,9 +33,6 @@
     <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">%2$sకోసం %1$s ఆహ్వానాన్ని అంగీకరించారు</string>
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 32055426..9f8e9078 100644
--- a/matrix-sdk-android/src/main/res/values-uk/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-uk/strings.xml
@@ -49,9 +49,6 @@
     <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>
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 7c9ff164..563fdded 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
@@ -35,7 +35,6 @@
     <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_crypto_unable_to_decrypt">** 无法解密：%s **</string>
     <string name="notice_crypto_error_unkwown_inbound_session_id">发送者的设备没有向我们发送此消息的密钥。</string>
 
@@ -55,8 +54,6 @@
 
     <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_room_third_party_invite">%1$s 向 %2$s 发送了加入聊天室的邀请</string>
     <string name="notice_room_third_party_registered_invite">%1$s 接受了 %2$s 的邀请</string>
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 132bdea7..3ab114b6 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
@@ -38,9 +38,6 @@
     <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>
diff --git a/matrix-sdk-android/src/main/res/values/strings.xml b/matrix-sdk-android/src/main/res/values/strings.xml
index af459dc6..2172c095 100644
--- a/matrix-sdk-android/src/main/res/values/strings.xml
+++ b/matrix-sdk-android/src/main/res/values/strings.xml
@@ -39,9 +39,10 @@
     <string name="notice_avatar_changed_too">(avatar was changed too)</string>
     <string name="notice_room_name_removed">%1$s removed the room name</string>
     <string name="notice_room_topic_removed">%1$s removed the room topic</string>
-    <string name="notice_event_redacted">redacted %1$s </string>
-    <string name="notice_event_redacted_by"> by %1$s</string>
-    <string name="notice_event_redacted_reason">  [reason: %1$s]</string>
+    <string name="notice_event_redacted">Message removed</string>
+    <string name="notice_event_redacted_by">Message removed by %1$s</string>
+    <string name="notice_event_redacted_with_reason">Message removed [reason: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Message removed by %1$s [reason: %2$s]</string>
     <string name="notice_profile_change_redacted">%1$s updated their profile %2$s</string>
     <string name="notice_room_third_party_invite">%1$s sent an invitation to %2$s to join the room</string>
     <string name="notice_room_third_party_registered_invite">%1$s accepted the invitation for %2$s</string>
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index 58ef5d02..9b75ad41 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -1439,4 +1439,6 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
     <string name="notification_sender_me">Minä</string>
     <string name="notification_inline_reply_failed">** Lähetys epäonnistui — avaathan huoneen</string>
 
+    <string name="error_jitsi_not_supported_on_old_device">Valitettavasti konferenssipuhelut Jitsin kanssa eivät toimi vanhoissa laitteissa (laitteet, joissa on Android 5.0 tai vanhempi)</string>
+
 </resources>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 87f29e27..3cf3ceda 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -1403,4 +1403,6 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
     <string name="notification_sender_me">Moi</string>
     <string name="notification_inline_reply_failed">** Échec de l’envoi − veuillez ouvrir le salon</string>
 
+    <string name="error_jitsi_not_supported_on_old_device">Désolé, les appels en visioconférence avec Jitsi ne sont pas pris en charge sur les vieux appareils (avec une version d\'Android antérieure à 5.0)</string>
+
 </resources>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 129d550d..58a5ea37 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -860,7 +860,7 @@ Ismeretlen eszközök:</string>
     <string name="settings_notification_privacy">Értesítés adatvédelme</string>
     <string name="settings_notification_privacy_reduced">Csökkentett adatvédelem</string>
     <string name="settings_notification_privacy_need_permission">"Az alkalmazásnak engedélyre van szüksége háttérben futáshoz "</string>
-    <string name="settings_notification_privacy_message_content_not_shown">• Az értesítések <b>nem mutatják az üzenet tartalmát</b></string>
+    <string name="settings_notification_privacy_message_content_not_shown">• Az értesítések <b>nem fogják mutatni az üzenet tartalmát</b></string>
 
     <string name="startup_notification_privacy_title">Értesítés adatvédelme</string>
     <string name="title_activity_choose_sticker">Matrica küldése</string>
@@ -1402,4 +1402,6 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="notification_sender_me">Én</string>
     <string name="notification_inline_reply_failed">** A küldés nem sikerült - kérlek nyisd meg a szobát</string>
 
+    <string name="error_jitsi_not_supported_on_old_device">Elnézést, Jitsi konferencia hívások a régi eszközökön (Android OS 5.0-nál régebbi) nem támogatottak</string>
+
 </resources>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 55d85d1b..d1231139 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -713,7 +713,7 @@ Attenzione: questo file può essere eliminato se l\'applicazione viene disinstal
     <string name="dark_theme">Tema Scuro</string>
     <string name="black_them">Tema Nero</string>
 
-    <string name="notification_sync_in_progress">Sincronizzazione</string>
+    <string name="notification_sync_in_progress">Sincronizzazione…</string>
     <string name="settings_notification_ringtone">Suono notifiche</string>
     <string name="settings_12_24_timestamps">Mostra gli orari in formato 12 ore</string>
     <string name="widget_no_power_to_manage">Hai bisogno dei permessi per gestire i widget in questa stanza</string>
@@ -1447,4 +1447,6 @@ Per essere certo di non perdere nulla, mantieni gli aggiornamenti attivi."</stri
     <string name="notification_sender_me">Io</string>
     <string name="notification_inline_reply_failed">** Invio fallito - per favore apri la stanza</string>
 
+    <string name="error_jitsi_not_supported_on_old_device">Spiacenti, le chiamate di gruppo con Jitsi non sono supportate sui vecchi dispositivi (con Android precedenti al 5.0)</string>
+
 </resources>
diff --git a/vector/src/main/res/values-nl/strings.xml b/vector/src/main/res/values-nl/strings.xml
index 5da497e2..7af59a43 100755
--- a/vector/src/main/res/values-nl/strings.xml
+++ b/vector/src/main/res/values-nl/strings.xml
@@ -1454,4 +1454,6 @@
 \n%s</string>
     <string name="autodiscover_well_known_autofill_confirm">Configuratie gebruiken</string>
 
+    <string name="error_jitsi_not_supported_on_old_device">Sorry, vergadergesprekken met Jitsi worden nog niet ondersteund op oudere apparaten (met een Android-versie lager dan 5.0)</string>
+
 </resources>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index 4a420001..7e8624f5 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -817,7 +817,7 @@
     <string name="settings_lazy_loading_title"><em>Lazy-load</em> anëtarët e dhomave</string>
     <string name="error_lazy_loading_not_supported_by_home_server">Shërbyesi juaj nuk e mbulon ende <em>lazy loading</em> e anëtarëve të dhomës. Provoni më vonë.</string>
 
-    <string name="notification_sync_in_progress">Njëkohësim</string>
+    <string name="notification_sync_in_progress">Po njëkohësohet…</string>
     <string name="redact">Hiqe</string>
     <string name="missing_permissions_warning">Për shkak lejesh që mungojnë, mund të mungojnë disa veçori…</string>
     <string name="missing_permissions_error">Ky veprim s’është i mundur, për shkak lejesh që mungojnë.</string>
@@ -1361,4 +1361,6 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
     <string name="notification_sender_me">Unë</string>
     <string name="notification_inline_reply_failed">** S’u arrit të dërgohej - ju lutemi, hapni dhomë</string>
 
+    <string name="error_jitsi_not_supported_on_old_device">Na ndjeni, thirrjet konferencë me Jitsi-n nuk mbulohen në pajisje të vjetra (pajisje me Android OS nën 5.0)</string>
+
 </resources>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 66d5f220..16cf9221 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -7,12 +7,12 @@
     <string name="dark_theme">深色主題</string>
     <string name="black_them">黑色主題</string>
 
-    <string name="notification_sync_in_progress">同步中</string>
+    <string name="notification_sync_in_progress">正在同步……</string>
     <string name="notification_listening_for_events">聆聽事件</string>
 
     <string name="title_activity_home">訊息</string>
     <string name="title_activity_room">聊天室</string>
-    <string name="title_activity_settings">設置</string>
+    <string name="title_activity_settings">設定</string>
     <string name="title_activity_member_details">會員訊息</string>
     <string name="title_activity_bug_report">錯誤回報</string>
     <string name="cancel">取消</string>
@@ -42,7 +42,7 @@
     <string name="rename">重新命名</string>
     <string name="report_content">回報內容</string>
     <string name="active_call">進行中的通話</string>
-    <string name="ongoing_conference_call">正在進行電話會議。
+    <string name="ongoing_conference_call">正在進行會議通話。 
 \n以 %1$s 或 %2$s 加入</string>
     <string name="ongoing_conference_call_voice">語音</string>
     <string name="ongoing_conference_call_video">視訊</string>
@@ -332,7 +332,7 @@
 
     <string name="room_participants_header_admin_tools">管理者工具</string>
     <string name="room_participants_header_call">通話</string>
-    <string name="room_participants_header_direct_chats">私聊</string>
+    <string name="room_participants_header_direct_chats">私人訊息</string>
     <string name="room_participants_header_devices">裝置</string>
 
     <string name="room_participants_action_invite">邀請</string>
@@ -473,7 +473,7 @@
     <string name="room_settings_mute">靜音</string>
     <string name="room_settings_favourite">我的最愛</string>
     <string name="room_settings_de_prioritize">降低優先順序</string>
-    <string name="room_settings_direct_chat">私人聊天</string>
+    <string name="room_settings_direct_chat">私人訊息</string>
     <string name="room_settings_leave_conversation">離開對話</string>
     <string name="room_settings_forget">忘記</string>
     <string name="room_settings_add_homescreen_shortcut">添加主熒幕快捷方式</string>
@@ -499,9 +499,9 @@
     <string name="settings_notification_privacy_normal">標準</string>
     <string name="settings_notification_privacy_reduced">低隱私模式</string>
     <string name="settings_notification_privacy_need_permission">應用程式需要權限以在後臺運行</string>
-    <string name="settings_notification_privacy_fcm">•通知將通過 Firebase 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_fcm">• 通知將透過 Firebase 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>
     <string name="settings_notification_privacy_message_content_not_shown">• 通知<b>不會顯示訊息內容</b></string>
 
@@ -754,9 +754,9 @@
     <string name="encryption_information_verify_device_warning2">如果符合的話，按下下方的驗證按鈕。若果沒有得話，那麼其他地方的某個人可能正在攔截這個裝置，您應該將其列入黑名單。未來，這個驗證程序會變得更加複雜。</string>
     <string name="encryption_information_verify_key_match">我驗證金鑰相符</string>
 
-    <string name="e2e_enabling_on_app_update">Riot 目前支援點對點加密，但您需要重新登入來啟用他。
-
-您可以現在重新登入或稍後在應用程式設定中進行。</string>
+    <string name="e2e_enabling_on_app_update">Riot 目前支援端到端加密，但您需要重新登入以啟用。
+\n
+\n您可以現在重新登入或稍後在應用程式設定中進行。</string>
 
     <string name="unknown_devices_alert_title">聊天室包含未知裝置</string>
     <string name="unknown_devices_alert_message">此聊天室包含未經驗證的裝置。
@@ -800,7 +800,7 @@
     <string name="widget_creation_failure">創建小部件失敗</string>
     <string name="event_formatter_widget_added">%1$s 已由 %2$s 新增</string>
     <string name="event_formatter_widget_removed">%1$s 被 %2$s 移除</string>
-    <string name="settings_labs_create_conference_with_jitsi">使用 jitsi 建立會議電話</string>
+    <string name="settings_labs_create_conference_with_jitsi">使用 jitsi 建立會議通話</string>
     <string name="widget_delete_message_confirmation">您確定要從聊天室刪除小工具嗎？</string>
     <plurals name="active_widgets">
         <item quantity="other">已啓用 %d 個小部件</item>
@@ -1040,7 +1040,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="settings_troubleshoot_test_account_settings_title">帳號設定。</string>
     <string name="settings_troubleshoot_test_account_settings_success">通知已為您的帳號啟用。</string>
     <string name="settings_troubleshoot_test_account_settings_failed">通知已為您的帳號停用。
-請檢查帳號設定。</string>
+\n請檢查帳號設定。</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">啟用</string>
 
     <string name="settings_troubleshoot_test_device_settings_title">裝置設定。</string>
@@ -1307,8 +1307,8 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="keys_backup_settings_untrusted_backup">要在此裝置上使用金鑰備份，現在就使用您的通關密語或復原金鑰復原。</string>
     <string name="new_recovery_method_popup_title">新的金鑰備份</string>
     <string name="new_recovery_method_popup_description">已偵測到新的安全訊息金鑰備份。
-
-如果您並沒有設定新的復原方法，那麼可能是有攻擊者在嘗試存取您的帳號。在設定中變更您的帳號密碼並立刻設定新的復原方法。</string>
+\n
+\n如果您並沒有設定新的復原方法，那麼可能是有攻擊者在嘗試存取您的帳號。在設定中變更您的帳號密碼並立刻設定新的復原方法。</string>
     <string name="new_recovery_method_popup_was_me">這是我</string>
     <string name="keys_backup_restoring_computing_key_waiting_message">正在計算復原金鑰……</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">正在下載金鑰……</string>
@@ -1355,4 +1355,6 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="notification_sender_me">我</string>
     <string name="notification_inline_reply_failed">** 傳送失敗 - 請開啟聊天室</string>
 
+    <string name="error_jitsi_not_supported_on_old_device">抱歉，使用 Jitsi 建立會議通話在舊裝置上並不支援（Android 系統版本小於 5.0 的裝置）</string>
+
 </resources>