From 51669574ed4686232332d0cf9978f0d7b3f7029d Mon Sep 17 00:00:00 2001 From: "dianesun%netscape.com" Date: Sat, 2 Sep 2000 01:11:49 +0000 Subject: [PATCH] Fix for bugs 38092 & 37931. R/A: ducarroz, QA: laurel. --- .../locale/en-US/pref-addressing.dtd | 8 ++++---- .../prefs/resources/content/pref-mailnews.xul | 6 +++--- .../content/pref-viewing_messages.xul | 20 +++++++++---------- .../locale/en-US/mailPrefsOverlay.dtd | 2 +- .../resources/locale/en-US/pref-mailnews.dtd | 10 +++++----- .../locale/en-US/pref-viewing_messages.dtd | 19 +++++++++--------- .../content/pref-composing_messages.xul | 8 ++++---- .../resources/content/pref-formatting.xul | 11 ++++++---- .../prefs/resources/content/pref-messages.xul | 16 +++++++-------- .../locale/en-US/pref-composing_messages.dtd | 16 ++++++++------- .../locale/en-US/pref-formatting.dtd | 11 +++++----- 11 files changed, 67 insertions(+), 60 deletions(-) diff --git a/mailnews/addrbook/prefs/resources/locale/en-US/pref-addressing.dtd b/mailnews/addrbook/prefs/resources/locale/en-US/pref-addressing.dtd index e9c7844ec22d..30954232070b 100644 --- a/mailnews/addrbook/prefs/resources/locale/en-US/pref-addressing.dtd +++ b/mailnews/addrbook/prefs/resources/locale/en-US/pref-addressing.dtd @@ -18,8 +18,8 @@ Communications Corporation. Portions created by Netscape are Rights Reserved. --> - - + + @@ -40,9 +40,9 @@ Rights Reserved. - + - + diff --git a/mailnews/base/prefs/resources/content/pref-mailnews.xul b/mailnews/base/prefs/resources/content/pref-mailnews.xul index 638313479098..cb5ad42031dd 100644 --- a/mailnews/base/prefs/resources/content/pref-mailnews.xul +++ b/mailnews/base/prefs/resources/content/pref-mailnews.xul @@ -39,7 +39,7 @@ &chooseExp.label; - @@ -48,11 +48,11 @@ <text value="&messengerStartPage.label;"/> - - + diff --git a/mailnews/base/prefs/resources/content/pref-viewing_messages.xul b/mailnews/base/prefs/resources/content/pref-viewing_messages.xul index 7b19e55283b3..5f1150d5169d 100644 --- a/mailnews/base/prefs/resources/content/pref-viewing_messages.xul +++ b/mailnews/base/prefs/resources/content/pref-viewing_messages.xul @@ -60,14 +60,14 @@ <text value="&displayWidth.label;"/> - &plainText.label; + - - + + @@ -85,7 +85,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -109,20 +109,20 @@ &viewingPlainText.label; - - - <text value="&languages.label;"/> + <text value="&languagesTitle.label;"/> &coding.label; - + @@ -133,7 +133,7 @@ - diff --git a/mailnews/base/prefs/resources/locale/en-US/mailPrefsOverlay.dtd b/mailnews/base/prefs/resources/locale/en-US/mailPrefsOverlay.dtd index 2dd827aebbbe..12256e39c1e9 100644 --- a/mailnews/base/prefs/resources/locale/en-US/mailPrefsOverlay.dtd +++ b/mailnews/base/prefs/resources/locale/en-US/mailPrefsOverlay.dtd @@ -10,6 +10,6 @@ - + diff --git a/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd b/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd index 4abe8aea42ed..6b34b739703a 100644 --- a/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd +++ b/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd @@ -21,18 +21,18 @@ Rights Reserved. - + - - + + - - + + diff --git a/mailnews/base/prefs/resources/locale/en-US/pref-viewing_messages.dtd b/mailnews/base/prefs/resources/locale/en-US/pref-viewing_messages.dtd index a87e16844047..c583f6a179f1 100644 --- a/mailnews/base/prefs/resources/locale/en-US/pref-viewing_messages.dtd +++ b/mailnews/base/prefs/resources/locale/en-US/pref-viewing_messages.dtd @@ -22,29 +22,30 @@ Rights Reserved. - + - + - - + + - - + + + - + - + @@ -53,7 +54,7 @@ Rights Reserved. - + diff --git a/mailnews/compose/prefs/resources/content/pref-composing_messages.xul b/mailnews/compose/prefs/resources/content/pref-composing_messages.xul index 8cd3ca541510..11eb3d6dfb96 100644 --- a/mailnews/compose/prefs/resources/content/pref-composing_messages.xul +++ b/mailnews/compose/prefs/resources/content/pref-composing_messages.xul @@ -56,7 +56,7 @@ - @@ -77,11 +77,11 @@ <text value="&sendingMessagesHeader.label;"/> - - @@ -93,7 +93,7 @@ - + diff --git a/mailnews/compose/prefs/resources/content/pref-formatting.xul b/mailnews/compose/prefs/resources/content/pref-formatting.xul index 61214b274e18..58fbae09543f 100644 --- a/mailnews/compose/prefs/resources/content/pref-formatting.xul +++ b/mailnews/compose/prefs/resources/content/pref-formatting.xul @@ -24,15 +24,18 @@ - - - - + + + + &override.label; + + &receiveHTML.label; + diff --git a/mailnews/compose/prefs/resources/content/pref-messages.xul b/mailnews/compose/prefs/resources/content/pref-messages.xul index 8e0fc31d01a7..3153ef45b820 100644 --- a/mailnews/compose/prefs/resources/content/pref-messages.xul +++ b/mailnews/compose/prefs/resources/content/pref-messages.xul @@ -27,7 +27,7 @@ - @@ -48,13 +48,13 @@ <text value="&readingMessagesHeader.label;"/> - - - @@ -63,10 +63,10 @@ <text value="&sendingMessagesHeader.label;"/> - - @@ -80,8 +80,8 @@ - - + + diff --git a/mailnews/compose/prefs/resources/locale/en-US/pref-composing_messages.dtd b/mailnews/compose/prefs/resources/locale/en-US/pref-composing_messages.dtd index aecc53aa7db1..f9f46e5e3728 100644 --- a/mailnews/compose/prefs/resources/locale/en-US/pref-composing_messages.dtd +++ b/mailnews/compose/prefs/resources/locale/en-US/pref-composing_messages.dtd @@ -18,7 +18,7 @@ Communications Corporation. Portions created by Netscape are Rights Reserved. --> - + @@ -32,8 +32,8 @@ Rights Reserved. - - + + @@ -50,7 +50,7 @@ Rights Reserved. - + @@ -59,9 +59,11 @@ Rights Reserved. - + - - + + + + diff --git a/mailnews/compose/prefs/resources/locale/en-US/pref-formatting.dtd b/mailnews/compose/prefs/resources/locale/en-US/pref-formatting.dtd index 5d18f25eb466..cbdf6c6dfc34 100644 --- a/mailnews/compose/prefs/resources/locale/en-US/pref-formatting.dtd +++ b/mailnews/compose/prefs/resources/locale/en-US/pref-formatting.dtd @@ -18,15 +18,16 @@ Communications Corporation. Portions created by Netscape are Rights Reserved. --> - + - + - + - + - + + \ No newline at end of file