From 4dd5b2c884498a086d39423c03bb9d23089ff25d Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Thu, 22 Jul 2021 11:58:32 +0100
Subject: [PATCH 1/2] grammar: Server matching ... -> Servers matching ...

This commit uses the plural form of Server as each message is talking about *one or more* servers in the room.
---
 vector/src/main/res/values/strings.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 4cd7f6f6c3..e3385765a8 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -74,19 +74,19 @@
     <string name="notice_direct_room_update_by_you">You upgraded here.</string>
     <string name="notice_room_server_acl_set_title">%s set the server ACLs for this room.</string>
     <string name="notice_room_server_acl_set_title_by_you">You set the server ACLs for this room.</string>
-    <string name="notice_room_server_acl_set_banned">• Server matching %s are banned.</string>
-    <string name="notice_room_server_acl_set_allowed">• Server matching %s are allowed.</string>
-    <string name="notice_room_server_acl_set_ip_literals_allowed">• Server matching IP literals are allowed.</string>
-    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Server matching IP literals are banned.</string>
+    <string name="notice_room_server_acl_set_banned">• Servers matching %s are banned.</string>
+    <string name="notice_room_server_acl_set_allowed">• Servers matching %s are allowed.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• Servers matching IP literals are allowed.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Servers matching IP literals are banned.</string>
 
     <string name="notice_room_server_acl_updated_title">%s changed the server ACLs for this room.</string>
     <string name="notice_room_server_acl_updated_title_by_you">You changed the server ACLs for this room.</string>
-    <string name="notice_room_server_acl_updated_banned">• Server matching %s are now banned.</string>
-    <string name="notice_room_server_acl_updated_was_banned">• Server matching %s were removed from the ban list.</string>
-    <string name="notice_room_server_acl_updated_allowed">• Server matching %s are now allowed.</string>
-    <string name="notice_room_server_acl_updated_was_allowed">• Server matching %s were removed from the allowed list.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Server matching IP literals are now allowed.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Server matching IP literals are now banned.</string>
+    <string name="notice_room_server_acl_updated_banned">• Servers matching %s are now banned.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Servers matching %s were removed from the ban list.</string>
+    <string name="notice_room_server_acl_updated_allowed">• Servers matching %s are now allowed.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Servers matching %s were removed from the allowed list.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Servers matching IP literals are now allowed.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Servers matching IP literals are now banned.</string>
     <string name="notice_room_server_acl_updated_no_change">No change.</string>
     <string name="notice_room_server_acl_allow_is_empty">🎉 All servers are banned from participating! This room can no longer be used.</string>
 

From 74aea4611ac713c648b3e0ba0addd97ac30ebe2d Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Thu, 22 Jul 2021 12:02:44 +0100
Subject: [PATCH 2/2] Changelog

---
 changelog.d/3721.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/3721.misc

diff --git a/changelog.d/3721.misc b/changelog.d/3721.misc
new file mode 100644
index 0000000000..8c3424c6ed
--- /dev/null
+++ b/changelog.d/3721.misc
@@ -0,0 +1 @@
+Apply grammatical fixes to the Server ACL timeline messages.