diff --git a/mozilla/toolkit/mozapps/downloads/content/download.xml b/mozilla/toolkit/mozapps/downloads/content/download.xml
index d222ef3723f..99fc341d0e3 100644
--- a/mozilla/toolkit/mozapps/downloads/content/download.xml
+++ b/mozilla/toolkit/mozapps/downloads/content/download.xml
@@ -139,7 +139,7 @@
           <xul:label value="&starting.label;"/>
         </xul:vbox>
         <xul:vbox pack="start">
-          <xul:label value="&cancel.label;" class="link" 
+          <xul:label value="&cmd.cancel.label;" class="link" 
                      onclick="this.parentNode.parentNode.parentNode.fireEvent('cancel');"/>
         </xul:vbox>
       </xul:hbox>
@@ -162,7 +162,7 @@
                                 xbl:inherits="value=progress,mode=progressmode"/>
             </xul:vbox>
             <xul:vbox pack="start">
-              <xul:label value="&cancel.label;" class="link"
+              <xul:label value="&cmd.cancel.label;" class="link"
                         onclick="this.parentNode.parentNode.parentNode.parentNode.parentNode.fireEvent('cancel');"/>          
             </xul:vbox>
           </xul:hbox>                              
@@ -303,7 +303,7 @@
                                 xbl:inherits="value=progress,mode=progressmode"/>
             </xul:vbox>
             <xul:vbox pack="start">
-              <xul:label value="&cancel.label;" class="link"
+              <xul:label value="&cmd.cancel.label;" class="link"
                         onclick="this.parentNode.parentNode.parentNode.parentNode.parentNode.fireEvent('cancel');"/>          
             </xul:vbox>
           </xul:hbox>                              
@@ -339,18 +339,9 @@
           <xul:label value="&done.label;"/>
         </xul:vbox>
         <xul:vbox pack="start">
-          <xul:label value="&show.label;" class="link" 
-#ifdef XP_WIN
-                     tooltip="&cmd.show.tooltipWin;"
-#else
-#ifdef XP_MACOSX
-                     tooltip="&cmd.show.tooltipMac;"
-#else
-                     tooltip="&cmd.show.tooltipUnix;"
-#endif
-#endif
-                     onclick="this.parentNode.parentNode.parentNode.fireEvent('show');"/>
-          <xul:label value="&remove.label;" class="link" 
+          <xul:label value="&cmd.open.label;" class="link" 
+                     onclick="this.parentNode.parentNode.parentNode.fireEvent('open');"/>
+          <xul:label value="&cmd.remove.label;" class="link" 
                      onclick="this.parentNode.parentNode.parentNode.fireEvent('remove');"/>
         </xul:vbox>
       </xul:hbox>
@@ -361,7 +352,7 @@
     <content>
       <xul:hbox flex="1">
 #ifdef XP_WIN
-        <xul:vbox pack="start">
+        <xul:vbox pack="start"> 
           <xul:image class="downloadTypeIcon" validate="always" style="width: 32px; max-width: 32px; height: 32px; max-height: 32px;" xbl:inherits="src=image"/>
         </xul:vbox>
 #endif
@@ -370,9 +361,9 @@
           <xul:label value="&canceled.label;"/>
         </xul:vbox>
         <xul:vbox pack="start">
-          <xul:label value="&retry.label;" class="link" 
+          <xul:label value="&cmd.retry.label;" class="link" 
                      onclick="this.parentNode.parentNode.parentNode.fireEvent('retry');"/>
-          <xul:label value="&remove.label;" class="link" 
+          <xul:label value="&cmd.remove.label;" class="link" 
                      onclick="this.parentNode.parentNode.parentNode.fireEvent('remove');"/>
         </xul:vbox>
       </xul:hbox>
@@ -392,9 +383,9 @@
           <xul:label value="&failed.label;"/>
         </xul:vbox>
         <xul:vbox pack="start">
-          <xul:label value="&retry.label;" class="link" 
+          <xul:label value="&cmd.retry.label;" class="link" 
                      onclick="this.parentNode.parentNode.parentNode.fireEvent('retry');"/>
-          <xul:label value="&remove.label;" class="link" 
+          <xul:label value="&cmd.remove.label;" class="link" 
                      onclick="this.parentNode.parentNode.parentNode.fireEvent('remove');"/>
         </xul:vbox>
       </xul:hbox>
@@ -448,7 +439,7 @@
           <xul:label value="&done.label;"/>
         </xul:vbox>
         <xul:vbox pack="start">
-          <xul:label value="&remove.label;" class="link" 
+          <xul:label value="&cmd.remove.label;" class="link" 
                      onclick="this.parentNode.parentNode.parentNode.fireEvent('remove');"/>
         </xul:vbox>
       </xul:hbox>
diff --git a/mozilla/toolkit/mozapps/downloads/locale/downloads.dtd b/mozilla/toolkit/mozapps/downloads/locale/downloads.dtd
index 592d9d4c000..30b4f461e7b 100644
--- a/mozilla/toolkit/mozapps/downloads/locale/downloads.dtd
+++ b/mozilla/toolkit/mozapps/downloads/locale/downloads.dtd
@@ -1,25 +1,5 @@
-<!ENTITY name.label                       "Name">
-<!ENTITY progress.label                   "Progress">
-<!ENTITY status.label                     "Status">
-<!ENTITY timeremaining.label              "Time Remaining">
-<!ENTITY transferred.label                "Transferred">
-<!ENTITY transferrate.label               "Speed">
-<!ENTITY timeelapsed.label                "Time Elapsed">
-<!ENTITY status.label                     "Status">
-<!--<!ENTITY progresstext.label           "&#37;">-->
-<!ENTITY source.label                     "Source">
-
 <!ENTITY done.label                       "Done">
-<!ENTITY cancel.label                     "Cancel">
 <!ENTITY canceled.label                   "Canceled">
-<!ENTITY launch.label                     "Launch">
-<!ENTITY divider.label                    "-">
-<!ENTITY show.label                       "Show">
-<!ENTITY open.label                       "Open">
-<!ENTITY retry.label                      "Retry">
-<!ENTITY remove.label                     "Remove">
-<!ENTITY pause.label                      "Pause">
-<!ENTITY resume.label                     "Resume">
 <!ENTITY installing.label                 "Installing...">
 
 <!ENTITY starting.label                   "Starting...">
@@ -33,11 +13,8 @@
 <!ENTITY cmd.resume.accesskey             "R">
 <!ENTITY cmd.cancel.label                 "Cancel">
 <!ENTITY cmd.cancel.accesskey             "C">
-<!ENTITY cmd.show.label                   "Show">
-<!ENTITY cmd.show.accesskey               "S">
-<!ENTITY cmd.show.tooltipWin              "Show this file in Explorer">
-<!ENTITY cmd.show.tooltipMac              "Show this file in Finder">
-<!ENTITY cmd.show.tooltipUnix             "Show this file in a browser window">
+<!ENTITY cmd.show.label                   "Open Containing Folder">
+<!ENTITY cmd.show.accesskey               "F">
 <!ENTITY cmd.open.label                   "Open">
 <!ENTITY cmd.open.accesskey               "O">
 <!ENTITY cmd.openWith.label               "Open With...">