Update for Thunderbird en-GB. /mail files
authorMark Tyndall <moz_en-gb@tyndall.org.uk>
Thu, 04 Sep 2008 19:48:13 +0100
changeset 7 cc1f746a5c8af54de2696b95a431b0e9b710a276
parent 6 1e32f1361b9ac3fd3f039245058ebdfe46a1bdb6
child 8 58b8a5a4183a5a53fad4929b5f1ea71779d4da16
push id8
push usermoz_en-gb@tyndall.org.uk
push dateFri, 05 Sep 2008 08:20:10 +0000
Update for Thunderbird en-GB. /mail files
mail/README.txt
mail/all-l10n.js
mail/chrome/branding/brand.dtd
mail/chrome/branding/brand.properties
mail/chrome/communicator/contentAreaCommands.dtd
mail/chrome/communicator/contentAreaCommands.properties
mail/chrome/communicator/utilityOverlay.dtd
mail/chrome/communicator/utilityOverlay.properties
mail/chrome/communicator/wallet/SignonViewer.properties
mail/chrome/global-platform/win/nsWindowsHooks.properties
mail/chrome/global/charset.dtd
mail/chrome/messenger-newsblog/am-newsblog.dtd
mail/chrome/messenger-newsblog/feed-properties.dtd
mail/chrome/messenger-newsblog/newsblog.dtd
mail/chrome/messenger-offline/offline.dtd
mail/chrome/messenger-offline/offline.properties
mail/chrome/messenger-region/region.properties
mail/chrome/messenger/AccountManager.dtd
mail/chrome/messenger/AccountWizard.dtd
mail/chrome/messenger/FilterEditor.dtd
mail/chrome/messenger/FilterListDialog.dtd
mail/chrome/messenger/SearchDialog.dtd
mail/chrome/messenger/aboutDialog.dtd
mail/chrome/messenger/addressbook/abAddressBookNameDialog.dtd
mail/chrome/messenger/addressbook/abCardOverlay.dtd
mail/chrome/messenger/addressbook/abContactsPanel.dtd
mail/chrome/messenger/addressbook/abMainWindow.dtd
mail/chrome/messenger/addressbook/abNewCardDialog.dtd
mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd
mail/chrome/messenger/addressbook/abSelectAddressesDialog.dtd
mail/chrome/messenger/addressbook/addressBook.properties
mail/chrome/messenger/addressbook/ldapAutoCompErrs.properties
mail/chrome/messenger/addressbook/pref-directory-add.dtd
mail/chrome/messenger/addressbook/pref-directory.dtd
mail/chrome/messenger/addressbook/replicationProgress.dtd
mail/chrome/messenger/addressbook/replicationProgress.properties
mail/chrome/messenger/am-addressing.dtd
mail/chrome/messenger/am-advanced.dtd
mail/chrome/messenger/am-copies.dtd
mail/chrome/messenger/am-dsn.dtd
mail/chrome/messenger/am-dsn.properties
mail/chrome/messenger/am-identities-list.dtd
mail/chrome/messenger/am-junk.dtd
mail/chrome/messenger/am-main.dtd
mail/chrome/messenger/am-offline.dtd
mail/chrome/messenger/am-server-advanced.dtd
mail/chrome/messenger/am-server-top.dtd
mail/chrome/messenger/am-serverwithnoidentities.dtd
mail/chrome/messenger/am-smime.dtd
mail/chrome/messenger/appleMailImportMsgs.properties
mail/chrome/messenger/baseMenuOverlay.dtd
mail/chrome/messenger/defaultClientDialog.dtd
mail/chrome/messenger/downloadheaders.dtd
mail/chrome/messenger/eudoraImportMsgs.properties
mail/chrome/messenger/fieldMapImport.dtd
mail/chrome/messenger/filter.properties
mail/chrome/messenger/folderProps.dtd
mail/chrome/messenger/imapMsgs.properties
mail/chrome/messenger/importDialog.dtd
mail/chrome/messenger/importMsgs.properties
mail/chrome/messenger/junkLog.dtd
mail/chrome/messenger/junkMail.dtd
mail/chrome/messenger/localMsgs.properties
mail/chrome/messenger/mailEditorOverlay.dtd
mail/chrome/messenger/mailOverlay.dtd
mail/chrome/messenger/mailTasksOverlay.dtd
mail/chrome/messenger/markByDate.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/askSendFormat.dtd
mail/chrome/messenger/messengercompose/askSendFormat.properties
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/messengercompose/mailComposeEditorOverlay.dtd
mail/chrome/messenger/messengercompose/messengercompose.dtd
mail/chrome/messenger/messengercompose/sendProgress.dtd
mail/chrome/messenger/messengercompose/sendProgress.properties
mail/chrome/messenger/migration/migration.dtd
mail/chrome/messenger/mime.properties
mail/chrome/messenger/msgAccountCentral.dtd
mail/chrome/messenger/msgFolderPickerOverlay.dtd
mail/chrome/messenger/msgHdrViewOverlay.dtd
mail/chrome/messenger/msgSynchronize.dtd
mail/chrome/messenger/msgViewPickerOverlay.dtd
mail/chrome/messenger/newTagDialog.dtd
mail/chrome/messenger/news.properties
mail/chrome/messenger/offline.properties
mail/chrome/messenger/offlineStartup.properties
mail/chrome/messenger/preferences/advanced.dtd
mail/chrome/messenger/preferences/changeaction.dtd
mail/chrome/messenger/preferences/compose.dtd
mail/chrome/messenger/preferences/connection.dtd
mail/chrome/messenger/preferences/defaultClient.dtd
mail/chrome/messenger/preferences/display.dtd
mail/chrome/messenger/preferences/downloadactions.dtd
mail/chrome/messenger/preferences/downloads.dtd
mail/chrome/messenger/preferences/fonts.dtd
mail/chrome/messenger/preferences/general.dtd
mail/chrome/messenger/preferences/htmlcompose.dtd
mail/chrome/messenger/preferences/junkLog.dtd
mail/chrome/messenger/preferences/notifications.dtd
mail/chrome/messenger/preferences/offline.dtd
mail/chrome/messenger/preferences/preferences.dtd
mail/chrome/messenger/preferences/preferences.properties
mail/chrome/messenger/preferences/privacy.dtd
mail/chrome/messenger/preferences/sendoptions.dtd
mail/chrome/messenger/prefs.properties
mail/chrome/messenger/search-attributes.properties
mail/chrome/messenger/search.properties
mail/chrome/messenger/searchTermOverlay.dtd
mail/chrome/messenger/shellservice.properties
mail/chrome/messenger/shutdownWindow.properties
mail/chrome/messenger/smtpEditOverlay.dtd
mail/chrome/messenger/subscribe.dtd
mail/chrome/messenger/subscribe.properties
mail/chrome/messenger/tabmail.dtd
mail/chrome/messenger/threadpane.dtd
mail/chrome/messenger/virtualFolderListDialog.dtd
mail/chrome/messenger/virtualFolderProperties.dtd
mail/chrome/mozapps/downloads/pref-downloads.dtd
mail/chrome/navigator-platform/mac/navigator.properties
mail/chrome/navigator-platform/mac/platformNavigationBindings.dtd
mail/chrome/navigator-platform/unix/navigator.properties
mail/chrome/navigator-platform/unix/platformNavigationBindings.dtd
mail/chrome/navigator-platform/win/navigator.properties
mail/chrome/navigator-platform/win/platformNavigationBindings.dtd
mail/chrome/navigator/navigator.properties
mail/defines.inc
mail/installer/custom.properties
mail/installer/installer.inc
mail/installer/mui.properties
mail/installer/override.properties
mail/os2/README.txt
mail/updater/updater.ini
--- a/mail/README.txt
+++ b/mail/README.txt
@@ -1,4 +1,3 @@
-For information about installing, running and configuring Thunderbird
-including a list of known issues and troubleshooting information, 
-refer to: http://getthunderbird.com/releases/
-
+For information about installing, running and configuring Thunderbird
+including a list of known issues and troubleshooting information, 
+refer to: http://getthunderbird.com/releases/
--- a/mail/all-l10n.js
+++ b/mail/all-l10n.js
@@ -1,39 +1,40 @@
-# ***** 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 the Firefox browser.
-#
-# The Initial Developer of the Original Code is
-# Benjamin Smedberg <bsmedberg@covad.net>
-# Portions created by the Initial Developer are Copyright (C) 2004
-# 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 *****
-
-#filter substitution
-
-pref("general.useragent.locale", "@AB_CD@");
+# ***** 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 the Firefox browser.
+#
+# The Initial Developer of the Original Code is
+# Benjamin Smedberg <bsmedberg@covad.net>
+# Portions created by the Initial Developer are Copyright (C) 2004
+# 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 *****
+
+#filter substitution
+
+pref("general.useragent.locale", "@AB_CD@");
+pref("spellchecker.dictionary", "@AB_CD@");
deleted file mode 100644
--- a/mail/chrome/branding/brand.dtd
+++ /dev/null
@@ -1,5 +0,0 @@
-#expand <!ENTITY  lang.version          "__MOZILLA_LOCALE_VERSION__">
-<!ENTITY  brandShortName        "Mail/News">
-<!ENTITY  brandFullName         "Mail/News Client">
-<!ENTITY  vendorShortName       "Mail/News Client">
-<!ENTITY  sidebarName           "Sidebar">
\ No newline at end of file
deleted file mode 100644
--- a/mail/chrome/branding/brand.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-brandShortName=Mail/News
-brandFullName=Mail/News Client
-vendorShortName=Mail/News Client
-sidebarName=Sidebar
deleted file mode 100644
--- a/mail/chrome/communicator/contentAreaCommands.dtd
+++ /dev/null
@@ -1,97 +0,0 @@
-<!-- Context Menu -->
-<!ENTITY popupWindowRejectCmd.label     "Reject popup windows from this site">
-<!ENTITY popupWindowRejectCmd.accesskey "">
-<!ENTITY popupWindowAllowCmd.label      "Allow popup windows from this site">
-<!ENTITY popupWindowAllowCmd.accesskey  "">
-<!ENTITY openLinkCmd.label            "Open Link in New Window">
-<!ENTITY openLinkCmd.accesskey        "W">
-<!ENTITY openLinkCmdInTab.label       "Open Link in New Tab">
-<!ENTITY openLinkCmdInTab.accesskey   "T">
-<!ENTITY openLinkInWindowCmd.label    "Open">
-<!ENTITY openLinkInWindowCmd.accesskey "p">
-<!ENTITY openFrameCmd.label           "Open Frame in New Window">
-<!ENTITY openFrameCmd.accesskey       "W">
-<!ENTITY openFrameCmdInTab.label      "Open Frame in New Tab">
-<!ENTITY openFrameCmdInTab.accesskey  "T">
-<!ENTITY showOnlyThisFrameCmd.label     "Show Only This Frame">
-<!ENTITY showOnlyThisFrameCmd.accesskey "S">
-<!ENTITY addToBookmarksCmd.label      "Bookmark This Page">
-<!ENTITY addToBookmarksCmd.accesskey  "B">
-<!ENTITY goBackCmd.label              "Back">
-<!ENTITY goBackCmd.accesskey          "B">
-<!ENTITY goForwardCmd.label           "Forwards">
-<!ENTITY goForwardCmd.accesskey       "F">
-<!ENTITY reloadCmd.label              "Reload">
-<!ENTITY reloadCmd.accesskey          "R">
-<!ENTITY reloadCmd.commandkey         "r">
-<!ENTITY stopCmd.label                "Stop">
-<!ENTITY stopCmd.accesskey            "S">
-<!ENTITY reloadFrameCmd.label         "Reload Frame">
-<!ENTITY reloadFrameCmd.accesskey     "R">
-<!ENTITY viewPartialSourceForSelectionCmd.label "View Selection Source">
-<!ENTITY viewPartialSourceForMathMLCmd.label    "View MathML Source">
-<!ENTITY viewPartialSourceCmd.accesskey "e">
-<!ENTITY viewPageSourceCmd.label      "View Page Source">
-<!ENTITY viewPageSourceCmd.accesskey  "V">
-<!ENTITY viewFrameSourceCmd.label     "View Frame Source">
-<!ENTITY viewFrameSourceCmd.accesskey "V">
-<!ENTITY viewPageInfoCmd.label        "View Page Info">
-<!ENTITY viewPageInfoCmd.accesskey    "I">
-<!ENTITY viewFrameInfoCmd.label       "View Frame Info">
-<!ENTITY viewFrameInfoCmd.accesskey   "I">
-<!ENTITY fitImageCmd.label            "Fit Image to Window">
-<!ENTITY fitImageCmd.accesskey        "F">
-<!ENTITY viewImageCmd.label           "View Image">
-<!ENTITY viewImageCmd.accesskey       "I">
-<!ENTITY viewBGImageCmd.label         "View Background Image">
-<!ENTITY viewBGImageCmd.accesskey     "w">
-<!ENTITY setWallpaperCmd.label        "Set As Wallpaper">
-<!ENTITY setWallpaperCmd.accesskey    "S">
-<!ENTITY bookmarkPageCmd.label        "Bookmark This Page">
-<!ENTITY bookmarkPageCmd.accesskey    "m">
-<!ENTITY bookmarkLinkCmd.label        "Bookmark This Link">
-<!ENTITY bookmarkLinkCmd.accesskey    "L">
-<!ENTITY bookmarkFrameCmd.label       "Bookmark This Frame">
-<!ENTITY bookmarkFrameCmd.accesskey   "m">
-<!ENTITY savePageAsCmd.label          "Save Page As...">
-<!ENTITY savePageCmd.label            "Save Page">
-<!ENTITY savePageCmd.accesskey        "A">
-<!ENTITY savePageCmd.commandkey       "s">
-<!ENTITY saveFrameAsCmd.label         "Save Frame As...">
-<!ENTITY saveFrameCmd.label           "Save Frame">
-<!ENTITY saveFrameCmd.accesskey       "m">
-<!ENTITY saveLinkAsCmd.label          "Save Link Target As...">
-<!ENTITY saveLinkCmd.label            "Save Link Target">
-<!ENTITY saveLinkCmd.accesskey        "r">
-<!ENTITY saveImageAsCmd.label         "Save Image As...">
-<!ENTITY saveImageCmd.label           "Save Image">
-<!ENTITY saveImageCmd.accesskey       "v">
-<!ENTITY copyCmd.label                "Copy">
-<!ENTITY copyCmd.accesskey            "C">
-<!ENTITY selectAllCmd.label           "Select All">
-<!ENTITY selectAllCmd.accesskey       "A">
-<!ENTITY copyLinkCmd.label            "Copy Link Location">
-<!ENTITY copyLinkCmd.accesskey        "C">
-<!ENTITY copyImageCmd.label           "Copy Image Location">
-<!ENTITY copyImageCmd.accesskey       "o">
-<!ENTITY metadataCmd.label            "Properties">
-<!ENTITY metadataCmd.accesskey        "P">
-<!ENTITY copyEmailCmd.label           "Copy Email Address">
-<!ENTITY copyEmailCmd.accesskey       "E">
-<!ENTITY pasteCmd.label               "Paste">
-<!ENTITY pasteCmd.accesskey           "P">
-<!ENTITY cutCmd.label                 "Cut">
-<!ENTITY cutCmd.accesskey             "t">
-<!ENTITY deleteCmd.label              "Delete">
-<!ENTITY deleteCmd.accesskey          "D">
-<!ENTITY undoCmd.label                "Undo">
-<!ENTITY undoCmd.accesskey            "U">
-<!ENTITY redoCmd.label                "Redo">
-<!ENTITY redoCmd.accesskey            "R">
-<!ENTITY thisFrameMenu.label          "This Frame">
-<!ENTITY thisFrameMenu.accesskey      "h">
-<!ENTITY search.accesskey             "W">
-<!ENTITY bidiSwitchPageDirectionItem.label        "Switch Page Direction">
-<!ENTITY bidiSwitchPageDirectionItem.accesskey    "g">
-<!ENTITY bidiSwitchTextDirectionItem.label        "Switch Text Direction">
-<!ENTITY bidiSwitchTextDirectionItem.accesskey    "w">
--- a/mail/chrome/communicator/contentAreaCommands.properties
+++ b/mail/chrome/communicator/contentAreaCommands.properties
@@ -4,16 +4,17 @@ searchText=Web Search for "%S"
 
 SavePageTitle=Save Web Page
 SaveImageTitle=Save Image
 SaveLinkTitle=Save As
 DefaultSaveFileName=index
 WebPageCompleteFilter=Web Page, complete
 WebPageHTMLOnlyFilter=Web Page, HTML only
 WebPageXHTMLOnlyFilter=Web Page, XHTML only
+WebPageSVGOnlyFilter=Web Page, SVG only
 WebPageXMLOnlyFilter=Web Page, XML only
 
 # LOCALIZATION NOTE (filesFolder):
 #    This is the name of the folder that is created parallel to a HTML file 
 #    when it is saved "With Images". The %S section is replaced with the
 #    leaf name of the file being saved (minus extension).
 filesFolder=%S_files
 
--- a/mail/chrome/communicator/utilityOverlay.dtd
+++ b/mail/chrome/communicator/utilityOverlay.dtd
@@ -1,73 +1,75 @@
 <!-- these things need to move into utilityOverlay.xul -->
-<!ENTITY  offlineGoOfflineCmd.label                 "Work Offline">
-<!ENTITY  offlineGoOfflineCmd.accesskey             "w">
+
+<!-- LOCALIZATION NOTE : FILE This file contains the global menu items -->
 
-<!-- LOCALIZATION NOTE : FILE This file contains the global menu items --> 
-
-<!ENTITY fileMenu.label					"File"> 
-<!ENTITY fileMenu.accesskey				"f">
-<!ENTITY newMenu.label						"New">
-<!ENTITY newMenu.accesskey					"N">
+<!ENTITY fileMenu.label          "File">
+<!ENTITY fileMenu.accesskey        "f">
+<!ENTITY newMenu.label            "New">
+<!ENTITY newMenu.accesskey          "N">
 
-<!ENTITY editMenu.label					"Edit"> 
-<!ENTITY editMenu.accesskey				"e"> 
-<!ENTITY undoCmd.label						"Undo">  
-<!ENTITY undoCmd.key						"Z">  
-<!ENTITY undoCmd.accesskey					"u"> 
-<!ENTITY redoCmd.label						"Redo">  
-<!ENTITY redoCmd.key						"Y">  
-<!ENTITY redoCmd.accesskey					"r"> 
-<!ENTITY cutCmd.label						"Cut">  
-<!ENTITY cutCmd.key							"X">  
-<!ENTITY cutCmd.accesskey					"t"> 
-<!ENTITY copyCmd.label						"Copy">  
-<!ENTITY copyCmd.key						"C">  
-<!ENTITY copyCmd.accesskey					"c"> 
-<!ENTITY pasteCmd.label						"Paste">  
-<!ENTITY pasteCmd.key						"V">  
-<!ENTITY pasteCmd.accesskey					"p"> 
-<!ENTITY deleteCmd.label					"Delete">  
-<!ENTITY deleteCmd.key						"D">  
-<!ENTITY deleteCmd.accesskey				"d"> 
-<!ENTITY selectAllCmd.label					"Select All">  
-<!ENTITY selectAllCmd.key					"A">  
-<!ENTITY selectAllCmd.accesskey				"a"> 
-<!ENTITY preferencesCmd.label				"Options...">
-<!ENTITY preferencesCmd.accesskey			"O"> 
+<!ENTITY editMenu.label          "Edit">
+<!ENTITY editMenu.accesskey        "e">
+<!ENTITY undoCmd.label            "Undo">
+<!ENTITY undoCmd.key            "Z">
+<!ENTITY undoCmd.accesskey          "u">
+<!ENTITY redoCmd.label            "Redo">
+<!ENTITY redoCmd.key            "Y">
+<!ENTITY redoCmd.accesskey          "r">
+<!ENTITY cutCmd.label            "Cut">
+<!ENTITY cutCmd.key              "X">
+<!ENTITY cutCmd.accesskey          "t">
+<!ENTITY copyCmd.label            "Copy">
+<!ENTITY copyCmd.key            "C">
+<!ENTITY copyCmd.accesskey          "c">
+<!ENTITY pasteCmd.label            "Paste">
+<!ENTITY pasteCmd.key            "V">
+<!ENTITY pasteCmd.accesskey          "p">
+<!ENTITY deleteCmd.label          "Delete">
+<!ENTITY deleteCmd.key            "D">
+<!ENTITY deleteCmd.accesskey        "d">
+<!ENTITY selectAllCmd.label          "Select All">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey        "a">
+<!ENTITY preferencesCmd.label        "Options…">
+<!ENTITY preferencesCmd.accesskey      "O">
 <!ENTITY preferencesCmdUnix.label       "Preferences">
-<!ENTITY preferencesCmdUnix.accesskey     "n"> 
+<!ENTITY preferencesCmdUnix.accesskey     "n">
 
 <!ENTITY findTypeTextCmd.label "Find Text As You Type">
 <!ENTITY findTypeTextCmd.accesskey "x">
 
-<!ENTITY viewMenu.label					"View"> 
-<!ENTITY viewMenu.accesskey				"v"> 
-<!ENTITY viewToolbarsMenu.label				"Toolbars"> 
-<!ENTITY viewToolbarsMenu.accesskey			"T"> 
-<!ENTITY showTaskbarCmd.label					"Status Bar">  
-<!ENTITY showTaskbarCmd.accesskey				"S"> 
+<!ENTITY viewMenu.label          "View">
+<!ENTITY viewMenu.accesskey        "v">
+<!ENTITY viewToolbarsMenu.label        "Toolbars">
+<!ENTITY viewToolbarsMenu.accesskey      "T">
+<!ENTITY showTaskbarCmd.label          "Status Bar">
+<!ENTITY showTaskbarCmd.accesskey        "S">
 
 <!ENTITY direct.label                                   "Online (proxy: none)">
 <!ENTITY direct.accesskey                               "n">
 <!ENTITY manual.label                                   "Online (proxy: manual)">
 <!ENTITY manual.accesskey                               "m">
 <!ENTITY pac.label                                      "Online (proxy: auto)">
 <!ENTITY pac.accesskey                                  "a">
 
-<!ENTITY proxy.label                                    "Proxy Configuration...">
+<!ENTITY proxy.label                                    "Proxy Configuration…">
 <!ENTITY proxy.accesskey                                "C">
 
 <!ENTITY findTypeTextCmd.key        "/">
 <!ENTITY findTypeLinksCmd.key       "'">
 
-<!ENTITY closeCmd.label			"Close">  
-<!ENTITY closeCmd.key			"W">  
-<!ENTITY closeCmd.accesskey		"c">
+<!ENTITY closeCmd.label      "Close">
+<!ENTITY closeCmd.key      "W">
+<!ENTITY closeCmd.accesskey    "c">
+
+<!ENTITY closeWindow.label "Close Window">
 
-<!ENTITY quitApplicationCmd.label	"Exit"> 
-<!ENTITY quitApplicationCmd.key		"Q"> 
-<!ENTITY quitApplicationCmd.accesskey	"x">
+<!ENTITY quitApplicationCmd.label  "Exit">
+<!ENTITY quitApplicationCmd.key    "Q">
+<!ENTITY quitApplicationCmd.accesskey  "x">
 
-<!ENTITY quitApplicationCmdUnix.label	"Quit"> 
-<!ENTITY quitApplicationCmdUnix.accesskey	"q">
+<!ENTITY quitApplicationCmdUnix.label  "Quit">
+<!ENTITY quitApplicationCmdUnix.accesskey  "q">
 
+<!ENTITY quitApplicationCmdMac.label  "Quit &brandShortName;">
+<!ENTITY quitApplicationCmdMac.accesskey  "q">
deleted file mode 100644
--- a/mail/chrome/communicator/utilityOverlay.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-
-onlineTooltip0=You are online (proxy: none). Click the icon to go offline.
-onlineTooltip1=You are online (proxy: manual). Click the icon to go offline.
-onlineTooltip2=You are online (proxy: auto URL). Click the icon to go offline.
-onlineTooltip4=You are online (proxy: auto discover). Click the icon to go offline.
-offlineTooltip=You are offline. Click the icon to go online.
-
--- a/mail/chrome/communicator/wallet/SignonViewer.properties
+++ b/mail/chrome/communicator/wallet/SignonViewer.properties
@@ -1,8 +1,10 @@
 encrypted = %S (encrypted)
 close=Close
 hidePasswords=Hide Passwords
 showPasswords=Show Passwords
 noMasterPasswordPrompt=Are you sure you wish to show your passwords?
+removeAllPasswordsPrompt=Are you sure you wish to remove all passwords?
+removeAllPasswordsTitle=Remove all passwords
 
 # Default user name in the view passwords dialog
-noUserNameForPassword=<not specified>
\ No newline at end of file
+noUserNameForPassword=<not specified>
deleted file mode 100644
--- a/mail/chrome/global-platform/win/nsWindowsHooks.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-yesButtonLabel=Yes
-noButtonLabel=No
-cancelButtonLabel=Cancel
-checkBoxLabel=Check at startup next time, too.
-promptText=%S is not currently set as your default browser. Would you like to make it your default browser?
-prefsLabel=Pr&eferences
deleted file mode 100644
--- a/mail/chrome/global/charset.dtd
+++ /dev/null
@@ -1,20 +0,0 @@
-<!ENTITY charsetMenu.label        "Character Encoding">
-<!ENTITY charsetMenu.accesskey        "C">
-<!ENTITY charsetMenuAutodet.label     "Auto-Detect">
-<!ENTITY charsetMenuAutodet.accesskey     "a">
-<!ENTITY charsetMenuMore.label        "More">
-<!ENTITY charsetMenuMore.accesskey        "m">
-<!ENTITY charsetMenuMore1.label       "West European">
-<!ENTITY charsetMenuMore1.accesskey       "w">
-<!ENTITY charsetMenuMore2.label       "East European">
-<!ENTITY charsetMenuMore2.accesskey       "E">
-<!ENTITY charsetMenuMore3.label       "East Asian">
-<!ENTITY charsetMenuMore3.accesskey       "A">
-<!ENTITY charsetMenuMore4.label       "SE &amp; SW Asian">
-<!ENTITY charsetMenuMore4.accesskey       "S">
-<!ENTITY charsetMenuMore5.label       "Middle Eastern">
-<!ENTITY charsetMenuMore5.accesskey       "M">
-<!ENTITY charsetMenuUnicode.label       "Unicode">
-<!ENTITY charsetMenuUnicode.accesskey       "U">
-<!ENTITY charsetCustomize.label       "Customise...">
-<!ENTITY charsetCustomize.accesskey       "c">
--- a/mail/chrome/messenger-newsblog/am-newsblog.dtd
+++ b/mail/chrome/messenger-newsblog/am-newsblog.dtd
@@ -1,20 +1,21 @@
-<!ENTITY newsblogTitle.label "RSS Account Settings">
-
-<!ENTITY biffStart.label "Check for new articles every ">
-<!ENTITY biffStart.accesskey "k">
-<!ENTITY biffEnd.label "minutes">
-
-<!ENTITY loginAtStartup.label "Check for new articles at startup"> 
-<!ENTITY loginAtStartup.accesskey "C">
-
-<!ENTITY useQuickMode.label "By default, show the article summary instead of loading the web page"> 
-<!ENTITY useQuickMode.accesskey "B">
-
-<!ENTITY manageSubscriptions.label "Manage Subscriptions..."> 
-<!ENTITY manageSubscriptions.accesskey "M">
-
-<!-- entities from defaults/isp/rss.rdf -->
-<!ENTITY rss.accountName            "News &amp; Blogs">
-<!ENTITY rss.wizardShortName        "RSS">  
-<!ENTITY rss.wizardLongName         "RSS News &amp; Blogs">
-<!ENTITY rss.hostName               "News &amp; Blogs">
+<!ENTITY newsblogTitle.label "RSS Account Settings">
+
+<!ENTITY biffStart.label "Check for new articles every ">
+<!ENTITY biffStart.accesskey "k">
+<!ENTITY biffEnd.label "minutes">
+
+<!ENTITY loginAtStartup.label "Check for new articles at startup"> 
+<!ENTITY loginAtStartup.accesskey "C">
+
+<!ENTITY useQuickMode.label "By default, show the article summary instead of loading the web page"> 
+<!ENTITY useQuickMode.accesskey "B">
+
+<!ENTITY manageSubscriptions.label "Manage Subscriptions…"> 
+<!ENTITY manageSubscriptions.accesskey "M">
+
+<!-- entities from defaults/isp/rss.rdf -->
+<!ENTITY rss.accountName            "News &amp; Blogs">
+<!ENTITY rss.wizardShortName        "RSS">  
+<!ENTITY rss.wizardLongName         "RSS News &amp; Blogs">
+<!ENTITY rss.wizardLongName.accesskey "R">
+<!ENTITY rss.hostName               "News &amp; Blogs">
--- a/mail/chrome/messenger-newsblog/feed-properties.dtd
+++ b/mail/chrome/messenger-newsblog/feed-properties.dtd
@@ -1,16 +1,19 @@
-<!-- Feed Properties Dialog -->
-<!ENTITY window.title             "Feed Properties">
-
-<!ENTITY feedFolder.label         "Store Articles in: ">
-<!ENTITY feedFolder.accesskey     "S">
-
-<!ENTITY feedLocation.label       "Feed URL: ">
-<!ENTITY feedLocation.accesskey   "F">
-
-<!ENTITY choosethisfolder.label   "choose this folder">
-
-<!ENTITY quickMode.label          "Show the article summary instead of loading the web page">
-<!ENTITY quickMode.accesskey      "h">
-
-<!ENTITY copyLinkCmd.label        "Copy Link Location"> 
-<!ENTITY copyLinkCmd.accesskey    "C"> 
+<!-- Feed Properties Dialog -->
+<!ENTITY window.title             "Feed Properties">
+
+<!ENTITY feedFolder.label         "Store Articles in: ">
+<!ENTITY feedFolder.accesskey     "S">
+
+<!ENTITY feedLocation.label       "Feed URL: ">
+<!ENTITY feedLocation.accesskey   "F">
+
+<!ENTITY choosethisfolder.label   "choose this folder">
+
+<!ENTITY quickMode.label          "Show the article summary instead of loading the web page">
+<!ENTITY quickMode.accesskey      "h">
+
+<!ENTITY copyLinkCmd.label        "Copy Link Location">
+<!ENTITY copyLinkCmd.accesskey    "C">
+
+<!ENTITY pasteLinkCmd.label       "Paste">
+<!ENTITY pasteLinkCmd.accesskey   "P">
--- a/mail/chrome/messenger-newsblog/newsblog.dtd
+++ b/mail/chrome/messenger-newsblog/newsblog.dtd
@@ -1,4 +1,5 @@
-<!-- folder pane context menu item -->
-<!ENTITY folderContextRSSSubscribe.label    "Manage Subscriptions...">
-<!ENTITY folderContextRSSSubscribe.accesskey   "M">
-
+<!-- folder pane context menu item -->
+<!ENTITY folderContextRSSSubscribe.label    "Subscribe…">
+<!ENTITY folderContextRSSSubscribe.accesskey   "b">
+
+
deleted file mode 100644
--- a/mail/chrome/messenger-offline/offline.dtd
+++ /dev/null
@@ -1,15 +0,0 @@
-<!ENTITY offlineMenu.label "Offline">
-<!ENTITY offlineMenu.accesskey "l">
-<!ENTITY synchronizeOfflineCmd.label "Download/Synchronise Now...">
-<!ENTITY synchronizeOfflineCmd.accesskey "S">
-<!ENTITY settingsOfflineCmd.label "Offline Settings...">
-<!ENTITY settingsOfflineCmd.accesskey "e">
-<!ENTITY downloadSelectedCmd.label "Get Selected Messages">
-<!ENTITY downloadSelectedCmd.accesskey "M">
-<!ENTITY downloadFlaggedCmd.label "Get Flagged Messages">
-<!ENTITY downloadFlaggedCmd.accesskey "F">
-
-<!ENTITY prefOfflineConnection.label "Offline and Connection Settings">
-<!ENTITY prefOfflineDesc.label "Manage offline settings.">
-<!ENTITY prefOfflineButton.label "Offline Settings...">
-<!ENTITY prefOfflineButton.accesskey "O">
deleted file mode 100644
--- a/mail/chrome/messenger-offline/offline.properties
+++ /dev/null
@@ -1,87 +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.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 *****
-
-#   LOCALIZATION NOTE :
-#   do not localize "\n".  use "\n" to make the text fit nicely in the dialog.
-
-# 
-# Download Messages Prompt
-#
-downloadMessagesWindowTitle=Work Offline 
-
-#   LOCALIZATION NOTE :
-#   do not localize "\n".  use "\n" to make the text fit nicely in the dialog.
-downloadMessagesLabel=Do you want to download messages \nfor offline use before you go offline?\n\n
-
-downloadMessagesCheckboxLabel=Always ask me when I go offline
-downloadMessagesDownloadButtonLabel=Download
-downloadMessagesNoDownloadButtonLabel=Don't Download
-downloadMessagesCancelButtonLabel=Cancel
-
-# 
-# Send Messages Prompt
-#
-sendMessagesWindowTitle=Work Online 
-
-#   LOCALIZATION NOTE :
-#   do not localize "\n".  use "\n" to make the text fit nicely in the dialog.
-sendMessagesLabel=Would you like to send the messages \nin your Unsent Messages folder once you are online?\n\n
-sendMessagesCheckboxLabel=Always ask me when I go online
-sendMessagesSendButtonLabel=Send
-sendMessagesNoSendButtonLabel=Don't Send
-sendMessagesCancelButtonLabel=Cancel
-
-#
-# GetMessages Offline Prompt 
-#
-getMessagesOfflineWindowTitle=Get Messages 
-
-#   LOCALIZATION NOTE :
-#   do not localize "\n".  use "\n" to make the text fit nicely in the dialog.
-getMessagesOfflineLabel=You are currently offline. Would you like \nto go online to get your new messages?\n\n
-getMessagesOfflineGoButtonLabel=Go online
-getMessagesOfflineCancelButtonLabel=Cancel
-
-# 
-# Send Messages Offline Prompt
-#
-sendMessagesOfflineWindowTitle=Send Messages 
-
-#   LOCALIZATION NOTE :
-#   do not localize "\n".  use "\n" to make the text fit nicely in the dialog.
-sendMessagesOfflineLabel=You are currently offline. Would you like \nto go online and send your unsent messages?\n\n
-sendMessagesOfflineGoButtonLabel=Go online
-sendMessagesOfflineCancelButtonLabel=Cancel
--- a/mail/chrome/messenger-region/region.properties
+++ b/mail/chrome/messenger-region/region.properties
@@ -1,19 +1,16 @@
-#
-# messenger.properties
-# mailnews.js
-mailnews.start_page.url=chrome://messenger/content/start.xhtml
-releaseNotesURL=http://www.mozilla.org/products/thunderbird/releases/%S.html
-mailnews.hints_and_tips.url=http://www.mozilla.org/support/thunderbird/
-messenger.throbber.url=http://www.mozilla.org/products/thunderbird/
-# To make mapit buttons to disappear in the addressbook, specify empty string.  For example:
-# mail.addr_book.mapit_url.format=
-# The format for "mail.addr_book.mapit_url.format" is:
-# @A1 == address, part 1
-# @A2 == address, part 2
-# @CI == city
-# @ST == state
-# @ZI == zip code
-# @CO == country
-mail.addr_book.mapit_url.format=http://www.streetmap.co.uk/streetmap.dll?postcode2map?@ZI
-
-#mrt TO-DO: mapquest?
\ No newline at end of file
+#
+# messenger.properties
+# mailnews.js
+mailnews.hints_and_tips.url=http://www.mozilla.org/support/thunderbird/
+
+# To make mapit buttons to disappear in the addressbook, specify empty string.  For example:
+# mail.addr_book.mapit_url.format=
+# The format for "mail.addr_book.mapit_url.format" is:
+# @A1 == address, part 1
+# @A2 == address, part 2
+# @CI == city
+# @ST == state
+# @ZI == zip code
+# @CO == country
+mail.addr_book.mapit_url.format=http://maps.google.com/maps?q=@A1%20@A2%20@CI%20@ST%20@ZI%20@CO
+mailnews.messageid_browser.url=http://groups.google.com/groups?selm=%mid&rnum=1
--- a/mail/chrome/messenger/AccountManager.dtd
+++ b/mail/chrome/messenger/AccountManager.dtd
@@ -1,13 +1,13 @@
 <!-- extracted from AccountManager.xul -->
 
 <!ENTITY accountManagerTitle.label "Account Settings">
 
-<!ENTITY addAccountButton.label "Add Account...">
+<!ENTITY addAccountButton.label "Add Account…">
 <!ENTITY addAccountButton.accesskey "A">
 <!ENTITY setDefaultButton.label "Set as Default">
 <!ENTITY setDefaultButton.accesskey "f">
 <!ENTITY duplicateButton.label "Duplicate">
 <!ENTITY removeButton.label "Remove Account">
 <!ENTITY removeButton.accesskey "R">
 
 <!ENTITY nameCol.label "Name">
@@ -15,11 +15,11 @@
 
 <!-- AccountManager.xul -->
 <!-- LOCALIZATION NOTE : this is part of an inline-style attribute on the account
      setting dialog, which specifies the width and height in em units of the dialog.
      Localizers ONLY can increase these widths if they are having difficulty getting
      panel content to fit. 1em = the width of the letter 'm' in the selected font.
      XUL/FE DEVELOPERS: DO NOT MODIFY THIS VALUE. It represents the correct size of
      this window for en-US. -->
-<!ENTITY accountManager.size "width: 55em; height: 44em;"> 
-<!ENTITY macAccountManager.size "width: 60em; height: 44em;">
+<!ENTITY accountManager.size "width: 55em; height: 50em;"> 
+<!ENTITY macAccountManager.size "width: 60em; height: 50em;">
 <!ENTITY accountTree.width   "width: 17em;">
--- a/mail/chrome/messenger/AccountWizard.dtd
+++ b/mail/chrome/messenger/AccountWizard.dtd
@@ -17,18 +17,18 @@
 <!-- Entities for Identity page -->
 
 <!ENTITY identityTitle.label "Identity">
 <!ENTITY identityDesc.label "Each account has an identity, which is the information that identifies you to others when they receive your messages.">
 
 <!-- LOCALIZATION NOTE (fullnameDesc.label) : do not translate two of "&quot;" in below line -->
 <!ENTITY fullnameDesc.label "Enter the name you would like to appear in the &quot;From&quot; field of your outgoing messages">
 <!-- LOCALIZATION NOTE (fullnameExample.label) : use following directions for below line
-	1, do not translate two of "&quot;"
-	2, Use localized full name instead of "John Smith"
+  1, do not translate two of "&quot;"
+  2, Use localized full name instead of "John Smith"
 -->
 <!ENTITY fullnameExample.label "(for example, &quot;John Smith&quot;).">
 <!ENTITY fullnameLabel.label "Your Name:">
 <!ENTITY fullnameLabel.accesskey "Y">
 
 <!ENTITY emailLabel.label "Email Address:">
 <!ENTITY emailLabel.accesskey "E">
 <!ENTITY emailDesc.label "Enter your email address; this is the address others will use to send email to you">
@@ -61,17 +61,17 @@
 <!-- LOCALIZATION NOTE (popType.label) : Do not translate "POP" in below line -->
 <!ENTITY popType.label "POP">
 <!ENTITY popType.accesskey "P">
 <!ENTITY nntpType.label "News Server">
 
 <!-- for when the user has an SMTP server pre-configured -->
 <!-- LOCALIZATION NOTE (currentSmtpBefore.label) : Do not translate "SMTP" and "&quot;" in
      this variable. Also, translate currentSmtpBefore.label and currentSmtpAfter.label as a single sentence,
-	  inserting text after the "&quot;" entity in currentSmtpAfter.label, if required grammatically
+     inserting text after the "&quot;" entity in currentSmtpAfter.label, if required grammatically
 -->
 <!-- LOCALIZATION NOTE (haveSmtp1.prefix and haveSmtp1.suffix) : Do not translate "SMTP" and "&quot;" in
      these variables. Also, translate haveSmtp1.prefix and haveSmtp1.suffix as a single sentence, inserting
      text after the "&quot;" entity in haveSmtp1.suffix, if required grammatically.
 -->
 <!ENTITY haveSmtp1.prefix "Your existing outgoing server (SMTP), &quot;">
 <!ENTITY haveSmtp1.suffix "&quot;, will be used. You can modify outgoing server settings by choosing Account Settings from the Tools menu.">
 
@@ -115,8 +115,9 @@
 <!ENTITY serverTypePrefix.label "Incoming Server Type:">
 <!ENTITY serverNamePrefix.label "Incoming Server Name:">
 <!ENTITY smtpServerNamePrefix.label "Outgoing Server Name (SMTP):">
 <!ENTITY newsServerNamePrefix.label "News Server Name (NNTP):">
 <!ENTITY downloadOnLogin.label "Download messages now">
 <!ENTITY deferStorageDesc.label "Untick this box to store mail for this account in its own directory. That will make this account appear as a top-level account. Otherwise, it will be part of the Local Folders Global Inbox account.">
 <!ENTITY deferStorage.label "Use Global Inbox (store mail in Local Folders)">
 <!ENTITY clickFinish.label "Click Finish to save these settings and exit the Account Wizard.">
+<!ENTITY clickFinish.labelMac "Click Done to save these settings and exit the Account Wizard.">
--- a/mail/chrome/messenger/FilterEditor.dtd
+++ b/mail/chrome/messenger/FilterEditor.dtd
@@ -1,53 +1,42 @@
 <!ENTITY window.title "Filter Rules">
-<!ENTITY subject.label "subject">
-<!ENTITY sender.label "sender">
-<!ENTITY date.label "date">
-<!ENTITY anyText.label "any text">
-<!ENTITY keyword.label "keyword">
-<!ENTITY age.label "age in days">
-<!ENTITY to.label "to">
 
-<!-- LOCALIZATION NOTE (cc.label): DONT_TRANSLATE -->
-<!ENTITY cc.label "Cc">
-
-<!ENTITY status.label "status">
-<!ENTITY priority.label "priority">
-<!ENTITY body.label "body">
-<!ENTITY contains.label "contains">
-<!ENTITY nocontains.label "doesn't contain">
 <!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">
 <!ENTITY normalPriorityCmd.label "Normal">
 <!ENTITY highPriorityCmd.label "High">
 <!ENTITY highestPriorityCmd.label "Highest">
 
-<!ENTITY conditionDesc.label "For incoming messages that:">
+<!ENTITY contextDesc.label "Apply filter when:">
+<!ENTITY contextDesc.accesskey "w">
+<!ENTITY contextIncoming.label "Checking Mail">
+<!ENTITY contextManual.label "Manually Run">
+<!ENTITY contextBoth.label "Checking Mail or Manually Run">
 <!ENTITY filterActionDesc.label "Perform these actions:">
 <!ENTITY filterActionDesc.accesskey "P">
 
-<!ENTITY newFolderButton.label "New Folder...">
+<!ENTITY newFolderButton.label "New Folder…">
 <!ENTITY newFolderButton.accesskey "N">
 
 <!-- New Style Filter Rule Actions -->
 <!ENTITY moveMessage.label "Move Message to">
 <!ENTITY copyMessage.label "Copy Message to">
 <!ENTITY forwardTo.label "Forward Message to">
 <!ENTITY replyWithTemplate.label "Reply with Template">
 <!ENTITY markMessageRead.label "Mark As Read">
-<!ENTITY markMessageFlagged.label "Mark As Flagged">
-<!ENTITY labelMessage.label "Label Message As">
+<!ENTITY markMessageStarred.label "Add Star">
 <!ENTITY setPriority.label "Set Priority to">
+<!ENTITY addTag.label "Tag Message">
 <!ENTITY setJunkScore.label "Set Junk Status to">
 <!ENTITY deleteMessage.label "Delete Message">
 <!ENTITY deleteFromPOP.label "Delete From POP Server">
 <!ENTITY fetchFromPOP.label "Fetch From POP Server">
 <!ENTITY ignoreThread.label "Ignore Thread">
+<!ENTITY ignoreSubthread.label "Ignore Subthread">
 <!ENTITY watchThread.label "Watch Thread">
-
-
+<!ENTITY stopExecution.label "Stop Filter Execution">
--- a/mail/chrome/messenger/FilterListDialog.dtd
+++ b/mail/chrome/messenger/FilterListDialog.dtd
@@ -1,14 +1,14 @@
 <!ENTITY window.title "Message Filters">
 <!ENTITY nameColumn.label "Filter Name">
 <!ENTITY activeColumn.label "Enabled">
-<!ENTITY newButton.label "New...">
+<!ENTITY newButton.label "New…">
 <!ENTITY newButton.accesskey "N">
-<!ENTITY editButton.label "Edit...">
+<!ENTITY editButton.label "Edit…">
 <!ENTITY editButton.accesskey "E">
 <!ENTITY deleteButton.label "Delete">
 <!ENTITY deleteButton.accesskey "t">
 <!ENTITY reorderUpButton.label "Move Up">
 <!ENTITY reorderUpButton.accesskey "U">
 <!ENTITY reorderDownButton.label "Move Down">
 <!ENTITY reorderDownButton.accesskey "D">
 <!ENTITY filterHeader.label "Enabled filters are run automatically in the order shown below.">
--- a/mail/chrome/messenger/SearchDialog.dtd
+++ b/mail/chrome/messenger/SearchDialog.dtd
@@ -1,75 +1,77 @@
-<!-- for SearchDialog.xul -->
-<!ENTITY searchHeading.label         "Search for messages in:">
-<!ENTITY searchHeading.accesskey     "h">
-<!ENTITY searchSubfolders.label      "Search subfolders">
-<!ENTITY searchSubfolders.accesskey  "e">
-<!ENTITY resetButton.label           "Clear">
-<!ENTITY resetButton.accesskey       "C">
-<!ENTITY optionsButton.label         "Options">
-<!ENTITY closeButton.label           "Close">
-<!ENTITY openButton.label            "Open">
-<!ENTITY openButton.accesskey        "n">
-<!ENTITY deleteButton.label          "Delete">
-<!ENTITY deleteButton.accesskey      "D">
-<!ENTITY searchDialogTitle.label     "Search Messages">
-<!ENTITY conditionDesc.label         "Search for messages that match:">
-<!ENTITY conditions.label            "Criteria">
-<!ENTITY results.label               "Results">
-<!ENTITY fileHereMenu.label          "File Here">
-<!ENTITY fileHereMenu.accesskey      "F">
-<!ENTITY fileButton.label            "File">
-<!ENTITY fileButton.accesskey        "i">
-<!ENTITY closeCmd.key                "W"> 
-<!ENTITY goToFolderButton.label      "Open Message Folder">
-<!ENTITY goToFolderButton.accesskey  "r">
-<!ENTITY saveAsVFButton.label        "Save as Search Folder">
-<!ENTITY saveAsVFButton.accesskey    "a">
-
-<!-- for ABSearchDialog.xul -->
-<!ENTITY abSearchHeading.label       "Search in:">
-<!ENTITY abSearchHeading.accesskey   "h">
-<!ENTITY propertiesButton.label      "Properties">
-<!ENTITY propertiesButton.accesskey  "P">
-<!ENTITY composeButton.label         "Write">
-<!ENTITY composeButton.accesskey     "W">
-<!ENTITY abSearchDialogTitle.label   "Advanced Address Book Search">
-
-<!-- Thread Pane -->
-<!ENTITY threadColumn.label "Thread">
-<!ENTITY senderColumn.label "Sender">
-<!ENTITY recipientColumn.label "Recipient">
-<!ENTITY subjectColumn.label "Subject">
-<!ENTITY dateColumn.label "Date">
-<!ENTITY priorityColumn.label "Priority">
-<!ENTITY labelColumn.label "Label">
-<!ENTITY accountColumn.label "Account">
-<!ENTITY statusColumn.label "Status">
-<!ENTITY sizeColumn.label "Size">
-<!ENTITY junkStatusColumn.label "Junk Status">
-<!ENTITY linesColumn.label "Lines">
-<!ENTITY unreadColumn.label "Unread">
-<!ENTITY totalColumn.label "Total">
-<!ENTITY readColumn.label "Read">
-<!ENTITY flagColumn.label "Flag">
-<!ENTITY locationColumn.label "Location">
-<!ENTITY idColumn.label "Order Received">
-
-<!-- Thread Pane Tooltips -->
-<!ENTITY columnChooser.tooltip "Click to select columns to display">
-<!ENTITY threadColumn.tooltip "Click to display message threads"> 
-<!ENTITY senderColumn.tooltip "Click to sort by sender">
-<!ENTITY recipientColumn.tooltip "Click to sort by recipient">
-<!ENTITY subjectColumn.tooltip "Click to sort by subject">
-<!ENTITY dateColumn.tooltip "Click to sort by date">
-<!ENTITY priorityColumn.tooltip "Click to sort by priority">
-<!ENTITY labelColumn.tooltip "Click to sort by label">
-<!ENTITY accountColumn.tooltip "Click to sort by account">
-<!ENTITY statusColumn.tooltip "Click to sort by status">
-<!ENTITY sizeColumn.tooltip "Click to sort by size">
-<!ENTITY junkStatusColumn.tooltip "Click to sort by junk status">
-<!ENTITY unreadColumn.tooltip "Number of unread messages in thread">
-<!ENTITY totalColumn.tooltip "Total number of messages in thread">
-<!ENTITY readColumn.tooltip "Click to sort by read">
-<!ENTITY flagColumn.tooltip "Click to sort by flag">
-<!ENTITY locationColumn.tooltip "Click to sort by location">
-<!ENTITY idColumn.tooltip "Click to sort by order received">
+<!-- for SearchDialog.xul -->
+<!ENTITY searchHeading.label         "Search for messages in:">
+<!ENTITY searchHeading.accesskey     "h">
+<!ENTITY searchSubfolders.label      "Search subfolders">
+<!ENTITY searchSubfolders.accesskey  "e">
+<!ENTITY resetButton.label           "Clear">
+<!ENTITY resetButton.accesskey       "C">
+<!ENTITY optionsButton.label         "Options">
+<!ENTITY closeButton.label           "Close">
+<!ENTITY openButton.label            "Open">
+<!ENTITY openButton.accesskey        "n">
+<!ENTITY deleteButton.label          "Delete">
+<!ENTITY deleteButton.accesskey      "D">
+<!ENTITY searchDialogTitle.label     "Search Messages">
+<!ENTITY conditionDesc.label         "Search for messages that match:">
+<!ENTITY conditions.label            "Criteria">
+<!ENTITY results.label               "Results">
+<!ENTITY fileHereMenu.label          "File Here">
+<!ENTITY fileHereMenu.accesskey      "F">
+<!ENTITY fileButton.label            "File">
+<!ENTITY fileButton.accesskey        "i">
+<!ENTITY closeCmd.key                "W"> 
+<!ENTITY goToFolderButton.label      "Open Message Folder">
+<!ENTITY goToFolderButton.accesskey  "r">
+<!ENTITY saveAsVFButton.label        "Save as Search Folder">
+<!ENTITY saveAsVFButton.accesskey    "a">
+
+<!-- for ABSearchDialog.xul -->
+<!ENTITY abSearchHeading.label       "Search in:">
+<!ENTITY abSearchHeading.accesskey   "h">
+<!ENTITY propertiesButton.label      "Properties">
+<!ENTITY propertiesButton.accesskey  "P">
+<!ENTITY composeButton.label         "Write">
+<!ENTITY composeButton.accesskey     "W">
+<!ENTITY abSearchDialogTitle.label   "Advanced Address Book Search">
+
+<!-- Thread Pane -->
+<!ENTITY threadColumn.label "Thread">
+<!ENTITY fromColumn.label "From">
+<!ENTITY recipientColumn.label "Recipient">
+<!ENTITY subjectColumn.label "Subject">
+<!ENTITY dateColumn.label "Date">
+<!ENTITY priorityColumn.label "Priority">
+<!ENTITY tagsColumn.label "Tags">
+<!ENTITY accountColumn.label "Account">
+<!ENTITY statusColumn.label "Status">
+<!ENTITY sizeColumn.label "Size">
+<!ENTITY junkStatusColumn.label "Junk Status">
+<!ENTITY linesColumn.label "Lines">
+<!ENTITY unreadColumn.label "Unread">
+<!ENTITY totalColumn.label "Total">
+<!ENTITY readColumn.label "Read">
+<!ENTITY receivedColumn.label "Received">
+<!ENTITY starredColumn.label "Starred">
+<!ENTITY locationColumn.label "Location">
+<!ENTITY idColumn.label "Order Received">
+
+<!-- Thread Pane Tooltips -->
+<!ENTITY columnChooser.tooltip "Click to select columns to display">
+<!ENTITY threadColumn.tooltip "Click to display message threads"> 
+<!ENTITY fromColumn.tooltip "Click to sort by from">
+<!ENTITY recipientColumn.tooltip "Click to sort by recipient">
+<!ENTITY subjectColumn.tooltip "Click to sort by subject">
+<!ENTITY dateColumn.tooltip "Click to sort by date">
+<!ENTITY priorityColumn.tooltip "Click to sort by priority">
+<!ENTITY tagsColumn.tooltip "Click to sort by tags">
+<!ENTITY accountColumn.tooltip "Click to sort by account">
+<!ENTITY statusColumn.tooltip "Click to sort by status">
+<!ENTITY sizeColumn.tooltip "Click to sort by size">
+<!ENTITY junkStatusColumn.tooltip "Click to sort by junk status">
+<!ENTITY unreadColumn.tooltip "Number of unread messages in thread">
+<!ENTITY totalColumn.tooltip "Total number of messages in thread">
+<!ENTITY readColumn.tooltip "Click to sort by read">
+<!ENTITY receivedColumn.tooltip "Click to sort by date received">
+<!ENTITY starredColumn.tooltip "Click to sort by star">
+<!ENTITY locationColumn.tooltip "Click to sort by location">
+<!ENTITY idColumn.tooltip "Click to sort by order received">
--- a/mail/chrome/messenger/aboutDialog.dtd
+++ b/mail/chrome/messenger/aboutDialog.dtd
@@ -1,7 +1,9 @@
-<!ENTITY aboutDialog.title      "About &brandShortName;">
-<!ENTITY credits                "Credits">
-<!ENTITY aboutLink              "&lt; About &brandShortName;">
+<!ENTITY aboutDialog.title      "About &brandFullName;">
+<!ENTITY credits.label          "Credits">
+<!ENTITY credits.accesskey      "C">
+<!ENTITY aboutLink.label        "&lt; About &brandFullName;">
+<!ENTITY aboutLink.accesskey    "A">
 <!ENTITY aboutVersion           "version">
-<!ENTITY copyrightText          "&#169;1998-2005 Contributors. All Rights Reserved. Mozilla Thunderbird and the 
+<!ENTITY copyrightText          "&#169;1998-2008 Contributors. All Rights Reserved. Mozilla Thunderbird and the 
                                  Thunderbird logos are trademarks of the Mozilla Foundation.  All rights 
                                  reserved.">
--- a/mail/chrome/messenger/addressbook/abAddressBookNameDialog.dtd
+++ b/mail/chrome/messenger/addressbook/abAddressBookNameDialog.dtd
@@ -31,9 +31,10 @@
  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 ***** -->
 
 <!-- Labels -->
-<!ENTITY name.label			"Address Book Name">
+<!ENTITY name.label      "Address Book Name:">
+<!ENTITY name.accesskey  "A">
--- a/mail/chrome/messenger/addressbook/abCardOverlay.dtd
+++ b/mail/chrome/messenger/addressbook/abCardOverlay.dtd
@@ -30,38 +30,36 @@
  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 chooseAddressBook.label                "Add to: ">
-<!ENTITY chooseAddressBook.accesskey            "A">
+<!ENTITY Contact.tab                     "Contact">
+<!ENTITY Contact.accesskey               "C">
+<!ENTITY Name.box                        "Name">
 
-<!ENTITY Contact.tab                     "Contact"> 
-<!ENTITY Name.box                        "Name"> 
-
-<!-- LOCALIZATION NOTE: 
+<!-- LOCALIZATION NOTE:
  NameField1, NameField2, PhoneticField1, PhoneticField2
  those fields are either LN or FN depends on the target country.
  "FirstName" and "LastName" can be swapped for id to change the order
  but they should not be translated (same applied to phonetic id).
  Make sure the translation of label corresponds to the order of id.
 -->
 
 <!-- LOCALIZATION NOTE (NameField1.id) : DONT_TRANSLATE -->
-<!ENTITY NameField1.id                  "FirstName"> 
+<!ENTITY NameField1.id                  "FirstName">
 <!-- LOCALIZATION NOTE (NameField2.id) : DONT_TRANSLATE -->
-<!ENTITY NameField2.id                  "LastName"> 
+<!ENTITY NameField2.id                  "LastName">
 <!-- LOCALIZATION NOTE (PhoneticField1.id) : DONT_TRANSLATE -->
-<!ENTITY PhoneticField1.id              "PhoneticFirstName"> 
+<!ENTITY PhoneticField1.id              "PhoneticFirstName">
 <!-- LOCALIZATION NOTE (PhoneticField2.id) : DONT_TRANSLATE -->
-<!ENTITY PhoneticField2.id              "PhoneticLastName"> 
+<!ENTITY PhoneticField2.id              "PhoneticLastName">
 
 <!ENTITY NameField1.label               "First:">
 <!ENTITY NameField1.accesskey           "F">
 <!ENTITY NameField2.label               "Last:">
 <!ENTITY NameField2.accesskey           "L">
 <!ENTITY PhoneticField1.label           "Phonetic:">
 <!ENTITY PhoneticField2.label           "Phonetic:">
 <!ENTITY DisplayName.label              "Display:">
@@ -77,53 +75,74 @@
 <!ENTITY PreferMailFormat.label         "Prefers to receive messages formatted as:">
 <!ENTITY PreferMailFormat.accesskey     "r">
 <!ENTITY PlainText.label                "Plain Text">
 <!ENTITY HTML.label                     "HTML">
 <!ENTITY Unknown.label                  "Unknown">
 <!ENTITY ScreenName.label               "Screen Name:">
 <!ENTITY ScreenName.accesskey           "S">
 
+<!ENTITY allowRemoteContent.label       "Allow remote images in HTML mail.">
+<!ENTITY allowRemoteContent.accesskey   "w">
+
 <!ENTITY Phones.box                     "Phones">
 <!ENTITY WorkPhone.label                "Work:">
 <!ENTITY WorkPhone.accesskey            "W">
 <!ENTITY HomePhone.label                "Home:">
 <!ENTITY HomePhone.accesskey            "H">
 <!ENTITY FaxNumber.label                "Fax:">
 <!ENTITY FaxNumber.accesskey            "x">
 <!ENTITY PagerNumber.label              "Pager:">
-<!ENTITY PagerNumber.accesskey          "P">
+<!ENTITY PagerNumber.accesskey          "g">
 <!ENTITY CellularNumber.label           "Mobile:">
 <!ENTITY CellularNumber.accesskey       "M">
 
-
-<!ENTITY Address.tab                    "Address"> 
-<!ENTITY Home.box                       "Home"> 
-<!ENTITY HomeAddress.label              "Address:"> 
-<!ENTITY HomeAddress2.label             ""> 
-<!ENTITY HomeCity.label                 "City:"> 
-<!ENTITY HomeState.label                "County:"> 
-<!ENTITY HomeZipCode.label              "Post Code:"> 
+<!ENTITY Address.tab                    "Address">
+<!ENTITY Address.accesskey              "A">
+<!ENTITY Home.box                       "Home">
+<!ENTITY HomeAddress.label              "Address:">
+<!ENTITY HomeAddress.accesskey          "d">
+<!ENTITY HomeAddress2.label             "">
+<!ENTITY HomeAddress2.accesskey         "">
+<!ENTITY HomeCity.label                 "City:">
+<!ENTITY HomeCity.accesskey             "y">
+<!ENTITY HomeState.label                "County:">
+<!ENTITY HomeState.accesskey            "C">
+<!ENTITY HomeZipCode.label              "Post Code:">
+<!ENTITY HomeZipCode.accesskey          "P">
 <!ENTITY HomeCountry.label              "Country:">
-<!ENTITY HomeWebPage.label              "Web Page:"> 
-<!ENTITY Work.box                       "Work"> 
-<!ENTITY JobTitle.label                 "Title:"> 
-<!ENTITY Department.label               "Department:"> 
-<!ENTITY Company.label                  "Organisation:"> 
-<!ENTITY WorkAddress.label              "Address:"> 
-<!ENTITY WorkAddress2.label             ""> 
-<!ENTITY WorkCity.label                 "City:"> 
-<!ENTITY WorkState.label                "County:"> 
-<!ENTITY WorkZipCode.label              "Post Code:"> 
+<!ENTITY HomeCountry.accesskey          "u">
+<!ENTITY HomeWebPage.label              "Web Page:">
+<!ENTITY HomeWebPage.accesskey          "W">
+<!ENTITY Work.box                       "Work">
+<!ENTITY JobTitle.label                 "Title:">
+<!ENTITY JobTitle.accesskey             "e">
+<!ENTITY Department.label               "Department:">
+<!ENTITY Department.accesskey           "m">
+<!ENTITY Company.label                  "Organisation:">
+<!ENTITY Company.accesskey              "O">
+<!ENTITY WorkAddress.label              "Address:">
+<!ENTITY WorkAddress.accesskey          "r">
+<!ENTITY WorkAddress2.label             "">
+<!ENTITY WorkAddress2.accesskey         "">
+<!ENTITY WorkCity.label                 "City:">
+<!ENTITY WorkCity.accesskey             "i">
+<!ENTITY WorkState.label                "County:">
+<!ENTITY WorkState.accesskey            "t">
+<!ENTITY WorkZipCode.label              "Post Code:">
+<!ENTITY WorkZipCode.accesskey          "s">
 <!ENTITY WorkCountry.label              "Country:">
-<!ENTITY WorkWebPage.label              "Web Page:"> 
-
+<!ENTITY WorkCountry.accesskey          "n">
+<!ENTITY WorkWebPage.label              "Web Page:">
+<!ENTITY WorkWebPage.accesskey          "b">
 
 <!ENTITY Other.tab                      "Other">
+<!ENTITY Other.accesskey                "h">
 <!ENTITY Custom1.label                  "Custom 1:">
 <!ENTITY Custom1.accesskey              "1">
 <!ENTITY Custom2.label                  "Custom 2:">
 <!ENTITY Custom2.accesskey              "2">
 <!ENTITY Custom3.label                  "Custom 3:">
 <!ENTITY Custom3.accesskey              "3">
 <!ENTITY Custom4.label                  "Custom 4:">
 <!ENTITY Custom4.accesskey              "4">
 <!ENTITY Notes.box                      "Notes">
+<!ENTITY Notes.accesskey                "N">
--- a/mail/chrome/messenger/addressbook/abContactsPanel.dtd
+++ b/mail/chrome/messenger/addressbook/abContactsPanel.dtd
@@ -1,16 +1,18 @@
-
 <!ENTITY addressbookPicker.label            "Address Book:">
+<!ENTITY addressbookPicker.accesskey        "k">
 <!ENTITY searchInput.label                  "Search For:">
+<!ENTITY searchInput.accesskey              "o">
 <!ENTITY SearchNameOrEmail.label            "Name or Email">
 
+<!ENTITY deleteAddrBookCard.label           "Delete">
+<!ENTITY addrBookCardProperties.label       "Properties">
 <!ENTITY addtoToFieldMenu.label             "Add to To field">
 <!ENTITY addtoCcFieldMenu.label             "Add to Cc field">
 <!ENTITY addtoBccFieldMenu.label            "Add to Bcc field">
 
 <!ENTITY toButton.label                     "Add to To:">
+<!ENTITY toButton.accesskey                 "A">
 <!ENTITY ccButton.label                     "Add to Cc:">
-
-
-
-
-
+<!ENTITY ccButton.accesskey                 "d">
+<!ENTITY bccButton.label                    "Add to Bcc:">
+<!ENTITY bccButton.accesskey                "B">
--- a/mail/chrome/messenger/addressbook/abMainWindow.dtd
+++ b/mail/chrome/messenger/addressbook/abMainWindow.dtd
@@ -1,44 +1,43 @@
 <!ENTITY addressbookWindow.title                        "Address Book">
 
 <!-- File Menu -->
 <!ENTITY fileMenu.label                                 "File">
 <!ENTITY fileMenu.accesskey                             "f">
 <!ENTITY newMenu.label                                  "New">
 <!ENTITY newMenu.accesskey                              "N">
-<!ENTITY newCard.label                                  "Address Book Card...">
-<!-- LOCALIZATION NOTE (newCard.accesskey) : DONT_TRANSLATE -->
+<!ENTITY newCard.label                                  "Address Book Card…">
 <!ENTITY newCard.accesskey                              "C">
 <!ENTITY newCard.key                                    "N">
-<!ENTITY newListCmd.label                               "Mailing List...">
-<!-- LOCALIZATION NOTE (newListCmd.accesskey) : DONT_TRANSLATE -->
+<!ENTITY newListCmd.label                               "Mailing List…">
 <!ENTITY newListCmd.accesskey                           "L">
-<!ENTITY newAddressBookCmd.label                        "Address Book...">
+<!ENTITY newAddressBookCmd.label                        "Address Book…">
 <!ENTITY newAddressBookCmd.accesskey                    "B">
-<!ENTITY newLDAPDirectoryCmd.label                      "LDAP Directory...">
-<!-- LOCALIZATION NOTE (newLDAPDirectoryCmd.accesskey) : DONT_TRANSLATE -->
+<!ENTITY newLDAPDirectoryCmd.label                      "LDAP Directory…">
 <!ENTITY newLDAPDirectoryCmd.accesskey                  "D">
 <!ENTITY newMessageCmd.label                            "Message">
 <!ENTITY newMessageCmd.key                              "M">
 <!ENTITY newMessageCmd.accesskey                        "m">
+<!-- LOCALIZATION NOTE (osxAddressBook) : These entities are only used on Mac -->
+<!ENTITY osxAddressBook.label                           "Use Mac OS X Address Book">
+<!ENTITY osxAddressBook.accesskey                       "O">
 <!ENTITY closeCmd.label                                 "Close">
 <!ENTITY closeCmd.key                                   "W">
 <!ENTITY closeCmd.accesskey                             "c">
-<!ENTITY printSetupCmd.label                            "Page Setup...">
+<!ENTITY printSetupCmd.label                            "Page Setup…">
 <!ENTITY printSetupCmd.accesskey                        "u">
 <!ENTITY printPreviewCardViewCmd.label                  "Print Preview Card">
 <!ENTITY printPreviewCardViewCmd.accesskey              "v">
 <!ENTITY printPreviewAddressBook.label                  "Print Preview Address Book">
 <!ENTITY printPreviewAddressBook.accesskey              "B">
-<!ENTITY printCardViewCmd.label                         "Print Card...">
+<!ENTITY printCardViewCmd.label                         "Print Card…">
 <!ENTITY printCardViewCmd.accesskey                     "p">
-<!-- LOCALIZATION NOTE (printCardViewCmd.key) : DONT_TRANSLATE -->
 <!ENTITY printCardViewCmd.key                           "P">
-<!ENTITY printAddressBook.label                         "Print Address Book...">
+<!ENTITY printAddressBook.label                         "Print Address Book…">
 <!ENTITY printAddressBook.accesskey                     "A">
 
 <!ENTITY quitApplicationCmdWin.label                    "Exit"> 
 <!ENTITY quitApplicationCmdWin.accesskey                "x">
 <!ENTITY quitApplicationCmd.label                       "Quit"> 
 <!ENTITY quitApplicationCmd.accesskey                   "Q">
 <!ENTITY quitApplicationCmd.key "Q">
 
@@ -60,43 +59,43 @@
 <!ENTITY pasteCmd.label                                 "Paste">
 <!ENTITY pasteCmd.key                                   "V">
 <!ENTITY pasteCmd.accesskey                             "p">
 <!ENTITY deleteCmd.label                                "Delete">
 <!ENTITY deleteCmd.key                                  "D">
 <!ENTITY deleteCmd.accesskey                            "d">
 <!ENTITY deleteAbCmd.label                              "Delete Address Book">
 <!ENTITY deleteCardCmd.label                            "Delete Card">
-<!ENTITY deleteCardsCmd.label                           "Delete Selected Cards">
+<!ENTITY deleteCardsCmd2.label                          "Delete Cards">
+<!ENTITY deleteListCmd.label                            "Delete List">
+<!ENTITY deleteListsCmd.label                           "Delete Lists">
+<!ENTITY deleteItemsCmd.label                           "Delete Items">
 <!ENTITY selectAllCmd.label                             "Select All">
 <!ENTITY selectAllCmd.key                               "A">
 <!ENTITY searchAddressesCmd.key                         "f">
 <!ENTITY selectAllCmd.accesskey                         "a">
 <!ENTITY swapFirstNameLastNameCmd.label                 "Swap First/Last Name">
 <!ENTITY swapFirstNameLastNameCmd.accesskey             "w">
 <!-- LOCALIZATION NOTE (hideSwapFnLnUI) : DONT_TRANSLATE -->
 <!-- Swap FN/LN UI  Set to "false" to show swap fn/ln UI -->
 <!ENTITY hideSwapFnLnUI "true">
-<!ENTITY propertiesCmd.label                            "Properties...">
-<!-- LOCALIZATION NOTE (propertiesCmd.accesskey) : DONT_TRANSLATE -->
+<!ENTITY propertiesCmd.label                            "Properties…">
 <!ENTITY propertiesCmd.accesskey                        "i">
 <!ENTITY propertiesCmd.key                              "i">
 
 <!-- View Menu -->
 <!ENTITY viewMenu.label                                 "View">
 <!ENTITY viewMenu.accesskey                             "v">
 <!ENTITY viewToolbarsMenu.label                         "Toolbars">
 <!ENTITY viewToolbarsMenu.accesskey                     "T"> 
 <!ENTITY showAbToolbarCmd.label                         "Address Book Toolbar">
 <!ENTITY showAbToolbarCmd.accesskey                     "o">
-<!ENTITY showSearchToolbarCmd.label                     "Search Bar">
-<!ENTITY showSearchToolbarCmd.accesskey                 "e">
 <!ENTITY showTaskbarCmd.label                           "Status Bar">
 <!ENTITY showTaskbarCmd.accesskey                       "S">
-<!ENTITY customizeToolbar.label                         "Customise...">
+<!ENTITY customizeToolbar.label                         "Customise…">
 <!ENTITY customizeToolbar.accesskey                     "C">
 <!ENTITY showCardPane.label                             "Card Summary Pane">
 <!ENTITY showCardPane.accesskey                         "C">
 <!ENTITY menu_ShowNameAs.label                          "Show Name As">
 <!ENTITY menu_ShowNameAs.accesskey                      "n"> 
 <!ENTITY firstLastCmd.label                             "First, Last">
 <!ENTITY firstLastCmd.accesskey                         "f"> 
 <!ENTITY lastFirstCmd.label                             "Last, First">
@@ -107,38 +106,27 @@
 <!ENTITY sortMenu.accesskey                             "S">
 
 <!-- Tools Menu -->
 <!ENTITY tasksMenu.label                                "Tools">
 <!ENTITY tasksMenu.accesskey                            "T">
 <!ENTITY messengerCmd.label                             "Mail &amp; Newsgroups">
 <!ENTITY messengerCmd.accesskey                         "m">
 <!ENTITY messengerCmd.commandkey                        "1">
-<!ENTITY searchAddressesCmd.label                       "Search Addresses...">
+<!ENTITY searchAddressesCmd.label                       "Search Addresses…">
 <!ENTITY searchAddressesCmd.accesskey                   "S">
-<!ENTITY importCmd.label                                "Import...">
+<!ENTITY importCmd.label                                "Import…">
 <!ENTITY importCmd.accesskey                            "I">
-<!ENTITY exportCmd.label                                "Export...">
+<!ENTITY exportCmd.label                                "Export…">
 <!ENTITY exportCmd.accesskey                            "E">
-<!ENTITY preferencesCmd.label                           "Options...">
+<!ENTITY preferencesCmd.label                           "Options…">
 <!ENTITY preferencesCmd.key                             "O">
 <!ENTITY preferencesCmd.accesskey                       "O">
 <!ENTITY preferencesCmdUnix.label                       "Preferences">
-<!ENTITY preferencesCmdUnix.accesskey                   "n"> 
-
-<!-- Help Menu -->
-<!ENTITY helpMenu.label                                 "Help">
-<!ENTITY helpMenu.accesskey                             "H">
-<!ENTITY releaseCmd.label                               "Release Notes">
-<!ENTITY releaseCmd.accesskey                           "R">
-<!ENTITY hintsAndTips.label                             "&brandShortName; Help">
-<!ENTITY hintsAndTips.accesskey                         "h">
-<!ENTITY hintsAndTipsMac.commandkey                     "?">
-<!ENTITY aboutCmd.label                                 "About &brandShortName;">
-<!ENTITY aboutCmd.accesskey                             "A">
+<!ENTITY preferencesCmdUnix.accesskey                   "n">
 
 <!-- Address Book Toolbar and Context Menus -->  
 <!ENTITY newcardButton.label                            "New Card">
 <!ENTITY newcardButton.accesskey                        "C">
 <!ENTITY newlistButton.label                            "New List">
 <!ENTITY newlistButton.accesskey                        "L">
 <!ENTITY editButton.label                               "Properties">
 <!ENTITY editButton.accesskey                           "P">
@@ -152,31 +140,26 @@
 
 <!-- Address Book Toolbar Tooltips -->
 <!ENTITY newcardButton.tooltip                          "Create a new address book card">
 <!ENTITY newlistButton.tooltip                          "Create a new list">
 <!ENTITY editButton.tooltip                             "Edit the selected card">
 <!ENTITY newmsgButton.tooltip                           "Send a mail message">
 <!ENTITY newIM.tooltip                                  "Send an instant message or chat">
 <!ENTITY deleteButton.tooltip                           "Delete selected card or address book">
-<!ENTITY throbber.tooltip                               "Go to the &vendorShortName; home page">
 
 <!-- Dir Tree header -->
 <!ENTITY dirTreeHeader.label                            "Address Books">
 
 <!-- Search Bar -->
 <!ENTITY SearchNameOrEmail.label                        "Name or Email">
 <!ENTITY SearchNameOrEmail.accesskey                    "N">
-<!ENTITY clearButton.label                              "Clear">
-<!ENTITY clearButton.accesskey                          "C">
-<!ENTITY clearButton.tooltip                            "Clear the search criteria and show all entries">
-<!ENTITY advancedButton.label                           "Advanced...">
-<!ENTITY advancedButton.accesskey                       "A">
 <!ENTITY advancedButton.tooltip                         "Advanced address search">
 <!ENTITY quickSearchCmd.key                             "k">
+<!ENTITY searchItem.title "Quick Search">
 
 <!-- Results Pane -->
 <!ENTITY GeneratedName.label                            "Name">
 <!ENTITY GeneratedName.accesskey                        "N">
 <!ENTITY PrimaryEmail.label                             "Email">
 <!ENTITY PrimaryEmail.accesskey                         "E">
 <!ENTITY ScreenName.label                               "Screen Name">
 <!ENTITY ScreenName.accesskey                           "S">
@@ -202,28 +185,16 @@
 <!ENTITY WorkPhone.accesskey                            "W">
 <!ENTITY sortAscending.label                            "Ascending">
 <!ENTITY sortAscending.accesskey                        "A">
 <!ENTITY sortDescending.label                           "Descending">
 <!ENTITY sortDescending.accesskey                       "D">
 <!ENTITY _PhoneticName.label                            "Phonetic Name">
 <!ENTITY _PhoneticName.accesskey                        "o">
 
-<!-- Results pane context menu -->
-<!ENTITY composeEmail.label                             "Compose Email To">
-<!ENTITY composeEmail.accesskey                         "C">
-<!ENTITY deleteAddrBookCard.label                       "Delete">
-<!ENTITY deleteAddrBookCard.accesskey                   "D">
-<!ENTITY newAddrBookCard.label                          "New Card...">
-<!ENTITY newAddrBookCard.accesskey                      "N">
-<!ENTITY newAddrBookMailingList.label                   "New Mailing List...">
-<!ENTITY newAddrBookMailingList.accesskey               "M">
-<!ENTITY addrBookCardProperties.label                   "Properties">
-<!ENTITY addrBookCardProperties.accesskey               "P">
-
 <!-- Card Summary Pane -->
 <!-- Box Headings -->
 <!ENTITY contact.heading                                "Contact">
 <!ENTITY home.heading                                   "Home">
 <!ENTITY other.heading                                  "Other">
 <!ENTITY phone.heading                                  "Phone">
 <!ENTITY work.heading                                   "Work">
 <!-- Special Box Headings, for mailing lists -->
@@ -233,12 +204,12 @@
 <!ENTITY mapItButton.label                              "Get Map">
 <!ENTITY mapIt.tooltip                                  "Display a map of this address from the Web">
 
 <!-- Status Bar -->
 <!ENTITY statusText.label "">
 
 <!--  Mac OS X Window Menu -->
 <!ENTITY windowMenu.label "Window">
+<!ENTITY minimizeWindow.label "Minimise">
 <!ENTITY minimizeWindow.key "m">
-<!ENTITY minimizeWindow.label "Minimise">
 <!ENTITY bringAllToFront.label "Bring All to Front">
 <!ENTITY zoomWindow.label "Zoom">
--- a/mail/chrome/messenger/addressbook/abNewCardDialog.dtd
+++ b/mail/chrome/messenger/addressbook/abNewCardDialog.dtd
@@ -1,89 +1,3 @@
 <!-- Labels -->
 <!ENTITY chooseAddressBook.label         "Add to: ">
-<!ENTITY chooseAddressBook.accesskey     "A">
-
-<!-- Contact Tab -->
-<!ENTITY Contact.tab                     "Contact"> 
-<!ENTITY Name.box                        "Name"> 
-<!-- LOCALIZATION NOTE: 
- NameField1, NameField2, PhoneticField1, PhoneticField2
- those fields are either LN or FN depends on the target country.
- "FirstName" and "LastName" can be swapped for id to change the order
- but they should not be translated (same applied to phonetic id).
- Make sure the translation of label corresponds to the order of id.
--->
-<!-- LOCALIZATION NOTE (NameField1.id) : DONT_TRANSLATE -->
-<!ENTITY NameField1.id                  "FirstName"> 
-<!-- LOCALIZATION NOTE (NameField2.id) : DONT_TRANSLATE -->
-<!ENTITY NameField2.id                  "LastName"> 
-<!-- LOCALIZATION NOTE (PhoneticField1.id) : DONT_TRANSLATE -->
-<!ENTITY PhoneticField1.id              "PhoneticFirstName"> 
-<!-- LOCALIZATION NOTE (PhoneticField2.id) : DONT_TRANSLATE -->
-<!ENTITY PhoneticField2.id              "PhoneticLastName"> 
-<!ENTITY NameField1.label               "First:">
-<!ENTITY NameField1.accesskey           "F">
-<!ENTITY NameField2.label               "Last:">
-<!ENTITY NameField2.accesskey           "L">
-<!ENTITY PhoneticField1.label           "Phonetic:">
-<!ENTITY PhoneticField2.label           "Phonetic:">
-<!ENTITY DisplayName.label              "Display:">
-<!ENTITY DisplayName.accesskey          "D">
-<!ENTITY NickName.label                 "Nickname:">
-<!ENTITY NickName.accesskey             "N">
-<!ENTITY Internet.box                   "Internet">
-<!ENTITY PrimaryEmail.label             "Email:">
-<!ENTITY PrimaryEmail.accesskey         "E">
-<!ENTITY SecondEmail.label              "Additional Email:">
-<!ENTITY SecondEmail.accesskey          "o">
-<!ENTITY PreferMailFormat.label         "Prefers to receive messages formatted as:">
-<!ENTITY PreferMailFormat.accesskey     "r">
-<!ENTITY PlainText.label                "Plain Text">
-<!ENTITY HTML.label                     "HTML">
-<!ENTITY Unknown.label                  "Unknown">
-<!ENTITY ScreenName.label               "Screen Name:">
-<!ENTITY ScreenName.accesskey           "S">
-<!ENTITY Phones.box                     "Phones">
-<!ENTITY WorkPhone.label                "Work:">
-<!ENTITY WorkPhone.accesskey            "W">
-<!ENTITY HomePhone.label                "Home:">
-<!ENTITY HomePhone.accesskey            "H">
-<!ENTITY FaxNumber.label                "Fax:">
-<!ENTITY FaxNumber.accesskey            "x">
-<!ENTITY PagerNumber.label              "Pager:">
-<!ENTITY PagerNumber.accesskey          "P">
-<!ENTITY CellularNumber.label           "Mobile:">
-<!ENTITY CellularNumber.accesskey       "M">
-
-<!-- Address Tab -->
-<!ENTITY Address.tab                    "Address"> 
-<!ENTITY Home.box                       "Home"> 
-<!ENTITY HomeAddress.label              "Address:"> 
-<!ENTITY HomeAddress2.label             ""> 
-<!ENTITY HomeCity.label                 "City:"> 
-<!ENTITY HomeState.label                "County:"> 
-<!ENTITY HomeZipCode.label              "Post Code:"> 
-<!ENTITY HomeCountry.label              "Country:">
-<!ENTITY HomeWebPage.label              "Web Page:"> 
-<!ENTITY Work.box                       "Work"> 
-<!ENTITY JobTitle.label                 "Title:"> 
-<!ENTITY Department.label               "Department:"> 
-<!ENTITY Company.label                  "Organisation:"> 
-<!ENTITY WorkAddress.label              "Address:"> 
-<!ENTITY WorkAddress2.label             ""> 
-<!ENTITY WorkCity.label                 "City:"> 
-<!ENTITY WorkState.label                "County:"> 
-<!ENTITY WorkZipCode.label              "Post Code:"> 
-<!ENTITY WorkCountry.label              "Country:">
-<!ENTITY WorkWebPage.label              "Web Page:"> 
-
-<!-- Other Tab -->
-<!ENTITY Other.tab                      "Other">
-<!ENTITY Custom1.label                  "Custom 1:">
-<!ENTITY Custom1.accesskey              "1">
-<!ENTITY Custom2.label                  "Custom 2:">
-<!ENTITY Custom2.accesskey              "2">
-<!ENTITY Custom3.label                  "Custom 3:">
-<!ENTITY Custom3.accesskey              "3">
-<!ENTITY Custom4.label                  "Custom 4:">
-<!ENTITY Custom4.accesskey              "4">
-<!ENTITY Notes.box                      "Notes">
+<!ENTITY chooseAddressBook.accesskey     "t">
--- a/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd
+++ b/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd
@@ -61,20 +61,8 @@
 <!ENTITY WorkPhone.label                       "Work Phone">
 <!ENTITY WorkPhone.accesskey                   "W">
 <!ENTITY ScreenName.label                      "Screen Name">
 <!ENTITY ScreenName.accesskey                  "S">
 <!ENTITY sortAscending.label                   "Ascending">
 <!ENTITY sortAscending.accesskey               "A">
 <!ENTITY sortDescending.label                  "Descending">
 <!ENTITY sortDescending.accesskey              "D">
-
-<!-- context menu -->
-<!ENTITY composeEmail.label                    "Compose Email To">
-<!ENTITY composeEmail.accesskey                "C">
-<!ENTITY deleteAddrBookCard.label              "Delete">
-<!ENTITY deleteAddrBookCard.accesskey          "D">
-<!ENTITY newAddrBookCard.label                 "New Card...">
-<!ENTITY newAddrBookCard.accesskey             "N">
-<!ENTITY newAddrBookMailingList.label          "New Mailing List...">
-<!ENTITY newAddrBookMailingList.accesskey      "M">
-<!ENTITY addrBookCardProperties.label          "Properties">
-<!ENTITY addrBookCardProperties.accesskey      "P">
deleted file mode 100644
--- a/mail/chrome/messenger/addressbook/abSelectAddressesDialog.dtd
+++ /dev/null
@@ -1,67 +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 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 ***** -->
-
-<!-- Title -->
-<!ENTITY selectAddressWindow.title           "Select Addresses">
-
-<!-- Buttons -->
-<!ENTITY toButton.label                      "To->"> 
-<!ENTITY toButton.accesskey                  "T"> 
-<!ENTITY ccButton.label                      "Cc->"> 
-<!ENTITY ccButton.accesskey                  "C"> 
-<!ENTITY bccButton.label                     "Bcc->">  
-<!ENTITY bccButton.accesskey                 "B">  
-<!ENTITY newButton.label                     "New..."> 
-<!ENTITY newButton.accesskey                 "N"> 
-<!ENTITY editButton.label                    "Edit..."> 
-<!ENTITY editButton.accesskey                "E">
-<!ENTITY removeButton.label                  "Remove"> 
-<!ENTITY removeButton.accesskey              "R"> 
-<!ENTITY lookIn.label                        "Look in:"> 
-<!ENTITY lookIn.accesskey                    "L"> 
-<!ENTITY for.label                           "for:"> 
-<!ENTITY for.accesskey                       "f"> 
-<!ENTITY clearButton.label                   "Clear">
-<!ENTITY clearButton.accesskey               "a">
-<!ENTITY stopButton.label                    "Stop"> 	
-<!ENTITY addressMessageTo.label              "Address message to:"> 
-
-<!-- Tooltips items -->  
-<!ENTITY addressPickerSearchButton.tooltip   "Search the selected address book"> 
-<!ENTITY addressPickerNewButton.tooltip      "Create a new address book card"> 
-<!ENTITY addressPickerEditButton.tooltip     "Edit the selected card"> 
-
--- a/mail/chrome/messenger/addressbook/addressBook.properties
+++ b/mail/chrome/messenger/addressbook/addressBook.properties
@@ -50,16 +50,22 @@ newCardTitleWithDisplayName=New Card for
 editCardTitle=Edit Card
 # %S will be the card's display name
 editCardTitleWithDisplayName=Edit Card for %S
 # don't translate vCard
 editVCardTitle=Edit vCard
 # %S will be the card's display name, don't translate vCard
 editVCardTitleWithDisplayName=Edit vCard for %S
 
+## LOCALIZATION NOTE (cardRequiredDataMissingMessage):  do not localize \n
+cardRequiredDataMissingMessage=You must enter at least one of the following items:\nEmail Address, First Name, Last Name, Display Name, Organisation.
+cardRequiredDataMissingTitle=Required Information Missing
+incorrectEmailAddressFormatMessage=The primary email address must be of the form user@host.
+incorrectEmailAddressFormatTitle=Incorrect Email Address Format
+
 viewCardTitle=Card for %S
 viewListTitle=Mailing List: %S
 mailListNameExistsTitle=Mailing List Already Exists
 mailListNameExistsMessage=A Mailing List with that name already exists. Please choose a different name.
 
 # used in the addressbook
 cannotDeleteTitle=Delete Failed
 confirmDeleteMailingListTitle=Delete Mailing List
@@ -103,54 +109,60 @@ prefixTo=To
 prefixCc=Cc
 prefixBcc=Bcc
 emptyEmailCard=Please remove the following cards with no email address : 
 addressBook=Address Book
 
 # mailnews.js
 ldap_2.servers.pab.description=Personal Address Book
 ldap_2.servers.history.description=Collected Addresses
+## LOCALIZATION NOTE (ldap_2.servers.osx.description is only used on Mac OS X)
+ldap_2.servers.osx.description=Mac OS X Address Book
 
 # status bar stuff
 ## LOCALIZATION NOTE (totalCardStatus): 
 ## %1$S is address book name, %2$S is card count
 totalCardStatus=Total Cards in %1$S: %2$S
 ## LOCALIZATION NOTE (matchesFound):  do not localize %S
 noMatchFound=No matches found
 matchFound=1 match found
 matchesFound=%S matches found
+
 cardsCopied=%S cards copied
 cardCopied=1 card copied
+cardsMoved=%S cards moved
+cardMoved=1 card moved
 
 # LDAP directory stuff
 directoriesListItemNone=None
 invalidName=Please enter a valid Name.
 invalidHostname=Please enter a valid Hostname.
 invalidPortNumber=Please enter a valid Port Number.
 invalidResults=Please enter a valid number in the results field.
+abReplicationOfflineWarning=You must be online to perform LDAP replication.
+abReplicationSaveSettings=Settings must be saved before a directory may be downloaded.
 
 # For importing / exporting
 ExportAddressBookTitle=Export Address Book
-LDIFFiles=LDIF (*.ldi,*.ldif)
-CSVFiles=Comma Separated (*.csv)
-TABFiles=Tab Delimited (*.tab,*.txt)
+LDIFFiles=LDIF
+CSVFiles=Comma Separated
+TABFiles=Tab Delimited
 failedToExportTitle=Export Failed
 failedToExportMessageNoDeviceSpace=Failed to export addressbook, no space left on device.
 failedToExportMessageFileAccessDenied=Failed to export addressbook, file access denied.
 
 # For getting authDN for replication using dlg box
 AuthDlgTitle=Address Book LDAP Replication
 AuthDlgDesc=To access the directory server, enter your user name and password.
 
 # LOCALIZATION NOTE(joinMeInThisChat)
 # use + for spaces
 joinMeInThisChat=Join+me+in+this+Chat.
 
 # For printing
-headingCardFor=Card for
 headingHome=Home
 headingWork=Work
 headingOther=Other
 headingPhone=Phone
 headingDescription=Description
 headingAddresses=Addresses
 
 # For address books
--- a/mail/chrome/messenger/addressbook/ldapAutoCompErrs.properties
+++ b/mail/chrome/messenger/addressbook/ldapAutoCompErrs.properties
@@ -60,28 +60,21 @@ 3=LDAP server communications problem
 ## @name ERR_STATE_SEARCHING
 ## @loc none
 4=LDAP server search problem
 
 
 # The format of the alert dialog itself
 #
 ## @name ALERT_FORMAT
-## @loc None of %1$S, %2$S, %3$S, and %4$S should be localized.  %1$S is the 
-##      ERROR_CODE string below, %2$S is the error code itself, %3$S is an
-##      LDAP SDK error message from chrome://mozldap/locale/ldap.properties,
-##      and %4$S is a hint relating to that specific error, found in this file.
-alertFormat=%1$S %2$S: %3$S\n\n %4$S
-
-# This string is used in ALERT_FORMAT
-#
-## @name ERROR_CODE
-## @loc none
-errCode=Error code
-
+## @loc None of %1$S, %2$S and %3$S should be localized. 
+##      %1$S is the error code itself, %2$S is an LDAP SDK error message from
+##      chrome://mozldap/locale/ldap.properties, and %3$S is a hint relating
+##      to that specific error, found in this file.
+errorAlertFormat=Error code %1$S: %2$S\n\n %3$S
 
 ## The following errors are for error codes other than LDAP-specific ones.
 ## Someday mozilla will actually have a system for mapping nsresults to
 ## error strings that's actually widely used, unlike nsIErrorService.  But
 ## until it does, these strings live here...
 
 ## @name HOST_NOT_FOUND
 ## @loc none
--- a/mail/chrome/messenger/addressbook/pref-directory-add.dtd
+++ b/mail/chrome/messenger/addressbook/pref-directory-add.dtd
@@ -63,15 +63,13 @@
 <!ENTITY scopeOneLevel.label               "One Level">
 <!ENTITY scopeOneLevel.accesskey           "L">
 <!ENTITY scopeSubtree.label                "Subtree">
 <!ENTITY scopeSubtree.accesskey            "S">
 <!ENTITY return.label                      "Don't return more than">
 <!ENTITY return.accesskey                  "r">
 <!ENTITY results.label                     "results">
 <!ENTITY offlineText.label                 "You can download a local copy of this directory so that it is available for use when you are working offline.">
-<!ENTITY downloadNowButton.label           "Download Now">
-<!ENTITY downloadNowButton.accesskey       "D">
 <!-- Localization note: this is here because the width of the dialog 
      is determined by the width of the base DN box; and that is likely
      to vary somewhat with the language.
 -->
 <!ENTITY newDirectoryWidth                 "36em">
--- a/mail/chrome/messenger/addressbook/pref-directory.dtd
+++ b/mail/chrome/messenger/addressbook/pref-directory.dtd
@@ -31,18 +31,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 ***** -->
 
 <!-- LOCALIZATION NOTE (window.title) : do not translate "LDAP" in below line -->
-<!ENTITY window.title              "LDAP Directory Servers">
-<!ENTITY pane.title                "Directory">
+<!ENTITY pref.ldap.window.title    "LDAP Directory Servers">
 <!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">
deleted file mode 100644
--- a/mail/chrome/messenger/addressbook/replicationProgress.dtd
+++ /dev/null
@@ -1,41 +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.
-   -
-   - The Initial Developer of the Original Code is
-   - Srilatha Moturi <srilatha@netscape.com>
-   - Portions created by the Initial Developer are Copyright (C) 2002
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -  Rajiv Dayal <rdayal@netscape.com>
-   -  Seth Spitzer <sspitzer@netscape.com>
-   -
-   - 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 LGPL or the GPL. 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 status.label   "Status:">
-<!ENTITY progress.label "Progress:">
-<!ENTITY replicationCancel.label "Cancel">
-<!ENTITY replicationCancel.accesskey "C">
--- a/mail/chrome/messenger/addressbook/replicationProgress.properties
+++ b/mail/chrome/messenger/addressbook/replicationProgress.properties
@@ -30,26 +30,21 @@
 #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 *****
-replicationStarted=Replication started...
-changesStarted=Started finding changes to replicate...
+replicationStarted=Replication started…
+changesStarted=Started finding changes to replicate…
 replicationSucceeded=Replication succeeded
 replicationFailed=Replication failed
+replicationCancelled=Replication cancelled
 # LOCALIZATION NOTE
 # do not localize %S.  %S is the current entry number (an integer)
 currentCount=Replicating directory entry: %S
-# LOCALIZATION NOTE
-# do not localize %S.  %S is the current address book name
-replicatingTitle=Replicating %S
-replicationOfSameInProgress=A replication of this directory is already in progress.
-replicationOfOtherInProgress=A replication of another directory is already in progress.  You can only replicate one directory at a time.
-mustBeOnlineToReplicate=You must be online to replicate a directory.
-# LOCALIZATION NOTE
-# do not localize %S.  %S is the product name.
-replicationInProgress=%S is currently in the process of replicating an address book.  Would you like to wait until the process has completed before quitting or quit now?
-waitButton=Wait
-quitButton=Quit
+
+downloadButton=Download Now
+downloadButton.accesskey=D
+cancelDownloadButton=Cancel Download
+cancelDownloadButton.accesskey=C
--- a/mail/chrome/messenger/am-addressing.dtd
+++ b/mail/chrome/messenger/am-addressing.dtd
@@ -1,32 +1,32 @@
 <!-- extracted from am-addressing.xul -->
 
 <!ENTITY addressing.label          "Composition &amp; Addressing">
 <!ENTITY addressingGroupTitle.label "Addressing">
 <!ENTITY addressingText.label      "When looking up addresses:">
 <!-- LOCALIZATION NOTE (override.label) : do not translate "LDAP" in below line -->
 <!ENTITY useGlobal.label           "Use my global LDAP server preferences for this account">
 <!ENTITY useGlobal.accesskey       "U">
-<!ENTITY editDirectories.label     "Edit Directories...">
+<!ENTITY editDirectories.label     "Edit Directories…">
 <!ENTITY editDirectories.accesskey "E">
 <!-- LOCALIZATION NOTE (directories.label) : do not translate "LDAP" in below line -->
 <!ENTITY directories.label         "Use a different LDAP server:">
 <!ENTITY directories.accesskey     "d">
 
 <!-- am-addressing.xul -->
 
 <!ENTITY compositionGroupTitle.label "Composition">
 <!-- LOCALIZATION NOTE (useHtml.label) : do not translate "html" in below line -->
 <!ENTITY useHtml.label                        "Compose messages in HTML format">
 <!ENTITY useHtml.accesskey                    "C">
 <!ENTITY autoQuote.label                      "Automatically quote the original message when replying">
 <!ENTITY autoQuote.accesskey                  "q">
 <!-- LOCALIZATION NOTE (then.label): This will concatenate with the 4 strings that follow. -->
 <!ENTITY then.label                           "Then,">
-<!ENTITY then.accesskey                       "t">
+<!ENTITY then.accesskey                       "T">
 <!ENTITY aboveQuote.label                     "start my reply above the quote">
 <!ENTITY belowQuote.label                     "start my reply below the quote">
 <!ENTITY selectAndQuote.label                 "select the quote">
 <!ENTITY place.label                          "and place my signature">
 <!ENTITY place.accesskey                      "p">
 <!ENTITY belowText.label                      "below the quote (recommended)">
 <!ENTITY aboveText.label                      "below my reply (above the quote)">
--- a/mail/chrome/messenger/am-advanced.dtd
+++ b/mail/chrome/messenger/am-advanced.dtd
@@ -1,22 +1,23 @@
 <!-- extracted from am-advanced.xul -->
 
 <!-- LOCALIZATION NOTE (smtpServer.label): do not translate "SMTP" in below line -->
 <!ENTITY smtpServer.label "Outgoing Server (SMTP) Settings">
 
 <!-- LOCALIZATION NOTE (smtpDesc.label): do not translate "SMTP" in below line -->
 <!ENTITY smtpDesc.label "Although you can specify more than one outgoing server (SMTP), this is only recommended for advanced users. Setting up multiple SMTP servers can cause errors when sending messages.">
 
-<!ENTITY smtpListAdd.label  "Add...">
+<!ENTITY smtpListAdd.label  "Add…">
 <!ENTITY smtpListAdd.accesskey  "d">
-<!ENTITY smtpListEdit.label "Edit...">
+<!ENTITY smtpListEdit.label "Edit…">
 <!ENTITY smtpListEdit.accesskey "E">
 <!ENTITY smtpListDelete.label "Remove">
 <!ENTITY smtpListDelete.accesskey "m">
 <!ENTITY smtpListSetDefault.label "Set Default">
 <!ENTITY smtpListSetDefault.accesskey "t">
 
 <!ENTITY serverDescription.label "Description: ">
 <!ENTITY serverName.label "Server Name: ">
 <!ENTITY serverPort.label "Port: ">
 <!ENTITY userName.label   "User Name: ">
 <!ENTITY useSecureConnection.label   "Secure Connection: ">
+<!ENTITY useSecureAuthentication.label   "Secure Authentication: ">
--- a/mail/chrome/messenger/am-copies.dtd
+++ b/mail/chrome/messenger/am-copies.dtd
@@ -1,15 +1,17 @@
 <!-- extracted from am-copies.xul -->
 
 <!ENTITY copyAndFolderTitle.label "Copies &amp; Folders">
 <!ENTITY sendingPrefix.label "When sending messages, automatically: ">
 <!ENTITY fccMailFolder.label "Place a copy in:">
 <!ENTITY fccMailFolder.accesskey "P">
-<!ENTITY chooseFolderButton.label "Choose Folder...">
+<!ENTITY fccReplyFollowsParent.label "Place replies in the folder of the message being replied to">
+<!ENTITY fccReplyFollowsParent.accesskey "c">
+<!ENTITY chooseFolderButton.label "Choose Folder…">
 <!-- LOCALIZATION NOTE (bccAddress.label): do not translate "Bcc" in below line -->
 <!ENTITY bccAddress.label "Bcc these email addresses:">
 <!ENTITY bccAddress.accesskey "B">
 <!ENTITY specialFolderTitle.label "Special Folders">
 <!ENTITY draftMailFolder.label "Keep message drafts in:">
 <!ENTITY templateMailFolder.label "Keep message templates in:">
 <!ENTITY saveMessageDlg.label "Show confirmation dialogue when messages are saved">
 <!ENTITY saveMessageDlg.accesskey "S">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/am-dsn.dtd
@@ -0,0 +1,16 @@
+<!ENTITY pane.title                 "Delivery Status Notification">
+<!ENTITY useGlobalPrefs.label       "Use my global Delivery Status Notification preferences for this account">
+<!ENTITY useGlobalPrefs.accesskey   "U">
+<!ENTITY useCustomPrefs.label       "Customise Delivery Status Notification for this account">
+<!ENTITY useCustomPrefs.accesskey   "C">
+<!ENTITY requestAlways.label        "When sending messages, always request a Delivery Status Notification">
+<!ENTITY requestAlways.accesskey    "W">
+<!ENTITY optionTitle.label          "Ask notification on :">
+<!ENTITY requestOnSucess.label      "Success in delivering">
+<!ENTITY requestOnSucess.accesskey  "S">
+<!ENTITY requestOnFailure.label     "Failure in delivering">
+<!ENTITY requestOnFailure.accesskey "F">
+<!ENTITY requestOnDelay.label       "Delay in delivering">
+<!ENTITY requestOnDelay.accesskey   "D">
+<!ENTITY requestNever.label         "Never receive Delivery Status Notification">
+<!ENTITY requestNever.accesskey     "N">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/am-dsn.properties
@@ -0,0 +1,2 @@
+## Strings used in prefs.
+prefPanel-dsn=Delivery Status Notification
--- a/mail/chrome/messenger/am-identities-list.dtd
+++ b/mail/chrome/messenger/am-identities-list.dtd
@@ -1,8 +1,8 @@
 <!ENTITY identitiesListTitle.label "Identities Associated With This Account">
 <!ENTITY identitiesListDesc.label "Multiple Identities Support">
-<!ENTITY identitiesListAdd.label  "Add...">
+<!ENTITY identitiesListAdd.label  "Add…">
 <!ENTITY identitiesListAdd.accesskey  "A">
-<!ENTITY identitiesListEdit.label "Edit...">
+<!ENTITY identitiesListEdit.label "Edit…">
 <!ENTITY identitiesListEdit.accesskey "E">
 <!ENTITY identitiesListDelete.label "Delete">
 <!ENTITY identitiesListDelete.accesskey "D">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/am-junk.dtd
@@ -0,0 +1,20 @@
+<!ENTITY junkSettings.label "Junk Settings">
+<!ENTITY trainingWarning.label "If enabled, you must first train &brandShortName; to identify junk mail by using the Junk toolbar button to mark messages as junk or not. You need to identify both junk and non junk messages.">
+<!ENTITY level.label "Enable adaptive junk mail controls for this account">
+<!ENTITY level.accesskey "E">
+
+<!ENTITY move.label "Move new junk messages to:">
+<!ENTITY move.accesskey "M">
+<!ENTITY junkFolderOn.label "&quot;Junk&quot; folder on:">
+<!ENTITY junkFolderOn.accesskey "J">
+<!ENTITY otherFolder.label "Other:">
+<!ENTITY otherFolder.accesskey "O">
+<!ENTITY purge1.label "Automatically delete junk mail older than">
+<!ENTITY purge1.accesskey "u">
+<!ENTITY purge2.label "days">
+
+<!ENTITY whitelist.label "Do not mark mail as junk if the sender is in: ">
+<!ENTITY whitelist.accesskey "D">
+
+<!ENTITY ispHeaders.label "Trust junk mail headers set by: ">
+<!ENTITY ispHeaders.accesskey "T">
--- a/mail/chrome/messenger/am-main.dtd
+++ b/mail/chrome/messenger/am-main.dtd
@@ -11,24 +11,24 @@
 <!ENTITY email.label "Email Address:">
 <!ENTITY email.accesskey "E">
 <!ENTITY replyTo.label "Reply-to Address:">
 <!ENTITY replyTo.accesskey "s">
 <!ENTITY organization.label "Organisation:">
 <!ENTITY organization.accesskey "O">
 <!ENTITY signature.label "Attach this signature:">
 <!ENTITY signature.accesskey "t">
-<!ENTITY edit.label "Edit...">
-<!ENTITY choose.label "Choose...">
+<!ENTITY edit.label "Edit…">
+<!ENTITY choose.label "Choose…">
 <!ENTITY choose.accesskey "C">
-<!ENTITY editVCard.label "Edit Card...">
+<!ENTITY editVCard.label "Edit Card…">
 <!ENTITY editVCard.accesskey "d">
 <!-- LOCALIZATION NOTE (attachVCard.label) : do not translate "vCard" in below line -->
 <!ENTITY attachVCard.label "Attach my vCard to messages">
 <!ENTITY attachVCard.accesskey "v">
 
-<!ENTITY manageIdentities.label "Manage Identities...">
+<!ENTITY manageIdentities.label "Manage Identities…">
 <!ENTITY manageIdentities.accesskey "M">
 
 <!-- LOCALIZATION NOTE (smtpName.label) : do not translate "SMTP" in below line -->
 <!ENTITY smtpName.label "Outgoing Server (SMTP):">
 <!ENTITY smtpName.accesskey "u">
 <!ENTITY smtpDefaultServer.label "Use Default Server">
--- a/mail/chrome/messenger/am-offline.dtd
+++ b/mail/chrome/messenger/am-offline.dtd
@@ -11,23 +11,24 @@
 <!ENTITY nntpNotDownloadRead.label "Read messages">
 <!ENTITY nntpNotDownloadRead.accesskey "R">
 <!ENTITY nntpDownloadMsg.label "Messages more than">
 <!ENTITY nntpDownloadMsg.accesskey "e">
 <!ENTITY retentionCleanup.label "To recover disc space, old messages can be permanently deleted">
 <!ENTITY retentionKeepMsg.label "Delete messages more than">
 <!ENTITY retentionKeepMsg.accesskey "m">
 <!ENTITY retentionKeepAll.label "Don't delete any messages">
-<!ENTITY retentionKeepAll.accesskey "A">
+<!ENTITY retentionKeepAll.accesskey "a">
 <!ENTITY retentionKeepNew.label "Delete all but the last">
-<!ENTITY retentionKeepNew.accesskey "l">
+<!ENTITY retentionKeepNew.accesskey "b">
 <!ENTITY retentionKeepUnread.label "Always delete read messages">
 <!ENTITY retentionKeepUnread.accesskey "r">
 <!ENTITY nntpRemoveBody.label "Only message bodies less than">
 <!ENTITY nntpRemoveBody.accesskey "O">
-<!ENTITY offlineSelectNntp.label "Select newsgroups for offline use...">
-<!ENTITY offlineSelectImap.label "Select folders for offline use...">
-<!ENTITY offlineSelect.accesskey "S">
+<!ENTITY offlineSelectNntp.label "Select newsgroups for offline use…">
+<!ENTITY offlineSelectNntp.accesskey "S">
+<!ENTITY offlineSelectImap.label "Select folders for offline use…">
+<!ENTITY offlineSelectImap.accesskey "S">
 <!ENTITY offlineDesc.label "You can download your messages locally so that they are available when you are working offline.">
 <!ENTITY makeInboxMsgsAvailable.label "Make the messages in my Inbox available when I am working offline">
 <!ENTITY makeInboxMsgsAvailable.accesskey "b">
 <!ENTITY offlineGroupTitle.label "Offline">
 <!ENTITY diskspaceGroupTitle.label "Disc Space">
--- a/mail/chrome/messenger/am-server-advanced.dtd
+++ b/mail/chrome/messenger/am-server-advanced.dtd
@@ -1,22 +1,23 @@
 <!ENTITY serverAdvanced.label "Advanced Account Settings">
-<!-- LOCALIZATION NOTE (serverDirectory.label): DONT_TRANSLATE "IMAP" -->
+<!-- LOCALIZATION NOTE (imapAdvanced.label): Do not translate "IMAP" -->
 <!ENTITY imapAdvanced.label "Advanced IMAP Server Settings">
+<!-- LOCALIZATION NOTE (serverDirectory.label): Do not translate "IMAP" -->
 <!ENTITY serverDirectory.label "IMAP server directory:">
 <!ENTITY serverDirectory.accesskey "d">
 <!ENTITY usingSubscription.label "Show only subscribed folders">
 <!ENTITY usingSubscription.accesskey "w">
 <!ENTITY dualUseFolders.label "Server supports folders that contain sub-folders and messages">
 <!ENTITY dualUseFolders.accesskey "f">
 <!ENTITY useIdle.label "Use IDLE command if the server supports it">
 <!ENTITY useIdle.accesskey "I">
 <!ENTITY maximumConnectionsNumber.label "Maximum number of server connections to cache">
 <!ENTITY maximumConnectionsNumber.accesskey "M">
-<!-- LOCALIZATION NOTE (namespaceDesc.label): DONT_TRANSLATE "IMAP" -->
+<!-- LOCALIZATION NOTE (namespaceDesc.label): Do not translate "IMAP" -->
 <!ENTITY namespaceDesc.label "These preferences specify the namespaces on your IMAP server">
 <!ENTITY personalNamespace.label "Personal namespace:">
 <!ENTITY personalNamespace.accesskey "P">
 <!ENTITY publicNamespace.label "Public (shared):">
 <!ENTITY publicNamespace.accesskey "u">
 <!ENTITY otherUsersNamespace.label "Other Users:">
 <!ENTITY otherUsersNamespace.accesskey "O">
 <!ENTITY overrideNamespaces.label "Allow server to override these namespaces">
--- a/mail/chrome/messenger/am-server-top.dtd
+++ b/mail/chrome/messenger/am-server-top.dtd
@@ -41,54 +41,54 @@
 <!ENTITY useSecAuth.accesskey "i">
 <!ENTITY leaveOnServer.label "Leave messages on server">
 <!ENTITY leaveOnServer.accesskey "g">
 <!ENTITY headersOnly.label "Fetch headers only">
 <!ENTITY headersOnly.accesskey "f">
 <!ENTITY deleteByAgeFromServer.label "For at most">
 <!ENTITY deleteByAgeFromServer.accesskey "o">
 <!ENTITY daysEnd.label "days">
-<!ENTITY deleteOnServer.label "Until I delete or move them from Inbox">
-<!ENTITY deleteOnServer.accesskey "d">
+<!ENTITY deleteOnServer2.label "Until I delete them">
+<!ENTITY deleteOnServer2.accesskey "d">
 <!ENTITY downloadOnBiff.label "Automatically download new messages">
 <!ENTITY downloadOnBiff.accesskey "m">
 <!ENTITY hostname.label "Server Hostname">
 <!ENTITY username.label "Your Login Name">
 <!-- LOCALIZATION NOTE (popServerTitle.label) : do not translate "POP" in below line -->
 <!ENTITY popServerTitle.label "POP Server Information">
 <!ENTITY deleteMessagePrefix.label "When I delete a message:">
-<!ENTITY deleteMessagePrefix.accesskey "W">
-<!ENTITY modelMoveToTrash.label "Move it to the Deleted folder">
-<!ENTITY modelMarkDeleted.label "Mark it as deleted">
+<!ENTITY modelMoveToTrash.label "Move it to this folder:">
+<!ENTITY modelMoveToTrash.accesskey "o">
+<!ENTITY modelMarkDeleted.label "Just mark it as deleted">
+<!ENTITY modelMarkDeleted.accesskey "k">
 <!ENTITY modelDeleteImmediately.label "Remove it immediately">
+<!ENTITY modelDeleteImmediately.accesskey "d">
 <!-- LOCALIZATION NOTE (expungeOnExit.label) : do not translate two of "&quot;" in below line -->
 <!ENTITY expungeOnExit.label "Clean up (&quot;Expunge&quot;) Inbox on Exit">
 <!ENTITY expungeOnExit.accesskey "E">
 <!ENTITY emptyTrashOnExit.label "Empty Deleted folder on Exit">
 <!ENTITY emptyTrashOnExit.accesskey "x">
-<!ENTITY loginAtStartup.label "Check for new messages at startup"> 
+<!ENTITY loginAtStartup.label "Check for new messages at startup">
 <!ENTITY loginAtStartup.accesskey "C">
-<!-- LOCALIZATION NOTE (maxMessagesStart.label) : translate below 2 lines with grammar dependency 
-    maxMessengerStart.label will be followed by maxMessagesEnd.label with the number
-	 of messages between them
+<!-- LOCALIZATION NOTE (maxMessagesStart.label) : translate below 2 lines with grammar dependency
+     maxMessengerStart.label will be followed by maxMessagesEnd.label with the number
+     of messages between them
 -->
 <!ENTITY maxMessagesStart.label "Ask me before downloading more than">
 <!ENTITY maxMessagesStart.accesskey "m">
 <!-- LOCALIZATION NOTE (maxMessagesEnd.label) : see note for maxMessagesStart.label -->
 <!ENTITY maxMessagesEnd.label "messages">
 <!ENTITY alwaysAuthenticate.label "Always request authentication when connecting to this server">
 <!ENTITY alwaysAuthenticate.accesskey "w">
 <!ENTITY newsrcFilePath.label "newsrc file:">
-<!ENTITY newsrcFilePath.accesskey "f">
 <!ENTITY localPath.label "Local directory:">
-<!ENTITY localPath.accesskey "L">
 <!ENTITY abbreviate.label "Show newsgroup names in the Mail Folder pane as:">
 <!ENTITY abbreviateOn.label "Full names (For example, 'netscape.public.mozilla.mail-news')">
 <!ENTITY abbreviateOff.label "Abbreviate names (For example, 'n.p.m.mail-news')">
-<!ENTITY advancedButton.label "Advanced...">
-<!ENTITY serverDefaultCharset.label "Default Character Encoding:">
+<!ENTITY advancedButton.label "Advanced…">
 <!ENTITY advancedButton.accesskey "v">
+<!ENTITY serverDefaultCharset.label "Default Character Encoding:">
 <!ENTITY localFolderPicker.label "Select Local Directory">
-<!ENTITY browseFolder.label "Browse...">
+<!ENTITY browseFolder.label "Browse…">
 <!ENTITY browseFolder.accesskey "B">
 <!ENTITY newsrcPicker.label "Select newsrc File">
-<!ENTITY browseNewsrc.label "Browse...">
+<!ENTITY browseNewsrc.label "Browse…">
 <!ENTITY browseNewsrc.accesskey "e">
--- a/mail/chrome/messenger/am-serverwithnoidentities.dtd
+++ b/mail/chrome/messenger/am-serverwithnoidentities.dtd
@@ -1,12 +1,11 @@
 <!ENTITY accountTitle.label "Account Settings">
 <!ENTITY accountSettingsDesc.label "The following is a special account.  There are no identities associated with it.">
 <!ENTITY accountName.label "Account Name:">
 <!ENTITY accountName.accesskey "N">
 <!ENTITY messageStorage.label "Message Storage">
 <!ENTITY emptyTrashOnExit.label "Empty Deleted folder on Exit">
 <!ENTITY emptyTrashOnExit.accesskey "x">
 <!ENTITY localPath.label "Local directory:">
-<!ENTITY localPath.accesskey "L">
 <!ENTITY localFolderPicker.label "Select Local Directory">
-<!ENTITY browseFolder.label "Browse...">
+<!ENTITY browseFolder.label "Browse…">
 <!ENTITY browseFolder.accesskey "B">
--- a/mail/chrome/messenger/am-smime.dtd
+++ b/mail/chrome/messenger/am-smime.dtd
@@ -1,17 +1,17 @@
 <!ENTITY securityTitle.label "Security">
 <!ENTITY securityHeading.label "To send and receive signed or encrypted messages, you should specify both a digital signing certificate and an encryption certificate.">
 <!ENTITY encryptionGroupTitle.label "Encryption">
 <!ENTITY encryptionChoiceLabel.label "Default encryption setting when sending messages:">
 <!ENTITY neverEncrypt.label "Never (do not use encryption)">
 <!ENTITY alwaysEncryptMessage.label "Required (can't send message unless all recipients have certificates)">
 <!ENTITY encryptionCert.message "Use this certificate to encrypt &amp; decrypt messages sent to you:">
 <!ENTITY encryptionCert.notselected "No certificate set">
-<!ENTITY certificate.button "Select...">
+<!ENTITY certificate.button "Select…">
 <!ENTITY certificate_clear.button "Clear">
 <!ENTITY signingGroupTitle.label "Digital Signing">
 <!ENTITY signMessage.label "Digitally sign messages (by default)">
 <!ENTITY signingCert.message "Use this certificate to digitally sign messages you send:">
 <!ENTITY signingCert.notselected "No certificate set">
 
 <!ENTITY certificates.label     "Certificates">
 <!ENTITY managecerts.label      "View Certificates">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/appleMailImportMsgs.properties
@@ -0,0 +1,64 @@
+# ***** 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 Apple Mail importer code.
+#
+# The Initial Developer of the Original Code is 
+# Håkan Waara <hwaara@gmail.com>.
+# Portions created by the Initial Developer are Copyright (C) 2008
+# 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 *****
+
+
+# Short name of import module
+## @name APPLEMAILIMPORT_NAME
+## @loc None
+2000=Apple Mail
+
+# Description of import module
+## @name APPLEMAILIMPORT_DESCRIPTION
+## @loc None
+2001=Import Local Mail from Mac OS X Mail
+
+# Success Message
+# LOCALIZATION NOTE : Do not translate the word "%S" below.
+## @name APPLEMAILIMPORT_MAILBOX_SUCCESS
+## @loc None
+2002=Local messages were successfully imported from %S
+
+# Error Message
+## @name APPLEMAILIMPORT_MAILBOX_BADPARAM
+## @loc None
+2003=An internal error occurred. Importing failed. Try importing again.
+
+# Error message
+# LOCALIZATION NOTE : Do not translate the word "%S" below.
+## @name APPLEMAILIMPORT_MAILBOX_CONVERTERROR
+## @loc None
+2004=An error occurred while importing messages from %S. Messages were not imported. 
+
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/baseMenuOverlay.dtd
@@ -0,0 +1,20 @@
+<!-- Help Menu -->
+<!ENTITY helpMenu.label "Help">
+<!ENTITY helpMenu.accesskey "H">
+<!-- LOCALIZATION NOTE some localizations of Windows use "?"
+                       for the help button in the menubar but Gnome does not.   -->
+<!ENTITY helpMenuWin.label "Help">
+<!ENTITY helpMenuWin.accesskey "H">
+<!ENTITY releaseCmd.label "Release Notes">
+<!ENTITY releaseCmd.accesskey "R">
+<!ENTITY openHelp.label "Help Contents">
+<!ENTITY openHelp.accesskey "H">
+<!ENTITY openHelp.commandkey "VK_F1">
+<!ENTITY openHelpMac.label "&brandShortName; Help">
+<!ENTITY openHelpMac2.commandkey   "?">
+<!ENTITY openHelpMac2.modifiers    "accel">
+
+<!ENTITY updateCmd.label "Check for Updates…">
+<!ENTITY updateCmd.accesskey "o">
+<!ENTITY aboutCmd.label "About &brandFullName;">
+<!ENTITY aboutCmd.accesskey "A">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/defaultClientDialog.dtd
@@ -0,0 +1,9 @@
+<!ENTITY defaultClient.title  "Default Client">
+<!ENTITY defaultClient.intro  "Use &brandShortName; as the default client for:">
+
+<!ENTITY email.label "Email">
+<!ENTITY newsgroups.label "Newsgroups">
+<!ENTITY rss.label "RSS Feeds">
+
+<!ENTITY checkOnStartup.label "Always perform this check when starting &brandShortName;">
+<!ENTITY checkOnStartup.accesskey "A">
--- a/mail/chrome/messenger/downloadheaders.dtd
+++ b/mail/chrome/messenger/downloadheaders.dtd
@@ -34,19 +34,19 @@
  the terms of any one of the MPL, the GPL or the LGPL.
 
  ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY all.label          "Download all headers">
 <!ENTITY all.accesskey      "D">
 <!--LOCALIZATION NOTE (download.label):
     consider the download.label and headers.label as a single sentence
-	 with the number of headers to be downloaded inserted between them:
-	 EXAMPLE: "Download" <some number> "headers"
-	 Either label could be set to null ("") if required grammatically.
+    with the number of headers to be downloaded inserted between them:
+    EXAMPLE: "Download" <some number> "headers"
+    Either label could be set to null ("") if required grammatically.
 -->
 
 <!ENTITY download.label     "Download">
 <!ENTITY download.accesskey "o">
 <!--LOCALIZATION NOTE (headers.label): see note for download.label -->
 <!ENTITY headers.label      "headers">
 <!ENTITY headers.accesskey  "h">
 <!ENTITY mark.label         "Mark remaining headers as read">
--- a/mail/chrome/messenger/eudoraImportMsgs.properties
+++ b/mail/chrome/messenger/eudoraImportMsgs.properties
@@ -51,79 +51,180 @@ 2001=Eudora mail and address books
 
 # Success message
 ## @name EUDORAIMPORT_MAILBOX_SUCCESS
 ## @loc None
 # LOCALIZATION NOTE (2002): In the following sentence,
 # the %S represents a string to be inserted at runtime (the name of the Mailbox), 
 # and the %d is a number (the number of messages imported). Do not translate %d or %S, but
 # instead insert them in your text at the appropriate places.
-
 2002=Mailbox %S, imported %d messages
 
 # Error message
 ## @name EUDORAIMPORT_MAILBOX_BADPARAM
 ## @loc None
-
 2003=Bad parameter passed to import mailbox.
 
 # Error message
 ## @name EUDORAIMPORT_MAILBOX_BADSOURCEFILE
 ## @loc None
 # LOCALIZATION NOTE (2004): In the following sentence, do not translate the "%S". Instead,
 # place it in your sentence where you wish to display the name of the mailbox.
-
 2004=Error accessing file for mailbox %S.
 
 # Error message
 ## @name EUDORAIMPORT_MAILBOX_CONVERTERROR
 ## @loc None
 # LOCALIZATION NOTE (2005): In the following sentence, do not translate the "%S". Instead,
 # place it in your sentence where you wish to display the name of the mailbox.
-
 2005=Error importing mailbox %S, all messages may not be imported from this mailbox.
 
 # Description
 ## @name EUDORAIMPORT_ACCOUNTNAME
 ## @loc None
 # LOCALIZATION NOTE (2006): Do not translate "Eudora" below.
-
 2006=Eudora Settings
 
 # Description
 ## @name EUDORAIMPORT_NICKNAMES_NAME
 ## @loc None
 # LOCALIZATION NOTE (2007): Do not translate "Eudora" below.
-
 2007=Eudora Nicknames
 
 # Description
 ## @name EUDORAIMPORT_ADDRESS_SUCCESS
 ## @loc None
 # LOCALIZATION NOTE (2008): In the following sentence, do not translate the "%S". Instead,
 # place it in your sentence where you wish to display the name of the address book.
-
 2008=Imported address book %S
 
 # Error message
 ## @name EUDORAIMPORT_ADDRESS_BADPARAM
 ## @loc None
-
 2009=Bad parameter passed to import address book.
 
 # Error message
 ## @name EUDORAIMPORT_ADDRESS_BADSOURCEFILE
 ## @loc None
 # LOCALIZATION NOTE (2010): In the following sentence, do not translate the "%S". Instead,
 # place it in your sentence where you wish to display the name of the address book.
-
 2010=Error accessing file for address book %S.
 
 # Error message
 ## @name EUDORAIMPORT_ADDRESS_CONVERTERROR
 ## @loc None
 # LOCALIZATION NOTE (2011): In the following sentence, do not translate the "%S". Instead,
 # place it in your sentence where you wish to display the name of the address book.
-
 2011=Error importing address book %S, all addresses may not have been imported.
 
+# Description
+## @name EUDORAIMPORT_ADDRESS_LABEL_HOMEMOBILE
+## @loc None
+# LOCALIZATION NOTE (2012): In the following sentence, do not translate the "%S". Instead,
+# place it in your sentence where you wish to display the mobile phone number.
 
+2012=Personal Mobile: %S
 
+# Description
+## @name EUDORAIMPORT_ADDRESS_LABEL_WORKMOBILE
+## @loc None
+# LOCALIZATION NOTE (2013): In the following sentence, do not translate the "%S". Instead,
+# place it in your sentence where you wish to display the mobile phone number.
+
+2013=Work Mobile: %S
+
+# Description
+## @name EUDORAIMPORT_ADDRESS_LABEL_HOMEFAX
+## @loc None
+# LOCALIZATION NOTE (2014): In the following sentence, do not translate the "%S". Instead,
+# place it in your sentence where you wish to display the fax phone number.
+ 
+2014=Home Fax: %S
+ 
+# Description
+## @name EUDORAIMPORT_ADDRESS_LABEL_WORKFAX
+## @loc None
+# LOCALIZATION NOTE (2015): In the following sentence, do not translate the "%S". Instead,
+# place it in your sentence where you wish to display the fax phone number.
+
+2015=Work Fax: %S
+
+# Description
+## @name EUDORAIMPORT_ADDRESS_LABEL_OTHEREMAIL
+## @loc None
+
+2016=Other Email:
+
+# Description
+## @name EUDORAIMPORT_ADDRESS_LABEL_OTHERPHONE
+## @loc None
+
+2017=Other Phone:
+
+# Description
+## @name EUDORAIMPORT_ADDRESS_LABEL_OTHERWEB
+## @loc None
+
+2018=Other Web:
+
+# Description
+## @name EUDORAIMPORT_FILTERS_WARN_OUTGOING
+## @loc None
+# LOCALIZATION NOTE (2019): This warning is displayed when one of Eudora's outgoing
+# filters is attempted to be imported.  Outgoing filters are ones which are
+# processed when a message is being sent, and are not supported.
+
+2019=can't import outgoing filter context
+
+# Description
+## @name EUDORAIMPORT_FILTERS_WARN_ACTION
+## @loc None
+# LOCALIZATION NOTE (2020): This warning is displayed if the action cannot be imported.
+# The "action" is what is done to the message if the filter matches, e.g. transfer to
+# a mailbox, change the priority.  The %S will be replaced with the name of the action.
+
+2020=can't import action "%S"
+
+# Description
+## @name EUDORAIMPORT_FILTERS_WARN_VERB
+## @loc None
+# LOCALIZATION NOTE (2021): This warning is displayed if the verb cannot be imported.
+# The "verb" is how filters match the header to the text, e.g. "contains", "is",
+# "begins with".  The %s will be replaced with the name of the verb.
+
+2021=can't import the "%s" verb
+
+# Description
+## @name EUDORAIMPORT_FILTERS_WARN_EMPTY_HEADER
+## @loc None
+# LOCALIZATION NOTE (2027): This warning is displayed when the name of the header to be
+# filtered against cannot be found.
+
+2027=header name not found
+
+# Description
+## @name EUDORAIMPORT_FILTERS_WARN_NEGATE_VERB
+## @loc None
+# LOCALIZATION NOTE (2023): This warning is displayed when a filter term needs to be
+# negated, but the negative comparison is not supported, e.g. the "starts with" verb has
+# no corresponding "doesn't start with" verb.  The %S will be replaced with the name of
+# the verb.
+
+2023=can't negate the "%S" verb
+
+# Description
+## @name EUDORAIMPORT_FILTERS_WARN_META_HEADER
+## @loc None
+# LOCALIZATION NOTE (2028): This warning is displayed when one of Eudora's pseudo-headers
+# cannot be supported.  Pseudo-headers are things that can match mutiple headers, e.g.
+# "Any Header", or non-header info, e.g. "Junk Score".  The %S will be replaced with
+# the name of the pseudo-header.
+
+2028=can't import the %S pseudo-header
+
+# Description
+## @name EUDORAIMPORT_FILTERS_WARN_MAILBOX_MISSING
+## @loc None
+# LOCALIZATION NOTE (2025): This warning is displayed when a filter has an action to
+# transfer the message to a mailbox, but the named mailbox doesn't exist.  The %S will
+# be replaced with the name of the mailbox.
+
+2025=can't find the mailbox "%S"
--- a/mail/chrome/messenger/fieldMapImport.dtd
+++ b/mail/chrome/messenger/fieldMapImport.dtd
@@ -33,23 +33,21 @@
  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 fieldMapImport.title "Import Address Book">
 <!ENTITY fieldMapImport.size "width: 40em; height: 30em;">
 <!ENTITY fieldMapImport.recordNumber "Imported data for Record: ">
-<!ENTITY fieldMapImport.next "Next">
+<!ENTITY fieldMapImport.next.label "Next">
 <!ENTITY fieldMapImport.next.accesskey "N">
-<!ENTITY fieldMapImport.previous "Previous">
+<!ENTITY fieldMapImport.previous.label "Previous">
 <!ENTITY fieldMapImport.previous.accesskey "P">
 <!ENTITY fieldMapImport.text "Use Move Up and Move Down to match the address book fields on the left to the correct data for import on the right. Untick items you do not want to import.">
-<!ENTITY fieldMapImport.up "Move Up">
+<!ENTITY fieldMapImport.up.label "Move Up">
 <!ENTITY fieldMapImport.up.accesskey "U">
-<!ENTITY fieldMapImport.down "Move Down">
+<!ENTITY fieldMapImport.down.label "Move Down">
 <!ENTITY fieldMapImport.down.accesskey "D">
 <!ENTITY fieldMapImport.fieldListTitle "Address Book fields">
 <!ENTITY fieldMapImport.dataTitle "Record data to import">
-<!ENTITY fieldMapImport.skipFirstRecord "First record contains field names">
+<!ENTITY fieldMapImport.skipFirstRecord.label "First record contains field names">
 <!ENTITY fieldMapImport.skipFirstRecord.accessKey "F">
-
-
--- a/mail/chrome/messenger/filter.properties
+++ b/mail/chrome/messenger/filter.properties
@@ -1,19 +1,51 @@
 mustSelectFolder=You must select a target folder.
 enterValidEmailAddress=Enter a valid email address to forward to.
 pickTemplateToReplyWith=Choose a template to reply with.
 mustEnterName=You must give this filter a name.
 mustSelectAction=You must select at least one filter action.
 cannotHaveDuplicateFilterTitle=Duplicate Filter Name
 cannotHaveDuplicateFilterMessage=The filter name you entered already exists. Please enter a different filter name.
-deleteFilterConfirmation=Are you sure you want to delete this filter?
+deleteFilterConfirmation=Are you sure you want to delete the selected filter(s)?
 untitledFilterName=Untitled Filter
 filterListBackUpMsg=Your filters do not work because the msgFilterRules.dat file, which contains your filters, could not be read. A new msgFilterRules.dat file will be created and a backup of the old file, called rulesbackup.dat, will be created in the same directory.
 customHeaderOverflow=You've exceeded the limit of 50 custom headers. Please remove one or more custom headers and try again.
 filterCustomHeaderOverflow=Your filters have exceeded the limit of 50 custom headers. Please edit the msgFilterRules.dat file, which contains your filters, to use fewer custom headers.
 invalidCustomHeader=One of your filters uses a custom header that contains an invalid character, such as ':', a non-printable character, a non-ascii character, or an eight-bit ascii character. Please edit the msgFilterRules.dat file, which contains your filters, to remove invalid characters from your custom headers.
 continueFilterExecution=Applying filter %S failed. Would you like to continue applying filters?
 promptTitle=Running Filters
 promptMsg=You are currently in the process of filtering messages.\nWould you like to continue applying filters?
 stopButtonLabel=Stop
 continueButtonLabel=Continue
 cannotEnableFilter=This filter was probably created by future version of mozilla/netscape. You cannot enable this filter because we don't know how to apply it.
+dontWarnAboutDeleteCheckbox=Don't ask me again
+
+# for junk mail logging / mail filter logging
+# LOCALIZATION NOTE(junkLogDetectStr)
+# %1$S=author, %2$S=subject, %3$S=date
+junkLogDetectStr=Detected junk message from %1$S - %2$S at %3$S
+# LOCALIZATION NOTE(logMoveStr)
+# %1$S=message id, %2$S=folder URI
+logMoveStr=moved message id = %1$S to %2$S
+# LOCALIZATION NOTE(logCopyStr)
+# %1$S=message id, %2$S=folder URI
+logCopyStr=copied message id = %1$S to %2$S
+# LOCALIZATION NOTE(filterLogDetectStr)
+# %1$S=filter name %2$S=author, %3$S=subject, %4$S=date
+filterLogDetectStr=Applied filter "%1$S" to message from %2$S - %3$S at %4$S
+filterAction2=priority changed
+filterAction3=deleted
+filterAction4=marked as read
+filterAction5=thread killed
+filterAction6=thread watched
+filterAction7=starred
+filterAction8=tagged
+filterAction9=replied
+filterAction10=forwarded
+filterAction11=execution stopped
+filterAction12=deleted from POP3 server
+filterAction13=left on POP3 server
+filterAction14=junk score
+filterAction15=body fetched from POP3 server
+filterAction16=copied to folder
+filterAction17=tagged
+filterAction18=ignored subthread
--- a/mail/chrome/messenger/folderProps.dtd
+++ b/mail/chrome/messenger/folderProps.dtd
@@ -40,26 +40,29 @@
 
 <!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 Index">
+<!ENTITY folderRebuildSummaryFile.accesskey      "R">
+<!ENTITY folderRebuildSummaryFileTip.label       "Rebuild Summary File"> 
 
 <!ENTITY retention.label "Retention Policy">
 <!ENTITY retentionUseDefault.label  "Use server defaults">
 <!ENTITY retentionUseDefault.accesskey "d">
 <!ENTITY days.label "days">
 <!ENTITY daysOld.label "days old">
 <!ENTITY message.label "messages">
 <!ENTITY retentionCleanup.label "To recover disc space, old messages can be permanently deleted">
-<!ENTITY retentionKeepMsg.label "Delete messages more than">
-<!ENTITY retentionKeepMsg.accesskey "m">
+<!ENTITY retentionDeleteMsg.label "Delete messages more than">
+<!ENTITY retentionDeleteMsg.accesskey "m">
 <!ENTITY retentionKeepAll.label "Don't delete any messages">
 <!ENTITY retentionKeepAll.accesskey "A">
 <!ENTITY retentionKeepNew.label "Delete all but the last">
 <!ENTITY retentionKeepNew.accesskey "l">
 <!ENTITY retentionKeepUnread.label "Always delete read messages">
 <!ENTITY retentionKeepUnread.accesskey "r">
 
 <!ENTITY folderOfflineTab.label                  "Offline">
@@ -75,20 +78,22 @@
 <!ENTITY selectofflineNewsgroup.check.accesskey  "o">
 <!ENTITY UseDefaultofflineNewsgroup.check.label  "Use the default from account settings ">
 <!ENTITY offlineNewsgroup.button.label           "Download Now">
 <!ENTITY offlineNewsgroup.button.accesskey       "D">
 
 <!ENTITY folderProps.information.label           "Information:">
 <!ENTITY folderProps.name.label                  "Name:">
 <!ENTITY folderProps.name.accesskey              "N">
+<!ENTITY folderProps.location.label              "Location:">
+<!ENTITY folderProps.location.accesskey          "L">
 
 <!ENTITY folderSharingTab.label                  "Sharing">
 <!ENTITY privilegesDesc.label                    "Share this and other folders with network users and display and set access privileges">
-<!ENTITY privileges.button.label                 "Privileges...">
+<!ENTITY privileges.button.label                 "Privileges…">
 <!ENTITY privileges.button.accesskey             "P">
 <!ENTITY permissionsDesc.label                   "You have the following permissions:">
 <!ENTITY folderType.label                        "Folder Type:">
 
 <!ENTITY folderQuotaTab.label                    "Quota">
 <!ENTITY folderQuotaRoot.label                   "Quota Root:">
 <!ENTITY folderQuotaUsage.label                  "Usage:">
 <!ENTITY folderQuotaStatus.label                 "Status:">
--- a/mail/chrome/messenger/imapMsgs.properties
+++ b/mail/chrome/messenger/imapMsgs.properties
@@ -37,138 +37,137 @@
 
 #
 # The following are used by the imap code to display progress/status/error messages
 #
 
 # Status - opening folder
 ## @name IMAP_STATUS_SELECTING_MAILBOX
 ## @loc None
-5000=Opening folder...
+5000=Opening folder %S…
 
 # Status - create folder
 ## @name IMAP_STATUS_CREATING_MAILBOX
 ## @loc None
-5001=Creating folder...
+5001=Creating folder…
 
 # Status - deleting a folder
 ## @name IMAP_STATUS_DELETING_MAILBOX
 ## @loc None
 # LOCALIZATION NOTE (Error 5002): The "%S" below should not be translated.
 # Instead, insert "%S" in your translation where you wish to display the name
 # of the folder being deleted.
-
-5002=Deleting folder %S...
+5002=Deleting folder %S…
 
 # Status - renaming mailbox
 ## @name IMAP_STATUS_RENAMING_MAILBOX
 ## @loc None
 # LOCALIZATION NOTE (Error 5003): The "%S" below should not be translated.
 # Instead, insert "%S" in your translation where you wish to display the name
 # of the folder being renamed.
-5003=Renaming folder %S...
+5003=Renaming folder %S…
 
 # Status - looking for mailboxes
 ## @name IMAP_STATUS_LOOKING_FOR_MAILBOX
 ## @loc None
-5004=Looking for folders...
+5004=Looking for folders…
 
 # Status - subscribing to mailbox
 ## @name IMAP_STATUS_SUBSCRIBE_TO_MAILBOX
 ## @loc None
 # LOCALIZATION NOTE (Error 5005): The "%S" below should not be translated.
 # Instead, insert "%S" in your translation where you wish to display the name
 # of the folder being subscribed to.
-5005=Subscribing to folder %S...
+5005=Subscribing to folder %S…
 
 # Status - unsubscribing from mailbox
 ## @name IMAP_STATUS_UNSUBSCRIBE_MAILBOX
 ## @loc None
 # LOCALIZATION NOTE (Error 5005): The "%S" below should not be translated.
 # Instead, insert "%S" in your translation where you wish to display the name
 # of the folder being unsubscribed from.
-5006=Unsubscribing from folder %S...
+5006=Unsubscribing from folder %S…
 
 # Status - searching imap folder
 ## @name IMAP_STATUS_SEARCH_MAILBOX
 ## @loc None
-5007=Searching folder...
+5007=Searching folder…
 
 # Status - getting message info
 ## @name IMAP_STATUS_MSG_INFO
 ## @loc None
-5008=Getting message info...
+5008=Getting message info…
 
 # Status - closing a folder
 ## @name IMAP_STATUS_CLOSE_MAILBOX
 ## @loc None
-5009=Closing folder...
+5009=Closing folder…
 
 # Status - compacting a folder
 ## @name IMAP_STATUS_EXPUNGING_MAILBOX
 ## @loc None
-5010=Compacting folder...
+5010=Compacting folder…
 
 # Status - logging out
 ## @name IMAP_STATUS_LOGGING_OUT
 ## @loc None
-5011=Logging out...
+5011=Logging out…
 
 # Status - checking server capabilities
 ## @name IMAP_STATUS_CHECK_COMPAT
 ## @loc None
-5012=Checking mail server capabilities...
+5012=Checking mail server capabilities…
 
 # Status - logging on
 ## @name IMAP_STATUS_SENDING_LOGIN
 ## @loc None
-5013=Sending login information...
+5013=Sending login information…
 
 # Status - auth logon
 ## @name IMAP_STATUS_SENDING_AUTH_LOGIN
 ## @loc None
-5014=Sending authenticate login information...
+5014=Sending authenticate login information…
 
 ## @name IMAP_DOWNLOADING_MESSAGE
 ## @loc None
-5015=Downloading message...
+5015=Downloading message…
 
 ## @name IMAP_STATUS_GETTING_NAMESPACE
 ## @loc None
 # LOCALIZATION NOTE (Error 5020): Do not translate the word "IMAP" below.
-5020=Checking IMAP Namespace...
+5020=Checking IMAP Namespace…
 
 ## @name IMAP_UPGRADE_NO_PERSONAL_NAMESPACE
 ## @loc None
 5021="The mail server indicates that you may not have any personal mail folders. Please verify your subscriptions.
 
 ## @name IMAP_UPGRADE_PROMPT_USER_2
 ## @loc None
 5024=Any folders which are left unsubscribed will not appear in your folder lists, but can be subscribed to later by choosing File / Subscribe.
 
 ## @name IMAP_UPGRADE_CUSTOM
 ## @loc None
-5026=Please choose which folders you want subscribed in the Subscribe window...
+5026=Please choose which folders you want subscribed in the Subscribe window…
 
 ## @name IMAP_UPGRADE_SUCCESSFUL
 ## @loc None
 5028=The upgrade was successful.
 
 ## @name IMAP_GETTING_ACL_FOR_FOLDER
 ## @loc None
 # LOCALIZATION NOTE (Error 5029): Do not translate the word "ACL" below.
-5029=Getting folder ACL...
+5029=Getting folder ACL…
 
 ## @name IMAP_GETTING_SERVER_INFO
 ## @loc None
-5030=Getting Server Configuration Info...
+5030=Getting Server Configuration Info…
 
 ## @name IMAP_GETTING_MAILBOX_INFO
 ## @loc None
-5031=Getting Mailbox Configuration Info...
+5031=Getting Mailbox Configuration Info…
 
 ## @name IMAP_EMPTY_MIME_PART
 ## @loc None
 5032=This body part will be downloaded on demand.
 
 ## @name IMAP_UNABLE_TO_SAVE_MESSAGE
 ## @loc None
 # LOCALIZATION NOTE (Error 5033): Do not translate the word "IMAP" below.
@@ -183,64 +182,63 @@ 5034=IMAP Error: The online folder infor
 ## @loc None
 5035=Login to server %S failed.
 
 ## @name IMAP_RECEIVING_MESSAGE_HEADERS_OF
 ## @loc None
 # LOCALIZATION NOTE (Error 5036): Do not translate the word "%S" or "%lu" below.
 # Place the word %S in your translation where the name of the server should appear.
 # Place the word %lu where the number of headers should appear.
-
 5036=%S Downloading message header %lu of %lu
 
 ## @name IMAP_RECEIVING_MESSAGE_FLAGS_OF
 ## @loc None
 # LOCALIZATION NOTE (Error 5037): Do not translate the word "%S" or "%lu" below.
 # Place the word %S in your translation where the name of the server should appear.
 # Place the word %lu where the number of flags should appear.
 5037=%S Downloading message flag %lu of %lu
 
 ## @name IMAP_DELETING_MESSAGES
 ## @loc None
-5038=Deleting messages...
+5038=Deleting messages…
 
 ## @name IMAP_DELETING_MESSAGE
 ## @loc None
-5039=Deleting message...
+5039=Deleting message…
 
 ## @name IMAP_MOVING_MESSAGES_TO
 ## @loc None
 # LOCALIZATION NOTE (Error 5040): Do not translate the word "%S" below.
 # Place the word %S in your translation where the name of the folder should appear.
 
-5040=Moving messages to %S...
+5040=Moving messages to %S…
 
 ## @name IMAP_MOVING_MESSAGE_TO
 ## @loc None
 # LOCALIZATION NOTE (Error 5041): Do not translate the word "%S" below.
 # Place the word %S in your translation where the name of the folder should appear.
-5041=Moving message to %S...
+5041=Moving message to %S…
 
 ## @name IMAP_COPYING_MESSAGES_TO
 ## @loc None
 # LOCALIZATION NOTE (Error 5042): Do not translate the word "%S" below.
 # Place the word %S in your translation where the name of the folder should appear.
-5042=Copying messages to %S...
+5042=Copying messages to %S…
 
 ## @name IMAP_COPYING_MESSAGE_TO
 ## @loc None
 # LOCALIZATION NOTE (Error 5043): Do not translate the word "%S" below.
 # Place the word %S in your translation where the name of the folder should appear.
-5043=Copying message to %S...
+5043=Copying message to %S…
 
 ## @name IMAP_SELECTING_MAILBOX
 ## @loc None
 # LOCALIZATION NOTE (Error 5044): Do not translate the word "%S" below.
 # Place the word %S in your translation where the name of the folder should appear.
-5044=Opening folder %S...
+5044=Opening folder %S…
 
 ## @name IMAP_FOLDER_RECEIVING_MESSAGE_OF
 ## @loc None
 # LOCALIZATION NOTE (Error 5045): Do not translate the word "%S" or "%lu" below.
 # Place the word %S in your translation where the name of the folder should appear.
 # Place the word %lu where the number of headers should appear.
 5045=%S - Downloading message %lu of %lu
 
@@ -394,16 +392,20 @@ 5082=Administer Folder
 ## @name IMAP_UNKNOWN_USER
 ## @loc None
 5083=Unknown
 
 ## @name IMAP_SERVER_DOESNT_SUPPORT_ACL
 ## @loc None
 5084=This server does not support shared folders.
 
+## @name IMAP_ACL_EXPUNGE_RIGHT
+## @loc None
+5085=Expunge
+
 ## @name IMAP_SERVER_DISCONNECTED
 ## @loc None
 5090= Server %S has disconnected. The server may have gone down or there may be a network problem.
 
 ## @name IMAP_REDIRECT_LOGIN_FAILED
 ## @loc None
 5091=Login failed.
 
--- a/mail/chrome/messenger/importDialog.dtd
+++ b/mail/chrome/messenger/importDialog.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) 2001
  the Initial Developer. All Rights Reserved.
 
  Contributor(s):
+     Jeff Beckley <beckley@qualcomm.com>
 
  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
@@ -34,40 +35,45 @@
  the terms of any one of the MPL, the GPL or the LGPL.
 
  ***** END LICENSE BLOCK ***** -->
 
 <!--
 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 : Do not translate any of the occurances of the word
+LOCALIZATION NOTE : Do not translate any of the occurrences of the word
 "&brandShortName;" below.
 --> 
 
 <!ENTITY importDialog.windowTitle "Import">
+<!ENTITY importDialog.allTitle    "Import everything">
 <!ENTITY importDialog.mailTitle   "Mail">
 <!ENTITY importDialog.addressbookTitle "Address Books">
 <!ENTITY importDialog.settingsTitle "Settings">
+<!ENTITY importDialog.filtersTitle "Filters">
 
-<!ENTITY importTitle.label        "&brandShortName; Mail Import Wizard">
-<!ENTITY importDesc.label         "Import Mail, Address Books and Settings from other programs">
+<!ENTITY  window.width            "40em">
+<!ENTITY  window.macWidth         "45em">
 
-<!ENTITY importDescription.label  "This wizard will import mail messages, address book entries, and/or preferences from other mail programs and common address book formats into &brandShortName; Mail.">
-<!ENTITY importDescription2.label "Once they have been imported, you will be able to access them from within &brandShortName; Mail and/or Address Book.">
+<!ENTITY importTitle.label        "&brandShortName; Import Wizard">
+<!ENTITY importShortDesc.label    "Import Mail, Address Books, Settings and Filters from other programs">
 
-<!ENTITY selectDescription.label  "Please select the program from which you would like to import:">
+<!ENTITY importDescription1.label "This wizard will import mail messages, address book entries, preferences, and/or filters from other mail programs and common address book formats into &brandShortName;.">
+<!ENTITY importDescription2.label "Once they have been imported, you will be able to access them from within &brandShortName;.">
+
+<!ENTITY selectDescription.label  "Please select the type of file that you would like to import:">
 
 <!ENTITY back.label               "&lt; Back">
 <!ENTITY forward.label            "Next &gt;">
 <!ENTITY finish.label             "Finish">
 <!ENTITY cancel.label             "Cancel">
 
-<!ENTITY select.label             "Select the type of material to import:">
+<!ENTITY select.label             "or select the type of material to import:">
 
 <!ENTITY title.label              "Title">
-<!ENTITY processing.label         "Importing...">
+<!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 importDialog.homeTitle  "Home">
 <!ENTITY importDialog.workTitle  "Work">
--- a/mail/chrome/messenger/importMsgs.properties
+++ b/mail/chrome/messenger/importMsgs.properties
@@ -14,16 +14,17 @@
 # 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) 2001
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
+#     Jeff Beckley <beckley@qualcomm.com>
 #
 # 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
@@ -295,29 +296,39 @@ ImportSettingsBadModule=Unable to load s
 ImportSettingsNotFound=Unable to find settings.  Check to make sure the application is installed on this machine.
 ImportSettingsFailed=An error occurred while importing settings.  Some, or all, of the settings may not have been imported.
 # LOCALIZATION NOTE : Do not translate the word "%S" below.
 ImportSettingsSuccess=Settings were imported from %S
 
 #Error string for mail import
 ImportMailBadModule=Unable to load mail import module
 ImportMailNotFound=Unable to find mail to import.  Check to make sure the mail application is correctly installed on this machine.
+ImportEmptyAddressBook=Can't import empty address book %S.
 # LOCALIZATION NOTE : Do not translate the word "%S" below.
 ImportMailFailed=An error occurred importing mail from %S
 # LOCALIZATION NOTE : Do not translate the word "%S" below.
 ImportMailSuccess=Mail was successfully imported from %S
 
 # Error string for address import
 ImportAddressBadModule=Unable to load address book import module.
 ImportAddressNotFound=Unable to find any address books to import.  Check to make sure the selected application or format is correctly installed on this machine.
 # LOCALIZATION NOTE : Do not translate the word "%S" below.
 ImportAddressFailed=An error occurred importing addresses from %S.
 # LOCALIZATION NOTE : Do not translate the word "%S" below.
 ImportAddressSuccess=Addresses successfully imported from %S.
 
+# Error string for filters import
+ImportFiltersBadModule=Unable to load filters import module.
+# LOCALIZATION NOTE : The %S will get replaced by the name of the import module.
+ImportFiltersFailed=An error occurred importing filters from %S.
+# LOCALIZATION NOTE : The %S will get replaced by the name of the import module.
+ImportFiltersSuccess=Filters successfully imported from %S.
+# LOCALIZATION NOTE : The %S will get replaced by the name of the import module.
+ImportFiltersPartial=Filters partially imported from %S.  Warnings below:
+
 
 #Progress strings
 MailProgressTitle=Importing Mail
 AddrProgressTitle=Importing Address Books
 # LOCALIZATION NOTE : Do not translate the word "%S" below.
 MailProgressMeterText=Converting mailboxes from %S
 # LOCALIZATION NOTE : Do not translate the word "%S" below.
 AddrProgressMeterText=Converting address books from %S
@@ -336,16 +347,15 @@ ImportSelectAddrFile=Select address book
 Comm4xImportName=Communicator 4.x
 Comm4xFiles=Communicator Address Book files (*.na2)
 HomeButtonDesc=Home
 WorkButtonDesc=Work
 
 # Folder Names for imported Mail
 DefaultFolderName=Imported Mail
 # LOCALIZATION NOTE: Do not translate the word "%S" below.
-ModuleFolderName=%S Mail
+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
 profileTitle=Communicator 4.x profiles
 profileText=Choose the profile that contains the Local Mail you want to import:
-
deleted file mode 100644
--- a/mail/chrome/messenger/junkLog.dtd
+++ /dev/null
@@ -1,8 +0,0 @@
-<!ENTITY junkLog.title "Junk Mail Log">
-<!ENTITY junkLogInfo.text "The Junk Mail Log documents the junk mail control activity on this account.  Use the tick box below to enable logging.">
-<!ENTITY clearLog.label "Clear Log">
-<!ENTITY clearLog.accesskey "C">
-<!ENTITY enableLog.label "Enable the Junk Mail Log">
-<!ENTITY enableLog.accesskey "E">
-<!ENTITY closeLog.label "Close">
-<!ENTITY closeLog.accesskey "o">
deleted file mode 100644
--- a/mail/chrome/messenger/junkMail.dtd
+++ /dev/null
@@ -1,44 +0,0 @@
-<!ENTITY window.title "Junk Mail Controls">
-<!ENTITY mainDescription.label "&brandShortName; has several ways to detect junk mail. These controls evaluate incoming messages and identify those that are most likely to be junk mail.">
-
-<!-- Tab titles -->
-<!ENTITY settingsTab.label "Settings">
-<!ENTITY adaptiveTab.label "Adaptive Filter">
-
-<!-- Settings tab -->
-<!ENTITY move.label "Move incoming messages determined to be junk mail to:">
-<!ENTITY otherFolder.label "Other:">
-<!ENTITY junkFolderOn.label "&quot;Junk&quot; folder on:">
-<!ENTITY purge1.label "Automatically delete junk messages older than">
-<!ENTITY purge1.accesskey "u">
-<!ENTITY purge2.label "days from this folder">
-<!ENTITY manualMark.label "When I manually mark messages as Junk:">
-<!ENTITY manualMarkModeMove.label "Move them to the &quot;Junk&quot; folder">
-<!ENTITY manualMarkModeDelete.label "Delete them">
-<!ENTITY renderWithSafeHtml.label "When displaying HTML messages marked as junk, sanitise the HTML">
-<!ENTITY log.label "Logging">
-<!ENTITY handling.label "Handling">
-
-<!ENTITY account.label "Configure Junk Settings for:">
-<!ENTITY account.accesskey "C">
-<!ENTITY viewLog.label "Junk Mail Log">
-<!ENTITY viewLog.accesskey "j">
-
-<!ENTITY loggingDescription.label "View and configure junk mail logging.">
-
-<!-- Adaptive Filter tab -->
-
-<!ENTITY adaptiveCaption.label "Adaptive Filter">
-<!ENTITY trainingWarning.label "If enabled, you must first train &brandShortName; to identify junk mail by using the Junk toolbar button to mark messages as junk or not. You need to identify both junk and non junk messages.">
-<!ENTITY level.label "Enable adaptive junk mail detection">
-<!ENTITY level.accesskey "E">
-
-<!ENTITY resetTrainingDescription.label "Resetting the training data used by the adaptive filter requires you to retrain the filter:">
-<!ENTITY resetTrainingData.label "Reset Training Data">
-<!ENTITY resetTrainingData.accesskey "R">
-
-<!ENTITY whitelist.label "Do not mark messages as junk if the sender is in:">
-<!ENTITY whitelist.accesskey "D">
-
-<!ENTITY ispHeaders.label "Trust junk mail headers set by: ">
-<!ENTITY ispHeaders.accesskey "T">
--- a/mail/chrome/messenger/localMsgs.properties
+++ b/mail/chrome/messenger/localMsgs.properties
@@ -1,251 +1,251 @@
-# ***** 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 local mail code to display progress/status/error 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.
-
-# Out of memory
-## @name LOCAL_OUT_OF_MEMORY
-## @loc None
--1000=Application is out of memory.
-
-# 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
-## @loc None
-4004=Sending of username did not succeed.
-
-# Status - password failed
-## @name POP3_PASSWORD_FAILURE
-## @loc None
-4005=Sending of password did not succeed.
-
-# Status - write error occurred
-## @name POP3_MESSAGE_WRITE_ERROR
-## @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 - 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"
-4010=The POP3 server (%S) does not support UIDL, which is needed to implement the ``Leave on Server'' and ``Maximum Message Size'' options. To download your mail, turn off these options in the Mail Server panel of Preferences.
-
-# Status - the server doesn't support the top command
-## @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"
-4011=The POP3 mail server (%s) does not support the TOP command. Without server support for this, we cannot implement the ``Maximum Message Size'' preference.  This option has been disabled, and messages will be downloaded regardless of their size.
-
-# 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
-## @loc None
-4013=Error getting mail password.
-
-# Status - username undefined 
-## @name POP3_USERNAME_UNDEFINED
-## @loc None
-4014=You have not supplied a username for this server.  Please provide one in the account setup menu and try again.
-
-# Status - list failure
-## @name POP3_LIST_FAILURE
-## @loc None
-# LOCALIZATION NOTE(4015): Do not translate the word "POP3" below.
-4015=The LIST command did not succeed. Error getting the ID and size of a message.
-
-# Status - delete error 
-## @name POP3_DELE_FAILURE
-## @loc None
-# LOCALIZATION NOTE(4016): Do not translate the word "POP3" below.
-4016=The DELE command did not succeed. Error marking a message as deleted.
-
-## @name POP3_ENTER_PASSWORD_PROMPT
-## @loc None
-# LOCALIZATION NOTE(4016): Do not translate the word "%1$s@%2$s" below.
-# Place the word "%1$s" and "%2$s" where email account name should appear (i.e. john.smith@example.org)
-4017=Enter your password for %1$s on %2$s:
-
-## @name POP3_PREVIOUSLY_ENTERED_PASSWORD_IS_INVALID_ETC
-## @loc None
-# LOCALIZATION NOTE(4016): Do not translate the word "%s" below. It will receive the message returned by the server.
-# Do not translate "%.100s" and "%.100s". It will receive the email account name.
-4018=Please enter a new password for user %.100s on %.100s:
-
-## @name POP3_NO_ANSWER
-## @loc None
-4019=No Answer
-
-## @name POP3_ENTER_PASSWORD_PROMPT_TITLE
-## @loc None
-4020=Enter your password:
-
-## @name moveFolderToTrash
-## @loc None
-4021=Are you sure you want to move the selected folder into the Deleted folder?
-
-## @name POP3_FOLDER_FOR_TRASH
-## @loc None
-4023=The Deleted folder already contained a folder named %s. The folder which you just deleted can be found in the Deleted folder under the new name %s.
-
-# Status - stat failed
-## @name POP3_STAT
-## @loc None
-4024= The STAT command did not succeed. Error getting message number and sizes.
-
-## @name POP3_SERVER_SAID
-## @loc None
-4025= Mail server %S responded: 
-
-## @name DELETING_MSGS_STATUS
-## @loc None
-4026=Deleting %S of %S messages
-
-## @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.
-
-# secure authentication failed and unsure why
-## @name CANNOT_PROCESS_APOP_AUTH
-## @loc None
-4031=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 account settings for your mail server.\n
-
-## @name MOVEMAIL_SPOOL_FILE_LOCKED
-## @loc None
-4032=The mail spool file %S is locked.
-
-## @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.
-
-## @name MOVEMAIL_CANT_DELETE_LOCK
-## @loc None
-4035=Unable to delete lock file %S.
-
-## @name MOVEMAIL_CANT_TRUNCATE_SPOOL_FILE
-## @loc None
-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 disc space. Skip this message?
-
-## @name NS_ERROR_COULD_NOT_CONNECT_VIA_TLS
-## @loc None
-4039=Unable to establish TLS connection to POP3 server. The server may be down or may be incorrectly configured. Please verify that your Mail/News account settings are correct and try again.
+# ***** 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 local mail code to display progress/status/error 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.
+
+# Out of memory
+## @name LOCAL_OUT_OF_MEMORY
+## @loc None
+-1000=Application is out of memory.
+
+# 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
+## @loc None
+4004=Sending of username did not succeed.
+
+# Status - password failed
+## @name POP3_PASSWORD_FAILURE
+## @loc None
+4005=Sending of password did not succeed.
+
+# Status - write error occurred
+## @name POP3_MESSAGE_WRITE_ERROR
+## @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 - 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
+## @loc None
+4013=Error getting mail password.
+
+# Status - username undefined 
+## @name POP3_USERNAME_UNDEFINED
+## @loc None
+4014=You have not supplied a username for this server.  Please provide one in the account setup menu and try again.
+
+# Status - list failure
+## @name POP3_LIST_FAILURE
+## @loc None
+# LOCALIZATION NOTE(4015): Do not translate the word "POP3" below.
+4015=The LIST command did not succeed. Error getting the ID and size of a message.
+
+# Status - delete error 
+## @name POP3_DELE_FAILURE
+## @loc None
+# LOCALIZATION NOTE(4016): Do not translate the word "POP3" below.
+4016=The DELE command did not succeed. Error marking a message as deleted.
+
+## @name POP3_ENTER_PASSWORD_PROMPT
+## @loc None
+# LOCALIZATION NOTE(4016): Do not translate the word "%1$s@%2$s" below.
+# Place the word "%1$s" and "%2$s" where email account name should appear (i.e. john.smith@example.org)
+4017=Enter your password for %1$s on %2$s:
+
+## @name POP3_PREVIOUSLY_ENTERED_PASSWORD_IS_INVALID_ETC
+## @loc None
+# LOCALIZATION NOTE(4016): Do not translate the word "%s" below. It will receive the message returned by the server.
+# Do not translate "%.100s" and "%.100s". It will receive the email account name.
+4018=Please enter a new password for user %.100s on %.100s:
+
+## @name POP3_NO_ANSWER
+## @loc None
+4019=No Answer
+
+## @name POP3_ENTER_PASSWORD_PROMPT_TITLE
+## @loc None
+4020=Enter your password:
+
+## @name moveFolderToTrash
+## @loc None
+4021=Are you sure you want to move the selected folder into the Deleted folder?
+
+## @name POP3_FOLDER_FOR_TRASH
+## @loc None
+4023=The Deleted folder already contained a folder named %s. The folder which you just deleted can be found in the Deleted folder under the new name %s.
+
+# Status - stat failed
+## @name POP3_STAT
+## @loc None
+4024= The STAT command did not succeed. Error getting message number and sizes.
+
+## @name POP3_SERVER_SAID
+## @loc None
+4025= Mail server %S responded: 
+
+## @name DELETING_MSGS_STATUS
+## @loc None
+4026=Deleting %S of %S messages
+
+## @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
+
+# 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.
+
+# secure authentication failed
+## @name CANNOT_PROCESS_SECURE_AUTH
+## @loc None
+4030=Mail server does not support secure authentication.
+
+## @name MOVEMAIL_SPOOL_FILE_LOCKED
+## @loc None
+4032=The mail spool file %S is locked.
+
+## @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.
+
+## @name MOVEMAIL_CANT_DELETE_LOCK
+## @loc None
+4035=Unable to delete lock file %S.
+
+## @name MOVEMAIL_CANT_TRUNCATE_SPOOL_FILE
+## @loc None
+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 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"
+4040=The POP3 mail server (%S) does not support UIDL or XTND XLST, which are required to implement the ``Leave on Server'', ``Maximum Message Size'' or ``Fetch Headers Only'' options. To download your mail, turn off these options in the Server Settings for your mail server in the Account Settings window.
+
+# Status - the server doesn't support the top command
+## @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.
--- a/mail/chrome/messenger/mailEditorOverlay.dtd
+++ b/mail/chrome/messenger/mailEditorOverlay.dtd
@@ -1,3 +1,2 @@
-
-<!ENTITY sendPage.label                   "Send Page...">
-<!ENTITY sendPage.accesskey               "g">
+<!ENTITY sendPage.label                   "Send Page…">
+<!ENTITY sendPage.accesskey               "g">
--- a/mail/chrome/messenger/mailOverlay.dtd
+++ b/mail/chrome/messenger/mailOverlay.dtd
@@ -1,8 +1,8 @@
-<!ENTITY  newMessageCmd2.key              "N">
-<!ENTITY  newMessageCmd.key               "M">
-<!ENTITY  newMessageCmd.label             "Message">
-<!ENTITY  newMessageCmd.accesskey         "m">
- 
-<!ENTITY  newCardCmd.label                "Address Book Card...">
-<!ENTITY  newCardCmd.accesskey            "c">
- 
+<!ENTITY  newMessageCmd2.key              "N">
+<!ENTITY  newMessageCmd.key               "M">
+<!ENTITY  newMessageCmd.label             "Message">
+<!ENTITY  newMessageCmd.accesskey         "m">
+ 
+<!ENTITY  newCardCmd.label                "Address Book Card…">
+<!ENTITY  newCardCmd.accesskey            "c">
+ 
deleted file mode 100644
--- a/mail/chrome/messenger/mailTasksOverlay.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- LOCALIZATION NOTE (messengerCmd.label): DONT_TRANSLATE -->
-
-<!ENTITY messengerCmd.label					"Mail &amp; Newsgroups">
-<!ENTITY messengerCmd.accesskey				"m">
-<!ENTITY messengerCmd.commandkey			"1">
-<!ENTITY addressBookCmd.label				"Address Book">  
-<!ENTITY addressBookCmd.accesskey			"a">
-<!ENTITY addressBookCmd.commandkey			"2">
-
-<!ENTITY taskMessenger.tooltip  "Mail &amp; Newsgroups">
-<!ENTITY taskAddressBook.tooltip  "Address Book">
-
-<!-- searchAddressesCmd is also used by addressbook -->
-<!ENTITY searchAddressesCmd.label                       "Search Addresses...">
-<!ENTITY searchAddressesCmd.accesskey                   "A">
-
-<!ENTITY searchMailCmd.label "Search Messages...">
-<!ENTITY searchMailCmd.accesskey "e">
-<!ENTITY searchMailCmd.key "f">
-
-<!ENTITY javaScriptConsoleCmd.label                             "JavaScript Console">
-<!ENTITY javaScriptConsoleCmd.accesskey				"S">
-
-<!ENTITY tasksMenu.label "Tools">
-<!ENTITY tasksMenu.accesskey "T"> 
--- a/mail/chrome/messenger/markByDate.dtd
+++ b/mail/chrome/messenger/markByDate.dtd
@@ -1,42 +1,42 @@
-<!-- ***** 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
-   - Frank Schoenheit <frank.schoenheit@gmx.de>
-   - Portions created by the Initial Developer are Copyright (C) 2003
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Frank Schoenheit <frank.schoenheit@gmx.de>
-   -
-   - 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 LGPL or the GPL. 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 messageMarkByDate.label "Mark Messages as Read by Date">
-<!ENTITY markByDateLower.label "Mark messages as read from:">
-<!ENTITY markByDateLower.accesskey "F">
-<!ENTITY markByDateUpper.accesskey "T">
-<!ENTITY markByDateUpper.label "To:">
+<!-- ***** 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
+   - Frank Schoenheit <frank.schoenheit@gmx.de>
+   - Portions created by the Initial Developer are Copyright (C) 2003
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Frank Schoenheit <frank.schoenheit@gmx.de>
+   -
+   - 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 LGPL or the GPL. 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 messageMarkByDate.label "Mark Messages as Read by Date">
+<!ENTITY markByDateLower.label "Mark messages as read from:">
+<!ENTITY markByDateLower.accesskey "F">
+<!ENTITY markByDateUpper.label "To:">
+<!ENTITY markByDateUpper.accesskey "T">
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -1,628 +1,685 @@
-<!ENTITY messengerWindow.title "Mail &amp; Newsgroups">
-<!ENTITY titledefault.label    "&brandFullName;">
-<!ENTITY titleSeparator.label " - ">
-
-<!-- File Menu -->
-<!ENTITY newFolderCmd.label "Folder...">
-<!ENTITY newFolderCmd.accesskey "F">
-<!ENTITY newVirtualFolderCmd.label "Saved Search...">
-<!ENTITY newVirtualFolderCmd.accesskey "S">
-<!ENTITY newAccountCmd.label "Account...">
-<!ENTITY newAccountCmd.accesskey "A">
-<!ENTITY openMessageMenu.label "Open">
-<!ENTITY openMessageFileCmd.label "Open Saved Message...">
-<!ENTITY openMessageFileCmd.accesskey "O">
-<!ENTITY openAttachmentCmd.label "Attachments">
-<!ENTITY openAttachmentCmd.accesskey "A">
-<!ENTITY saveAsMenu.label "Save As">
-<!ENTITY saveAsMenu.accesskey "S">
-<!ENTITY saveAsFileCmd.label "File">
-<!ENTITY saveAsFileCmd.accesskey "F">
-<!ENTITY saveAsFileCmd.key "s">
-<!ENTITY saveAsTemplateCmd.label "Template">
-<!ENTITY saveAsTemplateCmd.accesskey "T">
-<!ENTITY getNewMsgCmd.label "Get New Messages">
-<!ENTITY getNewMsgCmd.accesskey "G">
-<!ENTITY getNewMsgCmd.key "t">
-<!ENTITY getNewMsgForCmd.label "Get New Messages for">
-<!ENTITY getNewMsgForCmd.accesskey "w">
-<!ENTITY getAllNewMsgCmd.label "Get All New Messages">
-<!ENTITY getAllNewMsgCmd.key "t">
-<!ENTITY getNextNMsgCmd.label "Get Next 500 News Messages">
-<!ENTITY getNextNMsgCmd.accesskey "t">
-<!ENTITY sendUnsentCmd.label "Send Unsent Messages">
-<!ENTITY sendUnsentCmd.accesskey "d">
-<!ENTITY loadFirstDraft.label			"Load First Draft Message">
-<!ENTITY subscribeCmd.label "Subscribe...">
-<!ENTITY subscribeCmd.accesskey "b">
-<!ENTITY renameFolder.label "Rename Folder...">
-<!ENTITY renameFolder.accesskey "R">
-<!ENTITY renameFolder.key "VK_F2"> 
-<!ENTITY compactFolders.label "Compact Folders">
-<!ENTITY compactFolder.accesskey		"F">
-<!ENTITY emptyTrashCmd.label "Empty Deleted">
-<!ENTITY emptyTrashCmd.accesskey		"y">
-<!ENTITY importCmd.label "Import...">
-<!ENTITY importCmd.accesskey "I">
-<!ENTITY printCmd.label "Print...">
-<!ENTITY printCmd.accesskey "P">
-<!ENTITY printCmd.key "p">
-<!ENTITY printPreviewCmd.label "Print Preview">
-<!ENTITY printPreviewCmd.accesskey "v">
-<!ENTITY printPreviewCmd.key "v">
-<!ENTITY printSetupCmd.label "Page Setup...">
-<!ENTITY printSetupCmd.accesskey "u">
-
-<!-- Edit Menu -->
-<!ENTITY deleteMsgCmd.label "Delete Message">
-<!ENTITY deleteMsgCmd.accesskey "D">
-<!ENTITY undeleteMsgCmd.label "Undelete Message">
-<!ENTITY undeleteMsgCmd.accesskey "d">
-<!ENTITY cancelNewsMsgCmd.label "Cancel Message">
-<!ENTITY cancelNewsMsgCmd.accesskey "M">
-<!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 all.label "All">
-<!ENTITY all.accesskey "A">
-<!ENTITY selectThreadCmd.label "Thread">
-<!ENTITY selectThreadCmd.accesskey "T">
-<!ENTITY selectThreadCmd.key "a">
-<!ENTITY filtersCmd.label "Message Filters...">
-<!ENTITY filtersCmd.accesskey "F">
-<!ENTITY filtersApply.label "Run Filters on Folder">
-<!ENTITY filtersApply.accesskey "R">
-<!ENTITY folderPropsCmd.label "Properties...">
-<!ENTITY folderPropsFolderCmd.label "Folder Properties...">
-<!ENTITY folderPropsNewsgroupCmd.label "Newsgroup Properties...">
-<!ENTITY folderPropsCmd.accesskey "o">
-<!ENTITY accountManagerCmd.label "Account Settings...">
-<!ENTITY accountManagerCmd.accesskey "c">
-<!ENTITY accountManagerCmdUnix.accesskey "A">
-<!ENTITY undoDeleteMsgCmd.label "Undo Delete Message">
-<!ENTITY redoDeleteMsgCmd.label "Redo Delete Message">
-<!ENTITY undoMoveMsgCmd.label "Undo Move Message">
-<!ENTITY redoMoveMsgCmd.label "Redo Move Message">
-<!ENTITY undoCopyMsgCmd.label "Undo Copy Message">
-<!ENTITY redoCopyMsgCmd.label "Redo Copy Message">
-<!ENTITY undoDefaultCmd.label "Undo">
-<!ENTITY undoDefaultCmd.accesskey "U">
-<!ENTITY redoDefaultCmd.label "Redo">
-<!ENTITY redoDefaultCmd.accesskey "R">
-<!ENTITY editDraftCmd.label "Edit Draft">
-<!ENTITY editDraftCmd.accesskey "f">
-
-<!-- View Menu -->
-<!ENTITY showMessengerToolbarCmd.label "Mail Toolbar">
-<!ENTITY showMessengerToolbarCmd.accesskey "o">
-<!ENTITY showSearchToolbarCmd.label "Search Bar">
-<!ENTITY showSearchToolbarCmd.accesskey	"e">
-<!ENTITY customizeToolbar.label "Customise...">
-<!ENTITY customizeToolbar.accesskey "C">
-
-<!-- Layout Style Menu -->
-<!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">
-<!ENTITY showMessageCmd.label "Message Pane">
-<!ENTITY showMessageCmd.accesskey "M">
-
-<!-- Sort Menu -->
-<!ENTITY sortMenu.label "Sort by">
-<!ENTITY sortMenu.accesskey "S">
-<!ENTITY sortByDateCmd.label "Date">
-<!ENTITY sortByDateCmd.accesskey "e">
-<!ENTITY sortByFlagCmd.label "Flag">
-<!ENTITY sortByFlagCmd.accesskey "F">
-<!ENTITY sortByAttachmentsCmd.label "Attachments">
-<!ENTITY sortByAttachmentsCmd.accesskey "A">
-<!ENTITY sortByPriorityCmd.label "Priority">
-<!ENTITY sortByPriorityCmd.accesskey "P">
-<!ENTITY sortBySizeCmd.label "Size">
-<!ENTITY sortBySizeCmd.accesskey "z">
-<!ENTITY sortByStatusCmd.label "Status">
-<!ENTITY sortByStatusCmd.accesskey "u">
-<!ENTITY sortByLabelCmd.label "Label">
-<!ENTITY sortByLabelCmd.accesskey "L">
-<!ENTITY sortByJunkStatusCmd.label "Junk Status">
-<!ENTITY sortByJunkStatusCmd.accesskey "J">
-<!ENTITY sortBySubjectCmd.label "Subject">
-<!ENTITY sortBySubjectCmd.accesskey "S">
-<!ENTITY sortBySenderCmd.label "Sender">
-<!ENTITY sortBySenderCmd.accesskey "n">
-<!ENTITY sortByRecipientCmd.label "Recipient">
-<!ENTITY sortByRecipientCmd.accesskey "c">
-<!ENTITY sortByUnreadCmd.label "Read">
-<!ENTITY sortByUnreadCmd.accesskey "R">
-<!ENTITY sortByOrderReceivedCmd.label "Order Received">
-<!ENTITY sortByOrderReceivedCmd.accesskey "O">
-<!ENTITY sortAscending.label "Ascending">
-<!ENTITY sortAscending.accesskey "A">
-<!ENTITY sortDescending.label "Descending">
-<!ENTITY sortDescending.accesskey "D">
-<!ENTITY sortThreaded.label "Threaded">
-<!ENTITY sortThreaded.accesskey "T">
-<!ENTITY sortUnthreaded.label "Unthreaded">
-<!ENTITY sortUnthreaded.accesskey "h">
-<!ENTITY groupBySort.label "Grouped By Sort">
-<!ENTITY groupBySort.accesskey "G">
-<!ENTITY groupBySortCmd.key "G">
-<!ENTITY msgsMenu.label "Messages">
-<!ENTITY msgsMenu.accesskey "M">
-<!ENTITY viewAll.label "All">
-<!ENTITY viewUnread.label "Unread">
-<!ENTITY viewAll.accesskey "A">
-<!ENTITY viewUnread.accesskey "U">
-<!ENTITY viewCustomView.label "Customise...">
-<!ENTITY viewCustomView.accesskey "C">
-<!ENTITY threads.label "Threads">
-<!ENTITY threads.accesskey "e">
-<!ENTITY allMsgsCmd.label "All">
-<!ENTITY allMsgsCmd.accesskey "A">
-<!ENTITY expandOrCollapseMenu.label "Expand/Collapse">
-<!ENTITY expandOrCollapseMenu.accesskey "x">
-<!ENTITY expandAllThreadsCmd.label "Expand All Threads">
-<!ENTITY expandAllThreadsCmd.accesskey "E">
-<!ENTITY expandAllThreadsCmd.key "*">
-<!ENTITY collapseAllThreadsCmd.label "Collapse All Threads">
-<!ENTITY collapseAllThreadsCmd.accesskey "C">
-<!ENTITY collapseAllThreadsCmd.key "\">
-<!ENTITY unreadMsgsCmd.label "Unread">
-<!ENTITY unreadMsgsCmd.accesskey "U">
-<!ENTITY threadsWithUnreadCmd.label "Threads with Unread">
-<!ENTITY threadsWithUnreadCmd.accesskey "T">
-<!ENTITY watchedThreadsWithUnreadCmd.label "Watched Threads with Unread">
-<!ENTITY watchedThreadsWithUnreadCmd.accesskey "W">
-<!ENTITY ignoredThreadsCmd.label "Ignored Threads">
-<!ENTITY ignoredThreadsCmd.accesskey "i">  
-<!ENTITY headersMenu.label "Headers">
-<!ENTITY headersMenu.accesskey "H">
-<!ENTITY headersAllCmd.label "All">
-<!ENTITY headersAllCmd.accesskey "A">
-<!ENTITY headersNormalCmd.label "Normal">
-<!ENTITY headersNormalCmd.accesskey "N">
-<!ENTITY bodyMenu.label "Message Body As">
-<!ENTITY bodyMenu.accesskey "B">
-<!ENTITY bodyAllowHTML.label "Original HTML">
-<!ENTITY bodyAllowHTML.accesskey "H">
-<!ENTITY bodySanitized.label "Simple HTML">
-<!ENTITY bodySanitized.accesskey "S">
-<!ENTITY bodyAsPlaintext.label "Plain Text">
-<!ENTITY bodyAsPlaintext.accesskey "P">
-<!ENTITY viewAttachmentsInlineCmd.label "Display Attachments Inline">
-<!ENTITY viewAttachmentsInlineCmd.accesskey "A">
-<!ENTITY reloadCmd.label "Reload">
-<!ENTITY reloadCmd.accesskey "R">
-<!ENTITY stopCmd.label "Stop">
-<!ENTITY stopCmd.accesskey "S">
-<!ENTITY textZoomEnlargeCmd.label "Increase">
-<!ENTITY textZoomEnlargeCmd.accesskey "I">
-<!ENTITY textZoomEnlargeCmd.commandkey "+">
-<!ENTITY textZoomEnlargeCmd.commandkey2 "="> <!-- + is above this key on many keyboards -->
-<!ENTITY textZoomReduceCmd.label "Decrease">
-<!ENTITY textZoomReduceCmd.accesskey "D">
-<!ENTITY textZoomReduceCmd.commandkey "-">
-<!ENTITY textZoomResetCmd.commandkey "0">
-<!ENTITY textZoomResetCmd.label     "Normal">
-<!ENTITY textZoomResetCmd.accesskey "N"> 
-<!ENTITY textSize.label             "Text Size">
-<!ENTITY textSize.accesskey             "x">
-
-<!ENTITY pageSourceCmd.label "Message Source">
-<!ENTITY pageSourceCmd.accesskey "o">
-<!ENTITY pageSourceCmd.key "u">
-
-<!-- Search Menu -->
-<!ENTITY searchMenu.label "Search">
-<!ENTITY searchMenu.accesskey "S">
-
-
-<!ENTITY find.label "Find">
-<!ENTITY find.accesskey "F">
-<!ENTITY findCmd.label "Find in This Message...">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findCmd.key "f">
-<!ENTITY findAgainCmd.label "Find Again">
-<!ENTITY findAgainCmd.accesskey "g">
-<!ENTITY findAgainCmd.key "g">
-<!ENTITY findAgainCmd.key2 "VK_F3">
-<!ENTITY findPrevCmd.label "Find Previous">
-<!ENTITY findPrevCmd.accesskey "v">
-<!ENTITY findPrevCmd.key "g">
-<!ENTITY findPrevCmd.key2 "VK_F3">
-<!ENTITY searchMailCmd.label "Search Messages...">
-<!ENTITY searchMailCmd.accesskey "M">
-<!ENTITY searchMailCmd.key "f">
-<!ENTITY searchAddressesCmd.label "Search Addresses...">
-<!ENTITY searchAddressesCmd.accesskey "S">
-
-<!-- Go Menu -->
-<!ENTITY goMenu.label "Go">
-<!ENTITY goMenu.accesskey "G">
-<!ENTITY nextMenu.label "Next">
-<!ENTITY nextMenu.accesskey "N">
-<!ENTITY nextMsgCmd.label "Message">
-<!ENTITY nextMsgCmd.accesskey "M">
-<!ENTITY nextMsgCmd.key "f">
-<!ENTITY nextUnreadMsgCmd.label "Unread Message">
-<!ENTITY nextUnreadMsgCmd.accesskey "U">
-<!ENTITY nextUnreadMsgCmd.key "n">
-<!ENTITY nextFlaggedMsgCmd.label "Flagged Message">
-<!ENTITY nextFlaggedMsgCmd.accesskey "F">
-<!ENTITY nextUnflaggedMsgCmd.label "Unflagged Message">
-<!ENTITY nextUnreadThread.label "Unread Thread">
-<!ENTITY nextUnreadThreadCmd.accesskey "T">
-<!ENTITY nextUnreadThreadCmd.key "t">
-<!ENTITY prevMenu.label "Previous">
-<!ENTITY prevMenu.accesskey "P">
-<!ENTITY prevMsgCmd.label "Message">
-<!ENTITY prevMsgCmd.accesskey "M">
-<!ENTITY previousMsgCmd.key "b">
-<!ENTITY previousMsgCmd.accesskey "M">
-<!ENTITY prevUnreadMsgCmd.label "Unread Message">
-<!ENTITY prevUnreadMsgCmd.accesskey "U">
-<!ENTITY previousUnreadMsgCmd.key "p">
-<!ENTITY previousUnreadMsgCmd.accesskey "U">
-<!ENTITY prevFlaggedMsgCmd.label "Flagged Message">
-<!ENTITY previousFlaggedMsgCmd.accesskey "F">
-<!ENTITY startPageCmd.label "Mail Start Page">
-<!ENTITY startPageCmd.accesskey "S">
-<!ENTITY msgMenu.label "Message">
-<!ENTITY msgMenu.accesskey "M">
-<!ENTITY newMsgCmd.label "New Message">
-<!ENTITY newMsgCmd.accesskey "N">
-<!ENTITY newNewMsgCmd.label "Message">
-<!ENTITY newNewMsgCmd.accesskey "M">
-<!ENTITY replyMsgCmd.label "Reply">
-<!ENTITY replyMsgCmd.accesskey "R">
-<!ENTITY replyMsgCmd.key	"r">
-<!ENTITY replySenderCmd.label "Reply to Sender Only">
-<!ENTITY replySenderCmd.accesskey "R">
-<!ENTITY replyNewsgroupCmd.label "Reply to Newsgroup">
-<!ENTITY replyNewsgroupCmd.accesskey	"y">
-<!ENTITY replyToAllMsgCmd.label "Reply to All">
-<!ENTITY replyToAllMsgCmd.accesskey	"p">
-<!ENTITY replyToAllMsgCmd.key	"r">
-<!ENTITY forwardMsgCmd.label "Forward">
-<!ENTITY forwardMsgCmd.accesskey "F">
-<!ENTITY forwardMsgCmd.key	"l">
-<!ENTITY forwardAsMenu.label "Forward As">
-<!ENTITY forwardAsMenu.accesskey "o">
-<!ENTITY forwardAsInline.label "Inline">
-<!ENTITY forwardAsInline.accesskey "I">
-<!ENTITY forwardAsAttachmentCmd.label "Attachment">
-<!ENTITY forwardAsAttachmentCmd.accesskey "A">
-<!ENTITY editMsgAsNewCmd.label "Edit Message As New">
-<!ENTITY editMsgAsNewCmd.accesskey "E">
-<!ENTITY editMsgAsNewCmd.key "e">
-<!ENTITY createFilter.label "Create Filter From Message...">
-<!ENTITY createFilter.accesskey "a">
-<!ENTITY moveMsgMenu.label "Move">
-<!ENTITY moveMsgMenu.accesskey "M">
-<!ENTITY copyMessageLocation.label "Copy Message Location">
-<!ENTITY copyMessageLocation.accesskey "M">
-<!ENTITY copyMsgMenu.label "Copy">
-<!ENTITY copyMsgMenu.accesskey "C">
-<!ENTITY killThreadMenu.label "Ignore Thread">
-<!ENTITY killThreadMenu.accesskey "I">
-<!ENTITY killThreadMenu.key "k">
-<!ENTITY watchThreadMenu.label "Watch Thread">
-<!ENTITY watchThreadMenu.accesskey "W">
-<!ENTITY watchThreadMenu.key "w">
-<!ENTITY fileHereMenu.label "File Here">
-<!ENTITY fileHereMenu.accesskey "F">
-<!ENTITY copyHereMenu.label "Copy Here">
-<!ENTITY copyHereMenu.accesskey "C">
-<!ENTITY labelMenu.label "Label">
-<!ENTITY labelMenu.accesskey "L">
-<!ENTITY labelCmd0.accesskey "0">
-<!ENTITY labelCmd0.key "0">
-<!ENTITY labelCmd1.label "1">
-<!ENTITY labelCmd1.accesskey "1">
-<!ENTITY labelCmd1.key "1">
-<!ENTITY labelCmd2.label "2">
-<!ENTITY labelCmd2.accesskey "2">
-<!ENTITY labelCmd2.key "2">
-<!ENTITY labelCmd3.label "3">
-<!ENTITY labelCmd3.accesskey "3">
-<!ENTITY labelCmd3.key "3">
-<!ENTITY labelCmd4.label "4">
-<!ENTITY labelCmd4.accesskey "4">
-<!ENTITY labelCmd4.key "4">
-<!ENTITY labelCmd5.label "5">
-<!ENTITY labelCmd5.accesskey "5">
-<!ENTITY labelCmd5.key "5">
-<!ENTITY markMenu.label "Mark">
-<!ENTITY markMenu.accesskey "k">
-<!ENTITY markAsReadCmd.label "As Read">
-<!ENTITY markAsReadCmd.accesskey "R">
-<!ENTITY markAsReadCmd.key "m">
-<!ENTITY markAsUnreadCmd.label "As Unread">
-<!ENTITY markAsUnreadCmd.accesskey "U">
-<!ENTITY markThreadAsReadCmd.label "Thread As Read">
-<!ENTITY markThreadAsReadCmd.accesskey "T">
-<!ENTITY markThreadAsReadCmd.key "r">
-<!ENTITY markReadByDateCmd.label "As Read by Date...">
-<!ENTITY markReadByDateCmd.accesskey "D">
-<!ENTITY markReadByDateCmd.key "c">
-<!ENTITY markAllReadCmd.label "All Read">
-<!ENTITY markAllReadCmd.accesskey "A">
-<!ENTITY markAllReadCmd.key "c">
-<!ENTITY markFlaggedCmd.label "Flag">
-<!ENTITY markFlaggedCmd.accesskey "F">
-<!ENTITY markFlaggedCmd.key "i">
-<!ENTITY markAsJunkCmd.label "As Junk">
-<!ENTITY markAsJunkCmd.accesskey "J">
-<!ENTITY markAsJunkCmd.key "j">
-<!ENTITY markAsNotJunkCmd.label "As Not Junk">
-<!ENTITY markAsNotJunkCmd.accesskey "N">
-<!ENTITY markAsNotJunkCmd.key "j">
-<!ENTITY recalculateJunkScoreCmd.label "Run Junk Mail Controls"> 
-<!ENTITY recalculateJunkScoreCmd.accesskey "C">
-<!ENTITY openMessageWindowCmd.label "Open Message">
-<!ENTITY openMessageWindowCmd.accesskey "O">
-<!ENTITY openMessageWindowCmd.key "o">
-
-<!-- Windows Menu -->
-<!ENTITY windowMenu.label "Window">
-<!ENTITY windowMenu.accesskey "W">
-
-<!-- Tools Menu -->
-<!ENTITY tasksMenu.label "Tools">
-<!ENTITY tasksMenu.accesskey "T">
-<!ENTITY extensions.label             "Extensions">
-<!ENTITY extensions.tooltip           "Show and Manage installed Extensions">
-<!ENTITY extensions.accesskey         "E">
-<!ENTITY themes.label                 "Themes">
-<!ENTITY themes.tooltip               "Change the Theme">
-<!ENTITY themes.accesskey             "T">
-<!ENTITY messengerCmd.label "Mail &amp; Newsgroups">
-<!ENTITY messengerCmd.accesskey "m">
-<!ENTITY messengerCmd.commandkey "1">
-<!ENTITY addressBookCmd.label "Address Book">  
-<!ENTITY addressBookCmd.accesskey "a">
-<!ENTITY addressBookCmd.commandkey "2">
-<!ENTITY junkMailCmd.label "Junk Mail Controls...">
-<!ENTITY junkMailCmd.accesskey "J">
-<!ENTITY runJunkControls.label "Run Junk Mail Controls on Folder">
-<!ENTITY runJunkControls.accesskey "u">
-<!ENTITY deleteJunk.label "Delete Mail Marked as Junk in Folder">
-<!ENTITY deleteJunk.accesskey "l">
-<!ENTITY javaScriptConsoleCmd.label "JavaScript Console">
-<!ENTITY javaScriptConsoleCmd.accesskey "n">
-
-<!-- Help Menu -->
-<!ENTITY helpMenu.label "Help">
-<!ENTITY helpMenu.accesskey "H"> 
-<!ENTITY releaseCmd.label "Release Notes">
-<!ENTITY releaseCmd.accesskey "R"> 
-<!ENTITY hintsAndTips.label "&brandFullName; Help">
-<!ENTITY hintsAndTipsMac.commandkey "?">
-<!ENTITY hintsAndTips.accesskey "h">
-<!ENTITY updateCmd.accesskey  "o">
-<!ENTITY updateCmd.label      "Check for Updates...">
-<!ENTITY aboutCmd.label "About &brandFullName;">
-<!ENTITY aboutCmd.accesskey "A">
-
-<!-- Mail Toolbar -->
-<!ENTITY getMsgButton.label "Get Mail">
-<!ENTITY newMsgButton.label "Write">
-<!ENTITY replyButton.label "Reply">
-<!ENTITY replyAllButton.label "Reply All">
-<!ENTITY forwardButton.label "Forward">
-<!ENTITY fileButton.label "File">
-<!ENTITY nextButton.label "Next">
-<!ENTITY previousButton.label "Previous">
-<!ENTITY deleteButton.label "Delete">
-<!ENTITY markButton.label "Mark">
-<!ENTITY printButton.label "Print">
-<!ENTITY stopButton.label "Stop">
-<!ENTITY throbberItem.title "Activity Indicator">
-<!ENTITY updatesItem.title  "Updates">
-<!ENTITY junkButton.label "Junk">
-<!ENTITY notJunkButton.label "Not Junk">
-<!ENTITY addressBookButton.label "Address Book">
-
-<!-- Mail Toolbar Tooltips-->
-<!ENTITY advancedButton.tooltip "Advanced message search">
-<!ENTITY clearButton.tooltip "Clear the search criteria and show all messages">
-<!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 forwardButton.tooltip "Forward selected message">
-<!ENTITY fileButton.tooltip "File selected message">
-<!ENTITY nextButton.tooltip "Move to the next unread message">
-<!ENTITY previousButton.tooltip "Move to the previous unread message">
-<!ENTITY deleteButton.tooltip "Delete selected message or folder">
-<!ENTITY markButton.tooltip "Mark messages">
-<!ENTITY printButton.tooltip "Print this message">
-<!ENTITY stopButton.tooltip "Stop the current transfer">
-<!ENTITY throbber.tooltip "Go to the &vendorShortName; home page">
-<!ENTITY junkButton.tooltip "Mark the selected messages as junk">
-<!ENTITY notJunkButton.tooltip "Mark the selected messages as not junk">
-<!ENTITY addressBookButton.tooltip "Go to the address book">
-
-<!-- Folder Pane -->
-<!ENTITY folderPaneHeader.label "Folders">
-<!ENTITY folderColumn.label "Name">
-<!ENTITY folderSizeColumn.label "Size">
-
-<!-- Folder Pane Context Menu -->
-<!ENTITY folderContextGetMessages.label "Get Messages for Account">
-<!ENTITY folderContextGetMessages.accesskey "G">
-<!ENTITY folderContextOpenNewWindow.label "Open in New Mail Window">
-<!ENTITY folderContextOpenNewWindow.accesskey "W">
-<!ENTITY folderContextRename.label "Rename">
-<!ENTITY folderContextRename.accesskey "R">
-<!ENTITY folderContextRemove.label "Delete">
-<!ENTITY folderContextRemove.accesskey "D">
-<!ENTITY folderContextCompact.label "Compact This Folder">
-<!ENTITY folderContextCompact.accesskey "F">
-<!ENTITY folderContextEmptyTrash.label "Empty Deleted">
-<!ENTITY folderContextEmptyTrash.accesskey "y">
-<!ENTITY folderContextSendUnsentMessages.label "Send Unsent Messages...">
-<!ENTITY folderContextSendUnsentMessages.accesskey "d">
-<!ENTITY folderContextUnsubscribe.label "Unsubscribe">
-<!ENTITY folderContextUnsubscribe.accesskey "U">
-<!ENTITY folderContextMarkNewsgroupRead.label "Mark Newsgroup Read">
-<!ENTITY folderContextMarkNewsgroupRead.accesskey "k">
-<!ENTITY folderContextMarkMailFolderRead.label "Mark Folder Read">
-<!ENTITY folderContextMarkMailFolderRead.accesskey "k">
-<!ENTITY folderContextNew.label "New Subfolder...">
-<!ENTITY folderContextNew.accesskey "N">
-<!ENTITY folderContextSubscribe.label "Subscribe...">
-<!ENTITY folderContextSubscribe.accesskey "b">
-<!ENTITY folderContextSearchMessages.label "Search Messages...">
-<!ENTITY folderContextSearchMessages.accesskey "S">
-<!ENTITY folderContextProperties.label "Properties...">
-<!ENTITY folderContextProperties.accesskey "P">
-<!ENTITY folderContextCopyLocation.label "Copy Folder Location">
-<!ENTITY folderContextCopyLocation.accesskey "C">
-
-<!-- Search Bar -->
-<!ENTITY viewPicker.label "View:">
-<!ENTITY viewPicker.accesskey "i">
-<!ENTITY viewPickerAll.label "All">
-<!ENTITY viewPickerUnread.label "Unread">
-<!ENTITY viewPickerCustomView.label "Customise...">
-<!ENTITY viewPickerSaveAsVirtualFolder.label "Save View as a Folder...">
-<!ENTITY SearchNameOrEmail.label "Name or Email contains:">
-<!ENTITY SearchNameOrEmail.accesskey "N">
-<!ENTITY clearButton.label "Clear">
-<!ENTITY clearButton.accesskey "C">
-
-<!-- Quick Search Menu Bar -->
-<!ENTITY searchSubjectMenu.label "Subject">
-<!ENTITY searchSenderMenu.label "Sender">
-<!ENTITY searchSubjectOrSenderMenu.label "Subject or Sender">
-<!ENTITY searchRecipient.label "To or Cc">
-<!ENTITY searchMessageBody.label "Entire Message">
-<!ENTITY findInMessageMenu.label "Find In Message">
-<!ENTITY saveAsVirtualFolderMenu.label "Save Search as a Folder...">
-
-<!-- Thread Pane -->
-<!ENTITY threadColumn.label "Thread">
-<!ENTITY senderColumn.label "Sender">
-<!ENTITY recipientColumn.label "Recipient">
-<!ENTITY subjectColumn.label "Subject">
-<!ENTITY dateColumn.label "Date">
-<!ENTITY priorityColumn.label "Priority">
-<!ENTITY labelColumn.label "Label">
-<!ENTITY accountColumn.label "Account">
-<!ENTITY statusColumn.label "Status">
-<!ENTITY sizeColumn.label "Size">
-<!ENTITY junkStatusColumn.label "Junk Status">
-<!ENTITY linesColumn.label "Lines">
-<!ENTITY unreadColumn.label "Unread">
-<!ENTITY totalColumn.label "Total">
-<!ENTITY readColumn.label "Read">
-<!ENTITY flagColumn.label "Flag">
-<!ENTITY locationColumn.label "Location">
-<!ENTITY idColumn.label "Order Received">
-<!ENTITY attachmentColumn.label "Attachments">
-
-<!-- Thread Pane Tooltips -->
-<!ENTITY columnChooser.tooltip "Click to select columns to display">
-<!ENTITY threadColumn.tooltip "Click to display message threads"> 
-<!ENTITY senderColumn.tooltip "Click to sort by sender">
-<!ENTITY recipientColumn.tooltip "Click to sort by recipient">
-<!ENTITY subjectColumn.tooltip "Click to sort by subject">
-<!ENTITY dateColumn.tooltip "Click to sort by date">
-<!ENTITY priorityColumn.tooltip "Click to sort by priority">
-<!ENTITY labelColumn.tooltip "Click to sort by label">
-<!ENTITY accountColumn.tooltip "Click to sort by account">
-<!ENTITY statusColumn.tooltip "Click to sort by status">
-<!ENTITY sizeColumn.tooltip "Click to sort by size">
-<!ENTITY junkStatusColumn.tooltip "Click to sort by junk status">
-<!ENTITY unreadColumn.tooltip "Number of unread messages in thread">
-<!ENTITY totalColumn.tooltip "Total number of messages in thread">
-<!ENTITY readColumn.tooltip "Click to sort by read">
-<!ENTITY flagColumn.tooltip "Click to sort by flag">
-<!ENTITY locationColumn.tooltip "Click to sort by location">
-<!ENTITY idColumn.tooltip "Click to sort by order received">
-<!ENTITY attachmentColumn.tooltip "Click to sort by attachments">
-
-<!-- Thread Pane Context Menu -->
-<!ENTITY contextOpenNewWindow.label "Open Message in New Window">
-<!ENTITY contextOpenNewWindow.accesskey "W">
-<!ENTITY contextEditAsNew.label "Edit As New...">
-<!ENTITY contextEditAsNew.accesskey "E">
-<!ENTITY contextReplySender.label "Reply to Sender Only">
-<!ENTITY contextReplySender.accesskey "R">
-<!ENTITY contextReplyNewsgroup.label "Reply to Newsgroup">
-<!ENTITY contextReplyNewsgroup.accesskey "y">
-<!ENTITY contextReplyAll.label "Reply to All">
-<!ENTITY contextReplyAll.accesskey "A">
-<!ENTITY contextForward.label "Forward">
-<!ENTITY contextForward.accesskey "F">
-<!ENTITY contextForwardAsAttachment.label "Forward as Attachments">
-<!ENTITY contextForwardAsAttachment.accesskey "o">
-<!ENTITY contextMoveMsgMenu.label "Move To">
-<!ENTITY contextMoveMsgMenu.accesskey "M">
-<!ENTITY contextCopyMsgMenu.label "Copy To">
-<!ENTITY contextCopyMsgMenu.accesskey "C">
-<!ENTITY contextSaveAs.label "Save As...">
-<!ENTITY contextSaveAs.accesskey "S">
-<!ENTITY contextPrint.label "Print...">
-<!ENTITY contextPrint.accesskey "P">
-<!ENTITY contextPrintPreview.label "Print Preview">
-<!ENTITY contextDelete.label "Delete">
-<!ENTITY contextDelete.accesskey "D">
-<!ENTITY contextAddSenderToAddressBook.label "Add Sender To Address Book">
-<!ENTITY contextAddSenderToAddressBook.accesskey "B">
-<!ENTITY contextAddAllToAddressBook.label "Add All To Address Book">
-<!ENTITY contextAddAllToAddressBook.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 images in this message.">
-<!ENTITY loadRemoteContentButton.label "Show Images">
-
-<!-- Phishing Bar -->
-<!ENTITY phishingBarMessage.label "&brandShortName; thinks this message might be an email scam.">
-<!ENTITY removePhishingBarButton.label "Not a Scam">
-
-<!-- Search Bar -->
-<!ENTITY quickSearchCmd.key "k">
-
-<!-- Message Header Context Menu -->
-<!ENTITY AddToAddressBook.label "Add to Address Book...">
-<!ENTITY AddToAddressBook.accesskey "B">
-<!ENTITY SendMailTo.label "Compose Mail To">
-<!ENTITY SendMailTo.accesskey "s">
-<!ENTITY CopyEmailAddress.label "Copy Email Address">
-<!ENTITY CopyEmailAddress.accesskey "C">
-<!ENTITY CreateFilter.label "Create Filter from Message...">
-<!ENTITY CreateFilter.accesskey "F">
-<!ENTITY BlockAddress.label "Block Address">
-<!ENTITY BlockAddress.accesskey "A">
-
-<!-- Statusbar -->
-<!ENTITY statusText.label "Done">
-<!ENTITY unreadCountText.label "Unread: ">
-<!ENTITY totalCountText.label " Total: ">
-
-<!--  Mac OS X Window Menu -->
-<!ENTITY minimizeWindow.key "m">
-<!ENTITY minimizeWindow.label "Minimise">
-<!ENTITY bringAllToFront.label "Bring All to Front">
-<!ENTITY zoomWindow.label "Zoom">
+<!ENTITY messengerWindow.title "Mail &amp; Newsgroups">
+<!ENTITY titledefault.label    "&brandFullName;">
+<!ENTITY titleSeparator.label " - ">
+
+<!-- File Menu -->
+<!ENTITY newFolderCmd.label "Folder…">
+<!ENTITY newFolderCmd.accesskey "F">
+<!ENTITY newTabCmd.label "New Tab">
+<!ENTITY newTabCmd.accesskey "T">
+<!ENTITY closeTabCmd.label "Close Tab">
+<!ENTITY closeTabCmd.accesskey "e">
+<!ENTITY newVirtualFolderCmd.label "Saved Search…">
+<!ENTITY newVirtualFolderCmd.accesskey "S">
+<!ENTITY newAccountCmd.label "Account…">
+<!ENTITY newAccountCmd.accesskey "A">
+<!ENTITY openMessageMenu.label "Open">
+<!ENTITY openMessageFileCmd.label "Open Saved Message…">
+<!ENTITY openMessageFileCmd.accesskey "O">
+<!ENTITY openAttachmentCmd.label "Attachments">
+<!ENTITY openAttachmentCmd.accesskey "A">
+<!ENTITY saveAsMenu.label "Save As">
+<!ENTITY saveAsMenu.accesskey "S">
+<!ENTITY saveAsFileCmd.label "File">
+<!ENTITY saveAsFileCmd.accesskey "F">
+<!ENTITY saveAsFileCmd.key "s">
+<!ENTITY saveAsTemplateCmd.label "Template">
+<!ENTITY saveAsTemplateCmd.accesskey "T">
+<!ENTITY getNewMsgCmd.key "t">
+<!ENTITY getNewMsgForCmd.label "Get New Messages for">
+<!ENTITY getNewMsgForCmd.accesskey "w">
+<!ENTITY getAllNewMsgCmdPopupMenu.label "All Accounts">
+<!ENTITY getAllNewMsgCmdPopupMenu.accesskey "A">
+<!ENTITY getNewMsgCurrentAccountCmdPopupMenu.label "Current Account">
+<!ENTITY getNewMsgCurrentAccountCmdPopupMenu.accesskey "C">
+<!ENTITY getNextNMsgCmd.label "Get Next 500 News Messages">
+<!ENTITY getNextNMsgCmd.accesskey "t">
+<!ENTITY sendUnsentCmd.label "Send Unsent Messages">
+<!ENTITY sendUnsentCmd.accesskey "d">
+<!ENTITY subscribeCmd.label "Subscribe…">
+<!ENTITY subscribeCmd.accesskey "b">
+<!ENTITY renameFolder.label "Rename Folder…">
+<!ENTITY renameFolder.accesskey "R">
+<!ENTITY renameFolder.key "VK_F2">
+<!ENTITY compactFolders.label "Compact Folders">
+<!ENTITY compactFolder.accesskey    "F">
+<!ENTITY emptyTrashCmd.label "Empty Deleted">
+<!ENTITY emptyTrashCmd.accesskey    "y">
+<!ENTITY importCmd.label "Import…">
+<!ENTITY importCmd.accesskey "I">
+<!ENTITY offlineMenu.label "Offline">
+<!ENTITY offlineMenu.accesskey "l">
+<!ENTITY offlineGoOfflineCmd.label "Work Offline">
+<!ENTITY offlineGoOfflineCmd.accesskey "w">
+<!ENTITY synchronizeOfflineCmd.label "Download/Sync Now…">
+<!ENTITY synchronizeOfflineCmd.accesskey "S">
+<!ENTITY settingsOfflineCmd.label "Offline Settings…">
+<!ENTITY settingsOfflineCmd.accesskey "e">
+<!ENTITY downloadSelectedCmd.label "Get Selected Messages">
+<!ENTITY downloadSelectedCmd.accesskey "l">
+<!ENTITY downloadStarredCmd.label "Get Starred Messages">
+<!ENTITY downloadStarredCmd.accesskey "a">
+<!ENTITY printCmd.label "Print…">
+<!ENTITY printCmd.accesskey "P">
+<!ENTITY printCmd.key "p">
+<!ENTITY printPreviewCmd.label "Print Preview">
+<!ENTITY printPreviewCmd.accesskey "v">
+<!ENTITY printPreviewCmd.key "v">
+<!ENTITY printSetupCmd.label "Page Setup…">
+<!ENTITY printSetupCmd.accesskey "u">
+
+<!-- Edit Menu -->
+<!ENTITY deleteMsgCmd.label "Delete Message">
+<!ENTITY deleteMsgCmd.accesskey "D">
+<!ENTITY undeleteMsgCmd.label "Undelete Message">
+<!ENTITY undeleteMsgCmd.accesskey "d">
+<!ENTITY cancelNewsMsgCmd.label "Cancel Message">
+<!ENTITY cancelNewsMsgCmd.accesskey "M">
+<!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 all.label "All">
+<!ENTITY all.accesskey "A">
+<!ENTITY selectThreadCmd.label "Thread">
+<!ENTITY selectThreadCmd.accesskey "T">
+<!ENTITY selectThreadCmd.key "a">
+<!ENTITY selectFlaggedCmd.label "Starred Messages">
+<!ENTITY selectFlaggedCmd.accesskey "S">
+<!ENTITY menuFavoriteFolder.label "Favourite Folder">
+<!ENTITY menuFavoriteFolder.accesskey "a">
+<!ENTITY folderPropsCmd.label "Properties…">
+<!ENTITY folderPropsFolderCmd.label "Folder Properties…">
+<!ENTITY folderPropsNewsgroupCmd.label "Newsgroup Properties…">
+<!ENTITY folderPropsCmd.accesskey "o">
+<!ENTITY accountManagerCmd.label "Account Settings…">
+<!ENTITY accountManagerCmd.accesskey "c">
+<!ENTITY accountManagerCmdUnix.accesskey "A">
+<!ENTITY undoDeleteMsgCmd.label "Undo Delete Message">
+<!ENTITY redoDeleteMsgCmd.label "Redo Delete Message">
+<!ENTITY undoMoveMsgCmd.label "Undo Move Message">
+<!ENTITY redoMoveMsgCmd.label "Redo Move Message">
+<!ENTITY undoCopyMsgCmd.label "Undo Copy Message">
+<!ENTITY redoCopyMsgCmd.label "Redo Copy Message">
+<!ENTITY undoDefaultCmd.label "Undo">
+<!ENTITY undoDefaultCmd.accesskey "U">
+<!ENTITY redoDefaultCmd.label "Redo">
+<!ENTITY redoDefaultCmd.accesskey "R">
+
+<!-- View Menu -->
+<!ENTITY showMessengerToolbarCmd.label "Mail Toolbar">
+<!ENTITY showMessengerToolbarCmd.accesskey "o">
+<!ENTITY customizeToolbar.label "Customise…">
+<!ENTITY customizeToolbar.accesskey "C">
+
+<!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">
+<!ENTITY threadPaneWide.label "Wide List View">
+<!ENTITY threadPaneWide.accesskey "i">
+<!ENTITY showMessageCmd.label "Message Pane">
+<!ENTITY showMessageCmd.accesskey "M">
+
+<!ENTITY folderView.label "Folders">
+<!ENTITY folderView.accesskey "F">
+<!ENTITY allFolders.label "All">
+<!ENTITY allFolders.accesskey "A">
+<!ENTITY unreadFolders.label "Unread">
+<!ENTITY unreadFolders.accesskey "U">
+<!ENTITY favoriteFolders.label "Favourite">
+<!ENTITY favoriteFolders.accesskey "F">
+<!ENTITY recentFolders.label "Recent">
+<!ENTITY recentFolders.accesskey "R">
+
+<!-- Sort Menu -->
+<!ENTITY sortMenu.label "Sort by">
+<!ENTITY sortMenu.accesskey "S">
+<!ENTITY sortByDateCmd.label "Date">
+<!ENTITY sortByDateCmd.accesskey "e">
+<!ENTITY sortByReceivedCmd.label "Received">
+<!ENTITY sortByReceivedCmd.accesskey "v">
+<!ENTITY sortByStarCmd.label "Star">
+<!ENTITY sortByStarCmd.accesskey "S">
+<!ENTITY sortByAttachmentsCmd.label "Attachments">
+<!ENTITY sortByAttachmentsCmd.accesskey "A">
+<!ENTITY sortByPriorityCmd.label "Priority">
+<!ENTITY sortByPriorityCmd.accesskey "P">
+<!ENTITY sortBySizeCmd.label "Size">
+<!ENTITY sortBySizeCmd.accesskey "z">
+<!ENTITY sortByStatusCmd.label "Status">
+<!ENTITY sortByStatusCmd.accesskey "u">
+<!ENTITY sortByTagsCmd.label "Tags">
+<!ENTITY sortByTagsCmd.accesskey "g">
+<!ENTITY sortByJunkStatusCmd.label "Junk Status">
+<!ENTITY sortByJunkStatusCmd.accesskey "J">
+<!ENTITY sortBySubjectCmd.label "Subject">
+<!ENTITY sortBySubjectCmd.accesskey "b">
+<!ENTITY sortByFromCmd.label "From">
+<!ENTITY sortByFromCmd.accesskey "F">
+<!ENTITY sortByRecipientCmd.label "Recipient">
+<!ENTITY sortByRecipientCmd.accesskey "c">
+<!ENTITY sortByUnreadCmd.label "Read">
+<!ENTITY sortByUnreadCmd.accesskey "R">
+<!ENTITY sortByOrderReceivedCmd.label "Order Received">
+<!ENTITY sortByOrderReceivedCmd.accesskey "O">
+<!ENTITY sortAscending.label "Ascending">
+<!ENTITY sortAscending.accesskey "A">
+<!ENTITY sortDescending.label "Descending">
+<!ENTITY sortDescending.accesskey "D">
+<!ENTITY sortThreaded.label "Threaded">
+<!ENTITY sortThreaded.accesskey "T">
+<!ENTITY sortUnthreaded.label "Unthreaded">
+<!ENTITY sortUnthreaded.accesskey "h">
+<!ENTITY groupBySort.label "Grouped By Sort">
+<!ENTITY groupBySort.accesskey "G">
+<!ENTITY groupBySortCmd.key "G">
+<!ENTITY msgsMenu.label "Messages">
+<!ENTITY msgsMenu.accesskey "M">
+<!ENTITY threads.label "Threads">
+<!ENTITY threads.accesskey "e">
+<!ENTITY allMsgsCmd.label "All">
+<!ENTITY allMsgsCmd.accesskey "A">
+<!ENTITY expandOrCollapseMenu.label "Expand/Collapse">
+<!ENTITY expandOrCollapseMenu.accesskey "x">
+<!ENTITY expandAllThreadsCmd.label "Expand All Threads">
+<!ENTITY expandAllThreadsCmd.accesskey "E">
+<!ENTITY expandAllThreadsCmd.key "*">
+<!ENTITY collapseAllThreadsCmd.label "Collapse All Threads">
+<!ENTITY collapseAllThreadsCmd.accesskey "C">
+<!ENTITY collapseAllThreadsCmd.key "\">
+<!ENTITY unreadMsgsCmd.label "Unread">
+<!ENTITY unreadMsgsCmd.accesskey "U">
+<!ENTITY threadsWithUnreadCmd.label "Threads with Unread">
+<!ENTITY threadsWithUnreadCmd.accesskey "T">
+<!ENTITY watchedThreadsWithUnreadCmd.label "Watched Threads with Unread">
+<!ENTITY watchedThreadsWithUnreadCmd.accesskey "W">
+<!ENTITY ignoredThreadsCmd.label "Ignored Threads">
+<!ENTITY ignoredThreadsCmd.accesskey "i">
+<!ENTITY headersMenu.label "Headers">
+<!ENTITY headersMenu.accesskey "H">
+<!ENTITY headersAllCmd.label "All">
+<!ENTITY headersAllCmd.accesskey "A">
+<!ENTITY headersNormalCmd.label "Normal">
+<!ENTITY headersNormalCmd.accesskey "N">
+<!ENTITY bodyMenu.label "Message Body As">
+<!ENTITY bodyMenu.accesskey "B">
+<!ENTITY bodyAllowHTML.label "Original HTML">
+<!ENTITY bodyAllowHTML.accesskey "H">
+<!ENTITY bodySanitized.label "Simple HTML">
+<!ENTITY bodySanitized.accesskey "S">
+<!ENTITY bodyAsPlaintext.label "Plain Text">
+<!ENTITY bodyAsPlaintext.accesskey "P">
+<!ENTITY viewAttachmentsInlineCmd.label "Display Attachments Inline">
+<!ENTITY viewAttachmentsInlineCmd.accesskey "A">
+<!ENTITY reloadCmd.label "Reload">
+<!ENTITY reloadCmd.accesskey "R">
+<!ENTITY stopCmd.label "Stop">
+<!ENTITY stopCmd.accesskey "S">
+<!ENTITY textZoomEnlargeCmd.label "Increase">
+<!ENTITY textZoomEnlargeCmd.accesskey "I">
+<!ENTITY textZoomEnlargeCmd.commandkey "+">
+<!ENTITY textZoomEnlargeCmd.commandkey2 "="> <!-- + is above this key on many keyboards -->
+<!ENTITY textZoomReduceCmd.label "Decrease">
+<!ENTITY textZoomReduceCmd.accesskey "D">
+<!ENTITY textZoomReduceCmd.commandkey "-">
+<!ENTITY textZoomResetCmd.commandkey "0">
+<!ENTITY textZoomResetCmd.label     "Normal">
+<!ENTITY textZoomResetCmd.accesskey "N">
+<!ENTITY textSize.label             "Text Size">
+<!ENTITY textSize.accesskey             "x">
+
+<!ENTITY pageSourceCmd.label "Message Source">
+<!ENTITY pageSourceCmd.accesskey "o">
+<!ENTITY pageSourceCmd.key "u">
+
+<!-- Search Menu -->
+<!ENTITY searchMenu.label "Search">
+<!ENTITY searchMenu.accesskey "S">
+
+<!ENTITY findMenu.label "Find">
+<!ENTITY findMenu.accesskey "F">
+<!ENTITY findCmd.label "Find in This Message…">
+<!ENTITY findCmd.accesskey "F">
+<!ENTITY findCmd.key "f">
+<!ENTITY findAgainCmd.label "Find Again">
+<!ENTITY findAgainCmd.accesskey "g">
+<!ENTITY findAgainCmd.key "g">
+<!ENTITY findAgainCmd.key2 "VK_F3">
+<!ENTITY findPrevCmd.key "g">
+<!ENTITY findPrevCmd.key2 "VK_F3">
+<!ENTITY searchMailCmd.label "Search Messages…">
+<!ENTITY searchMailCmd.accesskey "M">
+<!ENTITY searchMailCmd.key "f">
+<!ENTITY searchAddressesCmd.label "Search Addresses…">
+<!ENTITY searchAddressesCmd.accesskey "S">
+
+<!-- Go Menu -->
+<!ENTITY goMenu.label "Go">
+<!ENTITY goMenu.accesskey "G">
+<!ENTITY nextMenu.label "Next">
+<!ENTITY nextMenu.accesskey "N">
+<!ENTITY nextMsgCmd.label "Message">
+<!ENTITY nextMsgCmd.accesskey "M">
+<!ENTITY nextMsgCmd.key "f">
+<!ENTITY nextUnreadMsgCmd.label "Unread Message">
+<!ENTITY nextUnreadMsgCmd.accesskey "U">
+<!ENTITY nextUnreadMsgCmd.key "n">
+<!ENTITY nextStarredMsgCmd.label "Starred Message">
+<!ENTITY nextStarredMsgCmd.accesskey "S">
+<!ENTITY nextUnreadThread.label "Unread Thread">
+<!ENTITY nextUnreadThreadCmd.accesskey "T">
+<!ENTITY nextUnreadThreadCmd.key "t">
+<!ENTITY prevMenu.label "Previous">
+<!ENTITY prevMenu.accesskey "P">
+<!ENTITY prevMsgCmd.label "Message">
+<!ENTITY prevMsgCmd.accesskey "M">
+<!ENTITY prevMsgCmd.key "b">
+<!ENTITY prevUnreadMsgCmd.label "Unread Message">
+<!ENTITY prevUnreadMsgCmd.accesskey "U">
+<!ENTITY prevUnreadMsgCmd.key "p">
+<!ENTITY goForwardCmd.label "Forwards">
+<!ENTITY goForwardCmd.accesskey "F">
+<!ENTITY goForwardCmd.commandKey "]">
+<!ENTITY goBackCmd.label "Back">
+<!ENTITY goBackCmd.accesskey "B">
+<!ENTITY goBackCmd.commandKey "[">
+<!ENTITY prevStarredMsgCmd.label "Starred Message">
+<!ENTITY prevStarredMsgCmd.accesskey "S">
+<!ENTITY startPageCmd.label "Mail Start Page">
+<!ENTITY startPageCmd.accesskey "S">
+<!ENTITY msgMenu.label "Message">
+<!ENTITY msgMenu.accesskey "M">
+<!ENTITY newMsgCmd.label "New Message">
+<!ENTITY newMsgCmd.accesskey "N">
+<!ENTITY newNewMsgCmd.label "Message">
+<!ENTITY newNewMsgCmd.accesskey "M">
+<!ENTITY replyMsgCmd.label "Reply">
+<!ENTITY replyMsgCmd.accesskey "R">
+<!ENTITY replyMsgCmd.key  "r">
+<!ENTITY replySenderCmd.label "Reply to Sender Only">
+<!ENTITY replySenderCmd.accesskey "R">
+<!ENTITY replyNewsgroupCmd.label "Reply to Newsgroup">
+<!ENTITY replyNewsgroupCmd.accesskey  "y">
+<!ENTITY replyToAllMsgCmd.label "Reply to All">
+<!ENTITY replyToAllMsgCmd.accesskey  "p">
+<!ENTITY replyToAllMsgCmd.key  "r">
+<!ENTITY forwardMsgCmd.label "Forward">
+<!ENTITY forwardMsgCmd.accesskey "F">
+<!ENTITY forwardMsgCmd.key  "l">
+<!ENTITY forwardAsMenu.label "Forward As">
+<!ENTITY forwardAsMenu.accesskey "o">
+<!ENTITY forwardAsInline.label "Inline">
+<!ENTITY forwardAsInline.accesskey "I">
+<!ENTITY forwardAsAttachmentCmd.label "Attachment">
+<!ENTITY forwardAsAttachmentCmd.accesskey "A">
+<!ENTITY editMsgAsNewCmd.label "Edit Message As New">
+<!ENTITY editMsgAsNewCmd.accesskey "E">
+<!ENTITY editMsgAsNewCmd.key "e">
+<!ENTITY createFilter.label "Create Filter From Message…">
+<!ENTITY createFilter.accesskey "a">
+<!ENTITY moveMsgMenu.label "Move">
+<!ENTITY moveMsgMenu.accesskey "M">
+<!ENTITY moveCopyMsgRecentMenu.label "Recent">
+<!ENTITY moveCopyMsgRecentMenu.accesskey "R">
+<!ENTITY copyMessageLocation.label "Copy Message Location">
+<!ENTITY copyMessageLocation.accesskey "M">
+<!ENTITY copyMsgMenu.label "Copy">
+<!ENTITY copyMsgMenu.accesskey "C">
+<!ENTITY moveToFolderAgain.label "Move Again">
+<!ENTITY moveToFolderAgain.accesskey "i">
+<!ENTITY moveToFolderAgainCmd.key "m">
+<!ENTITY killThreadMenu.label "Ignore Thread">
+<!ENTITY killThreadMenu.accesskey "I">
+<!ENTITY killThreadMenu.key "k">
+<!ENTITY killSubthreadMenu.label "Ignore Subthread">
+<!ENTITY killSubthreadMenu.accesskey "S">
+<!ENTITY killSubthreadMenu.key "k">
+<!ENTITY watchThreadMenu.label "Watch Thread">
+<!ENTITY watchThreadMenu.accesskey "W">
+<!ENTITY watchThreadMenu.key "w">
+<!ENTITY fileHereMenu.label "File Here">
+<!ENTITY fileHereMenu.accesskey "F">
+<!ENTITY copyHereMenu.label "Copy Here">
+<!ENTITY copyHereMenu.accesskey "C">
+<!ENTITY tagMenu.label "Tag">
+<!ENTITY tagMenu.accesskey "g">
+<!ENTITY tagCmd0.key "0">
+<!ENTITY tagCmd1.key "1">
+<!ENTITY tagCmd2.key "2">
+<!ENTITY tagCmd3.key "3">
+<!ENTITY tagCmd4.key "4">
+<!ENTITY tagCmd5.key "5">
+<!ENTITY tagCmd6.key "6">
+<!ENTITY tagCmd7.key "7">
+<!ENTITY tagCmd8.key "8">
+<!ENTITY tagCmd9.key "9">
+<!ENTITY markMenu.label "Mark">
+<!ENTITY markMenu.accesskey "k">
+<!ENTITY markAsReadCmd.label "As Read">
+<!ENTITY markAsReadCmd.accesskey "R">
+<!ENTITY markAsReadCmd.key "m">
+<!ENTITY markAsUnreadCmd.label "As Unread">
+<!ENTITY markAsUnreadCmd.accesskey "U">
+<!ENTITY markThreadAsReadCmd.label "Thread As Read">
+<!ENTITY markThreadAsReadCmd.accesskey "T">
+<!ENTITY markThreadAsReadCmd.key "r">
+<!ENTITY markReadByDateCmd.label "As Read by Date…">
+<!ENTITY markReadByDateCmd.accesskey "D">
+<!ENTITY markReadByDateCmd.key "c">
+<!ENTITY markAllReadCmd.label "All Read">
+<!ENTITY markAllReadCmd.accesskey "A">
+<!ENTITY markAllReadCmd.key "c">
+<!ENTITY markStarredCmd.label "Add Star">
+<!ENTITY markStarredCmd.accesskey "S">
+<!ENTITY markStarredCmd.key "S">
+<!ENTITY markAsJunkCmd.label "As Junk">
+<!ENTITY markAsJunkCmd.accesskey "J">
+<!ENTITY markAsJunkCmd.key "j">
+<!ENTITY markAsNotJunkCmd.label "As Not Junk">
+<!ENTITY markAsNotJunkCmd.accesskey "N">
+<!ENTITY markAsNotJunkCmd.key "j">
+<!ENTITY recalculateJunkScoreCmd.label "Run Junk Mail Controls">
+<!ENTITY recalculateJunkScoreCmd.accesskey "C">
+<!ENTITY openMessageWindowCmd.label "Open Message">
+<!ENTITY openMessageWindowCmd.accesskey "O">
+<!ENTITY openMessageWindowCmd.key "o">
+
+<!-- Windows Menu -->
+<!ENTITY windowMenu.label "Window">
+<!ENTITY windowMenu.accesskey "W">
+
+<!-- Tools Menu -->
+<!ENTITY tasksMenu.label "Tools">
+<!ENTITY tasksMenu.accesskey "T">
+<!ENTITY addons.label "Add-ons">
+<!ENTITY addons.accesskey "d">
+<!ENTITY messengerCmd.label "Mail &amp; Newsgroups">
+<!ENTITY messengerCmd.accesskey "m">
+<!ENTITY messengerCmd.commandkey "1">
+<!ENTITY addressBookCmd.label "Address Book">
+<!ENTITY addressBookCmd.accesskey "a">
+<!ENTITY addressBookCmd.commandkey "2">
+<!ENTITY runJunkControls.label "Run Junk Mail Controls on Folder">
+<!ENTITY runJunkControls.accesskey "u">
+<!ENTITY deleteJunk.label "Delete Mail Marked as Junk in Folder">
+<!ENTITY deleteJunk.accesskey "l">
+<!ENTITY errorConsoleCmd.label "Error Console">
+<!ENTITY errorConsoleCmd.accesskey "n">
+<!ENTITY filtersCmd.label "Message Filters…">
+<!ENTITY filtersCmd.accesskey "F">
+<!ENTITY filtersApply.label "Run Filters on Folder">
+<!ENTITY filtersApply.accesskey "R">
+<!ENTITY filtersApplyToSelection.label "Run Filters on Selected Messages">
+<!ENTITY filtersApplyToSelection.accesskey "S">
+<!ENTITY filtersApplyToMessage.label "Run Filters on Message">
+<!ENTITY filtersApplyToMessage.accesskey "s">
+
+<!-- Mail Toolbar -->
+<!ENTITY getMsgButton.label "Get Mail">
+<!ENTITY newMsgButton.label "Write">
+<!ENTITY replyButton.label "Reply">
+<!ENTITY replyAllButton.label "Reply All">
+<!ENTITY forwardButton.label "Forward">
+<!ENTITY fileButton.label "File">
+<!ENTITY nextButton.label "Next">
+<!ENTITY previousButton.label "Previous">
+<!ENTITY backButton1.label "Back">
+<!ENTITY goForwardButton1.label "Forwards">
+<!ENTITY deleteButton.label "Delete">
+<!ENTITY markButton.label "Mark">
+<!ENTITY printButton.label "Print">
+<!ENTITY stopButton.label "Stop">
+<!ENTITY throbberItem.title "Activity Indicator">
+<!ENTITY updatesItem.title  "Updates">
+<!ENTITY junkButton.label "Junk">
+<!ENTITY notJunkButton.label "Not Junk">
+<!ENTITY addressBookButton.label "Address Book">
+<!ENTITY searchItem.title "Quick Search">
+<!ENTITY mailViewsToolbarItem.title "Mail Views">
+<!ENTITY folderLocationToolbarItem.title "Folder Location">
+<!ENTITY tagButton.label "Tag">
+<!ENTITY compactButton.label "Compact">
+
+<!-- Mail Toolbar Tooltips-->
+<!ENTITY advancedButton.tooltip "Advanced message search">
+<!ENTITY clearButton.tooltip "Clear the search criteria and show all messages">
+<!ENTITY getMsgButton.tooltip "Get new messages">
+<!ENTITY getAllNewMsgCmd.label "Get All New Messages">
+<!ENTITY getAllNewMsgCmd.accesskey "G">
+<!ENTITY getAllNewMsgCmd.key "t">
+<!ENTITY newMsgButton.tooltip "Create a new message">
+<!ENTITY replyButton.tooltip "Reply to the message">
+<!ENTITY replyAllButton.tooltip "Reply to sender and all recipients">
+<!ENTITY forwardButton.tooltip "Forward selected message">
+<!ENTITY fileButton.tooltip "File selected message">
+<!ENTITY nextButton.tooltip "Move to the next unread message">
+<!ENTITY previousButton.tooltip "Move to the previous unread message">
+<!ENTITY goForwardButton.tooltip "Go forwards one message">
+<!ENTITY goBackButton.tooltip "Go back one message">
+<!ENTITY deleteButton.tooltip "Delete selected message or folder">
+<!ENTITY markButton.tooltip "Mark messages">
+<!ENTITY printButton.tooltip "Print this message">
+<!ENTITY stopButton.tooltip "Stop the current transfer">
+<!ENTITY junkButton.tooltip "Mark the selected messages as junk">
+<!ENTITY notJunkButton.tooltip "Mark the selected messages as not junk">
+<!ENTITY addressBookButton.tooltip "Go to the address book">
+<!ENTITY tagButton.tooltip "Tag messages">
+<!ENTITY compactButton.tooltip "Remove deleted messages from selected folder">
+
+<!-- Tags Menu Popup -->
+<!ENTITY addNewTag.label "New Tag…">
+<!ENTITY addNewTag.accesskey "N">
+
+<!-- Folder Pane -->
+<!ENTITY folderColumn.label "Name">
+<!ENTITY folderSizeColumn.label "Size">
+
+<!-- Folder Pane Context Menu -->
+<!ENTITY folderContextGetMessages.label "Get Messages">
+<!ENTITY folderContextGetMessages.accesskey "G">
+<!ENTITY folderContextOpenNewWindow.label "Open">
+<!ENTITY folderContextOpenNewWindow.accesskey "O">
+<!ENTITY folderContextOpenNewTab.label "Open in New Tab">
+<!ENTITY folderContextOpenNewTab.accesskey "T">
+<!ENTITY folderContextNew.label "New Subfolder…">
+<!ENTITY folderContextNew.accesskey "N">
+<!ENTITY folderContextRename.label "Rename">
+<!ENTITY folderContextRename.accesskey "R">
+<!ENTITY folderContextRemove.label "Delete">
+<!ENTITY folderContextRemove.accesskey "D">
+<!ENTITY folderContextCompact.label "Compact">
+<!ENTITY folderContextCompact.accesskey "C">
+<!ENTITY folderContextEmptyTrash.label "Empty Deleted">
+<!ENTITY folderContextEmptyTrash.accesskey "y">
+<!ENTITY folderContextEmptyJunk.label "Empty Junk">
+<!ENTITY folderContextEmptyJunk.accesskey "J">
+<!ENTITY folderContextSendUnsentMessages.label "Send Unsent Messages">
+<!ENTITY folderContextSendUnsentMessages.accesskey "d">
+<!ENTITY folderContextUnsubscribe.label "Unsubscribe">
+<!ENTITY folderContextUnsubscribe.accesskey "U">
+<!ENTITY folderContextMarkNewsgroupRead.label "Mark Newsgroup Read">
+<!ENTITY folderContextMarkNewsgroupRead.accesskey "k">
+<!ENTITY folderContextMarkMailFolderRead.label "Mark Folder Read">
+<!ENTITY folderContextMarkMailFolderRead.accesskey "k">
+<!ENTITY folderContextSubscribe.label "Subscribe…">
+<!ENTITY folderContextSubscribe.accesskey "b">
+<!ENTITY folderContextSearchMessages.label "Search…">
+<!ENTITY folderContextSearchMessages.accesskey "S">
+<!ENTITY folderContextProperties.label "Properties…">
+<!ENTITY folderContextProperties.accesskey "P">
+<!ENTITY folderContextFavoriteFolder.label "Favourite Folder">
+<!ENTITY folderContextFavoriteFolder.accesskey "a">
+<!ENTITY folderContextSettings.label "Settings…">
+<!ENTITY folderContextSettings.accesskey "e">
+
+<!-- Search Bar -->
+<!ENTITY SearchNameOrEmail.label "Name or Email contains:">
+<!ENTITY SearchNameOrEmail.accesskey "N">
+<!ENTITY clearButton.label "Clear">
+<!ENTITY clearButton.accesskey "C">
+
+<!-- Quick Search Menu Bar -->
+<!ENTITY searchSubjectMenu.label "Subject">
+<!ENTITY searchFromMenu.label "From">
+<!ENTITY searchSubjectOrFromMenu.label "Subject or From">
+<!ENTITY searchRecipient.label "To or Cc">
+<!ENTITY searchMessageBody.label "Entire Message">
+<!ENTITY saveAsVirtualFolderMenu.label "Save Search as a Folder…">
+
+<!-- Thread Pane -->
+<!ENTITY threadColumn.label "Thread">
+<!ENTITY fromColumn.label "From">
+<!ENTITY recipientColumn.label "Recipient">
+<!ENTITY subjectColumn.label "Subject">
+<!ENTITY dateColumn.label "Date">
+<!ENTITY priorityColumn.label "Priority">
+<!ENTITY tagsColumn.label "Tag">
+<!ENTITY accountColumn.label "Account">
+<!ENTITY statusColumn.label "Status">
+<!ENTITY sizeColumn.label "Size">
+<!ENTITY junkStatusColumn.label "Junk Status">
+<!ENTITY linesColumn.label "Lines">
+<!ENTITY unreadColumn.label "Unread">
+<!ENTITY totalColumn.label "Total">
+<!ENTITY readColumn.label "Read">
+<!ENTITY receivedColumn.label "Received">
+<!ENTITY starredColumn.label "Starred">
+<!ENTITY locationColumn.label "Location">
+<!ENTITY idColumn.label "Order Received">
+<!ENTITY attachmentColumn.label "Attachments">
+
+<!-- Thread Pane Tooltips -->
+<!ENTITY columnChooser.tooltip "Click to select columns to display">
+<!ENTITY threadColumn.tooltip "Click to display message threads">
+<!ENTITY fromColumn.tooltip "Click to sort by from">
+<!ENTITY recipientColumn.tooltip "Click to sort by recipient">
+<!ENTITY subjectColumn.tooltip "Click to sort by subject">
+<!ENTITY dateColumn.tooltip "Click to sort by date">
+<!ENTITY priorityColumn.tooltip "Click to sort by priority">
+<!ENTITY tagsColumn.tooltip "Click to sort by tags">
+<!ENTITY accountColumn.tooltip "Click to sort by account">
+<!ENTITY statusColumn.tooltip "Click to sort by status">
+<!ENTITY sizeColumn.tooltip "Click to sort by size">
+<!ENTITY junkStatusColumn.tooltip "Click to sort by junk status">
+<!ENTITY unreadColumn.tooltip "Number of unread messages in thread">
+<!ENTITY totalColumn.tooltip "Total number of messages in thread">
+<!ENTITY readColumn.tooltip "Click to sort by read">
+<!ENTITY receivedColumn.tooltip "Click to sort by date received">
+<!ENTITY starredColumn.tooltip "Click to sort by star">
+<!ENTITY locationColumn.tooltip "Click to sort by location">
+<!ENTITY idColumn.tooltip "Click to sort by order received">
+<!ENTITY attachmentColumn.tooltip "Click to sort by attachments">
+
+<!-- Thread Pane Context Menu -->
+<!ENTITY contextOpenNewWindow.label "Open Message in New Window">
+<!ENTITY contextOpenNewWindow.accesskey "W">
+<!ENTITY contextOpenNewTab.label "Open Message in New Tab">
+<!ENTITY contextOpenNewTab.accesskey "T">
+<!ENTITY contextEditAsNew.label "Edit As New…">
+<!ENTITY contextEditAsNew.accesskey "E">
+<!ENTITY contextReplySender.label "Reply to Sender Only">
+<!ENTITY contextReplySender.accesskey "R">
+<!ENTITY contextReplyNewsgroup.label "Reply to Newsgroup">
+<!ENTITY contextReplyNewsgroup.accesskey "y">
+<!ENTITY contextReplyAll.label "Reply to All">
+<!ENTITY contextReplyAll.accesskey "A">
+<!ENTITY contextForward.label "Forward">
+<!ENTITY contextForward.accesskey "F">
+<!ENTITY contextForwardAsAttachment.label "Forward as Attachments">
+<!ENTITY contextForwardAsAttachment.accesskey "o">
+<!ENTITY contextMoveMsgMenu.label "Move To">
+<!ENTITY contextMoveMsgMenu.accesskey "M">
+<!ENTITY contextMoveCopyMsgRecentMenu.label "Recent">
+<!ENTITY contextMoveCopyMsgRecentMenu.accesskey "R">
+<!ENTITY contextCopyMsgMenu.label "Copy To">
+<!ENTITY contextCopyMsgMenu.accesskey "C">
+<!ENTITY contextSaveAs.label "Save As…">
+<!ENTITY contextSaveAs.accesskey "S">
+<!ENTITY contextPrint.label "Print…">
+<!ENTITY contextPrint.accesskey "P">
+<!ENTITY contextPrintPreview.label "Print Preview">
+<!ENTITY contextPrintPreview.accesskey "v">
+<!ENTITY contextDelete.label "Delete">
+<!ENTITY contextDelete.accesskey "D">
+
+<!-- Junk Bar -->
+<!ENTITY junkBarMessage1.label "Junk Mail">
+<!ENTITY junkBarButton1.label "Not Junk">
+<!ENTITY junkInfoButton.label "?">
+
+<!-- Remote Content Bar -->
+<!ENTITY remoteContentMessage1.label "To protect your privacy, remote images have been blocked.">
+<!ENTITY loadRemoteContentButton1.label "Load Images">
+
+<!-- Phishing Bar -->
+<!ENTITY phishingBarMessage1.label "Suspected Email Scam">
+<!ENTITY removePhishingBarButton1.label "Ignore Warning">
+<!ENTITY reportPhishingError.label "This isn't an email scam">
+
+<!-- Quick Search Bar -->
+<!ENTITY quickSearchCmd.key "k">
+
+<!-- Message Header Context Menu -->
+<!ENTITY AddToAddressBook.label "Add to Address Book…">
+<!ENTITY AddToAddressBook.accesskey "B">
+<!ENTITY SendMailTo.label "Compose Mail To">
+<!ENTITY SendMailTo.accesskey "s">
+<!ENTITY CopyEmailAddress.label "Copy Email Address">
+<!ENTITY CopyEmailAddress.accesskey "C">
+<!ENTITY CreateFilterFrom.label "Create Filter From…">
+<!ENTITY CreateFilterFrom.accesskey "F">
+<!ENTITY BlockAddress.label "Block Address">
+<!ENTITY BlockAddress.accesskey "A">
+<!ENTITY reportPhishingURL.label "Report Email Scam">
+<!ENTITY reportPhishingURL.accesskey "o">
+
+<!-- Content Pane Context Menu -->
+<!ENTITY saveLinkCmd.label "Save Link Target">
+<!ENTITY saveLinkCmd.accesskey "r">
+<!ENTITY saveImageCmd.label "Save Image">
+<!ENTITY saveImageCmd.accesskey "v">
+<!ENTITY copyCmd.label "Copy">
+<!ENTITY copyCmd.accesskey "C">
+<!ENTITY selectAllCmd.label "Select All">
+<!ENTITY selectAllCmd.accesskey "A">
+<!ENTITY copyLinkCmd.label "Copy Link Location">
+<!ENTITY copyLinkCmd.accesskey "C">
+<!ENTITY copyImageCmd.label "Copy Image Location">
+<!ENTITY copyImageCmd.accesskey "o">
+<!ENTITY copyEmailCmd.label "Copy Email Address">
+<!ENTITY copyEmailCmd.accesskey "E">
+
+<!-- Statusbar -->
+<!ENTITY statusText.label "Done">
+
+<!--  Mac OS X Window Menu -->
+<!ENTITY minimizeWindow.label "Minimise">
+<!ENTITY minimizeWindow.key "m">
+<!ENTITY bringAllToFront.label "Bring All to Front">
+<!ENTITY zoomWindow.label "Zoom">
+
+<!-- Mac OS X Application Menu (Cocoa widgets) -->
+<!ENTITY preferencesCmdMac.label        "Preferences…">
+<!ENTITY preferencesCmdMac.commandkey   ",">
+<!ENTITY preferencesCmdMac.modifiers    "accel">
+<!ENTITY servicesMenuMac.label          "Services">
+<!ENTITY hideThisAppCmdMac.label        "Hide &brandShortName;">
+<!ENTITY hideThisAppCmdMac.commandkey   "H">
+<!ENTITY hideThisAppCmdMac.modifiers    "accel">
+<!ENTITY hideOtherAppsCmdMac.label      "Hide Others">
+<!ENTITY hideOtherAppsCmdMac.commandkey "H">
+<!ENTITY hideOtherAppsCmdMac.modifiers  "accel,alt">
+<!ENTITY showAllAppsCmdMac.label        "Show All">
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -1,382 +1,461 @@
-# ***** 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):
-#   Seth Spitzer <sspitzer@netscape.com>
-#   Lorenzo Colitti <lorenzo@colitti.com>
-#
-# 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 *****
-
-#
-# The following are used by the messenger application
-#
-renameAccount=Rename Account...
-renameNewsAccount=Rename News Account...
-renameFolder=Rename Folder...
-compactFolder=Compact This Folder
-removeAccount=Delete Account...
-removeNewsAccount=Delete News Account...
-removeFolder=Delete Folder
-newFolderMenuItem=Folder...
-newSubfolderMenuItem=Subfolder...
-newFolder=New Folder...
-newSubfolder=New Subfolder...
-folderProperties=Folder Properties
-getNextNMessages=Get Next %S News Messages
-advanceNextPrompt=Advance to next unread message in %S?
-titleNewsPreHost=on
-titleMailPreHost=for
-replyToSender=Reply to Sender
-reply=Reply
-EMLFiles=Mail Files
-OpenEMLFiles=Open Message
-# LOCALIZATION NOTES(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
-LoadingMessageToPrint=Loading message to print...
-MessageLoaded=Message loaded...
-PrintingMessage=Printing message...
-PrintPreviewMessage=Print Previewing message...
-PrintingCard=Printing card...
-PrintPreviewCard=Print Previewing card...
-PrintingAddrBook=Printing AddressBook...
-PrintPreviewAddrBook=Print Previewing AddressBook...
-PrintingComplete=Done.
-PreviewTitle=%S - %S
-LoadingMailMsgForPrint=(Loading content for Printing)
-LoadingMailMsgForPrintPreview=(Loading content for Print Preview)
-saveAttachmentFailed=Unable to save the attachment. Please check your file name and try again later.
-saveMessageFailed=Unable to save the message. Please check your file name and try again later.
-notDownloaded=(Not Downloaded)
-fileExists=%S already exists. Do you want to replace it?
-
-downloadingNewsgroups=Downloading Newsgroups for Offline Use
-downloadingMail=Downloading Mail for Offline Use
-sendingUnsent=Sending Unsent Messages
-
-folderExists=A folder with that name already exists. Please enter a different name.
-folderCreationFailed=The folder could not be created because the folder name you specified contains an unrecognised character. Please enter a different name and try again.
-compactingFolder=Compacting folder %S...
-compactingDone=Done compacting folders
-autoCompactAllFolders=Do you wish to compact all local and offline folders to save disc space?
-confirmFolderDeletionForFilter=Deleting the folder '%S' will disable its associated filter(s). Are you sure you want to delete the folder?
-alertFilterChanged=Filters associated with this folder will be updated.
-filterDisabled=The folder '%S' could not be found, so filter(s) associated with this folder will be disabled. Verify that the folder exists, and that filters point to a valid destination folder.
-filterFolderDeniedLocked=The messages could not be filtered to folder '%S' because another operation is in progress.
-parsingFolderFailed=Unable to open the folder %S because it is in use by some other operation. Please wait for that operation to finish and then select the folder again. 
-deletingMsgsFailed=Unable to delete messages in folder %S because it is in use by some other operation. Please wait for that operation to finish and then try again.
-alertFilterCheckbox=Do not warn me again.
-compactFolderDeniedLock=The folder '%S' cannot be compacted because another operation is in progress. Please try again later.
-compactFolderWriteFailed=The folder '%S' could not be compacted because writing to folder failed. Verify that you have enough disc space, and that you have write privileges to the file system, then try again.
-filterFolderWriteFailed=The messages could not be filtered to folder '%S' because writing to folder failed. Verify that you have enough disc space, and that you have write privileges to the file system, then try again.
-copyMsgWriteFailed=The messages could not be moved or copied to folder '%S' because writing to folder failed. To gain disc space, from the File menu, first choose Empty Deleted, and then choose Compact Folders, and then try again.
-cantMoveMsgWOBodyOffline=While working offline, you cannot move or copy messages that were not downloaded for offline use. From the Mail window, open the File menu, choose Offline, then choose Work Online, and then try again.
-operationFailedFolderBusy=The operation failed because an other operation is using the folder. Please wait for that operation to finish and then try again.
-folderRenameFailed=The folder could not be renamed. Perhaps the folder is being reparsed, or the new name is not a valid folder name.
-# LOCALIZATION NOTES(verboseFolderFormat): %1$S is folder name, %2$S is server name
-verboseFolderFormat=%1$S on %2$S
-# LOCALIZATION NOTES(filterFolderTruncateFailed): %1$S is replaced by the folder name, %2$S is replaced by the brandShortName
-filterFolderTruncateFailed=There was an error truncating the Inbox after filtering a message to folder '%1$S'. You may need to shutdown %2$S and delete INBOX.msf.
-
-
-mailboxTooLarge=The folder %S is full, and can't hold any more messages. To make room for more messages, delete any old or unwanted mail and compact the folder.
-
-
-defaultServerTag=(Default)
-useDefaultServer=Use default server
-
-# Used in the SMTP Account Settings panel when a server value has no properties
-smtpServerList-NotSpecified=<not specified>
-smtpServer-SecureConnection-Type-0=None
-smtpServer-SecureConnection-Type-1=TLS (if available)
-smtpServer-SecureConnection-Type-2=TLS
-smtpServer-SecureConnection-Type-3=SSL
-smtpServers-confirmServerDeletionTitle=Delete Server
-smtpServers-confirmServerDeletion=Are you sure you want to delete the server: \n %S?
-
-# LOCALIZATION NOTES(serverType-nntp): Do not translate "NNTP" in the line below
-serverType-nntp=News Server (NNTP)
-# LOCALIZATION NOTES(serverType-pop3): Do not translate "POP" in the line below
-serverType-pop3=POP Mail Server
-# LOCALIZATION NOTES(serverType-imap): Do not translate "IMAP" in the line below
-serverType-imap=IMAP Mail Server
-serverType-none=Local Mail Store
-# LOCALIZATION NOTES(serverType-movemail): DONT_TRANSLATE
-serverType-movemail=Unix Movemail
-
-sizeColumnTooltip=Click to sort by size
-sizeColumnHeader=Size
-linesColumnTooltip=Click to sort by lines
-linesColumnHeader=Lines
-
-# status feedback stuff
-documentDone=
-documentLoading=Loading Message...
-
-unreadMsgStatus=Unread: %S
-totalMsgStatus=Total: %S
-
-# localized folder names
-
-localFolders=Local Folders
-
-# LOCALIZATION NOTES (inboxFolderName): OK to translate all foldernames, bugzilla #57440 & bugzilla #23625 fixed
-inboxFolderName=Inbox
-trashFolderName=Deleted
-sentFolderName=Sent
-draftsFolderName=Drafts
-templatesFolderName=Templates
-unsentFolderName=Unsent
-junkFolderName=Junk
-
-# Error message for special folder deletion on imap accounts
-# LOCALIZATION NOTES (specialFolderDeletionErr): Do not translate "IMAP" in the line below
-specialFolderDeletionErr=Deletion of special folder %S is not allowed for IMAP accounts.
-specialFolderDeletionErrTitle=Special Folder Deletion
-
-# "Normal" priority is often blank,
-# depending on the consumers of these strings
-priorityLowest=Lowest
-priorityLow=Low
-priorityNormal=Normal
-priorityHigh=High
-priorityHighest=Highest
-
-#Group by date thread pane titles
-today=Today
-yesterday=Yesterday
-lastWeek=Last Week
-twoWeeksAgo=Two Weeks Ago
-older=Old Mail
-
-#Grouped By Label
-unlabeledMessages=Unlabelled Messages
-
-# Grouped by status
-messagesWithNoStatus=No Status
-
-#Grouped by priority
-noPriority=No Priority
-
-# defaults for labels prefs listed in mailnews.js
-mailnews.labels.description.0=None
-mailnews.labels.description.1=Important
-mailnews.labels.description.2=Work
-mailnews.labels.description.3=Personal
-mailnews.labels.description.4=To Do
-mailnews.labels.description.5=Later
-
-# Format definition for label menu text.  This is necessary in order to
-# get the access key to be the on the first character of the menu text
-# instead of after the menu text.  The access keys for each of the label
-# items have been set to be the number preceeding '%S' listed below.
-#
-# '%S' is the prefs defined above, mailnews.labels.description.X.
-#   ie: 0 None
-#       1 Important
-#       2 Work
-#       3 Personal
-#       4 To Do
-#       5 Later
-labelMenuItemFormat0=0 %S
-labelMenuItemFormat1=1 %S
-labelMenuItemFormat2=2 %S
-labelMenuItemFormat3=3 %S
-labelMenuItemFormat4=4 %S
-labelMenuItemFormat5=5 %S
-
-replied=Replied
-forwarded=Forwarded
-new=New
-read=Read
-flagged=Flagged
-
-# for junk status picker in search and mail views
-junk=Junk
-# for the has attachment picker in search and mail views
-hasAttachments=Has Attachments
-
-# mailnews.js
-mailnews.send_default_charset=ISO-8859-1
-mailnews.view_default_charset=ISO-8859-1
-
-# generate display names in last first order
-# valid mail.addr_book.displayName.lastnamefirst are: true or false
-mail.addr_book.displayName.lastnamefirst=false
-
-# the format for "mail.addr_book.quicksearchquery.format" is:
-# @V == the escaped value typed in the quick search bar in the addressbook
-#
-# note, changing this might require a change to SearchNameOrEmail.label
-# in messenger.dtd
-#
-# LOCALIZATION NOTES - please add phonetic names as below when "mail.addr_book.show_phonetic_fields" is true
-# "?(or(PrimaryEmail,c,@V)(DisplayName,c,@V)(FirstName,c,@V)(LastName,c,@V)(PhoneticFirstName,c,@V)(PhoneticLastName,c,@V))"
-#
-mail.addr_book.quicksearchquery.format=?(or(PrimaryEmail,c,@V)(DisplayName,c,@V)(FirstName,c,@V)(LastName,c,@V))
-
-# valid mail.addr_book.show_phonetic_fields are: true or false
-mail.addr_book.show_phonetic_fields=false
-
-# valid format options are:
-# 1: yyyy/mm/dd
-# 2: yyyy/dd/mm
-# 3: mm/dd/yyyy
-# 4: mm/yyyy/dd
-# 5: dd/mm/yyyy
-# 6: dd/yyyy/mm
-#
-# 0: auto-detect the current locale format
-#    a separator has to be either '/', '-', '.' and the year in Chistian year
-#    otherwise mm/dd/yyyy (option 3) is used
-#
-mailnews.search_date_format=0
-# separator for search date (e.g. "/", "-"), or empty when search_date_format is zero
-mailnews.search_date_separator=
-
-# offline msg 
-nocachedbodybody=The body of this message has not been downloaded from \
-the server for reading offline. To read this message, \
-you must reconnect to the network, choose Offline from \
-the File menu and then select Work Online.\
-In the future, you can select which messages or folders to read offline. To do \
-this, choose Offline from the file menu and then select Synchronise. You can \
-adjust the Disc Space preference to prevent the downloading of large messages.
-
-# accountCentral
-mailnews.account_central_page.url=chrome://messenger/content/msgAccountCentral.xul
-# LOCALIZATION NOTES(acctCentralTitleFormat): %1$S is brand, %2$S is account type, %3$S is account name
-acctCentralTitleFormat=%1$S %2$S - %3$S
-mailAcctType=Mail
-newsAcctType=News
-
-# LOCALIZATION NOTES(nocachedbodytitle): Do not translate "<TITLE>" or "</TITLE>" in the line below
-nocachedbodytitle=<TITLE>Go Online to View This Message</TITLE>\n
-
-# mailWindowOverlay.js
-confirmUnsubscribeTitle=Confirm Unsubscribe
-confirmUnsubscribeText=Are you sure you want to unsubscribe from %S?
-cannotHaveTwoFilterRulesDialogs=Filter Rules Dialogue
-cannotHaveTwoFilterRulesText=The filter cannot be created because the Filter Rules dialogue is already in use. Please close the dialogue and try again.
-
-# msgHdrViewOverlay.js
-openLabel=Open
-openLabelAccesskey=O
-saveLabel=Save As...
-saveLabelAccesskey=A
-detachLabel=Detach...
-detachLabelAccesskey=D
-deleteLabel=Delete
-deleteLabelAccesskey=E
-deleteAttachments=The following attachments will be permanently deleted from this message:\n%S\nThis action cannot be undone. Do you wish to continue?
-detachAttachments=The following attachments have been successfully saved and will now be permanently deleted from this message:\n%S\nThis action cannot be undone. Do you wish to continue?
-deleteAttachmentFailure=Failed to delete the selected attachments.
-# LOCALIZATION NOTES(attachmentDeletePrefix): Do not translate until foreign language attachment names are fixed
-attachmentDeletePrefix=Deleted: %S
-
-# 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
-
-# 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.
-
-recipientSearchCriteria=Subject or Recipient contains:
-senderSearchCriteria=Subject or Sender contains:
-
-# LOCALIZATION NOTES(biffNotification): %1$S is the number of new messages  
-biffNotification_message=has %1$S new message
-biffNotification_messages=has %1$S new messages
-
-# For the Quota tab in the mail folder properties dialog
-quotaUsedFree=%S of %S kB used
-quotaPercentUsed=%S%% full
-
-# for message views
-confirmViewDeleteTitle=Confirm
-confirmViewDeleteMessage=Are you sure you want to delete this view?
-
-# for virtual folders
-confirmSavedSearchDeleteMessage=Are you sure you want to delete this saved search?
-
-## @name ENTER_PASSWORD_PROMPT
-## @loc None
-# LOCALIZATION NOTE (passwordPrompt): Do not translate the word %S below.
-# Place the word "%S" in your translation where the email address
-# or the username should appear
-passwordPrompt=Enter your password for %1$S on %2$S:
-
-## @name ENTER_PASSWORD_PROMPT_TITLE
-## @loc None
-passwordTitle=Mail Server Password Required
-
-# for checking if the user really wants to open lots of messages
-openWindowWarningTitle=Confirm
-openWindowWarningText=Opening %S messages may be slow.  Continue?
-
-# for checking if the user really wants to delete the adaptive filter training set
-confirmResetJunkTrainingTitle=Confirm
-confirmResetJunkTrainingText=Are you sure you want to reset the adaptive filter training data?
-
-# 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 NOTES(????ByteAbbreviation): Do not translate %d below, it is the size of the message/folder
-kiloByteAbbreviation=%dkB
-megaByteAbbreviation=%dMB
-
-# 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?
-
-# Check for Updates
-updates_checkForUpdates=Check for Updates...
-updates_downloadingUpdates=Downloading %S...
-updates_downloadingUpdatesFallback=Downloading Update...
-updates_resumeDownloading=Resume Downloading %S...
-updates_resumeDownloadingFallback=Resume Downloading Update...
-
+# ***** 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):
+#   Seth Spitzer <sspitzer@netscape.com>
+#   Lorenzo Colitti <lorenzo@colitti.com>
+#
+# 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 *****
+
+#
+# The following are used by the messenger application
+#
+renameAccount=Rename Account…
+renameNewsAccount=Rename News Account…
+removeAccount=Delete Account…
+removeNewsAccount=Delete News Account…
+newFolderMenuItem=Folder…
+newSubfolderMenuItem=Subfolder…
+newFolder=New Folder…
+newSubfolder=New Subfolder…
+folderProperties=Folder Properties
+newTag=New Tag…
+getNextNMessages=Get Next %S News Messages
+advanceNextPrompt=Advance to next unread message in %S?
+titleNewsPreHost=on
+replyToSender=Reply to Sender
+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
+LoadingMessageToPrint=Loading message to print…
+MessageLoaded=Message loaded…
+PrintingMessage=Printing message…
+PrintPreviewMessage=Print Previewing message…
+PrintingCard=Printing card…
+PrintPreviewCard=Print Previewing card…
+PrintingAddrBook=Printing AddressBook…
+PrintPreviewAddrBook=Print Previewing AddressBook…
+PrintingComplete=Done.
+PreviewTitle=%S - %S
+LoadingMailMsgForPrint=(Loading content for Printing)
+LoadingMailMsgForPrintPreview=(Loading content for Print Preview)
+saveAttachmentFailed=Unable to save the attachment. Please check your file name and try again later.
+saveMessageFailed=Unable to save the message. Please check your file name and try again later.
+notDownloaded=(Not Downloaded)
+fileExists=%S already exists. Do you want to replace it?
+
+downloadingNewsgroups=Downloading Newsgroups for Offline Use
+downloadingMail=Downloading Mail for Offline Use
+sendingUnsent=Sending Unsent Messages
+
+folderExists=A folder with that name already exists. Please enter a different name.
+folderCreationFailed=The folder could not be created because the folder name you specified contains an unrecognised character. Please enter a different name and try again.
+
+compactingFolder=Compacting folder %S…
+doneCompacting=Done compacting
+autoCompactAllFoldersTitle=Compact Folders
+autoCompactAllFolders=Do you wish to compact all local and offline folders to save disc space?
+autoCompactAllFoldersCheckbox=Do this automatically from now on.
+
+confirmFolderDeletionForFilter=Deleting the folder '%S' will disable its associated filter(s). Are you sure you want to delete the folder?
+alertFilterChanged=Filters associated with this folder will be updated.
+filterDisabled=The folder '%S' could not be found, so filter(s) associated with this folder will be disabled. Verify that the folder exists, and that filters point to a valid destination folder.
+filterFolderDeniedLocked=The messages could not be filtered to folder '%S' because another operation is in progress.
+parsingFolderFailed=Unable to open the folder %S because it is in use by some other operation. Please wait for that operation to finish and then select the folder again. 
+deletingMsgsFailed=Unable to delete messages in folder %S because it is in use by some other operation. Please wait for that operation to finish and then try again.
+alertFilterCheckbox=Do not warn me again.
+compactFolderDeniedLock=The folder '%S' cannot be compacted because another operation is in progress. Please try again later.
+compactFolderWriteFailed=The folder '%S' could not be compacted because writing to folder failed. Verify that you have enough disc space, and that you have write privileges to the file system, then try again.
+filterFolderWriteFailed=The messages could not be filtered to folder '%S' because writing to folder failed. Verify that you have enough disc space, and that you have write privileges to the file system, then try again.
+copyMsgWriteFailed=The messages could not be moved or copied to folder '%S' because writing to folder failed. To gain disc space, from the File menu, first choose Empty Deleted, and then choose Compact Folders, and then try again.
+cantMoveMsgWOBodyOffline=While working offline, you cannot move or copy messages that were not downloaded for offline use. From the Mail window, open the File menu, choose Offline, then choose Work Online, and then try again.
+operationFailedFolderBusy=The operation failed because an other operation is using the folder. Please wait for that operation to finish and then try again.
+folderRenameFailed=The folder could not be renamed. Perhaps the folder is being reparsed, or the new name is not a valid folder name.
+# LOCALIZATION NOTE(verboseFolderFormat): %1$S is folder name, %2$S is server name
+verboseFolderFormat=%1$S on %2$S
+# LOCALIZATION NOTE(filterFolderTruncateFailed): %1$S is replaced by the folder name, %2$S is replaced by the brandShortName
+filterFolderTruncateFailed=There was an error truncating the Inbox after filtering a message to folder '%1$S'. You may need to shutdown %2$S and delete INBOX.msf.
+
+
+mailboxTooLarge=The folder %S is full, and can't hold any more messages. To make room for more messages, delete any old or unwanted mail and compact the folder.
+
+errorGettingDB=Unable to open the summary file for %S. Perhaps there was an error on disc, or the full path is too long.
+
+defaultServerTag=(Default)
+useDefaultServer=Use default server
+
+# Used in message database list view to provide a text value for graphic based cells.
+messageUnread=Unread
+messageHasFlag=Starred
+messageHasAttachment=Has Attachment
+messageJunk=Junk
+messageExpanded=Expanded
+messageCollapsed=Collapsed
+
+# Used in the SMTP Account Settings panel when a server value has no properties
+smtpServerList-NotSpecified=<not specified>
+smtpServer-SecureConnection-Type_0=No
+smtpServer-SecureConnection-Type_1=STARTTLS, if available
+smtpServer-SecureConnection-Type_2=STARTTLS
+smtpServer-SecureConnection-Type_3=SMTP-over-SSL
+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?
+
+# 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
+serverType-movemail=Unix Movemail
+
+sizeColumnTooltip=Click to sort by size
+sizeColumnHeader=Size
+linesColumnTooltip=Click to sort by lines
+linesColumnHeader=Lines
+
+# status feedback stuff
+documentDone=
+documentLoading=Loading Message…
+
+unreadMsgStatus=Unread: %S
+selectedMsgStatus=Selected: %S
+totalMsgStatus=Total: %S
+
+# localized folder names
+
+localFolders=Local Folders
+
+# LOCALIZATION NOTE (inboxFolderName): OK to translate all foldernames, bugzilla #57440 & bugzilla #23625 fixed
+inboxFolderName=Inbox
+trashFolderName=Deleted
+sentFolderName=Sent
+draftsFolderName=Drafts
+templatesFolderName=Templates
+outboxFolderName=Outbox
+junkFolderName=Junk
+
+# Error message for special folder deletion on imap accounts
+# LOCALIZATION NOTE (specialFolderDeletionErr): Do not translate "IMAP" in the line below
+specialFolderDeletionErr=Deletion of special folder %S is not allowed for IMAP accounts.
+specialFolderDeletionErrTitle=Special Folder Deletion
+
+# "Normal" priority is often blank,
+# depending on the consumers of these strings
+priorityLowest=Lowest
+priorityLow=Low
+priorityNormal=Normal
+priorityHigh=High
+priorityHighest=Highest
+
+#Group by date thread pane titles
+today=Today
+yesterday=Yesterday
+lastWeek=Last Week
+twoWeeksAgo=Two Weeks Ago
+older=Old Mail
+
+#Grouped By Tags
+untaggedMessages=Untagged Messages
+
+# Grouped by status
+messagesWithNoStatus=No Status
+
+#Grouped by priority
+noPriority=No Priority
+
+#Grouped by has attachments
+noAttachments=No Attachments
+attachments=Attachments
+
+#Grouped by starred
+notFlagged=Not Starred
+groupFlagged=Starred
+
+# defaults descriptions for tag prefs listed in mailnews.js
+# (we keep the .labels. names for backwards compatibility)
+mailnews.tags.remove=Remove All Tags
+mailnews.labels.description.1=Important
+mailnews.labels.description.2=Work
+mailnews.labels.description.3=Personal
+mailnews.labels.description.4=To Do
+mailnews.labels.description.5=Later
+
+# Format definition tag menu texts.
+# This is necessary in order to get the accesskeys to be the on the first
+# character of the menu text instead of after the menu text.
+# If a key definition exists for the tag at index n, that key's key will be
+# taken as the accesskey, eg.
+#   <key id="key_tag3" key="&tagCmd3.key;" oncommand="ToggleMessageTagKey(3);"/>
+# makes the third tag have the accesskey &tagCmd3.key;.
+# In the menuitem's label, this accesskey appears at %1$S below; %2$S will be
+# replaced by the tag label.
+mailnews.tags.format=%1$S %2$S
+
+replied=Replied
+forwarded=Forwarded
+new=New
+read=Read
+flagged=Starred
+
+# for junk status picker in search and mail views
+junk=Junk
+
+# for junk score origin picker in search and mail views
+junkScoreOriginPlugin=Plugin
+junkScoreOriginFilter=Filter
+junkScoreOriginWhitelist=Whitelist
+junkScoreOriginUser=User
+junkScoreOriginImapFlag=IMAP Flag
+
+# for the has attachment picker in search and mail views
+hasAttachments=Has Attachments
+
+# for the Tag picker in search and mail views.
+tag=Tags
+
+# mailnews.js
+mailnews.send_default_charset=ISO-8859-1
+mailnews.view_default_charset=ISO-8859-1
+
+# generate display names in last first order
+# valid mail.addr_book.displayName.lastnamefirst are: true or false
+mail.addr_book.displayName.lastnamefirst=false
+
+# the format for "mail.addr_book.quicksearchquery.format" is:
+# @V == the escaped value typed in the quick search bar in the addressbook
+#
+# note, changing this might require a change to SearchNameOrEmail.label
+# in messenger.dtd
+#
+# LOCALIZATION NOTE - please add phonetic names as below when "mail.addr_book.show_phonetic_fields" is true
+# "?(or(PrimaryEmail,c,@V)(DisplayName,c,@V)(FirstName,c,@V)(LastName,c,@V)(PhoneticFirstName,c,@V)(PhoneticLastName,c,@V))"
+#
+mail.addr_book.quicksearchquery.format=?(or(PrimaryEmail,c,@V)(DisplayName,c,@V)(FirstName,c,@V)(LastName,c,@V))
+
+# valid mail.addr_book.show_phonetic_fields are: true or false
+mail.addr_book.show_phonetic_fields=false
+
+# valid format options are:
+# 1: yyyy/mm/dd
+# 2: yyyy/dd/mm
+# 3: mm/dd/yyyy
+# 4: mm/yyyy/dd
+# 5: dd/mm/yyyy
+# 6: dd/yyyy/mm
+#
+# 0: auto-detect the current locale format
+#    a separator has to be either '/', '-', '.' and the year in Chistian year
+#    otherwise mm/dd/yyyy (option 3) is used
+#
+mailnews.search_date_format=0
+# separator for search date (e.g. "/", "-"), or empty when search_date_format is zero
+mailnews.search_date_separator=
+# leading zeros for day and month values, not used if mailnews.search_date_format is not zero
+mailnews.search_date_leading_zeros=true
+
+# offline msg 
+nocachedbodybody=The body of this message has not been downloaded from \
+the server for reading offline. To read this message, \
+you must reconnect to the network, choose Offline from \
+the File menu and then untick Work Offline. \
+In the future, you can select which messages or folders to read offline. To do \
+this, choose Offline from the file menu and then select Synchronise. You can \
+adjust the Disc Space preference to prevent the downloading of large messages.
+
+# accountCentral
+mailnews.account_central_page.url=chrome://messenger/content/msgAccountCentral.xul
+# LOCALIZATION NOTE(acctCentralTitleFormat): %1$S is brand, %2$S is account type, %3$S is account name
+acctCentralTitleFormat=%1$S %2$S - %3$S
+mailAcctType=Mail
+newsAcctType=News
+
+# LOCALIZATION NOTE(nocachedbodytitle): Do not translate "<TITLE>" or "</TITLE>" in the line below
+nocachedbodytitle=<TITLE>Go Online to View This Message</TITLE>\n
+
+# mailWindowOverlay.js
+confirmUnsubscribeTitle=Confirm Unsubscribe
+confirmUnsubscribeText=Are you sure you want to unsubscribe from %S?
+cannotHaveTwoFilterRulesDialogs=Filter Rules Dialogue
+cannotHaveTwoFilterRulesText=The filter cannot be created because the Filter Rules dialogue is already in use. Please close the dialogue and try again.
+
+# msgHdrViewOverlay.js
+openLabel=Open
+openLabelAccesskey=O
+saveLabel=Save As…
+saveLabelAccesskey=A
+detachLabel=Detach…
+detachLabelAccesskey=D
+deleteLabel=Delete
+deleteLabelAccesskey=E
+deleteAttachments=The following attachments will be permanently deleted from this message:\n%S\nThis action cannot be undone. Do you wish to continue?
+detachAttachments=The following attachments have been successfully saved and will now be permanently deleted from this message:\n%S\nThis action cannot be undone. Do you wish to continue?
+deleteAttachmentFailure=Failed to delete the selected attachments.
+# LOCALIZATION NOTE(attachmentDeletePrefix): Do not translate until foreign language attachment names are fixed
+attachmentDeletePrefix=Deleted: %S
+
+# 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
+
+# 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.
+
+recipientSearchCriteria=Subject or Recipient contains:
+fromSearchCriteria=Subject or From contains:
+
+# LOCALIZATION NOTE(biffNotification): %1$S is the number of new messages  
+biffNotification_message=has %1$S new message
+biffNotification_messages=has %1$S new messages
+
+# LOCALIZATION NOTE(biffNotification): %1$S is the name of the account %2$S is the number of new messages  
+newBiffNotification_message=%1$S has %2$S new message
+newBiffNotification_messages=%1$S has %2$S new messages
+
+# For the Quota tab in the mail folder properties dialog
+quotaUsedFree=%S of %S kB used
+quotaPercentUsed=%S%% full
+# for quota in main window (commandglue.js)
+percent=%S%%
+quotaTooltip=IMAP quota: %S kB used of %S kB total. Click for details.
+
+# for message views
+confirmViewDeleteTitle=Confirm
+confirmViewDeleteMessage=Are you sure you want to delete this view?
+
+# for virtual folders
+confirmSavedSearchDeleteMessage=Are you sure you want to delete this saved search?
+
+## @name ENTER_PASSWORD_PROMPT
+## @loc None
+# LOCALIZATION NOTE (passwordPrompt): Do not translate the word %S below.
+# Place the word "%S" in your translation where the email address
+# or the username should appear
+passwordPrompt=Enter your password for %1$S on %2$S:
+
+## @name ENTER_PASSWORD_PROMPT_TITLE
+## @loc None
+passwordTitle=Mail Server Password Required
+
+# for checking if the user really wants to open lots of messages
+openWindowWarningTitle=Confirm
+openWindowWarningText=Opening %S messages may be slow.  Continue?
+
+# for warning the user that a tag they're trying to create already exists
+tagExists=A tag with that name already exists.
+
+# title of the edit tag dialog
+editTagTitle=Edit Tag
+
+# 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
+
+# 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
+confirmPhishingUrl=%1$S thinks this message is a scam. The links in the message may be trying to impersonate web pages you want to visit. Are you sure you want to visit %2$S?
+
+# Check for Updates
+updatesItem_default=Check for Updates…
+updatesItem_defaultFallback=Check for Updates…
+updatesItem_downloading=Downloading %S…
+updatesItem_downloadingFallback=Downloading Update…
+updatesItem_resume=Resume Downloading %S…
+updatesItem_resumeFallback=Resume Downloading Update…
+updatesItem_pending=Apply Downloaded Update Now…
+updatesItem_pendingFallback=Apply Downloaded Update Now…
+
+# Folder Pane Header Title Strings
+folderPaneHeader=All Folders
+folderPaneHeader_unread=Unread Folders
+folderPaneHeader_favorites=Favourite Folders
+folderPaneHeader_recent=Recent Folders
+
+# Copy / Move to Folder Again
+#LOCALIZATION NOTE %1$S is the name of the folder we will move to. moveToFolderAgainAccessKey
+# should have the same value as copyToFolderAgainAccessKey as they are the same menu item in the UI
+# moveToFolderAgainAccessKey should also be a letter that occurs before %1$S
+moveToFolderAgain=Move to "%1$S" Again
+moveToFolderAgainAccessKey=t
+#LOCALIZATION NOTE %1$S is the name of the folder we will copy to
+# copyToFolderAgainAccessKey
+# should have the same value as moveToFolderAgainAccessKey as they are the same menu item in the UI
+# copyToFolderAgainAccessKey should also be a letter that occurs before %1$S
+copyToFolderAgain=Copy to "%1$S" Again
+copyToFolderAgainAccessKey=t
+
+#LOCALIZATION NOTE %1$S is the e-mail address of the person we will allow remote images for
+alwaysLoadRemoteContentForSender1= Always load remote images from %1$S 
+
+# Strings for growl notifications on Mac OS X
+subjectNotificationTitle=Subject: "%1$S"
+senderNotificationText=Sender: "%1$S"
+
+# mailCommands.js
+emptyJunkTitle=Confirm
+emptyJunkMessage=Are you sure you want to permanently delete all messages and subfolders in the Junk folder?
+emptyJunkDontAsk=Don't ask me again.
+emptyTrashTitle=Confirm
+emptyTrashMessage=Are you sure you want to permanently delete all messages and subfolders in the Deleted folder?
+emptyTrashDontAsk=Don't ask me again.
+
+# junkCommands.js
+junkAnalysisPercentComplete=Junk analysis %S complete
+processingJunkMessages=Processing Junk Messages
--- a/mail/chrome/messenger/messengercompose/askSendFormat.dtd
+++ b/mail/chrome/messenger/messengercompose/askSendFormat.dtd
@@ -1,25 +1,16 @@
-<!--LOCALIZATION NOTE askSendFormat.dtd UI for dialog that asks the user, which format to use for sending a message -->
-<!ENTITY windowTitle.label "HTML Mail Question">
-
-<!ENTITY recipient.label "Some of the recipients are not listed as being able to receive HTML mail.">
-
-<!ENTITY convertibleDefault.label "">
-<!ENTITY convertibleYes.label "Your message can be converted to plain text without losing information.">
-<!ENTITY convertibleAltering.label "Your message can be converted to plain text without losing important information. However, the plain text version might look different to that you saw in the composer.">
-<!ENTITY convertibleNo.label "However, you used formatting (e.g. colours) that will not be converted to plain text.">
-
-<!ENTITY question.label "Would you like to convert the message to plain text or send it in HTML anyway?">
-
-<!ENTITY plainTextAndHtml.label "Send in Plain Text and HTML">
-<!ENTITY plainTextOnly.label "Send in Plain Text Only">
-<!ENTITY htmlOnly.label "Send in HTML Only">
-
-<!ENTITY plainTextAndHtmlRecommended.label "Send in Plain Text and HTML (recommended)">
-<!ENTITY plainTextOnlyRecommended.label "Send in Plain Text Only (recommended)">
-<!ENTITY htmlOnlyRecommended.label "Send in HTML Only (recommended)">
-<!ENTITY recommended.label "(recommended)">
-
-<!ENTITY send.label "Send">
-<!ENTITY cancel.label "Cancel">
-<!ENTITY recipients.label "Recipients...">
-<!ENTITY help.label "Help">
+<!--LOCALIZATION NOTE askSendFormat.dtd UI for dialog that asks the user, which format to use for sending a message -->
+<!ENTITY windowTitle.label "HTML Mail Question">
+
+<!ENTITY recipient.label "Some of the recipients are not listed as being able to receive HTML mail.">
+
+<!ENTITY question.label "Would you like to convert the message to plain text or send it in HTML anyway?">
+
+<!ENTITY plainTextAndHtml.label "Send in Plain Text and HTML">
+<!ENTITY plainTextAndHtml.accesskey "a">
+<!ENTITY plainTextOnly.label "Send in Plain Text Only">
+<!ENTITY plainTextOnly.accesskey "P">
+<!ENTITY htmlOnly.label "Send in HTML Only">
+<!ENTITY htmlOnly.accesskey "H">
+
+<!ENTITY send.label "Send">
+<!ENTITY send.accesskey "S">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/messengercompose/askSendFormat.properties
@@ -0,0 +1,4 @@
+convertibleYes=Your message can be converted to plain text without losing information.
+convertibleAltering=Your message can be converted to plain text without losing important information. However, the plain text version might look different to the version you created in the composer.
+convertibleNo=However, you used formatting (e.g. colours) that will not be converted to plain text.
+recommended=(recommended)
--- a/mail/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/chrome/messenger/messengercompose/composeMsgs.properties
@@ -1,318 +1,334 @@
-# ***** 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 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.
-
-## @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
-12504=Loading attachments...
-
-## @name NS_MSG_LOAD_ATTACHMNT
-12505=Loading attachment...
-
-## @name NS_MSG_COULDNT_OPEN_FCC_FOLDER
-12506=Couldn't open Sent Mail folder. Please verify that your Mail preferences are correct.
-
-## @name NS_MSG_CANT_POST_TO_MULTIPLE_NEWS_HOSTS
-12507=Can't post to multiple news hosts. Try again.
-
-## @name NS_MSG_ASSEMB_DONE_MSG
-12508=Assembling message...Done
-
-## @name NS_MSG_ASSEMBLING_MSG
-12509=Assembling message...
-
-## @name NS_MSG_NO_SENDER
-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.
-
-## @name NS_MSG_ERROR_WRITING_FILE
-12512=Error writing temporary file.
-
-## @name NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER
-12513=An error occurred sending mail: Unable to connect to SMTP server %S. The server may be down or may be incorrectly configured. Please verify that your Mail/News account settings are correct and try again.
-
-## @name NS_ERROR_SENDING_FROM_COMMAND
-12514=An error occurred while sending mail. The mail server responded:  %s.  Please verify that your email address is correct in your Mail preferences and try again.
-
-## @name NS_ERROR_SENDING_RCPT_COMMAND
-12515=An error occurred while sending mail. The mail server responded:  %s. Please check the message recipients and try again.
-
-## @name NS_ERROR_SENDING_DATA_COMMAND
-12516=An (SMTP) error occurred while sending mail. The server responded:  %s.
-
-## @name NS_ERROR_SENDING_MESSAGE
-12517=An error occurred while sending mail. The mail server responded:  %s. Please check the message and try again.
-
-## @name NS_ERROR_POST_FAILED
-12518=The message could not be posted because connecting to the news server failed. The server may be unavailable or is refusing connections. Please verify that your news server setting is correct and try again, or else contact your network administrator.
-
-## @name NS_ERROR_QUEUED_DELIVERY_FAILED
-12519=An error occurred delivering unsent messages.
-
-## @name NS_ERROR_SEND_FAILED
-12520=Sending of message failed.
-
-## @name SMTP_DELIV_MAIL
-12521=Delivering mail...
-
-## @name SMTP_MESSAGE_SENT_WAITING_MAIL_REPLY
-12522=Mail: Message sent; waiting for reply...
-
-## @name SMTP_PROGRESS_MAILSENT
-12523=Mail sent successfully
-
-## @name NS_ERROR_SMTP_SERVER_ERROR
-12524=An error occurred sending mail: SMTP server error. The server responded:  %s Contact your mail administrator for assistance.
-
-## @name NS_MSG_UNABLE_TO_SEND_LATER
-12525=Unable to save your message in order to send it later.
-
-## @name NS_ERROR_COMMUNICATIONS_ERROR
-12526=A communications error occurred: %d.  Please try again.
-
-## @name NS_ERROR_BUT_DONT_SHOW_ALERT
-12527=THIS IS JUST A PLACEHOLDER.  YOU SHOULD NEVER SEE THIS STRING.
-
-## @name NS_ERROR_TCP_READ_ERROR
-12528=A network error occurred while receiving data.  (Network Error: %s)  Try connecting again.
-
-## @name NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS
-12529=An error occurred sending mail:  the return mail address was invalid.  Please verify that your email address is correct in your Mail preferences and try again.
-
-## @name NS_ERROR_SMTP_PASSWORD_UNDEFINED
-12530=Error getting mail password.
-
-## @name NS_ERROR_MIME_MPART_ATTACHMENT_ERROR
-12531=Attachment error.
-
-## @name NS_MSG_FAILED_COPY_OPERATION
-12532=The message was sent successfully, but could not be copied to your Sent folder.
-
-## @name NS_MSG_FAILURE_ON_OBJ_EMBED_WHILE_SAVING
-12533=There was a problem including the file %.200s in the message. Would you like to continue saving the message without this file?
-
-## @name NS_MSG_ASSEMBLING_MESSAGE
-12534=Assembling mail information...
-
-## @name NS_MSG_GATHERING_ATTACHMENT
-12535=Attaching %s...
-
-## @name NS_MSG_CREATING_MESSAGE
-12536=Creating mail message...
-
-## @name NS_MSG_FAILURE_ON_OBJ_EMBED_WHILE_SENDING
-12537=There was a problem including the file %.200s in the message. Would you like to continue sending the message without this file?
-
-## @name NS_MSG_START_COPY_MESSAGE
-12538=Copying message to %S folder...
-
-## @name NS_MSG_START_COPY_MESSAGE_COMPLETE
-12539=Copy complete.
-
-## @name NS_MSG_START_COPY_MESSAGE_FAILED
-12540=Copy failed.
-
-## @name NS_MSG_LARGE_MESSAGE_WARNING
-12541=Warning! You are about to send a %d byte message. Are you sure that you want to do this?
-
-noIdentities=You don't have any email identities yet.  Create one with the Account Wizard.
-
-## @name NS_SMTP_PASSWORD_PROMPT_TITLE
-12542=Mail Server Password Required
-
-## @name NS_SMTP_PASSWORD_PROMPT1
-12543=Enter your password for %S:
-
-## @name NS_SMTP_PASSWORD_PROMPT2
-12544=Enter your password for %S on %S:
-
-## @name NS_SMTP_CONNECTING_TO_SERVER
-12545=Connecting to server...
-
-## @name NS_MSG_SENDING_MESSAGE
-12550=Sending message...
-
-## @name NS_MSG_POSTING_MESSAGE
-12551=Posting message...
-
-## @name NS_ERROR_MSG_MULTILINGUAL_SEND
-12553=The message you composed contains characters not found in the selected Character Encoding. While you can choose a different Character Encoding, it is usually safe to use Unicode (UTF-8) for mail. If you just send in the current Character Encoding, be aware that those not covered by the current Character Encoding will be turned to question marks and illegible by the recipient.
-
-sendInUTF8=Send in UTF-8
-sendAnyway=Send anyway
-
-## @name NS_ERROR_NNTP_NO_CROSS_POSTING
-12554=You can only send a message to one news server at a time.
-
-## @name NS_MSG_CANCELLING
-12555=Cancelling...
-
-## @name NS_MSG_SEND_ERROR_TITLE
-12556=Send Message Error
-
-## @name NS_MSG_SENDLATER_ERROR_TITLE
-12557=Send Later Error
-
-## @name NS_MSG_SAVE_DRAFT_TITLE
-12558=Save Draft Error
-
-## @name NS_MSG_SAVE_TEMPLATE_TITLE
-12559=Save Template Error
-
-## @name NS_ERROR_SEND_FAILED_BUT_NNTP_OK
-12560=Your message has been posted to the newsgroup but has not been sent to other recipient.
-
-## @name NS_MSG_ASK_TO_COMEBACK_TO_COMPOSE
-12561=Would you like to return to the compose window?
-
-## @name NS_MSG_GENERIC_FAILURE_EXPLANATION
-12562=Please verify that your Mail & Newsgroups account settings are correct and try again.
-
-## @name NS_MSG_ERROR_READING_FILE
-12563=Error reading file.
-
-## @name NS_FOLLOWUPTO_SENDER
-12564=The author of this message has requested that responses be sent only to the author. If you also want to reply to the newsgroup, add a new row to the addressing area, choose Newsgroup from the recipients list, and enter the name of the newsgroup.
-
-## @name NS_ERROR_SMTP_SEND_FAILED
-12565=The message could not be sent because connecting to SMTP server %S failed. The server may be unavailable or is refusing SMTP connections. Please verify that your SMTP server setting is correct and try again, or else contact your network administrator.
-
-## @name NS_MSG_UNDISCLOSED_RECIPIENTS
-## LOCALIZATION NOTE: this string must be using only US_ASCII characters
-12566=undisclosed-recipients
-
-## @name NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED
-12567=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 and try again. The server responded:  %s.
-
-## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1
-12568=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, try to reduce the message size and try again.
-
-## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2
-12569=The size of the message you are trying to send exceeds the global size limit of the server. The message was not sent, try to reduce the message size and try again. The server responded:  %s.
-
-## @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_COULD_NOT_LOGIN_TO_SMTP_SERVER_WITH_STARTTLS1
-12573=An error occurred sending mail: Unable to connect to SMTP server %S via STARTTLS since it doesn't support EHLO. Please verify that your Mail/News account settings are correct and try again.
-
-## @name NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER_WITH_STARTTLS2
-12574=An error occurred sending mail: Unable to connect to SMTP server %S via STARTTLS since it doesn't offer STARTTLS In EHLO reponse. Please verify that your Mail/News account settings are correct and try again.
-
-## 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?
-saveDlogSaveBtn=Save
-saveDlogDontSaveBtn=Don't Save
-saveDlogCancelBtn=Cancel
-
-## generics string
-defaultSubject=(no subject)
-chooseFileToAttach=Attach File(s)
-
-##
-windowTitlePrefix=Compose:
-
-## String used by the dialog that ask the user to enter a subject
-sendMsgTitle=Send Message
-subjectDlogMessage=You did not specify a subject for this message. If you would like to provide one, please type it now.
-
-## String used by the dialog that informs the user about the newsgroup recipient
-recipientDlogMessage=This account only supports email recipients. Continuing will ignore newsgroups.
-
-#String used by the alert that tells the user an e-mail address is invalid
-addressInvalid=%1$S is not a valid email address because it is not of the form user@host. You must correct it before sending the email.
-## String used by the dialog that ask the user to attach a web page
-attachPageDlogTitle=Please specify a location to attach
-attachPageDlogMessage=Web Page (URL):
-
-## String used for attachment pretty name, when attachment is a message
-messageAttachmentSafeName=Attached Message
-## String used for attachment pretty name, when attachment is message part
-partAttachmentSafeName=Attached Message Part
-
-## String used by the Initialization Error dialog
-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 dialogue box again.
-
-## Strings used by prompt when Quitting while in progress
-quitComposeWindowTitle=Sending Message
-## LOCALIZATION NOTE (quitComposeWindowMessage): don't translate \n
-quitComposeWindowMessage=Mail 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?
-quitComposeWindowQuitButtonLabel=Quit
-quitComposeWindowWaitButtonLabel=Wait
-
-## Strings used by prompt for Ctrl-Enter check before sending message
-sendMessageCheckWindowTitle=Send Message
-sendMessageCheckLabel=Are you sure you are ready to send this message?
-sendMessageCheckSendButtonLabel=Send
-
-## reply header in composeMsg
-## <author> wrote:
-mailnews.reply_header_authorwrote=%s wrote
-mailnews.reply_header_ondate=On %s
-
-## reply header in composeMsg
-## user specified 
-mailnews.reply_header_originalmessage=-------- Original Message --------
+# ***** 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 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.
+
+## @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
+12504=Loading attachments…
+
+## @name NS_MSG_LOAD_ATTACHMNT
+12505=Loading attachment…
+
+## @name NS_MSG_COULDNT_OPEN_FCC_FOLDER
+12506=Couldn't open Sent Mail folder. Please verify that your Mail preferences are correct.
+
+## @name NS_MSG_CANT_POST_TO_MULTIPLE_NEWS_HOSTS
+12507=Can't post to multiple news hosts. Try again.
+
+## @name NS_MSG_ASSEMB_DONE_MSG
+12508=Assembling message…Done
+
+## @name NS_MSG_ASSEMBLING_MSG
+12509=Assembling message…
+
+## @name NS_MSG_NO_SENDER
+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.
+
+## @name NS_MSG_ERROR_WRITING_FILE
+12512=Error writing temporary file.
+
+## @name NS_ERROR_SENDING_FROM_COMMAND
+12514=An error occurred while sending mail. The mail server responded:  %s.  Please verify that your email address is correct in your Mail preferences and try again.
+
+## @name NS_ERROR_SENDING_DATA_COMMAND
+12516=An (SMTP) error occurred while sending mail. The server responded:  %s.
+
+## @name NS_ERROR_SENDING_MESSAGE
+12517=An error occurred while sending mail. The mail server responded:  %s. Please check the message and try again.
+
+## @name NS_ERROR_POST_FAILED
+12518=The message could not be posted because connecting to the news server failed. The server may be unavailable or is refusing connections. Please verify that your news server settings are correct and try again, or else contact your network administrator.
+
+## @name NS_ERROR_QUEUED_DELIVERY_FAILED
+12519=An error occurred delivering unsent messages.
+
+## @name NS_ERROR_SEND_FAILED
+12520=Sending of message failed.
+
+## @name SMTP_DELIV_MAIL
+12521=Delivering mail…
+
+## @name SMTP_MESSAGE_SENT_WAITING_MAIL_REPLY
+12522=Mail: Message sent; waiting for reply…
+
+## @name SMTP_PROGRESS_MAILSENT
+12523=Mail sent successfully
+
+## @name NS_ERROR_SMTP_SERVER_ERROR
+12524=An error occurred sending mail: SMTP server error. The server responded:  %s Contact your mail administrator for assistance.
+
+## @name NS_MSG_UNABLE_TO_SEND_LATER
+12525=Unable to save your message in order to send it later.
+
+## @name NS_ERROR_COMMUNICATIONS_ERROR
+12526=A communications error occurred: %d.  Please try again.
+
+## @name NS_ERROR_BUT_DONT_SHOW_ALERT
+12527=THIS IS JUST A PLACEHOLDER.  YOU SHOULD NEVER SEE THIS STRING.
+
+## @name NS_ERROR_TCP_READ_ERROR
+12528=A network error occurred while receiving data.  (Network Error: %s)  Try connecting again.
+
+## @name NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS
+12529=An error occurred sending mail:  the return mail address was invalid.  Please verify that your email address is correct in your Mail preferences and try again.
+
+## @name NS_ERROR_MIME_MPART_ATTACHMENT_ERROR
+12531=Attachment error.
+
+## @name NS_MSG_FAILED_COPY_OPERATION
+12532=The message was sent successfully, but could not be copied to your Sent folder.
+
+## @name NS_MSG_FAILURE_ON_OBJ_EMBED_WHILE_SAVING
+12533=There was a problem including the file %.200s in the message. Would you like to continue saving the message without this file?
+
+## @name NS_MSG_ASSEMBLING_MESSAGE
+12534=Assembling mail information…
+
+## @name NS_MSG_GATHERING_ATTACHMENT
+12535=Attaching %s…
+
+## @name NS_MSG_CREATING_MESSAGE
+12536=Creating mail message…
+
+## @name NS_MSG_FAILURE_ON_OBJ_EMBED_WHILE_SENDING
+12537=There was a problem including the file %.200s in the message. Would you like to continue sending the message without this file?
+
+## @name NS_MSG_START_COPY_MESSAGE
+12538=Copying message to %S folder…
+
+## @name NS_MSG_START_COPY_MESSAGE_COMPLETE
+12539=Copy complete.
+
+## @name NS_MSG_START_COPY_MESSAGE_FAILED
+12540=Copy failed.
+
+## @name NS_MSG_LARGE_MESSAGE_WARNING
+12541=Warning! You are about to send a %d byte message. Are you sure that you want to do this?
+
+noIdentities=You don't have any email identities yet.  Create one with the Account Wizard.
+
+## @name NS_SMTP_PASSWORD_PROMPT1
+12543=Enter your password for %S:
+
+## @name NS_SMTP_PASSWORD_PROMPT2
+12544=Enter your password for %S on %S:
+
+## @name NS_SMTP_CONNECTING_TO_SERVER
+12545=Connecting to server…
+
+## @name NS_MSG_SENDING_MESSAGE
+12550=Sending message…
+
+## @name NS_MSG_POSTING_MESSAGE
+12551=Posting message…
+
+## @name NS_ERROR_NNTP_NO_CROSS_POSTING
+12554=You can only send a message to one news server at a time.
+
+## @name NS_MSG_CANCELLING
+12555=Cancelling…
+
+## @name NS_MSG_SEND_ERROR_TITLE
+12556=Send Message Error
+
+## @name NS_MSG_SENDLATER_ERROR_TITLE
+12557=Send Later Error
+
+## @name NS_MSG_SAVE_DRAFT_TITLE
+12558=Save Draft Error
+
+## @name NS_MSG_SAVE_TEMPLATE_TITLE
+12559=Save Template Error
+
+## @name NS_ERROR_SEND_FAILED_BUT_NNTP_OK
+12560=Your message has been posted to the newsgroup but has not been sent to other recipient.
+
+## @name NS_MSG_ASK_TO_COMEBACK_TO_COMPOSE
+12561=Would you like to return to the compose window?
+
+## @name NS_MSG_GENERIC_FAILURE_EXPLANATION
+12562=Please verify that your Mail & Newsgroups account settings are correct and try again.
+
+## @name NS_MSG_ERROR_READING_FILE
+12563=Error reading file.
+
+## @name NS_FOLLOWUPTO_SENDER
+12564=The author of this message has requested that responses be sent only to the author. If you also want to reply to the newsgroup, add a new row to the addressing area, choose Newsgroup from the recipients list, and enter the name of the newsgroup.
+
+## @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. The server 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_SMTP_PASSWORD_PROMPT_TITLE
+12585=SMTP Server Password Required
+
+## @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.
+
+## @name NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2
+12588=The size of the message you are trying to send exceeds the global size limit of the server. The message was not sent; reduce the message size and try again. The server responded:  %s.
+
+## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_SERVER
+12589=An error occurred sending mail: SMTP server %S is unknown. The server may be incorrectly configured. Please verify that your SMTP server settings are correct and try again.
+
+## @name NS_ERROR_SMTP_SEND_FAILED_REFUSED
+12590=The message could not be sent because connecting to SMTP server %S failed. The server may be unavailable or is refusing SMTP connections. Please verify that your SMTP server settings are correct and try again, or contact the server administrator.
+
+## @name NS_ERROR_SMTP_SEND_FAILED_INTERRUPTED
+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.
+
+## 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?
+saveDlogSaveBtn=Save
+saveDlogDontSaveBtn=Don't Save
+saveDlogCancelBtn=Cancel
+
+## generics string
+defaultSubject=(no subject)
+chooseFileToAttach=Attach File(s)
+
+##
+windowTitlePrefix=Write:
+
+## String used by the dialog that ask the user to enter a subject
+sendMsgTitle=Send Message
+subjectDlogMessage=You did not specify a subject for this message. If you would like to provide one, please type it now.
+
+## String used by the dialog that informs the user about the newsgroup recipient
+recipientDlogMessage=This account only supports email recipients. Continuing will ignore newsgroups.
+
+#String used by the alert that tells the user an e-mail address is invalid
+addressInvalid=%1$S is not a valid email address because it is not of the form user@host. You must correct it before sending the email.
+## String used by the dialog that ask the user to attach a web page
+attachPageDlogTitle=Please specify a location to attach
+attachPageDlogMessage=Web Page (URL):
+
+## String used for attachment pretty name, when attachment is a message
+messageAttachmentSafeName=Attached Message
+## String used for attachment pretty name, when attachment is message part
+partAttachmentSafeName=Attached Message Part
+
+## String used by the Initialization Error dialog
+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 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
+
+## Strings used by prompt for Ctrl-Enter check before sending message
+sendMessageCheckWindowTitle=Send Message
+sendMessageCheckLabel=Are you sure you are ready to send this message?
+sendMessageCheckSendButtonLabel=Send
+
+## reply header in composeMsg
+## <author> wrote:
+mailnews.reply_header_authorwrote=%s wrote
+mailnews.reply_header_ondate=On %s
+
+## reply header in composeMsg
+## user specified 
+mailnews.reply_header_originalmessage=-------- Original Message --------
+
+## Strings used by the rename attachment dialog
+renameAttachmentTitle=Rename Attachment
+renameAttachmentMessage=New attachment name:
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/messengercompose/mailComposeEditorOverlay.dtd
@@ -0,0 +1,5 @@
+<!ENTITY attachImageSource.label         "Attach this image to the message">
+<!ENTITY attachImageSource.accesskey     "s">
+
+<!ENTITY attachLinkSource.label          "Attach the source of this link to the message">
+<!ENTITY attachLinkSource.accesskey      "s">
--- a/mail/chrome/messenger/messengercompose/messengercompose.dtd
+++ b/mail/chrome/messenger/messengercompose/messengercompose.dtd
@@ -1,284 +1,276 @@
-<!--LOCALIZATION NOTE messengercompose.dtd Main UI for message composition -->
-<!ENTITY msgComposeWindow.title "Compose: (no subject)">
-
-<!-- File Menu -->
-<!ENTITY fileMenu.label "File"> 
-<!ENTITY fileMenu.accesskey "f">
-<!ENTITY newMenu.label "New">
-<!ENTITY newMenu.accesskey "N">
-<!ENTITY newMessage.label "Message">
-<!ENTITY newMessage.key "M">
-<!ENTITY newMessageCmd2.key "N">
-<!ENTITY newMessage.accesskey "M">
-<!ENTITY newCard.label "Address Book Card...">
-<!ENTITY newCard.accesskey "c">
-<!ENTITY attachMenu.label "Attach">
-<!ENTITY attachMenu.accesskey "t">
-<!ENTITY attachFileCmd.label "File(s)...">
-<!ENTITY attachFileCmd.accesskey "F">
-<!ENTITY attachPageCmd.label "Web Page...">
-<!ENTITY attachPageCmd.accesskey "W">
-<!--LOCALIZATION NOTE attachVCardCmd.label Don't translate the term 'vCard' -->
-<!ENTITY attachVCardCmd.label "Personal Card (vCard)">
-<!ENTITY attachVCardCmd.accesskey "P">
-<!ENTITY closeCmd.label "Close">
-<!ENTITY closeCmd.key "W">
-<!ENTITY closeCmd.accesskey "c">
-<!ENTITY saveCmd.label "Save">
-<!ENTITY saveCmd.key "S">
-<!ENTITY saveCmd.accesskey "s">
-<!ENTITY saveAsCmd.label "Save As">
-<!ENTITY saveAsCmd.accesskey "A">
-<!ENTITY saveAsFileCmd.label "File...">
-<!ENTITY saveAsFileCmd.accesskey "F">
-<!ENTITY saveAsDraftCmd.label "Draft">
-<!ENTITY saveAsDraftCmd.accesskey "D">
-<!ENTITY saveAsTemplateCmd.label "Template">
-<!ENTITY saveAsTemplateCmd.accesskey "T">
-<!ENTITY offlineGoOfflineCmd.label "Work Offline">
-<!ENTITY offlineGoOfflineCmd.accesskey "w">
-<!ENTITY sendNowCmd.label "Send Now">
-<!ENTITY sendCmd.keycode "VK_RETURN">
-<!ENTITY sendNowCmd.accesskey "d">
-<!ENTITY sendLaterCmd.label "Send Later">
-<!ENTITY sendLaterCmd.keycode "VK_RETURN">
-<!ENTITY sendLaterCmd.accesskey "L">
-<!ENTITY printSetupCmd.label "Page Setup...">
-<!ENTITY printSetupCmd.accesskey "u">
-<!ENTITY printCmd.label "Print...">
-<!ENTITY printCmd.key "P">
-<!ENTITY printCmd.accesskey "P">
-<!ENTITY quitApplicationCmdWin.label                    "Exit"> 
-<!ENTITY quitApplicationCmdWin.accesskey                "x">
-<!ENTITY quitApplicationCmd.label                       "Quit"> 
-<!ENTITY quitApplicationCmd.accesskey                   "Q">
-<!ENTITY quitApplicationCmd.key "Q"> 
-
-<!-- Edit Menu -->
-<!ENTITY editMenu.label "Edit"> 
-<!ENTITY editMenu.accesskey "e">
-<!ENTITY undoCmd.label "Undo">
-<!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "u"> 
-<!ENTITY redoCmd.label "Redo">
-<!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "r"> 
-<!ENTITY cutCmd.label "Cut">
-<!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t"> 
-<!ENTITY copyCmd.label "Copy">
-<!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "c"> 
-<!ENTITY pasteCmd.label "Paste">
-<!ENTITY pasteCmd.key "V">
-<!ENTITY pasteCmd.accesskey "p">
-<!ENTITY editRewrapCmd.label "Rewrap">
-<!ENTITY editRewrapCmd.accesskey "w">
-<!ENTITY deleteCmd.label "Delete">
-<!ENTITY deleteCmd.key "D">
-<!ENTITY deleteCmd.accesskey "d">
-<!ENTITY selectAllCmd.label "Select All">
-<!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "a"> 
-<!ENTITY findCmd.label "Find and Replace...">
-<!ENTITY findCmd.key "F">
-<!ENTITY findCmd.accesskey "F">
-<!ENTITY findAgainCmd.label "Find Again">
-<!ENTITY findAgainCmd.key "G">
-<!ENTITY findAgainCmd.accesskey "g">
-<!ENTITY findAgainCmd.key2 "VK_F3">
-<!ENTITY findPrevCmd.label "Find Previous">
-<!ENTITY findPrevCmd.key "G">
-<!ENTITY findPrevCmd.key2 "VK_F3">
-<!ENTITY findPrevCmd.accesskey "v"> 
-
-<!-- View Menu -->
-<!ENTITY viewMenu.label "View"> 
-<!ENTITY viewMenu.accesskey "v">
-<!ENTITY viewToolbarsMenuNew.label "Toolbars"> 
-<!ENTITY viewToolbarsMenuNew.accesskey "T"> 
-<!ENTITY showComposeToolbarCmd.label "Mail Toolbar">
-<!ENTITY showComposeToolbarCmd.accesskey "o">
-<!ENTITY showFormatToolbarCmd.label "Formatting Toolbar">
-<!ENTITY showFormatToolbarCmd.accesskey "F">
-<!ENTITY showTaskbarCmd.label "Status Bar">
-<!ENTITY showTaskbarCmd.accesskey "S">
-<!ENTITY customizeToolbar.label "Customise...">
-<!ENTITY customizeToolbar.accesskey "C">
-
-<!ENTITY addressSidebar.label "Contacts Sidebar"> 
-<!ENTITY addressSidebar.accesskey "o"> 
-
-<!-- Format Menu -->
-<!ENTITY formatMenu.label "Format">
-<!ENTITY formatMenu.accesskey "o">
-
-<!-- Options Menu -->
-<!ENTITY optionsMenu.label "Options">
-<!ENTITY optionsMenu.accesskey "p">
-<!ENTITY checkSpellingCmd.label "Check Spelling...">
-<!ENTITY checkSpellingCmd.key "K">
-<!ENTITY checkSpellingCmd.key2 "VK_F7">
-<!ENTITY checkSpellingCmd.accesskey "h">
-<!ENTITY enableInlineSpellChecker.label "Spell As You Type">
-<!ENTITY enableInlineSpellChecker.accesskey "S">
-<!ENTITY quoteCmd.label "Quote Message">
-<!ENTITY quoteCmd.accesskey "Q">
-
-<!--LOCALIZATION NOTE attachVCard.label Don't translate the term 'vCard' -->
-<!ENTITY attachVCard.label "Attach Personal Card (vCard)">
-<!ENTITY attachVCard.accesskey "v">
-
-<!ENTITY returnReceiptMenu.label "Return Receipt">
-<!ENTITY returnReceiptMenu.accesskey "t">
-<!ENTITY outputFormatMenu.label "Format">
-<!ENTITY outputFormatMenu.accesskey "f">
-<!ENTITY autoFormatCmd.label "Auto-Detect">
-<!ENTITY autoFormatCmd.accesskey "a">
-<!ENTITY plainTextFormatCmd.label "Plain Text Only">
-<!ENTITY plainTextFormatCmd.accesskey "p">
-<!ENTITY htmlFormatCmd.label "Rich Text (HTML) Only">
-<!ENTITY htmlFormatCmd.accesskey "r">
-<!ENTITY bothFormatCmd.label "Plain and Rich (HTML) Text">
-<!ENTITY bothFormatCmd.accesskey "l">
-<!ENTITY priorityMenu.label "Priority">
-<!ENTITY priorityMenu.accesskey "p">
-<!ENTITY priorityButton.label "Priority:">
-<!ENTITY lowestPriorityCmd.label "Lowest">
-<!ENTITY lowestPriorityCmd.accesskey "l">
-<!ENTITY lowPriorityCmd.label "Low">
-<!ENTITY lowPriorityCmd.accesskey "o">
-<!ENTITY normalPriorityCmd.label "Normal">
-<!ENTITY normalPriorityCmd.accesskey "n">
-<!ENTITY highPriorityCmd.label "High">
-<!ENTITY highPriorityCmd.accesskey "i">
-<!ENTITY highestPriorityCmd.label "Highest">
-<!ENTITY highestPriorityCmd.accesskey "H">
-<!ENTITY fileCarbonCopyCmd.label "Send a Copy To">
-<!ENTITY fileCarbonCopyCmd.accesskey "d">
-<!ENTITY fileHereMenu.label "File Here">
-
-<!-- Tools Menu -->
-<!ENTITY tasksMenu.label "Tools">
-<!ENTITY tasksMenu.accesskey "T">
-<!ENTITY messengerCmd.label "Mail &amp; Newsgroups">
-<!ENTITY messengerCmd.accesskey "m">
-<!ENTITY messengerCmd.commandkey "1">
-<!ENTITY addressBookCmd.label "Address Book">
-<!ENTITY addressBookCmd.accesskey "a">
-<!ENTITY addressBookCmd.commandkey "2">
-<!ENTITY accountManagerCmd.label "Account Settings...">
-<!ENTITY accountManagerCmd.accesskey "c">
-<!ENTITY accountManagerCmdUnix.accesskey "S">
-<!ENTITY preferencesCmd.label "Options...">
-<!ENTITY preferencesCmd.key "O">
-<!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label       "Preferences">
-<!ENTITY preferencesCmdUnix.accesskey   "n"> 
-
-<!--  Mac OS X Window Menu -->
-<!ENTITY minimizeWindow.key "m">
-<!ENTITY minimizeWindow.label "Minimise">
-<!ENTITY bringAllToFront.label "Bring All to Front">
-<!ENTITY zoomWindow.label "Zoom"> 
-<!ENTITY windowMenu.label "Window"> 
-
-<!-- Help Menu -->
-<!ENTITY helpMenu.label "Help">
-<!ENTITY helpMenu.accesskey "H"> 
-<!ENTITY releaseCmd.label "Release Notes">
-<!ENTITY releaseCmd.accesskey "R"> 
-<!ENTITY hintsAndTips.label "&brandShortName; Help">
-<!ENTITY hintsAndTips.accesskey "h"> 
-<!ENTITY hintsAndTipsMac.commandkey "?">
-<!ENTITY aboutCmd.label "About &brandShortName;">
-<!ENTITY aboutCmd.accesskey "A">
-
-<!-- Mail Toolbar -->
-<!ENTITY sendButton.label "Send">
-<!ENTITY quoteButton.label "Quote">
-<!ENTITY addressButton.label "Contacts">
-<!ENTITY attachButton.label "Attach">
-<!ENTITY spellingButton.label "Spelling">
-<!ENTITY saveButton.label "Save">
-<!ENTITY throbberItem.title "Activity Indicator">
-
-<!-- Mail Toolbar Tooltips -->
-<!ENTITY sendButton.tooltip "Send this message now"> 
-<!ENTITY sendlaterButton.tooltip "Send this message later"> 
-<!ENTITY quoteButton.tooltip "Quote the previous message"> 
-<!ENTITY addressButton.tooltip "Select a recipient from an Address Book"> 
-<!ENTITY attachButton.tooltip "Include an attachment"> 
-<!ENTITY saveButton.tooltip "Save this message"> 
-<!ENTITY throbber.tooltip "Go to the &vendorShortName; home page">
-<!ENTITY cutButton.tooltip              "Cut">
-<!ENTITY copyButton.tooltip             "Copy">
-<!ENTITY pasteButton.tooltip            "Paste">
-
-<!-- Headers -->
-<!ENTITY fromAddr.label "From:">
-<!ENTITY fromAddr.accesskey "r">
-<!ENTITY toAddr.label "To:"> 
-<!ENTITY ccAddr.label "Cc:"> 
-<!ENTITY bccAddr.label "Bcc:"> 
-<!ENTITY replyAddr.label "Reply-To:"> 
-<!ENTITY newsgroupsAddr.label "Newsgroup:"> 
-<!ENTITY followupAddr.label "Followup-To:"> 
-<!ENTITY subject.label "Subject:">
-<!ENTITY subject.accesskey "S">
-<!ENTITY attachments.label "Attachments:">
-<!ENTITY attachments.accesskey "c">
-
-<!-- Format Toolbar, imported from editorAppShell.xul -->
-<!--LOCALIZATION NOTE formatToolbar. Don't change any of these Style Characters -->
-<!ENTITY formatToolbar.boldChar "B">
-<!ENTITY formatToolbar.italicChar "I">
-<!ENTITY formatToolbar.underlineChar "U">
-<!ENTITY SmileButton.tooltip "Insert a smiley face">
-<!ENTITY smiley1Cmd.label "Smiling">
-<!ENTITY smiley2Cmd.label "Frowning">
-<!ENTITY smiley3Cmd.label "Winking">
-<!ENTITY smiley4Cmd.label "Tongue-out">
-<!ENTITY smiley5Cmd.label "Laughing">
-<!ENTITY smiley6Cmd.label "Embarrassed">
-<!ENTITY smiley7Cmd.label "Undecided">
-<!ENTITY smiley8Cmd.label "Surprise">
-<!ENTITY smiley9Cmd.label "Kissing">
-<!ENTITY smiley10Cmd.label "Yelling">
-<!ENTITY smiley11Cmd.label "Cool">
-<!ENTITY smiley12Cmd.label "Money-Mouth">
-<!ENTITY smiley13Cmd.label "Foot-in-Mouth">
-<!ENTITY smiley14Cmd.label "Innocent">
-<!ENTITY smiley15Cmd.label "Crying">
-<!ENTITY smiley16Cmd.label "Lips-are-Sealed">
-
-<!-- Message Pane Context Menu -->
-<!ENTITY spellCheckNoSuggestions.label "No Suggestions Found">
-<!ENTITY spellCheckIgnoreWord.label "Ignore Word">
-<!ENTITY spellCheckIgnoreWord.accesskey "I">
-<!ENTITY spellCheckAddToDictionary.label "Add to Dictionary">
-<!ENTITY spellCheckAddToDictionary.accesskey "n">
-<!ENTITY undo.label "Undo">
-<!ENTITY undo.accesskey "U">
-<!ENTITY cut.label "Cut">
-<!ENTITY cut.accesskey "t">
-<!ENTITY copy.label "Copy">
-<!ENTITY copy.accesskey "C">
-<!ENTITY paste.label "Paste">
-<!ENTITY paste.accesskey "P">
-<!ENTITY pasteQuote.label "Paste As Quotation">
-<!ENTITY pasteQuote.accesskey "Q">
-
-<!ENTITY openAttachment.label "Open">
-<!ENTITY openAttachment.accesskey "O">
-<!ENTITY delete.label "Delete">
-<!ENTITY delete.accesskey "D">
-<!ENTITY selectAll.label "Select All">
-<!ENTITY selectAll.accesskey "A">
-<!ENTITY attachFile.label "Attach File(s)...">
-<!ENTITY attachFile.accesskey "F">
-<!ENTITY attachPage.label "Attach Web Page...">
-<!ENTITY attachPage.accesskey "W">
-
-<!-- Title for the address picker panel -->
-<!ENTITY addressesSidebarTitle.label "Contacts">
+<!--LOCALIZATION NOTE messengercompose.dtd Main UI for message composition -->
+<!ENTITY msgComposeWindow.title "Write: (no subject)">
+
+<!-- File Menu -->
+<!ENTITY fileMenu.label "File"> 
+<!ENTITY fileMenu.accesskey "f">
+<!ENTITY newMenu.label "New">
+<!ENTITY newMenu.accesskey "N">
+<!ENTITY newMessage.label "Message">
+<!ENTITY newMessage.key "M">
+<!ENTITY newMessageCmd2.key "N">
+<!ENTITY newMessage.accesskey "M">
+<!ENTITY newCard.label "Address Book Card…">
+<!ENTITY newCard.accesskey "c">
+<!ENTITY attachMenu.label "Attach">
+<!ENTITY attachMenu.accesskey "t">
+<!ENTITY attachFileCmd.label "File(s)…">
+<!ENTITY attachFileCmd.accesskey "F">
+<!ENTITY attachPageCmd.label "Web Page…">
+<!ENTITY attachPageCmd.accesskey "W">
+<!--LOCALIZATION NOTE attachVCardCmd.label Don't translate the term 'vCard' -->
+<!ENTITY attachVCardCmd.label "Personal Card (vCard)">
+<!ENTITY attachVCardCmd.accesskey "P">
+<!ENTITY closeCmd.label "Close">
+<!ENTITY closeCmd.key "W">
+<!ENTITY closeCmd.accesskey "c">
+<!ENTITY saveCmd.label "Save">
+<!ENTITY saveCmd.key "S">
+<!ENTITY saveCmd.accesskey "s">
+<!ENTITY saveAsCmd.label "Save As">
+<!ENTITY saveAsCmd.accesskey "A">
+<!ENTITY saveAsFileCmd.label "File…">
+<!ENTITY saveAsFileCmd.accesskey "F">
+<!ENTITY saveAsDraftCmd.label "Draft">
+<!ENTITY saveAsDraftCmd.accesskey "D">
+<!ENTITY saveAsTemplateCmd.label "Template">
+<!ENTITY saveAsTemplateCmd.accesskey "T">
+<!ENTITY sendNowCmd.label "Send Now">
+<!ENTITY sendCmd.keycode "VK_RETURN">
+<!ENTITY sendNowCmd.accesskey "d">
+<!ENTITY sendLaterCmd.label "Send Later">
+<!ENTITY sendLaterCmd.keycode "VK_RETURN">
+<!ENTITY sendLaterCmd.accesskey "L">
+<!ENTITY printSetupCmd.label "Page Setup…">
+<!ENTITY printSetupCmd.accesskey "u">
+<!ENTITY printCmd.label "Print…">
+<!ENTITY printCmd.key "P">
+<!ENTITY printCmd.accesskey "P">
+<!ENTITY quitApplicationCmdWin.label                    "Exit"> 
+<!ENTITY quitApplicationCmdWin.accesskey                "x">
+<!ENTITY quitApplicationCmd.label                       "Quit"> 
+<!ENTITY quitApplicationCmd.accesskey                   "Q">
+<!ENTITY quitApplicationCmd.key "Q"> 
+
+<!-- Edit Menu -->
+<!ENTITY editMenu.label "Edit"> 
+<!ENTITY editMenu.accesskey "e">
+<!ENTITY undoCmd.label "Undo">
+<!ENTITY undoCmd.key "Z">
+<!ENTITY undoCmd.accesskey "u"> 
+<!ENTITY redoCmd.label "Redo">
+<!ENTITY redoCmd.key "Y">
+<!ENTITY redoCmd.accesskey "r"> 
+<!ENTITY cutCmd.label "Cut">
+<!ENTITY cutCmd.key "X">
+<!ENTITY cutCmd.accesskey "t"> 
+<!ENTITY copyCmd.label "Copy">
+<!ENTITY copyCmd.key "C">
+<!ENTITY copyCmd.accesskey "c"> 
+<!ENTITY pasteCmd.label "Paste">
+<!ENTITY pasteCmd.key "V">
+<!ENTITY pasteCmd.accesskey "p">
+<!ENTITY editRewrapCmd.label "Rewrap">
+<!ENTITY editRewrapCmd.key "R">
+<!ENTITY editRewrapCmd.accesskey "w">
+<!ENTITY deleteCmd.label "Delete">
+<!ENTITY deleteCmd.key "D">
+<!ENTITY deleteCmd.accesskey "d">
+<!ENTITY selectAllCmd.label "Select All">
+<!ENTITY selectAllCmd.key "A">
+<!ENTITY selectAllCmd.accesskey "a"> 
+<!ENTITY findCmd.label "Find and Replace…">
+<!ENTITY findCmd.key "F">
+<!ENTITY findCmd.accesskey "F">
+<!ENTITY findAgainCmd.label "Find Again">
+<!ENTITY findAgainCmd.key "G">
+<!ENTITY findAgainCmd.accesskey "g">
+<!ENTITY findAgainCmd.key2 "VK_F3">
+<!ENTITY findPrevCmd.label "Find Previous">
+<!ENTITY findPrevCmd.key "G">
+<!ENTITY findPrevCmd.key2 "VK_F3">
+<!ENTITY findPrevCmd.accesskey "v"> 
+
+<!-- View Menu -->
+<!ENTITY viewMenu.label "View"> 
+<!ENTITY viewMenu.accesskey "v">
+<!ENTITY viewToolbarsMenuNew.label "Toolbars"> 
+<!ENTITY viewToolbarsMenuNew.accesskey "T"> 
+<!ENTITY showCompositionToolbarCmd.label "Composition Toolbar">
+<!ENTITY showCompositionToolbarCmd.accesskey "o">
+<!ENTITY showFormattingBarCmd.label "Formatting Bar">
+<!ENTITY showFormattingBarCmd.accesskey "F">
+<!ENTITY showTaskbarCmd.label "Status Bar">
+<!ENTITY showTaskbarCmd.accesskey "S">
+<!ENTITY customizeToolbar.label "Customise…">
+<!ENTITY customizeToolbar.accesskey "C">
+
+<!ENTITY addressSidebar.label "Contacts Sidebar"> 
+<!ENTITY addressSidebar.accesskey "o"> 
+
+<!-- Format Menu -->
+<!ENTITY formatMenu.label "Format">
+<!ENTITY formatMenu.accesskey "o">
+
+<!-- Options Menu -->
+<!ENTITY optionsMenu.label "Options">
+<!ENTITY optionsMenu.accesskey "p">
+<!ENTITY checkSpellingCmd.label "Check Spelling…">
+<!ENTITY checkSpellingCmd.key "K">
+<!ENTITY checkSpellingCmd.key2 "VK_F7">
+<!ENTITY checkSpellingCmd.accesskey "h">
+<!ENTITY enableInlineSpellChecker.label "Spell Check As You Type">
+<!ENTITY enableInlineSpellChecker.accesskey "S">
+<!ENTITY quoteCmd.label "Quote Message">
+<!ENTITY quoteCmd.accesskey "Q">
+
+<!--LOCALIZATION NOTE attachVCard.label Don't translate the term 'vCard' -->
+<!ENTITY attachVCard.label "Attach Personal Card (vCard)">
+<!ENTITY attachVCard.accesskey "v">
+
+<!ENTITY returnReceiptMenu.label "Return Receipt">
+<!ENTITY returnReceiptMenu.accesskey "t">
+<!ENTITY dsnMenu.label "Delivery Status Notification">
+<!ENTITY dsnMenu.accesskey "N">
+<!ENTITY outputFormatMenu.label "Format">
+<!ENTITY outputFormatMenu.accesskey "f">
+<!ENTITY autoFormatCmd.label "Auto-Detect">
+<!ENTITY autoFormatCmd.accesskey "a">
+<!ENTITY plainTextFormatCmd.label "Plain Text Only">
+<!ENTITY plainTextFormatCmd.accesskey "p">
+<!ENTITY htmlFormatCmd.label "Rich Text (HTML) Only">
+<!ENTITY htmlFormatCmd.accesskey "r">
+<!ENTITY bothFormatCmd.label "Plain and Rich (HTML) Text">
+<!ENTITY bothFormatCmd.accesskey "l">
+<!ENTITY priorityMenu.label "Priority">
+<!ENTITY priorityMenu.accesskey "p">
+<!ENTITY priorityButton.label "Priority:">
+<!ENTITY lowestPriorityCmd.label "Lowest">
+<!ENTITY lowestPriorityCmd.accesskey "l">
+<!ENTITY lowPriorityCmd.label "Low">
+<!ENTITY lowPriorityCmd.accesskey "o">
+<!ENTITY normalPriorityCmd.label "Normal">
+<!ENTITY normalPriorityCmd.accesskey "n">
+<!ENTITY highPriorityCmd.label "High">
+<!ENTITY highPriorityCmd.accesskey "i">
+<!ENTITY highestPriorityCmd.label "Highest">
+<!ENTITY highestPriorityCmd.accesskey "H">
+<!ENTITY fileCarbonCopyCmd.label "Send a Copy To">
+<!ENTITY fileCarbonCopyCmd.accesskey "d">
+<!ENTITY fileHereMenu.label "File Here">
+
+<!-- Tools Menu -->
+<!ENTITY tasksMenu.label "Tools">
+<!ENTITY tasksMenu.accesskey "T">
+<!ENTITY messengerCmd.label "Mail &amp; Newsgroups">
+<!ENTITY messengerCmd.accesskey "m">
+<!ENTITY messengerCmd.commandkey "1">
+<!ENTITY addressBookCmd.label "Address Book">
+<!ENTITY addressBookCmd.accesskey "a">
+<!ENTITY addressBookCmd.commandkey "2">
+<!ENTITY accountManagerCmd.label "Account Settings…">
+<!ENTITY accountManagerCmd.accesskey "c">
+<!ENTITY accountManagerCmdUnix.accesskey "S">
+<!ENTITY preferencesCmd.label "Options…">
+<!ENTITY preferencesCmd.key "O">
+<!ENTITY preferencesCmd.accesskey "O">
+<!ENTITY preferencesCmdUnix.label       "Preferences">
+<!ENTITY preferencesCmdUnix.accesskey   "n"> 
+
+<!--  Mac OS X Window Menu -->
+<!ENTITY minimizeWindow.key "m">
+<!ENTITY minimizeWindow.label "Minimise">
+<!ENTITY bringAllToFront.label "Bring All to Front">
+<!ENTITY zoomWindow.label "Zoom"> 
+<!ENTITY windowMenu.label "Window">
+
+<!-- Mail Toolbar -->
+<!ENTITY sendButton.label "Send">
+<!ENTITY quoteButton.label "Quote">
+<!ENTITY addressButton.label "Contacts">
+<!ENTITY attachButton.label "Attach">
+<!ENTITY spellingButton.label "Spelling">
+<!ENTITY saveButton.label "Save">
+<!ENTITY throbberItem.title "Activity Indicator">
+
+<!-- Mail Toolbar Tooltips -->
+<!ENTITY sendButton.tooltip "Send this message now"> 
+<!ENTITY sendlaterButton.tooltip "Send this message later"> 
+<!ENTITY quoteButton.tooltip "Quote the previous message"> 
+<!ENTITY addressButton.tooltip "Select a recipient from an Address Book"> 
+<!ENTITY attachButton.tooltip "Include an attachment"> 
+<!ENTITY saveButton.tooltip "Save this message"> 
+<!ENTITY cutButton.tooltip              "Cut">
+<!ENTITY copyButton.tooltip             "Copy">
+<!ENTITY pasteButton.tooltip            "Paste">
+
+<!-- Headers -->
+<!ENTITY fromAddr.label "From:">
+<!ENTITY fromAddr.accesskey "r">
+<!ENTITY toAddr.label "To:"> 
+<!ENTITY ccAddr.label "Cc:"> 
+<!ENTITY bccAddr.label "Bcc:"> 
+<!ENTITY replyAddr.label "Reply-To:"> 
+<!ENTITY newsgroupsAddr.label "Newsgroup:"> 
+<!ENTITY followupAddr.label "Followup-To:"> 
+<!ENTITY subject.label "Subject:">
+<!ENTITY subject.accesskey "S">
+<!ENTITY attachments.label "Attachments:">
+<!ENTITY attachments.accesskey "c">
+
+<!-- Format Toolbar, imported from editorAppShell.xul -->
+<!--LOCALIZATION NOTE formatToolbar. Don't change any of these Style Characters -->
+<!ENTITY formatToolbar.boldChar "B">
+<!ENTITY formatToolbar.italicChar "I">
+<!ENTITY formatToolbar.underlineChar "U">
+<!ENTITY SmileButton.tooltip "Insert a smiley face">
+<!ENTITY smiley1Cmd.label "Smiling">
+<!ENTITY smiley2Cmd.label "Frowning">
+<!ENTITY smiley3Cmd.label "Winking">
+<!ENTITY smiley4Cmd.label "Tongue-out">
+<!ENTITY smiley5Cmd.label "Laughing">
+<!ENTITY smiley6Cmd.label "Embarrassed">
+<!ENTITY smiley7Cmd.label "Undecided">
+<!ENTITY smiley8Cmd.label "Surprise">
+<!ENTITY smiley9Cmd.label "Kissing">
+<!ENTITY smiley10Cmd.label "Yelling">
+<!ENTITY smiley11Cmd.label "Cool">
+<!ENTITY smiley12Cmd.label "Money-Mouth">
+<!ENTITY smiley13Cmd.label "Foot-in-Mouth">
+<!ENTITY smiley14Cmd.label "Innocent">
+<!ENTITY smiley15Cmd.label "Crying">
+<!ENTITY smiley16Cmd.label "Lips-are-Sealed">
+
+<!-- Message Pane Context Menu -->
+<!ENTITY spellCheckNoSuggestions.label "No Suggestions Found">
+<!ENTITY spellCheckIgnoreWord.label "Ignore Word">
+<!ENTITY spellCheckIgnoreWord.accesskey "I">
+<!ENTITY spellCheckAddToDictionary.label "Add to Dictionary">
+<!ENTITY spellCheckAddToDictionary.accesskey "n">
+<!ENTITY undo.label "Undo">
+<!ENTITY undo.accesskey "U">
+<!ENTITY cut.label "Cut">
+<!ENTITY cut.accesskey "t">
+<!ENTITY copy.label "Copy">
+<!ENTITY copy.accesskey "C">
+<!ENTITY paste.label "Paste">
+<!ENTITY paste.accesskey "P">
+<!ENTITY pasteQuote.label "Paste As Quotation">
+<!ENTITY pasteQuote.accesskey "Q">
+
+<!ENTITY openAttachment.label "Open">
+<!ENTITY openAttachment.accesskey "O">
+<!ENTITY delete.label "Delete">
+<!ENTITY delete.accesskey "D">
+<!ENTITY renameAttachment.label "Rename…">
+<!ENTITY renameAttachment.accesskey "R">
+<!ENTITY selectAll.label "Select All">
+<!ENTITY selectAll.accesskey "A">
+<!ENTITY attachFile.label "Attach File(s)…">
+<!ENTITY attachFile.accesskey "F">
+<!ENTITY attachPage.label "Attach Web Page…">
+<!ENTITY attachPage.accesskey "W">
+
+<!-- Title for the address picker panel -->
+<!ENTITY addressesSidebarTitle.label "Contacts">
+
--- a/mail/chrome/messenger/messengercompose/sendProgress.dtd
+++ b/mail/chrome/messenger/messengercompose/sendProgress.dtd
@@ -1,17 +1,4 @@
-<!--LOCALIZATION NOTE sendprogress.dtd Main UI for Send Message Progress Dialog -->
-<!ENTITY sendWindow.title "Sending Messages"> 
-<!ENTITY titlePrefixSave "Saving Messages -"> 
-<!ENTITY titlePrefixSend "Sending Messages -"> 
-<!ENTITY status   "Status:"> 
-<!ENTITY progress "Progress:">
-
-<!-- LOCALIZATION NOTE (percentMsg):
-
-    This string is used to format the text to the right of the progress
-    meter.
-
-    #1 will be replaced by the percentage of the file that has been saved -->
-<!ENTITY percentMsg "#1&#037;">
-
-<!ENTITY messageSent "Your message has been sent">
-<!ENTITY messageSaved "Your message has been saved">
+<!--LOCALIZATION NOTE sendprogress.dtd Main UI for Send Message Progress Dialog -->
+<!ENTITY sendWindow.title "Sending Messages"> 
+<!ENTITY status.label "Status:">
+<!ENTITY progress.label "Progress:">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/messengercompose/sendProgress.properties
@@ -0,0 +1,10 @@
+titlePrefixSave=Saving Messages -
+titlePrefixSend=Sending Messages -
+
+# LOCALIZATION NOTE (percentMsg):
+# This string is used to format the text to the right of the progress meter.
+# %S% will be replaced by the percentage of the file that has been saved
+percentMsg=%S%%
+
+messageSent=Your message has been sent.
+messageSaved=Your message has been saved.
--- a/mail/chrome/messenger/migration/migration.dtd
+++ b/mail/chrome/messenger/migration/migration.dtd
@@ -1,31 +1,31 @@
-
-<!ENTITY migrationWizard.title          "Import Wizard">
-
-<!ENTITY importFrom.label               "Import Options, Account Settings, Addressbook and other data from:">
-<!ENTITY importFromUnix.label           "Import Preferences, Account Settings, Addressbook and other data from:">
-
-<!ENTITY importFromNothing.label        "Don't import anything">
-<!ENTITY importFromNothing.accesskey    "D">
-<!ENTITY importFromSeamonkey.label      "Netscape 6, 7 or Mozilla 1.x">
-<!ENTITY importFromSeamonkey.accesskey  "N">
-<!ENTITY importFromNetscape4.label      "Netscape 4.x">
-<!ENTITY importFromNetscape4.accesskey  "4">
-<!ENTITY importFromOExpress.label       "Outlook Express">
-<!ENTITY importFromOExpress.accesskey   "u">
-<!ENTITY importFromOutlook.label        "Outlook">
-<!ENTITY importFromOutlook.accesskey    "O">
-<!ENTITY importFromEudora.label         "Eudora">
-<!ENTITY importFromEudora.accesskey     "E">
-
-<!ENTITY importSource.title             "Import Settings and Mail Folders From">
-<!ENTITY importItems.title              "Items to Import">
-<!ENTITY importItems.label              "Select which items to import:">
-
-<!ENTITY migrating.title                "Importing...">
-<!ENTITY migrating.label                "The following items are currently being imported...">
-
-<!ENTITY selectProfile.title            "Select Profile">
-<!ENTITY selectProfile.label            "The following profiles are available to import from:">
-
-<!ENTITY done.title                     "Import Complete">
-<!ENTITY done.label                     "The following items were successfully imported:">
+
+<!ENTITY migrationWizard.title          "Import Wizard">
+
+<!ENTITY importFromWin.label            "Import Options, Account Settings, Address Book, Filters and other data from:">
+<!ENTITY importFromNonWin.label         "Import Preferences, Account Settings, Address Book, Filters and other data from:">
+
+<!ENTITY importFromNothing.label        "Don't import anything">
+<!ENTITY importFromNothing.accesskey    "D">
+<!ENTITY importFromSeamonkey.label      "Netscape 6, 7 or Mozilla 1.x">
+<!ENTITY importFromSeamonkey.accesskey  "N">
+<!ENTITY importFromNetscape4.label      "Netscape 4.x">
+<!ENTITY importFromNetscape4.accesskey  "4">
+<!ENTITY importFromOExpress.label       "Outlook Express">
+<!ENTITY importFromOExpress.accesskey   "u">
+<!ENTITY importFromOutlook.label        "Outlook">
+<!ENTITY importFromOutlook.accesskey    "O">
+<!ENTITY importFromEudora.label         "Eudora">
+<!ENTITY importFromEudora.accesskey     "E">
+
+<!ENTITY importSource.title             "Import Settings and Mail Folders">
+<!ENTITY importItems.title              "Items to Import">
+<!ENTITY importItems.label              "Select which items to import:">
+
+<!ENTITY migrating.title                "Importing…">
+<!ENTITY migrating.label                "The following items are currently being imported…">
+
+<!ENTITY selectProfile.title            "Select Profile">
+<!ENTITY selectProfile.label            "The following profiles are available to import from:">
+
+<!ENTITY done.title                     "Import Complete">
+<!ENTITY done.label                     "The following items were successfully imported:">
--- a/mail/chrome/messenger/mime.properties
+++ b/mail/chrome/messenger/mime.properties
@@ -1,307 +1,307 @@
-# ***** 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 libmime to emit header display in HTML
-#
-
-# Out of memory
-## @name MIME_OUT_OF_MEMORY
-## @loc None
--1000=Application is out of memory.
-
-# Can't open a temp file
-## @name MIME_UNABLE_TO_OPEN_TMP_FILE
-## @loc None
-# LOCALIZATION NOTE (-1001): Do not translate "\n%.200s.\n\n" below. It will display the name of the temporary directory
--1001=Unable to open the temporary file\n%.200s.\n\n\Check your `Temporary Directory' setting and try again.
-
-# Can't write temp file
-## @name MIME_ERROR_WRITING_FILE
-## @loc None
--1002=Error writing temporary file.
-
-# Mail subject
-## @name MIME_MHTML_SUBJECT
-## @loc None
-1000=Subject
-
-# Resent-Comments
-## @name MIME_MHTML_RESENT_COMMENTS
-## @loc 
-1001=Resent-Comments
-
-# Resent-Date
-## @name MIME_MHTML_RESENT_DATE
-## @loc 
-1002=Resent-Date
-
-# Resent-Sender
-## @name MIME_MHTML_RESENT_SENDER
-## @loc 
-1003=Resent-Sender
-
-# Resent-From
-## @name MIME_MHTML_RESENT_FROM
-## @loc 
-1004=Resent-From
-
-# Resent-To
-## @name MIME_MHTML_RESENT_TO
-## @loc 
-1005=Resent-To
-
-# Resent-CC
-## @name MIME_MHTML_RESENT_CC
-## @loc 
-# LOCALIZATION NOTE (1006): Do not translate "CC" below.
-1006=Resent-CC
-
-# Date
-## @name MIME_MHTML_DATE
-## @loc 
-1007=Date
-
-# Sender
-## @name MIME_MHTML_SENDER
-## @loc 
-1008=Sender
-
-# From
-## @name MIME_MHTML_FROM
-## @loc 
-1009=From
-
-# Reply-To
-## @name MIME_MHTML_REPLY_TO
-## @loc 
-1010=Reply-To
-
-# Organization
-## @name MIME_MHTML_ORGANIZATION
-## @loc 
-1011=Organisation
-
-# To
-## @name MIME_MHTML_TO
-## @loc 
-1012=To
-
-# CC
-## @name MIME_MHTML_CC
-## @loc 
-# LOCALIZATION NOTE (1013): Do not translate "CC" below.
-1013=CC
-
-# Newsgroups
-## @name MIME_MHTML_NEWSGROUPS
-## @loc 
-1014=Newsgroups
-
-# Followup-To
-## @name MIME_MHTML_FOLLOWUP_TO
-## @loc 
-1015=Followup-To
-
-# References
-## @name MIME_MHTML_REFERENCES
-## @loc 
-1016=References
-
-# Name
-## @name MIME_MHTML_NAME
-## @loc 
-1017=Name
-
-# Type
-## @name MIME_MHTML_TYPE
-## @loc 
-1018=Type
-
-# Encoding
-## @name MIME_MHTML_ENCODING
-## @loc 
-1019=Encoding
-
-# Description
-## @name MIME_MHTML_DESCRIPTION
-## @loc 
-1020=Description
-
-# Message ID
-## @name MIME_MHTML_MESSAGE_ID
-## @loc 
-1021=Message-ID
-
-# Resent Message ID
-## @name MIME_MHTML_RESENT_MESSAGE_ID
-## @loc 
-1022=Resent-Message-ID
-
-# BCC
-## @name MIME_MHTML_BCC
-## @loc 
-1023=BCC
-
-# Download Status
-## @name MIME_MHTML_DOWNLOAD_STATUS_HEADER
-## @loc 
-1024=Download Status
-
-# Download status not downloaded
-## @name MIME_MHTML_DOWNLOAD_STATUS_NOT_DOWNLOADED
-## @loc 
-1025=Not Downloaded Inline
-
-# Link to doc
-## @name MIME_MSG_LINK_TO_DOCUMENT
-## @loc 
-1026=Link to Document
-
-# Get Doc info
-## @name MIME_MSG_DOCUMENT_INFO
-## @loc 
-1027=<B>Document Info:</B>
-
-# Msg Attachment
-## @name MIME_MSG_ATTACHMENT
-## @loc 
-1028=Attachment
-
-# Forwarded Msg Attachment
-## @name MIME_FORWARDED_MESSAGE_ATTACHMENT
-## @loc 
-# LOCALIZATION NOTE (1029): DONT_TRANSLATE.
-1029=forward.msg
-
-# Mouseover text
-## @name MIME_MSG_ADDBOOK_MOUSEOVER_TEXT
-## @loc 
-# LOCALIZATION NOTE (1030): Do not translate "%s" below. Place "%s" where you wish to appear a name to be
-# added to the address book.
-1030=Add %s to your Address Book
-
-# XSender Internal
-## @name MIME_MSG_XSENDER_INTERNAL
-## @loc
-# LOCALIZATION NOTE (1031): Only translate the word "Internal in the line below".
-1031=<B><FONT COLOR="#808080">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Internal</FONT></B>
-
-# User wrote
-## @name MIME_MSG_X_USER_WROTE
-## @loc 
-# LOCALIZATION NOTE (1032): Do not translate "%s" below.
-# Place the first %s where you wish the name of the message to appear
-# Place the second %s where you wish the name of the user to appear
-# Do not translate "<P>"
-1032=In message %s %s wrote:<P>
-
-# Msg user wrote
-## @name MIME_MSG_USER_WROTE
-## @loc 
-# LOCALIZATION NOTE (1033): Do not translate "%s" below.
-# Place the %s where you wish the name of the user to appear
-# Do not translate "<P>"
-1033=%s wrote:<P>
-
-# No Headers
-## @name MIME_MSG_NO_HEADERS
-## @loc 
-1034=(no headers)
-
-# No Headers
-## @name MIME_MSG_SHOW_ATTACHMENT_PANE
-## @loc 
-1035=Toggle Attachment Pane
-
-# Part not downloaded
-## @name MIME_MSG_NOT_DOWNLOADED
-## @loc 
-1036=(Not Downloaded)
-
-# Partial Message Format 1
-## @name MIME_MSG_PARTIAL_FMT_1
-## @loc
-# LOCALIZATION NOTE (1037): In the following line, translate only the word, "Truncated!".
-1037=<P><CENTER><TABLE BORDER CELLSPACING=5 CELLPADDING=10 WIDTH="80%%"><TR><TD ALIGN=CENTER><FONT SIZE="+1"><B>Truncated!</B></FONT><HR>
-
-# Partial Message Format 2
-## @name MIME_MSG_PARTIAL_FMT_2
-## @loc
-# LOCALIZATION NOTE (1038): Translate the following two lines as a single sentence. In the middle of the two sections
-# there will be a URL. You may translate the text in any order you wish, but the html tags must stay in the same locations.
-# In particular, the "<B>" tag must begin the first section, which must end with the "<A HREF=" tag. Do not translate the html tag,"<P>"
-1038=<B>This message exceeded the Maximum Message Size set in Account Settings, so we have only downloaded the first few lines from the mail server.<P><A HREF="
-
-# Partial Message Format 3
-## @name MIME_MSG_PARTIAL_FMT_3
-## @loc
-# LOCALIZATION NOTE (1039): This section must begin with the ">" sign and end with the tags,"</B></TD></TR></TABLE></CENTER>"
-# Do not translate "</A>" tag.
-1039=">Download the rest of the message</A>.</B></TD></TR></TABLE></CENTER>
-
-# default attachment name
-## @name MIME_MSG_DEFAULT_ATTACHMENT_NAME
-## @loc 
-# LOCALIZATION NOTE (1040): Do not translate "%s" below.
-# Place the %s where you wish the part number of the attachment to appear
-1040=Part %s
-
-# default forwarded message prefix
-## @name MIME_FORWARDED_MESSAGE_USER_WROTE
-## @loc 
-1041=-------- Original Message --------
-
-# Partial Message Format2 1
-## @name MIME_MSG_PARTIAL_FMT2_1
-## @loc
-# LOCALIZATION NOTE (1037): In the following line, translate only the words, "Not Downloaded".
-1042=<P><CENTER><TABLE BORDER CELLSPACING=5 CELLPADDING=10 WIDTH="80%%"><TR><TD ALIGN=CENTER><FONT SIZE="+1"><B>Not Downloaded</B></FONT><HR>
-
-# Partial Message Format2 2
-## @name MIME_MSG_PARTIAL_FMT2_2
-## @loc
-# LOCALIZATION NOTE (1038): Translate the following two lines as a single sentence. In the middle of the two sections
-# there will be a URL. You may translate the text in any order you wish, but the html tags must stay in the same locations.
-# In particular, the "<B>" tag must begin the first section, which must end with the "<A HREF=" tag. Do not translate the html tag,"<P>"
-1043=<B>Only the headers for this message were downloaded from the mail server.<P><A HREF="
-
-# Partial Message Format2 3
-## @name MIME_MSG_PARTIAL_FMT_3
-## @loc
-# LOCALIZATION NOTE (1039): This section must begin with the ">" sign and end with the tags,"</B></TD></TR></TABLE></CENTER>"
-# Do not translate "</A>" tag.
-1044=">Download the rest of the message</A>.</B></TD></TR></TABLE></CENTER>
+# ***** 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 libmime to emit header display in HTML
+#
+
+# Out of memory
+## @name MIME_OUT_OF_MEMORY
+## @loc None
+-1000=Application is out of memory.
+
+# Can't open a temp file
+## @name MIME_UNABLE_TO_OPEN_TMP_FILE
+## @loc None
+# LOCALIZATION NOTE (-1001): Do not translate "\n%.200s.\n\n" below. It will display the name of the temporary directory
+-1001=Unable to open the temporary file\n%.200s.\n\n\Check your `Temporary Directory' setting and try again.
+
+# Can't write temp file
+## @name MIME_ERROR_WRITING_FILE
+## @loc None
+-1002=Error writing temporary file.
+
+# Mail subject
+## @name MIME_MHTML_SUBJECT
+## @loc None
+1000=Subject
+
+# Resent-Comments
+## @name MIME_MHTML_RESENT_COMMENTS
+## @loc 
+1001=Resent-Comments
+
+# Resent-Date
+## @name MIME_MHTML_RESENT_DATE
+## @loc 
+1002=Resent-Date
+
+# Resent-Sender
+## @name MIME_MHTML_RESENT_SENDER
+## @loc 
+1003=Resent-Sender
+
+# Resent-From
+## @name MIME_MHTML_RESENT_FROM
+## @loc 
+1004=Resent-From
+
+# Resent-To
+## @name MIME_MHTML_RESENT_TO
+## @loc 
+1005=Resent-To
+
+# Resent-CC
+## @name MIME_MHTML_RESENT_CC
+## @loc 
+# LOCALIZATION NOTE (1006): Do not translate "CC" below.
+1006=Resent-CC
+
+# Date
+## @name MIME_MHTML_DATE
+## @loc 
+1007=Date
+
+# Sender
+## @name MIME_MHTML_SENDER
+## @loc 
+1008=Sender
+
+# From
+## @name MIME_MHTML_FROM
+## @loc 
+1009=From
+
+# Reply-To
+## @name MIME_MHTML_REPLY_TO
+## @loc 
+1010=Reply-To
+
+# Organization
+## @name MIME_MHTML_ORGANIZATION
+## @loc 
+1011=Organisation
+
+# To
+## @name MIME_MHTML_TO
+## @loc 
+1012=To
+
+# CC
+## @name MIME_MHTML_CC
+## @loc 
+# LOCALIZATION NOTE (1013): Do not translate "CC" below.
+1013=CC
+
+# Newsgroups
+## @name MIME_MHTML_NEWSGROUPS
+## @loc 
+1014=Newsgroups
+
+# Followup-To
+## @name MIME_MHTML_FOLLOWUP_TO
+## @loc 
+1015=Followup-To
+
+# References
+## @name MIME_MHTML_REFERENCES
+## @loc 
+1016=References
+
+# Name
+## @name MIME_MHTML_NAME
+## @loc 
+1017=Name
+
+# Type
+## @name MIME_MHTML_TYPE
+## @loc 
+1018=Type
+
+# Encoding
+## @name MIME_MHTML_ENCODING
+## @loc 
+1019=Encoding
+
+# Description
+## @name MIME_MHTML_DESCRIPTION
+## @loc 
+1020=Description
+
+# Message ID
+## @name MIME_MHTML_MESSAGE_ID
+## @loc 
+1021=Message-ID
+
+# Resent Message ID
+## @name MIME_MHTML_RESENT_MESSAGE_ID
+## @loc 
+1022=Resent-Message-ID
+
+# BCC
+## @name MIME_MHTML_BCC
+## @loc 
+1023=BCC
+
+# Download Status
+## @name MIME_MHTML_DOWNLOAD_STATUS_HEADER
+## @loc 
+1024=Download Status
+
+# Download status not downloaded
+## @name MIME_MHTML_DOWNLOAD_STATUS_NOT_DOWNLOADED
+## @loc 
+1025=Not Downloaded Inline
+
+# Link to doc
+## @name MIME_MSG_LINK_TO_DOCUMENT
+## @loc 
+1026=Link to Document
+
+# Get Doc info
+## @name MIME_MSG_DOCUMENT_INFO
+## @loc 
+1027=<B>Document Info:</B>
+
+# Msg Attachment
+## @name MIME_MSG_ATTACHMENT
+## @loc 
+1028=Attachment
+
+# Forwarded Msg Attachment
+## @name MIME_FORWARDED_MESSAGE_ATTACHMENT
+## @loc 
+# LOCALIZATION NOTE (1029): DONT_TRANSLATE.
+1029=forward.msg
+
+# Mouseover text
+## @name MIME_MSG_ADDBOOK_MOUSEOVER_TEXT
+## @loc 
+# LOCALIZATION NOTE (1030): Do not translate "%s" below. Place "%s" where you wish to appear a name to be
+# added to the address book.
+1030=Add %s to your Address Book
+
+# XSender Internal
+## @name MIME_MSG_XSENDER_INTERNAL
+## @loc
+# LOCALIZATION NOTE (1031): Only translate the word "Internal" in the line below.
+1031=<B><FONT COLOR=\042#808080\042>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Internal</FONT></B>
+
+# User wrote
+## @name MIME_MSG_X_USER_WROTE
+## @loc 
+# LOCALIZATION NOTE (1032): Do not translate "%s" below.
+# Place the first %s where you wish the name of the message to appear
+# Place the second %s where you wish the name of the user to appear
+# Do not translate "<P>"
+1032=In message %s %s wrote:<P>
+
+# Msg user wrote
+## @name MIME_MSG_USER_WROTE
+## @loc 
+# LOCALIZATION NOTE (1033): Do not translate "%s" below.
+# Place the %s where you wish the name of the user to appear
+# Do not translate "<P>"
+1033=%s wrote:<P>
+
+# No Headers
+## @name MIME_MSG_NO_HEADERS
+## @loc 
+1034=(no headers)
+
+# No Headers
+## @name MIME_MSG_SHOW_ATTACHMENT_PANE
+## @loc 
+1035=Toggle Attachment Pane
+
+# Part not downloaded
+## @name MIME_MSG_NOT_DOWNLOADED
+## @loc 
+1036=(Not Downloaded)
+
+# Partial Message Format 1
+## @name MIME_MSG_PARTIAL_FMT_1
+## @loc
+# LOCALIZATION NOTE (1037): In the following line, translate only the word, "Truncated!".
+1037=<P><CENTER><TABLE BORDER CELLSPACING=5 CELLPADDING=10 WIDTH="80%%"><TR><TD ALIGN=CENTER><FONT SIZE="+1"><B>Truncated!</B></FONT><HR>
+
+# Partial Message Format 2
+## @name MIME_MSG_PARTIAL_FMT_2
+## @loc
+# LOCALIZATION NOTE (1038): Translate the following two lines as a single sentence. In the middle of the two sections
+# there will be a URL. You may translate the text in any order you wish, but the html tags must stay in the same locations.
+# In particular, the "<B>" tag must begin the first section, which must end with the "<A HREF=" tag. Do not translate the html tag,"<P>"
+1038=<B>This message exceeded the Maximum Message Size set in Account Settings, so we have only downloaded the first few lines from the mail server.<P><A HREF="
+
+# Partial Message Format 3
+## @name MIME_MSG_PARTIAL_FMT_3
+## @loc
+# LOCALIZATION NOTE (1039): This section must begin with the ">" sign and end with the tags,"</B></TD></TR></TABLE></CENTER>"
+# Do not translate "</A>" tag.
+1039=">Download the rest of the message</A>.</B></TD></TR></TABLE></CENTER>
+
+# default attachment name
+## @name MIME_MSG_DEFAULT_ATTACHMENT_NAME
+## @loc 
+# LOCALIZATION NOTE (1040): Do not translate "%s" below.
+# Place the %s where you wish the part number of the attachment to appear
+1040=Part %s
+
+# default forwarded message prefix
+## @name MIME_FORWARDED_MESSAGE_USER_WROTE
+## @loc 
+1041=-------- Original Message --------
+
+# Partial Message Format2 1
+## @name MIME_MSG_PARTIAL_FMT2_1
+## @loc
+# LOCALIZATION NOTE (1037): In the following line, translate only the words,