mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix for bugs 38092 & 37931. R/A: ducarroz, QA: laurel.

This commit is contained in:
dianesun%netscape.com 2000-09-02 01:11:49 +00:00
Родитель d817ceef9a
Коммит 51669574ed
11 изменённых файлов: 67 добавлений и 60 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
mailnews/addrbook/prefs/resources/locale/en-US/pref-addressing.dtd
Просмотреть файл

@ -18,8 +18,8 @@ Communications Corporation. Portions created by Netscape are
Rights Reserved.
-->
<!ENTITY window.title "Addressing">
<!ENTITY pane.title "Addressing">
<!ENTITY window.title "Address Books">
<!ENTITY pane.title "Address Books">
<!ENTITY pane.description "Settings for addressing messages">
<!ENTITY pinpoint.label "Pinpoint Addressing">
<!ENTITY lookFor.label "Look for addresses in the following:">
@ -40,9 +40,9 @@ Rights Reserved.
<!ENTITY emailCollectionOutgoingEnable.label "Outgoing Messages">
<!ENTITY emailCollectionTypeText.label "Save email addresses from my:">
<!ENTITY emailCollectiontitle.label "Email Address Collection">
<!ENTITY emailCollectiontext.label "Email Address Collection saves the email addresses from your incoming and/or outgoing mail and stores them in a local address book, Collected Addresses.">
<!ENTITY emailCollectiontext.label "Email Address Collection saves the email addresses from your incoming and/or outgoing mail and stores them in a local address book, 'Collected Addresses'.">
<!-- Autocompletion -->
<!ENTITY addressingTitle.label "Address Autocompletion">
<!ENTITY addressingTitle.label "Addressing Messages">
<!ENTITY addressingText.label "When you address messages, Mail can autocomplete addresses for you by looking for matching entries in your address books, or showing you a list of possible matches.">
<!ENTITY addressingEnable.label "Enable address autocompletion">

6
mailnews/base/prefs/resources/content/pref-mailnews.xul
Просмотреть файл

@ -39,7 +39,7 @@
<html>&chooseExp.label;</html>
<separator class="thin"/>
<checkbox id="mailnewsConfirmMoveFoldersToTrash" value="&confirmMove.label;" accesskey="&confirmMove.label;"
<checkbox id="mailnewsConfirmMoveFoldersToTrash" value="&confirmMove.label;"
pref="true" preftype="bool" prefstring="mailnews.confirm.moveFoldersToTrash"
prefattribute="checked"/>
@ -48,11 +48,11 @@
<titledbox orient="vertical">
<title><text value="&messengerStartPage.label;"/></title>
<checkbox allowevents="true" id="mailnewsStartPageEnabled" value="&enableStartPage.label;" accesskey="&enableStartPage.accesskey;"
<checkbox allowevents="true" id="mailnewsStartPageEnabled" value="&enableStartPage.label;"
pref="true" preftype="bool" prefstring="mailnews.start_page_enabled"
prefattribute="checked"/>
<box autostretch="never" class="indent">
<text class="label" value="&location.label;" accesskey="&location.label;" for="mailnews.start_page.url"/>
<text class="label" value="&location.label;" accesskey="&location.accesskey;" for="mailnews.start_page.url"/>
<textfield id="mailnewsStartPageUrl" flex="1" pref="true" preftype="string"
prefstring="mailnews.start_page.url" prefattribute="value"/>
</box>

20
mailnews/base/prefs/resources/content/pref-viewing_messages.xul
Просмотреть файл

@ -60,14 +60,14 @@
<titledbox orient="vertical">
<title><text value="&displayWidth.label;"/></title>
<box orient="horizontal">
<html>&plainText.label;</html>
<box orient="horizontal" class="indent">
<radiogroup id="mailFixedWidthMessages" orient="vertical" autostretch="never"
pref="true" preftype="bool" prefstring="mail.fixed_width_messages"
prefattribute="data">
<radio group="mailFixedWidthMessages" data="true" value="&fixedWidth.label;" accesskey="&fixedWidth.accesskey;"/>
<radio group="mailFixedWidthMessages" data="false" value="&variableWidth.label;" accesskey="&variableWidth.accesskey;"/>
<radio group="mailFixedWidthMessages" data="true" value="&fixedWidth.label;"/>
<radio group="mailFixedWidthMessages" data="false" value="&variableWidth.label;"/>
</radiogroup>
</box>
@ -85,7 +85,7 @@
</menupopup>
</menulist>
<text class="label" value="&size.label;" accesskey="&size.label;" for="mailQuotedSize"/>
<text class="label" value="&size.label;" accesskey="&size.accesskey;" for="mailQuotedSize"/>
<menulist id="mailQuotedSize" pref="true" preftype="int" prefstring="mail.quoted_size"
prefattribute="data">
<menupopup>
@ -95,7 +95,7 @@
</menupopup>
</menulist>
<text class="label" value="&color.label;"/>
<text class="label" value="&color.label;" accesskey="&color.accesskey;"/>
<menu id="citationmenu" allowevents="true" class="colorpicker">
<titledbutton class="popup" align="right"/>
<html:div style="width:30px; background-color:white"/>
@ -109,20 +109,20 @@
<separator class="thin"/>
<html>&viewingPlainText.label;</html>
<box orient="vertical" class="indent">
<checkbox id="wrapLongLines" value="&wrapInMsg.label;" accesskey="&wrapInMsg.accesskey;"
<checkbox id="wrapLongLines" value="&wrapInMsg.label;"
pref="true" preftype="bool" prefstring="mail.wrap_long_lines"
prefattribute="checked"/>
<checkbox class="iconic" id="displayGlyph" value="&convertEmoticons.label;" accesskey="&convertEmoticons.accesskey;"
<checkbox class="iconic" id="displayGlyph" value="&convertEmoticons.label;"
pref="true" preftype="bool" prefstring="mail.display_glyph"
prefattribute="checked" tooltip="aTooltip" tooltiptext="&convertEmoticons.tooltip;"/>
</box>
</titledbox>
<titledbox orient="vertical" autostretch="never">
<title><text value="&languages.label;"/></title>
<title><text value="&languagesTitle.label;"/></title>
<html>&coding.label;</html>
<box autostretch="never" class="indent">
<text class="label" value="&sendDefaultCharset.label;" for="sendDefaultCharsetList"/>
<text class="label" value="&sendDefaultCharset.label;" accesskey="&sendDefaultCharset.accesskey;" for="sendDefaultCharsetList"/>
<menulist id="sendDefaultCharsetList" ref="NC:MaileditCharsetMenuRoot" datasources="rdf:charset-menu"
pref="true" preftype="string" prefstring="mailnews.view_default_charset"
prefattribute="data">
@ -133,7 +133,7 @@
</template>
</menulist>
</box>
<checkbox id="forceCharsetOverride" value="&forceCharsetOverride.label;" accesskey="&forceCharsetOverride.accesskey;"
<checkbox id="forceCharsetOverride" value="&forceCharsetOverride.label;"
pref="true" preftype="bool" prefstring="mailnews.force_charset_override"
prefattribute="checked"/>
</titledbox>

2
mailnews/base/prefs/resources/locale/en-US/mailPrefsOverlay.dtd
Просмотреть файл

@ -10,6 +10,6 @@
<!ENTITY address.label "Address Book">
<!ENTITY viewingMessages.label "Message Display">
<!ENTITY composingMessages.label "Message Composition">
<!ENTITY format.label "Sending Format">
<!ENTITY format.label "Send Format">
<!ENTITY return.label "Return Receipts">
<!ENTITY disk.label "Disk Space">

10
mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd
Просмотреть файл

@ -21,18 +21,18 @@ Rights Reserved.
<!ENTITY pane.title "Mail and Newsgroups">
<!ENTITY pane.description "General Mail/News settings">
<!ENTITY windowSettings.label "Window Settings">
<!ENTITY windowSettings.label "General Settings">
<!ENTITY selectWindowLayout.label "Select the window layout you prefer for Mail:">
<!ENTITY chooseExp.label "Note: For this setting to take effect, you will need to exit and then restart Mail.">
<!ENTITY playSound.label "Play a sound when new messages arrive">
<!ENTITY playSound.accesskey "p">
<!ENTITY confirmMove.label "Confirm when moving folders to the trash">
<!ENTITY confirmMove.accesskey "m">
<!ENTITY confirmMove.label "Confirm when moving folders to the Trash">
<!ENTITY confirmMove.accesskey "c">
<!ENTITY useMessenger.label "Use Mail from MAPI-based applications">
<!ENTITY useMessenger.accesskey "u">
<!ENTITY messengerStartPage.label "Mail Start Page">
<!ENTITY enableStartPage.label "When Mail launches, show the start page in the message area">
<!ENTITY enableStartPage.accesskey "t">
<!ENTITY enableStartPage.label "When Mail launches, show the Start Page in the message area">
<!ENTITY enableStartPage.accesskey "w">
<!ENTITY location.label "Location:">
<!ENTITY location.accesskey "l">
<!ENTITY useDefault.label "Restore Default">

19
mailnews/base/prefs/resources/locale/en-US/pref-viewing_messages.dtd
Просмотреть файл

@ -22,29 +22,30 @@ Rights Reserved.
<!ENTITY pane.description "Settings for message display">
<!ENTITY textBegin.label "Quoted plain text appearance">
<!ENTITY style.label "Style:">
<!ENTITY style.accesskey "y">
<!ENTITY style.accesskey "t">
<!ENTITY regular.label "Regular">
<!ENTITY bold.label "Bold">
<!ENTITY italic.label "Italic">
<!ENTITY boldItalic.label "Bold Italic">
<!ENTITY size.label "Size:">
<!ENTITY size.accesskey "z">
<!ENTITY size.accesskey "s">
<!ENTITY regular.label "Regular">
<!ENTITY bigger.label "Bigger">
<!ENTITY smaller.label "Smaller">
<!ENTITY color.label "Color:">
<!ENTITY color.accesskey "c">
<!ENTITY displayWidth.label "Plain Text Messages">
<!ENTITY plainText.label "Display plain text messages using:">
<!ENTITY displayText.label "Settings for displaying quoted plain text messages:">
<!ENTITY plainText.label "Use this font when displaying plain text messages:">
<!ENTITY displayText.label "Use the following settings when displaying quoted plain text messages:">
<!ENTITY viewingPlainText.label "When viewing plain text messages:">
<!ENTITY languages.label "Languages">
<!ENTITY coding.label "Default character coding for viewing messages:">
<!ENTITY languagesTitle.label "Languages">
<!ENTITY coding.label "Use the following character coding as the default for viewing messages:">
<!ENTITY sendDefaultCharset.label "Character Coding:">
<!ENTITY sendDefaultCharset.accesskey "h">
<!ENTITY forceCharsetOverride.label "Apply default to all messages (ignore character coding specified by MIME header).">
<!ENTITY forceCharsetOverride.accesskey "i">
<!ENTITY forceCharsetOverride.accesskey "p">
<!ENTITY fixedWidth.label "Fixed width font">
<!ENTITY fixedWidth.accesskey "x">
<!ENTITY fixedWidth.accesskey "f">
<!ENTITY variableWidth.label "Variable width font">
<!ENTITY variableWidth.accesskey "v">
<!ENTITY readingMessagesHeader.label "For incoming messages">
@ -53,7 +54,7 @@ Rights Reserved.
<!ENTITY wrapInMsg.accesskey "w">
<!-- LOCALIZATION NOTE : (emoticonsAndStructs.label) 'Emoticons' are also known as 'Smileys', e.g. :-) -->
<!ENTITY convertEmoticons.label "Display emoticons as graphics.">
<!ENTITY convertEmoticons.accesskey "c">
<!ENTITY convertEmoticons.accesskey "d">
<!-- Tooltips -->
<!ENTITY convertEmoticons.tooltip "Convert Emoticons">

8
mailnews/compose/prefs/resources/content/pref-composing_messages.xul
Просмотреть файл

@ -56,7 +56,7 @@
</menulist>
</box>
<checkbox id="autoQuote" value="&autoQuote.label;" accesskey="&autoQuote.accesskey;"
<checkbox id="autoQuote" value="&autoQuote.label;"
pref="true" preftype="bool" prefstring="mail.auto_quote"
prefattribute="checked" oncommand="doEnabling();"/>
<box class="indent" autostretch="never" id="thenBox">
@ -77,11 +77,11 @@
<titledbox orient="vertical" autostretch="never">
<title><text value="&sendingMessagesHeader.label;"/></title>
<checkbox id="spellCheckBeforeSend" value="&spellCheck.label;" accesskey="&spellCheck.accesskey;"
<checkbox id="spellCheckBeforeSend" value="&spellCheck.label;"
pref="true" preftype="bool" prefstring="mail.SpellCheckBeforeSend"
prefattribute="checked"/>
<checkbox id="strictlyMime" value="&useMIME.label;" accesskey="&useMIME.accesskey;"
<checkbox id="strictlyMime" value="&useMIME.label;"
pref="true" preftype="bool" prefstring="mail.strictly_mime"
prefattribute="checked"/>
@ -93,7 +93,7 @@
</box>
<box autostretch="never">
<text class="label" value="&sendDefaultCharset.label;" for="sendDefaultCharsetList"/>
<text class="label" value="&sendDefaultCharset.label;" accesskey="&sendDefaultCharset.accesskey;" for="sendDefaultCharsetList"/>
<menulist id="sendDefaultCharsetList" ref="NC:MaileditCharsetMenuRoot" datasources="rdf:charset-menu"
pref="true" preftype="string" prefstring="mailnews.send_default_charset"
prefattribute="data">

11
mailnews/compose/prefs/resources/content/pref-formatting.xul
Просмотреть файл

@ -24,15 +24,18 @@
<radiogroup id="mailDefaultHTMLAction" orient="vertical" autostretch="never"
pref="true" preftype="int" prefstring="mail.default_html_action"
prefattribute="data">
<radio group="mailDefaultHTMLAction" data="0" value="&askMe.label;" accesskey="&askMe.accesskey;"/>
<radio group="mailDefaultHTMLAction" data="1" value="&convertPlain.label;" accesskey="&convertPlain.accesskey;"/>
<radio group="mailDefaultHTMLAction" data="2" value="&sendHTML.label;" accesskey="&sendHTML.accesskey;"/>
<radio group="mailDefaultHTMLAction" data="3" value="&sendBoth.label;" accesskey="&sendBoth.accesskey;"/>
<radio group="mailDefaultHTMLAction" data="0" value="&askMe.label;"/>
<radio group="mailDefaultHTMLAction" data="1" value="&convertPlain.label;"/>
<radio group="mailDefaultHTMLAction" data="2" value="&sendHTML.label;"/>
<radio group="mailDefaultHTMLAction" data="3" value="&sendBoth.label;"/>
</radiogroup>
<separator/>
<html>&override.label;</html>
<separator/>
<html>&receiveHTML.label;</html>
</titledbox>
</window>

16
mailnews/compose/prefs/resources/content/pref-messages.xul
Просмотреть файл

@ -27,7 +27,7 @@
</menulist>
</box>
<checkbox id="autoQuote" value="&autoQuote.label;" accesskey="&autoQuote.accesskey;"
<checkbox id="autoQuote" value="&autoQuote.label;"
pref="true" preftype="bool" prefstring="mail.auto_quote"
prefattribute="checked"/>
<box autostretch="never">
@ -48,13 +48,13 @@
<titledbox orient="vertical" autostretch="never">
<title><text value="&readingMessagesHeader.label;"/></title>
<checkbox id="wrapLongLines" value="&wrapInMsg.label;" accesskey="&wrapInMsg.accesskey;"
<checkbox id="wrapLongLines" value="&wrapInMsg.label;"
pref="true" preftype="bool" prefstring="mail.wrap_long_lines"
prefattribute="checked"/>
<checkbox id="displayGlyph" value="&convertEmoticons.label;" accesskey="&convertEmoticons.accesskey;"
<checkbox id="displayGlyph" value="&convertEmoticons.label;"
pref="true" preftype="bool" prefstring="mail.display_glyph"
prefattribute="checked"/>
<checkbox id="displayStruct" value="&convertStructs.label;" accesskey="&convertStructs.accesskey;"
<checkbox id="displayStruct" value="&convertStructs.label;"
pref="true" preftype="bool" prefstring="mail.display_struct"
prefattribute="checked"/>
</titledbox>
@ -63,10 +63,10 @@
<titledbox orient="vertical">
<title><text value="&sendingMessagesHeader.label;"/></title>
<checkbox id="spellCheckBeforeSend" value="&spellCheck.label;" accesskey="&spellCheck.accesskey;"
<checkbox id="spellCheckBeforeSend" value="&spellCheck.label;"
pref="true" preftype="bool" prefstring="mail.SpellCheckBeforeSend"
prefattribute="checked"/>
<checkbox id="sendStruct" value="&convertStructs.label;" accesskey="&convertStructs.accesskey;"
<checkbox id="sendStruct" value="&convertStructs.label;"
pref="true" preftype="bool" prefstring="mail.send_struct"
prefattribute="checked"/>
<box autostretch="never">
@ -80,8 +80,8 @@
<radiogroup id="strictlyMime" orient="vertical" autostretch="never"
pref="true" preftype="bool" prefstring="mail.strictly_mime"
prefattribute="data">
<radio group="strictlyMime" data="false" value="&asIs.label;" accesskey="&asIs.accesskey;"/>
<radio group="strictlyMime" data="true" value="&useMIME.label;" accesskey="&useMIME.accesskey;"/>
<radio group="strictlyMime" data="false" value="&asIs.label;"/>
<radio group="strictlyMime" data="true" value="&useMIME.label;"/>
</radiogroup>
</titledbox>

16
mailnews/compose/prefs/resources/locale/en-US/pref-composing_messages.dtd
Просмотреть файл

@ -18,7 +18,7 @@ Communications Corporation. Portions created by Netscape are
Rights Reserved.
-->
<!ENTITY pane.title "Composing Messages">
<!ENTITY pane.title "Message Composition">
<!ENTITY pane.description "Composing mail messages">
<!ENTITY forwardReply.label "Forwarding and replying to messages">
<!ENTITY forwardMsg.label "Forward messages:">
@ -32,8 +32,8 @@ Rights Reserved.
<!ENTITY autoQuote.label "Automatically quote the original message when replying">
<!ENTITY autoQuote.accesskey "u">
<!-- LOCALIZATION NOTE (then.label): This will concatenate with the 4 strings that follow. -->
<!ENTITY then.label "then,">
<!ENTITY then.accesskey "h">
<!ENTITY then.label "Then,">
<!ENTITY then.accesskey "t">
<!ENTITY aboveQuote.label "start my reply above the quoted text">
<!ENTITY aboveQuote.accesskey "v">
<!ENTITY belowQuote.label "start my reply below the quoted text">
@ -50,7 +50,7 @@ Rights Reserved.
<!ENTITY sendingMessagesHeader.label "Composing Messages">
<!ENTITY spellCheck.label "Check spelling before sending">
<!ENTITY spellCheck.accesskey "p">
<!ENTITY spellCheck.accesskey "c">
<!-- LOCALIZATION NOTE (wrapOutMsg.label): This will concatenate with "xxx characters", using a number and (char.label). -->
<!ENTITY wrapOutMsg.label "Wrap plain text messages at">
<!ENTITY wrapOutMsg.accesskey "l">
@ -59,9 +59,11 @@ Rights Reserved.
<!ENTITY asIs.label "As is (does not work well with some mail servers)">
<!ENTITY asIs.accesskey "t">
<!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 "m">
<!ENTITY useMIME.accesskey "o">
<!ENTITY sendDefaultCharset.label "Default Character Coding:">
<!ENTITY languages.label "Languages">
<!ENTITY sendDefaultCharset.label "Character Coding:">
<!ENTITY sendDefaultCharset.accesskey "h">
<!ENTITY languagesTitle.label "Languages">
<!ENTITY languagesText.label "Use the following character coding as the default for composing messages:">
<!-- Tooltips -->

11
mailnews/compose/prefs/resources/locale/en-US/pref-formatting.dtd
Просмотреть файл

@ -18,15 +18,16 @@ Communications Corporation. Portions created by Netscape are
Rights Reserved.
-->
<!ENTITY pane.title "Sending Format">
<!ENTITY pane.title "Send Format">
<!ENTITY pane.description "Message formatting">
<!ENTITY sendMail.label "You can specify how Mail sends HTML messages to recipients that are not listed as being able to receive them:">
<!ENTITY sendMail.label "When sending messages in HTML format and one or more recipients are not listed as being able to receive HTML:">
<!ENTITY askMe.label "Ask me what to do (Mail prompts you to choose a format)">
<!ENTITY askMe.accesskey "a">
<!ENTITY convertPlain.label "Convert the message to plain text (some formatting may be lost)">
<!ENTITY convertPlain.accesskey "p">
<!ENTITY convertPlain.accesskey "c">
<!ENTITY sendHTML.label "Send the message in HTML anyway (some mail programs may not be able to display it)">
<!ENTITY sendHTML.accesskey "h">
<!ENTITY sendHTML.accesskey "s">
<!ENTITY sendBoth.label "Send the message in both plain text and HTML (larger message size)">
<!ENTITY sendBoth.accesskey "s">
<!ENTITY sendBoth.accesskey "e">
<!ENTITY override.label "You can override these settings for individual messages by using the Options menu in the Mail Compose window.">
<!ENTITY receiveHTML.label "If you know a particular recipient can reveive HTML mail, unckeck the 'Send email as plain text(no HTML)' checkbox on hte recipients's Address Book card.">