Fix for Bug 155928: "Delete Entire Domain xxx" could be better worded

r=aaronl, sr=neil

xpfe/components/history/resources/history.js

@@ -195,28 +195,27 @@ nsHistoryController.prototype =
     isCommandEnabled: function(command)
     {
         var enabled = false;
-        var stringId;
         var text;
         switch(command) {
         case "cmd_deleteByHostname":
             if (gLastHostname) {
-                stringId = "deleteHost";
+                text = gHistoryBundle.getFormattedString("deleteHost", [ gLastHostname ]);
                 enabled = true;
             } else {
-                stringId = "deleteHostNoSelection";
+                text = gHistoryBundle.getString("deleteHostNoSelection");
             }
-            text = gHistoryBundle.getFormattedString(stringId, [ gLastHostname ]);
-            gDeleteByHostname.setAttribute("label", text);
+
+            gDeleteByHostname.label = text;
             break;
         case "cmd_deleteByDomain":
             if (gLastDomain) {
-                stringId = "deleteDomain";
+                text = gHistoryBundle.getFormattedString("deleteDomain", [ gLastDomain ]);
                 enabled = true;
             } else {
-                stringId = "deleteDomainNoSelection";
+                text = gHistoryBundle.getString("deleteDomainNoSelection");
             }
-            text = gHistoryBundle.getFormattedString(stringId, [ gLastDomain ]);
-            gDeleteByDomain.setAttribute("label", text);
+
+            gDeleteByDomain.label = text;
         }
         return enabled;
     },

xpfe/components/history/resources/locale/en-US/history.dtd

@@ -10,8 +10,8 @@
 <!ENTITY copyCmd.label              "Copy">
 <!ENTITY pasteCmd.label             "Paste">
 <!ENTITY deleteCmd.label            "Delete">
-<!ENTITY deleteHostnameCmd.accesskey "l">
-<!ENTITY deleteDomainCmd.accesskey "o">
+<!ENTITY deleteHostnameCmd.accesskey "H">
+<!ENTITY deleteDomainCmd.accesskey  "s">
 <!ENTITY selAllCmd.label            "Select All">
 <!ENTITY findHisCmd.label           "Search History...">
 <!ENTITY findHisCmd.commandkey      "f">

xpfe/components/history/resources/locale/en-US/history.properties

@@ -1,7 +1,7 @@
-deleteHost=Delete all from %S
-deleteDomain=Delete entire domain %S
-deleteHostNoSelection=Delete host
-deleteDomainNoSelection=Delete domain
+deleteHost=Delete History for %S
+deleteHostNoSelection=Delete History for Site
+deleteDomain=Delete History for *.%S
+deleteDomainNoSelection=Delete History for Domain
 
 finduri-AgeInDays-is-0=Today
 finduri-AgeInDays-is-1=Yesterday
@@ -10,6 +10,7 @@ finduri-AgeInDays-isgreater=Older than %S days
 
 finduri-Hostname-is-=(no host)
 
+search_button_label=Find
 search_results_title=Search Results
 
 collapseLabel=Collapse