Bug 564328 - Keyboard shortcut Ctrl+F conflict and cmd_find ambiguity, used for both Find in This Message and Quick Filter; r=asuth
authorJim Porter <squibblyflabbetydoo@gmail.com>
Tue, 10 May 2011 01:47:57 -0500
changeset 7628 ef48f53b3d50e1df5ae65afa97bb0248629504ce
parent 7627 930646d71783c47e67a7e6363544e8f97f262031
child 7629 a83abefd183b203310e8bf1bafe12e44f8b50549
push id1
push useraxel@mozilla.com
push dateTue, 10 Oct 2017 22:14:06 +0000
reviewersasuth
bugs564328
Bug 564328 - Keyboard shortcut Ctrl+F conflict and cmd_find ambiguity, used for both Find in This Message and Quick Filter; r=asuth X-Channel-Repo: comm-central X-Channel-Converted-Revision: c7733cc3da46aee7686bbafd3c65c5f75c4c3827
mail/chrome/messenger/quickFilterBar.dtd
--- a/mail/chrome/messenger/quickFilterBar.dtd
+++ b/mail/chrome/messenger/quickFilterBar.dtd
@@ -145,33 +145,35 @@
      quickFilterBar.textbox.emptyText.keyLabel.* value for the platform.
      The goal is to convey to the user that typing in the box will filter
      the messages and that there is a hotkey they can press to get to the
      box faster.
      -->
 <!ENTITY quickFilterBar.textbox.emptyText.base
          "Filter these messages... #1">
 
+<!-- LOCALIZATION NOTE (quickFilterBar.show.key2):
+     This is the key used to show the quick filter bar. -->
+<!ENTITY quickFilterBar.show.key2
+         "k">
+
 <!-- LOCALIZATION NOTE (quickFilterBar.textbox.emptyText.keyLabel.nonmac):
      The description of the key-binding to get into the box on windows and
-     linux (which use the control key).  We use the keybinding for cmd_find
-     used by the find-in-message mechanism, so that's the letter to indicate
-     if you don't use 'f' for your localization.
+     linux (which use the control key).  This should match the value of
+     quickFilterBar.show.key above.
      -->
 <!ENTITY quickFilterBar.textbox.emptyText.keyLabel.nonmac
-         "&lt;Ctrl+F&gt;">
+         "&lt;Ctrl+Shift+K&gt;">
 
 <!-- LOCALIZATION NOTE (quickFilterBar.textbox.emptyText.keyLabel.mac):
      The description of the key-binding to get into the box on mac systems.
-     We use the keybinding for cmd_find used by the find-in-message mechanism,
-     so that's the letter to indicate  if you don't use 'f' for your
-     localization.
+     This should match the value of quickFilterBar.show.key above.
      -->
 <!ENTITY quickFilterBar.textbox.emptyText.keyLabel1.mac
-         "&lt;&#x2318;F&gt;">
+         "&lt;&#x2318;Shift+K&gt;">
 
 <!-- LOCALIZATION NOTE (quickFilterBar.textbox.idealWidth):
      The number of pixels for the ideal width of the quick filter box textbox.
      Choose this value so that the emptyText fits nicely with a little bit of
      extra whitespace.
      -->
 <!ENTITY quickFilterBar.textbox.idealWidth
          "320">