From b4802cce10a80456b825cf6566d2c31654d2bfb8 Mon Sep 17 00:00:00 2001
From: "matt%netscape.com" <matt%netscape.com>
Date: Tue, 8 Jun 1999 20:30:08 +0000
Subject: [PATCH] fixing bugs 6468 and               6482

---
 suite/common/pref/pref-colors.xul                         | 2 +-
 suite/common/pref/pref-download.xul                       | 8 +++++---
 .../prefwindow/resources/content/pref-colors.xul          | 2 +-
 .../prefwindow/resources/content/pref-download.xul        | 8 +++++---
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/suite/common/pref/pref-colors.xul b/suite/common/pref/pref-colors.xul
index cbe80cc5990e..dffd8d17d869 100644
--- a/suite/common/pref/pref-colors.xul
+++ b/suite/common/pref/pref-colors.xul
@@ -24,7 +24,7 @@
 
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="return StartUp('Colors');"  title="title.label">
+        onload="return StartUp('Colors');"  title="window.label">
 
 
 <html:script language="JavaScript" src="PrefsWindow.js">
diff --git a/suite/common/pref/pref-download.xul b/suite/common/pref/pref-download.xul
index bcbf661bbd11..5b3a9f87528f 100644
--- a/suite/common/pref/pref-download.xul
+++ b/suite/common/pref/pref-download.xul
@@ -6,6 +6,8 @@
 <!DOCTYPE window [
 <!ENTITY  title.label "Download">
 <!ENTITY  download "Download">
+<!ENTITY  downOnlyCheck "Download only unread messages">
+<!ENTITY  downDateCheck "Download by date">
 <!ENTITY  newmes "Newsgroup Messages">
 <!ENTITY  downUnread "Download only unread messages">
 <!ENTITY  downloadDate "Download by date">
@@ -37,13 +39,13 @@
 
 
 <html:DIV ID="top">
-		<html:SPAN ID="lefttext">Download</html:SPAN>
+		<html:SPAN ID="lefttext">&download;</html:SPAN>
 </html:DIV>
 
 &newmes;
 <html:table>
-			<html:tr><html:td><html:label><html:input type="checkbox" id="pref:0:bool:offline.news.download.unread_only" />Download only unread messages</html:label></html:td></html:tr>
-			<html:tr><html:td><html:label><html:input type="checkbox" id="pref:0:bool:offline.news.download.by_date" />Download by date</html:label></html:td></html:tr>
+			<html:tr><html:td><html:label><html:input type="checkbox" id="pref:0:bool:offline.news.download.unread_only" />&downOnlyCheck;</html:label></html:td></html:tr>
+			<html:tr><html:td><html:label><html:input type="checkbox" id="pref:0:bool:offline.news.download.by_date" />&downDateCheck;</html:label></html:td></html:tr>
 			<html:tr><html:td>
 			    <html:label>
 				<html:input  type="radio" name="offline" id="pref:0:int:offline.news.download.use_days" val="checked" />&fromRadio.label;
diff --git a/xpfe/components/prefwindow/resources/content/pref-colors.xul b/xpfe/components/prefwindow/resources/content/pref-colors.xul
index cbe80cc5990e..dffd8d17d869 100644
--- a/xpfe/components/prefwindow/resources/content/pref-colors.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-colors.xul
@@ -24,7 +24,7 @@
 
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="return StartUp('Colors');"  title="title.label">
+        onload="return StartUp('Colors');"  title="window.label">
 
 
 <html:script language="JavaScript" src="PrefsWindow.js">
diff --git a/xpfe/components/prefwindow/resources/content/pref-download.xul b/xpfe/components/prefwindow/resources/content/pref-download.xul
index bcbf661bbd11..5b3a9f87528f 100644
--- a/xpfe/components/prefwindow/resources/content/pref-download.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-download.xul
@@ -6,6 +6,8 @@
 <!DOCTYPE window [
 <!ENTITY  title.label "Download">
 <!ENTITY  download "Download">
+<!ENTITY  downOnlyCheck "Download only unread messages">
+<!ENTITY  downDateCheck "Download by date">
 <!ENTITY  newmes "Newsgroup Messages">
 <!ENTITY  downUnread "Download only unread messages">
 <!ENTITY  downloadDate "Download by date">
@@ -37,13 +39,13 @@
 
 
 <html:DIV ID="top">
-		<html:SPAN ID="lefttext">Download</html:SPAN>
+		<html:SPAN ID="lefttext">&download;</html:SPAN>
 </html:DIV>
 
 &newmes;
 <html:table>
-			<html:tr><html:td><html:label><html:input type="checkbox" id="pref:0:bool:offline.news.download.unread_only" />Download only unread messages</html:label></html:td></html:tr>
-			<html:tr><html:td><html:label><html:input type="checkbox" id="pref:0:bool:offline.news.download.by_date" />Download by date</html:label></html:td></html:tr>
+			<html:tr><html:td><html:label><html:input type="checkbox" id="pref:0:bool:offline.news.download.unread_only" />&downOnlyCheck;</html:label></html:td></html:tr>
+			<html:tr><html:td><html:label><html:input type="checkbox" id="pref:0:bool:offline.news.download.by_date" />&downDateCheck;</html:label></html:td></html:tr>
 			<html:tr><html:td>
 			    <html:label>
 				<html:input  type="radio" name="offline" id="pref:0:int:offline.news.download.use_days" val="checked" />&fromRadio.label;