Ongoing prefs work.

browser/components/prefwindow/jar.mn

@@ -30,8 +30,6 @@ browser.jar:
     content/browser/pref/pref-proxy-manual.xul             (content/pref-proxy-manual.xul)
     content/browser/pref/pref-scripts.xul                  (content/pref-scripts.xul)
     content/browser/pref/pref-scripts.js                   (content/pref-scripts.js)
-    content/browser/pref/pref-search.js                    (content/pref-search.js)
-    content/browser/pref/pref-search.xul                   (content/pref-search.xul)
     content/browser/pref/pref-security.xul                 (content/pref-security.xul)
     content/browser/pref/pref-smart_browsing.xul           (content/pref-smart_browsing.xul)
     content/browser/pref/pref-smart_browsing.js            (content/pref-smart_browsing.js)
@@ -66,7 +64,6 @@ en-US.jar:
     locale/en-US/browser/pref/pref-proxies.dtd             (locale/pref-proxies.dtd)
     locale/en-US/browser/pref/pref-proxy-manual.dtd        (locale/pref-proxy-manual.dtd)
     locale/en-US/browser/pref/pref-scripts.dtd             (locale/pref-scripts.dtd)
-    locale/en-US/browser/pref/pref-search.dtd              (locale/pref-search.dtd)
     locale/en-US/browser/pref/pref-security.dtd            (locale/pref-security.dtd)
     locale/en-US/browser/pref/pref-smart_browsing.dtd      (locale/pref-smart_browsing.dtd)
     locale/en-US/browser/pref/pref-smartupdate.dtd         (locale/pref-smartupdate.dtd)

browser/components/prefwindow/locale/preftree.dtd

@@ -3,7 +3,7 @@
 <!ENTITY category.label "Category">
 
 <!--LOCALIZATION NOTE : FILE Lists preferences categories that appear on the left of the preferences dialog -->
-<!ENTITY fonts.label "Fonts & Colors">
+<!ENTITY fonts.label "Fonts &amp; Colors">
 <!ENTITY themes.label "Themes">
 <!--LOCALIZATION NOTE (navigator.label): DONT_TRANSLATE -->
 <!ENTITY navigator.label "Navigator">