Bug 289444 Give prefs panels titles a unique name (mailnews patch)

r=mnyromyr sr=neil.parkwaycc.co.uk
This commit is contained in:
bugzilla%arlen.demon.co.uk 2005-09-10 15:51:19 +00:00
Родитель fbbf3b86c3
Коммит 11e043103d
20 изменённых файлов: 45 добавлений и 236 удалений

Просмотреть файл

@ -8,7 +8,7 @@
xmlns:nc="http://home.netscape.com/NC-rdf#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
onload="onLoad();"
headertitle="&pane.title;">
headertitle="&pref.addressing.title;">
<script type="application/x-javascript" src="chrome://messenger/content/addressbook/pref-directory.js"/>
<script type="application/x-javascript">

Просмотреть файл

@ -42,7 +42,7 @@
<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
title="&window.title;"
title="&pref.ldap.window.title;"
buttons="accept,cancel,help"
onload="onInitEditDirectories();"
ondialogaccept="return onAccept();"

Просмотреть файл

@ -1,56 +0,0 @@
<!-- ***** BEGIN LICENSE BLOCK *****
Version: MPL 1.1/GPL 2.0/LGPL 2.1
The contents of this file are subject to the Mozilla Public License Version
1.1 (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.mozilla.org/MPL/
Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
for the specific language governing rights and limitations under the
License.
The Original Code is Mozilla Communicator client code, released
March 31, 1998.
The Initial Developer of the Original Code is
Netscape Communications Corporation.
Portions created by the Initial Developer are Copyright (C) 1998-1999
the Initial Developer. All Rights Reserved.
Contributor(s):
Alternatively, the contents of this file may be used under the terms of
either of the GNU General Public License Version 2 or later (the "GPL"),
or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
in which case the provisions of the GPL or the LGPL are applicable instead
of those above. If you wish to allow use of your version of this file only
under the terms of either the GPL or the LGPL, and not to allow others to
use your version of this file under the terms of the MPL, indicate your
decision by deleting the provisions above and replace them with the notice
and other provisions required by the GPL or the LGPL. If you do not delete
the provisions above, a recipient may use your version of this file under
the terms of any one of the MPL, the GPL or the LGPL.
***** END LICENSE BLOCK ***** -->
<!ENTITY pane.title "Addressing">
<!ENTITY emailCollectiontitle.label "Email Address Collection">
<!ENTITY emailCollectionPicker.label "Add email addresses to my:">
<!ENTITY emailCollectionPicker.accesskey "m">
<!ENTITY emailCollectiontext.label "Email addresses from outgoing messages can be automatically added to a local address book.">
<!-- Autocompletion -->
<!ENTITY addressingTitle.label "Address Autocompletion">
<!ENTITY highlightNonMatches.label "Highlight addresses that do not autocomplete">
<!ENTITY highlightNonMatches.accesskey "a">
<!ENTITY addressingEnable.label "Local Address Books">
<!ENTITY addressingEnable.accesskey "L">
<!ENTITY autocompleteText.label "When addressing messages, look for matching entries in:">
<!ENTITY directories.label "Directory Server:">
<!ENTITY directories.accesskey "D">
<!ENTITY editDirectories.label "Edit Directories...">
<!ENTITY editDirectories.accesskey "E">
<!ENTITY matchText.label "If there is a match in your local address books:">
<!ENTITY skipDirectory.label "Do not search in the directory">

Просмотреть файл

@ -1,54 +0,0 @@
<!-- ***** BEGIN LICENSE BLOCK *****
Version: MPL 1.1/GPL 2.0/LGPL 2.1
The contents of this file are subject to the Mozilla Public License Version
1.1 (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.mozilla.org/MPL/
Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
for the specific language governing rights and limitations under the
License.
The Original Code is Mozilla Communicator client code, released
March 31, 1998.
The Initial Developer of the Original Code is
Netscape Communications Corporation.
Portions created by the Initial Developer are Copyright (C) 1998-1999
the Initial Developer. All Rights Reserved.
Contributor(s):
Alternatively, the contents of this file may be used under the terms of
either of the GNU General Public License Version 2 or later (the "GPL"),
or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
in which case the provisions of the GPL or the LGPL are applicable instead
of those above. If you wish to allow use of your version of this file only
under the terms of either the GPL or the LGPL, and not to allow others to
use your version of this file under the terms of the MPL, indicate your
decision by deleting the provisions above and replace them with the notice
and other provisions required by the GPL or the LGPL. If you do not delete
the provisions above, a recipient may use your version of this file under
the terms of any one of the MPL, the GPL or the LGPL.
***** END LICENSE BLOCK ***** -->
<!-- LOCALIZATION NOTE (window.title) : do not translate "LDAP" in below line -->
<!ENTITY window.title "LDAP Directory Servers">
<!ENTITY pane.title "Directory">
<!ENTITY directory.label "Add a directory">
<!-- LOCALIZATION NOTE (directories.label) : do not translate "LDAP" in below line -->
<!ENTITY directories.label "LDAP Directory Server:">
<!-- LOCALIZATION NOTE (directoriesText.label) : do not translate "LDAP" in below line -->
<!ENTITY directoriesText.label "Select an LDAP Directory Server:">
<!ENTITY directoriesText.accesskey "S">
<!-- LOCALIZATION NOTE (autocomplete.title) : do not translate "LDAP" in below line -->
<!ENTITY autocomplete.title "LDAP Directory Server">
<!ENTITY addDirectory.label "Add">
<!ENTITY addDirectory.accesskey "a">
<!ENTITY editDirectory.label "Edit">
<!ENTITY editDirectory.accesskey "e">
<!ENTITY deleteDirectory.label "Delete">
<!ENTITY deleteDirectory.accesskey "d">

Просмотреть файл

@ -48,7 +48,7 @@
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="parent.initPanel('chrome://messenger/content/pref-labels.xul');"
headertitle="&pane.title;">
headertitle="&pref.labels.title;">
<popupset id="aTooltipSet"/>
@ -61,7 +61,7 @@
<script type="application/x-javascript" src="chrome://messenger/content/pref-labels.js"/>
<groupbox>
<caption label="&labelsSettings.label;"/>
<caption label="&labelsSettings.caption;"/>
<description>&displayText.label;</description>

Просмотреть файл

@ -46,7 +46,7 @@
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="parent.initPanel('chrome://messenger/content/pref-mailnews.xul');"
headertitle="&pane.title;">
headertitle="&pref.mailnews.title;">
<script type="application/x-javascript" src="chrome://messenger/content/pref-mailnews.js"/>

Просмотреть файл

@ -46,7 +46,7 @@
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="parent.initPanel('chrome://messenger/content/pref-notifications.xul');"
headertitle="&pane.title;"
headertitle="&pref.notifications.title;"
id="mailNotificationsPage">
<script type="application/x-javascript" src="chrome://messenger/content/pref-notifications.js"/>

Просмотреть файл

@ -47,7 +47,7 @@
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="parent.initPanel('chrome://messenger/content/pref-offline.xul');"
headertitle="&boxHeader;">
headertitle="&pref.offline.title;">
<script type="application/x-javascript">
<![CDATA[
@ -71,7 +71,7 @@
</script>
<groupbox>
<caption label="&rHeader;"/>
<caption label="&pref.offline.caption;"/>
<label value="&textStartUp;"/>
<radiogroup id="whenStartingUp" class="indent"

Просмотреть файл

@ -44,7 +44,7 @@
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="parent.initPanel('chrome://messenger/content/pref-receipts.xul');"
headertitle="&pane.title;">
headertitle="&pref.receipts.title;">
<script type="application/x-javascript">
<![CDATA[
@ -56,7 +56,7 @@
<groupbox>
<caption label="&pane.title;"/>
<caption label="&pref.receipts.caption;"/>
<vbox id="returnReceiptSettings" align="start">
<checkbox id="alwaysRequest" label="&requestReceipt.label;"

Просмотреть файл

@ -7,7 +7,7 @@
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="parent.initPanel('chrome://messenger/content/pref-viewing_messages.xul');"
headertitle="&pane.title;">
headertitle="&pref.viewing.messages.title;">
<script type="application/x-javascript">
<![CDATA[

Просмотреть файл

@ -35,8 +35,8 @@
-
- ***** END LICENSE BLOCK ***** -->
<!ENTITY pane.title "Labels">
<!ENTITY labelsSettings.label "Customize Labels">
<!ENTITY pref.labels.title "Labels">
<!ENTITY labelsSettings.caption "Customize Labels">
<!ENTITY displayText.label "Labels can be used to categorize and prioritize your messages. Modify the appearance of Labels using the settings below.">
<!ENTITY restoreDefaults.label "Restore Defaults">
<!ENTITY restoreDefaults.accesskey "R">

Просмотреть файл

@ -35,7 +35,7 @@
***** END LICENSE BLOCK ***** -->
<!ENTITY pane.title "Mail &amp; Newsgroups">
<!ENTITY pref.mailnews.title "Mail &amp; Newsgroups">
<!ENTITY generalSettings.label "General Settings">
<!ENTITY confirmMove.label "Confirm when moving folders to the Trash">
<!ENTITY confirmMove.accesskey "C">

Просмотреть файл

@ -35,7 +35,7 @@
***** END LICENSE BLOCK ***** -->
<!ENTITY pane.title "Notifications">
<!ENTITY pref.notifications.title "Notifications">
<!ENTITY newMessagesArrive.label "When new messages arrive:">
<!ENTITY playSound.label "Play a sound">
<!ENTITY playSound.accesskey "P">

Просмотреть файл

@ -1,28 +1,28 @@
<!-- extracted from content/pref-offline.xul -->
<!--LOCALIZATION NOTE : FILE The 'Offline' preferences dialog -->
<!ENTITY boxHeader "Offline &amp; Disk Space">
<!ENTITY rHeader "Offline">
<!ENTITY textStartUp "When starting up:">
<!ENTITY radioRememberPrevState "Remember previous online state">
<!ENTITY pref.offline.title "Offline &amp; Disk Space">
<!ENTITY pref.offline.caption "Offline">
<!ENTITY textStartUp "When starting up:">
<!ENTITY radioRememberPrevState "Remember previous online state">
<!ENTITY radioRememberPrevState.accesskey "R">
<!ENTITY radioAskMe "Ask me for online state at startup">
<!ENTITY radioAskMe.accesskey "A">
<!ENTITY textGoingOnline "Send unsent messages when going online?">
<!ENTITY radioAutoSend "Yes">
<!ENTITY radioAutoSend.accesskey "Y">
<!ENTITY radioNotSend "No">
<!ENTITY radioNotSend.accesskey "N">
<!ENTITY radioAskUnsent "Ask me">
<!ENTITY radioAskUnsent.accesskey "s">
<!ENTITY textGoingOffline "Download messages for offline use when going offline?">
<!ENTITY radioAutoDownload "Yes">
<!ENTITY radioAutoDownload.accesskey "e">
<!ENTITY radioNotDownload "No">
<!ENTITY radioNotDownload.accesskey "o">
<!ENTITY radioAskDownload "Ask me">
<!ENTITY radioAskDownload.accesskey "k">
<!ENTITY Diskspace "Disk Space">
<!ENTITY offlineCompact.label "Compact folders when it will save over">
<!ENTITY offlineCompact.accesskey "C">
<!ENTITY kb.label "KB">
<!ENTITY radioAskMe "Ask me for online state at startup">
<!ENTITY radioAskMe.accesskey "A">
<!ENTITY textGoingOnline "Send unsent messages when going online?">
<!ENTITY radioAutoSend "Yes">
<!ENTITY radioAutoSend.accesskey "Y">
<!ENTITY radioNotSend "No">
<!ENTITY radioNotSend.accesskey "N">
<!ENTITY radioAskUnsent "Ask me">
<!ENTITY radioAskUnsent.accesskey "s">
<!ENTITY textGoingOffline "Download messages for offline use when going offline?">
<!ENTITY radioAutoDownload "Yes">
<!ENTITY radioAutoDownload.accesskey "e">
<!ENTITY radioNotDownload "No">
<!ENTITY radioNotDownload.accesskey "o">
<!ENTITY radioAskDownload "Ask me">
<!ENTITY radioAskDownload.accesskey "k">
<!ENTITY Diskspace "Disk Space">
<!ENTITY offlineCompact.label "Compact folders when it will save over">
<!ENTITY offlineCompact.accesskey "C">
<!ENTITY kb.label "KB">

Просмотреть файл

@ -36,8 +36,8 @@
***** END LICENSE BLOCK ***** -->
<!-- LOCALIZATION NOTE pref-receipts.dtd: UI for Mail/News Return Receipts prefs -->
<!ENTITY pane.title "Return Receipts">
<!ENTITY pane.description "Settings for requesting or returning receipts">
<!ENTITY pref.receipts.title "Return Receipts">
<!ENTITY pref.receipts.caption "Return Receipts">
<!ENTITY requestReceipt.label "When sending messages, always request a return receipt">
<!ENTITY requestReceipt.accesskey "W">
<!-- LOCALIZATION NOTE dsn.label: don't translate "DSN" -->

Просмотреть файл

@ -36,8 +36,7 @@
***** END LICENSE BLOCK ***** -->
<!ENTITY pane.title "Message Display">
<!ENTITY pane.description "Settings for message display">
<!ENTITY pref.viewing.messages.title "Message Display">
<!ENTITY style.label "Style:">
<!ENTITY style.accesskey "t">
<!ENTITY regular.label "Regular">

Просмотреть файл

@ -11,7 +11,7 @@
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="populateFonts();parent.initPanel('chrome://messenger/content/messengercompose/pref-composing_messages.xul');"
headertitle="&pane.title;">
headertitle="&pref.composing.messages.title;">
<script type="application/x-javascript">
<![CDATA[

Просмотреть файл

@ -6,7 +6,7 @@
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="Init()"
headertitle="&pane.title;">
headertitle="&pref.formatting.title;">
<script type="application/x-javascript">
<![CDATA[

Просмотреть файл

@ -36,7 +36,7 @@
***** END LICENSE BLOCK ***** -->
<!ENTITY pane.title "Composition">
<!ENTITY pref.composing.messages.title "Composition">
<!ENTITY forwardReply.label "Forwarding Messages">
<!ENTITY forwardMsg.label "Forward messages:">
<!ENTITY inline.label "Inline">

Просмотреть файл

@ -1,80 +0,0 @@
<!-- ***** BEGIN LICENSE BLOCK *****
Version: MPL 1.1/GPL 2.0/LGPL 2.1
The contents of this file are subject to the Mozilla Public License Version
1.1 (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.mozilla.org/MPL/
Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
for the specific language governing rights and limitations under the
License.
The Original Code is Mozilla Communicator client code, released
March 31, 1998.
The Initial Developer of the Original Code is
Netscape Communications Corporation.
Portions created by the Initial Developer are Copyright (C) 1998-1999
the Initial Developer. All Rights Reserved.
Contributor(s):
Alternatively, the contents of this file may be used under the terms of
either of the GNU General Public License Version 2 or later (the "GPL"),
or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
in which case the provisions of the GPL or the LGPL are applicable instead
of those above. If you wish to allow use of your version of this file only
under the terms of either the GPL or the LGPL, and not to allow others to
use your version of this file under the terms of the MPL, indicate your
decision by deleting the provisions above and replace them with the notice
and other provisions required by the GPL or the LGPL. If you do not delete
the provisions above, a recipient may use your version of this file under
the terms of any one of the MPL, the GPL or the LGPL.
***** END LICENSE BLOCK ***** -->
<!ENTITY pane.title "Send Format">
<!ENTITY pane.description "Message formatting">
<!ENTITY sendMail.label "Send Format">
<!ENTITY sendMaildesc.label "When sending formatted (HTML) messages 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 "k">
<!ENTITY convertPlain.label "Convert the message to plain text (some formatting may be lost)">
<!ENTITY convertPlain.accesskey "c">
<!ENTITY sendHTML.label "Send the message as formatted text (HTML) anyway (some mail programs may not be able to display it)">
<!ENTITY sendHTML.accesskey "s">
<!ENTITY sendBoth.label "Send the message in both plain text and HTML (larger message size)">
<!ENTITY sendBoth.accesskey "e">
<!ENTITY override.label "You can override these settings for individual messages by using the Options menu while composing a message.">
<!ENTITY receiveHTML.label "If you know a particular recipient can receive HTML mail, uncheck the 'Send email as plain text (no HTML)' checkbox on the recipient's Address Book card.">
<!-- Html and Plain Text Domains -->
<!ENTITY domain.title "HTML and Plain Text Domains">
<!ENTITY domaindesc.label "When you send a message to an address with one of the domain names listed below, Mail automatically sends the message in the preferred format (formatted text or plain text).">
<!ENTITY HTMLdomaintitle.label "HTML Domains">
<!ENTITY HTMLdomaintitle.accesskey "M">
<!ENTITY PlainTexttitle.label "Plain Text Domains">
<!ENTITY PlainTexttitle.accesskey "p">
<!ENTITY AddButton.label "Add...">
<!ENTITY AddHtmlDomain.accesskey "a">
<!ENTITY AddPlainText.accesskey "d">
<!ENTITY DeleteButton.label "Delete">
<!ENTITY DeleteHtmlDomain.accesskey "l">
<!ENTITY DeletePlainText.accesskey "t">
<!-- Add HTML Domain Name -->
<!ENTITY add.htmltitle "Add HTML Domain Name">
<!ENTITY add.htmldomain "HTML Domain Name:">
<!ENTITY add.htmldomain.accesskey "d">
<!ENTITY add.plaintexttitle "Add Plain Text Domain Name">
<!ENTITY add.plaintextdomain "Plain Text Domain Name:">
<!ENTITY add.plaintext.accesskey "d">
<!-- LOCALIZATION NOTE: do not translate @string@ -->
<!ENTITY domainnameError.title "Domain Name Error">
<!ENTITY duplicationError.label "The domain name @string@ already exists in this list.">
<!-- LOCALIZATION NOTE: do not translate @string@ -->
<!ENTITY dualEntryError.label "A domain name cannot appear in both the HTML and Plain Text lists. The domain name @string@ already exists.">