From 33faee2a61cf4138f8367ec66ae6e31acee7b913 Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com"
 <blakeross%telocity.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 6 Mar 2002 03:36:54 +0000
Subject: [PATCH] Download manager. Not part of build. a=asa

git-svn-id: svn://10.0.0.236/trunk@115923 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../download-manager/resources/content/downloadmanager.xul | 6 ++----
 .../download-manager/resources/locale/downloadmanager.ent  | 7 +++++--
 .../components/download-manager/src/nsDownloadManager.cpp  | 1 -
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mozilla/xpfe/components/download-manager/resources/content/downloadmanager.xul b/mozilla/xpfe/components/download-manager/resources/content/downloadmanager.xul
index 54f8481a114..434307147cc 100644
--- a/mozilla/xpfe/components/download-manager/resources/content/downloadmanager.xul
+++ b/mozilla/xpfe/components/download-manager/resources/content/downloadmanager.xul
@@ -34,7 +34,7 @@
 %platformDTD;
 <!ENTITY % downloadManagerDTD SYSTEM "chrome://communicator/locale/downloadmanager/downloadmanager.ent">
 %downloadManagerDTD;
-<!ENTITY % downloadProgressDTD SYSTEM "chrome://global/locale/downloadProgress.dtd" >
+<!ENTITY % downloadProgressDTD SYSTEM "chrome://global/locale/nsProgressDialog.dtd" >
 %downloadProgressDTD;
 ]>
 
@@ -58,7 +58,6 @@
   <script type="application/x-javascript" src="chrome://communicator/content/downloadmanager/downloadmanager.js"/>
 
  <data id="strings.confirmCancel">&confirmCancel;</data>
- <data id="strings.close">&close;</data>
  <data id="strings.progressMsgNoRate">&progressMsgNoRate;</data>
  <data id="strings.rateMsg">&rateMsg;</data>
  <data id="strings.completeMsg">&completeMsg;</data>
@@ -67,7 +66,6 @@
  <data id="strings.longTimeFormat">&longTimeFormat;</data>
  <data id="strings.unknownTime">&unknownTime;</data>
  <data id="strings.pausedMsg">&pausedMsg;</data>
- <data id="strings.filesFolder">&filesFolder;</data>
 
  <commands id="commands">
    <commandset id="commandUpdate_Downloads"
@@ -120,7 +118,7 @@
   </keyset>
 
   <toolbox>
-    <toolbar>
+    <toolbar id="download-toolbar" class="chromeclass-toolbar" persist="collapsed">
       <toolbarbutton command="cmd_properties"/>
       <toolbarbutton command="cmd_pause"/>
       <toolbarseparator class="toolbarseparator-standard"/>
diff --git a/mozilla/xpfe/components/download-manager/resources/locale/downloadmanager.ent b/mozilla/xpfe/components/download-manager/resources/locale/downloadmanager.ent
index 2dbcb3d7554..2d8f25df844 100644
--- a/mozilla/xpfe/components/download-manager/resources/locale/downloadmanager.ent
+++ b/mozilla/xpfe/components/download-manager/resources/locale/downloadmanager.ent
@@ -5,12 +5,11 @@
 <!ENTITY view.header.transferred.label    "Transferred">
 <!ENTITY view.header.transferrate.label   "Speed">
 <!ENTITY view.header.timeelapsed.label    "Time Elapsed">
-<!ENTITY view.header.progresstext.label   "%">
+<!ENTITY view.header.progresstext.label   "&#37;">
 <!ENTITY view.header.source.label         "Source">
 
 <!ENTITY downloadManager.title            "Download Manager">
 
-
 <!ENTITY cmd.properties.label             "Properties">
 <!ENTITY cmd.properties.accesskey         "i">
 <!ENTITY cmd.properties.keybinding        "i">
@@ -23,3 +22,7 @@
 <!ENTITY cmd.openfile.label               "Open File">
 <!ENTITY cmd.openfile.accesskey           "o">
 
+<!ENTITY confirmCancel "Are you sure you want to cancel the saving of this file?">
+<!ENTITY progressMsgNoRate "#1KB of #2KB">
+<!ENTITY rateMsg "#1KB/sec">
+
diff --git a/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp b/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp
index 6204d10ad15..106633cea61 100644
--- a/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp
+++ b/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp
@@ -61,7 +61,6 @@
 static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
 static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
 
-#define PROFILE_DOWNLOAD_FILE "downloads.rdf"
 #define DOWNLOAD_MANAGER_FE_URL "chrome://communicator/content/downloadmanager/downloadmanager.xul"
 #define DOWNLOAD_MANAGER_BUNDLE "chrome://communicator/locale/downloadmanager/downloadmanager.properties"