зеркало из https://github.com/mozilla/gecko-dev.git
Back out Bug #206838 which changed the branding of Mail & News within seamonkey
r/sr=bienvenu/mscott a=sspitzer
This commit is contained in:
scott%scott-macgregor.org
Родитель
1df49b7090
Коммит
3c6bc17197
|
|
@ -1,6 +1,6 @@
|
|||
<!-- extracted from AccountManager.xul -->
|
||||
|
||||
<!ENTITY accountManagerTitle.label "Account Settings">
|
||||
<!ENTITY accountManagerTitle.label "Mail & Newsgroups Account Settings">
|
||||
|
||||
<!ENTITY addAccountButton.label "Add Account...">
|
||||
<!ENTITY setDefaultButton.label "Set as Default">
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@
|
|||
text after the """ entity in haveSmtp1.suffix, if required grammatically.
|
||||
-->
|
||||
<!ENTITY haveSmtp1.prefix "Your existing outgoing server (SMTP), "">
|
||||
<!ENTITY haveSmtp1.suffix "", will be used. You can modify outgoing server settings by choosing Account Settings from the Edit menu.">
|
||||
<!ENTITY haveSmtp1.suffix "", will be used. You can modify outgoing server settings by choosing Mail & Newsgroups Account Settings from the Edit menu.">
|
||||
|
||||
<!-- Entities for Login page -->
|
||||
|
||||
|
|
@ -91,13 +91,13 @@
|
|||
text after the """ entity in haveSmtp2.suffix, if required grammatically.
|
||||
-->
|
||||
<!ENTITY haveSmtp2.prefix "Your existing outgoing (SMTP) username, "">
|
||||
<!ENTITY haveSmtp2.suffix "", will be used. You can modify outgoing server settings by choosing Account Settings from the Edit menu.">
|
||||
<!ENTITY haveSmtp2.suffix "", will be used. You can modify outgoing server settings by choosing Mail & Newsgroups Account Settings from the Edit menu.">
|
||||
<!-- LOCALIZATION NOTE (haveSmtp3.prefix and haveSmtp3.suffix) : Do not translate "SMTP" and """ in
|
||||
these variables. Also, translate haveSmtp3.prefix and haveSmtp3.suffix as a single sentence, inserting
|
||||
text after the """ entity in haveSmtp3.suffix, if required grammatically.
|
||||
-->
|
||||
<!ENTITY haveSmtp3.prefix "Your outgoing (SMTP) server, "">
|
||||
<!ENTITY haveSmtp3.suffix "", is identical to your incoming server, your incoming user name will be used to access it. You can modify outgoing server settings by choosing Account Settings from the Edit menu.">
|
||||
<!ENTITY haveSmtp3.suffix "", is identical to your incoming server, your incoming user name will be used to access it. You can modify outgoing server settings by choosing Mail & Newsgroups Account Settings from the Edit menu.">
|
||||
|
||||
<!-- Entities for Account name page -->
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
|
||||
<!ENTITY enbJsCheckMailNews.label "Messenger">
|
||||
<!ENTITY enbJsCheckMailNews.label "Mail & Newsgroups">
|
||||
<!ENTITY enbJsCheckMailNews.accesskey "m">
|
||||
<!ENTITY enbPluginCheckMailNews.label "Messenger">
|
||||
<!ENTITY enbPluginCheckMailNews.accesskey "r">
|
||||
<!ENTITY enbPluginCheckMailNews.label "Mail & Newsgroups">
|
||||
<!ENTITY enbPluginCheckMailNews.accesskey "p">
|
||||
|
||||
<!ENTITY disableCookieForMailNews.label "Disable cookies in mail and news messages">
|
||||
<!ENTITY disableCookieForMailNews.label "Disable cookies in Mail & Newsgroups">
|
||||
<!ENTITY disableCookieForMailNews.accesskey "m">
|
||||
|
||||
<!ENTITY disableImageInMailNews.label "Do not load remote images in mail and news messages">
|
||||
<!ENTITY disableImageInMailNews.label "Do not load remote images in Mail & Newsgroup messages">
|
||||
<!ENTITY disableImageInMailNews.accesskey "i">
|
||||
|
||||
<!ENTITY mail.label "Messenger">
|
||||
<!ENTITY mail.label "Mail & Newsgroups">
|
||||
<!ENTITY mail.accesskey "m">
|
||||
<!ENTITY windows.label "Windows">
|
||||
<!ENTITY viewingMessages.label "Message Display">
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ Communications Corporation. Portions created by Netscape are
|
|||
Rights Reserved.
|
||||
-->
|
||||
|
||||
<!ENTITY pane.title "Messenger">
|
||||
<!ENTITY pane.title "Mail & Newsgroups">
|
||||
<!ENTITY generalSettings.label "General Settings">
|
||||
<!ENTITY confirmMove.label "Confirm when moving folders to the Trash">
|
||||
<!ENTITY confirmMove.accesskey "C">
|
||||
|
|
@ -27,7 +27,7 @@ Rights Reserved.
|
|||
<!ENTITY autounzip.label "Automatically expand zip files when saving attachments">
|
||||
<!ENTITY autounzip.accesskey "A">
|
||||
<!ENTITY messengerStartPage.label "Mail Start Page">
|
||||
<!ENTITY enableStartPage.label "When Messenger launches, show the Start Page in the message area">
|
||||
<!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">
|
||||
|
|
|
|||
|
|
@ -20,9 +20,9 @@ Rights Reserved.
|
|||
|
||||
<!ENTITY pane.title "Windows">
|
||||
<!ENTITY windowSettings.label "Windows">
|
||||
<!ENTITY selectWindowLayout.label "Select the window layout you prefer for Messenger:">
|
||||
<!ENTITY selectWindowLayout.label "Select the window layout you prefer for Mail:">
|
||||
<!ENTITY selectWindowLayout.accesskey "l">
|
||||
<!ENTITY chooseExp.label "Note: For this setting to take effect, you will need to exit and then restart Messenger.">
|
||||
<!ENTITY chooseExp.label "Note: For this setting to take effect, you will need to exit and then restart Mail.">
|
||||
<!ENTITY warnOnSendAccelKey.label "Confirm when using keyboard shortcut to send message">
|
||||
<!ENTITY warnOnSendAccelKey.accesskey "o">
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
|
||||
<!-- LOCALIZATION NOTE (messengerCmd.label): DONT_TRANSLATE -->
|
||||
<!ENTITY messengerCmd.label "Messenger">
|
||||
<!ENTITY messengerCmd.label "Mail & Newsgroups">
|
||||
<!ENTITY messengerCmd.accesskey "m">
|
||||
<!ENTITY messengerCmd.commandkey "2">
|
||||
<!ENTITY addressBookCmd.label "Address Book">
|
||||
<!ENTITY addressBookCmd.accesskey "a">
|
||||
<!ENTITY addressBookCmd.commandkey "5">
|
||||
|
||||
<!ENTITY taskMessenger.tooltip "Messenger">
|
||||
<!ENTITY taskMessenger.tooltip "Mail & Newsgroups">
|
||||
<!ENTITY taskAddressBook.tooltip "Address Book">
|
||||
|
||||
<!-- searchAddressesCmd is also used by addressbook -->
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ Communications Corporation. Portions created by Netscape are
|
|||
Rights Reserved.
|
||||
-->
|
||||
|
||||
<!ENTITY messengerWindow.title "Messenger">
|
||||
<!ENTITY messengerWindow.title "Mail & Newsgroups">
|
||||
<!ENTITY titleModifier.label "&brandShortName;">
|
||||
<!ENTITY titleSeparator.label " - ">
|
||||
|
||||
|
|
@ -116,8 +116,8 @@ Rights Reserved.
|
|||
<!ENTITY folderPropsFolderCmd.label "Folder Properties...">
|
||||
<!ENTITY folderPropsNewsgroupCmd.label "Newsgroup Properties...">
|
||||
<!ENTITY folderPropsCmd.accesskey "o">
|
||||
<!ENTITY accountManagerCmd.label "Account Settings...">
|
||||
<!ENTITY accountManagerCmd.accesskey "n">
|
||||
<!ENTITY accountManagerCmd.label "Mail & Newsgroups Account Settings...">
|
||||
<!ENTITY accountManagerCmd.accesskey "M">
|
||||
<!ENTITY undoDeleteMsgCmd.label "Undo Delete Message">
|
||||
<!ENTITY redoDeleteMsgCmd.label "Redo Delete Message">
|
||||
<!ENTITY undoMoveMsgCmd.label "Undo Move Message">
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
<html lang="en-US">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
|
||||
<title>Welcome to Mozilla Messenger</title>
|
||||
<title>Welcome to Mozilla Mail & Newsgroups</title>
|
||||
</head>
|
||||
<body>
|
||||
<div style="text-align: center">
|
||||
<strong>Welcome to <a href="http://www.mozilla.org">Mozilla</a> Messenger</strong>
|
||||
<strong>Welcome to <a href="http://www.mozilla.org">Mozilla</a> Mail & Newsgroups</strong>
|
||||
|
||||
<p><img src="mail_mozilla.gif" width="183" height="68" alt="Mozilla Messenger"></p>
|
||||
<p><img src="mail_mozilla.gif" width="183" height="68" alt="Mozilla Mail & Newsgroups"></p>
|
||||
<p><a href="http://www.mozilla.org/mailnews/">We</a> welcome bug reports and feature requests, but please read the
|
||||
<a href="http://www.mozilla.org/releases/">release notes</a> and query <a href="http://bugzilla.mozilla.org/query.cgi">Bugzilla</a> first.</p>
|
||||
<p>If you are looking for a stand alone version, see <a href="http://www.mozilla.org/projects/thunderbird/">Thunderbird Mail</a>.</p>
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ Rights Reserved.
|
|||
<!ENTITY pane.description "Message formatting">
|
||||
<!ENTITY sendMail.label "Send Format">
|
||||
<!ENTITY sendMaildesc.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 (Messenger prompts you to choose a format)">
|
||||
<!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">
|
||||
|
|
@ -35,7 +35,7 @@ Rights Reserved.
|
|||
|
||||
<!-- 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 domains listed below, Messenger automatically sends the message in the correct format.">
|
||||
<!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 correct format.">
|
||||
<!ENTITY HTMLdomaintitle.label "HTML Domains">
|
||||
<!ENTITY HTMLdomaintitle.accesskey "M">
|
||||
<!ENTITY PlainTexttitle.label "Plain Text Domains">
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
12509=Assembling message...
|
||||
|
||||
## @name NS_MSG_NO_SENDER
|
||||
12510=No sender was specified. Please fill in your email address in the Account Settings.
|
||||
12510=No sender was specified. Please fill in your email address in the Mail & Newsgroups account settings.
|
||||
|
||||
## @name NS_MSG_NO_RECIPIENTS
|
||||
12511=No recipients were specified. Please enter a recipient or newsgroup in the addressing area.
|
||||
|
|
|
|||
|
|
@ -61,8 +61,8 @@
|
|||
<!ENTITY findPrevCmd.key "G">
|
||||
<!ENTITY findPrevCmd.key2 "VK_F3">
|
||||
<!ENTITY findPrevCmd.accesskey "v">
|
||||
<!ENTITY accountManagerCmd.label "Account Settings...">
|
||||
<!ENTITY accountManagerCmd.accesskey "n">
|
||||
<!ENTITY accountManagerCmd.label "Mail & Newsgroups Account Settings...">
|
||||
<!ENTITY accountManagerCmd.accesskey "m">
|
||||
|
||||
<!-- View menu items -->
|
||||
<!ENTITY showComposeToolbarCmd.label "Mail Toolbar">
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
## S/MIME error strings.
|
||||
## Note to localization: %S is a placeholder
|
||||
NoSenderSigningCert=You specified that this message should be digitally signed, but the application either failed to find the signing certificate specified in your Account Settings, or the certificate has expired.
|
||||
NoSenderEncryptionCert=You specified encryption for this message, but the application either failed to find the encryption certificate specified in your Account Settings, or the certificate has expired.
|
||||
NoSenderSigningCert=You specified that this message should be digitally signed, but the application either failed to find the signing certificate specified in your Mail & Newsgroup Account Settings, or the certificate has expired.
|
||||
NoSenderEncryptionCert=You specified encryption for this message, but the application either failed to find the encryption certificate specified in your Mail & Newsgroup Account Settings, or the certificate has expired.
|
||||
MissingRecipientEncryptionCert=You specified encryption for this message, but the application failed to find an encryption certificate for %S.
|
||||
SignNoSenderEncryptionCert=You specified that this message should be digitally signed, but the application either failed to find an encryption certificate to include in the signed message, or the certificate has expired.
|
||||
ErrorCanNotEncrypt=Unable to encrypt message. Please check that you have a valid email certificate for each recipient. Please check that the certificates specified in Account Settings for this mail account are valid and trusted.
|
||||
ErrorCanNotSign=Unable to sign message. Please check that the certificates specified in Account Settings for this mail account are valid and trusted
|
||||
ErrorCanNotEncrypt=Unable to encrypt message. Please check that you have a valid email certificate for each recipient. Please check that the certificates specified in Mail & Newsgroups Account Settings for this mail account are valid and trusted.
|
||||
ErrorCanNotSign=Unable to sign message. Please check that the certificates specified in Mail & Newsgroups Account Settings for this mail account are valid and trusted
|
||||
|
||||
## Strings used for in the prefs.
|
||||
prefPanel-smime=Security
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
# Mail Integration Dialog
|
||||
dialogTitle=%S Messenger
|
||||
dialogText=Do you want to use %S Messenger as the default mail application?
|
||||
dialogTitle=%S Mail
|
||||
dialogText=Do you want to use %S as the default mail application?
|
||||
checkboxText=Do not display this dialog again
|
||||
|
||||
# MAPI Messages
|
||||
loginText=Please enter your password for %S:
|
||||
loginTextwithName=Please enter your username and password
|
||||
loginTitle=%S Messenger
|
||||
PasswordTitle=%S Messenger
|
||||
loginTitle=%S Mail
|
||||
PasswordTitle=%S Mail
|
||||
|
||||
# MAPI Error Messages
|
||||
errorMessage=%S Messenger could not be set as the default mail application because a registry key could not be updated. Verify with your system administrator that you have write access to your system registry, and then try again.
|
||||
errorMessageTitle=%S Messenger
|
||||
errorMessage=%S Mail could not be set as the default mail application because a registry key could not be updated. Verify with your system administrator that you have write access to your system registry, and then try again.
|
||||
errorMessageTitle=%S Mail
|
||||
|
||||
# MAPI Security Messages
|
||||
mapiBlindSendWarning=Another application is attempting to send mail using your user profile. Are you sure you want to send mail?
|
||||
|
|
@ -19,4 +19,5 @@ mapiBlindSendDontShowAgain=Warn me whenever other applications try to send mail
|
|||
|
||||
#Default Mail Display String
|
||||
# localization note, %S is the vendor name
|
||||
defaultMailDisplayTitle=%S Messenger
|
||||
defaultMailDisplayTitle=%S Mail
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
<!ENTITY enableMapiTitle.label "When sending mail from other applications">
|
||||
<!ENTITY enableMapi.label "Use &vendorShortName; Messenger as the default mail application">
|
||||
<!ENTITY enableMapi.label "Use &vendorShortName; Mail as the default mail application">
|
||||
<!ENTITY enableMapi.accesskey "u">
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче