From 4b641dbe1aace1815cc94851f77490e9872fca78 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 29 Sep 2025 14:43:16 +0200
Subject: [PATCH 1/2] Do not use plurals in this case since it can lead to lint
 issues since there is no %d in the value for one and this triggers a warning
 in some languages.

---
 .../android/features/space/impl/leave/LeaveSpaceView.kt      | 3 +--
 features/space/impl/src/main/res/values/localazy.xml         | 5 +----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceView.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceView.kt
index fbfb659f53..2a3cd73ea9 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceView.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/leave/LeaveSpaceView.kt
@@ -155,9 +155,8 @@ private fun LeaveSpaceHeader(
             ),
             subTitle =
                 if (state.selectableSpaceRooms is AsyncData.Success && state.selectableSpaceRooms.data.isNotEmpty()) {
-                    val count = state.selectableSpaceRooms.data.size
                     if (state.hasOnlyLastAdminRoom) {
-                        pluralStringResource(R.plurals.screen_leave_space_subtitle_only_last_admin, count, count)
+                        stringResource(R.string.screen_leave_space_subtitle_only_last_admin)
                     } else {
                         stringResource(R.string.screen_leave_space_subtitle)
                     }
diff --git a/features/space/impl/src/main/res/values/localazy.xml b/features/space/impl/src/main/res/values/localazy.xml
index ac031defa3..07c5468ce6 100644
--- a/features/space/impl/src/main/res/values/localazy.xml
+++ b/features/space/impl/src/main/res/values/localazy.xml
@@ -6,9 +6,6 @@
     <item quantity="other">"Leave %1$d rooms and space"</item>
   </plurals>
   <string name="screen_leave_space_subtitle">"Select the rooms you’d like to leave which you\'re not the only administrator for:"</string>
-  <plurals name="screen_leave_space_subtitle_only_last_admin">
-    <item quantity="one">"You will not be removed from the following room because you\'re the only administrator:"</item>
-    <item quantity="other">"You will not be removed from the following rooms because you\'re the only administrator:"</item>
-  </plurals>
+  <string name="screen_leave_space_subtitle_only_last_admin">"You will not be removed from the following room(s) because you\'re the only administrator:"</string>
   <string name="screen_leave_space_title">"Leave %1$s?"</string>
 </resources>

From f41185d2f008f53f543dd50ed3f3062dde157b38 Mon Sep 17 00:00:00 2001
From: ElementBot <android@element.io>
Date: Mon, 29 Sep 2025 12:59:33 +0000
Subject: [PATCH 2/2] Update screenshots

---
 .../features.space.impl.leave_LeaveSpaceView_Day_4_en.png     | 4 ++--
 .../features.space.impl.leave_LeaveSpaceView_Day_5_en.png     | 4 ++--
 .../features.space.impl.leave_LeaveSpaceView_Night_4_en.png   | 4 ++--
 .../features.space.impl.leave_LeaveSpaceView_Night_5_en.png   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_4_en.png
index b312c338e7..6ffb98cf91 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16b86605705dbe40f359cb93eba19efcd5b119b2da38eadf2636bfb26458e838
-size 35844
+oid sha256:aa05867ac79a3bfb9f59bf1dafb02185274b46e9a5fbf27415a0e907780a0493
+size 36393
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_5_en.png
index 85809372c1..aba8f0ea75 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:251c739a4d2f4b553d192bdfaf4565a0d2ac45938ce32c53205500b8ef347f19
-size 42540
+oid sha256:e74abc389c25fa9a5d33ade6d0f8a2242aeb5150fe81a26e26e9b561c46bb802
+size 43010
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_4_en.png
index 0e360e7d6b..d7a024d955 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:09903fc1e3e5adf5b165acbd4cf504c5d570da9ad3ea8a7cc90c17e72e491fe4
-size 34953
+oid sha256:6465f03be41ae02635cbdc94f521059bdd6476c5b2ccfca6f28ccd8898112cea
+size 35530
diff --git a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_5_en.png
index 37d6117ae0..171d67f826 100644
--- a/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.space.impl.leave_LeaveSpaceView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9e4ca33fcc750bbdea7e25aaed5f9ac7fef377ae44e9015576362af873da99af
-size 41658
+oid sha256:af017745220027708f5a84ca639c9990fe7e474a38aaeecc3cba82011d195360
+size 42080