From 090273da14c2f8c79e85cc3d4b771d7b8cf2ae9c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 8 Oct 2021 14:55:50 +0200
Subject: [PATCH 1/2] Fix lint error

---
 vector/src/main/res/values-nl/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-nl/strings.xml b/vector/src/main/res/values-nl/strings.xml
index efa9228af5..98ce426c8c 100644
--- a/vector/src/main/res/values-nl/strings.xml
+++ b/vector/src/main/res/values-nl/strings.xml
@@ -1960,8 +1960,8 @@
     <string name="call_held_by_user">%s heeft de oproep in de wacht gezet</string>
     <string name="return_to_call">Teruggaan naar oproep</string>
     <string name="active_call_with_duration">Actieve Oproep (%s)</string>
-    <string name="audio_call_with_participant">Bellen met</string>
-    <string name="video_call_with_participant">Videobellen met</string>
+    <string name="audio_call_with_participant">Bellen met %s</string>
+    <string name="video_call_with_participant">Videobellen met %s</string>
     <plurals name="missed_video_call">
         <item quantity="one">Gemiste video-oproep</item>
         <item quantity="other">%d gemiste video-oproepen</item>

From 66d4a48930db9f2036e65ded7462a9d378ba91a2 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 8 Oct 2021 15:07:52 +0200
Subject: [PATCH 2/2] Remove unused strings

---
 .../im/vector/app/features/userdirectory/UserListFragment.kt  | 3 ---
 vector/src/main/res/layout/fragment_user_list.xml             | 2 +-
 vector/src/main/res/values-ar/strings.xml                     | 2 --
 vector/src/main/res/values-ca/strings.xml                     | 1 -
 vector/src/main/res/values-cs/strings.xml                     | 3 ---
 vector/src/main/res/values-de/strings.xml                     | 3 ---
 vector/src/main/res/values-eo/strings.xml                     | 3 ---
 vector/src/main/res/values-es/strings.xml                     | 3 ---
 vector/src/main/res/values-et/strings.xml                     | 3 ---
 vector/src/main/res/values-fa/strings.xml                     | 3 ---
 vector/src/main/res/values-fi/strings.xml                     | 1 -
 vector/src/main/res/values-fr-rCA/strings.xml                 | 3 ---
 vector/src/main/res/values-fr/strings.xml                     | 3 ---
 vector/src/main/res/values-hu/strings.xml                     | 3 ---
 vector/src/main/res/values-in/strings.xml                     | 2 --
 vector/src/main/res/values-it/strings.xml                     | 3 ---
 vector/src/main/res/values-iw/strings.xml                     | 1 -
 vector/src/main/res/values-ja/strings.xml                     | 1 -
 vector/src/main/res/values-lv/strings.xml                     | 1 -
 vector/src/main/res/values-nb-rNO/strings.xml                 | 1 -
 vector/src/main/res/values-pl/strings.xml                     | 1 -
 vector/src/main/res/values-pt-rBR/strings.xml                 | 3 ---
 vector/src/main/res/values-ru/strings.xml                     | 3 ---
 vector/src/main/res/values-sq/strings.xml                     | 3 ---
 vector/src/main/res/values-sv/strings.xml                     | 3 ---
 vector/src/main/res/values-tr/strings.xml                     | 1 -
 vector/src/main/res/values-uk/strings.xml                     | 2 --
 vector/src/main/res/values-vi/strings.xml                     | 1 -
 vector/src/main/res/values-zh-rCN/strings.xml                 | 3 ---
 vector/src/main/res/values-zh-rTW/strings.xml                 | 3 ---
 vector/src/main/res/values/strings.xml                        | 4 ----
 31 files changed, 1 insertion(+), 71 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt
index c1fd878013..e6d64c799f 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt
@@ -132,9 +132,6 @@ class UserListFragment @Inject constructor(
     }
 
     private fun setupSearchView() {
-        withState(viewModel) {
-            views.userListSearch.hint = getString(R.string.user_directory_search_hint_2)
-        }
         views.userListSearch
                 .textChanges()
                 .startWith(views.userListSearch.text)
diff --git a/vector/src/main/res/layout/fragment_user_list.xml b/vector/src/main/res/layout/fragment_user_list.xml
index 96cad5b7e9..36e62d2b31 100644
--- a/vector/src/main/res/layout/fragment_user_list.xml
+++ b/vector/src/main/res/layout/fragment_user_list.xml
@@ -89,7 +89,7 @@
         android:background="@null"
         android:drawablePadding="8dp"
         android:gravity="center_vertical"
-        android:hint="@string/user_directory_search_hint"
+        android:hint="@string/user_directory_search_hint_2"
         android:importantForAutofill="no"
         android:inputType="text"
         android:maxHeight="80dp"
diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
index 2ad5d7dde9..a37fad08d2 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -1166,8 +1166,6 @@
     <string name="space_explore_activity_title">استكشِف الغُرف</string>
     <string name="space_add_child_title">أضف غُرف</string>
     <string name="leave_space">غادر المساحة</string>
-    <!-- TO BE REMOVED -->
-    <string name="space_leave_prompt_msg">هل أنت متأكد أنك تريد مغادرة المساحة؟</string>
     <string name="space_leave_prompt_msg_only_you">انت الشخص الوحيد هنا إذا غادرت، فلن يتمكن أي شخص من الانضمام في المستقبل، بما في ذلك أنت.</string>
     <string name="space_leave_prompt_msg_private">هذه المساحة ليست عامة. لن تتمكن من الانضمام مرة أخرى بدون دعوة.</string>
     <string name="space_leave_prompt_msg_as_admin">أنت المسؤول عن هذه المساحة، تأكد من أنك قمت بنقل حق المسؤول إلى عضو آخر قبل المغادرة.</string>
diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index 6a68166bb7..9f8f2a98b0 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -1700,7 +1700,6 @@
     <string name="settings_category_timeline">Cronologia</string>
     <string name="timeline_unread_messages">Missatges no llegits</string>
     <string name="labs_swipe_to_reply_in_timeline">Activa lliscar per respondre a la cronologia</string>
-    <string name="user_directory_search_hint">Cerca a partir del nom o l\'ID</string>
     <string name="room_directory_search_hint">Nom o ID (#exemple:matrix.org)</string>
     <string name="room_filtering_footer_open_room_directory">Mostra el directori de la sales</string>
     <string name="room_filtering_footer_create_new_room">Crea una nova sala</string>
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index ec0b783464..e13a903c5e 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -2543,7 +2543,6 @@
     <string name="direct_room_user_list_recent_title">Poslední</string>
     <string name="qr_code">QR kód</string>
     <string name="add_by_qr_code">Přidat pomocí QR kódu</string>
-    <string name="user_directory_search_hint">Hledat podle jména nebo ID</string>
     <string name="permissions_denied_add_contact">Udělte právo přístupu ke kontaktům.</string>
     <string name="permissions_denied_qr_code">Pro sken QR kódu je nutné povolit přístup k fotoaparátu.</string>
     <string name="send_bug_report_include_key_share_history">Poslat historii požadavků na sdílení klíčů</string>
@@ -2737,8 +2736,6 @@
     <string name="you_are_invited">Jste zváni</string>
     <string name="spaces_beta_welcome_to_spaces">Vítejte ve Spaces!</string>
     <string name="space_add_existing_rooms">Přidat existující místnosti a prostor</string>
-    <!-- TO BE REMOVED -->
-    <string name="space_leave_prompt_msg">Jste si jisti, že chcete opustit tento prostor\?</string>
     <string name="leave_space">Opustit prostor</string>
     <string name="space_add_child_title">Přidat místnosti</string>
     <string name="space_explore_activity_title">Prozkoumat místnosti</string>
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 62db877318..73f0a9eb70 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2523,7 +2523,6 @@
     <string name="direct_room_user_list_recent_title">Kürzlich</string>
     <string name="qr_code">QR-Code</string>
     <string name="add_by_qr_code">Hinzufügen via QR-Code</string>
-    <string name="user_directory_search_hint">Nach Name oder ID suchen</string>
     <string name="permissions_denied_add_contact">Gib die Erlaubnis, um auf die Kamera zu zugreifen.</string>
     <string name="permissions_denied_qr_code">Um den QR-Code zu scannen, muss der Zugriff auf die Kamera erlaubt werden.</string>
     <string name="room_alias_published_alias_title">Öffentliche Adressen</string>
@@ -2770,8 +2769,6 @@
     <string name="command_description_leave_room">Verlasse den Raum mit der angegebenen ID (oder den aktuellen Raum, wenn keine ID angegeben wird)</string>
     <string name="search_hint_room_name">Name suchen</string>
     <string name="you_are_invited">Du wurdest eingeladen</string>
-    <!-- TO BE REMOVED -->
-    <string name="space_leave_prompt_msg">Bist du dir sicher, dass du den Space verlassen willst\?</string>
     <string name="leave_space">Space verlassen</string>
     <string name="space_add_child_title">Räume hinzufügen</string>
     <string name="space_explore_activity_title">Räume erkunden</string>
diff --git a/vector/src/main/res/values-eo/strings.xml b/vector/src/main/res/values-eo/strings.xml
index 05fd62b90b..c8f0f5fd02 100644
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/vector/src/main/res/values-eo/strings.xml
@@ -2596,7 +2596,6 @@
     <string name="qr_code">Rapidresponda kodo (QR)</string>
     <string name="add_by_qr_code">Aldoni per rapidresponda kodo (QR)</string>
     <string name="search_hint_room_name">Serĉi per nomo</string>
-    <string name="user_directory_search_hint">Serĉi per nomo aŭ identigilo</string>
     <string name="send_file_step_compressing_video">Densigante filmon %d%%</string>
     <string name="send_file_step_compressing_image">Densigante bildon…</string>
     <string name="give_feedback">Prikomenti</string>
@@ -2674,8 +2673,6 @@
     <string name="space_leave_prompt_msg_as_admin">Vi estas la sola administranto de ĉi tiu aro. Se vi foriros, neniu povos ĝin regi.</string>
     <string name="space_leave_prompt_msg_private">Vi ne povos ree aliĝi sen invito.</string>
     <string name="space_leave_prompt_msg_only_you">Vi estas la sola persono ĉi tie. Se vi foriros, neniu plu povos aliĝi, inkluzive vin mem.</string>
-    <!-- TO BE REMOVED -->
-    <string name="space_leave_prompt_msg">Ĉu vi certe volas foriri de la aro\?</string>
     <string name="leave_space">Foriri de aro</string>
     <string name="space_add_child_title">Aldoni ĉambrojn</string>
     <string name="space_explore_activity_title">Esplori ĉambrojn</string>
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index 7af1373a53..c2f77e5afc 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -2551,7 +2551,6 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="settings_show_emoji_keyboard">Mostrar teclado emoji</string>
     <string name="direct_room_user_list_recent_title">Reciente</string>
     <string name="add_by_qr_code">Añadir mediante código QR</string>
-    <string name="user_directory_search_hint">Buscar por nick o ID</string>
     <string name="qr_code">Código QR</string>
     <string name="direct_room_user_list_suggestions_title">Sugerencias</string>
     <string name="direct_room_user_list_contacts_title">Contactos</string>
@@ -2619,8 +2618,6 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="labs_use_restricted_join_rule">Espacio Experimental - Sala Restringida.</string>
     <string name="you_are_invited">Estas invitado</string>
     <string name="space_add_rooms">Añadir salas</string>
-    <!-- TO BE REMOVED -->
-    <string name="space_leave_prompt_msg">Estas seguro de que quieres salir de este espacio\?</string>
     <string name="leave_space">Salir de este espacio</string>
     <string name="space_add_child_title">Añadir salas</string>
     <string name="space_explore_activity_title">Explorar salas</string>
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index a39ab26a2a..288e9246c2 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -2497,7 +2497,6 @@
     <string name="direct_room_user_list_recent_title">Hiljutised</string>
     <string name="qr_code">QR-kood</string>
     <string name="add_by_qr_code">Lisa QR-koodi abil</string>
-    <string name="user_directory_search_hint">Otsi nime või Matrix\'i tunnuse alusel</string>
     <string name="permissions_denied_add_contact">Anna õigused oma kontakte lugeda.</string>
     <string name="permissions_denied_qr_code">QR-koodi lugemiseks pead selleks kaamerale õigused andma.</string>
     <string name="start_chatting">Alusta vestlust</string>
@@ -2679,8 +2678,6 @@
     <string name="spaces_beta_welcome_to_spaces_desc">Kogukonnakeskused on uus võimalus siduda jututubasid ja inimesi.</string>
     <string name="spaces_beta_welcome_to_spaces">Tere tulemast kasutama kogukonnakeskuseid!</string>
     <string name="space_add_existing_rooms">Lisa olemasolevaid jututubasid ja kogukonnakeskuseid</string>
-    <!-- TO BE REMOVED -->
-    <string name="space_leave_prompt_msg">Kas oled kindel, et soovid lahkuda kogukonnakeskusest\?</string>
     <string name="leave_space">Lahku kogukonnakeskusest</string>
     <string name="space_add_child_title">Lisa jututuba</string>
     <string name="space_explore_activity_title">Uuri jututubasid</string>
diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index 9ce4769bcc..a2a3d856fc 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -2437,7 +2437,6 @@
     <string name="direct_room_user_list_recent_title">اخیر</string>
     <string name="qr_code">رمز QR</string>
     <string name="add_by_qr_code">افزودن با رمز QR</string>
-    <string name="user_directory_search_hint">جست‌وجو با نام یا شناسه</string>
     <string name="permissions_denied_add_contact">دادن اجازهٔ دسترسی به آشنایانتان.</string>
     <string name="permissions_denied_qr_code">برای پویش یک رمز QR نیاز است دسترسی به دوربین را مجاز کنید.</string>
     <string name="start_chatting">آغاز به گپ</string>
@@ -2679,8 +2678,6 @@
     <string name="spaces_beta_welcome_to_spaces_desc">فضاها شیوه‌ای جدید برای گروه‌بندی اتاق‌ها و افراد است.</string>
     <string name="spaces_beta_welcome_to_spaces">به فضاها خوش آمدید!</string>
     <string name="space_add_existing_rooms">افزودن فضا و اتاق‌های موجود</string>
-    <!-- TO BE REMOVED -->
-    <string name="space_leave_prompt_msg">مطمئنید که می‌خواهید فضا را ترک کنید؟</string>
     <string name="leave_space">ترک فضا</string>
     <string name="space_add_child_title">افزودن اتاق</string>
     <string name="space_explore_activity_title">کاوش در اتاق‌ها</string>
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index 28a576613e..634c4027b0 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -2078,7 +2078,6 @@
     <string name="start_chatting">Aloita keskustelu</string>
     <string name="room_list_quick_actions_favorite_remove">Poista suosikeista</string>
     <string name="room_list_quick_actions_favorite_add">Lisää suosikiksi</string>
-    <string name="user_directory_search_hint">Hae nimellä tai käyttäjänimellä</string>
     <string name="room_no_active_widgets">Ei aktiivisia sovelmia</string>
     <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
     <string name="notification_ticker_text_dm">%1$s: %2$s</string>
diff --git a/vector/src/main/res/values-fr-rCA/strings.xml b/vector/src/main/res/values-fr-rCA/strings.xml
index 204580c842..cf9c07efb6 100644
--- a/vector/src/main/res/values-fr-rCA/strings.xml
+++ b/vector/src/main/res/values-fr-rCA/strings.xml
@@ -343,7 +343,6 @@
     <string name="link_copied_to_clipboard">Lien copié dans le presse-papiers</string>
     <string name="labs_show_unread_notifications_as_tab">Ajouter un onglet dédié aux notifications non-lues sur l’écran principal.</string>
     <string name="labs_swipe_to_reply_in_timeline">Activer le balayage pour répondre dans l’historique</string>
-    <string name="user_directory_search_hint">Chercher par nom ou identifiant</string>
     <string name="room_directory_search_hint">Nom ou identifiant (#exemple:matrix.org)</string>
     <string name="room_filtering_footer_open_room_directory">Voir le répertoire des salons</string>
     <string name="room_filtering_footer_create_new_direct_message">Envoyer un nouveau message privé</string>
@@ -2748,8 +2747,6 @@
     <string name="space_leave_prompt_msg_as_admin">Vous êtes admin de cet espace, assurez-vous d’avoir transféré les droits d’admin à un autre membre avant de partir.</string>
     <string name="space_leave_prompt_msg_private">Cet espace n’est pas public. Vous ne pourrez pas le rejoindre sans invitation.</string>
     <string name="space_leave_prompt_msg_only_you">Vous êtes la seule personne ici. Si vous partez, personne ne pourra entrer à l’avenir, même pas vous.</string>
-    <!-- TO BE REMOVED -->
-    <string name="space_leave_prompt_msg">Voulez-vous vraiment quitter l’espace\?</string>
     <string name="leave_space">Quitter l’espace</string>
     <string name="space_add_child_title">Ajouter des salons</string>
     <string name="space_explore_activity_title">Parcourir les salons</string>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index bb8bca76cd..710145c63b 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -2452,7 +2452,6 @@
     <string name="direct_room_user_list_recent_title">Récent</string>
     <string name="qr_code">code QR</string>
     <string name="add_by_qr_code">Ajouter avec un code QR</string>
-    <string name="user_directory_search_hint">Chercher par nom ou identifiant</string>
     <string name="permissions_denied_add_contact">Autoriser l’accès à vos contacts.</string>
     <string name="permissions_denied_qr_code">Pour scanner un code QR, vous devez autoriser l’accès à votre appareil photo.</string>
     <string name="start_chatting">Commencer une conversation</string>
@@ -2708,8 +2707,6 @@
     <string name="spaces_beta_welcome_to_spaces_desc">Les espaces sont une nouvelle manière de regrouper les salons et les gens.</string>
     <string name="spaces_beta_welcome_to_spaces">Bienvenue dans les espaces !</string>
     <string name="space_add_existing_rooms">Ajouter des salons et espaces existants</string>
-    <!-- TO BE REMOVED -->
-    <string name="space_leave_prompt_msg">Voulez-vous vraiment quitter l’espace \?</string>
     <string name="leave_space">Quitter l’espace</string>
     <string name="space_add_child_title">Ajouter des salons</string>
     <string name="space_explore_activity_title">Parcourir les salons</string>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 8635e8bf75..55b5dcb0c7 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -2306,7 +2306,6 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="this_is_the_beginning_of_room_no_name">Itt kezdődik ez a beszélgetés.</string>
     <string name="this_is_the_beginning_of_room">Ez a %s szoba kezdete.</string>
     <string name="direct_room_user_list_known_title">Ismert felhasználók</string>
-    <string name="user_directory_search_hint">Keresés névvel, vagy Matrix ID-vel</string>
     <string name="sent_a_reaction">Reakció: %s</string>
     <string name="action_add">Hozzáadás</string>
     <string name="call_notification_hangup">Befejezés</string>
@@ -2490,8 +2489,6 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="space_leave_prompt_msg_as_admin">Ön az egyetlen adminisztrátora a térnek. Ha kilép, senki nem tudja irányítani.</string>
     <string name="space_leave_prompt_msg_private">Amíg nem hívnak meg újra nem tudsz újracsatlakozni.</string>
     <string name="space_leave_prompt_msg_only_you">Csak te van itt. Ha kilépsz, akkor a jövőben senki nem tud majd ide belépni, beleértve téged is.</string>
-    <!-- TO BE REMOVED -->
-    <string name="space_leave_prompt_msg">Biztos el akarod hagyni a teret\?</string>
     <string name="leave_space">Tér elhagyása</string>
     <string name="space_add_child_title">Szobák hozzáadása</string>
     <string name="space_explore_activity_title">Szobák felderítése</string>
diff --git a/vector/src/main/res/values-in/strings.xml b/vector/src/main/res/values-in/strings.xml
index 295d7427a2..6875ba6782 100644
--- a/vector/src/main/res/values-in/strings.xml
+++ b/vector/src/main/res/values-in/strings.xml
@@ -1770,7 +1770,6 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="link_copied_to_clipboard">Tautan disalin ke klipboard</string>
     <string name="labs_swipe_to_reply_in_timeline">Aktifkan geser untuk balas di linimasa</string>
     <string name="search_hint_room_name">Cari Nama</string>
-    <string name="user_directory_search_hint">Cari dengan nama atau ID</string>
     <string name="room_directory_search_hint">Nama atau ID (#contoh:matrix.org)</string>
     <string name="room_filtering_footer_open_room_directory">Tampilkan direktori ruangan</string>
     <string name="room_filtering_footer_create_new_direct_message">Kirim pesan langsung baru</string>
@@ -2396,7 +2395,6 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="space_leave_prompt_msg_as_admin">Anda adalah admin satu-satunya di space ini. Meninggalkannya berarti siapa saja tidak akan mempunyai kontrol atas space-nya.</string>
     <string name="space_leave_prompt_msg_private">Anda tidak akan bisa bergabung lagi kecuali jika Anda diundang lagi.</string>
     <string name="space_leave_prompt_msg_only_you">Anda hanya salah satu orang di sini. Jika Anda tinggalkan, siapa saja tidak dapat bergabung di masa depan, termasuk Anda.</string>
-    <string name="space_leave_prompt_msg">Apakah Anda yakin untuk meninggalkan space ini\?</string>
     <string name="space_leave_prompt_msg_with_name">Apakah Anda yakin untuk meninggalkan %s\?</string>
     <string name="leave_space">Tinggalkan Space</string>
     <string name="space_add_child_title">Tambahkan ruangan</string>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 67fc33c28e..2262774b1e 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -2550,7 +2550,6 @@
     <string name="direct_room_user_list_recent_title">Recenti</string>
     <string name="qr_code">Codice QR</string>
     <string name="add_by_qr_code">Aggiungi da codice QR</string>
-    <string name="user_directory_search_hint">Cerca per nome o ID</string>
     <string name="permissions_denied_qr_code">Per scansionare un codice QR devi permettere l\'accesso alla fotocamera.</string>
     <string name="permissions_denied_add_contact">Autorizza ad accedere ai tuoi contatti.</string>
     <string name="start_chatting">Inizia a chattare</string>
@@ -2732,8 +2731,6 @@
     <string name="spaces_beta_welcome_to_spaces_desc">Gli Spazi sono un nuovo modo per raggruppare stanze e contatti.</string>
     <string name="spaces_beta_welcome_to_spaces">Benvenuto negli Spazi!</string>
     <string name="space_add_existing_rooms">Aggiungi stanze e Spazi esistenti</string>
-    <!-- TO BE REMOVED -->
-    <string name="space_leave_prompt_msg">Vuoi veramente uscire dallo Spazio\?</string>
     <string name="leave_space">Esci dallo Spazio</string>
     <string name="space_add_child_title">Aggiungi stanze</string>
     <string name="space_explore_activity_title">Guarda le stanze</string>
diff --git a/vector/src/main/res/values-iw/strings.xml b/vector/src/main/res/values-iw/strings.xml
index 41d6e147c5..f6c38a6a0f 100644
--- a/vector/src/main/res/values-iw/strings.xml
+++ b/vector/src/main/res/values-iw/strings.xml
@@ -1602,7 +1602,6 @@
     <string name="link_copied_to_clipboard">הקישור הועתק ללוח</string>
     <string name="labs_show_unread_notifications_as_tab">הוסף כרטיסייה ייעודית להתראות שלא נקראו על המסך הראשי.</string>
     <string name="labs_swipe_to_reply_in_timeline">אפשר החלקה כדי להשיב בציר הזמן</string>
-    <string name="user_directory_search_hint">חפש לפי שם או תעודת זהות</string>
     <string name="room_directory_search_hint">שם או מזהה (# לדוגמא: matrix.ahava528.com)</string>
     <string name="room_filtering_footer_open_room_directory">צפו בספריית החדרים</string>
     <string name="room_filtering_footer_create_new_direct_message">שלח הודעה ישירה חדשה</string>
diff --git a/vector/src/main/res/values-ja/strings.xml b/vector/src/main/res/values-ja/strings.xml
index 96324c2058..135c0eb09b 100644
--- a/vector/src/main/res/values-ja/strings.xml
+++ b/vector/src/main/res/values-ja/strings.xml
@@ -1194,7 +1194,6 @@ ${app_name}からあなた個人の電話帳への検索要求を許可する場
     <string name="user_code_share">コードを共有</string>
     <string name="template_invite_friends_text">${app_name} で会話しましょう: %s</string>
     <string name="invite_friends">フレンドを招待</string>
-    <string name="user_directory_search_hint">名前または ID で検索</string>
     <string name="direct_room_user_list_known_title">既知のユーザー</string>
     <string name="invalid_qr_code_uri">無効なQRコード (無効な URI)！</string>
     <string name="passwords_do_not_match">パスワードが一致しません</string>
diff --git a/vector/src/main/res/values-lv/strings.xml b/vector/src/main/res/values-lv/strings.xml
index 126942b645..bde0afd0eb 100644
--- a/vector/src/main/res/values-lv/strings.xml
+++ b/vector/src/main/res/values-lv/strings.xml
@@ -1074,7 +1074,6 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="attachment_type_camera">Kamera</string>
     <string name="settings_text_message_sent_hint">Kods</string>
     <string name="direct_room_user_list_known_title">Zināmie lietotāji</string>
-    <string name="user_directory_search_hint">Meklēt pēc nosaukuma vai ID</string>
     <string name="send_file_step_idle">Gaida…</string>
     <string name="bottom_action_people_x">Tiešās ziņas</string>
     <string name="send_suggestion_failed">Ieteikumu neizdevās nosūtīt (%s)</string>
diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml
index 822b37f2d7..454e946f5a 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@@ -1205,7 +1205,6 @@
     <string name="no_message_edits_found">Ingen endringer funnet</string>
     <string name="room_filtering_footer_title">Finner du ikke det du leter etter\?</string>
     <string name="room_filtering_footer_create_new_direct_message">Send en ny direkte melding</string>
-    <string name="user_directory_search_hint">Søk etter navn eller ID</string>
     <string name="labs_swipe_to_reply_in_timeline">Aktiver sveip for å svare på tidslinjen</string>
     <string name="link_copied_to_clipboard">Link kopiert til utklippstavlen</string>
     <string name="add_by_matrix_id">Legg til med matrix-ID</string>
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index 902c0df49e..75a6938bc0 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -2125,7 +2125,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="qr_code">Kod QR</string>
     <string name="add_by_qr_code">Dodaj poprzez kod QR</string>
     <string name="labs_show_unread_notifications_as_tab">Dodaj dedykowaną kartę dla nieprzeczytanych powiadomień na ekranie głównym.</string>
-    <string name="user_directory_search_hint">Szukaj poprzez imię bądź ID</string>
     <string name="settings_labs_show_complete_history_in_encrypted_room">Pokazuj całą historię w zaszyfrowanych pokojach</string>
     <string name="create_room_federation_error">Ten pokój został utworzony ale niektóre zaproszenia nie zostały wysłane z następującego powodu:
 \n
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 04cee3ef62..a9bc57047b 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -2567,7 +2567,6 @@
     <string name="direct_room_user_list_known_title">Usuárias(os) Conhecidas(os)</string>
     <string name="qr_code">QR code</string>
     <string name="add_by_qr_code">Adicionar por QR code</string>
-    <string name="user_directory_search_hint">Pesquisar por nome ou ID</string>
     <string name="permissions_denied_add_contact">Aceitar permissão para acessar seus contatos.</string>
     <string name="permissions_denied_qr_code">Para scannear um QR code, você precisa permitir acesso a câmera.</string>
     <string name="start_chatting">Começar a Conversar</string>
@@ -2815,8 +2814,6 @@
     <string name="space_leave_prompt_msg_as_admin">Você é a/o única(o) admin deste espaço. Sair dele vai significar que ninguém tem controle sobre ele.</string>
     <string name="space_leave_prompt_msg_private">Você não vai ser capaz de se rejuntar a menos que você seja re-convidada(o).</string>
     <string name="space_leave_prompt_msg_only_you">Você é a única pessoa aqui. Se você sair, ninguém vai ser capaz de se juntar no futuro, incluindo você.</string>
-    <!-- TO BE REMOVED -->
-    <string name="space_leave_prompt_msg">Você tem certeza que você quer sair do espaço\?</string>
     <string name="leave_space">Sair de Espaço</string>
     <string name="space_add_child_title">Adicionar salas</string>
     <string name="space_explore_activity_title">Explorar salas</string>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 82cddb03cf..cf25de8f27 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -2586,7 +2586,6 @@
     <string name="create_room_name_section">Название комнаты</string>
     <string name="settings_discovery_consent_notice_on">Вы дали свое согласие на отправку электронных писем и телефонных номеров на этот сервер идентификации для обнаружения других пользователей из ваших контактов.</string>
     <string name="add_by_qr_code">Добавить по QR-коду</string>
-    <string name="user_directory_search_hint">Поиск по имени или идентификатору</string>
     <string name="permissions_denied_add_contact">Разрешить доступ к вашим контактам.</string>
     <string name="permissions_denied_qr_code">Чтобы отсканировать QR-код, вам нужно разрешить доступ к камере.</string>
     <string name="matrix_to_card_title">Ссылка Matrix</string>
@@ -2868,8 +2867,6 @@
     <string name="space_leave_prompt_msg_as_admin">Вы являетесь администратором этого пространства, перед уходом убедитесь, что передали права администратора другому пользователю.</string>
     <string name="space_leave_prompt_msg_private">Это пространство не является публичным. Вы не сможете присоединиться к нему без приглашения.</string>
     <string name="space_leave_prompt_msg_only_you">Вы здесь единственный человек. Если вы уйдёте, никто не сможет присоединиться в будущем, включая вас.</string>
-    <!-- TO BE REMOVED -->
-    <string name="space_leave_prompt_msg">Вы уверены, что хотите покинуть пространство\?</string>
     <string name="leave_space">Покинуть пространство</string>
     <string name="space_add_child_title">Добавить комнаты</string>
     <string name="space_explore_activity_title">Список комнат</string>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index 182b3a1415..5e399ebe84 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -2483,7 +2483,6 @@
     <string name="direct_room_user_list_known_title">Përdorues të Ditur</string>
     <string name="qr_code">Kod QR</string>
     <string name="add_by_qr_code">Shtoni përmes kodi QR</string>
-    <string name="user_directory_search_hint">Kërkoni sipas emri ose ID-je</string>
     <string name="permissions_denied_qr_code">Që të skanoni një kod QR, lypset të lejoni përdorim kamere.</string>
     <string name="start_chatting">Filloni të Llafoseni</string>
     <string name="permissions_denied_add_contact">Jepni leje për hyrje te kontaktet tuaja.</string>
@@ -2668,8 +2667,6 @@
     <string name="you_are_invited">Jeni ftuar</string>
     <string name="spaces_beta_welcome_to_spaces">Mirë se vini te Hapësira!</string>
     <string name="space_add_existing_rooms">Shtoni dhoma ekzistuese dhe hapësira</string>
-    <!-- TO BE REMOVED -->
-    <string name="space_leave_prompt_msg">Jeni i sigurt se doni të dilni nga hapësira\?</string>
     <string name="leave_space">Braktiseni Hapësirën</string>
     <string name="space_add_child_title">Shtoni dhoma</string>
     <string name="space_explore_activity_title">Eksploroni dhoma</string>
diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index 4add831fcf..3fc05c4d40 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -2504,7 +2504,6 @@
     <string name="direct_room_user_list_recent_title">Senaste</string>
     <string name="qr_code">QR-kod</string>
     <string name="add_by_qr_code">Lägg till med QR-kod</string>
-    <string name="user_directory_search_hint">Sök med namn eller ID</string>
     <string name="room_preview_no_preview_join">Det här rummet kan inte förhandsgranskas. Vill du gå med i det\?</string>
     <string name="room_preview_not_found">Det här rummet är inte åtkomligt just nu.
 \nFörsök igen senare, eller be en rumsadministratör för att kolla om du har åtkomst.</string>
@@ -2737,8 +2736,6 @@
     <string name="spaces_beta_welcome_to_spaces_desc">Utrymmen är ett nytt sätt att gruppera rum och personer.</string>
     <string name="spaces_beta_welcome_to_spaces">Välkommen till utrymmen!</string>
     <string name="space_add_existing_rooms">Lägg till existerande rum och utrymme</string>
-    <!-- TO BE REMOVED -->
-    <string name="space_leave_prompt_msg">Är du säker på att du vill lämna utrymmet\?</string>
     <string name="leave_space">Lämna utrymme</string>
     <string name="space_add_child_title">Lägg till rum</string>
     <string name="space_explore_activity_title">Utforska rum</string>
diff --git a/vector/src/main/res/values-tr/strings.xml b/vector/src/main/res/values-tr/strings.xml
index 1d62631111..6fc2a5a738 100644
--- a/vector/src/main/res/values-tr/strings.xml
+++ b/vector/src/main/res/values-tr/strings.xml
@@ -1616,7 +1616,6 @@
     <string name="add_identity_server">Kimlik sunucusunu yapılandırın</string>
     <string name="disconnect_identity_server">Kimlik sunucusunun bağlantısını kesin</string>
     <string name="identity_server">Kimlik sunucusu</string>
-    <string name="user_directory_search_hint">İsimle veya ID ile ara</string>
     <string name="settings_labs_show_hidden_events_in_timeline">Gizli etkinlikleri zaman tünelinde göster</string>
     <string name="room_preview_no_preview_join">Bu oda ön izlenemiyor. Katılmak ister misiniz\?</string>
     <string name="room_manage_integrations">Entegrasyonları Yönet</string>
diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml
index b4cf230eea..ee3dd722a1 100644
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -1964,7 +1964,6 @@
     <string name="a11y_qr_code_for_verification">QR-код</string>
     <string name="a13n_qr_code_description">Зображення QR-коду</string>
     <string name="qr_code">QR-код</string>
-    <string name="user_directory_search_hint">Пошук за іменем або ID</string>
     <string name="add_by_qr_code">Додати за QR-кодом</string>
     <string name="settings_discovery_mail_pending">Очікування</string>
     <string name="identity_server_set_alternative_notice_no_default">Зазначте адресу сервера ідентифікації</string>
@@ -2200,7 +2199,6 @@
     <string name="voice_message_slide_to_cancel">Проведіть пальцем, щоб скасувати</string>
     <string name="a11y_start_voice_message">Розпочати голосове повідомлення</string>
     <string name="call_jitsi_started">Розпочато груповий виклик</string>
-    <string name="space_leave_prompt_msg">Ви впевнені, що хочете вийти з простору\?</string>
     <string name="leave_space">Вийти з простору</string>
     <string name="space_settings_manage_rooms">Керувати кімнатами</string>
     <string name="user_invites_you">%s запрошує вас</string>
diff --git a/vector/src/main/res/values-vi/strings.xml b/vector/src/main/res/values-vi/strings.xml
index 5da3dbe059..ab164d62c7 100644
--- a/vector/src/main/res/values-vi/strings.xml
+++ b/vector/src/main/res/values-vi/strings.xml
@@ -1124,7 +1124,6 @@
     <string name="link_copied_to_clipboard">Đường link được copy</string>
     <string name="labs_swipe_to_reply_in_timeline">Bật chức năng quẹt để Trả lời</string>
     <string name="search_hint_room_name">Tìm Tên</string>
-    <string name="user_directory_search_hint">Tìm theo tên hoặc ID</string>
     <string name="room_directory_search_hint">Tên hoặc ID</string>
     <string name="room_filtering_footer_open_room_directory">Xem danh mục phòng chat</string>
     <string name="room_filtering_footer_create_new_direct_message">Gửi tin nhắn tới phòng 1-1</string>
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 20df22ad79..685ffbb0cd 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -2419,7 +2419,6 @@
     <string name="direct_room_user_list_recent_title">最近</string>
     <string name="qr_code">二维码</string>
     <string name="add_by_qr_code">通过二维码添加</string>
-    <string name="user_directory_search_hint">通过名称或 ID 搜索</string>
     <string name="create_room_settings_section">聊天室设置</string>
     <string name="create_room_topic_hint">主题</string>
     <string name="create_room_topic_section">聊天室话题（可选）</string>
@@ -2602,8 +2601,6 @@
     <string name="space_leave_prompt_msg_as_admin">你是此空间唯一的管理员。离开就意味着没人能控制它。</string>
     <string name="space_leave_prompt_msg_private">除非你被重新邀请，否则你将无法重新加入。</string>
     <string name="space_leave_prompt_msg_only_you">你是这唯一的人。如果你离开，包括你在内的所有人都将无法加入此空间。</string>
-    <!-- TO BE REMOVED -->
-    <string name="space_leave_prompt_msg">你确定你想要离开此空间吗？</string>
     <string name="leave_space">离开空间</string>
     <string name="space_add_child_title">添加聊天室</string>
     <string name="space_explore_activity_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 6f7a8b5dd3..8de57469ee 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -2449,7 +2449,6 @@
     <string name="direct_room_user_list_recent_title">最近</string>
     <string name="qr_code">QR code</string>
     <string name="add_by_qr_code">透過 QR code 新增</string>
-    <string name="user_directory_search_hint">使用名稱或 ID 搜尋</string>
     <string name="permissions_denied_add_contact">允許存取您聯絡人的權限。</string>
     <string name="permissions_denied_qr_code">要掃描 QR code，您必須允許存取攝影機。</string>
     <string name="start_chatting">開始聊天</string>
@@ -2628,8 +2627,6 @@
     <string name="spaces_beta_welcome_to_spaces_desc">空間是將聊天室與人們分組的新方式。</string>
     <string name="spaces_beta_welcome_to_spaces">歡迎使用空間！</string>
     <string name="space_add_existing_rooms">新增既有的聊天室與空間</string>
-    <!-- TO BE REMOVED -->
-    <string name="space_leave_prompt_msg">您確定您想要離開空間嗎？</string>
     <string name="leave_space">離開空間</string>
     <string name="space_add_child_title">新增聊天室</string>
     <string name="space_explore_activity_title">探索聊天室</string>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 50306f1528..a61ba52a79 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2308,8 +2308,6 @@
     <string name="room_filtering_footer_open_room_directory">View the room directory</string>
 
     <string name="room_directory_search_hint">Name or ID (#example:matrix.org)</string>
-    <!-- TO BE REMOVED -->
-    <string name="user_directory_search_hint">Search by name or ID</string>
     <string name="user_directory_search_hint_2">Search by name, ID or mail</string>
 
     <string name="search_hint_room_name">Search Name</string>
@@ -3518,8 +3516,6 @@
     <string name="space_add_child_title">Add rooms</string>
     <string name="leave_space">Leave Space</string>
     <string name="space_leave_prompt_msg_with_name">Are you sure you want to leave %s?</string>
-    <!-- TO BE REMOVED -->
-    <string name="space_leave_prompt_msg">Are you sure you want to leave the space?</string>
     <string name="space_leave_prompt_msg_only_you">You are the only person here. If you leave, no one will be able to join in the future, including you.</string>
     <string name="space_leave_prompt_msg_private">You won\'t be able to rejoin unless you are re-invited.</string>
     <string name="space_leave_prompt_msg_as_admin">You\'re the only admin of this space. Leaving it will mean no one has control over it.</string>