--- a/browser/components/preferences/cookies.xul
+++ b/browser/components/preferences/cookies.xul
@@ -30,17 +30,18 @@
     <key key="&focusSearch2.key;" modifiers="accel" oncommand="gCookiesWindow.focusFilterBox();"/>
   </keyset>
 
   <vbox flex="1" class="contentPane largeDialogContainer">
     <hbox align="center">
       <textbox type="search" id="filter" flex="1"
                aria-controls="cookiesList"
                oncommand="gCookiesWindow.filter();"
-               placeholder="Search"/>
+               placeholder="&searchFilter.label;"
+               accesskey="&searchFilter.accesskey;"/>
     </hbox>
     <separator class="thin"/>
     <label control="cookiesList" id="cookiesIntro" value="&cookiesonsystem.label;"/>
     <separator class="thin"/>
     <tree id="cookiesList" flex="1" style="height: 10em;"
           onkeypress="gCookiesWindow.onCookieKeyPress(event)"
           onselect="gCookiesWindow.onCookieSelected();"
           hidecolumnpicker="true" seltype="single">

--- a/browser/locales/en-US/chrome/browser/preferences/cookies.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/cookies.dtd
@@ -23,13 +23,13 @@
 <!ENTITY     props.expires.label            "Expires:">
 <!ENTITY     props.container.label          "Container:">
 
 <!ENTITY     window.title                   "Cookies">
 <!ENTITY     windowClose.key                "w">
 <!ENTITY     focusSearch1.key               "f">
 <!ENTITY     focusSearch2.key               "k">
 
-<!ENTITY     filter.label                   "Search:">
-<!ENTITY     filter.accesskey               "S">
+<!ENTITY     searchFilter.label             "Search">
+<!ENTITY     searchFilter.accesskey         "S">
 
 <!ENTITY     button.close.label             "Close">
 <!ENTITY     button.close.accesskey         "C">

--- a/toolkit/components/passwordmgr/content/passwordManager.xul
+++ b/toolkit/components/passwordmgr/content/passwordManager.xul
@@ -54,17 +54,18 @@
 
   <!-- saved signons -->
   <vbox id="savedsignons" class="contentPane" flex="1">
     <!-- filter -->
     <hbox align="center">
       <textbox id="filter" flex="1" type="search"
                aria-controls="signonsTree"
                oncommand="FilterPasswords();"
-               placeholder="Search"/>
+               placeholder="&searchFilter.label;"
+               accesskey="&searchFilter.accesskey;"/>
     </hbox>
 
     <label control="signonsTree" id="signonsIntro"/>
     <separator class="thin"/>
     <tree id="signonsTree" flex="1"
           width="750"
           style="height: 20em;"
           onkeypress="HandleSignonKeyPress(event)"

--- a/toolkit/locales/en-US/chrome/passwordmgr/passwordManager.dtd
+++ b/toolkit/locales/en-US/chrome/passwordmgr/passwordManager.dtd
@@ -21,18 +21,18 @@
 <!ENTITY      removeall.accesskey             "A">
 
 <!ENTITY      addLogin.label                  "Add Login">
 <!ENTITY      addLogin.accesskey              "L">
 
 <!ENTITY      import.label                    "Import…">
 <!ENTITY      import.accesskey                "I">
 
-<!ENTITY      filter.label                    "Search:">
-<!ENTITY      filter.accesskey                "S">
+<!ENTITY      searchFilter.label              "Search">
+<!ENTITY      searchFilter.accesskey          "S">
 
 <!ENTITY      windowClose.key                 "w">
 <!ENTITY      focusSearch1.key                "f">
 <!ENTITY      focusSearch2.key                "k">
 
 <!ENTITY      copyPasswordCmd.label           "Copy Password">
 <!ENTITY      copyPasswordCmd.accesskey       "C">