From 10f0e1d0c1ec15c1a6e3576f3afeacca9990a007 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 18 Jan 2022 22:05:19 +0000
Subject: [PATCH] Tweak copy for the Sidebar tab in User Settings

---
 .../settings/tabs/user/SidebarUserSettingsTab.tsx | 15 +++++++--------
 src/i18n/strings/en_EN.json                       |  9 ++++-----
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx b/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx
index 92a5bacb64f..adbee7e1d99 100644
--- a/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Matrix.org Foundation C.I.C.
+Copyright 2021 - 2022 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -45,18 +45,17 @@ const SidebarUserSettingsTab = () => {
             <div className="mx_SettingsTab_heading">{ _t("Sidebar") }</div>
 
             <div className="mx_SettingsTab_section">
-                <span className="mx_SettingsTab_subheading">{ _t("Spaces") }</span>
-                <div className="mx_SettingsTab_subsectionText">{ _t("Spaces are ways to group rooms and people.") }</div>
-
                 <div className="mx_SidebarUserSettingsTab_subheading">{ _t("Spaces to show") }</div>
                 <div className="mx_SettingsTab_subsectionText">
-                    { _t("Along with the spaces you're in, you can use some pre-built ones too.") }
+                    { _t("Spaces are ways to group rooms and people. " +
+                        "Alongside the spaces you're in, you can use some pre-built ones too.") }
                 </div>
 
                 <StyledCheckbox
                     checked={!!homeEnabled}
                     onChange={onMetaSpaceChangeFactory(MetaSpace.Home)}
                     className="mx_SidebarUserSettingsTab_homeCheckbox"
+                    disabled={homeEnabled}
                 >
                     { _t("Home") }
                 </StyledCheckbox>
@@ -91,7 +90,7 @@ const SidebarUserSettingsTab = () => {
                     { _t("Favourites") }
                 </StyledCheckbox>
                 <div className="mx_SidebarUserSettingsTab_checkboxMicrocopy">
-                    { _t("Automatically group all your favourite rooms and people together in one place.") }
+                    { _t("Group all your favourite rooms and people in one place.") }
                 </div>
 
                 <StyledCheckbox
@@ -102,7 +101,7 @@ const SidebarUserSettingsTab = () => {
                     { _t("People") }
                 </StyledCheckbox>
                 <div className="mx_SidebarUserSettingsTab_checkboxMicrocopy">
-                    { _t("Automatically group all your people together in one place.") }
+                    { _t("Group all your people in one place.") }
                 </div>
 
                 <StyledCheckbox
@@ -113,7 +112,7 @@ const SidebarUserSettingsTab = () => {
                     { _t("Rooms outside of a space") }
                 </StyledCheckbox>
                 <div className="mx_SidebarUserSettingsTab_checkboxMicrocopy">
-                    { _t("Automatically group all your rooms that aren't part of a space in one place.") }
+                    { _t("Group all your rooms that aren't part of a space in one place.") }
                 </div>
             </div>
         </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index aa4f13dda6a..863847b35c6 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1518,15 +1518,14 @@
     "Where you're signed in": "Where you're signed in",
     "Manage your signed-in devices below. A device's name is visible to people you communicate with.": "Manage your signed-in devices below. A device's name is visible to people you communicate with.",
     "Sidebar": "Sidebar",
-    "Spaces are ways to group rooms and people.": "Spaces are ways to group rooms and people.",
     "Spaces to show": "Spaces to show",
-    "Along with the spaces you're in, you can use some pre-built ones too.": "Along with the spaces you're in, you can use some pre-built ones too.",
+    "Spaces are ways to group rooms and people. Alongside the spaces you're in, you can use some pre-built ones too.": "Spaces are ways to group rooms and people. Alongside the spaces you're in, you can use some pre-built ones too.",
     "Home is useful for getting an overview of everything.": "Home is useful for getting an overview of everything.",
     "Show all your rooms in Home, even if they're in a space.": "Show all your rooms in Home, even if they're in a space.",
-    "Automatically group all your favourite rooms and people together in one place.": "Automatically group all your favourite rooms and people together in one place.",
-    "Automatically group all your people together in one place.": "Automatically group all your people together in one place.",
+    "Group all your favourite rooms and people in one place.": "Group all your favourite rooms and people in one place.",
+    "Group all your people in one place.": "Group all your people in one place.",
     "Rooms outside of a space": "Rooms outside of a space",
-    "Automatically group all your rooms that aren't part of a space in one place.": "Automatically group all your rooms that aren't part of a space in one place.",
+    "Group all your rooms that aren't part of a space in one place.": "Group all your rooms that aren't part of a space in one place.",
     "Default Device": "Default Device",
     "No media permissions": "No media permissions",
     "You may need to manually permit %(brand)s to access your microphone/webcam": "You may need to manually permit %(brand)s to access your microphone/webcam",