Bug 561059 - localization glitch on global search entity for the key follow-up. r=davida, a=blocking-tb3.1b2
authorAndrew Sutherland <asutherland@asutherland.org>
Thu, 22 Apr 2010 12:16:13 -0700
changeset 5515 270335f4d429960957361373feb821610f431ed7
parent 5514 19d5618679fe00c76f179808562cb902f75d4105
child 5516 d7fdba3f04e3bfb33e59047dff01cf4d5090d4b6
push idunknown
push userunknown
push dateunknown
reviewersdavida, blocking-tb3.1b2
bugs561059
Bug 561059 - localization glitch on global search entity for the key follow-up. r=davida, a=blocking-tb3.1b2
mail/base/content/extraCustomizeItems.xul
mail/locales/en-US/chrome/messenger/messenger.dtd
--- a/mail/base/content/extraCustomizeItems.xul
+++ b/mail/base/content/extraCustomizeItems.xul
@@ -70,18 +70,18 @@
                  searchbutton="true"
                  autocompletesearch="gloda"
                  autocompletepopup="PopupGlodaAutocomplete"
                  autocompletesearchparam="global"
                  enablehistory="false"
                  timeout="200"
                  emptytext=""
                  emptytextbase="&searchAllMessages.label.base;"
-                 keyLabelNonMac="&searchAllMessages.keyLabel.nonmac;"
-                 keyLabelMac="&searchAllMessages.keyLabel1.mac;"
+                 keyLabelNonMac="&searchAllMessages.keyLabel2.nonmac;"
+                 keyLabelMac="&searchAllMessages.keyLabel2.mac;"
                  >
           <!-- Mimic the search/clear buttons of the standard search textbox,
                but adjust for the reality that clear doesn't make much sense
                since gloda results only show in a tab and the idiom for closing
                tabs is closing the tab.  Our binding does process escape to
                clear the box, if people want to clear it that way...
                -->
           <hbox>
--- a/mail/locales/en-US/chrome/messenger/messenger.dtd
+++ b/mail/locales/en-US/chrome/messenger/messenger.dtd
@@ -700,37 +700,35 @@ you can use these alternative items. Oth
 <!-- LOCALIZATION NOTE (quickSearchCmd.key):
      This is actually the key used for the global message search box; we have
      not changed 
      -->
 <!ENTITY quickSearchCmd.key "k">
 <!-- LOCALIZATION NOTE (searchAllMessages.label.base):
      This is the base of the empty text for the global search box.  We replace
      #1 with the contents of the appropriate
-     searchAllMessages.keyLabel.* value for the platform.
+     searchAllMessages.keyLabel2.* value for the platform.
      The goal is to convey to the user that typing in the box will allow them
      to search for messages globally and that there is a hotkey they can press
      to get to the box faster.  If the global indexer is disabled, the search
      box will be collapsed and the user will never see this message.
      -->
 <!ENTITY searchAllMessages.label.base "Search all messages… #1">
 <!-- LOCALIZATION NOTE (searchAllMessages.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.
+     The description of the key-binding to get into the global search box on
+     windows and linux (which use the control key).  We use the key defined in
+     the quickSearchCmd.key entity defined above, the letter should match it.
      -->
-<!ENTITY searchAllMessages.keyLabel.nonmac "&lt;Ctrl+K&gt;">
+<!ENTITY searchAllMessages.keyLabel2.nonmac "&lt;Ctrl+K&gt;">
 <!-- LOCALIZATION NOTE (searchAllMessages.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.
+     The description of the key-binding to get into the global search box on mac
+     systems.  We use the key defined in the quickSearchCmd.key entity defined
+     above, the letter should match it.
      -->
-<!ENTITY searchAllMessages.keyLabel1.mac "&lt;&#x2318;F&gt;">
+<!ENTITY searchAllMessages.keyLabel2.mac "&lt;&#x2318;K&gt;">
 
 <!-- Message Header Context Menu -->
 <!ENTITY AddToAddressBook.label "Add to Address Book…">
 <!ENTITY AddToAddressBook.accesskey "B">
 <!ENTITY AddDirectlyToAddressBook.label "Add to Address Book">
 <!ENTITY AddDirectlyToAddressBook.accesskey "B">
 <!ENTITY EditContact.label "Edit Contact…">
 <!ENTITY EditContact.accesskey "E">