Bug 1520123: Notify users when there is a duplicate shortcut r=mstriemer,fluent-reviewers,flod,Gijs draft
authorTrishul <trishul.goel@gmail.com>
Thu, 15 Aug 2019 10:15:28 +0000
changeset 11936 6bd050aa0e9f9b5a796ba125bca21758a6aa0f68
parent 11935 c039617db71d649db6543a797a5b44a8e0ca43b6
child 11937 15c55c4c5b1017a2a416110b65b36603ebaa62f3
push id317
push userflodolo@mozilla.com
push dateFri, 16 Aug 2019 05:11:19 +0000
reviewersmstriemer, fluent-reviewers, flod, Gijs
bugs1520123
Bug 1520123: Notify users when there is a duplicate shortcut r=mstriemer,fluent-reviewers,flod,Gijs Notify users when there is a duplicate shortcut Differential Revision: https://phabricator.services.mozilla.com/D29125 X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: f69698a5cc46d070a64e8221a68a23da81708d66 X-Channel-Repo: releases/mozilla-beta X-Channel-Revision: faf1d9e6579b5b230c062961eb5319d014396a25 X-Channel-Repo: releases/mozilla-release X-Channel-Revision: 2fb19d0466d2f61674c0af80813645cccd510593 X-Channel-Repo: releases/mozilla-esr68 X-Channel-Revision: 6da286bb33b5cee90f383d21b5835e81a4709388
toolkit/toolkit/about/aboutAddons.ftl
--- a/toolkit/toolkit/about/aboutAddons.ftl
+++ b/toolkit/toolkit/about/aboutAddons.ftl
@@ -323,16 +323,25 @@ shortcuts-browserAction = Activate exten
 shortcuts-pageAction = Activate page action
 shortcuts-sidebarAction = Toggle the sidebar
 
 shortcuts-modifier-mac = Include Ctrl, Alt, or ⌘
 shortcuts-modifier-other = Include Ctrl or Alt
 shortcuts-invalid = Invalid combination
 shortcuts-letter = Type a letter
 shortcuts-system = Can’t override a { -brand-short-name } shortcut
+
+# String displayed in warning label when there is a duplicate shortcut
+shortcuts-duplicate = Duplicate shortcut
+
+# String displayed when a keyboard shortcut is already assigned to more than one add-on
+# Variables:
+#   $shortcut (string) - Shortcut string for the add-on
+shortcuts-duplicate-warning-message = { $shortcut } is being used as a shortcut in more than one case. Duplicate shortcuts may cause unexpected behavior.
+
 # String displayed when a keyboard shortcut is already used by another add-on
 # Variables:
 #   $addon (string) - Name of the add-on
 shortcuts-exists = Already in use by { $addon }
 
 shortcuts-card-expand-button =
     { $numberToShow ->
         *[other] Show { $numberToShow } More