Bug 658987 - Update of en-GB locale for suite mailnews r=moz_en-gb
authorIan Neal <iann_cvs@blueyonder.co.uk>
Fri, 20 May 2011 14:46:50 +0100
changeset 114 282e90fd259bf418d7beadde14552d709d24161a
parent 113 942f1ab44e43d22ef272c646c04a2fdab29db326
child 115 ec17c2452eff19421a4d5c02ee075137ab462764
push id55
push useriann_cvs@blueyonder.co.uk
push dateMon, 30 May 2011 22:17:06 +0000
reviewersmoz_en-gb
bugs658987
Bug 658987 - Update of en-GB locale for suite mailnews r=moz_en-gb
suite/chrome/mailnews/FilterEditor.dtd
suite/chrome/mailnews/SearchDialog.dtd
suite/chrome/mailnews/comm4xMailImportMsgs.properties
suite/chrome/mailnews/compose/composeMsgs.properties
suite/chrome/mailnews/folderProps.dtd
suite/chrome/mailnews/folderpane.dtd
suite/chrome/mailnews/imapMsgs.properties
suite/chrome/mailnews/importDialog.dtd
suite/chrome/mailnews/importMsgs.properties
suite/chrome/mailnews/localMsgs.properties
suite/chrome/mailnews/messenger.dtd
suite/chrome/mailnews/messenger.properties
suite/chrome/mailnews/msgHdrViewOverlay.dtd
suite/chrome/mailnews/msgSynchronize.dtd
suite/chrome/mailnews/msgmdn.properties
suite/chrome/mailnews/newFolderDialog.dtd
suite/chrome/mailnews/news.properties
suite/chrome/mailnews/renameFolderDialog.dtd
suite/chrome/mailnews/searchTermOverlay.dtd
suite/chrome/mailnews/smime/am-smime.properties
suite/chrome/mailnews/smime/msgCompSMIMEOverlay.dtd
suite/chrome/mailnews/smime/msgSecurityInfo.properties
suite/chrome/mailnews/vCardImportMsgs.properties
suite/chrome/mailnews/virtualFolderProperties.dtd
suite/chrome/mailnews/wmImportMsgs.properties
--- a/suite/chrome/mailnews/FilterEditor.dtd
+++ b/suite/chrome/mailnews/FilterEditor.dtd
@@ -48,17 +48,17 @@
  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 window.title "Filter Rules">
-
+<!ENTITY filterEditorDialog.dimensions "width: 105ch;">
 <!ENTITY filterName.label "Filter name:">
 <!ENTITY filterName.accesskey "i">
 
 <!ENTITY junk.label "Junk">
 <!ENTITY notJunk.label "Not Junk">
 
 <!ENTITY lowestPriorityCmd.label "Lowest">
 <!ENTITY lowPriorityCmd.label "Low">
--- a/suite/chrome/mailnews/SearchDialog.dtd
+++ b/suite/chrome/mailnews/SearchDialog.dtd
@@ -1,34 +1,32 @@
 
 <!-- for SearchDialog.xul -->
 <!ENTITY searchHeading.label         "Search for messages in:">
-<!ENTITY searchHeading.accesskey     "h">
+<!ENTITY searchHeading.accesskey     "e">
 <!ENTITY searchSubfolders.label      "Search subfolders">
-<!ENTITY searchSubfolders.accesskey  "e">
+<!ENTITY searchSubfolders.accesskey  "u">
 <!ENTITY searchLocalSystem.label     "Search local system">
 <!ENTITY searchLocalSystem.accesskey "y">
 <!ENTITY resetButton.label           "Clear">
 <!ENTITY resetButton.accesskey       "C">
-<!ENTITY helpButton.label            "Help">
-<!ENTITY helpButton.accesskey        "l">
 <!ENTITY openButton.label            "Open">
-<!ENTITY openButton.accesskey        "n">
+<!ENTITY openButton.accesskey        "O">
 <!ENTITY deleteButton.label          "Delete">
 <!ENTITY deleteButton.accesskey      "D">
 <!ENTITY searchDialogTitle.label     "Search Messages">
 <!ENTITY results.label               "Results">
 <!ENTITY fileHereMenu.label          "File Here">
-<!ENTITY fileHereMenu.accesskey      "F">
+<!ENTITY fileHereMenu.accesskey      "r">
 <!ENTITY fileButton.label            "File">
-<!ENTITY fileButton.accesskey        "i">
+<!ENTITY fileButton.accesskey        "F">
 <!ENTITY goToFolderButton.label      "Open Message Folder">
-<!ENTITY goToFolderButton.accesskey  "r">
+<!ENTITY goToFolderButton.accesskey  "n">
 <!ENTITY saveAsVFButton.label      "Save as Search Folder">
-<!ENTITY saveAsVFButton.accesskey  "a">
+<!ENTITY saveAsVFButton.accesskey  "v">
 
 <!-- for ABSearchDialog.xul -->
 <!ENTITY abSearchHeading.label       "Search in:">
 <!ENTITY abSearchHeading.accesskey   "h">
 <!ENTITY propertiesButton.label      "Properties">
 <!ENTITY propertiesButton.accesskey  "P">
 <!ENTITY composeButton.label         "Compose">
 <!ENTITY composeButton.accesskey     "e">
--- a/suite/chrome/mailnews/comm4xMailImportMsgs.properties
+++ b/suite/chrome/mailnews/comm4xMailImportMsgs.properties
@@ -30,22 +30,18 @@
 # 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 *****
 
-# Short name of import module
-# LOCALIZATION NOTE : "Communicator 4.x" below is the used for previous versions of Netscape Communicator
-# Please translate using the brandname in respective languages for Netscape Communicator 4 releases.
-## @name COMM4XMAILIMPORT_NAME
-## @loc None
-2000=Communicator 4.x
+# LOCALIZATION NOTE (comm4xImportName) : "Communicator 4.x" below is the used for previous versions of Netscape Communicator. Please translate using the brandname in respective languages for Netscape Communicator 4 releases.
+comm4xImportName=Communicator 4.x
 
 # Description of import module
 # LOCALIZATION NOTE : "Communicator 4.x" below is the used for previous versions of Netscape Communicator
 # Please translate using the brandname in respective languages for Netscape Communicator 4 releases.
 ## @name COMM4XMAILIMPORT_DESCRIPTION
 ## @loc None
 2001=Import Local Mail from Communicator 4.x.
 
--- a/suite/chrome/mailnews/compose/composeMsgs.properties
+++ b/suite/chrome/mailnews/compose/composeMsgs.properties
@@ -32,21 +32,20 @@
 # 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 *****
 
 #
 # The following are used by the compose back end
 #
-## @name NS_MSG_UNABLE_TO_OPEN_FILE 
-12500=Unable to open the file %P0%.
-
-## @name NS_MSG_UNABLE_TO_OPEN_TMP_FILE
-12501=Unable to open the temporary file %P0%. Check your 'Temporary Directory' setting.
+## LOCALIZATION NOTE (unableToOpenFile, unableToOpenTmpFile):
+## %S will be replaced with the name of file that could not be opened
+unableToOpenFile=Unable to open the file %S.
+unableToOpenTmpFile=Unable to open the temporary file %S. Check your 'Temporary Directory' setting.
 
 ## @name NS_MSG_UNABLE_TO_SAVE_TEMPLATE
 12502=Unable to save your message as template.
 
 ## @name NS_MSG_UNABLE_TO_SAVE_DRAFT
 12503=Unable to save your message as draft.
 
 ## @name NS_MSG_LOAD_ATTACHMNTS
@@ -195,40 +194,25 @@ 12564=The author of this message has req
 
 ## @name NS_MSG_UNDISCLOSED_RECIPIENTS
 ## LOCALIZATION NOTE: this string must be using only US_ASCII characters
 12566=undisclosed-recipients
 
 ## @name NS_MSG_ERROR_ATTACHING_FILE
 12570=There was an error attaching %S. Please check if you have access to the file.
 
-## @name NS_MSG_ERROR_DOING_FCC
-12571=There was an error copying the message to the Sent folder. Retry?
-
 ## @name NS_ERROR_SMTP_GREETING
 12572=An error occurred sending mail: The mail server sent an incorrect greeting:  %s.
 
 ## @name NS_ERROR_SENDING_RCPT_COMMAND
 12575=An error occurred while sending mail. The mail server responded:  %1$s. Please check the message recipient %2$s and try again.
 
-## @name NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER_INSECAUTH
-12579=An error occurred sending mail: Unable to authenticate to SMTP server %S. The server does not support any compatible insecure authentication mechanism but you have chosen insecure authentication. Try switching on secure authentication or contact your service provider.
-
-## @name NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER_SECAUTH
-12580=An error occurred sending mail: Unable to authenticate to SMTP server %S. The server does not support any compatible secure authentication mechanism but you have chosen secure authentication. Try switching off secure authentication or contact your service provider.
-
-## @name NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER_AUTH_NONE
-12581=An error occurred sending mail: Unable to authenticate to SMTP server %S. It does not support authentication (SMTP-AUTH) but you have chosen to use authentication. Untick 'Use name and password' for that server or contact your service provider.
-
 ## @name NS_ERROR_STARTTLS_FAILED_EHLO_STARTTLS
 12582=An error occurred sending mail: Unable to establish a secure link with SMTP server %S using STARTTLS since it doesn't advertise that feature. Switch off STARTTLS for that server or contact your service provider.
 
-## @name NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER
-12583=An error occurred sending mail: Unable to log in to SMTP server %S. The server may be incorrectly configured. Please verify that your SMTP server settings are correct and try again.
-
 ## @name NS_ERROR_SMTP_PASSWORD_UNDEFINED
 12584=An error occurred sending mail: Could not get password for %S. The message was not sent.
 
 ## @name NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED
 12586=The size of the message you are trying to send exceeds a temporary size limit of the server. The message was not sent; try to reduce the message size or wait some time and try again. The server responded:  %s.
 
 ## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1
 12587=The size of the message you are trying to send exceeds the global size limit (%d bytes) of the server. The message was not sent; reduce the message size and try again.
@@ -246,16 +230,45 @@ 12590=The message could not be sent beca
 12591=The message could not be sent because the connection to SMTP server %S was lost in the middle of the transaction. Try again or contact your network administrator.
 
 ## @name NS_ERROR_SMTP_SEND_FAILED_TIMEOUT
 12592=The message could not be sent because the connection to SMTP server %S timed out. Try again or contact your network administrator.
 
 ## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_REASON
 12593=The message could not be sent using SMTP server %S for an unknown reason. Please verify that your SMTP server settings are correct and try again, or contact your network administrator.
 
+## @name NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
+# LOCALIZATION NOTE (12594): $S is server hostname
+12594=The SMTP server %S does not seem to support encrypted passwords. If you just set up the account, please try changing to 'Password, transmitted insecurely' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, this is a common scenario how someone could steal your password.
+
+## @name NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
+# LOCALIZATION NOTE (12595): $S is server hostname
+12595=The SMTP server %S does not seem to support encrypted passwords. If you just set up this account, please try changing to 'Normal password' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, please contact your email administrator or provider.
+
+## @name NS_ERROR_SMTP_AUTH_CHANGE_PLAIN_TO_ENCRYPT
+# LOCALIZATION NOTE (12596): $S is server hostname
+12596=The SMTP server %S does not allow plaintext passwords. Please try changing to 'Encrypted password' as the 'Authentication method' in the 'Account Settings | Server settings'.
+
+## @name NS_ERROR_SMTP_AUTH_FAILURE
+# LOCALIZATION NOTE (12597): $S is server hostname
+12597=Unable to authenticate to SMTP server %S. Please check the password, and verify the 'Authentication method' in 'Account Settings | Outgoing server (SMTP)'.
+
+## @name NS_ERROR_SMTP_AUTH_GSSAPI
+# LOCALIZATION NOTE (12598): $S is server hostname
+12598=The Kerberos/GSSAPI ticket was not accepted by the SMTP server %S. Please check that you are logged in to the Kerberos/GSSAPI realm.
+
+## @name NS_ERROR_SMTP_AUTH_MECH_NOT_SUPPORTED
+# LOCALIZATION NOTE (12599): $S is server hostname
+12599=The SMTP server %S does not support the selected authentication method. Please change the 'Authentication method' in the 'Account Settings | Outgoing Server (SMTP)'.
+
+## @name NS_ERROR_SMTP_AUTH_NOT_SUPPORTED
+# LOCALIZATION NOTE (12600): $S is server hostname
+12600=Unable to authenticate to SMTP server %S. It does not support authentication (SMTP-AUTH) but you have chosen to use authentication. Please change the 'Authentication method' to 'None' in the 'Account Settings | Outgoing Server (SMTP)' or contact your email service provider for instructions.
+
+
 ## Strings use for the save message dialog shown when the user close a message compose window
 saveDlogTitle=Save Message
 saveDlogMessage=Message has not been sent. Do you want to save the message in the Drafts folder?
 
 ## generics string
 defaultSubject=(no subject)
 chooseFileToAttach=Attach File(s)
 
@@ -285,17 +298,17 @@ partAttachmentSafeName=Attached Message 
 initErrorDlogTitle=Message Compose
 ## LOCALIZATION NOTE (initErrorDlogMessage): %1$s will be replaced by the error string.  do not translate \n
 initErrorDlogMessage=An error occurred while creating a message compose window. Please try again.\n%1$s
 
 ## Strings used by Save as Draft/Template dialog
 SaveDialogTitle=Save Message
 ## LOCALIZATION NOTE (SaveDialogMsg): %1$S is folder name, %2$S is host name
 SaveDialogMsg=Your message has been saved to the folder %1$S under %2$S.
-CheckMsg=Do not show me this dialog box again.
+CheckMsg=Do not show me this dialogue box again.
 
 ## Strings used by prompt when Quitting while in progress
 quitComposeWindowTitle=Sending Message
 ## LOCALIZATION NOTE (quitComposeWindowMessage): don't translate \n
 quitComposeWindowMessage2=%1$S is currently in the process of sending a message.\nWould you like to wait until the message has been sent before quitting or quit now?
 quitComposeWindowQuitButtonLabel2=&Quit
 quitComposeWindowWaitButtonLabel2=&Wait
 
@@ -320,8 +333,12 @@ renameAttachmentMessage=New attachment n
 ## LOCALIZATION NOTE(smtpEnterPasswordPrompt): Do not translate the
 ## word $S. Place the word $S where the host name should appear.
 smtpEnterPasswordPrompt=Enter your password for %S:
 ## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the
 ## words %1$S and %2$S. Place the word %1$S where the host name should appear,
 ## and %2$S where the user name should appear.
 smtpEnterPasswordPromptWithUsername=Enter your password for %2$S on %1$S:
 smtpEnterPasswordPromptTitle=SMTP Server Password Required
+
+## LOCALIZATION NOTE(errorSavingMsg): Do not translate the word %S. It
+## will be replaced with the name of the folder the message is being saved to.
+errorSavingMsg=There was an error saving the message to %S. Retry?
--- a/suite/chrome/mailnews/folderProps.dtd
+++ b/suite/chrome/mailnews/folderProps.dtd
@@ -40,19 +40,22 @@
 
 <!ENTITY folderProps.windowtitle.label           "Properties">
 
 <!ENTITY generalInfo.label                       "General Information">
 <!ENTITY folderCharsetTab.label                  "Default Character Encoding:">
 <!ENTITY folderCharsetTab.accesskey              "E">
 <!ENTITY folderCharsetOverride.label             "Apply default to all messages in the folder (individual message character encoding settings and auto-detection will be ignored)">
 <!ENTITY folderCharsetOverride.accesskey         "A">
-<!ENTITY folderRebuildSummaryFile.label          "Rebuild Summary File">
-<!ENTITY folderRebuildSummaryFile.accesskey      "R">
-<!ENTITY folderRebuildSummaryFileTip.label       "Rebuild Summary File">
+<!ENTITY folderRebuildSummaryFileTip2.label      "Rebuild Summary File Index">
+<!ENTITY folderRebuildSummaryFile2.label         "Repair Folder">
+<!ENTITY folderRebuildSummaryFile2.accesskey     "R">
+<!ENTITY folderRebuildSummaryFile.explanation    "Sometimes the folder index (.msf) file becomes damaged and messages may appear missing or deleted messages continue showing; repairing the folder may fix these issues.">
+<!ENTITY folderIncludeInGlobalSearch.label       "Include messages in this folder in Global Search results">
+<!ENTITY folderIncludeInGlobalSearch.accesskey   "G">
 
 <!ENTITY retention.label "Retention Policy">
 <!ENTITY retentionUseAccount.label "Use my account settings">
 <!ENTITY retentionUseAccount.accesskey "U">
 <!ENTITY daysOld.label "days old">
 <!ENTITY message.label "messages">
 <!ENTITY retentionCleanup.label "Keep messages:">
 <!ENTITY retentionCleanupImap.label "Keep messages, both the local copies and their originals on the server:">
@@ -64,18 +67,18 @@
 <!ENTITY retentionKeepRecent.label "The newest">
 <!ENTITY retentionKeepRecent.accesskey "n">
 <!-- LOCALIZATION NOTE: Unhide with .keepUnreadOnly { display: -moz-box; } -->
 <!ENTITY retentionKeepUnreadHidden.label "Always delete read messages (overrides age settings)">
 <!ENTITY retentionApplyToFlagged.label "Always keep flagged messages">
 <!ENTITY retentionApplyToFlagged.accesskey "e">
 
 <!ENTITY folderSynchronizationTab.label          "Synchronisation">
-<!ENTITY folderCheckForNewMessages.label         "Check this folder for new messages">
-<!ENTITY folderCheckForNewMessages.accesskey     "C">
+<!ENTITY folderCheckForNewMessages2.label        "When getting new messages for this account, always check this folder">
+<!ENTITY folderCheckForNewMessages2.accesskey    "c">
 
 <!ENTITY offlineFolder.check.label               "Select this folder for offline use">
 <!ENTITY offlineFolder.check.accesskey           "S">
 <!ENTITY offlineFolder.button.label              "Download Now">
 <!ENTITY offlineFolder.button.accesskey          "D">
 
 <!ENTITY selectofflineNewsgroup.check.label      "Select this newsgroup for offline use">
 <!ENTITY selectofflineNewsgroup.check.accesskey  "o">
--- a/suite/chrome/mailnews/folderpane.dtd
+++ b/suite/chrome/mailnews/folderpane.dtd
@@ -15,16 +15,17 @@
  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):
+    Ian Neal <iann_bugzilla@blueyonder.co.uk>
 
  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
@@ -33,8 +34,12 @@
  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 nameColumn.label   "Name"> 
 <!ENTITY unreadColumn.label "Unread"> 
 <!ENTITY totalColumn.label "Total"> 
 <!ENTITY folderSizeColumn.label "Size"> 
+<!ENTITY folderLocationToolbarItem.title "Folder Location">
+<!ENTITY mailViewsToolbarItem.title "Mail Views">
+<!ENTITY searchToolbarItem.title "Search">
+<!ENTITY searchSubjectOrAddress.placeholder "Search Subject or Address">
--- a/suite/chrome/mailnews/imapMsgs.properties
+++ b/suite/chrome/mailnews/imapMsgs.properties
@@ -213,20 +213,16 @@ 5046=Found folder: %S
 # or the username should appear
 5047=Enter your password for %S:
 
 ## @name IMAP_SERVER_NOT_IMAP4
 ## @loc None
 # LOCALIZATION NOTE (Error 5048): Do not translate the word "IMAP4" below.
 5048=Mail server %S is not an IMAP4 mail server.
 
-## @name IMAP_SERVER_SAID
-## @loc None
-5049=The current command did not succeed.  The mail server responded: 
-
 ## @name IMAP_DONE
 ## @loc None
 5050=
 
 ## @name IMAP_ENTER_PASSWORD_PROMPT_TITLE
 ## @loc None
 5051=Mail Server Password Required
 
@@ -250,28 +246,16 @@ 5056=There are no new messages on the se
 ## @name IMAP_DEFAULT_ACCOUNT_NAME
 ## @loc None
 5057=Mail for %S
 
 ## @name IMAP_EMPTY_TRASH_CONFIRM
 ## @loc None
 5061=Emptying the Deleted Folder will delete %S and all of the messages it contains. Do you want to delete this folder?
 
-## @name IMAP_PERSONAL_FILING_CABINET
-## @loc None
-5062=Personal Filing Cabinet
-
-## @name IMAP_PFC_READ_MAIL
-## @loc None
-5063=Read Mail
-
-## @name IMAP_PFC_SENT_MAIL
-## @loc None
-5064=Sent Mail
-
 ## @name IMAP_SPECIAL_CHAR
 ## @loc None
 5065= The %c character is reserved on this imap server. Please choose another name. 
 
 ## @name IMAP_PERSONAL_SHARED_FOLDER_TYPE_NAME
 ## @loc None
 5066=Personal Folder
 
@@ -372,44 +356,92 @@ 5096=This server does not support quotas
 ## @loc None
 5097=There are no storage quotas on this folder.
 
 # Out of memory
 ## @name IMAP_OUT_OF_MEMORY
 ## @loc None
 5100=Application is out of memory.
 
-## @name IMAP_AUTH_SECURE_NOTSUPPORTED
-## @loc None
-5102=You cannot log in to %S because you have enabled secure authentication and this server does not support it.\n\nTo log in, turn off secure authentication for this account.
-
 ## @name IMAP_COPYING_MESSAGE_OF
 ## @loc None
 # LOCALIZATION NOTE (Error 5103): Do not translate the word "%S" below.
 # Place the word %3$S in your translation where the name of the destination folder should appear.
 # Place the word %1$S where the currently copying message should appear.
 # Place the word %2$S where the total number of messages should appear.
 5103=Copying Message %1$S of %2$S to %3$S
 
 ## @name IMAP_MOVE_FOLDER_TO_TRASH
 ## @loc None
 # LOCALIZATION NOTE (5105): Do not translate the word %S below.
-# "%S" is the the name of the folder.
+# "%S" is the name of the folder.
 5105=Are you sure you want to delete the folder '%S'?
 
 ## @name IMAP_DELETE_NO_TRASH
 ## @loc None
 # LOCALIZATION NOTE (5106): Do not translate the word %S below.
-# "%S" is the the name of the folder.
+# "%S" is the name of the folder.
 5106=Deleting this folder is not undoable and will delete all of the messages it contains, and its sub-folders. Are you sure you still want to delete the folder '%S'?
 
 ## @name IMAP_DELETE_FOLDER_DIALOG_TITLE
 ## @loc None
 5107=Delete Folder
 
 ## @name IMAP_DELETE_FOLDER_BUTTON_LABEL
 ## @loc None
 5108=&Delete Folder
 
+## @name IMAP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
+## @loc None
+# LOCALIZATION NOTE (5110): %S is the server hostname
+5110=The IMAP server %S does not seem to support encrypted passwords. If you just set up this account, please try changing to 'Normal password' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, please contact your email administrator or provider.
+
+## @name IMAP_AUTH_CHANGE_PLAIN_TO_ENCRYPT
+## @loc None
+# LOCALIZATION NOTE (5111): %S is the server hostname
+5111=The IMAP server %S does not allow plaintext passwords. Please try changing to 'Encrypted password' as the 'Authentication method' in the 'Account Settings | Server settings'.
+
+## @name IMAP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
+## @loc None
+# LOCALIZATION NOTE (5112): %S is the server hostname
+5112=The IMAP server %S does not seem to support encrypted passwords. If you just set up the account, please try changing to 'Password, transmitted insecurely' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, this is a common scenario how someone could steal your password.
+
+## @name IMAP_AUTH_MECH_NOT_SUPPORTED
+## @loc None
+# LOCALIZATION NOTE (5113): %S is the server hostname
+5113=The IMAP server %S does not support the selected authentication method. Please change the 'Authentication method' in the 'Account Settings | Server settings'.
+
+## @name IMAP_AUTH_MECH_FAILED
+## @loc None
+# LOCALIZATION NOTE (5114): %S is the server hostname
+5114=All login mechanisms for %S failed. Please check the password or change the 'Authentication method' in the 'Account Settings | Server settings'.
+
+## @name IMAP_AUTH_GSSAPI_FAILED
+## @loc None
+# LOCALIZATION NOTE (5115): %S is the server hostname
+5115=The Kerberos/GSSAPI ticket was not accepted by the IMAP server %S. Please check that you are logged in to the Kerberos/GSSAPI realm.
+
 ## @name IMAP_LOGIN_DISABLED
 ## @loc None
-# LOCALIZATION NOTE (5109): %S is the server address
-5109=You cannot log in to %S because the server doesn't allow plaintext authentication without STARTTLS or SSL/TLS. Try enabling connection security or secure authentication in the account settings.
+# LOCALIZATION NOTE (5116): %S is the account name
+5116=You cannot log in to %S because the server doesn't allow plaintext authentication without STARTTLS or SSL/TLS. Try enabling connection security or secure authentication in the account settings.
+
+## @name IMAP_SERVER_COMMAND_FAILED
+## @loc None
+# LOCALIZATION NOTE (5117): 
+# Place the word %1$S in your translation where the name of the account name should appear.
+# Place the word %2$S in your translation where the server response should appear.
+5117=The current command did not succeed. The mail server for account %1$S responded: %2$S 
+
+## @name IMAP_FOLDER_COMMAND_FAILED
+## @loc None
+# LOCALIZATION NOTE (5118): Do not translate the word %S below.
+# Place the word %1$S in your translation where the name of the account should appear.
+# Place the word %2$S in your translation where the name of the folder should appear.
+# Place the word %3$S in your translation where the server response should appear.
+5118=The current operation on '%2$S' did not succeed. The mail server for account %1$S responded: %3$S
+
+## @name IMAP_SERVER_ALERT
+## @loc None
+# LOCALIZATION NOTE (5119):
+# Place the word %1$S in your translation where the name of the account should appear.
+# Place the word %2$S in your translation where the alert from the server should appear.
+5119=Alert from account %1$S: %2$S
--- a/suite/chrome/mailnews/importDialog.dtd
+++ b/suite/chrome/mailnews/importDialog.dtd
@@ -64,16 +64,8 @@
 <!ENTITY forward.label            "Next &gt;">
 <!ENTITY finish.label             "Finish">
 <!ENTITY cancel.label             "Cancel">
 
 <!ENTITY select.label             "or select the type of material to import:">
 
 <!ENTITY title.label              "Title">
 <!ENTITY processing.label         "Importing…">
-
-<!ENTITY FieldDiscInputText1.label  "Netscape Communicator 4.x has one mailing address for each card, while &brandShortName; has two (Home and Work).">
-<!ENTITY FieldDiscInputText2.label  "Select the category in which you want to store the imported mailing addresses:">
-<!ENTITY FieldDiscWarning.label  "This category will be used for all the entries of the selected address book: ">
-<!ENTITY importHome.label        "Home">
-<!ENTITY importHome.accesskey    "H">
-<!ENTITY importWork.label        "Work">
-<!ENTITY importWork.accesskey    "W">
--- a/suite/chrome/mailnews/importMsgs.properties
+++ b/suite/chrome/mailnews/importMsgs.properties
@@ -328,24 +328,16 @@ MailProgressMeterText=Converting mailbox
 AddrProgressMeterText=Converting address books from %S
 
 #Import file dialog strings
 ImportSelectSettings=Select Settings File
 ImportSelectMailDir=Select Mail Directory
 ImportSelectAddrDir=Select Address Book Directory
 ImportSelectAddrFile=Select Address Book File
 
-# LOCALIZATION NOTE : "Communicator 4.x" is the used for previous versions of Netscape Communicator
-# Please translate using the brandname in respective languages for Netscape Communicator 4 releases.
-# LOCALIZATION NOTE : Please do not translate "*.na2", this represents the extension of the address book 
-# files from the Netscape Communicator 4 releases.
-# Comm4.xTo6.xImport user selection string
-Comm4xImportName=Communicator 4.x
-Comm4xFiles=Communicator Address Book files (*.na2)
-
 # Folder Names for imported Mail
 DefaultFolderName=Imported Mail
 # LOCALIZATION NOTE: Do not translate the word "%S" below.
 ImportModuleFolderName=%S Import
  
 # LOCALIZATION NOTE : "Communicator 4.x" is the used for previous versions of Netscape Communicator
 # Please translate using the brandname in respective languages for Netscape Communicator 4 releases.
 # strings profile dialog that comes up when importing mail from 4.x
--- a/suite/chrome/mailnews/localMsgs.properties
+++ b/suite/chrome/mailnews/localMsgs.properties
@@ -45,41 +45,64 @@ pop3EnterPasswordPromptTitle=Enter your 
 # %2$S where the host name should appear.
 pop3EnterPasswordPrompt=Enter your password for %1$S on %2$S:
 
 # LOCALIZATION NOTE(pop3PreviouslyEnteredPasswordIsInvalidPrompt): Do not
 # translate the words "%1$S" and "%2$S" below. Place the word %1$S where the
 # user name should appear, and %2$S where the host name should appear.
 pop3PreviouslyEnteredPasswordIsInvalidPrompt=Please enter a new password for user %1$S on %2$S:
 
+# Status - Downloading message n of m to account
+## @name receivingMsgs
+## @loc None
+#LOCALIZATION NOTE (receivingMsgs): Do not translate %1$S, %2$S, or %3$S in the following lines.
+# Place the word %1$S where the number of messages downloaded so far should appear.
+# Place the word %2$S where the total number of messages to receive should appear;
+# Place %3$S where the account name should appear.
+receivingMsgs=Downloading message %1$S of %2$S to %3$S
+
+# Status - connecting to host
+## @name hostContacted
+## @loc None
+#LOCALIZATION NOTE : Do not translate %1$S in the following line.
+# Place %1$S where the account name should appear
+hostContacted=Connect: Host for %1$S contacted, sending login information…
+
+# Status - no messages to download 
+## @name noMessages
+## @loc None
+#LOCALIZATION NOTE : Do not translate %1$S in the following line.
+# Place %1$S where the account name should appear
+noMessages=There are no new messages for %1$S.
+
+# Status - messages received after the download
+## @name receivedMessages
+## @loc None
+#LOCALIZATION NOTE : Do not translate %1$S, %2$S or %3$S in the following line.
+# %1$S will receive the number of messages received
+# %2$S will receive the total number of messages
+# Place %3$S where the account name should appear
+receivedMessages=%3$S Received %1$S of %2$S messages
+
 ## @name MK_POP3_OUT_OF_DISK_SPACE
 ## @loc None
 -321=There is not enough disc space to download new messages. Try deleting old mail, emptying the Deleted folder, and compacting your mail folders, and then try again.
 
 # Status - parsing folder
 ## @name LOCAL_STATUS_SELECTING_MAILBOX
 ## @loc None
 #LOCALIZATION NOTE (4000): Do not translate %s in the following line.
 # Place the word %s where the name of the mailbox should appear
 4000=Building summary file for %S…
 
 # Status - parsing folder
 ## @name LOCAL_STATUS_DOCUMENT_DONE
 ## @loc None
 4001=Done
 
-# Status - receiving message n of m
-## @name LOCAL_STATUS_RECEIVING_MESSAGE_OF
-## @loc None
-#LOCALIZATION NOTE (4002): Do not translate %lu in the following line.
-# Place the word %lu where the number of messages should appear.
-# The first %lu will receive the number of messages received so far;
-# the second %lu will receive the total number of messages
-4002=Downloading message %S of %S
-
 # Status - pop3 server error
 ## @name POP3_SERVER_ERROR
 ## @loc None
 #LOCALIZATION NOTE (4003): Do not translate POP3 in the following line.
 4003=An error occurred with the POP3 mail server.
 
 # Status - pop3 user name failed
 ## @name POP3_USERNAME_FAILURE
@@ -96,35 +119,16 @@ 4005=Sending of password did not succeed
 ## @loc None
 4006=Unable to write the email to the mailbox. Make sure the file system allows you write privileges, and you have enough disc space to copy the mailbox.
 
 # Status - write error occurred
 ## @name POP3_MESSAGE_FOLDER_BUSY
 ## @loc None
 4029=This folder is being processed. Please wait until processing is complete to get messages.
 
-# Status - connecting to host
-## @name POP3_CONNECT_HOST_CONTACTED_SENDING_LOGIN_INFORMATION
-## @loc None
-4007=Connect: Host contacted, sending login information…
-
-# Status - no messages to download 
-## @name POP3_NO_MESSAGES
-## @loc None
-4008=There are no new messages on the server.
-
-# Status - messages received after the download
-## @name POP3_DOWNLOAD_COUNT
-## @loc None
-#LOCALIZATION NOTE (4009): Do not translate %ld in the following line.
-# Place the word %ld where the number of messages should appear.
-# The first %ld will receive the number of messages received so far;
-# the second %ld will receive the total number of messages
-4009=Received %ld of %ld messages
-
 # Status - retr failure from the server
 ## @name POP3_RETR_FAILURE
 ## @loc None
 # LOCALIZATION NOTE(4012): Do not translate the word "POP3" below.
 4012=The RETR command did not succeed. Error retrieving a message.
 
 # Status - password undefined 
 ## @name POP3_PASSWORD_UNDEFINED
@@ -160,21 +164,16 @@ 4025= Mail server %S responded:
 ## @name COPYING_MSGS_STATUS
 ## @loc None
 4027=Copying %S of %S messages to %S
 
 ## @name MOVING_MSGS_STATUS
 ## @loc None
 4028=Moving %S of %S messages to %S
 
-# secure authentication failed
-## @name CANNOT_PROCESS_SECURE_AUTH
-## @loc None
-4030=Mail server does not support secure authentication.
-
 ## @name MOVEMAIL_CANT_OPEN_SPOOL_FILE
 ## @loc None
 4033=Unable to open mail spool file %S.
 
 ## @name MOVEMAIL_CANT_CREATE_LOCK
 ## @loc None
 4034=Unable to create lock file %S. For movemail to work, it is necessary to create lock files in the mail spool directory. On many systems, this is best accomplished by making the spool directory be mode 01777.
 
@@ -187,17 +186,17 @@ 4035=Unable to delete lock file %S.
 4036=Unable to truncate spool file %S.
 
 ## @name MOVEMAIL_SPOOL_FILE_NOT_FOUND
 ## @loc None
 4037=Unable to locate mail spool file.
 
 ## @name POP3_TMP_DOWNLOAD_FAILED
 ## @loc None
-4038=There was an error downloading the following message:   \nFrom: %S\n   Subject: %S\n This message may contain a virus or there is not enough disk space. Skip this message?
+4038=There was an error downloading the following message:   \nFrom: %S\n   Subject: %S\n This message may contain a virus or there is not enough disc space. Skip this message?
 
 # Status - the server doesn't support UIDL…
 ## @name POP3_SERVER_DOES_NOT_SUPPORT_UIDL_ETC
 ## @loc None
 # LOCALIZATION NOTE(4010): The following sentence should be translated in this way:
 # Do not translate "POP3"
 # Do not translate "%S". Place %S in your translation where the name of the server should appear.
 # Do not translate "UIDL"
@@ -207,30 +206,51 @@ 4040=The POP3 mail server (%S) does not 
 ## @name POP3_SERVER_DOES_NOT_SUPPORT_THE_TOP_COMMAND
 ## @loc None
 # LOCALIZATION NOTE(4011): The following sentence should be translated in this way:
 # Do not translate "POP3"
 # Do not translate "%S". Place %S in your translation where the name of the server should appear.
 # Do not translate "TOP"
 4041=The POP3 mail server (%S) does not support the TOP command. Without server support for this, we cannot implement the ``Maximum Message Size'' or ``Fetch Headers Only'' preference.  This option has been disabled, and messages will be downloaded regardless of their size.
 
-# secure authentication failed and unsure why
-## @name CANNOT_PROCESS_APOP_AUTH
-## @loc None
-4042=The mail server does not support secure authentication or you have entered an incorrect password. Please check your password, or turn off secure authentication in the Server Settings for your mail server in the Account Settings window.\n
-
 ## @name NS_ERROR_COULD_NOT_CONNECT_VIA_TLS
 ## @loc None
 4043=Unable to establish TLS connection to POP3 server. The server may be down or may be incorrectly configured. Please verify the correct configuration in the Server Settings for your mail server in the Account Settings window and try again.
 
 ## @name POP3_MOVE_FOLDER_TO_TRASH
 ## @loc None
 # LOCALIZATION NOTE (4044): Do not translate the word %S below.
-# "%S" is the the name of the folder.
+# "%S" is the name of the folder.
 4044=Are you sure you want to delete the folder '%S'?
 
 ## @name POP3_DELETE_FOLDER_DIALOG_TITLE
 ## @loc None
 4045=Delete Folder
 
 ## @name POP3_DELETE_FOLDER_BUTTON_LABEL
 ## @loc None
 4046=&Delete Folder
+
+## @name POP3_AUTH_INTERNAL_ERROR
+## @loc None
+4047=Internal state error during POP3 server authentication. This is an internal, unexpected error in the application, please report it as bug.
+
+## @name POP3_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
+## @loc None
+4048=This POP3 server does not seem to support encrypted passwords. If you just set up the account, please try changing to 'Password, transmitted insecurely' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, this is a common scenario how someone could steal your password.
+
+## @name POP3_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
+## @loc None
+4049=This POP3 server does not seem to support encrypted passwords. If you just set up this account, please try changing to 'Normal password' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, please contact your email administrator or provider.
+
+## @name POP3_AUTH_CHANGE_PLAIN_TO_ENCRYPT
+## @loc None
+4050=This POP3 server does not allow plaintext passwords. Please try changing to 'Encrypted password' as the 'Authentication method' in the 'Account Settings | Server settings'.
+
+# Authentication server caps and pref don't match
+## @name POP3_AUTH_MECH_NOT_SUPPORTED
+## @loc None
+4051=The server does not support the selected authentication method. Please change the 'Authentication method' in the 'Account Settings | Server settings'.
+
+# Status - Could not log in to GSSAPI, and it was the only method
+## @name POP3_GSSAPI_FAILURE
+## @loc None
+4052=The Kerberos/GSSAPI ticket was not accepted by the POP server. Please check that you are logged in to the Kerberos/GSSAPI realm.
--- a/suite/chrome/mailnews/messenger.dtd
+++ b/suite/chrome/mailnews/messenger.dtd
@@ -17,16 +17,17 @@
  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):
     Karsten Düsterloh <mnyromyr@tprac.de>
     Jeremy Morton <bugzilla@game-point.net>
+    Ian Neal <iann_bugzilla@blueyonder.co.uk>
 
  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
@@ -120,18 +121,16 @@
 <!ENTITY undeleteMsgCmd.label "Undelete Message">
 <!ENTITY undeleteMsgCmd.accesskey "d">
 <!ENTITY cancelNewsMsgCmd.label "Cancel Message">
 <!ENTITY cancelNewsMsgCmd.accesskey "n">
 <!ENTITY deleteMsgsCmd.label "Delete Selected Messages">
 <!ENTITY deleteMsgsCmd.accesskey "D">
 <!ENTITY undeleteMsgsCmd.label "Undelete Selected Messages">
 <!ENTITY undeleteMsgsCmd.accesskey "d">
-<!ENTITY cancelNewsMsgsCmd.label "Cancel Selected Messages">
-<!ENTITY cancelNewsMsgsCmd.accesskey "n">
 <!ENTITY deleteFolderCmd.label "Delete Folder">
 <!ENTITY deleteFolderCmd.accesskey "D">
 <!ENTITY unsubscribeNewsgroupCmd.label "Unsubscribe">
 <!ENTITY unsubscribeNewsgroupCmd.accesskey "n">
 <!ENTITY selectMenu.label "Select">
 <!ENTITY selectMenu.accesskey "S">
 <!ENTITY selectThreadCmd.label "Thread">
 <!ENTITY selectThreadCmd.accesskey "T">
@@ -152,25 +151,22 @@
 <!ENTITY redoCopyMsgCmd.label "Redo Copy Message">
 <!ENTITY undoMarkAllCmd.label "Undo Mark All Read">
 <!ENTITY redoMarkAllCmd.label "Redo Mark All Read">
 <!ENTITY undoDefaultCmd.label "Undo">
 <!ENTITY redoDefaultCmd.label "Redo">
 
 <!-- View Menu -->
 <!ENTITY showMessengerToolbarCmd.label		"Mail Toolbar">
-<!ENTITY showMessengerToolbarCmd.accesskey	"o">
+<!ENTITY showMessengerToolbarCmd.accesskey	"M">
  
 <!-- showSearchToolbarCmd is also used by addressbook -->
 <!ENTITY showSearchToolbarCmd.label		"Search Bar">
 <!ENTITY showSearchToolbarCmd.accesskey	"e">
 
-<!ENTITY showLocationToolbarCmd.label "Location Toolbar">
-<!ENTITY showLocationToolbarCmd.accesskey "L">
-
 <!ENTITY messagePaneLayoutStyle.label "Layout">
 <!ENTITY messagePaneLayoutStyle.accesskey "L">
 <!ENTITY messagePaneClassic.label "Classic View">
 <!ENTITY messagePaneClassic.accesskey "C">
 <!ENTITY messagePaneWide.label "Wide View">
 <!ENTITY messagePaneWide.accesskey "W">
 <!ENTITY messagePaneVertical.label "Vertical View">
 <!ENTITY messagePaneVertical.accesskey "V">
@@ -313,17 +309,17 @@
 <!ENTITY prevMsgCmd.accesskey "M">
 <!ENTITY prevMsgCmd.key "b">
 <!ENTITY prevUnreadMsgCmd.label "Unread Message">
 <!ENTITY prevUnreadMsgCmd.accesskey "U">
 <!ENTITY prevUnreadMsgCmd.key "p">
 <!ENTITY goBackCmd.label "Back">
 <!ENTITY goBackCmd.accesskey "B">
 <!ENTITY goBackCmd.commandKey "[">
-<!ENTITY goForwardCmd.label "Forward">
+<!ENTITY goForwardCmd.label "Forwards">
 <!ENTITY goForwardCmd.accesskey "F">
 <!ENTITY goForwardCmd.commandKey "]">
 <!ENTITY prevFlaggedMsgCmd.label "Flagged Message">
 <!ENTITY prevFlaggedMsgCmd.accesskey "F">
 <!ENTITY startPageCmd.label "Mail Start Page">
 <!ENTITY startPageCmd.accesskey "S">
 
 <!-- Message Menu -->
@@ -484,21 +480,22 @@
 <!ENTITY goForwardButton.label "Go Forwards">
 <!ENTITY deleteButton.label "Delete">
 <!ENTITY undeleteButton.label "Undelete">
 <!ENTITY markButton.label "Mark">
 <!ENTITY printButton.label "Print">
 <!ENTITY stopButton.label "Stop">
 <!ENTITY junkButton.label "Junk">
 <!ENTITY notJunkButton.label "Not Junk">
+<!ENTITY searchButton.title "Advanced Search">
 
 <!-- Tooltips -->
 <!ENTITY menuBar.tooltip "Menu Bar">
 <!ENTITY mailToolbar.tooltip "Mail Toolbar">
-<!ENTITY locationToolbar.tooltip "Location Toolbar">
+<!ENTITY searchToolbar.tooltip "Search Bar">
 <!ENTITY advancedButton.tooltip "Advanced message search">
 <!ENTITY getMsgButton.tooltip "Get new messages">
 <!ENTITY newMsgButton.tooltip "Create a new message">
 <!ENTITY replyButton.tooltip "Reply to the message">
 <!ENTITY replyAllButton.tooltip "Reply to sender and all recipients">
 <!ENTITY replyAllButtonNews.tooltip "Reply to sender and newsgroup">
 <!ENTITY forwardButton.tooltip "Forward selected message">
 <!ENTITY fileButton.tooltip "File selected message">
@@ -584,27 +581,33 @@
 <!ENTITY folderContextSearchMessages.accesskey "S">
 <!ENTITY folderContextProperties.label "Properties…">
 <!ENTITY folderContextProperties.accesskey "P">
 <!ENTITY folderContextSettings.label "Settings…">
 <!ENTITY folderContextSettings.accesskey "e">
 
 <!-- focusSearchInput.key also used by addressbook -->
 <!ENTITY focusSearchInput.key "k">
-<!ENTITY searchSubjectOrAddress.emptytext "Search Subject or Address">
 <!ENTITY advancedButton.label "Advanced…">
 <!ENTITY advancedButton.accesskey "A">
+<!ENTITY searchButton.label "Search Messages…">
+<!ENTITY searchButton.accesskey "S">
 
 <!ENTITY all.label "All">
 <!ENTITY all.accesskey "A">
 
 <!-- Junk Bar -->
 <!ENTITY junkBarMessage.label "&brandShortName; thinks this message is junk.">
 <!ENTITY junkBarButton.label "This is Not Junk">
 <!ENTITY junkInfoButton.label "?">
 
 <!-- Remote Content Bar -->
 <!ENTITY remoteContentMessage.label "To protect your privacy, &brandShortName; has blocked remote content in this message.">
 <!ENTITY loadRemoteContentButton.label "Show Remote Content">
 
 <!-- Phishing Bar -->
 <!ENTITY phishingBarMessage.label "&brandShortName; thinks this message might be an email scam.">
 <!ENTITY removePhishingBarButton.label "Not a Scam">
+
+<!-- MDN Bar -->
+<!ENTITY mdnBarMessage.label "The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?">
+<!ENTITY mdnBarIgnoreButton.label "Ignore Request">
+<!ENTITY mdnBarSendButton.label "Send Receipt">
--- a/suite/chrome/mailnews/messenger.properties
+++ b/suite/chrome/mailnews/messenger.properties
@@ -58,16 +58,17 @@ reply=Reply
 EMLFiles=Mail Files
 OpenEMLFiles=Open Message
 # LOCALIZATION NOTE(defaultSaveMessageAsFileName): Do not translate ".eml" 
 # in the line below.  Also, the complete file name should 8.3
 defaultSaveMessageAsFileName=message.eml
 SaveMailAs=Save Message As
 SaveAttachment=Save Attachment
 SaveAllAttachments=Save All Attachments
+ChooseFolder=Choose Folder
 LoadingMessageToPrint=Loading message to print…
 MessageLoaded=Message loaded…
 PrintingMessage=Printing message…
 PrintPreviewMessage=Print Previewing message…
 PrintingContact=Printing contact…
 PrintPreviewContact=Print Previewing contact…
 PrintingAddrBook=Printing AddressBook…
 PrintPreviewAddrBook=Print Previewing AddressBook…
@@ -131,16 +132,28 @@ smtpServer-ConnectionSecurityType-0=None
 smtpServer-ConnectionSecurityType-1=STARTTLS, if available
 smtpServer-ConnectionSecurityType-2=STARTTLS
 smtpServer-ConnectionSecurityType-3=SSL/TLS
 smtpServer-SecureAuthentication-Type-false=No
 smtpServer-SecureAuthentication-Type-true=Yes
 smtpServers-confirmServerDeletionTitle=Delete Server
 smtpServers-confirmServerDeletion=Are you sure you want to delete the server: \n %S?
 
+# Account Settings - Both Incoming and SMTP server
+authNo=No authentication
+authOld=Password, original method (insecure)
+authPasswordCleartextInsecurely=Password, transmitted insecurely
+authPasswordCleartextViaSSL=Normal password
+authPasswordEncrypted=Encrypted password
+authKerberos=Kerberos / GSSAPI
+authExternal=TLS Certificate
+authNTLM=NTLM
+authAnySecure=Any secure method (deprecated)
+authAny=Any method (insecure)
+
 # LOCALIZATION NOTE(serverType-nntp): Do not translate "NNTP" in the line below
 serverType-nntp=News Server (NNTP)
 # LOCALIZATION NOTE(serverType-pop3): Do not translate "POP" in the line below
 serverType-pop3=POP Mail Server
 # LOCALIZATION NOTE(serverType-imap): Do not translate "IMAP" in the line below
 serverType-imap=IMAP Mail Server
 serverType-none=Local Mail Store
 # LOCALIZATION NOTE(serverType-movemail): DONT_TRANSLATE
@@ -321,16 +334,19 @@ detachAttachments=The following attachme
 deleteAttachmentFailure=Failed to delete the selected attachments.
 
 # This is the format for prepending accesskeys to the
 # each of the attachments in the file|attachments menu:
 #   ie: 1 file.txt
 #       2 another file.txt
 attachmentDisplayNameFormat=%S %S
 
+# This is the heading for the attachment summary when printing an email
+attachmentsPrintHeader=Attachments:
+
 # Connection Error Messages
 101=Unknown Error 
 102=Failed to connect to server %S.
 103=Could not connect to server %S; the connection was refused.
 104=Connection to server %S timed out.
 
 # LOCALIZATION NOTE(biffNotification): %1$S is the number of new messages  
 biffNotification_message=has %1$S new message
@@ -381,30 +397,32 @@ confirmResetJunkTrainingText=Are you sur
 
 # for the virtual folder list dialog title
 # %S is the name of the saved search folder
 editVirtualFolderPropertiesTitle=Edit Saved Search Properties for %S
 
 #alert to inform the user to choose one or more folders to search for a saved search folder
 alertNoSearchFoldersSelected=You must choose at least one folder to search for the saved search folder.
 
-# These two are displayed in the message and folder pane windows
-# LOCALIZATION NOTE(????ByteAbbreviation): Do not translate %d below, it is the size of the message/folder
-kiloByteAbbreviation=%dkB
-megaByteAbbreviation=%dMB
+# These are displayed in the message and folder pane windows
+# LOCALIZATION NOTE %.*f is the abbreviated size in the appropriate units
+byteAbbreviation2=%.*f bytes
+kiloByteAbbreviation2=%.*f kB
+megaByteAbbreviation2=%.*f MB
+gigaByteAbbreviation2=%.*f GB
 
 # Error message if message for a message id wasn't found
 errorOpenMessageForMessageIdTitle=Error opening message-id
 errorOpenMessageForMessageIdMessage=Message for message-id %S not found
 
 # Warnings to alert users about phishing urls
 confirmPhishingTitle=Email Scam Alert
 #LOCALIZATION NOTE %1$S is the brand name, %2$S is the host name of the url being visited
-confirmPhishingUrl1=%1$S thinks this site is suspicious! It may be trying to impersonate the web page you want to visit. Most legitimate sites use names instead of numbers. Are you sure you want to visit %2$S?
-confirmPhishingUrl2=%1$S thinks this site is suspicious! It may be trying to impersonate the web page you want to visit. Are you sure you want to visit %2$S?
+confirmPhishingUrl1=%1$S thinks this site is suspicious! It may be trying to impersonate the web page you want to visit. Most legitimate web sites use names instead of numbers. Are you sure you want to visit %2$S?
+confirmPhishingUrl2=%1$S thinks this web site is suspicious! It may be trying to impersonate the web page you want to visit. Are you sure you want to visit %2$S?
 
 #LOCALIZATION NOTE %1$S is the e-mail address of the person we will allow remote content for
 alwaysLoadRemoteContentForSender=Click here to always load remote content from %1$S.
 
 # Strings for growl notifications on Mac OS X
 growlNotification=New Mail
 
 # mailCommands.js
--- a/suite/chrome/mailnews/msgHdrViewOverlay.dtd
+++ b/suite/chrome/mailnews/msgHdrViewOverlay.dtd
@@ -49,23 +49,23 @@
 <!ENTITY followupToField.label "Followup-To: ">
 
 <!ENTITY tagsHdr.label "Tags: ">
 <!ENTITY dateField.label "Date: ">
 <!ENTITY userAgentField.label "User-Agent: ">
 <!ENTITY referencesField.label "References: ">
 <!ENTITY messageIdField.label "Message-ID: ">
 <!ENTITY inReplyToField.label "In-Reply-To: ">
-<!ENTITY originalWebsite.label "Website: ">
+<!ENTITY originalWebsite.label "Web Site: ">
 
 <!ENTITY editMessage.label                 "Edit Draft…">
 <!ENTITY editMessage.accesskey             "D">
 
 <!ENTITY attachmentsTree.label             "Attachments:">
-<!ENTITY attachmentsTree.accesskey         "A">
+<!ENTITY attachmentsTree.accesskey         "c">
 <!ENTITY openAttachmentCmd.label           "Open">
 <!ENTITY openAttachmentCmd.accesskey       "O">
 <!ENTITY viewAttachmentCmd.label           "View Source">
 <!ENTITY viewAttachmentCmd.accesskey       "V">
 <!ENTITY saveAsAttachmentCmd.label         "Save As…">
 <!ENTITY saveAsAttachmentCmd.accesskey     "A">
 <!ENTITY detachAttachmentCmd.label         "Detach…">
 <!ENTITY detachAttachmentCmd.accesskey     "h">
--- a/suite/chrome/mailnews/msgSynchronize.dtd
+++ b/suite/chrome/mailnews/msgSynchronize.dtd
@@ -11,9 +11,9 @@
 <!ENTITY sendMessage.label "Send Unsent messages">
 <!ENTITY sendMessage.accesskey "S">
 <!ENTITY workOffline.label "Work offline once download and/or synchronisation is complete">
 <!ENTITY workOffline.accesskey "W">
 <!ENTITY selectButton.label "Select…">
 <!ENTITY selectButton.accesskey "e">
 <!ENTITY MsgSelectDesc.label "Choose mail folders and newsgroups for offline use.">
 <!ENTITY MsgSelectInd.label "Download">
-<!ENTITY MsgSelectItems.label "Folders and Newsgroups">
\ No newline at end of file
+<!ENTITY MsgSelectItems.label "Folders and Newsgroups">
--- a/suite/chrome/mailnews/msgmdn.properties
+++ b/suite/chrome/mailnews/msgmdn.properties
@@ -36,19 +36,16 @@
 #***** END LICENSE BLOCK *****
 ## Msg Mdn Report strings
 MsgMdnDisplayed=Note: This Return Receipt only acknowledges that the message was displayed on the recipient's computer. There is no guarantee that the recipient has read or understood the message contents.
 MsgMdnDispatched=The message was either printed, faxed, or forwarded without being displayed to the recipient. There is no guarantee that the recipient will read the message at a later time.
 MsgMdnProcessed=The message was processed by the recipient's mail client without being displayed. There is no guarantee that the message will be read at a later time.
 MsgMdnDeleted=The message has been deleted. The person you sent it to may or may not have seen it. They might undelete it at a later time and read it.
 MsgMdnDenied=The recipient of the message does not wish to send a return receipt back to you.
 MsgMdnFailed=A failure occurred. A proper return receipt could not be generated or sent to you.
-MsgMdnWishToSend=The sender of this message has asked to be notified when you read this message.\n\nDo you wish to notify the sender?
-MsgMdnIgnoreRequest=Ignore Request
-MsgMdnSendReceipt=Send Receipt
 # LOCALIZATION NOTE : Do not translate the word "%S" below.
 MsgMdnMsgSentTo=This is a Return Receipt for the mail that you sent to %S.
 MdnDisplayedReceipt=Return Receipt (displayed)
 MdnDispatchedReceipt=Return Receipt (dispatched)
 MdnProcessedReceipt=Return Receipt (processed)
 MdnDeletedReceipt=Return Receipt (deleted)
 MdnDeniedReceipt=Return Receipt (denied)
 MdnFailedReceipt=Return Receipt (failed)
--- a/suite/chrome/mailnews/newFolderDialog.dtd
+++ b/suite/chrome/mailnews/newFolderDialog.dtd
@@ -40,8 +40,10 @@
 <!ENTITY name.label                 "Name:">
 <!ENTITY name.accesskey             "n">
 <!ENTITY description.label          "Create as a subfolder of:">
 <!ENTITY description.accesskey      "c">
 <!ENTITY folderRestriction1.label   "This server restricts folders to two special kinds.">
 <!ENTITY folderRestriction2.label   "Allow your new folder to contain:">
 <!ENTITY foldersOnly.label          "Folders Only">
 <!ENTITY messagesOnly.label         "Messages Only">
+<!ENTITY accept.label               "Create Folder">
+<!ENTITY accept.accesskey           "r">
--- a/suite/chrome/mailnews/news.properties
+++ b/suite/chrome/mailnews/news.properties
@@ -62,18 +62,16 @@ newNewsgroupHeaders=Downloading %1$S of 
 # header being filtered on, %2$S is the number of the current header being
 # downloaded, %3$S is the number of headers to be downloaded, and %4$S is the
 # newsgroup whose headers are being downloaded.
 newNewsgroupFilteringHeaders=Getting headers for filters: %1$S (%2$S/%3$S) on %4$S
 downloadingArticles=Downloading articles %S-%S
 bytesReceived=Downloading newsgroups: %S received (%SkB read at %SkB/sec)
 downloadingArticlesForOffline=Downloading articles %S-%S in %S
 
-onlyCancelOneMessage=You can only cancel one article at a time.
-
 # LOCALIZATION NOTE (autoUnsubscribeText): %1$S is the newsgroup and %2$S is the newsgroup-server it is being removed from.
 autoUnsubscribeText=The newsgroup %1$S does not appear to exist on the host %2$S.  Would you like to unsubscribe from it?
 
 # LOCALIZATION NOTE (autoSubscribeText): %1$S is the newsgroup.
 autoSubscribeText=Would you like to subscribe to %1$S?
 
 # LOCALIZATION NOTE (Error -304): In the following item, don't translate "NNTP"
 # Error - server error
--- a/suite/chrome/mailnews/renameFolderDialog.dtd
+++ b/suite/chrome/mailnews/renameFolderDialog.dtd
@@ -1,3 +1,5 @@
 <!ENTITY renameFolderDialog.title          "Rename Folder">
 <!ENTITY rename.label                      "Enter the new name for your folder:">
 <!ENTITY rename.accesskey                  "E">
+<!ENTITY accept.label                      "Rename">
+<!ENTITY accept.accesskey                  "R">
--- a/suite/chrome/mailnews/searchTermOverlay.dtd
+++ b/suite/chrome/mailnews/searchTermOverlay.dtd
@@ -1,14 +1,14 @@
 <!ENTITY matchAll.label     "Match all of the following">
-<!ENTITY matchAll.accesskey "a">
+<!ENTITY matchAll.accesskey "M">
 <!ENTITY matchAny.label     "Match any of the following">
-<!ENTITY matchAny.accesskey "o">
+<!ENTITY matchAny.accesskey "a">
 <!ENTITY matchAllMsgs.label     "Match all messages">
-<!ENTITY matchAllMsgs.accesskey "m">
+<!ENTITY matchAllMsgs.accesskey "t">
 <!-- LOCALIZATION NOTE  
   The values below are used to control the widths of the search widgets.
   Change the values only when the localized strings in the popup menus
   are truncated in the widgets.
  -->
 <!ENTITY searchTermListAttributesFlexValue "5">
 <!ENTITY searchTermListOperatorsFlexValue "5">
 <!ENTITY searchTermListValueFlexValue "5">
--- a/suite/chrome/mailnews/smime/am-smime.properties
+++ b/suite/chrome/mailnews/smime/am-smime.properties
@@ -12,8 +12,13 @@ NoSigningCert=Certificate Manager can't 
 NoEncryptionCert=Certificate Manager can't locate a valid certificate that other people can use to send you encrypted email messages.
 
 encryption_needCertWantSame=You should also specify a certificate for other people to use when they send you encrypted messages. Do you want to use the same certificate to encrypt & decrypt messages sent to you?
 encryption_wantSame=Do you want to use the same certificate to encrypt & decrypt messages sent to you?
 encryption_needCertWantToSelect=You should also specify a certificate for other people to use when they send you encrypted messages. Do you want to configure an encryption certificate now?
 signing_needCertWantSame=You should also specify a certificate to use for digitally signing your messages. Do you want to use the same certificate to digitally sign your messages?
 signing_wantSame=Do you want to use the same certificate to digitally sign your messages?
 signing_needCertWantToSelect=You should also specify a certificate to use for digitally signing your messages. Do you want to configure a certificate for digitally signing messages now?
+
+## Strings used by nsMsgComposeSecure
+mime_multipartSignedBlurb=This is a cryptographically signed message in MIME format.
+mime_smimeEncryptedContentDesc=S/MIME Encrypted Message
+mime_smimeSignatureContentDesc=S/MIME Cryptographic Signature
--- a/suite/chrome/mailnews/smime/msgCompSMIMEOverlay.dtd
+++ b/suite/chrome/mailnews/smime/msgCompSMIMEOverlay.dtd
@@ -1,21 +1,15 @@
 <!--LOCALIZATION NOTE msgCompSMIMEOverlay.dtd UI for s/mime hooks in message composition -->
 
-<!ENTITY securityMenu.label "Security">
-<!ENTITY securityMenu.accesskey "e">
-
 <!ENTITY menu_securityEncryptRequire.label "Encrypt This Message">
 <!ENTITY menu_securityEncryptRequire.accesskey "E">
 
-<!ENTITY menu_securityNoEncryption.label "Do Not Encrypt This Message">
-<!ENTITY menu_securityNoEncryption.accesskey "N">
-
 <!ENTITY menu_securitySign.label "Digitally Sign This Message">
-<!ENTITY menu_securitySign.accesskey "S">
+<!ENTITY menu_securitySign.accesskey "M">
 
 <!ENTITY menu_securityStatus.label "View Security Info">
 <!ENTITY menu_securityStatus.accesskey "I">
 
 <!ENTITY securityButton.label "Security">
 <!ENTITY securityButton.tooltip "View or change security settings">
 
 <!ENTITY menu_viewSecurityStatus.label "Message Security Info">
--- a/suite/chrome/mailnews/smime/msgSecurityInfo.properties
+++ b/suite/chrome/mailnews/smime/msgSecurityInfo.properties
@@ -26,15 +26,15 @@ SIPartiallyValidHeader=Although the digi
 SIHeaderMismatch=The email address listed in the signer's certificate is different from the email address that was used to send this message. Please look at the details of the signature certificate to learn who signed the message.
 SICertWithoutAddress=The certificate used to sign the message does not contain an email address. Please look at the details of the signature certificate to learn who signed the message.
 
 ## Encryption Information strings
 EINoneLabel=Message Not Encrypted
 EINone=This message was not encrypted before it was sent. Information sent over the Internet without encryption can be seen by other people while in transit.
 
 EIValidLabel=Message Is Encrypted
-EIValid=This message was encrypted before it was sent to you. Encryption makes it very difficult for other people to view information while it is traveling over the network.
+EIValid=This message was encrypted before it was sent to you. Encryption makes it very difficult for other people to view information while it is travelling over the network.
 
 EIInvalidLabel=Message Cannot Be Decrypted
 EIInvalidHeader=This message was encrypted before it was sent to you, but it cannot be decrypted.
 
 EIContentAltered=The message contents appear to have been altered during transmission.
 EIClueless=There are unknown problems with this encrypted message.
new file mode 100644
--- /dev/null
+++ b/suite/chrome/mailnews/vCardImportMsgs.properties
@@ -0,0 +1,22 @@
+#
+# The following are used by the vCard import code to display status, error, and
+# informational messages
+#
+
+vCardImportName=vCard file (.vcf)
+
+vCardImportDescription=Import an address book from vCard format
+
+vCardImportAddressName=vCard Address Book
+
+# LOCALIZATION NOTE (vCardImportAddressSuccess): %S is replaced by the
+# name of the address book being imported.
+vCardImportAddressSuccess=Imported address book %S
+
+# LOCALIZATION NOTE (vCardImportAddressSuccess): %S is replaced by the
+# name of the address book being imported.
+vCardImportAddressBadSourceFile=Error accessing file for address book %S.
+
+# LOCALIZATION NOTE (vCardImportAddressSuccess): %S is replaced by the
+# name of the address book being imported.
+vCardImportAddressConvertError=Error importing address book %S, all addresses may not have been imported.
--- a/suite/chrome/mailnews/virtualFolderProperties.dtd
+++ b/suite/chrome/mailnews/virtualFolderProperties.dtd
@@ -7,8 +7,12 @@
 <!ENTITY searchTermCaption.label       "Configure the search criteria used for this saved search folder: ">
 
 <!ENTITY folderSelectionCaption.label  "Select the folders to search: ">
 <!ENTITY chooseFoldersButton.label     "Choose…">
 <!ENTITY chooseFoldersButton.accesskey "h">
 
 <!ENTITY searchOnline.label            "Search Online (Gives up-to-date results for IMAP and News folders but increases time to open the folder)">
 <!ENTITY searchOnline.accesskey        "S">
+<!ENTITY newFolderButton.label         "Create">
+<!ENTITY newFolderButton.accesskey     "r">
+<!ENTITY editFolderButton.label        "Update">
+<!ENTITY editFolderButton.accesskey    "U">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/mailnews/wmImportMsgs.properties
@@ -0,0 +1,108 @@
+# ***** 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.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either 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 *****
+
+#
+# The following are used by the windows live mail import code to display status/error
+# and informational messages
+#
+
+# Short name of import module
+## @name WMIMPORT_NAME
+## @loc None
+## LOCALIZATION NOTE (2000): DONT_TRANSLATE
+2000=Windows Live Mail
+
+# Description of import module
+## @name WMIMPORT_DESCRIPTION
+## @loc None
+## LOCALIZATION NOTE (2001): In this item, don't translate "Windows Live Mail"
+2001=Windows Live Mail settings
+
+# Success message
+## @name WMIMPORT_MAILBOX_SUCCESS
+## @loc None
+## LOCALIZATION NOTE (2002): In this item, don't translate "%1$S" or "%2$d"
+## The variable %1$S will contain the name of the Mailbox
+## The variable %2$d will contain the number of messages
+2002=Mailbox %1$S, imported %2$d messages
+
+# Error message
+## @name WMIMPORT_MAILBOX_BADPARAM
+## @loc None
+2003=Bad parameter passed to import mailbox.
+
+# Error message
+## @name WMIMPORT_MAILBOX_BADSOURCEFILE
+## @loc None
+## LOCALIZATION NOTE (2004): In this item, don't translate "%S"
+## The variable %S will contain the name of the Mailbox
+2004=Error accessing file for mailbox %S.
+
+# Error message
+## @name WMIMPORT_MAILBOX_CONVERTERROR
+## @loc None
+## LOCALIZATION NOTE (2005): In this item, don't translate "%S"
+## The variable %S will contain the name of the Mailbox
+2005=Error importing mailbox %S, all messages may not be imported from this mailbox.
+
+# Default name of imported addressbook
+## @name WMIMPORT_DEFAULT_NAME
+## @loc None
+2006=Windows Live Mail Address Book
+
+# Autofind description
+## @name WMIMPORT_AUTOFIND
+## @loc None
+2007=Windows Live Mail address book (windows address book)
+
+# Description
+## @name WMIMPORT_ADDRESS_SUCCESS
+## @loc None
+## LOCALIZATION NOTE (2006): In this item, don't translate "%S"
+## The variable %S will receive the name of the address book
+2008=Imported address book %S
+
+# Error message
+## @name WMIMPORT_ADDRESS_CONVERTERROR
+## @loc None
+## LOCALIZATION NOTE (2009): In this item, don't translate "%S"
+## The variable %S will receive the name of the address book
+2009=Error importing address book %S, all addresses may not have been imported.
+
+# Error message
+## @name WMIMPORT_ADDRESS_BADPARAM
+## @loc None
+2010=Bad parameter passed to import addressbook.