From ee0b7a41ade06b4dddd617508a522b50cc8c81a1 Mon Sep 17 00:00:00 2001
From: "bryner%uiuc.edu" <bryner%uiuc.edu>
Date: Sat, 12 Feb 2000 03:33:40 +0000
Subject: [PATCH] Making the key names in the mousewheel preferences dialog
 platform-specific.  bug 23685, r=ben@netscape.com.

---
 .../prefwindow/resources/content/pref-mousewheel.xul      | 8 +++++++-
 .../prefwindow/resources/locale/en-US/pref-mousewheel.dtd | 8 ++++----
 .../resources/locale/en-US/mac/platformDialogOverlay.dtd  | 6 ++++++
 .../resources/locale/en-US/unix/platformDialogOverlay.dtd | 6 ++++++
 .../resources/locale/en-US/win/platformDialogOverlay.dtd  | 6 ++++++
 5 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul b/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
index f162d0e05a57..19aa4f3c87b5 100644
--- a/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
@@ -25,7 +25,13 @@
 
 <?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
   
-<!DOCTYPE window SYSTEM "chrome://pref/locale/pref-mousewheel.dtd" >
+<!DOCTYPE window [
+<!ENTITY % platformDTD SYSTEM "chrome://global/locale/platformDialogOverlay.dtd" >
+%platformDTD;
+<!ENTITY % prefMousewheelDTD SYSTEM "chrome://pref/locale/pref-mousewheel.dtd" >
+%prefMousewheelDTD;
+]>
+
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     class="dialog"
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-mousewheel.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-mousewheel.dtd
index 912b0050fe60..54c81d7f6057 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-mousewheel.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-mousewheel.dtd
@@ -4,12 +4,12 @@
 <!ENTITY info.label "Mouse Wheel Configuration">
 <!ENTITY mouseWheelPanel.label "When ">
 <!ENTITY usingJustTheWheel.label "using just the mouse wheel">
-<!ENTITY usingWheelAndAlt.label "using the wheel while pressing the Alt key">
-<!ENTITY usingWheelAndCtrl.label "using the wheel while pressing the Ctrl key">
-<!ENTITY usingWheelAndShft.label "using the wheel while pressing the Shift key">
+<!ENTITY usingWheelAndAlt.label "using the wheel while pressing the &altKey.label; key">
+<!ENTITY usingWheelAndCtrl.label "using the wheel while pressing the &ctrlKey.label; key">
+<!ENTITY usingWheelAndShft.label "using the wheel while pressing the &shiftKey.label; key">
 <!ENTITY scroll.label "Scroll the document by ">
 <!ENTITY scrollLines.label " lines. ">
 <!ENTITY useSystemDefault.label "Use system default.">
 <!ENTITY scrollPgUpPgDn.label "Scroll a page up or a page down">
 <!ENTITY history.label "Move back and forward in the browsing history">
-  
+
diff --git a/xpfe/global/resources/locale/en-US/mac/platformDialogOverlay.dtd b/xpfe/global/resources/locale/en-US/mac/platformDialogOverlay.dtd
index d65ed5346cc4..dd6c94ebc4d7 100644
--- a/xpfe/global/resources/locale/en-US/mac/platformDialogOverlay.dtd
+++ b/xpfe/global/resources/locale/en-US/mac/platformDialogOverlay.dtd
@@ -3,3 +3,9 @@
 <!-- OK Cancel Buttons -->
 <!ENTITY okButton.label			"OK"> 
 <!ENTITY cancelButton.label		"Cancel"> 
+
+<!-- Key labels, for mousewheel prefs -->
+<!ENTITY ctrlKey.label			"Control">
+<!ENTITY altKey.label			"Option">
+<!ENTITY shiftKey.label			"Shift">
+
diff --git a/xpfe/global/resources/locale/en-US/unix/platformDialogOverlay.dtd b/xpfe/global/resources/locale/en-US/unix/platformDialogOverlay.dtd
index d41f3f412beb..d62799ca3121 100644
--- a/xpfe/global/resources/locale/en-US/unix/platformDialogOverlay.dtd
+++ b/xpfe/global/resources/locale/en-US/unix/platformDialogOverlay.dtd
@@ -3,3 +3,9 @@
 <!-- OK Cancel Buttons -->
 <!ENTITY okButton.label			"OK"> 
 <!ENTITY cancelButton.label		"Cancel"> 
+
+<!-- Key labels, for mousewheel prefs -->
+<!ENTITY ctrlKey.label			"Control">
+<!ENTITY altKey.label			"Alt">
+<!ENTITY shiftKey.label			"Shift">
+
diff --git a/xpfe/global/resources/locale/en-US/win/platformDialogOverlay.dtd b/xpfe/global/resources/locale/en-US/win/platformDialogOverlay.dtd
index 37ba88b3ffb5..026983a50a79 100644
--- a/xpfe/global/resources/locale/en-US/win/platformDialogOverlay.dtd
+++ b/xpfe/global/resources/locale/en-US/win/platformDialogOverlay.dtd
@@ -3,3 +3,9 @@
 <!-- OK Cancel Buttons -->
 <!ENTITY okButton.label			"OK"> 
 <!ENTITY cancelButton.label		"Cancel"> 
+
+<!-- Key labels, for mousewheel prefs -->
+<!ENTITY ctrlKey.label			"Control">
+<!ENTITY altKey.label			"Alt">
+<!ENTITY shiftKey.label			"Shift">
+