From e84eba23a1b65fd75f52d2df3a1bfe00636ab848 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 28 Oct 2020 13:45:36 +0100
Subject: [PATCH] Fix lint issue

---
 .../src/main/res/values-bg/strings.xml               |  4 ++--
 .../src/main/res/values-eo/strings.xml               |  8 ++++----
 .../src/main/res/values-fr/strings.xml               | 12 ++++++------
 .../src/main/res/values-zh-rCN/strings.xml           |  2 +-
 vector/src/main/res/values-el/strings.xml            |  2 --
 vector/src/main/res/values-sq/strings.xml            |  2 +-
 6 files changed, 14 insertions(+), 16 deletions(-)

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 d564dbeab6..c3a5f3be82 100644
--- a/matrix-sdk-android/src/main/res/values-bg/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-bg/strings.xml
@@ -154,7 +154,7 @@
     <string name="notice_direct_room_leave_with_reason">%1$s напусна. Причина: %2$s</string>
     <string name="notice_room_leave_with_reason_by_you">Напуснахте стаята. Причина: %1$s</string>
     <string name="notice_direct_room_join_with_reason_by_you">Присъединихте се. Причина: %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s се присъедини. Причина: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s се присъедини. Причина: %2$s</string>
     <string name="notice_room_join_with_reason_by_you">Присъединихте се в стаята. Причина: %1$s</string>
     <string name="notice_room_invite_with_reason_by_you">Поканихте %1$s. Причина: %2$s</string>
     <string name="notice_room_invite_no_invitee_with_reason_by_you">Ваша покана. Причина: %1$s</string>
@@ -169,7 +169,7 @@
     <string name="notice_widget_modified_by_you">Променихте %1$s приспособлението</string>
     <string name="notice_widget_modified">%1$s промени %2$s приспособлението</string>
     <string name="notice_widget_removed_by_you">Премахнахте %1$s приспособлението</string>
-    <string name="notice_widget_removed">%1$s премахна %1$s приспособлението</string>
+    <string name="notice_widget_removed">%1$s премахна %2$s приспособлението</string>
     <string name="notice_widget_added_by_you">Добавихте %1$s приспособление</string>
     <string name="notice_widget_added">%1$s добави %2$s приспособление</string>
     <string name="notice_room_third_party_registered_invite_by_you">Приехте поканата за %1$s</string>
diff --git a/matrix-sdk-android/src/main/res/values-eo/strings.xml b/matrix-sdk-android/src/main/res/values-eo/strings.xml
index 1aee1fbc18..3a726a0a4f 100644
--- a/matrix-sdk-android/src/main/res/values-eo/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-eo/strings.xml
@@ -123,7 +123,7 @@
     <string name="notice_room_guest_access_can_join_by_you">Vi permesis al gastoj enveni.</string>
     <string name="notice_room_canonical_alias_unset_by_you">Vi forigis la ĉefadreson de ĉi tiu ĉambro.</string>
     <string name="notice_room_canonical_alias_set_by_you">Vi agordis al ĉefadreson de ĉi tiu ĉambro al %1$s.</string>
-    <string name="notice_room_aliases_added_and_removed_by_you">Vi aldonis %2$s kaj forigis %3$s kiel adresojn por ĉi tiu ĉambro.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">Vi aldonis %1$s kaj forigis %2$s kiel adresojn por ĉi tiu ĉambro.</string>
     <plurals name="notice_room_aliases_removed_by_you">
         <item quantity="one">Vi forigis %2$s kiel adreson por ĉi tiu ĉambro.</item>
         <item quantity="other">Vi forigis %2$s kiel adresojn por ĉi tiu ĉambro.</item>
@@ -132,12 +132,12 @@
         <item quantity="one">Vi aldonis %2$s kiel adreson por ĉi tiu ĉambro.</item>
         <item quantity="other">Vi aldonis %2$s kiel adresojn por ĉi tiu ĉambro.</item>
     </plurals>
-    <string name="notice_room_withdraw_with_reason_by_you">Vi nuligis la inviton por %2$s. Kialo: %2$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Vi nuligis la inviton por %1$s. Kialo: %2$s</string>
     <string name="notice_room_third_party_registered_invite_with_reason_by_you">Vi akceptis la inviton por %1$s. Kialo: %2$s</string>
     <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Vi nuligis inviton al la ĉambro por %1$s. Kialo: %2$s</string>
     <string name="notice_room_third_party_invite_with_reason_by_you">Vi sendis al %1$s inviton al la ĉambro. Kialo: %2$s</string>
     <string name="notice_room_ban_with_reason_by_you">Vi forbaris uzanton %1$s. Kialo: %2$s</string>
-    <string name="notice_room_unban_with_reason_by_you">Vi malforbaris uzanton %1$s. Kialo: %1$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Vi malforbaris uzanton %1$s. Kialo: %2$s</string>
     <string name="notice_room_kick_with_reason_by_you">Vi forpelis uzanton %1$s. Kialo: %2$s</string>
     <string name="notice_room_reject_with_reason_by_you">Vi rifuzis la inviton. Kialo: %1$s</string>
     <string name="notice_direct_room_leave_with_reason_by_you">Vi foriris. Kialo: %1$s</string>
@@ -165,7 +165,7 @@
     <string name="notice_direct_room_third_party_revoked_invite">%1$s nuligis la inviton por %2$s</string>
     <string name="notice_room_third_party_revoked_invite_by_you">Vi nuligis la aliĝan inviton por %1$s</string>
     <string name="notice_direct_room_third_party_invite_by_you">Vi invitis uzanton %1$s</string>
-    <string name="notice_direct_room_third_party_invite">%1$s invitis uzanton %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s invitis uzanton %2$s</string>
     <string name="notice_room_third_party_invite_by_you">Vi sendis aliĝan inviton al %1$s</string>
     <string name="notice_profile_change_redacted_by_you">Vi ĝisdatigis vian profilon %1$s</string>
     <string name="notice_room_avatar_removed_by_you">Vi forigis bildon de la ĉambro</string>
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 6a17430035..9c5fa7d3b1 100644
--- a/matrix-sdk-android/src/main/res/values-fr/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-fr/strings.xml
@@ -130,7 +130,7 @@
     <string name="notice_room_invite_no_invitee_by_you">Votre invitation</string>
     <string name="summary_you_sent_sticker">Vous avez envoyé un autocollant.</string>
     <string name="summary_you_sent_image">Vous avez envoyé une image.</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Vous avez activé le chiffrement de bout en bout (algorithme %2$s inconnu).</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Vous avez activé le chiffrement de bout en bout (algorithme %1$s inconnu).</string>
     <string name="notice_end_to_end_ok_by_you">Vous avez activé le chiffrement de bout en bout.</string>
     <string name="notice_direct_room_guest_access_forbidden_by_you">Vous avez empêché les visiteurs de rejoindre le salon.</string>
     <string name="notice_direct_room_guest_access_forbidden">%1$s a empêché les visiteurs de rejoindre le salon.</string>
@@ -154,9 +154,9 @@
     <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Vous avez révoqué l’invitation de %1$s à rejoindre le salon. Raison : %2$s</string>
     <string name="notice_room_third_party_invite_with_reason_by_you">Vous avez envoyé une invitation à %1$s pour rejoindre le salon. Raison : %2$s</string>
     <string name="notice_room_reject_with_reason_by_you">Vous avez refusé l’invitation. Raison : %1$s</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">Vous êtes parti. Raison : %2$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Vous êtes parti. Raison : %1$s</string>
     <string name="notice_direct_room_leave_with_reason">%1$s est parti. Raison : %2$s</string>
-    <string name="notice_room_leave_with_reason_by_you">Vous êtes parti du salon. Raison : %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Vous êtes parti du salon. Raison : %1$s</string>
     <string name="notice_direct_room_join_with_reason">%1$s rejoint. Raison : %2$s</string>
     <string name="notice_direct_room_join_with_reason_by_you">Vous avez rejoint. Raison : %1$s</string>
     <string name="notice_room_join_with_reason_by_you">Vous avez rejoint le salon. Raison : %1$s</string>
@@ -172,7 +172,7 @@
     <string name="power_level_admin">Admin</string>
     <string name="notice_widget_modified_by_you">Vous avez modifié le widget %1$s</string>
     <string name="notice_widget_modified">%1$s a modifié le widget %2$s</string>
-    <string name="notice_widget_removed_by_you">Vous avez supprimé le widget %2$s</string>
+    <string name="notice_widget_removed_by_you">Vous avez supprimé le widget %1$s</string>
     <string name="notice_widget_removed">%1$s a supprimé le widget %2$s</string>
     <string name="notice_widget_added_by_you">Vous avez ajouté le widget %1$s</string>
     <string name="notice_widget_added">%1$s a ajouté le widget %2$s</string>
@@ -201,11 +201,11 @@
     <string name="notice_avatar_url_changed_by_you">Vous avez changé votre avatar</string>
     <string name="notice_room_withdraw_by_you">Vous avez annulé l’invitation de %1$s</string>
     <string name="notice_room_topic_changed_by_you">Vous avez changé le sujet en : %1$s</string>
-    <string name="notice_display_name_removed_by_you">Vous avez supprimé votre nom affiché (précédemment %2$s)</string>
+    <string name="notice_display_name_removed_by_you">Vous avez supprimé votre nom affiché (précédemment %1$s)</string>
     <string name="notice_room_third_party_revoked_invite_by_you">Vous avez révoqué l’invitation pour %1$s à rejoindre le salon</string>
     <string name="notice_direct_room_third_party_invite_by_you">Vous avez invité %1$s</string>
     <string name="notice_direct_room_third_party_invite">%1$s a invité %2$s</string>
-    <string name="notice_room_third_party_invite_by_you">Vous avez envoyé une invitation à %2$s pour rejoindre le salon</string>
+    <string name="notice_room_third_party_invite_by_you">Vous avez envoyé une invitation à %1$s pour rejoindre le salon</string>
     <string name="notice_profile_change_redacted_by_you">Vous avez mis à jour votre profile %1$s</string>
     <string name="notice_room_topic_removed_by_you">Vous avez supprimé le sujet du salon</string>
     <string name="notice_room_ban_with_reason_by_you">Vous avez exclus %1$s. Raison : %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 76e4908e59..79b2eb31ee 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
@@ -196,7 +196,7 @@
     <string name="notice_direct_room_third_party_invite">%1$s 邀请了 %2$s</string>
     <string name="notice_direct_room_update_by_you">您在此处升级。</string>
     <string name="notice_direct_room_update">%s 在此处升级。</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">您使未来的消息对 %2$s 可见</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">您使未来的消息对 %1$s 可见</string>
     <string name="notice_made_future_direct_room_visibility">%1$s 使未来的消息对 %2$s 可见</string>
     <string name="notice_direct_room_leave_by_you">您离开了聊天室</string>
     <string name="notice_direct_room_leave">%1$s 离开了聊天室</string>
diff --git a/vector/src/main/res/values-el/strings.xml b/vector/src/main/res/values-el/strings.xml
index 72eb4c980c..5b3f3aaafc 100644
--- a/vector/src/main/res/values-el/strings.xml
+++ b/vector/src/main/res/values-el/strings.xml
@@ -327,8 +327,6 @@
     <string name="no_permissions_to_start_conf_call_in_direct_room">Δεν έχετε άδεια να ξεκινήσετε μια κλήση συνδιάσκεψης</string>
     <string name="no_permissions_to_start_conf_call">Δεν έχετε άδεια να ξεκινήσετε μια κλήση συνδιάσκεψης σε αυτήν την αίθουσα</string>
     <string name="missing_permissions_to_start_conf_call">Χρειάζεστε άδεια για να προσκαλέσετε να ξεκινήσει μια διάσκεψη σε αυτήν την αίθουσα</string>
-    <string name="ongoing_conference_call">Τρέχουσα κλήση συνδιάσκεψης.
-\nΣυνδεθείτε ώς</string>
     <string name="reset">Επαναφορά</string>
     <string name="dismiss">Απόρριψη</string>
     <string name="play_video">Παίξε</string>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index 92b10157fa..1c784e9ed8 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -2137,7 +2137,7 @@
     <string name="bad_passphrase_key_reset_all_action">Harruat ose humbët krejt mundësitë e rimarrjes\? Riujdisni gjihçka</string>
     <string name="command_description_discard_session">E detyron të hidhet tej sesionin e tanishëm outbound në një dhomë të fshehtëzuar</string>
     <string name="direct_room_created_summary_item_by_you">Erdhët.</string>
-    <string name="direct_room_created_summary_item">$s erdhi.</string>
+    <string name="direct_room_created_summary_item">%s erdhi.</string>
     <string name="direct_room_encryption_enabled_tile_description">Mesazhet në këtë dhomë s’fshehtëzohen skaj-më-skaj.</string>
     <string name="direct_room_profile_section_more_leave">Braktise</string>
     <string name="direct_room_profile_section_more_settings">Rregullime</string>