From b55d4bc54c20c4f2a491a0de6192f3e25dab6579 Mon Sep 17 00:00:00 2001
From: "ben%netscape.com" <ben%netscape.com>
Date: Sun, 14 May 2000 02:57:41 +0000
Subject: [PATCH] fix 33647 (display font size units in fonts pref panel)

---
 .../components/prefwindow/resources/content/pref-fonts.xul | 7 +++++++
 .../prefwindow/resources/locale/en-US/pref-fonts.dtd       | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/xpfe/components/prefwindow/resources/content/pref-fonts.xul b/xpfe/components/prefwindow/resources/content/pref-fonts.xul
index 3ba034e7d147..9de0096e41aa 100644
--- a/xpfe/components/prefwindow/resources/content/pref-fonts.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-fonts.xul
@@ -77,6 +77,7 @@
         <column flex="1"/>
         <column/>
         <column/>
+        <column/>
       </columns>
       
       <rows>
@@ -98,6 +99,7 @@
               <menuitem data="24" value="24"/>
             </menupopup>
           </menulist>
+          <text class="label" value="&units.label;"/>
         </row>
         <row>
           <text class="label" value="&sans-serif.label;" accesskey="&sans-serif.accesskey;" for="sans-serif"/>
@@ -106,6 +108,7 @@
           </menulist>
           <spring/>
           <spring/>
+          <spring/>
         </row>
         <!--
         <row>
@@ -115,6 +118,7 @@
           </menulist>
           <spring/>
           <spring/>
+          <spring/>
         </row>
         <row>
           <text class="label" value="&fantasy.label;" accesskey="&fantasy.accesskey;" for="fantasy"/>
@@ -123,6 +127,7 @@
           </menulist>
           <spring/>
           <spring/>
+          <spring/>
         </row>
         -->
       </rows>
@@ -150,6 +155,7 @@
         <column flex="1"/>
         <column/>
         <column/>
+        <column/>
       </columns>
       <rows>
         <row>
@@ -170,6 +176,7 @@
               <menuitem data="24" value="24"/>
             </menupopup>
           </menulist>
+          <text class="label" value="&units.label;"/>
         </row>
       </rows>
     </grid>
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd
index 6f23bfecfb3d..8e0d503e73a9 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd
@@ -75,4 +75,6 @@
 <!ENTITY  resolution.accesskey                    "d">
 
 <!ENTITY  fixedFonts.label                        "Fixed-width fonts:">
-<!ENTITY  variableFonts.label                     "Variable-width fonts:">
\ No newline at end of file
+<!ENTITY  variableFonts.label                     "Variable-width fonts:">
+
+<!ENTITY  units.label                             "pixels">
\ No newline at end of file