From 2a47afa672444372972c2ad8cf5c6d646d50411b Mon Sep 17 00:00:00 2001
From: antelle <dmitryvit@gmail.com>
Date: Sun, 6 Oct 2019 12:33:03 +0200
Subject: [PATCH] better texts on the shortcuts page

---
 app/scripts/locales/base.json                 | 10 +++++-----
 app/templates/settings/settings-shortcuts.hbs | 11 ++++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/scripts/locales/base.json b/app/scripts/locales/base.json
index 36925988..6c1f047e 100644
--- a/app/scripts/locales/base.json
+++ b/app/scripts/locales/base.json
@@ -515,11 +515,11 @@
     "setShSave": "save all files",
     "setShGen": "generate password",
     "setShSet": "app settings",
-    "setShCopyPassGlobal": "copy password (when the app is in background)",
-    "setShCopyUserGlobal": "copy user (when the app is in background)",
-    "setShCopyUrlGlobal": "copy website (when the app is in background)",
-    "setShCopyOtpGlobal": "copy OTP (when the app is in background)",
-    "setShAutoTypeGlobal": "auto-type (when the app is in background)",
+    "setShCopyPassGlobal": "copy password",
+    "setShCopyOtp": "copy OTP",
+    "setShAutoTypeGlobal": "auto-type",
+    "setShCopyPassOnly": "copy password",
+    "setShGlobal": "These system-wide shortcuts work when the app is running in background. You can click them to select your own shortcut.",
     "setShLock": "lock database",
     "setShEdit": "Press a new key combination to set it as shortcut",
 
diff --git a/app/templates/settings/settings-shortcuts.hbs b/app/templates/settings/settings-shortcuts.hbs
index d415f749..9096f5cc 100644
--- a/app/templates/settings/settings-shortcuts.hbs
+++ b/app/templates/settings/settings-shortcuts.hbs
@@ -20,16 +20,17 @@
     <div><span class="shortcut">{{{cmd}}},</span> {{res 'setShSet'}}</div>
     <div><span class="shortcut">{{{cmd}}}L</span> {{res 'setShLock'}}</div>
     {{#if globalShortcuts}}
+        <p>{{res 'setShGlobal'}}</p>
         <div><button class="shortcut btn-silent {{#if globalIsLarge}}shortcut-large{{/if}}"
-                     data-shortcut="autoType">{{{globalShortcuts.autoType}}}</button> {{res 'setShAutoTypeGlobal'}}</div>
+                     data-shortcut="autoType">{{{globalShortcuts.autoType}}}</button> {{res 'setShAutoType'}}</div>
         <div><button class="shortcut btn-silent {{#if globalIsLarge}}shortcut-large{{/if}}"
-                     data-shortcut="copyPassword">{{{globalShortcuts.copyPassword}}}</button> {{res 'setShCopyPassGlobal'}}</div>
+                     data-shortcut="copyPassword">{{{globalShortcuts.copyPassword}}}</button> {{res 'setShCopyPassOnly'}}</div>
         <div><button class="shortcut btn-silent {{#if globalIsLarge}}shortcut-large{{/if}}"
-                     data-shortcut="copyUser">{{{globalShortcuts.copyUser}}}</button> {{res 'setShCopyUserGlobal'}}</div>
+                     data-shortcut="copyUser">{{{globalShortcuts.copyUser}}}</button> {{res 'setShCopyUser'}}</div>
         <div><button class="shortcut btn-silent {{#if globalIsLarge}}shortcut-large{{/if}}"
-                     data-shortcut="copyUrl">{{{globalShortcuts.copyUrl}}}</button> {{res 'setShCopyUrlGlobal'}}</div>
+                     data-shortcut="copyUrl">{{{globalShortcuts.copyUrl}}}</button> {{res 'setShCopyUrl'}}</div>
         <div><button class="shortcut btn-silent {{#if globalIsLarge}}shortcut-large{{/if}}"
-                     data-shortcut="copyOtp">{{{globalShortcuts.copyOtp}}}</button> {{res 'setShCopyOtpGlobal'}}</div>
+                     data-shortcut="copyOtp">{{{globalShortcuts.copyOtp}}}</button> {{res 'setShCopyOtp'}}</div>
         <div><button class="shortcut btn-silent {{#if globalIsLarge}}shortcut-large{{/if}}"
                      data-shortcut="restoreApp">{{{globalShortcuts.restoreApp}}}</button> {{#res 'menuRestoreApp'}}KeeWeb{{/res}}</div>
     {{/if}}