From e5e9010850ab4c678890686e3707d7e3e842385e Mon Sep 17 00:00:00 2001
From: Niloth-p <20315308+Niloth-p@users.noreply.github.com>
Date: Mon, 13 May 2024 07:11:28 +0530
Subject: [PATCH] keys: Standardize choice of words in hotkey help texts.

Previously, there was mixed use of "add/remove" and "toggle".
Now, all of them use "toggle".

All menus and popups now use "show/hide".

Removed the only explicit usage of 'popup', as it is redundant,
and does not add clarity.

Hotkeys document regenerated.
---
 docs/hotkeys.md              | 10 +++++-----
 zulipterminal/config/keys.py | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/hotkeys.md b/docs/hotkeys.md
index cb40a45330..1c9e4bf528 100644
--- a/docs/hotkeys.md
+++ b/docs/hotkeys.md
@@ -12,7 +12,7 @@
 |Open draft message saved in this session|<kbd>d</kbd>|
 |Redraw screen|<kbd>Ctrl</kbd> + <kbd>l</kbd>|
 |Quit|<kbd>Ctrl</kbd> + <kbd>c</kbd>|
-|View user information (from users list)|<kbd>i</kbd>|
+|Show/hide user information (from users list)|<kbd>i</kbd>|
 
 ## Navigation
 |Command|Key Combination|
@@ -39,7 +39,7 @@
 |Search messages|<kbd>/</kbd>|
 |Search streams|<kbd>q</kbd>|
 |Search topics in a stream|<kbd>q</kbd>|
-|Search emojis from emoji picker popup|<kbd>p</kbd>|
+|Search emojis from emoji picker|<kbd>p</kbd>|
 
 ## Message actions
 |Command|Key Combination|
@@ -51,13 +51,13 @@
 |Edit message's content or topic|<kbd>e</kbd>|
 |New message to a stream|<kbd>c</kbd>|
 |New message to a person or group of people|<kbd>x</kbd>|
-|Show/hide emoji picker popup for current message|<kbd>:</kbd>|
+|Show/hide emoji picker for current message|<kbd>:</kbd>|
 |Narrow to the stream of the current message|<kbd>s</kbd>|
 |Narrow to the topic of the current message|<kbd>S</kbd>|
 |Narrow to a topic/direct-chat, or stream/all-direct-messages|<kbd>z</kbd>|
 |Toggle first emoji reaction on selected message|<kbd>=</kbd>|
-|Add/remove thumbs-up reaction to the current message|<kbd>+</kbd>|
-|Add/remove star status of the current message|<kbd>Ctrl</kbd> + <kbd>s</kbd> / <kbd>*</kbd>|
+|Toggle thumbs-up reaction to the current message|<kbd>+</kbd>|
+|Toggle star status of the current message|<kbd>Ctrl</kbd> + <kbd>s</kbd> / <kbd>*</kbd>|
 |Show/hide message information|<kbd>i</kbd>|
 |Show/hide message sender information|<kbd>u</kbd>|
 |Show/hide edit history (from message information)|<kbd>e</kbd>|
diff --git a/zulipterminal/config/keys.py b/zulipterminal/config/keys.py
index f34be06b7d..473d19c0f9 100644
--- a/zulipterminal/config/keys.py
+++ b/zulipterminal/config/keys.py
@@ -154,7 +154,7 @@ class KeyBinding(TypedDict):
     },
     'ADD_REACTION': {
         'keys': [':'],
-        'help_text': 'Show/hide emoji picker popup for current message',
+        'help_text': 'Show/hide emoji picker for current message',
         'key_category': 'msg_actions',
     },
     'STREAM_NARROW': {
@@ -240,7 +240,7 @@ class KeyBinding(TypedDict):
     },
     'SEARCH_EMOJIS': {
         'keys': ['p'],
-        'help_text': 'Search emojis from emoji picker popup',
+        'help_text': 'Search emojis from emoji picker',
         'excluded_from_random_tips': True,
         'key_category': 'searching',
     },
@@ -256,12 +256,12 @@ class KeyBinding(TypedDict):
     },
     'THUMBS_UP': {
         'keys': ['+'],
-        'help_text': 'Add/remove thumbs-up reaction to the current message',
+        'help_text': 'Toggle thumbs-up reaction to the current message',
         'key_category': 'msg_actions',
     },
     'TOGGLE_STAR_STATUS': {
         'keys': ['ctrl s', '*'],
-        'help_text': 'Add/remove star status of the current message',
+        'help_text': 'Toggle star status of the current message',
         'key_category': 'msg_actions',
     },
     'MSG_INFO': {
@@ -317,7 +317,7 @@ class KeyBinding(TypedDict):
     },
     'USER_INFO': {
         'keys': ['i'],
-        'help_text': 'View user information (from users list)',
+        'help_text': 'Show/hide user information (from users list)',
         'key_category': 'general',
     },
     'BEGINNING_OF_LINE': {