Bug 330139 - "Change 'Remove' in download manager to 'Remove From List'" [p=supernova_00@yahoo.com (Kurt [supernova_00]) r=sdwilsh ui-r=madhava a1.9=schrep]

toolkit/locales/en-US/chrome/mozapps/downloads/downloads.dtd

@@ -24,8 +24,8 @@
 <!ENTITY cmd.retry.accesskey              "R">
 <!ENTITY cmd.copyLocation.label           "Copy Source Location">
 <!ENTITY cmd.copyLocation.accesskey       "L">
-<!ENTITY cmd.remove.label                 "Remove">
-<!ENTITY cmd.remove.accesskey             "e">
+<!ENTITY cmd.removeFromList.label         "Remove From List">
+<!ENTITY cmd.removeFromList.accesskey     "e">
 <!ENTITY cmd.info.label                   "Information">
 <!ENTITY cmd.info.accesskey               "i">
 <!ENTITY cmd.info.commandKey              "i">

toolkit/mozapps/downloads/content/downloads.js

@@ -520,13 +520,13 @@ var gContextMenus = [
   ["menuitem_pause", "menuitem_cancel", "menuseparator_copy_location",
    "menuitem_copyLocation"],
   // DOWNLOAD_FINISHED
-  ["menuitem_open", "menuitem_show", "menuitem_remove", "menuitem_clearList",
+  ["menuitem_open", "menuitem_show", "menuitem_removeFromList", "menuitem_clearList",
    "menuseparator_copy_location", "menuitem_copyLocation"],
   // DOWNLOAD_FAILED
-  ["menuitem_retry", "menuitem_remove", "menuitem_clearList",
+  ["menuitem_retry", "menuitem_removeFromList", "menuitem_clearList",
    "menuseparator_copy_location", "menuitem_copyLocation"],
   // DOWNLOAD_CANCELED
-  ["menuitem_retry", "menuitem_remove", "menuitem_clearList",
+  ["menuitem_retry", "menuitem_removeFromList", "menuitem_clearList",
    "menuseparator_copy_location", "menuitem_copyLocation"],
   // DOWNLOAD_PAUSED
   ["menuitem_resume", "menuitem_cancel", "menuseparator_copy_location",
@@ -535,7 +535,7 @@ var gContextMenus = [
   ["menuitem_cancel", "menuseparator_copy_location",
    "menuitem_copyLocation"],
   // DOWNLOAD_BLOCKED
-  ["menuitem_retry", "menuitem_remove", "menuitem_clearList",
+  ["menuitem_retry", "menuitem_removeFromList", "menuitem_clearList",
    "menuseparator_copy_location", "menuitem_copyLocation"],
   // DOWNLOAD_SCANNING
   ["menuitem_copyLocation"]
@@ -636,7 +636,7 @@ var gDownloadViewController = {
       case "cmd_resume":
         return dl.paused;
       case "cmd_openReferrer":
-      case "cmd_remove":
+      case "cmd_removeFromList":
       case "cmd_retry":
         return dl.removable;
       case "cmd_showInfo":
@@ -686,7 +686,7 @@ var gDownloadViewController = {
       else
         this.commands.cmd_resume(aSelectedItem);
     },
-    cmd_remove: function(aSelectedItem) {
+    cmd_removeFromList: function(aSelectedItem) {
       removeDownload(aSelectedItem);
     },
     cmd_resume: function(aSelectedItem) {

toolkit/mozapps/downloads/content/downloads.xul

@@ -88,8 +88,8 @@
              oncommand="gDownloadViewController.doCommand('cmd_pause');"/>
     <command id="cmd_pauseResume"
              oncommand="gDownloadViewController.doCommand('cmd_pauseResume');"/>
-    <command id="cmd_remove"
-             oncommand="gDownloadViewController.doCommand('cmd_remove');"/>
+    <command id="cmd_removeFromList"
+             oncommand="gDownloadViewController.doCommand('cmd_removeFromList');"/>
     <command id="cmd_resume"
              oncommand="gDownloadViewController.doCommand('cmd_resume');"/>
     <command id="cmd_retry"
@@ -106,9 +106,9 @@
     
   <keyset id="downloadKeys">
     <key id="key_pauseResume" key=" " command="cmd_pauseResume"/>
-    <key id="key_remove"  keycode="VK_DELETE" command="cmd_remove"/>
+    <key id="key_removeFromList"  keycode="VK_DELETE" command="cmd_removeFromList"/>
 #ifdef XP_MACOSX
-    <key id="key_remove2" keycode="VK_BACK" command="cmd_remove"/>
+    <key id="key_removeFromList2" keycode="VK_BACK" command="cmd_removeFromList"/>
 #endif
     <key id="key_close"   key="&cmd.close.commandKey;"  oncommand="closeWindow(true);"    modifiers="accel"/>
 #ifdef XP_GNOME
@@ -148,9 +148,9 @@
               label="&cmd.retry.label;" accesskey="&cmd.retry.accesskey;"
               command="cmd_retry"/>
 
-    <menuitem id="menuitem_remove"
-              label="&cmd.remove.label;" accesskey="&cmd.remove.accesskey;"
-              command="cmd_remove"/>
+    <menuitem id="menuitem_removeFromList"
+              label="&cmd.removeFromList.label;" accesskey="&cmd.removeFromList.accesskey;"
+              command="cmd_removeFromList"/>
               
     <menuseparator id="menuseparator_copy_location"/>
               
@@ -195,4 +195,3 @@
   </hbox>
 
 </window>
-