diff --git a/mozilla/toolkit/mozapps/downloads/content/download.xml b/mozilla/toolkit/mozapps/downloads/content/download.xml index 688ebf76555..7baf8d19d62 100644 --- a/mozilla/toolkit/mozapps/downloads/content/download.xml +++ b/mozilla/toolkit/mozapps/downloads/content/download.xml @@ -132,7 +132,7 @@ #endif - + @@ -152,14 +152,10 @@ #endif - + - - - - + #endif - + - - - - + #endif - + @@ -344,7 +336,7 @@ #endif - + @@ -364,7 +356,7 @@ #endif - + diff --git a/mozilla/toolkit/mozapps/downloads/content/downloads.js b/mozilla/toolkit/mozapps/downloads/content/downloads.js index e6dc5109518..0e86a978205 100644 --- a/mozilla/toolkit/mozapps/downloads/content/downloads.js +++ b/mozilla/toolkit/mozapps/downloads/content/downloads.js @@ -475,3 +475,43 @@ function onDownloadShowOptions() "chrome,titlebar,resizable,modal", "catDownloadsButton"); } + +# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is Mozilla.org Code. +# +# The Initial Developer of the Original Code is +# Doron Rosenberg. +# Portions created by the Initial Developer are Copyright (C) 2001 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Blake Ross (Original Author) +# Ben Goodger (v2.0) +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + + diff --git a/mozilla/toolkit/mozapps/downloads/locale/downloads.properties b/mozilla/toolkit/mozapps/downloads/locale/downloads.properties index a6f7f66d7a9..d905c3873b0 100644 --- a/mozilla/toolkit/mozapps/downloads/locale/downloads.properties +++ b/mozilla/toolkit/mozapps/downloads/locale/downloads.properties @@ -17,7 +17,7 @@ downloadsCompleteMsg=All files have finished downloading. statusFormatKBKB=#1 of #2 KB statusFormatKBMB=#1 KB of #2 MB statusFormatMBMB=#1 of #2 MB -statusFormat=#1; #2 KB/sec +statusFormat=#1 at #2 KB/sec; #3 remain longTimeFormat=#1:#2:#3 shortTimeFormat=#2:#3