fix for bug #373207 l10n: rename entity / properties that changed due to bug #373211 (search.all.label, cmd.find.label, places.title, etc)

patch=Steve Won <swon@mozilla.com>

r=sspitzer

browser/components/places/content/places.js

@@ -409,7 +409,7 @@ var PlacesSearchBox = {
         PlacesUtils.getFormattedString("searchCurrentDefault", [title]);
     }
     else
-      this.searchFilter.grayText = PlacesUtils.getString("searchDefault");
+      this.searchFilter.grayText = PlacesUtils.getString("searchByDefault");
   },
 
   /**
@@ -446,7 +446,7 @@ var PlacesSearchBox = {
    */
   init: function PSB_init() {
     var searchFilter = this.searchFilter;
-    searchFilter.grayText = PlacesUtils.getString("searchDefault");
+    searchFilter.grayText = PlacesUtils.getString("searchByDefault");
     searchFilter.reset();
   },
   

browser/components/places/content/places.xul

@@ -56,7 +56,7 @@
 ]>
 
 <window id="places"
-        title="&places.title;" 
+        title="&places.bm.title;" 
         windowtype="Places:Organizer" 
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="PlacesOrganizer.init();"
@@ -74,8 +74,9 @@
   <commandset id="placesCommands"/>
   
   <commandset id="organizerCommandSet">
-    <command id="OrganizerCommand_find:all" 
-             label="&cmd.find.label;" accesskey="&cmd.find.accesskey;"
+    <command id="OrganizerCommand_find:all"
+             label="&cmd.findInBookmarks.label;"
+             accesskey="&cmd.findInBookmarks.accesskey;"
              oncommand="PlacesSearchBox.findAll();"/>
     <command id="OrganizerCommand_find:current"
              label="&cmd.findCurrent.label;"
@@ -315,7 +316,8 @@
                collection="bookmarks">
         <button type="menu" class="filterList" id="filterList_history">
           <menupopup>
-            <menuitem label="&search.all.label;" accesskey="&search.all.accesskey;"
+            <menuitem label="&search.allBookmarks.label;"
+                      accesskey="&search.allBookmarks.accesskey;"
                       type="radio" name="collection" value="all" 
                       checked="true" default="true"/>
             <menuitem label="&search.collection.label;" accesskey="&search.collection.accesskey;"

browser/locales/en-US/chrome/browser/places/places.dtd

@@ -1,4 +1,4 @@
-<!ENTITY places.title
+<!ENTITY places.bm.title
   "Bookmarks Manager">
 <!ENTITY file.label
   "File">
@@ -51,9 +51,9 @@
 <!ENTITY help.advancedTips.accesskey
   "T">
 
-<!ENTITY cmd.find.label 
+<!ENTITY cmd.findInBookmarks.label 
   "Find in Bookmarks...">
-<!ENTITY cmd.find.accesskey
+<!ENTITY cmd.findInBookmarks.accesskey
   "F">
 <!ENTITY cmd.findCurrent.label
   "Find in Current Collection...">
@@ -220,9 +220,9 @@
   "Current Collection Only">
 <!ENTITY search.collection.accesskey
   "C">
-<!ENTITY search.all.label
+<!ENTITY search.allBookmarks.label
   "All Bookmarks">
-<!ENTITY search.all.accesskey
+<!ENTITY search.allBookmarks.accesskey
   "A">
 <!ENTITY saveSearch.label
   "Save">

browser/locales/en-US/chrome/browser/places/places.properties

@@ -62,7 +62,7 @@ view.sortBy.dateAdded.accesskey=A
 view.sortBy.lastModified.label=Sort by Last Modified
 view.sortBy.lastModified.accesskey=M
 
-searchDefault=Search in Bookmarks
+searchByDefault=Search in Bookmarks
 searchCurrentDefault=Search in '%S'
 findInPrefix=Find in '%S'...