From f2104b59f07f05f15dc252c93f492168eb9cc662 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 16 Jul 2020 14:38:04 +0100
Subject: [PATCH] Simplify room sublist context menu

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/RoomSublist2.tsx | 10 +++-------
 src/i18n/strings/en_EN.json                 |  8 +++-----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index ec937dcad3..145bd8d68e 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -444,24 +444,20 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
                     <React.Fragment>
                         <hr />
                         <div>
-                            <div className='mx_RoomSublist2_contextMenu_title'>{_t("Unread rooms")}</div>
+                            <div className='mx_RoomSublist2_contextMenu_title'>{_t("Appearance")}</div>
                             <StyledMenuItemCheckbox
                                 onClose={this.onCloseMenu}
                                 onChange={this.onUnreadFirstChanged}
                                 checked={isUnreadFirst}
                             >
-                                {_t("Always show first")}
+                                {_t("Show rooms with unread messages first")}
                             </StyledMenuItemCheckbox>
-                        </div>
-                        <hr />
-                        <div>
-                            <div className='mx_RoomSublist2_contextMenu_title'>{_t("Show")}</div>
                             <StyledMenuItemCheckbox
                                 onClose={this.onCloseMenu}
                                 onChange={this.onMessagePreviewChanged}
                                 checked={this.layout.showPreviews}
                             >
-                                {_t("Message preview")}
+                                {_t("Show previews of messages")}
                             </StyledMenuItemCheckbox>
                         </div>
                     </React.Fragment>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a205b78f1e..25e8d24e82 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1210,10 +1210,9 @@
     "Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Securely back up your keys to avoid losing them. <a>Learn more.</a>",
     "Not now": "Not now",
     "Don't ask me again": "Don't ask me again",
-    "Unread rooms": "Unread rooms",
-    "Always show first": "Always show first",
-    "Show": "Show",
-    "Message preview": "Message preview",
+    "Appearance": "Appearance",
+    "Show rooms with unread messages first": "Show rooms with unread messages first",
+    "Show previews of messages": "Show previews of messages",
     "Sort by": "Sort by",
     "Activity": "Activity",
     "A-Z": "A-Z",
@@ -1855,7 +1854,6 @@
     "Upload %(count)s other files|one": "Upload %(count)s other file",
     "Cancel All": "Cancel All",
     "Upload Error": "Upload Error",
-    "Appearance": "Appearance",
     "Verify other session": "Verify other session",
     "Verification Request": "Verification Request",
     "A widget would like to verify your identity": "A widget would like to verify your identity",