diff --git a/matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml b/matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml
index 8490c35d78..805d13a62a 100644
--- a/matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml
@@ -21,7 +21,7 @@
     <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="summary_message">%1$s: %2$s</string>
+    <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_you_sent_image">আপনি একটি ছবি প্রেরণ করেছেন।</string>
     <string name="summary_you_sent_sticker">আপনি একটি স্তিকার পাঠিয়েছেন।</string>
 
@@ -130,9 +130,9 @@
     <string name="room_displayname_two_members">%1$s এবং %2$s</string>
 
     <plurals name="room_displayname_three_and_more_members">
-	<item quantity="one">%1$s এবং অন্য ১ জন</item>
-	<item quantity="other">%1$s এবং অন্যান্য %2$d জন</item>
-</plurals>
+        <item quantity="one">%1$s এবং অন্য ১ জন</item>
+        <item quantity="other">%1$s এবং অন্যান্য %2$d জন</item>
+    </plurals>
 
     <string name="room_displayname_empty_room">খালি কক্ষ</string>
 
@@ -249,24 +249,24 @@
     <string name="notice_room_withdraw_with_reason_by_you">আপনি %1$s এর আমন্ত্রণ প্রত্যাহার করেছেন। কারণ: %2$s</string>
 
     <plurals name="notice_room_aliases_added">
-	<item quantity="one">%1$s এই ঘরের ঠিকানা হিসাবে %2$s যুক্ত করেছে।</item>
-	<item quantity="other">%1$s এই ঘরের ঠিকানাগুলি হিসাবে %2$s যুক্ত করেছে।</item>
-</plurals>
+        <item quantity="one">%1$s এই ঘরের ঠিকানা হিসাবে %2$s যুক্ত করেছে।</item>
+        <item quantity="other">%1$s এই ঘরের ঠিকানাগুলি হিসাবে %2$s যুক্ত করেছে।</item>
+    </plurals>
 
     <plurals name="notice_room_aliases_added_by_you">
-	<item quantity="one">আপনি এই কক্ষের জন্য ঠিকানা হিসাবে %1$s যুক্ত করেছেন।</item>
-	<item quantity="other">আপনি এই কক্ষের ঠিকানা হিসাবে %1$s যুক্ত করেছেন।</item>
-</plurals>
+        <item quantity="one">আপনি এই কক্ষের জন্য ঠিকানা হিসাবে %1$s যুক্ত করেছেন।</item>
+        <item quantity="other">আপনি এই কক্ষের ঠিকানা হিসাবে %1$s যুক্ত করেছেন।</item>
+    </plurals>
 
     <plurals name="notice_room_aliases_removed">
-	<item quantity="one">%1$s এই ঘরের ঠিকানা হিসাবে %2$s সরানো হয়েছে।</item>
-	<item quantity="other">%1$s %3$s কে এই ঘরের ঠিকানা হিসাবে সরানো হয়েছে।</item>
-</plurals>
+        <item quantity="one">%1$s এই ঘরের ঠিকানা হিসাবে %2$s সরানো হয়েছে।</item>
+        <item quantity="other">%1$s %3$s কে এই ঘরের ঠিকানা হিসাবে সরানো হয়েছে।</item>
+    </plurals>
 
     <plurals name="notice_room_aliases_removed_by_you">
-	<item quantity="one">আপনি এই ঘরের ঠিকানা হিসাবে %1$s সরিয়েছেন।</item>
-	<item quantity="other">আপনি এই ঘরের ঠিকানা হিসাবে %2$s গুলি সরিয়েছেন।</item>
-</plurals>
+        <item quantity="one">আপনি এই ঘরের ঠিকানা হিসাবে %1$s সরিয়েছেন।</item>
+        <item quantity="other">আপনি এই ঘরের ঠিকানা হিসাবে %2$s গুলি সরিয়েছেন।</item>
+    </plurals>
 
     <string name="notice_room_aliases_added_and_removed">%1$s %2$s যোগ করেছে এবং %3$s গুলি এই ঘরের ঠিকানা হিসাবে সরানো হয়েছে।</string>
     <string name="notice_room_aliases_added_and_removed_by_you">আপনি %1$s যোগ করেছেন এবং %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 87921c7a86..7ec9240067 100644
--- a/matrix-sdk-android/src/main/res/values-de/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-de/strings.xml
@@ -206,7 +206,7 @@
 
     <string name="key_verification_request_fallback_message">%s fordert zur Überprüfung deines Schlüssels auf, jedoch unterstützt dein Client nicht die Schlüsselüberprüfung im Chat. Du musst die herkömmliche Schlüsselüberprüfung verwenden, um die Schlüssel zu überprüfen.</string>
 
-<string name="summary_you_sent_image">Du hast ein Bild gesendet.</string>
+    <string name="summary_you_sent_image">Du hast ein Bild gesendet.</string>
     <string name="summary_you_sent_sticker">Du hast einen Sticker gesendet.</string>
 
     <string name="notice_room_invite_no_invitee_by_you">Deine Einladung</string>
@@ -277,14 +277,14 @@
     <string name="notice_room_withdraw_with_reason_by_you">Du hast die Einladung von %1$s abgelehnt. Grund: %2$s</string>
 
     <plurals name="notice_room_aliases_added_by_you">
-	<item quantity="one">Du hast die Raumaddresse %1$s hinzugefügt.</item>
-	<item quantity="other">Du hast die Raumaddressen %1$s hinzugefügt.</item>
-</plurals>
+        <item quantity="one">Du hast die Raumaddresse %1$s hinzugefügt.</item>
+        <item quantity="other">Du hast die Raumaddressen %1$s hinzugefügt.</item>
+    </plurals>
 
     <plurals name="notice_room_aliases_removed_by_you">
-	<item quantity="one">Du hast die Raumaddresse %1$s vom Raum entfernt.</item>
-	<item quantity="other">Du hast die Raumaddressen %1$s vom Raum entfernt.</item>
-</plurals>
+        <item quantity="one">Du hast die Raumaddresse %1$s vom Raum entfernt.</item>
+        <item quantity="other">Du hast die Raumaddressen %1$s vom Raum entfernt.</item>
+    </plurals>
 
     <string name="notice_room_aliases_added_and_removed_by_you">Du hast den Raumaddressen %1$s hinzugefügt und %2$s entfernt.</string>
 
@@ -301,6 +301,6 @@
     <string name="call_notification_reject">Ablehnen</string>
     <string name="call_notification_hangup">Anruf beenden</string>
 
-<string name="notice_call_candidates">%s hat Daten gesendet, um einen Anruf zu starten.</string>
+    <string name="notice_call_candidates">%s hat Daten gesendet, um einen Anruf zu starten.</string>
     <string name="notice_call_candidates_by_you">Du hast Daten geschickt, um eine Anruf zu starten.</string>
-    </resources>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-et/strings.xml b/matrix-sdk-android/src/main/res/values-et/strings.xml
index 3b90d963de..657d5446eb 100644
--- a/matrix-sdk-android/src/main/res/values-et/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-et/strings.xml
@@ -199,7 +199,7 @@
     <string name="key_verification_request_fallback_message">%s soovib verifitseerida sinu võtmeid, kuid sinu kasutatav klient ei oska vestluse-sisest verifitseerimist teha. Sa pead kasutama traditsioonilist verifitseerimislahendust.</string>
 
     <string name="notice_room_created">Kasutaja %1$s lõi jututoa</string>
-<string name="summary_you_sent_image">Sina saatsid pildi.</string>
+    <string name="summary_you_sent_image">Sina saatsid pildi.</string>
     <string name="summary_you_sent_sticker">Sina saatsid kleepsu.</string>
 
     <string name="notice_room_invite_no_invitee_by_you">Sinu kutse</string>
@@ -275,14 +275,14 @@
     <string name="notice_room_withdraw_with_reason_by_you">Sina võtsid tagasi kasutaja %1$s kutse. Põhjus: %2$s</string>
 
     <plurals name="notice_room_aliases_added_by_you">
-	<item quantity="one">Sina lisasid %1$s selle jututoa aadressiks.</item>
-	<item quantity="other">Sina lisasid %1$s selle jututoa aadressideks.</item>
-</plurals>
+        <item quantity="one">Sina lisasid %1$s selle jututoa aadressiks.</item>
+        <item quantity="other">Sina lisasid %1$s selle jututoa aadressideks.</item>
+    </plurals>
 
     <plurals name="notice_room_aliases_removed_by_you">
-	<item quantity="one">Sina eemaldasid %1$s, kui selle jututoa aadressi.</item>
-	<item quantity="other">Sina eemaldasid %1$s selle jututoa aadresside hulgast.</item>
-</plurals>
+        <item quantity="one">Sina eemaldasid %1$s, kui selle jututoa aadressi.</item>
+        <item quantity="other">Sina eemaldasid %1$s selle jututoa aadresside hulgast.</item>
+    </plurals>
 
     <string name="notice_room_aliases_added_and_removed_by_you">Sina lisasid %1$s selle jututoa aadressiks ning eemaldasid %2$s aadresside hulgast.</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 1a4c8f39ef..2b2a097f13 100644
--- a/matrix-sdk-android/src/main/res/values-it/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-it/strings.xml
@@ -204,7 +204,7 @@
     <string name="key_verification_request_fallback_message">%s sta chiedendo di verificare la tua chiave, ma il tuo client non supporta la verifica in-chat. Dovrai usare il metodo di verifica obsoleto per verificare le chiavi.</string>
 
     <string name="notice_room_created">%1$s ha creato la stanza</string>
-<string name="summary_you_sent_image">Hai inviato un\'immagine.</string>
+    <string name="summary_you_sent_image">Hai inviato un\'immagine.</string>
     <string name="summary_you_sent_sticker">Hai inviato un adesivo.</string>
 
     <string name="notice_room_invite_no_invitee_by_you">Il tuo invito</string>
@@ -276,14 +276,14 @@
     <string name="notice_room_withdraw_with_reason_by_you">Hai ritirato l\'invito di %2$s. Motivo: %2$s</string>
 
     <plurals name="notice_room_aliases_added_by_you">
-	<item quantity="one">Hai aggiunto %1$s come indirizzo per questa stanza.</item>
-	<item quantity="other">Hai aggiunto %1$s come indirizzi per questa stanza.</item>
-</plurals>
+        <item quantity="one">Hai aggiunto %1$s come indirizzo per questa stanza.</item>
+        <item quantity="other">Hai aggiunto %1$s come indirizzi per questa stanza.</item>
+    </plurals>
 
     <plurals name="notice_room_aliases_removed_by_you">
-	<item quantity="one">Hai rimosso %1$s come indirizzo per questa stanza.</item>
-	<item quantity="other">Hai rimosso %2$s come indirizzi per questa stanza.</item>
-</plurals>
+        <item quantity="one">Hai rimosso %1$s come indirizzo per questa stanza.</item>
+        <item quantity="other">Hai rimosso %2$s come indirizzi per questa stanza.</item>
+    </plurals>
 
     <string name="notice_room_aliases_added_and_removed_by_you">Hai aggiunto %1$s e rimosso %2$s come indirizzi per questa stanza.</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 7e8daa0bdc..7c5d6fe583 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
@@ -81,12 +81,12 @@
     <string name="room_displayname_empty_room">Sala vazia</string>
 
     <plurals name="room_displayname_three_and_more_members">
-	<item quantity="one">%1$s e 1 outro</item>
-	<item quantity="other">%1$s e %2$d outros</item>
-</plurals>
+        <item quantity="one">%1$s e 1 outro</item>
+        <item quantity="other">%1$s e %2$d outros</item>
+    </plurals>
 
 
-<string name="summary_you_sent_image">Você enviou uma foto.</string>
+    <string name="summary_you_sent_image">Você enviou uma foto.</string>
     <string name="summary_you_sent_sticker">Você enviou uma figurinha.</string>
 
     <string name="notice_room_invite_no_invitee_by_you">Seu convite</string>
@@ -263,24 +263,24 @@
     <string name="notice_room_withdraw_with_reason_by_you">Você desfez o convite de %1$s. Motivo: %2$s</string>
 
     <plurals name="notice_room_aliases_added">
-	<item quantity="one">%1$s adicionou %2$s como um endereço desta sala.</item>
-	<item quantity="other">%1$s adicionou %2$s como endereços desta sala.</item>
-</plurals>
+        <item quantity="one">%1$s adicionou %2$s como um endereço desta sala.</item>
+        <item quantity="other">%1$s adicionou %2$s como endereços desta sala.</item>
+    </plurals>
 
     <plurals name="notice_room_aliases_added_by_you">
-	<item quantity="one">Você adicionou %1$s como um endereço desta sala.</item>
-	<item quantity="other">Você adicionou %1$s como endereços desta sala.</item>
-</plurals>
+        <item quantity="one">Você adicionou %1$s como um endereço desta sala.</item>
+        <item quantity="other">Você adicionou %1$s como endereços desta sala.</item>
+    </plurals>
 
     <plurals name="notice_room_aliases_removed">
-	<item quantity="one">%1$s removeu %2$s como um endereço desta sala.</item>
-	<item quantity="other">%1$s removeu %3$s como endereços desta sala.</item>
-</plurals>
+        <item quantity="one">%1$s removeu %2$s como um endereço desta sala.</item>
+        <item quantity="other">%1$s removeu %3$s como endereços desta sala.</item>
+    </plurals>
 
     <plurals name="notice_room_aliases_removed_by_you">
-	<item quantity="one">Você removeu %1$s como um endereço desta sala.</item>
-	<item quantity="other">Você removeu %2$s como endereços desta sala.</item>
-</plurals>
+        <item quantity="one">Você removeu %1$s como um endereço desta sala.</item>
+        <item quantity="other">Você removeu %2$s como endereços desta sala.</item>
+    </plurals>
 
     <string name="notice_room_aliases_added_and_removed">%1$s adicionou %2$s e removeu %3$s como endereços desta sala.</string>
     <string name="notice_room_aliases_added_and_removed_by_you">Você adicionou %1$s e removeu %2$s como endereços desta sala.</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 5c4962b419..1657d80f1c 100644
--- a/matrix-sdk-android/src/main/res/values-ru/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-ru/strings.xml
@@ -83,7 +83,7 @@
         <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 quantity="other" />
     </plurals>
 
 
@@ -195,10 +195,10 @@
 
     <string name="notice_room_created">%1$s создал(а) комнату</string>
     <plurals name="notice_room_aliases_added">
-	<item quantity="one">%1$s добавил(а) %2$s в качестве адреса для этой комнаты.</item>
-	<item quantity="few">%1$s добавил(а) %2$s в качестве адресов для этой комнаты.</item>
-	<item quantity="many">%1$s добавил(а) %2$s в качестве адресов для этой комнаты.</item>
-</plurals>
+        <item quantity="one">%1$s добавил(а) %2$s в качестве адреса для этой комнаты.</item>
+        <item quantity="few">%1$s добавил(а) %2$s в качестве адресов для этой комнаты.</item>
+        <item quantity="many">%1$s добавил(а) %2$s в качестве адресов для этой комнаты.</item>
+    </plurals>
 
     <plurals name="notice_room_aliases_removed">
         <item quantity="one">%1$s удалил(а) адрес %2$s для комнаты.</item>
@@ -307,7 +307,7 @@
     <string name="notice_end_to_end_ok_by_you">Вы включили сквозное шифрование.</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Вы включили сквозное шифрование (неизвестный алгоритм %1$s).</string>
 
-<string name="notice_room_avatar_changed">%1$s изменил(а) аватар комнаты</string>
+    <string name="notice_room_avatar_changed">%1$s изменил(а) аватар комнаты</string>
     <string name="notice_room_avatar_changed_by_you">Вы изменили аватар комнаты</string>
     <string name="notice_call_candidates">%s отправил(а) данные для начала звонка.</string>
     <string name="notice_call_candidates_by_you">Вы отправили данные для начала звонка.</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 928401d7c4..ef080e8357 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
@@ -199,7 +199,7 @@
     <string name="key_verification_request_fallback_message">%s 正在请求验证您的密钥，但您的客户端不支援聊天中密钥验证。 您将必须使用旧版的密钥验证来验证金钥。</string>
 
     <string name="notice_room_created">%1$s 创建了这个聊天室</string>
-<string name="summary_you_sent_image">您发送了一张图片。</string>
+    <string name="summary_you_sent_image">您发送了一张图片。</string>
     <string name="summary_you_sent_sticker">您发送了一张贴纸。</string>
 
     <string name="notice_room_invite_no_invitee_by_you">您的邀请</string>
@@ -271,12 +271,12 @@
     <string name="notice_room_withdraw_with_reason_by_you">您撤回了 %1$s 的邀请。理由：%2$s</string>
 
     <plurals name="notice_room_aliases_added_by_you">
-	<item quantity="other">您新增了 %1$s 为此聊天室的地址。</item>
-</plurals>
+        <item quantity="other">您新增了 %1$s 为此聊天室的地址。</item>
+    </plurals>
 
     <plurals name="notice_room_aliases_removed_by_you">
-	<item quantity="other">您移除了此聊天室的 %2$s 地址。</item>
-</plurals>
+        <item quantity="other">您移除了此聊天室的 %2$s 地址。</item>
+    </plurals>
 
     <string name="notice_room_aliases_added_and_removed_by_you">您为此聊天室新增了 %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 486bdd0b50..ee2662f143 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
@@ -200,7 +200,7 @@
     <string name="key_verification_request_fallback_message">%s 正在請求驗證您的金鑰，但您的客戶端不支援聊天中金鑰驗證。您將必須使用舊版的金鑰驗證來驗證金鑰。</string>
 
     <string name="notice_room_created">%1$s 建立了聊天室</string>
-<string name="summary_you_sent_image">您傳送了圖片。</string>
+    <string name="summary_you_sent_image">您傳送了圖片。</string>
     <string name="summary_you_sent_sticker">您傳送了貼圖。</string>
 
     <string name="notice_room_invite_no_invitee_by_you">您的邀請</string>
@@ -272,12 +272,12 @@
     <string name="notice_room_withdraw_with_reason_by_you">您撤回了 %1$s 的邀請。理由：%2$s</string>
 
     <plurals name="notice_room_aliases_added_by_you">
-	<item quantity="other">您為此聊天室新增了 %1$s 作為地址。</item>
-</plurals>
+        <item quantity="other">您為此聊天室新增了 %1$s 作為地址。</item>
+    </plurals>
 
     <plurals name="notice_room_aliases_removed_by_you">
-	<item quantity="other">您為此聊天室移除了 %2$s 作為地址。</item>
-</plurals>
+        <item quantity="other">您為此聊天室移除了 %2$s 作為地址。</item>
+    </plurals>
 
     <string name="notice_room_aliases_added_and_removed_by_you">您為此聊天室新增了 %1$s 並移除了 %2$s 作為地址。</string>
 
diff --git a/vector/lint.xml b/vector/lint.xml
index 9a0c6e9a1c..8acd8af9b6 100644
--- a/vector/lint.xml
+++ b/vector/lint.xml
@@ -6,6 +6,7 @@
     <issue id="MissingTranslation" severity="warning" />
     <issue id="TypographyEllipsis" severity="error" />
     <issue id="ImpliedQuantity" severity="warning" />
+    <issue id="UnusedQuantity" severity="error" />
     <issue id="IconXmlAndPng" severity="error" />
     <issue id="IconDipSize" severity="error" />
     <issue id="IconDuplicatesConfig" severity="error" />
diff --git a/vector/src/main/play/listings/en-US/full-description.txt b/vector/src/main/play/listings/en-US/full_description.txt
similarity index 100%
rename from vector/src/main/play/listings/en-US/full-description.txt
rename to vector/src/main/play/listings/en-US/full_description.txt
diff --git a/vector/src/main/play/listings/en-US/short-description.txt b/vector/src/main/play/listings/en-US/short_description.txt
similarity index 100%
rename from vector/src/main/play/listings/en-US/short-description.txt
rename to vector/src/main/play/listings/en-US/short_description.txt
diff --git a/vector/src/main/res/values-bn-rIN/strings.xml b/vector/src/main/res/values-bn-rIN/strings.xml
index fed8adb89a..6a618b04f0 100644
--- a/vector/src/main/res/values-bn-rIN/strings.xml
+++ b/vector/src/main/res/values-bn-rIN/strings.xml
@@ -480,7 +480,7 @@
     <string name="room_details_settings">সেটিংস</string>
     <plurals name="room_details_selected">
         <item quantity="one">%d নির্বাচিত</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <string name="malformed_id">বিকৃত পরিচয়।একটি ইমেইল ঠিকানা বা একটি মাধ্যমিক পরিচয় হতে হবে যেমন \'@localpart:domain\'</string>
     <string name="room_details_people_invited_group_name">আমন্ত্রিত</string>
@@ -1246,7 +1246,7 @@
     <string name="resource_limit_soft_mau"> এই হোমসার্ভারটি তার মাসিক অ্যাক্টিভ ব্যবহারকারীর সীমাটিতে আঘাত করেছে তাই <b> কিছু ব্যবহারকারী লগ ইন করতে পারবেন না </b>।</string>
     <string name="resource_limit_hard_mau">এই হোমসার্ভারটি তার মাসিক সক্রিয় ব্যবহারকারীর সীমাতে ছুঁয়েছে।</string>
 
-<string name="resources_script">Beng</string>
+    <string name="resources_script">Beng</string>
 
     <string name="play_video">চালু</string>
     <string name="pause_video">থামাও</string>
@@ -1314,9 +1314,9 @@
     <string name="disabled_integration_dialog_content">এটি করতে সেটিংসে \'একীকরণের অনুমতি দিন\' সক্ষম করুন।</string>
 
     <plurals name="room_settings_banned_users_count">
-	<item quantity="one">%d নিষিদ্ধ ব্যবহারকারী</item>
-	<item quantity="other">%d নিষিদ্ধ ব্যবহারকারী</item>
-</plurals>
+        <item quantity="one">%d নিষিদ্ধ ব্যবহারকারী</item>
+        <item quantity="other">%d নিষিদ্ধ ব্যবহারকারী</item>
+    </plurals>
 
     <string name="encryption_exported_successfully">কীগুলি সফলভাবে উত্পাদন হয়েছিল</string>
 
@@ -1408,4 +1408,4 @@
     <string name="keys_backup_restore_is_getting_backup_version">ব্যাকআপ সংস্করণ আনছে…</string>
     <string name="keys_backup_restore_with_passphrase">আপনার এনক্রিপ্ট করা বার্তাগুলির ইতিহাস আনলক করতে আপনার পুনরুদ্ধার পাসফ্রেজটি ব্যবহার করুন</string>
     <string name="keys_backup_restore_use_recovery_key">আপনার পুনরুদ্ধার কী ব্যবহার করুন</string>
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index aea2756d7a..e4b5414043 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -253,8 +253,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <plurals name="membership_changes">
         <item quantity="one">1 změna členství</item>
         <item quantity="few">%d změny členství</item>
-        <item quantity="many">%d změn členství</item>
-        <item quantity="other" />
+        <item quantity="other">%d změn členství</item>
     </plurals>
 
     <string name="compression_options">Odeslat jako</string>
@@ -341,14 +340,12 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <plurals name="room_header_active_members_count">
         <item quantity="one">1 aktivní člen</item>
         <item quantity="few">%d aktivní členové</item>
-        <item quantity="many">%d aktivních členů</item>
-        <item quantity="other" />
+        <item quantity="other">%d aktivních členů</item>
     </plurals>
     <plurals name="room_title_members">
         <item quantity="one">1 člen</item>
         <item quantity="few">%d členové</item>
-        <item quantity="many">%d členů</item>
-        <item quantity="other" />
+        <item quantity="other">%d členů</item>
     </plurals>
     <string name="room_title_one_member">1 člen</string>
     <plurals name="format_time_s">
@@ -439,8 +436,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <plurals name="room_new_messages_notification">
         <item quantity="one">1 nová zpráva</item>
         <item quantity="few">%d nové zprávy</item>
-        <item quantity="many">%d nových zpráv</item>
-        <item quantity="other" />
+        <item quantity="other">%d nových zpráv</item>
     </plurals>
 
     <string name="ssl_trust">Důvěřovat</string>
@@ -456,8 +452,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <plurals name="room_details_selected">
         <item quantity="one">1 vybrán</item>
         <item quantity="few">%d vybrány</item>
-        <item quantity="many">%d vybráno</item>
-        <item quantity="other" />
+        <item quantity="other">%d vybráno</item>
     </plurals>
     <string name="title_activity_keys_backup_setup">Záloha klíče</string>
     <string name="title_activity_keys_backup_restore">Použít zálohu klíče</string>
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index f391fc42fc..2dcb786186 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2398,7 +2398,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     </plurals>
     <string name="invite_users_to_room_failure">Wir konnten den Benutzer nicht einladen. Bitte überprüfe den Benutzernamen, welchen du einladen möchtest und versuche es erneut.</string>
 
-<string name="pause_video">Pause</string>
+    <string name="pause_video">Pause</string>
     <string name="action_copy">Kopieren</string>
     <string name="bottom_action_notification">Benachrichtigungen</string>
     <string name="call_failed_no_connection">Element-Anruf fehlgeschlagen</string>
@@ -2462,9 +2462,9 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="disabled_integration_dialog_content">Aktiviere \'Erlaube Integrationen\' in den Einstellungen um dies zu machen.</string>
 
     <plurals name="room_settings_banned_users_count">
-	<item quantity="one">%d gebannter Benutzer</item>
-	<item quantity="other">%d gebannte Benutzer</item>
-</plurals>
+        <item quantity="one">%d gebannter Benutzer</item>
+        <item quantity="other">%d gebannte Benutzer</item>
+    </plurals>
 
     <string name="encryption_exported_successfully">Schlüssel erfolgreich exportiert</string>
 
@@ -2625,5 +2625,5 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="settings_security_pin_code_title">Aktiviere PIN</string>
     <string name="settings_security_pin_code_summary">Wenn du deine PIN zurücksetzen möchtest, tippe \"PIN vergessen\" um dich abzumelden und sie anschließend zurückzusetzen.</string>
     <string name="auth_pin_confirm_to_disable_title">Bestätige PIN um die PIN zu deaktivieren</string>
-<string name="labs_merge_e2e_in_timeline">Übertragung von Schlüsseln zur Entschlüsselung in Nachrichtenverlauf fehlgeschlagen</string>
-    </resources>
+    <string name="labs_merge_e2e_in_timeline">Übertragung von Schlüsseln zur Entschlüsselung in Nachrichtenverlauf fehlgeschlagen</string>
+</resources>
diff --git a/vector/src/main/res/values-eo/strings.xml b/vector/src/main/res/values-eo/strings.xml
index bf8460e7af..0e4c464b9c 100644
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/vector/src/main/res/values-eo/strings.xml
@@ -597,9 +597,9 @@
 
     <string name="settings_troubleshoot_test_account_settings_title">Agordoj de konto.</string>
     <string name="settings_troubleshoot_test_account_settings_success">Sciigoj estas ŝaltitaj por via konto.</string>
-<string name="play_video">Ludi</string>
+    <string name="play_video">Ludi</string>
     <string name="pause_video">Paûzi</string>
     <string name="dismiss">Eksigi</string>
 
 
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index a80ba2dc96..5c029a902d 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -1850,7 +1850,7 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="login_reset_password_on">Reiniciar contraseña en %1$s</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">¡Las claves ya están al día!</string>
 
-<string name="play_video">Reproducir</string>
+    <string name="play_video">Reproducir</string>
     <string name="pause_video">Pausar</string>
     <string name="dismiss">Descartar</string>
 
@@ -1896,9 +1896,9 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="invitation_sent_to_one_user">Invitación enviada a %1$s</string>
     <string name="invitations_sent_to_two_users">Invitación enviada a %1$s y %2$s</string>
     <plurals name="invitations_sent_to_one_and_more_users">
-	<item quantity="one">Invitaciones enviadas a % $s y a uno más</item>
-	<item quantity="other">Invitaciones enviadas a %$s y a %2$d más</item>
-</plurals>
+        <item quantity="one">Invitaciones enviadas a % $s y a uno más</item>
+        <item quantity="other">Invitaciones enviadas a %$s y a %2$d más</item>
+    </plurals>
     <string name="invite_users_to_room_failure">No se pudo invitar el usuario. Por favor, intente nuevamente.</string>
 
     <string name="choose_locale_current_locale_title">Idioma actual</string>
@@ -1906,7 +1906,7 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="choose_locale_loading_locales">Cargando lenguajes disponibles</string>
 
     <string name="open_terms_of">Leer los terminos de %s</string>
-    <string name="disconnect_identity_server_dialog_content">Desconectarse del servidor de Identidad\?</string>
+    <string name="disconnect_identity_server_dialog_content">Desconectarse del servidor de Identidad %s\?</string>
     <string name="identity_server_error_outdated_identity_server">Servidor de identidad desactualizado. Element solo soporta API V2.</string>
     <string name="identity_server_error_outdated_home_server">Operacion no posible. Servidor desactualizado.</string>
     <string name="identity_server_error_no_identity_server_configured">Por favor, configure primero un Servidor de Identidad.</string>
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index 6d85de32fa..d5984ce706 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -279,7 +279,7 @@
     <string name="login_error_not_json">Ei sisaldanud korrektset JSON\'it</string>
     <string name="login_error_limit_exceeded">Liiga palju samaaegseid sisselogimispäringuid</string>
     <string name="login_error_user_in_use">See kasutajanimi on juba kasutusel</string>
-<string name="play_video">Esita</string>
+    <string name="play_video">Esita</string>
     <string name="pause_video">Peata</string>
     <string name="dismiss">Loobu</string>
 
@@ -320,9 +320,9 @@
     <string name="groups_list">Gruppide loend</string>
 
     <plurals name="membership_changes">
-	<item quantity="one">1 liikmelisuse muutus</item>
-	<item quantity="other">%d liikmelisuse muutust</item>
-</plurals>
+        <item quantity="one">1 liikmelisuse muutus</item>
+        <item quantity="other">%d liikmelisuse muutust</item>
+    </plurals>
 
     <string name="compression_options">Saada pilt</string>
     <string name="compression_opt_list_original">Algses suuruses</string>
@@ -416,9 +416,9 @@
     <string name="room_details_files">Failid</string>
     <string name="room_details_settings">Seadistused</string>
     <plurals name="room_details_selected">
-	<item quantity="one">1 valitud</item>
-	<item quantity="other">%d valitud</item>
-</plurals>
+        <item quantity="one">1 valitud</item>
+        <item quantity="other">%d valitud</item>
+    </plurals>
     <string name="malformed_id">Vigane kasutajatunnus. Peaksid kasutama kas e-posti aadressi või õiget Matrix\'i kasutajatunnust vormingus \'@toreinimene:domeen.ee\'</string>
     <string name="room_details_people_invited_group_name">KUTSUTUD</string>
     <string name="room_details_people_present_group_name">LIITUNUD</string>
@@ -489,7 +489,7 @@
     <string name="settings_security_pin_code_title">Võta PIN-kood kasutusele</string>
     <string name="settings_security_pin_code_summary">Kui sa soovid oma PIN-koodi lähtestada, siis klõpsi nuppu „Unustasin PIN-koodi“.</string>
     <string name="auth_pin_confirm_to_disable_title">PIN-koodi kasutuselt eemaldamiseks korda PIN-koodi</string>
-<string name="room_settings_never_send_to_unverified_devices_title">Kasuta krüptimist vaid verifitseeritud sessioonides</string>
+    <string name="room_settings_never_send_to_unverified_devices_title">Kasuta krüptimist vaid verifitseeritud sessioonides</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Ära iialgi saada sellest sessioonist krüptitud sõnumeid verifitseerimata sessioonidesse selles jututoas.</string>
 
     <string name="room_settings_addresses_no_local_addresses">Sellel jututoal puuduvad kohalikud aadressid</string>
@@ -533,9 +533,9 @@
     <string name="settings_labs_create_conference_with_jitsi">Algata rühmakõnesid jitsi vahendusel</string>
     <string name="widget_delete_message_confirmation">Kas oled kindel, et soovid siit jututoast selle vidina kustutada\?</string>
     <plurals name="active_widgets">
-	<item quantity="one">Kasutusel on üks vidin</item>
-	<item quantity="other">Kasutusel on %d vidinat</item>
-</plurals>
+        <item quantity="one">Kasutusel on üks vidin</item>
+        <item quantity="other">Kasutusel on %d vidinat</item>
+    </plurals>
     <string name="active_widgets_title">Kasutusel vidinad</string>
 
 
@@ -626,7 +626,7 @@
     <string name="settings_show_redacted_summary">Näita kustutatud sõnumite asemel kohatäidet</string>
     <string name="event_redacted_by_user_reason">Kasutaja kustutas sündmuse</string>
     <string name="event_redacted_by_admin_reason">Jututoa haldur on sündmust modereerinud</string>
-    <string name="last_edited_info_message">Viimati muudetud 1$s poolt, muutmise aeg %2$s</string>
+    <string name="last_edited_info_message">Viimati muudetud %1$s poolt, muutmise aeg %2$s</string>
 
 
     <string name="malformed_message">Vigaselt vormindatud sündmus ja kuvamine pole seetõttu võimalik</string>
@@ -697,13 +697,13 @@
     <string name="identity_server_error_outdated_identity_server">See isikutuvastusserver kasutab vana API\'t. Element toetab aga vaid API versiooni 2.</string>
     <string name="identity_server_error_outdated_home_server">See tegevus ei ole võimalik. Koduserveri versioon on liiga vana.</string>
     <plurals name="directory_search_rooms">
-	<item quantity="one">1 jututuba</item>
-	<item quantity="other">%d jututuba</item>
-</plurals>
+        <item quantity="one">1 jututuba</item>
+        <item quantity="other">%d jututuba</item>
+    </plurals>
     <plurals name="directory_search_rooms_for">
-	<item quantity="one">Otsingusõnaga %2$s leidsin %1$s jututoa</item>
-	<item quantity="other">Otsingusõnaga %2$s leidsin %1$s jututuba</item>
-</plurals>
+        <item quantity="one">Otsingusõnaga %2$s leidsin %1$s jututoa</item>
+        <item quantity="other">Otsingusõnaga %2$s leidsin %1$s jututuba</item>
+    </plurals>
     <string name="directory_searching_title">Otsin kataaloogist…</string>
 
     <string name="room_settings_all_messages_noisy">Kõik sõnumid (lärmakas)</string>
@@ -813,9 +813,9 @@
 
     <string name="room_settings_banned_users_title">Suhtluskeelu saanud kasutajad</string>
     <plurals name="room_settings_banned_users_count">
-	<item quantity="one">%d suhtluskeelu saanud kasutaja</item>
-	<item quantity="other">%d suhtluskeelu saanud kasutajat</item>
-</plurals>
+        <item quantity="one">%d suhtluskeelu saanud kasutaja</item>
+        <item quantity="other">%d suhtluskeelu saanud kasutajat</item>
+    </plurals>
 
     <string name="room_settings_category_advanced_title">Lisaseadistused</string>
     <string name="room_settings_room_internal_id">Selle jututoa sisemine tunnus</string>
@@ -918,4 +918,4 @@
     <string name="soft_logout_clear_data_dialog_title">Eemalda andmed</string>
     <string name="soft_logout_clear_data_dialog_content">Kas sa oled kindel, et soovid kustutada kõik andmed, mis on hetkel siin seadmes salvestatud\?
 \nOma sõnumite ja kontoandmete nägemiseks logi uuesti sisse.</string>
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index b20262b98b..6e5955ae32 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -60,9 +60,9 @@
     <string name="no_conversation_placeholder">گفتگوای نیست</string>
     <string name="rooms_header">اتاق‌ها</string>
     <plurals name="public_room_nb_users">
-	<item quantity="one">۱ کاربر</item>
-	<item quantity="other">%d کاربر</item>
-</plurals>
+        <item quantity="one">۱ کاربر</item>
+        <item quantity="other">%d کاربر</item>
+    </plurals>
 
     <string name="groups_invite_header">دعوت</string>
     <string name="no_group_placeholder">هیچ گروهی وجود ندارد</string>
@@ -243,21 +243,21 @@
     <string name="room_title_one_member">۱ عضو</string>
 
     <plurals name="format_time_s">
-	<item quantity="one">۱ ثانیه</item>
-	<item quantity="other">%d ثانیه</item>
-</plurals>
+        <item quantity="one">۱ ثانیه</item>
+        <item quantity="other">%d ثانیه</item>
+    </plurals>
     <plurals name="format_time_m">
-	<item quantity="one">۱ دقیقه</item>
-	<item quantity="other">%d دقیقه</item>
-</plurals>
+        <item quantity="one">۱ دقیقه</item>
+        <item quantity="other">%d دقیقه</item>
+    </plurals>
     <plurals name="format_time_h">
-	<item quantity="one">۱ ساعت</item>
-	<item quantity="other">%d ساعت</item>
-</plurals>
+        <item quantity="one">۱ ساعت</item>
+        <item quantity="other">%d ساعت</item>
+    </plurals>
     <plurals name="format_time_d">
-	<item quantity="one">۱ روز</item>
-	<item quantity="other">%d روز</item>
-</plurals>
+        <item quantity="one">۱ روز</item>
+        <item quantity="other">%d روز</item>
+    </plurals>
 
     <string name="room_participants_leave_prompt_title">ترک اتاق</string>
     <string name="room_participants_leave_prompt_msg">آیا از ترک این اتاق اطمینان دارید؟</string>
@@ -490,9 +490,9 @@
     </plurals>
 
     <plurals name="notification_compat_summary_title">
-	<item quantity="one">۱ آگاهی</item>
-	<item quantity="other">%d آگاهی</item>
-</plurals>
+        <item quantity="one">۱ آگاهی</item>
+        <item quantity="other">%d آگاهی</item>
+    </plurals>
 
     <string name="room_widget_permission_theme">زمینه‌تان</string>
     <string name="room_add_matrix_apps">افزودن کاره‌های ماتریس</string>
@@ -645,9 +645,9 @@
     <string name="settings_active_sessions_show_all">نمایش تمامی نشست‌ها</string>
     <string name="settings_active_sessions_manage">مدیریت نشست‌ها</string>
     <plurals name="settings_active_sessions_count">
-	<item quantity="one">۱ نشست فعّال</item>
-	<item quantity="other">%d نشست فعّال</item>
-</plurals>
+        <item quantity="one">۱ نشست فعّال</item>
+        <item quantity="other">%d نشست فعّال</item>
+    </plurals>
 
     <string name="room_member_profile_failed_to_get_devices">شکست در گرفتن نشست‌ها</string>
     <string name="room_member_profile_sessions_section_title">نشست‌ها</string>
@@ -747,10 +747,10 @@
     <string name="settings">تنظیمات</string>
     <string name="account_password">گذرواژه حساب</string>
 
-<string name="play_video">پخش</string>
+    <string name="play_video">پخش</string>
     <string name="pause_video">توقف</string>
     <string name="action_copy">رونوشت</string>
     <string name="dialog_title_success">موفقیت</string>
 
     <string name="bottom_action_notification">اعلان‌ها</string>
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 88d7b1ef59..07974104da 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -2433,7 +2433,7 @@
     <string name="identity_server_set_alternative_notice_no_default">Inserisci l\'URL di un server di identità</string>
     <string name="identity_server_set_alternative_submit">Invia</string>
 
-<string name="play_video">Riproduci</string>
+    <string name="play_video">Riproduci</string>
     <string name="pause_video">Pausa</string>
     <string name="dismiss">Annulla</string>
 
@@ -2499,9 +2499,9 @@
     <string name="disabled_integration_dialog_content">Attiva \'Permetti integrazioni\' nelle impostazioni per continuare.</string>
 
     <plurals name="room_settings_banned_users_count">
-	<item quantity="one">%d utente bandito</item>
-	<item quantity="other">%d utenti banditi</item>
-</plurals>
+        <item quantity="one">%d utente bandito</item>
+        <item quantity="other">%d utenti banditi</item>
+    </plurals>
 
     <string name="encryption_exported_successfully">Chiavi esportate correttamente</string>
 
diff --git a/vector/src/main/res/values-ja/strings.xml b/vector/src/main/res/values-ja/strings.xml
index 2c8d9083ed..6e43e2a328 100644
--- a/vector/src/main/res/values-ja/strings.xml
+++ b/vector/src/main/res/values-ja/strings.xml
@@ -1062,7 +1062,7 @@ Matrixでのメッセージの可視性は電子メールと同様です。メ
     <string name="settings_troubleshoot_test_bing_settings_title">カスタム設定</string>
     <string name="settings_troubleshoot_test_service_boot_title">起動時の実行</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">バックグラウンド制限の確認</string>
-<string name="stay">とどまる</string>
+    <string name="stay">とどまる</string>
     <string name="edit">編集</string>
     <string name="reply">返信</string>
 
@@ -1125,8 +1125,8 @@ Matrixでのメッセージの可視性は電子メールと同様です。メ
     <string name="room_profile_section_more_settings">部屋の設定</string>
     <string name="room_profile_section_more_notifications">通知</string>
     <plurals name="room_profile_section_more_member_list">
-	<item quantity="other">%1$d 人の参加者</item>
-</plurals>
+        <item quantity="other">%1$d 人の参加者</item>
+    </plurals>
     <string name="room_profile_section_more_uploads">アップロード</string>
     <string name="room_profile_section_more_leave">部屋を退室</string>
     <string name="room_profile_leaving_room">部屋から退室中…</string>
@@ -1163,8 +1163,8 @@ Matrixでのメッセージの可視性は電子メールと同様です。メ
     <string name="settings_active_sessions_signout_device">このセッションからログアウト</string>
 
     <plurals name="settings_active_sessions_count">
-	<item quantity="other">%d 件の有効なセッション</item>
-</plurals>
+        <item quantity="other">%d 件の有効なセッション</item>
+    </plurals>
 
     <string name="crosssigning_verify_this_session">このログインを検証</string>
     <string name="a11y_qr_code_for_verification">QR コード</string>
@@ -1183,4 +1183,4 @@ Matrixでのメッセージの可視性は電子メールと同様です。メ
     <string name="encryption_enabled_tile_description">この部屋内でのメッセージはエンドツーエンド暗号化されます。詳細の確認や検証はユーザーのプロフィールをご確認ください。</string>
     <string name="encryption_not_enabled">暗号化が有効化されていません</string>
     <string name="settings_notification_configuration">通知設定</string>
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 5917331557..a4b1c2378e 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -93,9 +93,9 @@
     <string name="no_room_placeholder">Nenhuma sala</string>
     <string name="no_public_room_placeholder">Nenhuma sala pública disponível</string>
     <plurals name="public_room_nb_users">
-	<item quantity="one">%d usuário</item>
-	<item quantity="other">%d usuários</item>
-</plurals>
+        <item quantity="one">%d usuário</item>
+        <item quantity="other">%d usuários</item>
+    </plurals>
 
     <string name="send_bug_report_include_logs">Enviar registros</string>
     <string name="send_bug_report_include_crash_logs">Enviar registros da falha</string>
@@ -855,9 +855,9 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
         <item quantity="other">%1$s salas encontradas para %2$s</item>
     </plurals>
     <plurals name="membership_changes">
-	<item quantity="one">1 alteração na filiação</item>
-	<item quantity="other">%d alterações na filiação</item>
-</plurals>
+        <item quantity="one">1 alteração na filiação</item>
+        <item quantity="other">%d alterações na filiação</item>
+    </plurals>
 
     <string name="list_members">Lista de integrantes</string>
     <plurals name="notification_unread_notified_messages">
@@ -918,17 +918,17 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
     <string name="e2e_re_request_encryption_key_dialog_content">Por favor, inicie o Element em outro aparelho que possa descriptografar a mensagem, de modo que ele possa enviar as chaves para esta sessão.</string>
 
     <plurals name="format_time_s">
-	<item quantity="one">1s</item>
-	<item quantity="other">%ds</item>
-</plurals>
+        <item quantity="one">1s</item>
+        <item quantity="other">%ds</item>
+    </plurals>
     <plurals name="format_time_m">
-	<item quantity="one">1m</item>
-	<item quantity="other">%dm</item>
-</plurals>
+        <item quantity="one">1m</item>
+        <item quantity="other">%dm</item>
+    </plurals>
     <plurals name="format_time_h">
-	<item quantity="one">1h</item>
-	<item quantity="other">%dh</item>
-</plurals>
+        <item quantity="one">1h</item>
+        <item quantity="other">%dh</item>
+    </plurals>
     <plurals name="format_time_d">
         <item quantity="one">%d dia</item>
         <item quantity="other">%d dias</item>
@@ -1246,7 +1246,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="people_no_identity_server">Nenhum servidor de identidade está configurado.</string>
 
     <string name="call_failed_no_ice_title">A chamada falhou por conta de má configuração no servidor</string>
-<string name="play_video">Reproduzir</string>
+    <string name="play_video">Reproduzir</string>
     <string name="pause_video">Pausar</string>
     <string name="dismiss">Descartar</string>
 
@@ -1372,9 +1372,9 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="settings_play_shutter_sound">Tocar o som da câmera</string>
 
     <plurals name="room_settings_banned_users_count">
-	<item quantity="one">%d usuário banido</item>
-	<item quantity="other">%d usuários banidos</item>
-</plurals>
+        <item quantity="one">%d usuário banido</item>
+        <item quantity="other">%d usuários banidos</item>
+    </plurals>
 
     <string name="encryption_information_device_name_with_warning">O nome público (visível para as pessoas com quem você se comunica)</string>
     <string name="device_name_warning">O nome público de uma sessão é visível para as pessoas com quem você se comunica</string>
@@ -1385,13 +1385,13 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 
     <string name="encryption_information_unknown_ip">IP desconhecido</string>
     <plurals name="notification_compat_summary_line_for_room">
-	<item quantity="one">%1$s: 1 mensagem</item>
-	<item quantity="other">%1$s: %2$d mensagens</item>
-</plurals>
+        <item quantity="one">%1$s: 1 mensagem</item>
+        <item quantity="other">%1$s: %2$d mensagens</item>
+    </plurals>
     <plurals name="notification_compat_summary_title">
-	<item quantity="one">%d notificação</item>
-	<item quantity="other">%d notificações</item>
-</plurals>
+        <item quantity="one">%d notificação</item>
+        <item quantity="other">%d notificações</item>
+    </plurals>
 
     <string name="notification_unknown_new_event">Novo Evento</string>
     <string name="notification_unknown_room_name">Sala</string>
@@ -1531,13 +1531,13 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="keys_backup_restore_success_title">Backup restaurado %s !</string>
     <string name="keys_backup_restore_success_description">Restauradas %1$d chaves de sessão, e adicionadas %2$d chave(s) nova(s) que não eram conhecidas nesta sessão</string>
     <plurals name="keys_backup_restore_success_description_part1">
-	<item quantity="one">Restaurou um backup com chave %d.</item>
-	<item quantity="other">Restaurou um backup com chaves %d.</item>
-</plurals>
+        <item quantity="one">Restaurou um backup com chave %d.</item>
+        <item quantity="other">Restaurou um backup com chaves %d.</item>
+    </plurals>
     <plurals name="keys_backup_restore_success_description_part2">
-	<item quantity="one">%d nova chave foi adicionada a esta sessão.</item>
-	<item quantity="other">%d novas chaves foram adicionadas a esta sessão.</item>
-</plurals>
+        <item quantity="one">%d nova chave foi adicionada a esta sessão.</item>
+        <item quantity="other">%d novas chaves foram adicionadas a esta sessão.</item>
+    </plurals>
 
     <string name="keys_backup_get_version_error">Não foi possível obter a versão mais recente das chaves de recuperação (%s).</string>
     <string name="keys_backup_no_keysbackup_sdk_error">A sessão criptografada não está activa</string>
@@ -1591,9 +1591,9 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 
     <string name="keys_backup_info_keys_all_backup_up">O backup de todas as chaves foi concluído</string>
     <plurals name="keys_backup_info_keys_backing_up">
-	<item quantity="one">Fazendo o backup da chave %d …</item>
-	<item quantity="other">Fazendo o backup das chaves %d …</item>
-</plurals>
+        <item quantity="one">Fazendo o backup da chave %d …</item>
+        <item quantity="other">Fazendo o backup das chaves %d …</item>
+    </plurals>
 
     <string name="keys_backup_info_title_version">Versão</string>
     <string name="keys_backup_info_title_algorithm">Algoritmo</string>
@@ -1851,9 +1851,9 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="two_users_read">%1$s e %2$s lê</string>
     <string name="one_user_read">%s lê</string>
     <plurals name="fallback_users_read">
-	<item quantity="one">1 usuário leu</item>
-	<item quantity="other">%d usuários leram</item>
-</plurals>
+        <item quantity="one">1 usuário leu</item>
+        <item quantity="other">%d usuários leram</item>
+    </plurals>
 
     <string name="error_file_too_big">O arquivo \'%1$s\' (%2$s) é muito grande para ser carregado. O limite é de %3$s.</string>
 
@@ -2044,9 +2044,9 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="login_error_outdated_homeserver_content">Este servidor tem uma versão muito antiga que não é compatível com nosso servidor. Peça ao administrador para fazer atualização.</string>
 
     <plurals name="login_error_limit_exceeded_retry_after">
-	<item quantity="one">Recebemos demasiado pedidos. Você pode tentar novamente em %1$d segundo…</item>
-	<item quantity="other">Recebemos demasiado pedidos. Você pode tentar novamente em %1$d segundos…</item>
-</plurals>
+        <item quantity="one">Recebemos demasiado pedidos. Você pode tentar novamente em %1$d segundo…</item>
+        <item quantity="other">Recebemos demasiado pedidos. Você pode tentar novamente em %1$d segundos…</item>
+    </plurals>
 
     <string name="login_connect_using_matrix_id_notice">Alternativamente, se você já tem uma conta e conhece seu identificador do Matrix e a senha, você pode usar este método:</string>
     <string name="login_connect_using_matrix_id_submit">Entre com ID do Matrix</string>
@@ -2182,9 +2182,9 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="room_profile_section_more_settings">Configurações da sala</string>
     <string name="room_profile_section_more_notifications">Notificações</string>
     <plurals name="room_profile_section_more_member_list">
-	<item quantity="one">Uma pessoa</item>
-	<item quantity="other">%1$d pessoas</item>
-</plurals>
+        <item quantity="one">Uma pessoa</item>
+        <item quantity="other">%1$d pessoas</item>
+    </plurals>
     <string name="room_profile_section_more_uploads">Subidas</string>
     <string name="room_profile_section_more_leave">Deixar a sala</string>
     <string name="room_profile_leaving_room">Deixando a sala…</string>
@@ -2258,9 +2258,9 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="settings_active_sessions_unverified_device_desc">Verifique esta sessão para marcá-la como confiável e conceder-a acesso a mensagens criptografadas. Se você não entrou nesta sessão, sua conta pode estar comprometida:</string>
 
     <plurals name="settings_active_sessions_count">
-	<item quantity="one">%d sessão ativa</item>
-	<item quantity="other">%d sessões ativas</item>
-</plurals>
+        <item quantity="one">%d sessão ativa</item>
+        <item quantity="other">%d sessões ativas</item>
+    </plurals>
 
     <string name="crosssigning_verify_this_session">Verificar este acesso</string>
     <string name="crosssigning_other_user_not_trust">Outros usuários podem não confiar nela</string>
@@ -2298,13 +2298,13 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="settings_dev_tools">Ferramentas do Desenvolvedor</string>
     <string name="settings_account_data">Dados da Conta</string>
     <plurals name="poll_info">
-	<item quantity="one">%d voto</item>
-	<item quantity="other">%d votos</item>
-</plurals>
+        <item quantity="one">%d voto</item>
+        <item quantity="other">%d votos</item>
+    </plurals>
     <plurals name="poll_info_final">
-	<item quantity="one">%d voto - Resultados finais</item>
-	<item quantity="other">%d votos - Resultados finais</item>
-</plurals>
+        <item quantity="one">%d voto - Resultados finais</item>
+        <item quantity="other">%d votos - Resultados finais</item>
+    </plurals>
     <string name="poll_item_selected_aria">Opção Selecionada</string>
     <string name="command_description_poll">Cria uma pesquisa simples</string>
     <string name="verification_cannot_access_other_session">Use a Chave ou a Frase Secreta de Recuperação</string>
@@ -2320,9 +2320,9 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="message_action_item_redact">Excluír…</string>
     <string name="share_confirm_room">Deseja enviar este anexo para %1$s\?</string>
     <plurals name="send_images_with_original_size">
-	<item quantity="one">Enviar imagem do tamanho original</item>
-	<item quantity="other">Enviar imagens do tamanho original</item>
-</plurals>
+        <item quantity="one">Enviar imagem do tamanho original</item>
+        <item quantity="other">Enviar imagens do tamanho original</item>
+    </plurals>
 
     <string name="delete_event_dialog_title">Confirmar a exclusão</string>
     <string name="delete_event_dialog_content">Tem certeza de que deseja apagar este evento\? Observe que, se você apagar a alteração do nome ou descrição de uma sala, isso reverterá a alteração.</string>
@@ -2524,9 +2524,9 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="invitation_sent_to_one_user">Convite enviado para %1$s</string>
     <string name="invitations_sent_to_two_users">Convites enviados para %1$s e %2$s</string>
     <plurals name="invitations_sent_to_one_and_more_users">
-	<item quantity="one">Convites enviados para %1$s e mais um</item>
-	<item quantity="other">Convites enviados para %1$s e %2$s e mais</item>
-</plurals>
+        <item quantity="one">Convites enviados para %1$s e mais um</item>
+        <item quantity="other">Convites enviados para %1$s e %2$s e mais</item>
+    </plurals>
     <string name="invite_users_to_room_failure">Não podíamos convidar os usuários. Por favor, verifique os usuários que você deseja convidar e tente novamente.</string>
 
     <string name="choose_locale_current_locale_title">Idioma atual</string>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 0781cdd975..13257551c4 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -96,7 +96,7 @@
         <item quantity="one">%d пользователь</item>
         <item quantity="few">%d пользователя</item>
         <item quantity="many">%d пользователей</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <string name="send_bug_report_include_logs">Отправить логи</string>
@@ -832,13 +832,13 @@
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <string name="notification_unread_notified_messages_in_room">%1$s в %2$s</string>
 
@@ -846,7 +846,7 @@
         <item quantity="one">%d активный виджет</item>
         <item quantity="few">%d активных виджета</item>
         <item quantity="many">%d активных виджетов</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <!-- Widget Integration Manager -->
@@ -856,45 +856,45 @@
         <item quantity="one">%d активный участник</item>
         <item quantity="few">%d активных участника</item>
         <item quantity="many">%d активных участников</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="room_title_members">
         <item quantity="one">%d участник</item>
         <item quantity="few">%d участника</item>
         <item quantity="many">%d участников</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="room_new_messages_notification">
         <item quantity="one">%d новое сообщение</item>
         <item quantity="few">%d новых сообщения</item>
         <item quantity="many">%d новых сообщений</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <plurals name="directory_search_rooms_for">
         <item quantity="one">%1$s комната найдена для %2$s</item>
         <item quantity="few">%1$s комнаты найдено для %2$s</item>
         <item quantity="many">%1$s комнат найдено для %2$s</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="membership_changes">
         <item quantity="one">%d изменение членства</item>
         <item quantity="few">%d изменения членства</item>
         <item quantity="many">%d изменений членства</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <plurals name="notification_unread_notified_messages">
         <item quantity="one">%d непрочитанное уведомление</item>
         <item quantity="few">%d непрочитанных уведомления</item>
         <item quantity="many">%d непрочитанных уведомлений</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
         <item quantity="one">%d непрочитанное уведомление</item>
         <item quantity="few">%d непрочитанных уведомления</item>
         <item quantity="many">%d непрочитанных уведомлений</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <string name="receipt_avatar">Получить аватар</string>
     <string name="notice_avatar">Заметка аватара</string>
@@ -1029,20 +1029,20 @@
         <item quantity="one">%d выбран</item>
         <item quantity="few">%d выбрано</item>
         <item quantity="many">%d выбраны</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="group_members">
         <item quantity="one">%d участник</item>
         <item quantity="few">%d участника</item>
         <item quantity="many">%d участников</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <plurals name="group_rooms">
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <string name="system_alerts_header">Системные оповещения</string>
 
@@ -1304,7 +1304,7 @@
         <item quantity="one">%d новый ключ был добавлен к этому устройству.</item>
         <item quantity="few">%d новых ключа были добавлены к этому устройству.</item>
         <item quantity="many">%d новых ключей были добавлены к этому устройству.</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <plurals name="keys_backup_restore_success_description_part1">
@@ -1356,7 +1356,7 @@
         <item quantity="one">Резервное копирование %d ключа…</item>
         <item quantity="few">Резервное копирование %d ключей…</item>
         <item quantity="many">Резервное копирование %d ключей…</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <string name="keys_backup_info_keys_all_backup_up">Все ключи сохранены</string>
@@ -2081,7 +2081,7 @@
 
     <string name="no_network_indicator">Нет подключения к сети</string>
 
-<string name="play_video">Воспроизвести</string>
+    <string name="play_video">Воспроизвести</string>
     <string name="pause_video">Приостановить</string>
     <string name="action_copy">Копировать</string>
     <string name="dialog_title_success">Выполнено</string>
@@ -2147,10 +2147,10 @@
     <string name="disabled_integration_dialog_content">Включите «Управление интеграциями» в настройках, чтобы сделать это.</string>
 
     <plurals name="room_settings_banned_users_count">
-	<item quantity="one">%d пользователь заблокирован</item>
-	<item quantity="few">%d пользователей заблокировано</item>
-	<item quantity="many">%d пользователей заблокировано</item>
-</plurals>
+        <item quantity="one">%d пользователь заблокирован</item>
+        <item quantity="few">%d пользователей заблокировано</item>
+        <item quantity="many">%d пользователей заблокировано</item>
+    </plurals>
 
     <string name="encryption_exported_successfully">Ключи успешно экспортированы</string>
 
@@ -2169,10 +2169,10 @@
     <string name="labs_show_unread_notifications_as_tab">Добавьте специальную вкладку для непрочитанных уведомлений на главном экране.</string>
 
     <plurals name="fallback_users_read">
-	<item quantity="one">Прочитал 1 пользователь</item>
-	<item quantity="few">Прочитано %d пользователями</item>
-	<item quantity="many">Прочитано %d пользователями</item>
-</plurals>
+        <item quantity="one">Прочитал 1 пользователь</item>
+        <item quantity="few">Прочитано %d пользователями</item>
+        <item quantity="many">Прочитано %d пользователями</item>
+    </plurals>
 
     <string name="room_list_quick_actions_favorite_add">Добавить в избранное</string>
     <string name="room_list_quick_actions_favorite_remove">Убрать из избранного</string>
@@ -2333,10 +2333,10 @@
     <string name="settings_failed_to_get_crypto_device_info">Нет доступного шифрования информации</string>
 
     <plurals name="settings_active_sessions_count">
-	<item quantity="one">%d сессия активна</item>
-	<item quantity="few">%d сессии активны</item>
-	<item quantity="many">%d сессий активно</item>
-</plurals>
+        <item quantity="one">%d сессия активна</item>
+        <item quantity="few">%d сессии активны</item>
+        <item quantity="many">%d сессий активно</item>
+    </plurals>
 
     <string name="crosssigning_verify_this_session">Подтвердите эту сессию</string>
     <string name="verification_open_other_to_verify">Используйте существующую сессию для подтверждения этой, предоставив ей доступ к зашифрованным сообщениям.</string>
@@ -2388,15 +2388,15 @@
     <string name="verification_profile_device_verified_because">Эта сессия является доверенной для безопасного обмена сообщениями, так как %1$s (%2$s) проверил(а) его:</string>
     <string name="verification_profile_device_new_signing">%1$s (%2$s) вошел(ла), используя новую сессию:</string>
     <plurals name="poll_info">
-	<item quantity="one">%d голос</item>
-	<item quantity="few">%d голоса</item>
-	<item quantity="many">%d голосов</item>
-</plurals>
+        <item quantity="one">%d голос</item>
+        <item quantity="few">%d голоса</item>
+        <item quantity="many">%d голосов</item>
+    </plurals>
     <plurals name="poll_info_final">
-	<item quantity="one">%d голос - финальные результаты</item>
-	<item quantity="few">%d голоса - финальные результаты</item>
-	<item quantity="many">%d голосов - финальные результаты</item>
-</plurals>
+        <item quantity="one">%d голос - финальные результаты</item>
+        <item quantity="few">%d голоса - финальные результаты</item>
+        <item quantity="many">%d голосов - финальные результаты</item>
+    </plurals>
     <string name="poll_item_selected_aria">Выберите вариант</string>
     <string name="command_description_poll">Создать простой опрос</string>
     <string name="new_signin">Новый вход</string>
@@ -2420,10 +2420,10 @@
 
     <string name="share_confirm_room">Вы хотите отправить это вложение в %1$s\?</string>
     <plurals name="send_images_with_original_size">
-	<item quantity="one">Отправить изображение в оригинальном размере</item>
-	<item quantity="few">Отправить изображения в оригинальном размере</item>
-	<item quantity="many">Отправить изображения в оригинальном размере</item>
-</plurals>
+        <item quantity="one">Отправить изображение в оригинальном размере</item>
+        <item quantity="few">Отправить изображения в оригинальном размере</item>
+        <item quantity="many">Отправить изображения в оригинальном размере</item>
+    </plurals>
 
     <string name="delete_event_dialog_title">Подтвердите удаление</string>
     <string name="delete_event_dialog_content">Вы уверены, что хотите скрыть (удалить) это событие\? Обратите внимание, что если вы удалите название комнаты или измените тему, это может отменить изменение.</string>
@@ -2566,10 +2566,10 @@
     <string name="invitation_sent_to_one_user">Приглашение для %1$s отправлено</string>
     <string name="invitations_sent_to_two_users">Приглашения для %1$s и %2$s отправлены</string>
     <plurals name="invitations_sent_to_one_and_more_users">
-	<item quantity="one">Приглашения отправлены %1$s и еще одному пользователю</item>
-	<item quantity="few">Приглашения отправлены %1$s и еще %2$d пользователям</item>
-	<item quantity="many">Приглашения отправлены %1$s и еще %2$d пользователям</item>
-</plurals>
+        <item quantity="one">Приглашения отправлены %1$s и еще одному пользователю</item>
+        <item quantity="few">Приглашения отправлены %1$s и еще %2$d пользователям</item>
+        <item quantity="many">Приглашения отправлены %1$s и еще %2$d пользователям</item>
+    </plurals>
     <string name="invite_users_to_room_failure">Мы не могли пригласить этих пользователей. Пожалуйста, проверьте пользователей, которых вы хотите пригласить, и повторите попытку.</string>
 
     <string name="choose_locale_current_locale_title">Текущий язык</string>
diff --git a/vector/src/main/res/values-sk/strings.xml b/vector/src/main/res/values-sk/strings.xml
index 554fb5e349..a685545acd 100644
--- a/vector/src/main/res/values-sk/strings.xml
+++ b/vector/src/main/res/values-sk/strings.xml
@@ -93,8 +93,7 @@
     <plurals name="public_room_nb_users">
         <item quantity="one">1 používateľ</item>
         <item quantity="few">%d používatelia</item>
-        <item quantity="many">%d používateľov</item>
-        <item quantity="other" />
+        <item quantity="other">%d používateľov</item>
     </plurals>
 
     <string name="send_bug_report_include_logs">Odoslať záznamy</string>
@@ -776,8 +775,7 @@ Pozor: tento súbor môže byť automaticky zmazaný po odinštalovaní aplikác
     <plurals name="membership_changes">
         <item quantity="one">1 zmena stavu</item>
         <item quantity="few">%d zmeny stavu</item>
-        <item quantity="many">%d zmien stavu</item>
-        <item quantity="other" />
+        <item quantity="other">%d zmien stavu</item>
     </plurals>
 
     <string name="list_members">Zobraziť členov</string>
@@ -786,45 +784,38 @@ Pozor: tento súbor môže byť automaticky zmazaný po odinštalovaní aplikác
     <plurals name="room_header_active_members_count">
         <item quantity="one">1 aktívny člen</item>
         <item quantity="few">%d aktívni členovia</item>
-        <item quantity="many">%d aktívnych členov</item>
-        <item quantity="other" />
+        <item quantity="other">%d aktívnych členov</item>
     </plurals>
     <plurals name="room_title_members">
         <item quantity="one">1 člen</item>
         <item quantity="few">%d členovia</item>
-        <item quantity="many">%d členov</item>
-        <item quantity="other" />
+        <item quantity="other">%d členov</item>
     </plurals>
     <plurals name="room_new_messages_notification">
         <item quantity="one">1 nová správa</item>
         <item quantity="few">%d nové správy</item>
-        <item quantity="many">%d nových správ</item>
-        <item quantity="other" />
+        <item quantity="other">%d nových správ</item>
     </plurals>
 
     <plurals name="directory_search_rooms">
         <item quantity="one">1 miestnosť</item>
         <item quantity="few">%d miestnosti</item>
-        <item quantity="many">%d miestností</item>
-        <item quantity="other" />
+        <item quantity="other">%d miestností</item>
     </plurals>
     <plurals name="directory_search_rooms_for">
         <item quantity="one">Nájdená %1$s miestnosť pre %2$s</item>
         <item quantity="few">Nájdené %1$s miestnosti pre %2$s</item>
-        <item quantity="many">Nájdených %1$s miestností pre %2$s</item>
-        <item quantity="other" />
+        <item quantity="other">Nájdených %1$s miestností pre %2$s</item>
     </plurals>
     <plurals name="notification_unread_notified_messages">
         <item quantity="one">1 neprečítaná správa</item>
         <item quantity="few">%d neprečítané správy</item>
-        <item quantity="many">%d neprečítaných správ</item>
-        <item quantity="other" />
+        <item quantity="other">%d neprečítaných správ</item>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
         <item quantity="one">1 neprečítaná správa</item>
         <item quantity="few">%d neprečítané správy</item>
-        <item quantity="many">%d neprečítaných správ</item>
-        <item quantity="other" />
+        <item quantity="other">%d neprečítaných správ</item>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="one">1 miestnosť</item>
@@ -836,8 +827,7 @@ Pozor: tento súbor môže byť automaticky zmazaný po odinštalovaní aplikác
     <plurals name="active_widgets">
         <item quantity="one">1 aktívny widget</item>
         <item quantity="few">%d aktívne widgety</item>
-        <item quantity="many">%d aktívnych widgetov</item>
-        <item quantity="other" />
+        <item quantity="other">%d aktívnych widgetov</item>
     </plurals>
 
     <!-- Widget Integration Manager -->
@@ -948,8 +938,7 @@ Viditeľnosť správ odoslaných cez matrix funguje podobne ako viditeľnosť sp
     <plurals name="room_details_selected">
         <item quantity="one">1 vybratý</item>
         <item quantity="few">%d vybratí</item>
-        <item quantity="many">%d vybratých</item>
-        <item quantity="other" />
+        <item quantity="other">%d vybratých</item>
     </plurals>
     <string name="settings_preview_media_before_sending">Zobraziť náhľad médií pred odoslaním</string>
 
@@ -973,15 +962,13 @@ Viditeľnosť správ odoslaných cez matrix funguje podobne ako viditeľnosť sp
     <plurals name="group_members">
         <item quantity="one">1 člen</item>
         <item quantity="few">%d členovia</item>
-        <item quantity="many">%d členov</item>
-        <item quantity="other" />
+        <item quantity="other">%d členov</item>
     </plurals>
 
     <plurals name="group_rooms">
         <item quantity="one">1 miestnosť</item>
         <item quantity="few">%d miestnosti</item>
-        <item quantity="many">%d miestností</item>
-        <item quantity="other" />
+        <item quantity="other">%d miestností</item>
     </plurals>
     <string name="room_tombstone_versioned_description">Táto miestnosť bola nahradená inou a nie je viac aktívna</string>
     <string name="room_tombstone_continuation_link">Konverzácia pokračuje tu</string>
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index ecb75cd620..f0b682841f 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -1452,7 +1452,7 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="login_error_no_homeserver_found">這不是有效的 Matrix 服务器位置</string>
     <string name="login_error_homeserver_not_found">无法在此 URL 找到家庭服务器，请检查</string>
     <string name="settings_call_ringtone_use_default_stun">允许后备呼叫协助服务器</string>
-<string name="play_video">播放</string>
+    <string name="play_video">播放</string>
     <string name="pause_video">暂停</string>
     <string name="dismiss">忽略</string>
 
@@ -1548,8 +1548,8 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="disabled_integration_dialog_content">请在设置中启用“允许集成”。</string>
 
     <plurals name="room_settings_banned_users_count">
-	<item quantity="other">%d 个封禁用户</item>
-</plurals>
+        <item quantity="other">%d 个封禁用户</item>
+    </plurals>
 
     <string name="encryption_information_device_name_with_warning">公开名称（对通信参与者可见）</string>
     <string name="device_name_warning">会话的公开名称对通信的参与者可见</string>
@@ -1771,8 +1771,8 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="two_users_read">%1$s 和 %2$s 已读</string>
     <string name="one_user_read">%s 已读</string>
     <plurals name="fallback_users_read">
-	<item quantity="other">%d 个用户已读</item>
-</plurals>
+        <item quantity="other">%d 个用户已读</item>
+    </plurals>
 
     <string name="error_file_too_big">上传文件 \'%1$s\' (%2$s) 过大。限制为 %3$s。</string>
 
@@ -1956,8 +1956,8 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="login_error_outdated_homeserver_content">此家庭服务器运行的版本过旧以至于无法连接。要求您的家庭服务器管理员升级。</string>
 
     <plurals name="login_error_limit_exceeded_retry_after">
-	<item quantity="other">发送了太多请求。您可以在 %1$d 秒后重试…</item>
-</plurals>
+        <item quantity="other">发送了太多请求。您可以在 %1$d 秒后重试…</item>
+    </plurals>
 
     <string name="login_connect_using_matrix_id_notice">或者，如果您已经拥有账户并知道您的 Matrix 标识符和密码，您可以使用这种方式：</string>
     <string name="login_connect_using_matrix_id_submit">使用 Matrix ID 登录</string>
@@ -2076,7 +2076,7 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="verification_verify_user">验证 %s</string>
     <string name="verification_verified_user">已验证 %s</string>
     <string name="verification_request_waiting_for">正在等待 %s…</string>
-    <string name="verification_request_alert_description">为了提高安全性，请通过检查两个设备上的一次性代码来验证 ％s。
+    <string name="verification_request_alert_description">为了提高安全性，请通过检查两个设备上的一次性代码来验证 %s。
 \n
 \n为了获得最大的安全性，请亲自进行。</string>
     <string name="room_profile_not_encrypted_subtitle">此聊天室的消息不是端到端加密。</string>
@@ -2090,8 +2090,8 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="room_profile_section_more_settings">聊天室设置</string>
     <string name="room_profile_section_more_notifications">通知</string>
     <plurals name="room_profile_section_more_member_list">
-	<item quantity="other">%1$d 人</item>
-</plurals>
+        <item quantity="other">%1$d 人</item>
+    </plurals>
     <string name="room_profile_section_more_uploads">上传</string>
     <string name="room_profile_section_more_leave">离开聊天室</string>
     <string name="room_profile_leaving_room">正在离开聊天室…</string>
@@ -2163,8 +2163,8 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="settings_active_sessions_unverified_device_desc">验证此会话以将其标记为可信，并授予其访问加密消息的权限。如果您未登录此会话，则您的帐户可能已被盗：</string>
 
     <plurals name="settings_active_sessions_count">
-	<item quantity="other">%d 个活动会话</item>
-</plurals>
+        <item quantity="other">%d 个活动会话</item>
+    </plurals>
 
     <string name="crosssigning_verify_this_session">验证此登录</string>
     <string name="crosssigning_other_user_not_trust">其他用户可能不信任它</string>
@@ -2202,11 +2202,11 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="settings_dev_tools">开发工具</string>
     <string name="settings_account_data">账户数据</string>
     <plurals name="poll_info">
-	<item quantity="other">%d 票</item>
-</plurals>
+        <item quantity="other">%d 票</item>
+    </plurals>
     <plurals name="poll_info_final">
-	<item quantity="other">%d 票 - 最终结果</item>
-</plurals>
+        <item quantity="other">%d 票 - 最终结果</item>
+    </plurals>
     <string name="poll_item_selected_aria">已选选项</string>
     <string name="command_description_poll">创建简单调查</string>
     <string name="verification_cannot_access_other_session">使用恢复短语或密钥</string>
@@ -2222,8 +2222,8 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="message_action_item_redact">移除…</string>
     <string name="share_confirm_room">您想要发送此附件到 %1$s 吗？</string>
     <plurals name="send_images_with_original_size">
-	<item quantity="other">发送原始尺寸图片</item>
-</plurals>
+        <item quantity="other">发送原始尺寸图片</item>
+    </plurals>
 
     <string name="delete_event_dialog_title">确认移除</string>
     <string name="delete_event_dialog_content">您确实想要移除（删除）此事件吗？注意如果您删除聊天室名或话题更改，可以撤销更改。</string>
@@ -2432,8 +2432,8 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="invitation_sent_to_one_user">邀请已发送到 %1$s</string>
     <string name="invitations_sent_to_two_users">邀请已发送到 %1$s 和 %2$s</string>
     <plurals name="invitations_sent_to_one_and_more_users">
-	<item quantity="other">邀请已发送到 %1$s 和 %2$s 等</item>
-</plurals>
+        <item quantity="other">邀请已发送到 %1$s 和 %2$s 等</item>
+    </plurals>
     <string name="invite_users_to_room_failure">我们无法邀请用户，请检查您想要邀请的用户并重试。</string>
 
     <string name="choose_locale_current_locale_title">当前语言</string>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 35a7328051..d13e084960 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -2330,7 +2330,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="identity_server_set_alternative_notice_no_default">輸入身份識別伺服器 URL</string>
     <string name="identity_server_set_alternative_submit">遞交</string>
 
-<string name="play_video">播放</string>
+    <string name="play_video">播放</string>
     <string name="pause_video">暫停</string>
     <string name="dismiss">忽略</string>
 
@@ -2396,8 +2396,8 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="disabled_integration_dialog_content">在設定中啟用「允許整合」以執行此動作。</string>
 
     <plurals name="room_settings_banned_users_count">
-	<item quantity="other">%d 封鎖了使用者</item>
-</plurals>
+        <item quantity="other">%d 封鎖了使用者</item>
+    </plurals>
 
     <string name="encryption_exported_successfully">金鑰已成功匯出</string>