diff --git a/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.dtd b/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.dtd index 9656f855145b..63c7ce36eeb0 100644 --- a/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.dtd +++ b/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.dtd @@ -24,8 +24,8 @@ - - + + diff --git a/toolkit/mozapps/downloads/content/downloads.js b/toolkit/mozapps/downloads/content/downloads.js index 1d11567069af..3caaab85727c 100644 --- a/toolkit/mozapps/downloads/content/downloads.js +++ b/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) { diff --git a/toolkit/mozapps/downloads/content/downloads.xul b/toolkit/mozapps/downloads/content/downloads.xul index 82f485e714e8..6bab06369e32 100644 --- a/toolkit/mozapps/downloads/content/downloads.xul +++ b/toolkit/mozapps/downloads/content/downloads.xul @@ -88,8 +88,8 @@ oncommand="gDownloadViewController.doCommand('cmd_pause');"/> - + - + #ifdef XP_MACOSX - + #endif #ifdef XP_GNOME @@ -148,9 +148,9 @@ label="&cmd.retry.label;" accesskey="&cmd.retry.accesskey;" command="cmd_retry"/> - + @@ -195,4 +195,3 @@ -