Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Tweak copy for the Sidebar tab in User Settings #7578

Merged
merged 1 commit into from
Jan 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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>
Expand Down
9 changes: 4 additions & 5 deletions src/i18n/strings/en_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down