зеркало из https://github.com/mozilla/pjs.git
Bug 292668 Reorganise mailnews pref panes - Character Encoding patch
p=me r=mnyromyr/cbiesinger sr=neil.parkwaycc.co.uk
This commit is contained in:
bugzilla%arlen.demon.co.uk
Родитель
967cca1c5f
Коммит
3953f92e72
|
|
@ -1101,6 +1101,11 @@
|
|||
nc:name="changing account settings"
|
||||
nc:link="mail_help.xhtml#changing_the_settings_for_an_account"/>
|
||||
</rdf:li>
|
||||
<rdf:li>
|
||||
<rdf:Description ID="Mail_and_Newsgroups:Character_Encoding"
|
||||
nc:name="Character Encoding"
|
||||
nc:link="mail_help.xhtml#character_encoding"/>
|
||||
</rdf:li>
|
||||
<rdf:li>
|
||||
<rdf:Description ID="Mail_and_Newsgroups:Compose_window"
|
||||
nc:name="Compose window"
|
||||
|
|
|
|||
|
|
@ -492,6 +492,7 @@ nc:link="chrome://help/locale/nav_help.xhtml#plugins_and_downloads"/> </rdf:li>
|
|||
<rdf:li> <rdf:Description ID="mail_prefs_addressing" nc:name="Addressing" nc:link="mail_help.xhtml#addressing_preferences"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description ID="mail-prefs-labels" nc:name="Labels" nc:link="mail_help.xhtml#labels"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description ID="mail-prefs-receipts" nc:name="Return Receipts" nc:link="mail_help.xhtml#return_receipts_preferences"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description ID="mail_prefs_character_encoding" nc:name="Character Encoding" nc:link="mail_help.xhtml#character_encoding"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description ID="mail_prefs_offline" nc:name="Offline and Disk Space" nc:link="mail_help.xhtml#offline_and_disk_space_preferences"/> </rdf:li>
|
||||
</rdf:Seq>
|
||||
</nc:subheadings>
|
||||
|
|
|
|||
|
|
@ -4283,6 +4283,7 @@ to filter unwanted mail.</p>
|
|||
<li><a href="#addressing_preferences">Addressing</a></li>
|
||||
<li><a href="#labels">Labels</a></li>
|
||||
<li><a href="#return_receipts_preferences">Return Receipts</a></li>
|
||||
<li><a href="#character_encoding">Character Encoding</a></li>
|
||||
<li><a href="#offline_and_disk_space_preferences">Offline & Disk Space
|
||||
Preferences</a></li>
|
||||
</ul>
|
||||
|
|
@ -4369,20 +4370,6 @@ to filter unwanted mail.</p>
|
|||
your messages as read automatically at all, you can select this option
|
||||
and enter a very large number of seconds.</p>
|
||||
</li>
|
||||
<li><strong>Default Character Encoding</strong>: Click this drop-down list to
|
||||
select the character encoding you want Mail & Newsgroups to use as the
|
||||
default for incoming mail and newsgroup messages. This is recommended if
|
||||
it's likely you might receive messages in which the character encoding
|
||||
(MIME charset) is not indicated, such as when reading messages in
|
||||
international newsgroups.</li>
|
||||
<li><strong>Apply default to all messages</strong>: Select this to apply the
|
||||
default character encoding to all messages.
|
||||
|
||||
<p><strong>Tip</strong>: You can later view or change the character
|
||||
encoding for a specific folder. In the Mail window, select a folder from
|
||||
the list of Mail folders. Open the View menu, and choose Character
|
||||
Encoding.</p>
|
||||
</li>
|
||||
<li><strong>Plain Text Messages</strong>: Select the font you prefer for
|
||||
viewing plain-text messages: fixed width or variable width. Choosing a font
|
||||
style, size, and color for quoted plain-text messages can help you more
|
||||
|
|
@ -4521,22 +4508,17 @@ to filter unwanted mail.</p>
|
|||
<li><strong>Forward Messages</strong>: Choose how you want forwarded
|
||||
message text to appear: as an attachment or <em>inline</em> (in the body
|
||||
of your message).</li>
|
||||
<li><strong>Automatically save the message every ___ minutes</strong>: Choose
|
||||
this option if you want Mail & Newsgroups to save the message you are
|
||||
currently composing automatically at the given interval. After a computer
|
||||
crash or program failure you can find the latest saved version of the
|
||||
message in your Drafts folder.</li>
|
||||
<li><strong>Check spelling before sending</strong>: Select this option to
|
||||
have Mail & Newsgroups always check the spelling of your message before
|
||||
you send it.</li>
|
||||
<li><strong>Check spelling as you type</strong>: Select this option to have
|
||||
Mail & Newsgroups always check the spelling of your message as you type
|
||||
it.</li>
|
||||
<li><strong>For messages that contain 8-bit characters, use 'quoted
|
||||
printable' MIME encoding</strong>: Choose to have Mail &
|
||||
Newsgroups use <q>quoted printable</q> MIME encoding when sending regular
|
||||
messages that use an 8-bit character encoding (for example, Latin
|
||||
ISO-8859-3).</li>
|
||||
<li><strong>Automatically save the message every ___ minutes</strong>: Choose
|
||||
this option if you want Mail & Newsgroups to save the message you are
|
||||
currently composing automatically at the given interval. After a computer
|
||||
crash or program failure you can find the latest saved version of the
|
||||
message in your Drafts folder.</li>
|
||||
<li><strong>Confirm when using keyboard shortcut to send message</strong>:
|
||||
Check this option if want to be asked if you're sure to be ready to
|
||||
send the message when you're pressing Ctrl+Return in message editor.
|
||||
|
|
@ -4544,14 +4526,6 @@ to filter unwanted mail.</p>
|
|||
keyboard shortcut by mistake when composing a message.</li>
|
||||
<li><strong>Wrap plain text messages at ___ characters</strong>: Enter a
|
||||
number to set the right margin for text in the message area.</li>
|
||||
<li><strong>Default Character Encoding</strong>: Select the character
|
||||
encoding you want Mail & Newsgroups to use as the default for outgoing
|
||||
mail and newsgroup messages. Note that this character encoding is
|
||||
<strong>not</strong> used when replying to a message. Instead, the
|
||||
character encoding of the message being replied to is used by default.
|
||||
Choose <strong>Always use this default character encoding in
|
||||
replies</strong> to use the default character encoding for outgoing
|
||||
messages even when replying.</li>
|
||||
<li><strong>Defaults for HTML Messages</strong>: Here you can define what the
|
||||
defaults are for font, size, text and background color if you choose to
|
||||
send mails in HTML format.</li>
|
||||
|
|
@ -4755,6 +4729,56 @@ to filter unwanted mail.</p>
|
|||
<a href="#return_receipts">Mail & Newsgroups Account Settings - Return
|
||||
Receipts</a>.</p>
|
||||
|
||||
<p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
|
||||
section</a>]</p>
|
||||
|
||||
<h2 id="character_encoding">Mail & Newsgroups Preferences - Character
|
||||
Encoding</h2>
|
||||
|
||||
<p>Character encoding preferences allow you to choose how messages are encoded
|
||||
when being displayed or created in all accounts. If you are not already
|
||||
viewing the Character Encoding settings, follow these steps:</p>
|
||||
|
||||
<ol>
|
||||
<li>Open the <span class="mac">&brandShortName;</span>
|
||||
<span class="noMac">Edit</span> menu and choose Preferences. You see the
|
||||
Preferences dialog box.</li>
|
||||
<li>Under the Mail & Newsgroups category, click Character Encoding. (If
|
||||
no subcategories are visible, double-click Mail & Newsgroups to expand
|
||||
the list.)</li>
|
||||
</ol>
|
||||
|
||||
<ul>
|
||||
<li><strong>Default Character Encoding</strong>: Click this drop-down list to
|
||||
select the character encoding you want Mail & Newsgroups to use as the
|
||||
default for incoming mail and newsgroup messages. This is recommended if
|
||||
it's likely you might receive messages in which the character encoding
|
||||
(MIME charset) is not indicated, such as when reading messages in
|
||||
international newsgroups.</li>
|
||||
<li><strong>Always use this default character encoding when messages are
|
||||
displayed</strong>: Select this to apply the default character encoding to
|
||||
all messages.
|
||||
|
||||
<p><strong>Tip</strong>: You can later view or change the character
|
||||
encoding for a specific folder. In the Mail window, select a folder from
|
||||
the list of Mail folders. Open the View menu, and choose Character
|
||||
Encoding.</p>
|
||||
</li>
|
||||
<li><strong>For messages that contain 8-bit characters, use 'quoted
|
||||
printable' MIME encoding</strong>: Choose to have Mail &
|
||||
Newsgroups use <q>quoted printable</q> MIME encoding when sending regular
|
||||
messages that use an 8-bit character encoding (for example, Latin
|
||||
ISO-8859-3).</li>
|
||||
<li><strong>Default Character Encoding</strong>: Select the character
|
||||
encoding you want Mail & Newsgroups to use as the default for outgoing
|
||||
mail and newsgroup messages. Note that this character encoding is
|
||||
<strong>not</strong> used when replying to a message. Instead, the
|
||||
character encoding of the message being replied to is used by default.
|
||||
Choose <strong>Always use this default character encoding in
|
||||
replies</strong> to use the default character encoding for outgoing
|
||||
messages even when replying.</li>
|
||||
</ul>
|
||||
|
||||
<p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
|
||||
section</a>]</p>
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
<checkbox id="generalStartupMail" wsm_persist="true" position="3"
|
||||
label="&mail.label;" accesskey="&mail.accesskey;"
|
||||
pref="true" preftype="bool" prefstring="general.startup.mail"
|
||||
prefattribute="checked"/>
|
||||
prefattribute="checked"/>
|
||||
<checkbox id="generalStartupAddressBook" wsm_persist="true" position="5"
|
||||
label="&addressbook.label;" accesskey="&addressbook.accesskey;"
|
||||
pref="true" preftype="bool" prefstring="general.startup.addressbook"
|
||||
|
|
@ -96,6 +96,11 @@
|
|||
<treecell url="chrome://messenger/content/pref-receipts.xul" label="&return.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://messenger/content/pref-character_encoding.xul" label="&characterEncoding.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://messenger/content/pref-offline.xul" label="&offline.label;"/>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,69 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://messenger/skin/prefPanels.css" type="text/css"?>
|
||||
|
||||
<!DOCTYPE page SYSTEM "chrome://messenger/locale/pref-character_encoding.dtd">
|
||||
|
||||
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
onload="parent.initPanel('chrome://messenger/content/pref-character_encoding.xul');"
|
||||
headertitle="&pref.character.encoding.title;">
|
||||
|
||||
<script type="application/x-javascript">
|
||||
<![CDATA[
|
||||
var _elementIDs = ["viewDefaultCharsetList", "forceCharsetOverride",
|
||||
"strictlyMime", "sendDefaultCharsetList",
|
||||
"replyInDefaultCharset"];
|
||||
var observerService = Components.classes["@mozilla.org/observer-service;1"]
|
||||
.getService(Components.interfaces.nsIObserverService);
|
||||
observerService.notifyObservers(null, "charsetmenu-selected", "other");
|
||||
observerService.notifyObservers(null, "charsetmenu-selected", "mailedit");
|
||||
]]>
|
||||
</script>
|
||||
|
||||
<groupbox align="start">
|
||||
<caption label="&messageDisplay.caption;"/>
|
||||
<hbox align="center">
|
||||
<label control="viewDefaultCharsetList"
|
||||
value="&viewDefaultCharset.label;" accesskey="&viewDefaultCharset.accesskey;"/>
|
||||
<menulist id="viewDefaultCharsetList" ref="NC:DecodersRoot" datasources="rdf:charset-menu"
|
||||
preftype="localizedstring" prefstring="mailnews.view_default_charset">
|
||||
<template>
|
||||
<menupopup>
|
||||
<menuitem label="rdf:http://home.netscape.com/NC-rdf#Name" value="..." uri="..."/>
|
||||
</menupopup>
|
||||
</template>
|
||||
</menulist>
|
||||
</hbox>
|
||||
|
||||
<checkbox id="forceCharsetOverride" label="&forceCharsetOverride.label;"
|
||||
prefstring="mailnews.force_charset_override"
|
||||
accesskey="&forceCharsetOverride.accesskey;"/>
|
||||
|
||||
</groupbox>
|
||||
|
||||
<!-- Composing Mail -->
|
||||
<groupbox align="start">
|
||||
<caption label="&composingMessages.caption;"/>
|
||||
|
||||
<checkbox id="strictlyMime" label="&useMIME.label;"
|
||||
prefstring="mail.strictly_mime"
|
||||
accesskey="&useMIME.accesskey;"/>
|
||||
|
||||
<hbox align="center">
|
||||
<label value="&sendDefaultCharset.label;" accesskey="&sendDefaultCharset.accesskey;"
|
||||
page="sendDefaultCharsetList" control="sendDefaultCharsetList"/>
|
||||
<menulist id="sendDefaultCharsetList" ref="NC:MaileditCharsetMenuRoot" datasources="rdf:charset-menu"
|
||||
preftype="localizedstring" prefstring="mailnews.send_default_charset">
|
||||
<template>
|
||||
<menupopup>
|
||||
<menuitem label="rdf:http://home.netscape.com/NC-rdf#Name" value="..." uri="..."/>
|
||||
</menupopup>
|
||||
</template>
|
||||
</menulist>
|
||||
</hbox>
|
||||
<checkbox id="replyInDefaultCharset" label="&replyInDefaultCharset.label;"
|
||||
prefstring="mailnews.reply_in_default_charset"
|
||||
accesskey="&replyInDefaultCharset.accesskey;"/>
|
||||
</groupbox>
|
||||
</page>
|
||||
|
|
@ -15,10 +15,7 @@
|
|||
"mailQuotedSize", "mailCitationColor",
|
||||
"wrapLongLines", "displayGlyph",
|
||||
"reuseMessageWindow", "disableContent",
|
||||
"markMessagesRead", "markMessagesReadAfter",
|
||||
"sendDefaultCharsetList", "forceCharsetOverride"];
|
||||
var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
|
||||
observerService.notifyObservers(null, "charsetmenu-selected", "other");
|
||||
"markMessagesRead", "markMessagesReadAfter"];
|
||||
var gMarkMessagesReadAfter;
|
||||
|
||||
function Startup() {
|
||||
|
|
@ -66,33 +63,18 @@
|
|||
<label value="&seconds.label;"/>
|
||||
</hbox>
|
||||
|
||||
<hbox align="center">
|
||||
<label control="sendDefaultCharsetList"
|
||||
value="&sendDefaultCharset.label;" accesskey="&sendDefaultCharset.accesskey;"/>
|
||||
<menulist id="sendDefaultCharsetList" ref="NC:DecodersRoot" datasources="rdf:charset-menu"
|
||||
preftype="localizedstring" prefstring="mailnews.view_default_charset">
|
||||
<template>
|
||||
<menupopup>
|
||||
<menuitem label="rdf:http://home.netscape.com/NC-rdf#Name" value="..." uri="..."/>
|
||||
</menupopup>
|
||||
</template>
|
||||
</menulist>
|
||||
</hbox>
|
||||
|
||||
<checkbox id="forceCharsetOverride" label="&forceCharsetOverride.label;"
|
||||
prefstring="mailnews.force_charset_override"
|
||||
accesskey="&forceCharsetOverride.accesskey;"/>
|
||||
|
||||
</groupbox>
|
||||
|
||||
<groupbox>
|
||||
<caption label="&displayPlainText.label;"/>
|
||||
<hbox align="center">
|
||||
<description>&plainTextFont.label;</description>
|
||||
<label value="&plainTextFont.label;"/>
|
||||
<hbox class="indent" align="center">
|
||||
<radiogroup id="mailFixedWidthMessages" orient="horizontal"
|
||||
preftype="bool" prefstring="mail.fixed_width_messages">
|
||||
<radio value="true" label="&fixedWidth.label;" accesskey="&fixedWidth.accesskey;"/>
|
||||
<radio value="false" label="&variableWidth.label;" accesskey="&variableWidth.accesskey;"/>
|
||||
<radio value="true" label="&fixedWidth.label;"
|
||||
accesskey="&fixedWidth.accesskey;"/>
|
||||
<radio value="false" label="&variableWidth.label;"
|
||||
accesskey="&variableWidth.accesskey;"/>
|
||||
</radiogroup>
|
||||
</hbox>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
|
||||
<!ENTITY enbJsCheckMailNews.label "Mail & Newsgroups">
|
||||
<!ENTITY enbJsCheckMailNews.accesskey "m">
|
||||
<!ENTITY enbJsCheckMailNews.accesskey "M">
|
||||
<!ENTITY enbPluginCheckMailNews.label "Mail & Newsgroups">
|
||||
<!ENTITY enbPluginCheckMailNews.accesskey "p">
|
||||
<!ENTITY enbPluginCheckMailNews.accesskey "a">
|
||||
|
||||
<!ENTITY mail.label "Mail & Newsgroups">
|
||||
<!ENTITY mail.accesskey "m">
|
||||
<!ENTITY mail.accesskey "M">
|
||||
<!ENTITY addressbook.label "Address Book">
|
||||
<!ENTITY addressbook.accesskey "a">
|
||||
<!ENTITY addressbook.accesskey "A">
|
||||
<!ENTITY viewingMessages.label "Message Display">
|
||||
<!ENTITY notifications.label "Notifications">
|
||||
<!ENTITY address.label "Addressing">
|
||||
|
|
@ -16,4 +16,5 @@
|
|||
<!ENTITY return.label "Return Receipts">
|
||||
<!ENTITY disk.label "Disk Space">
|
||||
<!ENTITY labels.label "Labels">
|
||||
<!ENTITY characterEncoding.label "Character Encoding">
|
||||
<!ENTITY offline.label "Offline & Disk Space">
|
||||
|
|
|
|||
|
|
@ -38,13 +38,13 @@
|
|||
|
||||
<!ENTITY pref.viewing.messages.title "Message Display">
|
||||
<!ENTITY style.label "Style:">
|
||||
<!ENTITY style.accesskey "t">
|
||||
<!ENTITY style.accesskey "S">
|
||||
<!ENTITY regular.label "Regular">
|
||||
<!ENTITY bold.label "Bold">
|
||||
<!ENTITY italic.label "Italic">
|
||||
<!ENTITY boldItalic.label "Bold Italic">
|
||||
<!ENTITY size.label "Size:">
|
||||
<!ENTITY size.accesskey "S">
|
||||
<!ENTITY size.accesskey "z">
|
||||
<!ENTITY bigger.label "Bigger">
|
||||
<!ENTITY smaller.label "Smaller">
|
||||
<!ENTITY color.label "Color:">
|
||||
|
|
@ -52,10 +52,6 @@
|
|||
<!ENTITY displayPlainText.label "When displaying plain text messages">
|
||||
<!ENTITY plainTextFont.label "Use the following font width:">
|
||||
<!ENTITY displayQuoted.label "Settings for quoted messages:">
|
||||
<!ENTITY sendDefaultCharset.label "Default Character Encoding:">
|
||||
<!ENTITY sendDefaultCharset.accesskey "r">
|
||||
<!ENTITY forceCharsetOverride.label "Apply default to all messages (ignore character encoding specified by MIME header)">
|
||||
<!ENTITY forceCharsetOverride.accesskey "A">
|
||||
<!ENTITY fixedWidth.label "Fixed">
|
||||
<!ENTITY fixedWidth.accesskey "F">
|
||||
<!ENTITY variableWidth.label "Variable">
|
||||
|
|
@ -63,7 +59,7 @@
|
|||
<!ENTITY readingMessagesHeader.label "For incoming messages">
|
||||
<!ENTITY messageWrapping.label "Message Wrapping">
|
||||
<!ENTITY wrapInMsg.label "Wrap text to fit window width">
|
||||
<!ENTITY wrapInMsg.accesskey "x">
|
||||
<!ENTITY wrapInMsg.accesskey "t">
|
||||
<!-- LOCALIZATION NOTE : (convertEmoticons.label) 'Emoticons' are also known as 'Smileys', e.g. :-) -->
|
||||
<!ENTITY convertEmoticons.label "Display emoticons as graphics">
|
||||
<!ENTITY convertEmoticons.accesskey "D">
|
||||
|
|
@ -81,4 +77,4 @@
|
|||
<!ENTITY existingWindowRadio.label "An existing message window">
|
||||
<!ENTITY existingWindowRadio.accesskey "e">
|
||||
<!ENTITY disableContent.label "Allow messages to load and display remote images and other content">
|
||||
<!ENTITY disableContent.accesskey "m">
|
||||
<!ENTITY disableContent.accesskey "A">
|
||||
|
|
|
|||
|
|
@ -17,13 +17,8 @@
|
|||
<![CDATA[
|
||||
var _elementIDs = ["forwardMessageMode", "autoSave",
|
||||
"autoSaveInterval","spellCheckBeforeSend", "inlineSpellCheck",
|
||||
"strictlyMime", "mailWarnOnSendAccelKey",
|
||||
"wrapLength", "sendDefaultCharsetList",
|
||||
"replyInDefaultCharset", "FontSelect",
|
||||
"fontSizeSelect", "textColor",
|
||||
"backgroundColor"];
|
||||
var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
|
||||
observerService.notifyObservers(null, "charsetmenu-selected", "mailedit");
|
||||
"mailWarnOnSendAccelKey", "wrapLength", "FontSelect",
|
||||
"fontSizeSelect", "textColor", "backgroundColor"];
|
||||
var gAutoSaveInterval;
|
||||
|
||||
function Startup()
|
||||
|
|
@ -78,6 +73,15 @@
|
|||
<groupbox align="start">
|
||||
<caption label="&sendingMessagesHeader.label;"/>
|
||||
|
||||
<vbox align="start">
|
||||
<checkbox id="spellCheckBeforeSend" label="&spellCheck.label;"
|
||||
prefstring="mail.SpellCheckBeforeSend"
|
||||
accesskey="&spellCheck.accesskey;"/>
|
||||
<checkbox id="inlineSpellCheck" label="&spellCheckInline.label;"
|
||||
prefstring="mail.spellcheck.inline"
|
||||
accesskey="&spellCheckInline.accesskey;"/>
|
||||
</vbox>
|
||||
|
||||
<hbox align="center">
|
||||
<checkbox id="autoSave" label="&autoSave.label;"
|
||||
prefstring="mail.compose.autosave"
|
||||
|
|
@ -88,48 +92,17 @@
|
|||
<label value="&autoSaveEnd.label;"/>
|
||||
</hbox>
|
||||
|
||||
<hbox align="center">
|
||||
<checkbox id="spellCheckBeforeSend" label="&spellCheck.label;"
|
||||
prefstring="mail.SpellCheckBeforeSend"
|
||||
accesskey="&spellCheck.accesskey;"/>
|
||||
|
||||
<checkbox id="inlineSpellCheck" label="&spellCheckInline.label;"
|
||||
prefstring="mail.spellcheck.inline"
|
||||
accesskey="&spellCheckInline.accesskey;"/>
|
||||
</hbox>
|
||||
|
||||
<checkbox id="strictlyMime" label="&useMIME.label;"
|
||||
prefstring="mail.strictly_mime"
|
||||
accesskey="&useMIME.accesskey;"/>
|
||||
<checkbox id="mailWarnOnSendAccelKey" label="&warnOnSendAccelKey.label;"
|
||||
prefstring="mail.warn_on_send_accel_key"
|
||||
accesskey="&warnOnSendAccelKey.accesskey;" />
|
||||
|
||||
<hbox align="center">
|
||||
<checkbox id="mailWarnOnSendAccelKey" label="&warnOnSendAccelKey.label;"
|
||||
prefstring="mail.warn_on_send_accel_key"
|
||||
accesskey="&warnOnSendAccelKey.accesskey;" />
|
||||
</hbox>
|
||||
|
||||
<hbox align="center">
|
||||
<label value="&wrapOutMsg.label;" accesskey="&wrapOutMsg.accesskey;" control="wrapLength"/>
|
||||
<textbox id="wrapLength" size="3" preftype="int"
|
||||
<label value="&wrapOutMsg.label;" accesskey="&wrapOutMsg.accesskey;" control="wrapLength"/>
|
||||
<textbox id="wrapLength" size="3" preftype="int"
|
||||
prefstring="mailnews.wraplength" prefattribute="value"/>
|
||||
<label value="&char.label;"/>
|
||||
</hbox>
|
||||
<label value="&char.label;"/>
|
||||
</hbox>
|
||||
|
||||
<hbox align="center">
|
||||
<label value="&sendDefaultCharset.label;" accesskey="&sendDefaultCharset.accesskey;"
|
||||
page="sendDefaultCharsetList" control="sendDefaultCharsetList"/>
|
||||
<menulist id="sendDefaultCharsetList" ref="NC:MaileditCharsetMenuRoot" datasources="rdf:charset-menu"
|
||||
preftype="localizedstring" prefstring="mailnews.send_default_charset">
|
||||
<template>
|
||||
<menupopup>
|
||||
<menuitem label="rdf:http://home.netscape.com/NC-rdf#Name" value="..." uri="..."/>
|
||||
</menupopup>
|
||||
</template>
|
||||
</menulist>
|
||||
</hbox>
|
||||
<checkbox id="replyInDefaultCharset" label="&replyInDefaultCharset.label;"
|
||||
prefstring="mailnews.reply_in_default_charset"
|
||||
accesskey="&replyInDefaultCharset.accesskey;"/>
|
||||
</groupbox>
|
||||
|
||||
<groupbox align="start">
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
<!ENTITY forwardReply.label "Forwarding Messages">
|
||||
<!ENTITY forwardMsg.label "Forward messages:">
|
||||
<!ENTITY inline.label "Inline">
|
||||
<!ENTITY inline.accesskey "I">
|
||||
<!ENTITY inline.accesskey "n">
|
||||
<!ENTITY asAttachment.label "As Attachment">
|
||||
<!ENTITY asAttachment.accesskey "A">
|
||||
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
<!-- LOCALIZATION NOTE (autoSave.label): This will concatenate with
|
||||
"xxx minutes", using a number and (autoSaveEnd.label). -->
|
||||
<!ENTITY autoSave.label "Automatically save the message every">
|
||||
<!ENTITY autoSave.accesskey "m">
|
||||
<!ENTITY autoSave.accesskey "u">
|
||||
<!ENTITY autoSaveEnd.label "minutes">
|
||||
<!ENTITY spellCheck.label "Check spelling before sending">
|
||||
<!ENTITY spellCheck.accesskey "C">
|
||||
|
|
@ -61,13 +61,6 @@
|
|||
<!ENTITY wrapOutMsg.label "Wrap plain text messages at">
|
||||
<!ENTITY wrapOutMsg.accesskey "W">
|
||||
<!ENTITY char.label "characters">
|
||||
<!ENTITY useMIME.label "For messages that contain 8-bit characters, use 'quoted printable' MIME encoding. Leave unchecked to send the messages as is.">
|
||||
<!ENTITY useMIME.accesskey "o">
|
||||
|
||||
<!ENTITY sendDefaultCharset.label "Default Character Encoding:">
|
||||
<!ENTITY sendDefaultCharset.accesskey "D">
|
||||
<!ENTITY replyInDefaultCharset.label "Always use this default character encoding in replies. (When unchecked, only new messages use this default.)">
|
||||
<!ENTITY replyInDefaultCharset.accesskey "r">
|
||||
|
||||
<!ENTITY defaultMessagesHeader.label "Defaults for HTML Messages">
|
||||
<!ENTITY font.label "Font:">
|
||||
|
|
|
|||
|
|
@ -69,6 +69,7 @@ messenger.jar:
|
|||
content/messenger/pref-viewing_messages.xul (base/prefs/resources/content/pref-viewing_messages.xul)
|
||||
content/messenger/pref-receipts.xul (base/prefs/resources/content/pref-receipts.xul)
|
||||
content/messenger/pref-receipts.js (base/prefs/resources/content/pref-receipts.js)
|
||||
content/messenger/pref-character_encoding.xul (base/prefs/resources/content/pref-character_encoding.xul)
|
||||
content/messenger/pref-offline.xul (base/prefs/resources/content/pref-offline.xul)
|
||||
content/messenger/AccountWizard.xul (base/prefs/resources/content/AccountWizard.xul)
|
||||
content/messenger/AccountWizard.js (base/prefs/resources/content/AccountWizard.js)
|
||||
|
|
@ -261,6 +262,7 @@ en-US.jar:
|
|||
locale/en-US/messenger/pref-notifications.dtd (base/prefs/resources/locale/en-US/pref-notifications.dtd)
|
||||
locale/en-US/messenger/pref-labels.dtd (base/prefs/resources/locale/en-US/pref-labels.dtd)
|
||||
locale/en-US/messenger/pref-receipts.dtd (base/prefs/resources/locale/en-US/pref-receipts.dtd)
|
||||
locale/en-US/messenger/pref-character_encoding.dtd (base/prefs/resources/locale/en-US/pref-character_encoding.dtd)
|
||||
locale/en-US/messenger/pref-viewing_messages.dtd (base/prefs/resources/locale/en-US/pref-viewing_messages.dtd)
|
||||
locale/en-US/messenger/pref-offline.dtd (base/prefs/resources/locale/en-US/pref-offline.dtd)
|
||||
locale/en-US/messenger/AccountManager.dtd (base/prefs/resources/locale/en-US/AccountManager.dtd)
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ var fm = {
|
|||
"chrome://communicator/content/pref/pref-scripts.xul": "advanced_pref_scripts",
|
||||
"chrome://messenger/content/pref-mailnews.xul": "mail_prefs_general",
|
||||
"chrome://messenger/content/pref-viewing_messages.xul": "mail_prefs_display",
|
||||
"chrome://messenger/content/pref-character_encoding.xul": "mail_prefs_character_encoding",
|
||||
"chrome://messenger/content/pref-notifications.xul": "mail_prefs_notifications",
|
||||
"chrome://messenger/content/messengercompose/pref-composing_messages.xul": "mail_prefs_messages",
|
||||
"chrome://messenger/content/messengercompose/pref-formatting.xul": "mail_prefs_formatting",
|
||||
|
|
|
|||
|
|
@ -444,7 +444,7 @@
|
|||
return this.getAttribute("color");
|
||||
]]></getter>
|
||||
<setter><![CDATA[
|
||||
this.mColorBox.setAttribute("style", "background-color: " + val);
|
||||
this.mColorBox.style.backgroundColor = val;
|
||||
return this.setAttribute("color", val);
|
||||
]]></setter>
|
||||
</property>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче