From 7781cb1f8b23baa7cbc9d2e16fda90d2006fe00f Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@jermolene.com>
Date: Fri, 28 Jun 2019 17:35:17 +0100
Subject: [PATCH] Streamline wording for sidebar search shortcut

---
 core/language/en-GB/Buttons.multids                           | 2 +-
 .../{focus-sidebar-search.tid => sidebar-search.tid}          | 4 ++--
 core/wiki/config/ShortcutInfo.multids                         | 2 +-
 core/wiki/config/shortcuts/shortcuts.multids                  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename core/ui/KeyboardShortcuts/{focus-sidebar-search.tid => sidebar-search.tid} (55%)

diff --git a/core/language/en-GB/Buttons.multids b/core/language/en-GB/Buttons.multids
index 572c515d7..2ac239047 100644
--- a/core/language/en-GB/Buttons.multids
+++ b/core/language/en-GB/Buttons.multids
@@ -32,7 +32,7 @@ ExportTiddler/Caption: export tiddler
 ExportTiddler/Hint: Export tiddler
 ExportTiddlers/Caption: export tiddlers
 ExportTiddlers/Hint: Export tiddlers
-FocusSidebarSearch/Hint: Focus the sidebar search field
+SidebarSearch/Hint: Select the sidebar search field
 Fold/Caption: fold tiddler
 Fold/Hint: Fold the body of this tiddler
 Fold/FoldBar/Caption: fold-bar
diff --git a/core/ui/KeyboardShortcuts/focus-sidebar-search.tid b/core/ui/KeyboardShortcuts/sidebar-search.tid
similarity index 55%
rename from core/ui/KeyboardShortcuts/focus-sidebar-search.tid
rename to core/ui/KeyboardShortcuts/sidebar-search.tid
index e7441e0b1..7b9ec8cad 100644
--- a/core/ui/KeyboardShortcuts/focus-sidebar-search.tid
+++ b/core/ui/KeyboardShortcuts/sidebar-search.tid
@@ -1,5 +1,5 @@
-title: $:/core/ui/KeyboardShortcuts/focus-sidebar-search
+title: $:/core/ui/KeyboardShortcuts/sidebar-search
 tags: $:/tags/KeyboardShortcut
-key: ((focus-sidebar-search))
+key: ((sidebar-search))
 
 <$action-sendmessage $message="tm-focus-selector" $param=".tc-search input"/>
diff --git a/core/wiki/config/ShortcutInfo.multids b/core/wiki/config/ShortcutInfo.multids
index 7d2c35062..1ffaca3be 100644
--- a/core/wiki/config/ShortcutInfo.multids
+++ b/core/wiki/config/ShortcutInfo.multids
@@ -3,7 +3,7 @@ title: $:/config/ShortcutInfo/
 bold: {{$:/language/Buttons/Bold/Hint}}
 cancel-edit-tiddler: {{$:/language/Buttons/Cancel/Hint}}
 excise: {{$:/language/Buttons/Excise/Hint}}
-focus-sidebar-search: {{$:/language/Buttons/FocusSidebarSearch/Hint}}
+sidebar-search: {{$:/language/Buttons/SidebarSearch/Hint}}
 heading-1: {{$:/language/Buttons/Heading1/Hint}}
 heading-2: {{$:/language/Buttons/Heading2/Hint}}
 heading-3: {{$:/language/Buttons/Heading3/Hint}}
diff --git a/core/wiki/config/shortcuts/shortcuts.multids b/core/wiki/config/shortcuts/shortcuts.multids
index db1633b61..d5a287327 100644
--- a/core/wiki/config/shortcuts/shortcuts.multids
+++ b/core/wiki/config/shortcuts/shortcuts.multids
@@ -2,7 +2,7 @@ title: $:/config/shortcuts/
 
 cancel-edit-tiddler: escape
 excise: ctrl-E
-focus-sidebar-search: ctrl-shift-F
+sidebar-search: ctrl-shift-F
 heading-1: ctrl-1
 heading-2: ctrl-2
 heading-3: ctrl-3