Merge pull request #2981 from vector-im/feature/bma/wl

WL mistake

CHANGES.md

@@ -13,6 +13,7 @@ Improvements 🙌:
  - Pre-share session keys when opening a room or start typing (#2771)
  - Sending is now queuing by room and not uniquely to the session
  - Improve Snackbar duration (#2929)
+ - Improve sending message state (#2937)
 
 Bugfix 🐛:
  - Try to fix crash about UrlPreview (#2640)

vector/lint.xml

@@ -12,6 +12,7 @@
     <issue id="IconDuplicatesConfig" severity="error" />
     <issue id="IconDuplicates" severity="error" />
     <issue id="IconExpectedSize" severity="error" />
+    <issue id="LocaleFolder" severity="error" />
 
     <!-- UX -->
     <issue id="ButtonOrder" severity="error" />

vector/src/main/res/values-de/strings.xml

@@ -2694,7 +2694,7 @@
     <string name="a11y_open_emoji_picker">Emoji-Auswahl öffnen</string>
     <string name="a11y_trust_level_trusted">Vertraute Vertrauensstufe</string>
     <string name="a11y_trust_level_warning">Warnungsvertrauensstufe</string>
-    <string name="a11y_trust_level_default">Standart-Vertrauensstufe</string>
+    <string name="a11y_trust_level_default">Standard-Vertrauensstufe</string>
     <string name="a11y_selected">Ausgewählt</string>
     <string name="a11y_video">Video</string>
     <string name="a11y_unsent_draft">Dieser Raum enthält einen ungesendeten Entwurf</string>

vector/src/main/res/values-fr/strings.xml

@@ -2584,7 +2584,7 @@
     <string name="room_alias_address_empty_can_add">Aucune adresse publiée pour le moment, ajoutez en une ci-dessous.</string>
     <string name="room_alias_publish">Publier ce salon dans le répertoire public de %1$s \?</string>
     <string name="room_alias_delete_confirmation">Supprimer l’adresse « %1$s » \?</string>
-    <string name="room_alias_unpublish_confirmation">Dé-publier l’adresse « %&amp;$s » \?</string>
+    <string name="room_alias_unpublish_confirmation">Dé-publier l’adresse « %1$s » \?</string>
     <string name="room_alias_published_alias_add_manually_submit">Publier</string>
     <string name="room_alias_published_alias_add_manually">Publier une nouvelle adresse manuellement</string>
     <string name="room_alias_published_other">Autres adresses publiées :</string>

vector/src/main/res/values-id/strings_no_weblate.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="resources_language">in</string>
-    <string name="resources_country_code">ID</string>
-
-</resources>