From 37a9cdd6e68d79d9ad4f3e4bff4968c184dd9707 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <jannemk@element.io>
Date: Wed, 22 Mar 2023 16:25:25 +0100
Subject: [PATCH 1/3] Quick settings: Change the copy / labels on the options

---
 .../views/context_menus/RoomNotificationContextMenu.tsx     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/context_menus/RoomNotificationContextMenu.tsx b/src/components/views/context_menus/RoomNotificationContextMenu.tsx
index 0e5d608f7e8..54554390397 100644
--- a/src/components/views/context_menus/RoomNotificationContextMenu.tsx
+++ b/src/components/views/context_menus/RoomNotificationContextMenu.tsx
@@ -52,7 +52,7 @@ export const RoomNotificationContextMenu: React.FC<IProps> = ({ room, onFinished
 
     const defaultOption: JSX.Element = (
         <IconizedContextMenuRadio
-            label={_t("Use default")}
+            label={_t("Match default setting")}
             active={notificationState === RoomNotifState.AllMessages}
             iconClassName="mx_RoomNotificationContextMenu_iconBell"
             onClick={wrapHandler(() => setNotificationState(RoomNotifState.AllMessages))}
@@ -70,7 +70,7 @@ export const RoomNotificationContextMenu: React.FC<IProps> = ({ room, onFinished
 
     const mentionsOption: JSX.Element = (
         <IconizedContextMenuRadio
-            label={_t("Mentions & Keywords")}
+            label={_t("Mentions & keywords")}
             active={notificationState === RoomNotifState.MentionsOnly}
             iconClassName="mx_RoomNotificationContextMenu_iconBellMentions"
             onClick={wrapHandler(() => setNotificationState(RoomNotifState.MentionsOnly))}
@@ -79,7 +79,7 @@ export const RoomNotificationContextMenu: React.FC<IProps> = ({ room, onFinished
 
     const muteOption: JSX.Element = (
         <IconizedContextMenuRadio
-            label={_t("Off")}
+            label={_t("Mute room")}
             active={notificationState === RoomNotifState.Mute}
             iconClassName="mx_RoomNotificationContextMenu_iconBellCrossed"
             onClick={wrapHandler(() => setNotificationState(RoomNotifState.Mute))}

From ec5d3a0bb8befab52dcdcd2f4043638776c9940e Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <jannemk@element.io>
Date: Wed, 22 Mar 2023 17:10:16 +0100
Subject: [PATCH 2/3] Update i18n

---
 src/i18n/strings/en_EN.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f67847fd925..fb597faa65e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -3255,8 +3255,8 @@
     "Low Priority": "Low Priority",
     "Forget Room": "Forget Room",
     "Mark as read": "Mark as read",
-    "Use default": "Use default",
-    "Mentions & Keywords": "Mentions & Keywords",
+    "Match default setting": "Match default setting",
+    "Mute room": "Mute room",
     "See room timeline (devtools)": "See room timeline (devtools)",
     "Space": "Space",
     "Space home": "Space home",

From a1c6a9cb0714c63648805f89f7b756e25a3e9d19 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <jannemk@element.io>
Date: Tue, 4 Apr 2023 13:52:39 +0200
Subject: [PATCH 3/3] Fix hardcoded button label in sliding-sync test

---
 cypress/e2e/sliding-sync/sliding-sync.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/e2e/sliding-sync/sliding-sync.ts b/cypress/e2e/sliding-sync/sliding-sync.ts
index 2cae1a12184..10bd2467970 100644
--- a/cypress/e2e/sliding-sync/sliding-sync.ts
+++ b/cypress/e2e/sliding-sync/sliding-sync.ts
@@ -202,7 +202,7 @@ describe("Sliding Sync", () => {
 
         // disable notifs in this room (TODO: CS API call?)
         cy.contains(".mx_RoomTile", "Test Room").find(".mx_RoomTile_notificationsButton").click({ force: true });
-        cy.contains("Off").click();
+        cy.contains("Mute room").click();
 
         // create a new room so we know when the message has been received as it'll re-shuffle the room list
         cy.createRoom({