Bug 728897 - 'Search All Messages' should be just 'Search'. r+ui-review=bwinton
authorMark Banner <bugzilla@standard8.plus.com>
Mon, 27 Feb 2012 22:02:22 +0000
changeset 9508 201ebae0fa47f45cf99b1f12bec11e4f689cd126
parent 9507 94b5ff26eda9f6a36fe51c4bf0cf98e325f98951
child 9509 4474376b3ee532ecc4413f1446fe147e3e9aa37b
push id7267
push userbugzilla@standard8.plus.com
push dateMon, 27 Feb 2012 22:02:41 +0000
treeherdercomm-central@201ebae0fa47 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs728897
Bug 728897 - 'Search All Messages' should be just 'Search'. r+ui-review=bwinton
mail/base/content/extraCustomizeItems.xul
mail/base/content/specialTabs.xul
mail/locales/en-US/chrome/messenger/messenger.dtd
--- a/mail/base/content/extraCustomizeItems.xul
+++ b/mail/base/content/extraCustomizeItems.xul
@@ -72,19 +72,19 @@
                  searchbutton="true"
                  autocompletesearch="gloda"
                  autocompletepopup="PopupGlodaAutocomplete"
                  autocompletesearchparam="global"
                  enablehistory="false"
                  timeout="200"
                  maxlength="192"
                  placeholder=""
-                 emptytextbase="&searchAllMessages.label.base;"
-                 keyLabelNonMac="&searchAllMessages.keyLabel2.nonmac;"
-                 keyLabelMac="&searchAllMessages.keyLabel2.mac;"
+                 emptytextbase="&search.label.base;"
+                 keyLabelNonMac="&search.keyLabel.nonmac;"
+                 keyLabelMac="&search.keyLabel.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/base/content/specialTabs.xul
+++ b/mail/base/content/specialTabs.xul
@@ -90,19 +90,19 @@
                      searchbutton="true"
                      autocompletesearch="gloda"
                      autocompletepopup="PopupGlodaAutocomplete"
                      autocompletesearchparam="global"
                      enablehistory="false"
                      timeout="200"
                      maxlength="192"
                      placeholder=""
-                     emptytextbase="&searchAllMessages.label.base;"
-                     keyLabelNonMac="&searchAllMessages.keyLabel2.nonmac;"
-                     keyLabelMac="&searchAllMessages.keyLabel2.mac;">
+                     emptytextbase="&search.label.base;"
+                     keyLabelNonMac="&search.keyLabel.nonmac;"
+                     keyLabelMac="&search.keyLabel.mac;">
               <hbox>
                 <image class="gloda-search-icon" />
               </hbox>
             </textbox>
           </hbox>
         </toolbar>
       </toolbox>
       <iframe flex="1"/>
--- a/mail/locales/en-US/chrome/messenger/messenger.dtd
+++ b/mail/locales/en-US/chrome/messenger/messenger.dtd
@@ -781,38 +781,38 @@ you can use these alternative items. Oth
 <!ENTITY mdnBarSendButton2.accesskey "S">
 
 <!-- Quick Search Bar -->
 <!-- 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):
+<!-- LOCALIZATION NOTE (search.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.keyLabel2.* value for the platform.
+     #1 with the contents of the appropriate search.keyLabel.* 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):
+<!ENTITY search.label.base "Search… #1">
+<!-- LOCALIZATION NOTE (search.keyLabel.nonmac):
      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.keyLabel2.nonmac "&lt;Ctrl+K&gt;">
-<!-- LOCALIZATION NOTE (searchAllMessages.keyLabel.mac):
+<!ENTITY search.keyLabel.nonmac "&lt;Ctrl+K&gt;">
+<!-- LOCALIZATION NOTE (search.keyLabel.mac):
      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.keyLabel2.mac "&lt;&#x2318;K&gt;">
+<!ENTITY search.keyLabel.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">