mail and editor/ui updates for Tb for en-GB THUNDERBIRD_3_0b1_BUILD1 THUNDERBIRD_3_0b1_RELEASE
authorMark Tyndall <moz_en-gb@tyndall.org.uk>
Sun, 30 Nov 2008 15:45:21 +0000
changeset 23 4601bfa19e4f84f5dfe6ea6bcb441b57d504826e
parent 20 0cbf0cd875345037e8316b6719344d7e65e8831c
child 26 0e3a44e354952e741e0a6f79ed8d8ae6bb1badfa
push id1
push userroot
push dateWed, 13 Apr 2011 19:42:42 +0000
mail and editor/ui updates for Tb for en-GB
editor/ui/chrome/composer/editor.dtd
editor/ui/chrome/composer/editor.properties
editor/ui/chrome/composer/editorNavigatorOverlay.dtd
editor/ui/chrome/composer/editorOverlay.dtd
editor/ui/chrome/composer/pref-composer.dtd
editor/ui/chrome/dialogs/EdLinkChecker.dtd
editor/ui/chrome/dialogs/EditorImageMap.dtd
editor/ui/chrome/dialogs/EditorImageProperties.dtd
editor/ui/chrome/dialogs/EditorInsertTOC.dtd
editor/ui/chrome/dialogs/EditorListProperties.dtd
editor/ui/chrome/dialogs/EditorPublish.dtd
editor/ui/chrome/dialogs/EditorPublishProgress.dtd
editor/ui/chrome/dialogs/EditorReplace.dtd
editor/ui/chrome/dialogs/EditorTableProperties.dtd
mail/chrome/communicator/contentAreaCommands.properties
mail/chrome/communicator/utilityOverlay.dtd
mail/chrome/messenger-newsblog/am-newsblog.dtd
mail/chrome/messenger-newsblog/newsblog.dtd
mail/chrome/messenger-region/region.properties
mail/chrome/messenger-smime/msgCompSMIMEOverlay.dtd
mail/chrome/messenger/AccountManager.dtd
mail/chrome/messenger/AccountWizard.dtd
mail/chrome/messenger/FilterEditor.dtd
mail/chrome/messenger/SearchDialog.dtd
mail/chrome/messenger/addressbook/abCardOverlay.dtd
mail/chrome/messenger/addressbook/abMailListDialog.dtd
mail/chrome/messenger/addressbook/abMainWindow.dtd
mail/chrome/messenger/addressbook/addressBook.properties
mail/chrome/messenger/addressbook/pref-directory-add.dtd
mail/chrome/messenger/addressbook/pref-directory.dtd
mail/chrome/messenger/am-copies.dtd
mail/chrome/messenger/am-identities-list.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-smime.dtd
mail/chrome/messenger/am-smime.properties
mail/chrome/messenger/credits.dtd
mail/chrome/messenger/custom.properties
mail/chrome/messenger/fieldMapExport.dtd
mail/chrome/messenger/filter.properties
mail/chrome/messenger/folderProps.dtd
mail/chrome/messenger/folderpane.dtd
mail/chrome/messenger/importMsgs.properties
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/messengercompose/messengercompose.dtd
mail/chrome/messenger/migration/migration.properties
mail/chrome/messenger/msgFolderPickerOverlay.dtd
mail/chrome/messenger/msgHdrViewOverlay.dtd
mail/chrome/messenger/msgmdn.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/display.dtd
mail/chrome/messenger/preferences/downloads.dtd
mail/chrome/messenger/preferences/fonts.dtd
mail/chrome/messenger/preferences/general.dtd
mail/chrome/messenger/preferences/preferences.dtd
mail/chrome/messenger/preferences/preferences.properties
mail/chrome/messenger/preferences/privacy.dtd
mail/chrome/messenger/preferences/receipts.dtd
mail/chrome/messenger/preferences/sendoptions.dtd
mail/chrome/messenger/prefs.properties
mail/chrome/messenger/search.properties
mail/chrome/messenger/shellservice.properties
mail/chrome/messenger/start.dtd
mail/chrome/messenger/tabmail.dtd
mail/chrome/messenger/virtualFolderName.dtd
mail/installer/custom.properties
--- a/editor/ui/chrome/composer/editor.dtd
+++ b/editor/ui/chrome/composer/editor.dtd
@@ -50,16 +50,8 @@
 <!ENTITY formattingToolbarCmd.label "Format Toolbar">
 <!ENTITY formattingToolbarCmd.accesskey "F">
 <!ENTITY editmodeToolbarCmd.label "Edit Mode Toolbar">
 <!ENTITY editmodeToolbarCmd.accesskey "E">
 
 <!-- Format menu items -->
 <!ENTITY formatMenu.label "Format">
 <!ENTITY formatMenu.accesskey "o">
-
-<!ENTITY helpMenu.label "Help">
-<!ENTITY aboutCmd.label ".About">
-
-<!-- Display Mode Toolbar -->
-<!ENTITY editMode.label "Edit Mode:">
-
-<!ENTITY statusText.label "Done loading page">
--- a/editor/ui/chrome/composer/editor.properties
+++ b/editor/ui/chrome/composer/editor.properties
@@ -1,25 +1,17 @@
-#
-# moved from content/
-#
 # LOCALIZATION NOTE FILE: embedded "\n" represent HTML breaks (<br>)
 # Don't translate embedded "\n".
 # Don't translate strings like this: %variable%
 #  as they will be replaced using JavaScript
 #
-Yes=Yes
 No=No
 Save=Save
-DontSave=Don't Save
 More=More
-Fewer=Fewer
 Less=Less
-MoreAttributes=More Attributes
-FewerAttributes=Fewer Attributes
 MoreProperties=More Properties
 FewerProperties=Fewer Properties
 PropertiesAccessKey=P
 None=None
 none=none
 OpenHTMLFile=Open HTML File
 SelectImageFile=Select Image File
 SaveDocument=Save Page
@@ -31,26 +23,21 @@ Publish=Publish
 PublishPage=Publish Page
 DontPublish=Don't Publish
 SavePassword=Use Password Manager to save this password
 CorrectSpelling=(correct spelling)
 NoSuggestedWords=(no suggested words)
 NoMisspelledWord=No misspelled words
 CheckSpellingDone=Completed spell checking.
 CheckSpelling=Check Spelling
-LoadingDone=Done loading page
 InputError=Error
 Alert=Alert
 CantEditFramesetMsg=Composer cannot edit HTML framesets, or pages with inline frames. For framesets, try editing the page for each frame separately. For pages with iframes, save a copy of the page and remove the <iframe> tag.
 CantEditMimeTypeMsg=This type of page can't be edited.
 CantEditDocumentMsg=This page can't be edited for an unknown reason.
-HTMLFiles=HTML Files
-IMGFiles=Image Files
-TextFiles=Text Files
-AllFiles=All Files
 BeforeClosing=before closing
 BeforePreview=before viewing in the browser
 BeforeValidate=before validating the document
 # LOCALIZATION NOTE (SaveFilePrompt, PublishPrompt): Don't translate %title% and %reason% (this is the reason for asking user to close, such as "before closing")
 SaveFilePrompt=Save changes to "%title%" %reason%? 
 PublishPrompt=Save changes to "%title%" %reason%? 
 SaveFileFailed=Saving file failed!
 
@@ -85,17 +72,16 @@ AbandonChanges=Abandon unsaved changes t
 DocumentTitle=Page Title
 NeedDocTitle=Please enter a title for the current page.
 DocTitleHelp=This identifies the page in the window title and bookmarks.
 CancelPublishTitle=Cancel publishing?
 ## LOCALIZATION NOTE: "Continue" in this sentence must match the text for
 ## the CancelPublishContinue key below
 CancelPublishMessage=Cancelling while publishing is in progress may result in your file(s) being incompletely transferred. Would you like to Continue or Cancel?
 CancelPublishContinue=Continue
-AttributesFor=Current attributes for: 
 MissingImageError=Please enter or choose an image of type gif, jpg, or png.
 EmptyHREFError=Please choose a location to create a new link.
 LinkText=Link Text
 LinkImage=Link Image
 MixedSelection=[Mixed selection]
 Mixed=(mixed)
 EnterLinkText=Enter text to display for the link:
 EnterLinkTextAccessKey=T
@@ -158,41 +144,36 @@ TextArea=Text Area
 Select=Selection List
 Button=Button
 Label=Label
 FieldSet=Field Set
 Tag=Tag
 MissingSiteNameError=Please enter a name for this publishing site.
 MissingPublishUrlError=Please enter a location for publishing this page.
 MissingPublishFilename=Please enter a filename for the current page.
-MissingPublishSiteError=No publishing site information given. Switching to Settings panel so you can supply publishing information.
 #LOCALIZATION NOTE (DuplicateSiteNameError): Don't translate %name%
 DuplicateSiteNameError="%name%" already exists. Please enter a different site name.
 AdvancedProperties=Advanced Properties…
 AdvancedEditForCellMsg=Advanced Edit is unavailable when multiple cells are selected
 # LOCALIZATION NOTE (ObjectProperties):Don't translate "%obj%" it will be replaced with one of above object nouns
 ObjectProperties=%obj% Properties…
 # LOCALIZATION NOTE This character must be in the above string and not confict with other accesskeys in Format menu
 ObjectPropertiesAccessKey=o
 # LOCALIZATION NOTE (JoinSelectedCells): This variable should contain the "tableJoinCells.accesskey" 
 # letter as defined in editorOverlay.dtd
 JoinSelectedCells=Join Selected Cells
 # LOCALIZATION NOTE (JoinCellToRight): This variable should contain the "tableJoinCells.accesskey" 
 # letter as defined in editorOverlay.dtd
 JoinCellToRight=Join with Cell to the Right
 JoinCellAccesskey=j
-# LOCALIZATION NOTE (TableSelectKey): DONT_TRANSLATE
+# LOCALIZATION NOTE (TableSelectKey): Ctrl key on a keyboard
 TableSelectKey=Ctrl+
-# LOCALIZATION NOTE (XulKeyDefault): DONT_TRANSLATE
-XulKeyDefault=Ctrl+
-# LOCALIZATION NOTE (XulKeyMac): DONT_TRANSLATE
+# LOCALIZATION NOTE (XulKeyMac): Command key on a Mac keyboard
 XulKeyMac=Cmd+
-# LOCALIZATION NOTE (XulKeyUnix): DONT_TRANSLATE
-XulKeyUnix=Alt+
-# LOCALIZATION NOTE (Del): DONT_TRANSLATE
+# LOCALIZATION NOTE (Del): Del key on a keyboard
 Del=Del
 Delete=Delete
 DeleteCells=Delete Cells
 DeleteTableTitle=Delete Rows or Columns
 DeleteTableMsg=Reducing the number of rows or columns will delete table cells and their contents. Do you really want to do this?
 Clear=Clear
 #Mouse actions
 Click=Click
@@ -208,19 +189,12 @@ StopTextStyles=Discontinue Text Styles
 # LOCALIZATION NOTE "RemoveLinksAccesskey" is used for both
 #  menu items: "RemoveLinks" and "StopLinks"
 RemoveLinksAccesskey=n
 RemoveLinks=Remove Links
 StopLinks=Discontinue Link
 #
 NoFormAction=It is recommended that you enter an action for this form. Self-posting forms are an advanced technique that may not work consistently in all browsers.
 NoAltText=If the image is relevant to the content of the document, you must supply alternate text that will appear in text-only browsers, and that will appear in other browsers when an image is loading or when image loading is disabled.
-SaveImageAs=Save Image (%NAME%)…
-NoSeparatorCharacter=Please enter a single character to use for separating into columns
-#
-# LOCALIZATION NOTE please do not translate %brand%, it will be used programmatically
-#  download spelling dictionaries confirmation dialog
-DictDownldConfirmTit=Download Dictionaries
-DictDownldConfirmMsg=%brand% will close the current window and redirect you to a spellchecker download site.
 #
 NoHeadTag=The HTML source could not be converted back into the document because the required <head> tag is missing. Please add it.
 NoBodyTag=The HTML source could not be converted back into the document because the required <body> tag is missing. Please add it.
 NoLinksToCheck=There are no elements with links to check
deleted file mode 100644
--- a/editor/ui/chrome/composer/editorNavigatorOverlay.dtd
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<!ENTITY editPageCmd.label                "Edit Page in Composer"> 
-<!ENTITY editPageCmd.accesskey            "e">
-
-<!ENTITY editLinkCmd.label                "Edit Link in Composer">
-<!ENTITY editLinkCmd.accesskey            "E">
-
--- a/editor/ui/chrome/composer/editorOverlay.dtd
+++ b/editor/ui/chrome/composer/editorOverlay.dtd
@@ -74,19 +74,16 @@
 <!ENTITY saveAsChangeEncodingCmd.label "Save And Change Character Encoding">
 <!ENTITY saveAsChangeEncodingCmd.accesskey "E">
 <!ENTITY previewCmd.label "Browse Page">
 <!ENTITY previewCmd.accesskey "w">
 <!ENTITY sendPageCmd.label "Send Page…">
 <!ENTITY sendPageCmd.accesskey "d">
 <!ENTITY printSetupCmd.label "Page Setup…">
 <!ENTITY printSetupCmd.accesskey "u">
-<!ENTITY printPreviewCmd.label "Print Preview">
-<!ENTITY printPreviewCmd.accesskey "v">
-<!ENTITY printButtonCmd.label "Print…">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.accesskey "P">
 <!ENTITY printCmd.key "P">
 <!ENTITY closeCmd.label "Close">
 <!ENTITY closeCmd.accesskey "C">
 <!ENTITY closeCmd.key "W">
 
 <!-- Edit menu items -->
@@ -94,39 +91,18 @@
 <!ENTITY editMenu.accesskey "E">
 <!ENTITY pasteNoFormatting.label "Paste Without Formatting">
 <!ENTITY pasteNoFormatting.accesskey "o">
 <!ENTITY pasteNoFormatting.key "V">
 <!ENTITY pasteAs.label "Paste As">
 <!ENTITY pasteAs.accesskey "a">
 <!ENTITY publishSettings.label "Publishing Site Settings…">
 <!ENTITY publishSettings.accesskey "b">
-
-<!-- For a "Paste" submenu when more than 1 
-     clipboard formats are available -->
-<!ENTITY pasteHTMLCmd.label "HTML">
-<!ENTITY pasteHTMLCmd.accesskey "H">
-<!ENTITY pasteTextCmd.label "Text">
-<!ENTITY pasteTextCmd.accesskey "T">
-<!ENTITY pasteImageCmd.label "Image">
-<!ENTITY pasteImageCmd.accesskey "I">
-<!ENTITY pasteRowsCmd.label "Rows">
-<!ENTITY pasteRowsCmd.accesskey "R">
-<!ENTITY pasteColumnsCmd.label "Columns">
-<!ENTITY pasteColumnsCmd.accesskey "C">
-<!-- LOCALIZATION NOTE: Text for menu item is in editor.properties
-     Set to: "Table" or "Nested Table" depending on context 
-     This accesskey must be in both strings -->
-<!ENTITY pasteTableCmd.accesskey "a">
-<!ENTITY pasteLinkCmd.label "Link">
-<!ENTITY pasteLinkCmd.accesskey "L">
 <!ENTITY pasteAsQuotationCmd.label "Paste As Quotation">
 <!ENTITY pasteAsQuotationCmd.accesskey "Q">
-<!ENTITY editStripQuotesCmd.label "Strip Quotes">
-<!ENTITY editRewrapCmd.label "Rewrap">
 <!ENTITY findCmd.label "Find and Replace…">
 <!ENTITY findCmd.accesskey "F">
 <!ENTITY findCmd.key "F">
 <!ENTITY findCmd.key2 "VK_F19">
 <!ENTITY findAgainCmd.label "Find Again">
 <!ENTITY findAgainCmd.accesskey "g">
 <!ENTITY findAgainCmd.key "G">
 <!ENTITY findAgainCmd.key2 "VK_F3">
@@ -136,70 +112,38 @@
 <!ENTITY findPrevCmd.key2 "VK_F3">
 <!ENTITY enableInlineSpellChecker.label "Spellcheck As You Type">
 <!ENTITY enableInlineSpellChecker.accesskey "S">
 <!ENTITY checkSpellingCmd.label "Check Spelling">
 <!ENTITY checkSpellingCmd.accesskey "h">
 <!ENTITY checkSpellingCmd.key "K">
 <!ENTITY validateCmd.label "Validate HTML">
 <!ENTITY validateCmd.accesskey "V">
-<!ENTITY checkLinksCmd.label "Check Links">
-
-<!-- View menu items -->
-<!ENTITY viewPageSource.label "Page Source">
-<!ENTITY viewPageSource.accesskey "S">
-<!ENTITY viewParagraphMarks.label "Paragraph Marks">
-<!ENTITY viewParagraphMarks.accesskey "P">
 
 <!-- Insert menu items -->
 <!ENTITY insertMenu.label "Insert">
 <!ENTITY insertMenu.accesskey "I">
 <!ENTITY insertLinkCmd.label "Link…">
 <!ENTITY insertLinkCmd.accesskey "L">
 <!ENTITY insertLinkCmd.key "L">
 <!ENTITY insertAnchorCmd.label "Named Anchor…">
 <!ENTITY insertAnchorCmd.accesskey "A">
 <!ENTITY insertImageCmd.label "Image…">
 <!ENTITY insertImageCmd.accesskey "I">
-<!ENTITY insertImageMapCmd.label "Image Map…">
 <!ENTITY insertHLineCmd.label "Horizontal Line">
 <!ENTITY insertHLineCmd.accesskey "o">
 <!ENTITY insertTableCmd.label "Table…">
 <!ENTITY insertTableCmd.accesskey "T">
-<!ENTITY insertFormMenu.label "Form">
-<!ENTITY insertFormMenu.accesskey "F">
 <!ENTITY insertHTMLCmd.label "HTML…">
 <!ENTITY insertHTMLCmd.accesskey "H">
 <!ENTITY insertCharsCmd.label "Characters and Symbols…">
 <!ENTITY insertCharsCmd.accesskey "C">
-<!ENTITY insertBreakCmd.label "Line Break">
-<!ENTITY insertBreakCmd.accesskey "B">
 <!ENTITY insertBreakAllCmd.label "Break Below Image(s)">
 <!ENTITY insertBreakAllCmd.accesskey "k">
 
-<!-- Insert form menu items -->
-<!ENTITY insertFormCmd.label "Define Form…">
-<!ENTITY insertFormCmd.accesskey "D">
-<!ENTITY insertInputTagCmd.label "Form Field…">
-<!ENTITY insertInputTagCmd.accesskey "e">
-<!ENTITY insertInputImageCmd.label "Form Image…">
-<!ENTITY insertInputImageCmd.accesskey "I">
-<!ENTITY insertTextAreaCmd.label "Text Area…">
-<!ENTITY insertTextAreaCmd.accesskey "T">
-<!ENTITY insertSelectCmd.label "Selection List…">
-<!ENTITY insertSelectCmd.accesskey "S">
-<!ENTITY insertButtonCmd.label "Define Button…">
-<!ENTITY insertButtonCmd.accesskey "B">
-<!ENTITY insertLabelCmd.label "Define Label">
-<!ENTITY insertLabelCmd.accesskey "L">
-<!ENTITY insertFieldSetCmd.label "Define Field Set…">
-<!ENTITY insertFieldSetCmd.accesskey "F">
-<!ENTITY insertIsIndexCmd.label "Index Search">
-<!ENTITY insertIsIndexCmd.accesskey "x">
-
 <!-- Used just in context popup. -->
 <!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 createLinkCmd.label "Create Link…">
 <!ENTITY createLinkCmd.accesskey "k">
@@ -233,18 +177,16 @@
 <!ENTITY fontFixedWidth.accesskey "x">
 <!ENTITY fontFixedWidth.key "T">
 <!ENTITY fontHelvetica.label "Helvetica, Arial">
 <!ENTITY fontHelvetica.accesskey "l">
 <!ENTITY fontTimes.label "Times">
 <!ENTITY fontTimes.accesskey "T">
 <!ENTITY fontCourier.label "Courier">
 <!ENTITY fontCourier.accesskey "C">
-<!ENTITY localfontfaceMenu.label "Local Fonts">
-<!ENTITY localfontfaceMenu.accesskey "F">
 
 <!-- Font Size SubMenu -->
 <!ENTITY FontSizeSelect.tooltip "Choose a font size">
 <!ENTITY decreaseFontSize.label "Smaller">
 <!ENTITY decreaseFontSize.accesskey "r">
 <!ENTITY decreaseFontSize.key "-">
 <!ENTITY increaseFontSize.label "Larger">
 <!ENTITY increaseFontSize.accesskey "g">
@@ -356,28 +298,16 @@
 <!ENTITY ParagraphSelect.tooltip "Choose a paragraph format">
 <!-- Shared in Paragraph, and Toolbar menulist -->
 <!ENTITY bodyTextCmd.label "Body Text">
 <!ENTITY bodyTextCmd.accesskey "T">
 <!-- isn't used in menu now, but may be added in future -->
 <!ENTITY advancedPropertiesCmd.label "Advanced Properties">
 <!ENTITY advancedPropertiesCmd.accesskey "v">
 
-<!ENTITY NormalAbbr.label "Text">
-<!ENTITY ParagraphAbbr.label "P">  
-<!ENTITY Heading1Abbr.label "H1">
-<!ENTITY Heading2Abbr.label "H2">
-<!ENTITY Heading3Abbr.label "H3">
-<!ENTITY Heading4Abbr.label "H4">
-<!ENTITY Heading5Abbr.label "H5">
-<!ENTITY Heading6Abbr.label "H6">
-<!ENTITY BlockquoteAbbr.label "BQ">
-<!ENTITY AddressAbbr.label "Addr.">
-<!ENTITY PreformatAbbr.label "Pre.">
-
 <!-- Align menu items -->
 <!ENTITY alignMenu.label "Align">
 <!ENTITY alignMenu.accesskey "A">
 <!ENTITY alignLeft.label "Left">
 <!ENTITY alignLeft.accesskey "L">
 <!ENTITY alignLeft.tooltip "Align Left">
 <!ENTITY alignCenter.label "Centre">
 <!ENTITY alignCenter.accesskey "c">
@@ -453,18 +383,16 @@
 <!ENTITY tableCellBefore.label "Cell Before">
 <!ENTITY tableCellBefore.accesskey "C">
 <!ENTITY tableCellAfter.label "Cell After">
 <!ENTITY tableCellAfter.accesskey "f">
 <!-- Delete SubMenu -->
 <!ENTITY tableDeleteMenu.label "Delete">
 <!ENTITY tableDeleteMenu.accesskey "D">
 
-<!ENTITY tableFix.label "Fix Table Layout">
-<!ENTITY tableFix.accesskey "F">
 <!-- text for "Join Cells" is in editor.properties 
      ("JoinSelectedCells" and "JoinCellToRight")
      the access key must exist in both of those strings
      But value must be set here for accesskey to draw properly
 -->
 <!ENTITY tableJoinCells.label "j">
 <!ENTITY tableJoinCells.accesskey "j">
 <!ENTITY tableSplitCell.label "Split Cell">
@@ -496,50 +424,38 @@
 <!ENTITY hruleToolbarCmd.label "H.Line">
 <!ENTITY hruleToolbarCmd.tooltip "Insert horizontal line or edit selected line's properties">
 <!ENTITY tableToolbarCmd.label "Table">
 <!ENTITY tableToolbarCmd.tooltip "Insert new table or edit selected table's properties">
 <!ENTITY linkToolbarCmd.label "Link">
 <!ENTITY linkToolbarCmd.tooltip "Insert new link or edit selected link's properties">
 <!ENTITY anchorToolbarCmd.label "Anchor">
 <!ENTITY anchorToolbarCmd.tooltip "Insert new named anchor or edit selected anchor's properties">
-<!ENTITY textColorCaption.label "Text Colour">
 <!ENTITY TextColorButton.tooltip "Choose colour for text">
 <!ENTITY BackgroundColorButton.tooltip "Choose colour for background">
 <!ENTITY throbber.tooltip "Go to the &vendorShortName; home page">
 <!ENTITY HighlightColorButton.tooltip "Choose highlight colour for text">
 
 <!-- Editor toolbar -->
 <!ENTITY decreaseFontSizeToolbarCmd.tooltip "Smaller font size">
 <!ENTITY increaseFontSizeToolbarCmd.tooltip "Larger font size">
 <!ENTITY boldToolbarCmd.tooltip "Bold">
 <!ENTITY italicToolbarCmd.tooltip "Italic">
 <!ENTITY underlineToolbarCmd.tooltip "Underline">
 <!ENTITY bulletListToolbarCmd.tooltip "Apply or remove bulleted list">
 <!ENTITY numberListToolbarCmd.tooltip "Apply or remove numbered list">
 <!ENTITY outdentToolbarCmd.tooltip "Outdent text (move left)">
 <!ENTITY indentToolbarCmd.tooltip "Indent text (move right)">
 <!ENTITY AlignPopupButton.tooltip "Choose text alignment">
-<!ENTITY InsertPopupButton.tooltip "Insert a Link, Anchor, Image, Horizontal Line or Table">
+<!ENTITY InsertPopupButton.tooltip "Insert a Link, Anchor, Image, Horizontal Line, or Table">
 <!ENTITY alignLeftButton.tooltip "Align text along left margin">
 <!ENTITY alignCenterButton.tooltip "Align text centred">
 <!ENTITY alignRightButton.tooltip "Align text along right margin">
 <!ENTITY alignjustifyButton.tooltip "Align text along left and right margins">
 
-<!-- Formatting toolbar not used, but may be in future -->
-<!ENTITY formatToolbar.boldChar "B">
-<!ENTITY formatToolbar.italicChar "I">
-<!ENTITY formatToolbar.underlineChar "U">
-
-<!-- Used with color pickers in Format toolbar and Format Menu -->
-<!ENTITY colorPicker.default.label "Reader's default colour">
-<!ENTITY colorPicker.default.accesskey "r">
-<!ENTITY colorLabel.label "Colour:">
-<!ENTITY ok.label "OK">
-
 <!-- Display Mode toolbar and View menu items -->
 <!ENTITY NormalModeTab.label "Normal">
 <!ENTITY NormalMode.label "Normal Edit Mode">
 <!ENTITY NormalMode.accesskey "n">
 <!ENTITY NormalMode.tooltip "Show table borders and named anchors">
 <!ENTITY AllTagsMode.label "HTML Tags">
 <!ENTITY AllTagsMode.accesskey "A">
 <!ENTITY AllTagsMode.tooltip "Display icons for all HTML tags">
--- a/editor/ui/chrome/composer/pref-composer.dtd
+++ b/editor/ui/chrome/composer/pref-composer.dtd
@@ -1,39 +1,25 @@
 <!-- extracted from content/pref-composer.xul -->
 
 <!--LOCALIZATION NOTE : FILE 'Composer' prefs dialog. Similar to Communcator 4.x Document Properties/Colors and Background -->
 
 <!--LOCALIZATION NOTE (pref.composer.title): DONT_TRANSLATE -->
 <!ENTITY  pref.composer.title           "Composer">
-
-<!ENTITY  saving                        "Saving">
-<!ENTITY  AutoSaveCheck                 "Automatically save every">
-<!ENTITY  minText                       "minutes">
-
-<!ENTITY  exterLegend.label             "External Editors">
-<!ENTITY  htmlSource                    "HTML Source:">
-<!ENTITY  imageeditor                   "Images:">
-<!ENTITY  chooseButton.label            "Choose">
-
 <!ENTITY  recentFiles.title             "Recent Pages Menu">
 <!ENTITY  documentsInMenu.label         "Maximum number of pages listed:">
 <!ENTITY  documentsInMenu.accesskey     "n">
-
 <!ENTITY  savingFiles.title             "When Saving or Publishing Pages">
 <!ENTITY  preserveExisting.label        "Preserve original source formatting">
 <!ENTITY  preserveExisting.accesskey    "P">
 <!ENTITY  preserveExisting.tooltip      "Preserves line breaks and page's original formatting">
 <!ENTITY  saveAssociatedFiles.label     "Save images and other associated files when saving pages">
 <!ENTITY  saveAssociatedFiles.accesskey "S">
 <!ENTITY  showPublishDialog.label       "Always show Publish dialogue when publishing pages">
 <!ENTITY  showPublishDialog.accesskey   "A">
-
 <!ENTITY  composerEditing.label         "Editing">
-<!ENTITY  spellCheckInline.label        "Check spelling as you type">
-<!ENTITY  spellCheckInline.accesskey    "C">
 <!ENTITY  maintainStructure.label       "Maintain table layout when inserting or deleting cells">
 <!ENTITY  maintainStructure.tooltip     "Preserves table's rectangular shape by automatically adding cells after inserting or deleting cells">
 <!ENTITY  maintainStructure.accesskey   "M">
 <!ENTITY  useCSS.label                  "Use CSS styles instead of HTML elements and attributes">
 <!ENTITY  useCSS.accesskey              "U">
 <!ENTITY  crInPCreatesNewP.label        "Return in a paragraph always creates a new paragraph">
 <!ENTITY  crInPCreatesNewP.accesskey    "R">
--- a/editor/ui/chrome/dialogs/EdLinkChecker.dtd
+++ b/editor/ui/chrome/dialogs/EdLinkChecker.dtd
@@ -15,17 +15,17 @@
    - March 31, 1998.
    -
    - The Initial Developer of the Original Code is
    - Netscape Communications Corporation.
    - Portions created by the Initial Developer are Copyright (C) 1998-1999
    - the Initial Developer. All Rights Reserved.
    -
    - Contributor(s):
-   -   Charles Manxke (cmanske@netscape.com)
+   -   Charles Manske (cmanske@netscape.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
@@ -33,14 +33,11 @@
    - 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 ***** -->
 
 <!-- Window title -->
 <!ENTITY windowTitle.label     "Check Image and Link Locations">
-<!ENTITY urlsNotFound.label    "The following image or link locations were not found:">
-<!ENTITY notFoundKey.label     "(&quot;X&quot; = file not found, &quot;?&quot; = timed-out attempting to connect.)">
-<!ENTITY changeUrlButton.label "Change Location of Selected Item">
 <!ENTITY succeeded.label       "Succeeded">
 <!ENTITY failed.label          "Failed">
 <!ENTITY closeButton.label     "Close">
--- a/editor/ui/chrome/dialogs/EditorImageMap.dtd
+++ b/editor/ui/chrome/dialogs/EditorImageMap.dtd
@@ -77,17 +77,16 @@
 <!ENTITY apercentCmd.accesskey "1">
 <!ENTITY bpercentCmd.label "200">
 <!ENTITY bpercentCmd.accesskey "2">
 <!ENTITY cpercentCmd.label "400">
 <!ENTITY cpercentCmd.accesskey "4">
 
 <!ENTITY zoominCmd.label "Zoom In">
 <!ENTITY zoomoutCmd.label "Zoom Out">
-<!ENTITY delSpotCmd.label "Delete Spot">
 
 <!-- Keys -->
 <!ENTITY clear.key "d">
 <!ENTITY selectall.key "a">
 <!ENTITY close.key "l">
 <!ENTITY cut.key "x">
 <!ENTITY copy.key "c">
 <!ENTITY paste.key "v">
--- a/editor/ui/chrome/dialogs/EditorImageProperties.dtd
+++ b/editor/ui/chrome/dialogs/EditorImageProperties.dtd
@@ -36,33 +36,31 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <!-- These strings are for use specifically in the editor's image and form image dialogs. -->
 
 <!-- Window title -->
 <!ENTITY windowTitle.label "Image Properties">
 
 <!ENTITY pixelsPopup.value "pixels">
-<!ENTITY percentPopup.value "percent">
 
 <!-- These are in the Location tab panel -->
 <!ENTITY locationEditField.label "Image Location:">
 <!ENTITY locationEditField.accessKey "L">
 <!ENTITY locationEditField.tooltip "Type the image's filename or location">
 <!ENTITY title.label "Tooltip:">
 <!ENTITY title.accessKey "T">
 <!ENTITY title.tooltip "The html 'title' attribute that displays as a tooltip">
 <!ENTITY altText.label "Alternate text:">
 <!ENTITY altText.accessKey "A">
 <!ENTITY altTextEditField.tooltip "Type text to display in place of the image">
 <!ENTITY noAltText.label "Don't use alternate text">
 <!ENTITY noAltText.accessKey "D">
 
 <!ENTITY previewBox.label "Image Preview">
-<!ENTITY MoreFewerButton.tooltip "Display more or fewer properties to edit">
 
 <!-- These controls are in the Dimensions tab panel -->
 <!-- actualSize.label should be same as actualSizeRadio.label + ":" -->
 <!ENTITY actualSize.label "Actual Size:">
 <!ENTITY actualSizeRadio.label "Actual Size">
 <!ENTITY actualSizeRadio.accessKey "A">
 <!ENTITY actualSizeRadio.tooltip "Revert to the image's actual size">
 <!ENTITY customSizeRadio.label "Custom Size">
@@ -88,32 +86,25 @@
 <!ENTITY bottomPopup.value "At the bottom">
 <!ENTITY topPopup.value "At the top">
 <!ENTITY centerPopup.value "In the centre">
 <!ENTITY wrapRightPopup.value "Wrap to the right">
 <!ENTITY wrapLeftPopup.value "Wrap to the left">
 
 <!-- These controls are in the Spacing Box -->
 <!ENTITY spacingBox.label "Spacing">
-<!ENTITY spacingBox.tooltip "Type a number for the amount of space around image">
 <!ENTITY leftRightEditField.label "Left and Right:">
 <!ENTITY leftRightEditField.accessKey "L">
 <!ENTITY topBottomEditField.label "Top and Bottom:">
 <!ENTITY topBottomEditField.accessKey "T">
 <!ENTITY borderEditField.label "Solid Border:">
 <!ENTITY borderEditField.accessKey "B">
 
 <!-- These controls are in the Link Box -->
 <!ENTITY showImageLinkBorder.label "Show border around linked image">
 <!ENTITY showImageLinkBorder.accessKey "B">
 
-<!-- These controls may be added some day; currently not used -->
-<!ENTITY makePageBackgroundCheckbox.label "Make Page Background">
-<!ENTITY makePageBackgroundCheckbox.tooltip "Use image as background for your page">
-<!ENTITY editImageButton.label "Edit Image">
-<!ENTITY editImageButton.tooltip "Edit image file in another program">
-
 <!-- These tabs are currently used in the image input dialog -->
 <!ENTITY imageInputTab.label "Form">
 <!ENTITY imageLocationTab.label "Location">
 <!ENTITY imageDimensionsTab.label "Dimensions">
 <!ENTITY imageAppearanceTab.label "Appearance">
 <!ENTITY imageLinkTab.label "Link">
--- a/editor/ui/chrome/dialogs/EditorInsertTOC.dtd
+++ b/editor/ui/chrome/dialogs/EditorInsertTOC.dtd
@@ -32,17 +32,16 @@
    - 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 Window.title        "Table of Contents">
 <!ENTITY buildToc.label      "Build table of contents from:">
-<!ENTITY style.label         "Style:">
 <!ENTITY tag.label           "Tag:">
 <!ENTITY class.label         "Class:">
 <!ENTITY header1.label       "Level 1">
 <!ENTITY header2.label       "Level 2">
 <!ENTITY header3.label       "Level 3">
 <!ENTITY header4.label       "Level 4">
 <!ENTITY header5.label       "Level 5">
 <!ENTITY header6.label       "Level 6">
--- a/editor/ui/chrome/dialogs/EditorListProperties.dtd
+++ b/editor/ui/chrome/dialogs/EditorListProperties.dtd
@@ -42,13 +42,12 @@
 <!ENTITY ListType.label "List Type">
 <!ENTITY bulletStyle.label "Bullet Style:">
 <!ENTITY startingNumber.label "Start at:">
 <!ENTITY startingNumber.accessKey "S">
 <!ENTITY none.value "None">
 <!ENTITY bulletList.value "Bullet (Unnumbered) List">
 <!ENTITY numberList.value "Numbered List">
 <!ENTITY definitionList.value "Definition List">
-<!ENTITY changeListMsg.label "When changing list type:">
 <!ENTITY changeEntireListRadio.label "Change entire list">
 <!ENTITY changeEntireListRadio.accessKey "C">
 <!ENTITY changeSelectedRadio.label "Change just selected items">
 <!ENTITY changeSelectedRadio.accessKey "I">
--- a/editor/ui/chrome/dialogs/EditorPublish.dtd
+++ b/editor/ui/chrome/dialogs/EditorPublish.dtd
@@ -30,24 +30,21 @@
    - 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 ***** -->
 
-
 <!-- Window title -->
 <!ENTITY windowTitle.label            "Publish Page">
 <!ENTITY windowTitleSettings.label    "Publish Settings">
-
 <!ENTITY publishTab.label             "Publish">
 <!ENTITY settingsTab.label            "Settings">
-
 <!ENTITY publishButton.label          "Publish">
 
 <!-- Publish Tab Panel -->
 <!ENTITY siteList.label               "Site Name:">
 <!ENTITY siteList.accesskey           "e">
 <!ENTITY siteList.tooltip             "Choose the site that you want to publish to">
 <!ENTITY newSiteButton.label          "New Site">
 <!ENTITY newSiteButton.accesskey      "N">
@@ -67,20 +64,18 @@
 <!ENTITY pageTitle.label              "Page Title:">
 <!ENTITY pageTitle.accesskey          "T">
 <!ENTITY pageTitle.tooltip            "Enter a title to identify the page in the window and in bookmarks">
 <!ENTITY pageTitleExample.label       "e.g.: &quot;My Web Page&quot;">
 <!ENTITY filename.label               "Filename:">
 <!ENTITY filename.accesskey           "F">
 <!ENTITY filename.tooltip             "Enter a name for this file, including '.html' for a web page">
 <!ENTITY filenameExample.label        "e.g,: &quot;mypage.html&quot;">
-<!ENTITY relatedDocs.label            "Other files to publish">
 <!ENTITY setDefaultButton.label       "Set as Default">
 <!ENTITY setDefaultButton.accesskey   "D">
-<!ENTITY setDefSiteAndDir.label       "Set as Default Site and Directory">
 <!ENTITY removeButton.label           "Remove Site">
 <!ENTITY removeButton.accesskey       "R">
 
 <!-- Settings Tab Panel -->
 <!ENTITY publishSites.label           "Publishing Sites">
 <!ENTITY serverInfo.label             "Server Information">
 <!ENTITY loginInfo.label              "Login Information">
 <!ENTITY siteName.label               "Site Name:">
--- a/editor/ui/chrome/dialogs/EditorPublishProgress.dtd
+++ b/editor/ui/chrome/dialogs/EditorPublishProgress.dtd
@@ -38,15 +38,13 @@
 
 <!-- Window title -->
 <!ENTITY siteUrl.label         "Site URL:">
 <!ENTITY docSubdir.label       "Page subdirectory:">
 <!ENTITY otherSubdir.label     "Image subdirectory:">
 
 <!ENTITY status.label          "Publishing…">
 <!ENTITY fileList.label        "Publishing Status">
-<!ENTITY statusHeader.label    "Status">
-<!ENTITY filenameHeader.label  "Filename">
 <!ENTITY succeeded.label       "Succeeded">
 <!ENTITY failed.label          "Failed">
 
 <!ENTITY keepOpen              "Keep this window open after publishing is complete.">
 <!ENTITY closeButton.label     "Close">
--- a/editor/ui/chrome/dialogs/EditorReplace.dtd
+++ b/editor/ui/chrome/dialogs/EditorReplace.dtd
@@ -53,9 +53,8 @@
 <!ENTITY findNextButton.accesskey "F">
 <!ENTITY replaceButton.label "Replace">
 <!ENTITY replaceButton.accesskey "R">
 <!ENTITY replaceAndFindButton.label "Replace and Find">
 <!ENTITY replaceAndFindButton.accesskey "d">
 <!ENTITY replaceAllButton.label "Replace All">
 <!ENTITY replaceAllButton.accesskey "A">
 <!ENTITY closeButton.label "Close">
-<!ENTITY notFoundWarning.label "The text you entered was not found.">
--- a/editor/ui/chrome/dialogs/EditorTableProperties.dtd
+++ b/editor/ui/chrome/dialogs/EditorTableProperties.dtd
@@ -64,30 +64,25 @@
 <!ENTITY tableCaption.accessKey           "N">
 <!ENTITY tableCaptionAbove.label          "Above Table">
 <!ENTITY tableCaptionBelow.label          "Below Table">
 <!ENTITY tableCaptionLeft.label           "Left of Table">
 <!ENTITY tableCaptionRight.label          "Right of table">
 <!ENTITY tableCaptionNone.label           "None">
 <!ENTITY tableInheritColor.label           "(Let page colour show through)">
 
-<!ENTITY cellPercent.label                "percent of table">
 <!ENTITY cellSelection.label              "Selection">
 <!ENTITY cellSelectCell.label             "Cell">
 <!ENTITY cellSelectRow.label              "Row">
 <!ENTITY cellSelectColumn.label           "Column">
 <!ENTITY cellSelectNext.label             "Next">
 <!ENTITY cellSelectNext.accessKey         "N">
 <!ENTITY cellSelectPrevious.label         "Previous">
 <!ENTITY cellSelectPrevious.accessKey     "P">
-<!ENTITY cellApplyBeforeMove.label        "Apply changes before changing selection">
-<!ENTITY cellKeepCurrentData.label        "Keep current settings">
 <!ENTITY applyBeforeChange.label          "Current changes will be applied before changing the selection.">
-<!ENTITY cellRowSpan.label                "Row Span:">
-<!ENTITY cellColSpan.label                "Column Span:">
 <!ENTITY cellContentAlignment.label       "Content Alignment">
 <!ENTITY cellHorizontal.label             "Horizontal:">
 <!ENTITY cellHorizontal.accessKey         "Z">
 <!ENTITY cellVertical.label               "Vertical:">
 <!ENTITY cellVertical.accessKey           "V">
 <!ENTITY cellStyle.label                  "Cell Style:">
 <!ENTITY cellStyle.accessKey              "C">
 <!ENTITY cellNormal.label                 "Normal">
@@ -95,17 +90,16 @@
 <!ENTITY cellTextWrap.label               "Text Wrap:">
 <!ENTITY cellTextWrap.accessKey           "T">
 <!ENTITY cellWrap.label                   "Wrap">
 <!ENTITY cellNoWrap.label                 "Don't wrap">
 <!ENTITY cellAlignTop.label               "Top">
 <!ENTITY cellAlignMiddle.label            "Middle">
 <!ENTITY cellAlignBottom.label            "Bottom">
 <!ENTITY cellAlignJustify.label           "Justify">
-<!ENTITY cellAlignAtChar.label            "At Character:">
 <!ENTITY cellInheritColor.label           "(Let table colour show through)">
 <!ENTITY cellUseCheckboxHelp.label        "Use tickboxes to determine which properties are applied to all selected cells">
 
 <!-- Used in both Table and Cell panels  -->
 <!ENTITY size.label                       "Size">
 <!ENTITY pixels.label                     "pixels">
 <!ENTITY backgroundColor.label            "Background Colour:">
 <!ENTITY backgroundColor.accessKey        "B">
deleted file mode 100644
--- a/mail/chrome/communicator/contentAreaCommands.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# context menu strings
-
-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
-
-saveLinkErrorMsg=The link could not be saved.  The web page might have been removed or had its name changed.
-saveLinkErrorTitle=Save Link
--- a/mail/chrome/communicator/utilityOverlay.dtd
+++ b/mail/chrome/communicator/utilityOverlay.dtd
@@ -20,49 +20,35 @@
 <!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 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 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.accesskey                                "C">
 
-<!ENTITY findTypeTextCmd.key        "/">
-<!ENTITY findTypeLinksCmd.key       "'">
-
 <!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">
--- a/mail/chrome/messenger-newsblog/am-newsblog.dtd
+++ b/mail/chrome/messenger-newsblog/am-newsblog.dtd
@@ -1,21 +1,20 @@
-<!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">
+<!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">
deleted file mode 100644
--- a/mail/chrome/messenger-newsblog/newsblog.dtd
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- folder pane context menu item -->
-<!ENTITY folderContextRSSSubscribe.label    "Subscribe…">
-<!ENTITY folderContextRSSSubscribe.accesskey   "b">
-
-
--- a/mail/chrome/messenger-region/region.properties
+++ b/mail/chrome/messenger-region/region.properties
@@ -1,10 +1,8 @@
-mailnews_support_url=http://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/
-
 # 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
--- a/mail/chrome/messenger-smime/msgCompSMIMEOverlay.dtd
+++ b/mail/chrome/messenger-smime/msgCompSMIMEOverlay.dtd
@@ -1,16 +1,13 @@
 <!--LOCALIZATION NOTE msgCompSMIMEOverlay.dtd UI for s/mime hooks in message composition -->
 
 <!ENTITY securityMenu.label "Security">
 <!ENTITY securityMenu.accesskey "e">
 
-<!ENTITY menu_securityEncryptIfPossible.label "Encrypt if Possible">
-<!ENTITY menu_securityEncryptIfPossible.accesskey "P">
-
 <!ENTITY menu_securityEncryptRequire.label "Encrypt This Message">
 <!ENTITY menu_securityEncryptRequire.accesskey "E">
 
 <!ENTITY menu_securityNoEncryption.label "Do Not Encrypt This Message">
 <!ENTITY menu_securityNoEncryption.accesskey "N">
 
 <!ENTITY menu_securitySign.label "Digitally Sign This Message">
 <!ENTITY menu_securitySign.accesskey "S">
--- a/mail/chrome/messenger/AccountManager.dtd
+++ b/mail/chrome/messenger/AccountManager.dtd
@@ -1,23 +1,19 @@
 <!-- extracted from AccountManager.xul -->
 
 <!ENTITY accountManagerTitle.label "Account Settings">
 
 <!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">
-<!ENTITY duplicate.label "Duplicate">
-
 <!-- 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: 50em;"> 
--- a/mail/chrome/messenger/AccountWizard.dtd
+++ b/mail/chrome/messenger/AccountWizard.dtd
@@ -26,53 +26,40 @@
   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">
-<!-- LOCALIZATION NOTE (emailExample.label) : do not translate "user@example.net" in below line -->
-<!ENTITY emailExample.label "(for example: user@example.net).">
 
 <!-- Entities for Server page -->
 
 <!ENTITY serverTitle.label "Server Information">
-<!ENTITY incomingServerTitle.label "Incoming Server">
 <!ENTITY incomingServerTypeDesc.label "Select the type of incoming server you are using.">
-<!ENTITY incomingServerTypeLabel.label "Server Type:">
 <!-- LOCALIZATION NOTE (incomingServerNameDesc.label) : Do not translate "&quot;pop.example.net&quot;" in below line -->
 <!ENTITY incomingServerNameDesc.label "Enter the name of your incoming server (for example, &quot;mail.example.net&quot;).">
 <!ENTITY incomingServerLabel.label "Incoming Server:">
 <!ENTITY incomingServerLabel.accesskey "S">
 <!-- LOCALIZATION NOTE (newsServerNameDesc.label) : Do not translate "NNTP" or the "&quot;" entities in below line -->
 <!ENTITY newsServerNameDesc.label "Enter the name of your news server (NNTP) (for example, &quot;news.example.net&quot;).">
-<!-- LOCALIZATION NOTE (smtpServerTitle.label) : Do not translate "SMTP" in below line -->
-<!ENTITY smtpServerTitle.label "Outgoing Server (SMTP)">
 <!-- LOCALIZATION NOTE (smtpServerDesc.label) : Do not translate "SMTP" and "&quot;smtp.example.net&quot;" in below line -->
 <!ENTITY smtpServerDesc.label "Enter the name of your outgoing server (SMTP) (for example, &quot;smtp.example.net&quot;).">
 <!ENTITY smtpServerLabel.label "Outgoing Server:">
 <!ENTITY smtpServerLabel.accesskey "O">
 <!ENTITY newsServerLabel.label "Newsgroup Server:">
 <!ENTITY newsServerLabel.accesskey "N">
 <!-- LOCALIZATION NOTE (imapType.label) : Do not translate "IMAP" in below line -->
 <!ENTITY imapType.label "IMAP">
 <!ENTITY imapType.accesskey "I">
 <!-- 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
--->
 <!-- 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.">
 
 <!-- Entities for Login page -->
@@ -99,17 +86,16 @@
 <!ENTITY haveSmtp3.prefix "Your outgoing (SMTP) server, &quot;">
 <!ENTITY haveSmtp3.suffix "&quot;, is identical to your incoming server, your incoming user name will be used to access it. You can modify outgoing server settings by choosing Account Settings from the Tools menu.">
 
 <!-- Entities for Account name page -->
 
 <!ENTITY accnameTitle.label "Account Name">
 <!-- LOCALIZATION NOTE (accnameDesc.label) : do not translate any "&quot;" in below line -->
 <!ENTITY accnameDesc.label "Enter the name by which you would like to refer to this account (for example, &quot;Work Account&quot;, &quot;Home Account&quot; or &quot;News Account&quot;).">
-<!ENTITY accnameExample.label "For example, Work Account, Home Account or News Account">
 <!ENTITY accnameLabel.label "Account Name:">
 <!ENTITY accnameLabel.accesskey "A">
 
 <!-- Entities for Done (Congratulations) page -->
 
 <!ENTITY completionTitle.label "Congratulations!">
 <!ENTITY completionText.label "Please verify that the information below is correct.">
 <!ENTITY serverTypePrefix.label "Incoming Server Type:">
--- a/mail/chrome/messenger/FilterEditor.dtd
+++ b/mail/chrome/messenger/FilterEditor.dtd
@@ -15,19 +15,16 @@
 <!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.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 markMessageStarred.label "Add Star">
 <!ENTITY setPriority.label "Set Priority to">
--- a/mail/chrome/messenger/SearchDialog.dtd
+++ b/mail/chrome/messenger/SearchDialog.dtd
@@ -1,77 +1,72 @@
-<!-- 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">
+<!-- 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 openButton.label            "Open">
+<!ENTITY openButton.accesskey        "n">
+<!ENTITY deleteButton.label          "Delete">
+<!ENTITY deleteButton.accesskey      "D">
+<!ENTITY searchDialogTitle.label     "Search Messages">
+<!ENTITY results.label               "Results">
+<!ENTITY fileHereMenu.label          "File Here">
+<!ENTITY fileHereMenu.accesskey      "F">
+<!ENTITY 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 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/addressbook/abCardOverlay.dtd
+++ b/mail/chrome/messenger/addressbook/abCardOverlay.dtd
@@ -68,56 +68,66 @@
 <!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 PreferMailFormat.accesskey     "v">
 <!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 allowRemoteContent.label       "Allow remote images.">
+<!ENTITY allowRemoteContent.accesskey   "r">
+<!ENTITY allowRemoteContent.tooltip     "In HTML messages it is possible to
+embed images from remote sources. Opening such a message will open a
+connection to this external source. This may allow tracking of the
+message being read. Ticking this box will allow such external embedded
+images in HTML messages from this contact.">
 
-<!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          "g">
 <!ENTITY CellularNumber.label           "Mobile:">
 <!ENTITY CellularNumber.accesskey       "M">
 
-<!ENTITY Address.tab                    "Address">
-<!ENTITY Address.accesskey              "A">
-<!ENTITY Home.box                       "Home">
+<!ENTITY Home.tab                       "Private">
+<!ENTITY Home.accesskey                 "P">
 <!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 HomeCountry.accesskey          "u">
 <!ENTITY HomeWebPage.label              "Web Page:">
-<!ENTITY HomeWebPage.accesskey          "W">
-<!ENTITY Work.box                       "Work">
+<!ENTITY HomeWebPage.accesskey          "e">
+<!ENTITY Birthday.label                 "Birthday:">
+<!ENTITY Birthday.accesskey             "B">
+<!ENTITY Year.emptytext                 "Year">
+<!ENTITY Or.value                       "or">
+<!ENTITY Age.emptytext                  "Age">
+
+<!ENTITY Work.tab                       "Work">
+<!ENTITY Work.accesskey                 "W">
 <!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">
@@ -131,23 +141,18 @@
 <!ENTITY WorkZipCode.accesskey          "s">
 <!ENTITY WorkCountry.label              "Country:">
 <!ENTITY WorkCountry.accesskey          "n">
 <!ENTITY WorkWebPage.label              "Web Page:">
 <!ENTITY WorkWebPage.accesskey          "b">
 
 <!ENTITY Other.tab                      "Other">
 <!ENTITY Other.accesskey                "h">
-<!ENTITY Birthday.label                 "Birthday:">
-<!ENTITY Birthday.accesskey             "B">
-<!ENTITY Year.emptytext                 "Year">
-<!ENTITY Or.value                       "or">
-<!ENTITY Age.emptytext                  "Age">
 <!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.label                    "Notes:">
 <!ENTITY Notes.accesskey                "N">
--- a/mail/chrome/messenger/addressbook/abMailListDialog.dtd
+++ b/mail/chrome/messenger/addressbook/abMailListDialog.dtd
@@ -41,17 +41,16 @@
 <!-- Labels -->
 <!ENTITY addToAddressBook.label         "Add to: ">
 
 <!ENTITY ListName.label                 "List Name: ">
 <!ENTITY ListNickName.label             "List Nickname: ">
 <!ENTITY ListDescription.label          "Description: ">
 <!-- See bug 58485, when we implement drag and drop, add 'or drag addresses' back in -->
 <!ENTITY AddressTitle.label             "Type email addresses to add them to the mailing list:">
-<!ENTITY RemoveButton.label             "Remove">
 <!ENTITY UpButton.label                 "Move Up">
 <!ENTITY DownButton.label               "Move Down">
 
 <!-- Access Keys -->
 <!ENTITY addToAddressBook.accesskey     "A">
 <!ENTITY ListName.accesskey             "L">
 <!ENTITY ListNickName.accesskey         "N">
 <!ENTITY ListDescription.accesskey      "e">
--- a/mail/chrome/messenger/addressbook/abMainWindow.dtd
+++ b/mail/chrome/messenger/addressbook/abMainWindow.dtd
@@ -30,22 +30,16 @@
 <!ENTITY printPreviewAddressBook.label                  "Print Preview Address Book">
 <!ENTITY printPreviewAddressBook.accesskey              "B">
 <!ENTITY printCardViewCmd.label                         "Print Card…">
 <!ENTITY printCardViewCmd.accesskey                     "p">
 <!ENTITY printCardViewCmd.key                           "P">
 <!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">
-
 <!-- 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">
@@ -55,17 +49,16 @@
 <!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 deleteAbCmd.label                              "Delete Address Book">
 <!ENTITY deleteCardCmd.label                            "Delete Card">
 <!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">
@@ -113,17 +106,16 @@
 <!ENTITY messengerCmd.commandkey                        "1">
 <!ENTITY searchAddressesCmd.label                       "Search Addresses…">
 <!ENTITY searchAddressesCmd.accesskey                   "S">
 <!ENTITY importCmd.label                                "Import…">
 <!ENTITY importCmd.accesskey                            "I">
 <!ENTITY exportCmd.label                                "Export…">
 <!ENTITY exportCmd.accesskey                            "E">
 <!ENTITY preferencesCmd.label                           "Options…">
-<!ENTITY preferencesCmd.key                             "O">
 <!ENTITY preferencesCmd.accesskey                       "O">
 <!ENTITY preferencesCmdUnix.label                       "Preferences">
 <!ENTITY preferencesCmdUnix.accesskey                   "n">
 
 <!-- Address Book Toolbar and Context Menus -->  
 <!ENTITY newcardButton.label                            "New Card">
 <!ENTITY newcardButton.accesskey                        "C">
 <!ENTITY newlistButton.label                            "New List">
--- a/mail/chrome/messenger/addressbook/addressBook.properties
+++ b/mail/chrome/messenger/addressbook/addressBook.properties
@@ -62,17 +62,16 @@ incorrectEmailAddressFormatMessage=The p
 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
 confirmDeleteAddressbookTitle=Delete Address Book
 confirmDeleteAddressbook=Are you sure you want to delete the selected address book?
 confirmDeleteCollectionAddressbook=If this address book is deleted, %S will no longer collect addresses. Are you sure you want to delete the selected address book?
 confirmDeleteMailingList=Are you sure you want to delete the selected mailing list?
 confirmDeleteListsAndCards=Are you sure you want to delete the selected cards and mailing lists?
 confirmDeleteMailingLists=Are you sure you want to delete the selected mailing lists?
 
@@ -105,23 +104,21 @@ dateformat=%e %B
 cityAndStateAndZip=%1$S, %2$S %3$S
 ## LOCALIZATION NOTE (cityAndStateNoZip): 
 ## %1$S is city, %2$S is state
 cityAndStateNoZip=%1$S, %2$S
 ## LOCALIZATION NOTE (cityOrStateAndZip): 
 ## %1$S is city or state, %2$S is zip
 cityOrStateAndZip=%1$S %2$S
 
-cityStateSeparator=,
 stateZipSeparator=
 
 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
 
--- a/mail/chrome/messenger/addressbook/pref-directory-add.dtd
+++ b/mail/chrome/messenger/addressbook/pref-directory-add.dtd
@@ -43,22 +43,19 @@
 <!ENTITY directoryBaseDN.label             "Base DN: ">
 <!ENTITY directoryBaseDN.accesskey         "b">
 <!ENTITY findButton.label                  "Find">
 <!ENTITY findButton.accesskey              "f">
 <!ENTITY directorySecure.label             "Use secure connection (SSL)">
 <!ENTITY directorySecure.accesskey         "U">
 <!ENTITY directoryLogin.label              "Bind DN: ">
 <!ENTITY directoryLogin.accesskey          "i">
-<!ENTITY advancedOptionsButton.label       "Advanced Options">
-<!ENTITY advancedOptionsButton.accesskey   "a">
 <!ENTITY General.tab                       "General">
 <!ENTITY Offline.tab                       "Offline">
 <!ENTITY Advanced.tab                      "Advanced">
-<!ENTITY advancedOptionsTitle.label        "Advanced Options">
 <!ENTITY portNumber.label                  "Port number: ">
 <!ENTITY portNumber.accesskey              "p">
 <!ENTITY searchFilter.label                "Search filter: ">
 <!ENTITY searchFilter.accesskey            "f">
 <!ENTITY scope.label                       "Scope: ">
 <!ENTITY scope.accesskey                   "c">
 <!ENTITY scopeOneLevel.label               "One Level">
 <!ENTITY scopeOneLevel.accesskey           "L">
--- a/mail/chrome/messenger/addressbook/pref-directory.dtd
+++ b/mail/chrome/messenger/addressbook/pref-directory.dtd
@@ -32,22 +32,19 @@
  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 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">
 <!ENTITY addDirectory.label        "Add">
 <!ENTITY addDirectory.accesskey    "a">
 <!ENTITY editDirectory.label       "Edit">
 <!ENTITY editDirectory.accesskey   "e">
 <!ENTITY deleteDirectory.label     "Delete">
 <!ENTITY deleteDirectory.accesskey "d">
--- a/mail/chrome/messenger/am-copies.dtd
+++ b/mail/chrome/messenger/am-copies.dtd
@@ -1,23 +1,19 @@
 <!-- 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 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">
 <!-- LOCALIZATION NOTE (sentFolderOn.label): OK to translate this, bug #57440 -->
 <!ENTITY sentFolderOn.label "&quot;Sent&quot; Folder on:">
 <!ENTITY sentFolderOn.accesskey "e">
 <!ENTITY sentInOtherFolder.label "Other:">
 <!ENTITY sentInOtherFolder.accesskey "O">
 <!-- LOCALIZATION NOTE (draftsFolderOn.label): OK to translate this, bug #57440 -->
--- a/mail/chrome/messenger/am-identities-list.dtd
+++ b/mail/chrome/messenger/am-identities-list.dtd
@@ -1,8 +1,7 @@
-<!ENTITY identitiesListTitle.label "Identities Associated With This Account">
 <!ENTITY identitiesListDesc.label "Multiple Identities Support">
 <!ENTITY identitiesListAdd.label  "Add…">
 <!ENTITY identitiesListAdd.accesskey  "A">
 <!ENTITY identitiesListEdit.label "Edit…">
 <!ENTITY identitiesListEdit.accesskey "E">
 <!ENTITY identitiesListDelete.label "Delete">
 <!ENTITY identitiesListDelete.accesskey "D">
--- a/mail/chrome/messenger/am-main.dtd
+++ b/mail/chrome/messenger/am-main.dtd
@@ -1,14 +1,13 @@
 <!-- extracted from am-main.xul -->
 
 <!ENTITY accountTitle.label "Account Settings">
 <!ENTITY accountName.label "Account Name:">
 <!ENTITY accountName.accesskey "N">
-<!ENTITY accountNameDesc.label "The account name is used to identify each account">
 <!ENTITY identityTitle.label "Default Identity">
 <!ENTITY identityDesc.label "Each account has an identity, which is the information that other people see when they read your messages.">
 <!ENTITY name.label "Your Name:">
 <!ENTITY name.accesskey "Y">
 <!ENTITY email.label "Email Address:">
 <!ENTITY email.accesskey "E">
 <!ENTITY replyTo.label "Reply-to Address:">
 <!ENTITY replyTo.accesskey "s">
--- a/mail/chrome/messenger/am-offline.dtd
+++ b/mail/chrome/messenger/am-offline.dtd
@@ -1,16 +1,15 @@
 <!ENTITY doNotDownloadPop3Movemail.label "To save disc space, do not download:">
 <!ENTITY doNotDownload.label "To save disc space, do not download for offline use:">
 <!ENTITY allFoldersOffline.label "Keep messages for this account on this computer">
 <!ENTITY allFoldersOffline.accesskey "o">
 <!ENTITY offlineNotDownload.label "Messages larger than">
 <!ENTITY offlineNotDownload.accesskey "M">
 <!ENTITY kb.label "kB">
-<!ENTITY days.label "days">
 <!ENTITY daysOld.label "days old">
 <!ENTITY message.label "messages">
 <!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">
--- a/mail/chrome/messenger/am-server-advanced.dtd
+++ b/mail/chrome/messenger/am-server-advanced.dtd
@@ -1,11 +1,9 @@
 <!ENTITY serverAdvanced.label "Advanced Account Settings">
-<!-- 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">
@@ -18,17 +16,16 @@
 <!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">
 <!ENTITY overrideNamespaces.accesskey "A">
 <!ENTITY pop3Desc.label "When downloading POP3 mail from this server, use the following folder for new mail:" >
-<!ENTITY folderStorage.label "Where to store mail">
 <!ENTITY globalInbox.label "Global Inbox (Local Folders Account)">
 <!ENTITY globalInbox.accesskey "G">
 <!ENTITY accountDirectory.label "Inbox for this server's account">
 <!ENTITY accountDirectory.accesskey "S">
 <!ENTITY deferToServer.label "Inbox for different account">
 <!ENTITY deferToServer.accesskey "D">
 <!ENTITY deferGetNewMail.label "Include this server when getting new mail">
 <!ENTITY deferGetNewMail.accesskey "I">
--- a/mail/chrome/messenger/am-server-top.dtd
+++ b/mail/chrome/messenger/am-server-top.dtd
@@ -1,19 +1,12 @@
 <!-- extracted from am-server-top.xul -->
 
 <!ENTITY securitySettings.label "Security Settings">
 <!ENTITY serverSettings.label "Server Settings">
-<!-- LOCALIZATION NOTE (popServer.label) : do not translate "POP" in below line -->
-<!ENTITY popServer.label "POP Mail Server">
-<!-- LOCALIZATION NOTE (imapServer.label) : do not translate "IMAP" in below line -->
-<!ENTITY imapServer.label "IMAP Mail Server">
-<!-- LOCALIZATION NOTE (newsServer.label) : do not translate "NNTP" in below line -->
-<!ENTITY newsServer.label "News Server (NNTP)">
-<!ENTITY webmail.label "WebMail account">
 <!ENTITY serverType.label "Server Type:">
 <!ENTITY serverName.label "Server Name:">
 <!ENTITY serverName.accesskey "S">
 <!ENTITY userName.label "User Name:">
 <!ENTITY userName.accesskey "N">
 <!ENTITY port.label "Port:">
 <!ENTITY port.accesskey "P">
 <!ENTITY serverPortDefault.label "Default:">
@@ -45,20 +38,17 @@
 <!ENTITY headersOnly.accesskey "f">
 <!ENTITY deleteByAgeFromServer.label "For at most">
 <!ENTITY deleteByAgeFromServer.accesskey "o">
 <!ENTITY daysEnd.label "days">
 <!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 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 -->
--- a/mail/chrome/messenger/am-smime.dtd
+++ b/mail/chrome/messenger/am-smime.dtd
@@ -1,20 +1,18 @@
 <!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_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">
 <!ENTITY managecerts.accesskey  "V">
 <!ENTITY managedevices.label    "Security Devices">
 <!ENTITY managedevices.accesskey "S">
--- a/mail/chrome/messenger/am-smime.properties
+++ b/mail/chrome/messenger/am-smime.properties
@@ -1,14 +1,13 @@
 ## S/MIME error strings.
 ## Note to localization: %S is a placeholder
 NoSenderSigningCert=You specified that this message should be digitally signed, but the application either failed to find the signing certificate specified in your Mail & Newsgroup Account Settings, or the certificate has expired.
 NoSenderEncryptionCert=You specified encryption for this message, but the application either failed to find the encryption certificate specified in your Mail & Newsgroup Account Settings, or the certificate has expired.
 MissingRecipientEncryptionCert=You specified encryption for this message, but the application failed to find an encryption certificate for %S.
-SignNoSenderEncryptionCert=You specified that this message should be digitally signed, but the application either failed to find an encryption certificate to include in the signed message, or the certificate has expired.
 ErrorCanNotEncrypt=Unable to encrypt message. Please check that you have a valid email certificate for each recipient. Please check that the certificates specified in Mail & Newsgroups Account Settings for this mail account are valid and trusted.
 ErrorCanNotSign=Unable to sign message. Please check that the certificates specified in Mail & Newsgroups Account Settings for this mail account are valid and trusted
 
 ## Strings used for in the prefs.
 prefPanel-smime=Security
 NoSigningCert=Certificate Manager can't locate a valid certificate that can be used to digitally sign your messages.
 NoEncryptionCert=Certificate Manager can't locate a valid certificate that other people can use to send you encrypted email messages.
 
--- a/mail/chrome/messenger/credits.dtd
+++ b/mail/chrome/messenger/credits.dtd
@@ -1,30 +1,17 @@
 <!ENTITY credit.title     "&brandFullName; Credits">
 <!ENTITY brandMotto       "Thunderbirds Are Go!">
 <!ENTITY credit.leads     "Engineering Leads">
-<!ENTITY credit.core      "Core Development Posse">
-<!ENTITY credit.gecko     "Gecko Layout Engine">
 <!ENTITY credit.thanks    "Special Thanks To">
 
 <!-- localization credits look like this: -->
 <!--
 <!ENTITY credit.translation
   "<h3>Translators</h3><ul><li>Name Here</li></ul>">
 -->
 <!ENTITY credit.translation "<h3>Localisation</h3><ul><li>Mark Tyndall</li><li>David Bartlett</li><li>Constantine Murenin</li></ul>">
 
-<!ENTITY credit.visuals     "Visual Design Coordinator">
-<!ENTITY credit.theme       "Theme Design">
-<!ENTITY credit.brand       "Brand Identity">
-<!ENTITY credit.web         "Web Design">
-<!ENTITY credit.update      "Mozilla Update">
-<!ENTITY credit.qalead      "Quality Assurance Lead">
-<!ENTITY credit.qa          "Quality Assurance">
-<!ENTITY credit.build       "Build and Release">
-<!ENTITY credit.infra       "Infrastructure Support">
-<!ENTITY credit.support     "Support Resources">
-<!ENTITY credit.manage      "Project Management">
-<!ENTITY credit.marketleads "Marketing Leads">
-<!ENTITY credit.market      "Marketing">
-<!ENTITY credit.creators    "Created By">
-<!ENTITY credit.memory      "In Fond Memory Of">
+<!ENTITY credit.theme          "Theme Design">
+<!ENTITY credit.qa             "Quality Assurance">
+<!ENTITY credit.build          "Build and Release">
+<!ENTITY credit.memory         "In Fond Memory Of">
 <!ENTITY credit.poweredByGecko "Powered by Gecko&trade;">
--- a/mail/chrome/messenger/custom.properties
+++ b/mail/chrome/messenger/custom.properties
@@ -1,2 +1,1 @@
-headerRemoved=You have removed header from the list. This may require resetting of the search filter criteria.
 colonInHeaderName=The header you entered contains an invalid character, such as ':', a non-printable character, a non-ascii character, or an eight bit ascii character. Please remove the invalid character and try again.
deleted file mode 100644
--- a/mail/chrome/messenger/fieldMapExport.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 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 ***** -->
-
-<!ENTITY fieldMapExport.title "Export Address Book">
-<!ENTITY fieldMapExport.add		"Add Field ->">
-<!ENTITY fieldMapExport.addAll	"Add All ->">
-<!ENTITY fieldList.label   "Address Fields"> 
--- a/mail/chrome/messenger/filter.properties
+++ b/mail/chrome/messenger/filter.properties
@@ -1,13 +1,12 @@
 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 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.
@@ -27,16 +26,17 @@ junkLogDetectStr=Detected junk message f
 # %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
+filterMissingCustomAction=Missing Custom Action
 filterAction2=priority changed
 filterAction3=deleted
 filterAction4=marked as read
 filterAction5=thread killed
 filterAction6=thread watched
 filterAction7=starred
 filterAction8=tagged
 filterAction9=replied
--- a/mail/chrome/messenger/folderProps.dtd
+++ b/mail/chrome/messenger/folderProps.dtd
@@ -47,17 +47,16 @@
 <!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 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">
@@ -71,28 +70,25 @@
 
 <!ENTITY offlineFolder.check.label               "Select this folder for offline use">
 <!ENTITY offlineFolder.check.accesskey           "S">
 <!ENTITY offlineFolder.button.label              "Download Now">
 <!ENTITY offlineFolder.button.accesskey          "D">
 
 <!ENTITY selectofflineNewsgroup.check.label      "Select this newsgroup for offline use">
 <!ENTITY selectofflineNewsgroup.check.accesskey  "o">
-<!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.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:">
--- a/mail/chrome/messenger/folderpane.dtd
+++ b/mail/chrome/messenger/folderpane.dtd
@@ -33,11 +33,8 @@
  the provisions above, a recipient may use your version of this file under
  the terms of any one of the MPL, the GPL or the LGPL.
 
  ***** END LICENSE BLOCK ***** -->
 <!ENTITY nameColumn.label   "Name"> 
 <!ENTITY unreadColumn.label "Unread"> 
 <!ENTITY totalColumn.label "Total"> 
 <!ENTITY folderSizeColumn.label "Size"> 
-<!ENTITY accounts.label "Accounts">
-<!-- LOCALIZATION NOTE (accounts.img) : DONT_TRANSLATE -->
-<!ENTITY accounts.img "chrome://messenger/skin/local-mailhost.gif">
--- a/mail/chrome/messenger/importMsgs.properties
+++ b/mail/chrome/messenger/importMsgs.properties
@@ -30,20 +30,18 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-#
 # The following are used by the import code to display status/error 
 # and informational messages
-#
 
 # Success message when no address books are found to import
 ## @name IMPORT_NO_ADDRBOOKS
 ## @loc None
 2000=No address books were found to import.
 
 # Error: Address book import not intialized		
 ## @name IMPORT_ERROR_AB_NOTINITIALIZED
@@ -275,41 +273,33 @@ 2133=Custom 3
 ## @loc None
 2134=Custom 4
 
 # Description: Address book field name
 ## @name IMPORT_FIELD_DESC_END
 ## @loc None
 2135=Notes
 
-# Description: Strings for the import dialog
-ImportMailDialogTitle=Import Mail
-ImportAddressBooksDialogTitle=Import Address Books
-ImportSettingsDialogTitle=Import Settings
-ImportMailListLabel=Select application to import mail from:
-ImportAddressBooksListLabel=Select address book format:
-ImportSettingsListLabel=Select application to import settings from:
-
 #Error strings
 ImportAlreadyInProgress=An import operation is currently in progress. Try again when the current import has finished.
 
 #Error strings for settings import
 ImportSettingsBadModule=Unable to load settings module
 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.
+# 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.
+# 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.
@@ -319,20 +309,17 @@ ImportAddressSuccess=Addresses successfu
 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
 
 #Import file dialog strings
 ImportSelectSettings=Select settings file
 ImportSelectMailDir=Select mail directory
@@ -341,18 +328,16 @@ ImportSelectAddrFile=Select address book
 
 # LOCALIZATION NOTE : "Communicator 4.x" is the used for previous versions of Netscape Communicator
 # Please translate using the brandname in respective languages for Netscape Communicator 4 releases.
 # LOCALIZATION NOTE : Please do not translate "*.na2", this represents the extension of the address book 
 # files from the Netscape Communicator 4 releases.
 # Comm4.xTo6.xImport user selection string
 Comm4xImportName=Communicator 4.x
 Comm4xFiles=Communicator Address Book files (*.na2)
-HomeButtonDesc=Home
-WorkButtonDesc=Work
 
 # Folder Names for imported Mail
 DefaultFolderName=Imported Mail
 # LOCALIZATION NOTE: Do not translate the word "%S" below.
 ImportModuleFolderName=%S Import
  
 # LOCALIZATION NOTE : "Communicator 4.x" is the used for previous versions of Netscape Communicator
 # Please translate using the brandname in respective languages for Netscape Communicator 4 releases.
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -1,24 +1,21 @@
 <!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">
@@ -39,17 +36,17 @@
 <!ENTITY subscribeCmd.label "Subscribe…">
 <!ENTITY subscribeCmd.accesskey "b">
 <!ENTITY deleteFolder.label "Delete Folder">
 <!ENTITY deleteFolder.accesskey "e">
 <!ENTITY renameFolder.label "Rename Folder…">
 <!ENTITY renameFolder.accesskey "R">
 <!ENTITY renameFolder.key "VK_F2">
 <!ENTITY compactFolders.label "Compact Folders">
-<!ENTITY compactFolder.accesskey    "F">
+<!ENTITY compactFolders.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">
@@ -61,17 +58,16 @@
 <!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">
@@ -125,18 +121,16 @@
 <!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">
@@ -182,25 +176,22 @@
 <!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">
@@ -221,41 +212,49 @@
 <!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">
+
+<!-- LOCALIZATION NOTE :
+fullZoomEnlargeCmd.commandkey3, fullZoomReduceCmd.commandkey2 and
+fullZoomResetCmd.commandkey2 are alternative acceleration keys for zoom.
+If shift key is needed with your locale popular keyboard for them,
+you can use these alternative items. Otherwise, their values should be empty.  -->
+
+<!ENTITY fullZoomEnlargeCmd.label       "Zoom In">
+<!ENTITY fullZoomEnlargeCmd.accesskey   "I">
+<!ENTITY fullZoomEnlargeCmd.commandkey  "+">
+<!ENTITY fullZoomEnlargeCmd.commandkey2 "="> <!-- + is above this key on many keyboards -->
+<!ENTITY fullZoomEnlargeCmd.commandkey3 "">
+
+<!ENTITY fullZoomReduceCmd.label        "Zoom Out">
+<!ENTITY fullZoomReduceCmd.accesskey    "O">
+<!ENTITY fullZoomReduceCmd.commandkey   "-">
+<!ENTITY fullZoomReduceCmd.commandkey2  "">
+
+<!ENTITY fullZoomResetCmd.label         "Reset">
+<!ENTITY fullZoomResetCmd.accesskey     "R">
+<!ENTITY fullZoomResetCmd.commandkey    "0">
+<!ENTITY fullZoomResetCmd.commandkey2   "">
+
+<!ENTITY fullZoomToggleCmd.label        "Zoom Text Only">
+<!ENTITY fullZoomToggleCmd.accesskey    "T">
+<!ENTITY fullZoom.label                 "Zoom">
+<!ENTITY fullZoom.accesskey             "Z">
 
 <!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">
@@ -277,18 +276,18 @@
 <!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 nextUnreadThread.accesskey "T">
+<!ENTITY nextUnreadThread.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">
@@ -317,34 +316,34 @@
 <!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 forwardAsMenu.accesskey "w">
 <!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 moveMsgToMenu.label "Move To">
+<!ENTITY moveMsgToMenu.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 copyMsgToMenu.label "Copy To">
+<!ENTITY copyMsgToMenu.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">
@@ -368,18 +367,16 @@
 <!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">
@@ -396,17 +393,16 @@
 <!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">
@@ -441,29 +437,27 @@
 <!ENTITY backButton1.label "Back">
 <!ENTITY goForwardButton1.label "Forwards">
 <!ENTITY deleteButton.label "Delete">
 <!ENTITY undeleteButton.label "Undelete">
 <!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">
@@ -527,18 +521,16 @@
 <!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 searchSubjectOrRecipientMenu.label "Subject, To or Cc">
 <!ENTITY searchMessageBody.label "Entire Message">
@@ -551,17 +543,16 @@
 <!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">
@@ -612,33 +603,34 @@
 <!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 loadRemoteContentButton2.label "Display Images Now">
 
 <!-- Phishing Bar -->
 <!ENTITY phishingBarMessage2.label "This message may be a scam.">
 <!ENTITY removePhishingBarButton1.label "Ignore Warning">
 <!ENTITY reportPhishingError1.label "This message doesn't appear to be a scam.">
 
+<!-- Message Header Button Box (to show hidden email addresses) -->
+<!ENTITY more.label "more">
+
 <!-- Quick Search Bar -->
 <!ENTITY quickSearchCmd.key "k">
 
 <!-- Message Header Context Menu -->
 <!ENTITY AddToAddressBook.label "Add to Address Book…">
 <!ENTITY AddToAddressBook.accesskey "B">
 <!ENTITY AddDirectlyToAddressBook.label "Add to Address Book">
 <!ENTITY AddDirectlyToAddressBook.accesskey "B">
@@ -647,18 +639,16 @@
 <!ENTITY ViewContact.label "View Contact">
 <!ENTITY ViewContact.accesskey "V">
 <!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 saveLinkAsCmd.label "Save Link As…">
 <!ENTITY saveLinkAsCmd.accesskey "k">
 <!ENTITY saveImageAsCmd.label "Save Image As…">
 <!ENTITY saveImageAsCmd.accesskey "v">
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -31,23 +31,19 @@
 # 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?
@@ -71,17 +67,16 @@ 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.
@@ -106,23 +101,19 @@ copyMsgWriteFailed=The messages could no
 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
@@ -315,33 +306,29 @@ 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
@@ -423,19 +410,19 @@ 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_all=All Folders
 folderPaneHeader_unread=Unread Folders
-folderPaneHeader_favorites=Favourite Folders
+folderPaneHeader_favorite=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
@@ -445,22 +432,25 @@ moveToFolderAgainAccessKey=t
 # 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"
+growlNotification=New Mail
 
 # 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
+
+# second person direct object pronoun; used in the collapsed header view if
+# the user is in the To or Cc field of a message
+headerFieldYou=You
--- a/mail/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/chrome/messenger/messengercompose/composeMsgs.properties
@@ -1,334 +1,329 @@
-# ***** 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:
+# ***** 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?
+
+## @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?
+
+## 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:
--- a/mail/chrome/messenger/messengercompose/messengercompose.dtd
+++ b/mail/chrome/messenger/messengercompose/messengercompose.dtd
@@ -1,276 +1,265 @@
-<!--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">
-
+<!--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">
+
+<!-- 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 pasteNoFormattingCmd.key "V">
+<!ENTITY editRewrapCmd.label "Rewrap">
+<!ENTITY editRewrapCmd.key "R">
+<!ENTITY editRewrapCmd.accesskey "w">
+<!ENTITY deleteCmd.label "Delete">
+<!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 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.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 -->
+<!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/migration/migration.properties
+++ b/mail/chrome/messenger/migration/migration.properties
@@ -9,21 +9,23 @@ sourceNameOutlook=Outlook
 # Import Sources
 1_dogbert=Preferences
 1_seamonkey=Preferences
 
 2_dogbert=Account Settings
 2_seamonkey=Account Settings
 2_oexpress=Account Settings
 2_outlook=Account Settings
+2_eudora=Account Settings
 
 4_dogbert=Address Books
 4_seamonkey=Address Books
 4_oexpress=Address Book
 4_outlook=Address Book
+4_eudora=Address Books
 
 8_dogbert=Junk Mail Training
 8_seamonkey=Junk Mail Training
 
 16_dogbert=Saved Passwords
 16_seamonkey=Saved Passwords
 
 32_dogbert=Other Data
@@ -31,16 +33,19 @@ 32_seamonkey=Other Data
 
 64_dogbert=Newsgroup Folders
 64_seamonkey=Newsgroup Folders
 
 128_dogbert=Mail Folders
 128_seamonkey=Mail Folders
 128_oexpress=Mail Folders
 128_outlook=Mail Folders
+128_eudora=Mail Folders
+
+256_eudora=Filters
 
 # mailDirName needs to be set to the same value as in 4.x
 # see bug #55449
 mailDirName=Mail
 
 # newsDirName needs to be set to the same value as in 4.x
 # see bug #55449
 newsDirName=News
--- a/mail/chrome/messenger/msgFolderPickerOverlay.dtd
+++ b/mail/chrome/messenger/msgFolderPickerOverlay.dtd
@@ -1,49 +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 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 ***** -->
-
-<!-- Labels -->
-<!ENTITY subscribechoosethis.label      "choose this news server">
-<!ENTITY subscribeclickhere.label      "click here to choose a news server">
-<!ENTITY newfolderchoosethis.label      "choose this for the parent">
-<!ENTITY newfolderclickhere.label      "Click here to select">
-<!ENTITY renamefolderchoosethis.label      "choose this folder">
-<!ENTITY renamefolderclickhere.label      "click here to choose a folder">
-<!ENTITY filemessageschoosethis.label      "choose this folder">
-<!ENTITY filemessagesclickhere.label      "click here to choose a folder">
-<!ENTITY chooseaccountclickhere.label      "Click here to select an account">
-<!ENTITY choosefolderclickhere.label      "Click here to select a folder">
-<!ENTITY chooseserverToDeferTo.label      "click here to select an account to use for storing messages">
+<!-- ***** 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 ***** -->
+
+<!-- Labels -->
+<!ENTITY newfolderchoosethis.label      "choose this for the parent">
+<!ENTITY filemessageschoosethis.label   "choose this folder">
--- a/mail/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/chrome/messenger/msgHdrViewOverlay.dtd
@@ -49,17 +49,16 @@
 <!ENTITY followupToField2.label "followup-to ">
 <!ENTITY tagsHdr2.label "tags ">
 <!ENTITY dateField2.label "date ">
 <!ENTITY userAgentField2.label "user-agent ">
 <!ENTITY referencesField2.label "references ">
 <!ENTITY messageIdField2.label "message-id ">
 <!ENTITY inReplyToField2.label "in-reply-to ">
 <!ENTITY originalWebsite2.label "website ">
-<!ENTITY saveAll.label "Save All…">
 
 <!ENTITY editMessageDescription.label "This is a draft message">
 <!ENTITY editMessageButton.label "Edit…">
 <!ENTITY replyButton.label "reply…">
 <!ENTITY forwardButton.label "forward…">
 <!ENTITY junkButton.label "mark as junk">
 <!ENTITY trashButton.tooltiptext "delete">
 
--- a/mail/chrome/messenger/msgmdn.properties
+++ b/mail/chrome/messenger/msgmdn.properties
@@ -29,18 +29,16 @@
 #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 translate anything in this file (except for "MsgMdnWishToSend")
-#                    see bugzilla bug 139615.
 ## Msg Mdn Report strings
 MsgMdnDisplayed=Note: This Return Receipt only acknowledges that the message was displayed on the recipient's computer. There is no guarantee that the recipient has read or understood the message contents.
 MsgMdnDispatched=The message was either printed, faxed, or forwarded without being displayed to the recipient. There is no guarantee that the recipient will read the message at a later time.
 MsgMdnProcessed=The message was processed by the recipient's mail client without being displayed. There is no guarantee that the message will be read at a later time.
 MsgMdnDeleted=The message has been deleted. The person you sent it to may or may not have seen it. They might undelete it at a later time and read it.
 MsgMdnDenied=The recipient of the message does not wish to send a return receipt back to you.
 MsgMdnFailed=A failure occurred. A proper return receipt could not be generated or sent to you.
 MsgMdnWishToSend=The sender of this message has asked to be notified when you read this message.\nDo you wish to notify the sender?
--- a/mail/chrome/messenger/preferences/advanced.dtd
+++ b/mail/chrome/messenger/preferences/advanced.dtd
@@ -1,83 +1,94 @@
-<!ENTITY itemGeneral.label       "General">
-<!ENTITY itemUpdate.label        "Update">
-<!ENTITY itemNetworking.label    "Network &amp; Disc Space">
-<!ENTITY itemCertificates.label  "Certificates">
-
-<!-- General Settings -->
-
-<!ENTITY showCondensedAddresses.label  "Show only display name for people in my address book">
-<!ENTITY showCondensedAddresses.accesskey "p">
-
-<!ENTITY autoMarkAsRead.label          "Automatically mark messages as read">
-<!ENTITY autoMarkAsRead.accesskey      "A">
-<!ENTITY markAsReadNoDelay.label       "Immediately on display">
-<!ENTITY markAsReadNoDelay.accesskey   "d">
-<!-- LOCALIZATION NOTE (markAsReadDelay.label): This will concatenate to
-     "After displaying for [___] seconds",
-     using (markAsReadDelay.label) and a number (secondsLabel.label). -->
-<!ENTITY markAsReadDelay.label         "After displaying for">
-<!ENTITY markAsReadDelay.accesskey     "e">
-<!ENTITY secondsLabel.label            "seconds">
-<!ENTITY showFolderColumns.label       "Show expanded columns in the folder pane">
-<!ENTITY showFolderColumns.accesskey   "f">
-<!ENTITY rememberLastMsg.label         "Remember the last selected message">
-<!ENTITY rememberLastMsg.accesskey     "b">
-<!ENTITY openMsgIn.label               "Open messages in:">
-<!ENTITY reuseExpRadio0.label          "A new message window">
-<!ENTITY reuseExpRadio0.accesskey      "i">
-<!ENTITY reuseExpRadio1.label          "An existing message window">
-<!ENTITY reuseExpRadio1.accesskey      "x">
-<!ENTITY reuseExpRadio2.label          "A new message tab">
-<!ENTITY reuseExpRadio2.accesskey      "Z">
-<!ENTITY connectionTimeout.label       "Connection timeout: ">
-<!ENTITY connectionTimeout.accesskey   "C">
-<!ENTITY connectionSeconds.label       "seconds">
-<!ENTITY configEditDesc.label          "Advanced Configuration">
-<!ENTITY configEdit.label              "Config Editor…">
-<!ENTITY configEdit.accesskey          "g">
-<!ENTITY returnReceiptsInfo.label      "Determine how &brandShortName; handles return receipts">
-<!ENTITY showReturnReceipts.label      "Return Receipts…">
-<!ENTITY showReturnReceipts.accesskey  "R">
-
-<!-- Update -->
-<!ENTITY autoCheck.label                "Automatically check for updates to:">
-<!ENTITY enableAppUpdate.label          "&brandShortName;">
-<!ENTITY enableAppUpdate.accesskey      "h">
-<!ENTITY enableAddonsUpdate.label       "Installed Add-ons">
-<!ENTITY enableAddonsUpdate.accesskey   "t">
-<!ENTITY checkNow.label                 "Check Now…">
-<!ENTITY whenUpdatesFound.label         "When updates to &brandShortName; are found,">
-<!ENTITY modeAskMe.label                "Ask me what I want to do">
-<!ENTITY modeAskMe.accesskey            "A">
-<!ENTITY modeAutomatic.label            "Automatically download and install the update">
-<!ENTITY modeAutomatic.accesskey        "d">
-<!ENTITY modeAutoAddonWarn.label        "Warn me if this will disable any of my add-ons">
-<!ENTITY modeAutoAddonWarn.accesskey    "W">
-<!ENTITY showUpdates.label              "Show Update History">
-<!ENTITY showUpdates.accesskey          "U">
-
-<!-- Networking and Disk Space -->
-<!ENTITY showConnections.label         "Connection…">
-<!ENTITY showConnections.accesskey     "n">
-<!ENTITY proxiesInfo.label             "Determine how &brandShortName; connects to the Internet.">
-<!ENTITY connectionsInfo.caption       "Connection">
-<!ENTITY offlineInfo.caption           "Offline">
-<!ENTITY offlineInfo.label             "Configure offline settings">
-<!ENTITY showOffline.label             "Offline…">
-<!ENTITY showOffline.accesskey         "O">
-
-<!ENTITY Diskspace "Disc Space">
-<!ENTITY offlineCompact.label "Compact folders when it will save over">
-<!ENTITY offlineCompact.accesskey "v">
-<!ENTITY kb.label "kB">
-
-<!-- Certificates -->
-<!ENTITY certificatesInfo2.label        "Manage certificates, revocation lists, certificate validation and security devices.">
-<!ENTITY viewCertificates.label         "View Certificates">
-<!ENTITY viewCertificates.accesskey     "a">
-<!ENTITY viewCRLs.label                 "Revocation Lists">
-<!ENTITY viewCRLs.accesskey             "e">
-<!ENTITY validation.label               "Validation">
-<!ENTITY validation.accesskey           "d">
-<!ENTITY viewSecurityDevices.label      "Security Devices">
-<!ENTITY viewSecurityDevices.accesskey  "u">
+<!ENTITY itemGeneral.label       "General">
+<!ENTITY itemDisplay.label       "Reading &amp; Display">
+<!ENTITY itemUpdate.label        "Update">
+<!ENTITY itemNetworking.label    "Network &amp; Disc Space">
+<!ENTITY itemCertificates.label  "Certificates">
+
+<!-- General Settings -->
+
+<!ENTITY enableGloda.label             "Enable Message Indexer">
+<!ENTITY enableGloda.accesskey         "I">
+<!ENTITY showCondensedAddresses.label  "Show only display name for people in my address book">
+<!ENTITY showCondensedAddresses.accesskey "p">
+
+<!ENTITY autoMarkAsRead.label          "Automatically mark messages as read">
+<!ENTITY autoMarkAsRead.accesskey      "A">
+<!ENTITY markAsReadNoDelay.label       "Immediately on display">
+<!ENTITY markAsReadNoDelay.accesskey   "d">
+<!-- LOCALIZATION NOTE (markAsReadDelay.label): This will concatenate to
+     "After displaying for [___] seconds",
+     using (markAsReadDelay.label) and a number (secondsLabel.label). -->
+<!ENTITY markAsReadDelay.label         "After displaying for">
+<!ENTITY markAsReadDelay.accesskey     "e">
+<!ENTITY secondsLabel.label            "seconds">
+<!ENTITY showFolderColumns.label       "Show expanded columns in the folder pane">
+<!ENTITY showFolderColumns.accesskey   "f">
+<!ENTITY openMsgIn.label               "Open messages in:">
+<!ENTITY reuseExpRadio0.label          "A new message window">
+<!ENTITY reuseExpRadio0.accesskey      "i">
+<!ENTITY reuseExpRadio1.label          "An existing message window">
+<!ENTITY reuseExpRadio1.accesskey      "x">
+<!ENTITY configEditDesc.label          "Advanced Configuration">
+<!ENTITY configEdit.label              "Config Editor…">
+<!ENTITY configEdit.accesskey          "g">
+<!ENTITY returnReceiptsInfo.label      "Determine how &brandShortName; handles return receipts">
+<!ENTITY showReturnReceipts.label      "Return Receipts…">
+<!ENTITY showReturnReceipts.accesskey  "R">
+
+<!-- Display and Reading Settings -->
+<!ENTITY reading.caption                "Reading">
+<!ENTITY display.caption                "Display">
+
+<!-- Update -->
+<!ENTITY autoCheck.label                "Automatically check for updates to:">
+<!ENTITY enableAppUpdate.label          "&brandShortName;">
+<!ENTITY enableAppUpdate.accesskey      "h">
+<!ENTITY enableAddonsUpdate.label       "Installed Add-ons">
+<!ENTITY enableAddonsUpdate.accesskey   "t">
+<!ENTITY checkNow.label                 "Check Now…">
+<!ENTITY whenUpdatesFound.label         "When updates to &brandShortName; are found,">
+<!ENTITY modeAskMe.label                "Ask me what I want to do">
+<!ENTITY modeAskMe.accesskey            "A">
+<!ENTITY modeAutomatic.label            "Automatically download and install the update">
+<!ENTITY modeAutomatic.accesskey        "d">
+<!ENTITY modeAutoAddonWarn.label        "Warn me if this will disable any of my add-ons">
+<!ENTITY modeAutoAddonWarn.accesskey    "W">
+<!ENTITY showUpdates.label              "Show Update History">
+<!ENTITY showUpdates.accesskey          "U">
+
+<!-- Networking and Disk Space -->
+<!ENTITY showSettings.label            "Settings…">
+<!ENTITY showSettings.accesskey        "n">
+<!ENTITY proxiesConfigure.label        "Configure how &brandShortName; connects to the Internet">
+<!ENTITY connectionsInfo.caption       "Connection">
+<!ENTITY offlineInfo.caption           "Offline">
+<!ENTITY offlineInfo.label             "Configure offline settings">
+<!ENTITY showOffline.label             "Offline…">
+<!ENTITY showOffline.accesskey         "O">
+
+<!ENTITY Diskspace "Disc Space">
+<!ENTITY offlineCompact.label "Compact folders when it will save over">
+<!ENTITY offlineCompact.accesskey "v">
+<!ENTITY kb.label "kB">
+
+<!-- LOCALIZATION NOTE:
+  The entities useCacheBefore.label and useCacheAfter.label appear on a single
+  line in preferences as follows:
+
+  &useCacheBefore.label  [ textbox for cache size in MB ]   &useCacheAfter.label;
+-->
+<!ENTITY useCacheBefore.label            "Use up to">
+<!ENTITY useCacheBefore.accesskey        "U">
+<!ENTITY useCacheAfter.label             "MB of space for the cache">
+<!ENTITY clearCacheNow.label             "Clear Now">
+<!ENTITY clearCacheNow.accesskey         "C">
+
+<!-- Certificates -->
+<!ENTITY viewCertificates.label         "View Certificates">
+<!ENTITY viewCertificates.accesskey     "a">
+<!ENTITY viewCRLs.label                 "Revocation Lists">
+<!ENTITY viewCRLs.accesskey             "e">
+<!ENTITY validation.label               "Validation">
+<!ENTITY validation.accesskey           "d">
+<!ENTITY viewSecurityDevices.label      "Security Devices">
+<!ENTITY viewSecurityDevices.accesskey  "u">
--- a/mail/chrome/messenger/preferences/changeaction.dtd
+++ b/mail/chrome/messenger/preferences/changeaction.dtd
@@ -1,23 +1,21 @@
-<!ENTITY  changeAction.title                  "Change Action">
-<!ENTITY  window.width                         "36em">
-
-<!ENTITY  whenDownloading.label               "When downloading files like this:">
-
-<!ENTITY  openDefault.label                   "Open them with the default application:">
-<!ENTITY  openDefault.accesskey               "O">
-<!ENTITY  openApplication.label               "Open them with this application:">
-<!ENTITY  openApplication.accesskey           "e">
-<!ENTITY  changeApp.label                     "Browse…">
-<!ENTITY  changeApp.accesskey                 "B">
-<!ENTITY  saveToDisk.label                    "Save them on my computer">
-<!ENTITY  saveToDisk.accesskey                "S">
-<!ENTITY  saveToDefaultFolder.label           "in the default download folder">
-<!ENTITY  saveToDefaultFolder.accesskey       "d">
-<!ENTITY  saveToThisFolder.label              "in this folder:">
-<!ENTITY  saveToThisFolder.accesskey          "h">
-<!ENTITY  chooseFolder.label                  "Browse…">
-<!ENTITY  chooseFolder.accesskey              "w">
-<!ENTITY  saveToAskMe.label                   "ask me where to save the file">
-<!ENTITY  saveToAskMe.accesskey               "a">
-<!ENTITY  usePlugin.label                     "Use this Plugin:">
-<!ENTITY  usePlugin.accesskey                 "P">
+<!ENTITY  changeAction.title                  "Change Action">
+<!ENTITY  window.width                         "36em">
+
+<!ENTITY  whenDownloading.label               "When downloading files like this:">
+
+<!ENTITY  openDefault.label                   "Open them with the default application:">
+<!ENTITY  openDefault.accesskey               "O">
+<!ENTITY  openApplication.label               "Open them with this application:">
+<!ENTITY  openApplication.accesskey           "e">
+<!ENTITY  changeApp.label                     "Browse…">
+<!ENTITY  changeApp.accesskey                 "B">
+<!ENTITY  saveToDisk.label                    "Save them on my computer">
+<!ENTITY  saveToDisk.accesskey                "S">
+<!ENTITY  saveToDefaultFolder.label           "in the default download folder">
+<!ENTITY  saveToDefaultFolder.accesskey       "d">
+<!ENTITY  saveToThisFolder.label              "in this folder:">
+<!ENTITY  saveToThisFolder.accesskey          "h">
+<!ENTITY  chooseFolder.label                  "Browse…">
+<!ENTITY  chooseFolder.accesskey              "w">
+<!ENTITY  saveToAskMe.label                   "ask me where to save the file">
+<!ENTITY  saveToAskMe.accesskey               "a">
--- a/mail/chrome/messenger/preferences/compose.dtd
+++ b/mail/chrome/messenger/preferences/compose.dtd
@@ -1,14 +1,12 @@
 <!ENTITY itemGeneral.label                   "General">
 <!ENTITY itemAutoComplete.label              "Addressing">
 <!ENTITY itemSpellCheck.label                "Spelling">
-<!ENTITY itemSendFormat.label                "Send Format">
 
-<!ENTITY forwardReply.label                   "Forwarding Messages">
 <!ENTITY forwardMsg.label                     "Forward messages:">
 <!ENTITY forwardMsg.accesskey                 "f">
 <!ENTITY inline.label                         "Inline">
 <!ENTITY inline.accesskey                     "I">
 <!ENTITY asAttachment.label                   "As Attachment">
 <!ENTITY asAttachment.accesskey               "A">
 <!ENTITY addExtension.label                   "add extension to file name">
 <!ENTITY addExtension.accesskey               "f">
@@ -20,45 +18,37 @@
 <!ENTITY size.accesskey                       "z">
 <!ENTITY fontColor.label                      "Text Colour:">
 <!ENTITY fontColor.accesskey                  "x">
 <!ENTITY bgColor.label                        "Background Colour:">
 <!ENTITY bgColor.accesskey                    "B">
 <!ENTITY restoreHTMLDefaults.label            "Restore Defaults">
 <!ENTITY restoreHTMLDefaults.accesskey        "R">
 
-<!ENTITY sendingMessagesHeader.label          "Composing Messages">
 <!ENTITY spellCheck.label                     "Check spelling before sending">
 <!ENTITY spellCheck.accesskey                 "C">
 <!ENTITY spellCheckInline.label               "Enable spell check as you type">
 <!ENTITY spellCheckInline1.accesskey          "k">
 <!ENTITY languagePopup.label                  "Language:">
 <!ENTITY languagePopup.accessKey              "g">
 <!ENTITY downloadDictionaries.label           "Download More Dictionaries">
 
 <!ENTITY warnOnSendAccelKey.label             "Confirm when using keyboard shortcut to send message">
 <!ENTITY warnOnSendAccelKey.accesskey         "i">
 <!ENTITY autoSave.label                       "Auto Save every">
 <!ENTITY autoSave.accesskey                   "u">
 <!ENTITY autoSaveEnd.label                    "minutes">
-<!-- LOCALIZATION NOTE (wrapOutMsg.label): This will concatenate with "xxx characters", using a number and (char.label). -->
-<!ENTITY wrapOutMsg.label                     "Wrap plain text messages at">
-<!ENTITY wrapOutMsg.accesskey                 "l">
-<!ENTITY char.label                           "characters">
 
 <!ENTITY emailCollectionPicker.label           "Automatically add outgoing email addresses to my:">
 <!ENTITY emailCollectionPicker.accesskey       "t">
 <!ENTITY addressingTitle.label                 "Address Autocompletion">
 <!ENTITY autocompleteText.label                "When addressing messages, look for matching entries in:">
 <!ENTITY addressingEnable.label                "Local Address Books">
 <!ENTITY addressingEnable.accesskey            "A">
 <!ENTITY directories.label                     "Directory Server:">
 <!ENTITY directories.accesskey                 "D">
 <!ENTITY directoriesNone.label                 "None">
 <!ENTITY editDirectories.label                 "Edit Directories…">
 <!ENTITY editDirectories.accesskey             "E">
-<!ENTITY matchText.label                       "If there is a match in your local address books:">
-<!ENTITY skipDirectory.label                   "Do not search in the directory">
 
-<!ENTITY sendOptionsCaption.label              "Send and HTML Options">
 <!ENTITY sendOptionsDescription.label          "Configure text format behaviour">
 <!ENTITY sendOptions.label                     "Send Options…">
 <!ENTITY sendOptions.accesskey                 "S">
--- a/mail/chrome/messenger/preferences/connection.dtd
+++ b/mail/chrome/messenger/preferences/connection.dtd
@@ -1,42 +1,37 @@
-
-<!ENTITY  connectionsDialog.title       "Connection Settings">
-<!ENTITY  window.width                   "37em">
-
-<!ENTITY  proxyTitle.label              "Configure Proxies to Access the Internet">
-<!ENTITY  noProxyTypeRadio.label        "No proxy">
-<!ENTITY  noProxyTypeRadio.accesskey    "y">
-<!ENTITY  systemTypeRadio.label         "Use system proxy settings">
-<!ENTITY  systemTypeRadio.accesskey     "u">
-<!ENTITY  WPADTypeRadio.label           "Auto-detect proxy settings for this network">
-<!ENTITY  WPADTypeRadio.accesskey       "w">
-<!ENTITY  manualTypeRadio.label         "Manual proxy configuration:">
-<!ENTITY  manualTypeRadio.accesskey     "m">
-<!ENTITY  autoTypeRadio.label           "Automatic proxy configuration URL:">
-<!ENTITY  autoTypeRadio.accesskey       "A">
-<!ENTITY  reload.label                  "Reload">
-<!ENTITY  reload.accesskey              "l">
-<!ENTITY  ftp.label                     "FTP Proxy:">
-<!ENTITY  ftp.accesskey                 "f">
-<!ENTITY  gopher.label                  "Gopher Proxy:">
-<!ENTITY  gopher.accesskey              "g">
-<!ENTITY  http.label                    "HTTP Proxy:">
-<!ENTITY  http.accesskey                "h">
-<!ENTITY  ssl.label                     "SSL Proxy:">
-<!ENTITY  ssl.accesskey                 "s">
-<!ENTITY  socks.label                   "SOCKS Host:">
-<!ENTITY  socks.accesskey               "c">
-<!ENTITY  socks4.label                  "SOCKS v4">
-<!ENTITY  socks4.accesskey              "k">
-<!ENTITY  socks5.label                  "SOCKS v5">
-<!ENTITY  socks5.accesskey              "v">
-<!ENTITY  HTTPport.label                "Port:">
-<!ENTITY  HTTPport.accesskey            "p">
-<!ENTITY  SSLport.label                 "Port:">
-<!ENTITY  SSLport.accesskey             "o">
-<!ENTITY  SOCKSport.label               "Port:">
-<!ENTITY  SOCKSport.accesskey           "t">
-<!ENTITY  noproxy.label                 "No Proxy for:">
-<!ENTITY  noproxy.accesskey             "n">
-<!ENTITY  noproxyExplain.label          "Example: .mozilla.org, .net.nz, 192.168.1.0/24">
-<!ENTITY  shareproxy.label              "Use this proxy server for all protocols">
-<!ENTITY  shareproxy.accesskey          "x">
+<!ENTITY  connectionsDialog.title       "Connection Settings">
+<!ENTITY  window.width                   "37em">
+
+<!ENTITY  proxyTitle.label              "Configure Proxies to Access the Internet">
+<!ENTITY  noProxyTypeRadio.label        "No proxy">
+<!ENTITY  noProxyTypeRadio.accesskey    "y">
+<!ENTITY  systemTypeRadio.label         "Use system proxy settings">
+<!ENTITY  systemTypeRadio.accesskey     "u">
+<!ENTITY  WPADTypeRadio.label           "Auto-detect proxy settings for this network">
+<!ENTITY  WPADTypeRadio.accesskey       "w">
+<!ENTITY  manualTypeRadio.label         "Manual proxy configuration:">
+<!ENTITY  manualTypeRadio.accesskey     "m">
+<!ENTITY  autoTypeRadio.label           "Automatic proxy configuration URL:">
+<!ENTITY  autoTypeRadio.accesskey       "A">
+<!ENTITY  reload.label                  "Reload">
+<!ENTITY  reload.accesskey              "l">
+<!ENTITY  http.label                    "HTTP Proxy:">
+<!ENTITY  http.accesskey                "h">
+<!ENTITY  ssl.label                     "SSL Proxy:">
+<!ENTITY  ssl.accesskey                 "s">
+<!ENTITY  socks.label                   "SOCKS Host:">
+<!ENTITY  socks.accesskey               "c">
+<!ENTITY  socks4.label                  "SOCKS v4">
+<!ENTITY  socks4.accesskey              "k">
+<!ENTITY  socks5.label                  "SOCKS v5">
+<!ENTITY  socks5.accesskey              "v">
+<!ENTITY  HTTPport.label                "Port:">
+<!ENTITY  HTTPport.accesskey            "p">
+<!ENTITY  SSLport.label                 "Port:">
+<!ENTITY  SSLport.accesskey             "o">
+<!ENTITY  SOCKSport.label               "Port:">
+<!ENTITY  SOCKSport.accesskey           "t">
+<!ENTITY  noproxy.label                 "No Proxy for:">
+<!ENTITY  noproxy.accesskey             "n">
+<!ENTITY  noproxyExplain.label          "Example: .mozilla.org, .net.nz, 192.168.1.0/24">
+<!ENTITY  shareproxy.label              "Use this proxy server for all protocols">
+<!ENTITY  shareproxy.accesskey          "x">
--- a/mail/chrome/messenger/preferences/display.dtd
+++ b/mail/chrome/messenger/preferences/display.dtd
@@ -1,52 +1,48 @@
-<!ENTITY itemFormatting.label             "Formatting">
-<!ENTITY itemTags.label                   "Tags">
-<!ENTITY itemFonts.label                  "Fonts">
-
-<!ENTITY textBegin.label                  "Quoted plain text appearance">
-<!ENTITY style.label                      "Style:">
-<!ENTITY style.accesskey                  "y">
-<!ENTITY regularStyle.label               "Regular">
-<!ENTITY bold.label                       "Bold">
-<!ENTITY italic.label                     "Italic">
-<!ENTITY boldItalic.label                 "Bold Italic">
-<!ENTITY size.label                       "Size:">
-<!ENTITY size.accesskey                   "s">
-<!ENTITY regularSize.label                "Regular">
-<!ENTITY bigger.label                     "Bigger">
-<!ENTITY smaller.label                    "Smaller">
-<!ENTITY color.label                      "Colour:">
-<!ENTITY color.accesskey                  "c">
-<!ENTITY displayWidth.label               "Plain Text Messages">
-<!ENTITY plainText.label                  "Use the following font:">
-<!ENTITY displayText.label                "When displaying quoted plain text messages:">
-<!ENTITY viewingPlainText.label            "When displaying plain text messages:">
-<!ENTITY fixedWidth.label                 "Fixed width font">
-<!ENTITY fixedWidth.accesskey             "x">
-<!ENTITY variableWidth.label              "Variable width font">
-<!ENTITY variableWidth.accesskey          "V">
-<!ENTITY readingMessagesHeader.label      "For incoming messages">
-<!ENTITY colors.label                     "Colours">
-<!ENTITY overrideColors.label             "When displaying messages, use the following colours:">
-<!ENTITY textColor.label                  "Text Colour:">
-<!ENTITY textColor.accesskey              "T">
-<!ENTITY backgroundColor.label            "Background Colour:">
-<!ENTITY backgroundColor.accesskey        "b">
-
-<!-- LOCALIZATION NOTE : (emoticonsAndStructs.label) 'Emoticons' are also known as 'Smileys', e.g. :-)   -->
-<!ENTITY convertEmoticons.label        "Display emoticons as graphics">
-<!ENTITY convertEmoticons.accesskey    "D">
-
-<!-- labels -->
-<!ENTITY displayTagsText.label    "Tags can be used to categorise and prioritise your messages.">
-<!ENTITY addTagButton.label       "Add">
-<!ENTITY addTagButton.accesskey   "A">
-<!ENTITY editTagButton.label      "Edit">
-<!ENTITY editTagButton.accesskey   "E">
-<!ENTITY removeTagButton.label    "Delete">
-<!ENTITY removeTagButton.accesskey "l">
-
-<!-- Fonts -->
-<!ENTITY fontAndEncodingsDescription.label  "Configure the fonts and encodings used by &brandShortName;">
-<!ENTITY fontsAndEncodingsCaption.label      "Fonts &amp; Encodings">
-<!ENTITY fontOptions.accesskey   "F">
-<!ENTITY fontOptions.label       "Fonts…">
+<!ENTITY itemFormatting.label             "Formatting">
+<!ENTITY itemTags.label                   "Tags">
+
+<!ENTITY style.label                      "Style:">
+<!ENTITY style.accesskey                  "y">
+<!ENTITY regularStyle.label               "Regular">
+<!ENTITY bold.label                       "Bold">
+<!ENTITY italic.label                     "Italic">
+<!ENTITY boldItalic.label                 "Bold Italic">
+<!ENTITY size.label                       "Size:">
+<!ENTITY size.accesskey                   "s">
+<!ENTITY regularSize.label                "Regular">
+<!ENTITY bigger.label                     "Bigger">
+<!ENTITY smaller.label                    "Smaller">
+<!ENTITY color.label                      "Colour:">
+<!ENTITY color.accesskey                  "c">
+<!ENTITY displayWidth.label               "Plain Text Messages">
+<!ENTITY plainText.label                  "Use the following font:">
+<!ENTITY displayText.label                "When displaying quoted plain text messages:">
+<!ENTITY fixedWidth.label                 "Fixed width font">
+<!ENTITY fixedWidth.accesskey             "x">
+<!ENTITY variableWidth.label              "Variable width font">
+<!ENTITY variableWidth.accesskey          "V">
+<!ENTITY colors.label                     "Colours">
+<!ENTITY overrideColors.label             "When displaying messages, use the following colours:">
+<!ENTITY textColor.label                  "Text Colour:">
+<!ENTITY textColor.accesskey              "T">
+<!ENTITY backgroundColor.label            "Background Colour:">
+<!ENTITY backgroundColor.accesskey        "b">
+
+<!-- LOCALIZATION NOTE : (emoticonsAndStructs.label) 'Emoticons' are also known as 'Smileys', e.g. :-)   -->
+<!ENTITY convertEmoticons.label        "Display emoticons as graphics">
+<!ENTITY convertEmoticons.accesskey    "D">
+
+<!-- labels -->
+<!ENTITY displayTagsText.label    "Tags can be used to categorise and prioritise your messages.">
+<!ENTITY addTagButton.label       "Add">
+<!ENTITY addTagButton.accesskey   "A">
+<!ENTITY editTagButton.label      "Edit">
+<!ENTITY editTagButton.accesskey   "E">
+<!ENTITY removeTagButton.label    "Delete">
+<!ENTITY removeTagButton.accesskey "l">
+
+<!-- Fonts -->
+<!ENTITY fontAndEncodingsDescription.label  "Configure the fonts and encodings used by &brandShortName;">
+<!ENTITY fontsAndEncodingsCaption.label      "Fonts &amp; Encodings">
+<!ENTITY fontOptions.accesskey   "F">
+<!ENTITY fontOptions.label       "Fonts…">
--- a/mail/chrome/messenger/preferences/downloads.dtd
+++ b/mail/chrome/messenger/preferences/downloads.dtd
@@ -1,24 +1,15 @@
 <!ENTITY askOnSave.label              "Attachments Folder">
 <!ENTITY alwaysAsk.label              "Ask me where to save every file">
 <!ENTITY alwaysAsk.accesskey          "A">
 <!ENTITY neverAsk.label               "Save all attachments to this folder:">
 <!ENTITY neverAsk.accesskey           "S">
-<!ENTITY desktop.label                "Desktop">
-<!ENTITY downloads.label              "My Downloads">
 <!ENTITY chooseFolderWin.label        "Browse…">
 <!ENTITY chooseFolderWin.accesskey    "B">
 <!ENTITY chooseFolderMac.label        "Choose…">
 <!ENTITY chooseFolderMac.accesskey    "C">
 
 
 <!ENTITY fileTypes.label              "Download Actions">
 <!ENTITY configureActions.label       "View &amp; Edit Actions…">
 <!ENTITY configureActions.accesskey   "V">
 <!ENTITY fileTypesDescription.label   "&brandShortName; can automatically save or open attachments of certain types.">
-
-<!ENTITY fileTypeColName.label        "File Type">
-<!ENTITY fileHandlerColName.label     "Application">
-<!ENTITY editFileHandler.label        "Change Action…">
-<!ENTITY editFileHandler.accesskey    "a">
-<!ENTITY removeFileHandler.label      "Remove">
-<!ENTITY removeFileHandler.accesskey  "r">
--- a/mail/chrome/messenger/preferences/fonts.dtd
+++ b/mail/chrome/messenger/preferences/fonts.dtd
@@ -1,77 +1,72 @@
-<!ENTITY  fontsAndEncodingsDialog.title           "Fonts &amp; Encodings">
-<!ENTITY  window.width                            "39em">
-<!ENTITY  window.macWidth                         "43em">
-<!ENTITY  window.unixWidth                        "41em">
-
-<!ENTITY  language.label                          "Fonts for:">
-<!ENTITY  language.accesskey                      "t">
-
-<!ENTITY  typefaces.label                         "Typeface">
-<!ENTITY  sizes.label                             "Size (pixels)">
-<!ENTITY  proportionalSize.accesskey              "e">
-<!ENTITY  monospaceSize.accesskey                 "x">
-
-<!ENTITY  proportional.label                      "Proportional:">
-<!ENTITY  proportional.accesskey                  "P">
-
-<!ENTITY  serif.label                             "Serif:">
-<!ENTITY  serif.accesskey                         "s">
-<!ENTITY  sans-serif.label                        "Sans-serif:">
-<!ENTITY  sans-serif.accesskey                    "n">
-<!ENTITY  monospace.label                         "Monospace:">
-<!ENTITY  monospace.accesskey                     "m">
-
-<!ENTITY  fontsize.units                          "pixels">
-
-<!ENTITY  font.langGroup.latin1                   "Western">
-<!ENTITY  font.langGroup.latin2                   "Central European">
-<!ENTITY  font.langGroup.japanese                 "Japanese">
-<!ENTITY  font.langGroup.trad-chinese             "Traditional Chinese (Taiwan)">
-<!ENTITY  font.langGroup.simpl-chinese            "Simplified Chinese">
-<!ENTITY  font.langGroup.trad-chinese-hk          "Traditional Chinese (Hong Kong)">
-<!ENTITY  font.langGroup.korean                   "Korean">
-<!ENTITY  font.langGroup.cyrillic                 "Cyrillic">
-<!ENTITY  font.langGroup.baltic                   "Baltic">
-<!ENTITY  font.langGroup.el                       "Greek">
-<!ENTITY  font.langGroup.turkish                  "Turkish">
-<!ENTITY  font.langGroup.unicode                  "Other Languages">
-<!ENTITY  font.langGroup.user-def                 "User Defined">
-<!ENTITY  font.langGroup.thai                     "Thai">
-<!ENTITY  font.langGroup.hebrew                   "Hebrew">
-<!ENTITY  font.langGroup.arabic                   "Arabic">
-<!ENTITY  font.langGroup.devanagari               "Devanagari">
-<!ENTITY  font.langGroup.tamil                    "Tamil">
-<!ENTITY  font.langGroup.armenian                 "Armenian">
-<!ENTITY  font.langGroup.bengali                  "Bengali">
-<!ENTITY  font.langGroup.canadian                 "Unified Canadian Syllabary">
-<!ENTITY  font.langGroup.ethiopic                 "Ethiopic">
-<!ENTITY  font.langGroup.georgian                 "Georgian">
-<!ENTITY  font.langGroup.gujarati                 "Gujarati">
-<!ENTITY  font.langGroup.gurmukhi                 "Gurmukhi">
-<!ENTITY  font.langGroup.khmer                    "Khmer">
-<!ENTITY  font.langGroup.malayalam                "Malayalam">
-
-<!-- Minimum font size -->
-<!ENTITY minSize.label                            "Minimum font size:">
-<!ENTITY minSize.accesskey                        "z">
-<!ENTITY minSize.none                             "None">
-
-<!-- default font type -->
-<!ENTITY  useDefaultFontSerif.label               "Serif">
-<!ENTITY  useDefaultFontSansSerif.label           "Sans Serif">
-
-<!ENTITY  newLanguages.label                      "New languages can be configured using the Languages Panel.">
-
-<!ENTITY  useDocumentFonts.label                  "Allow messages to use other fonts">
-<!ENTITY  useDocumentFonts.accesskey              "o">
-
-<!-- Language settings -->
-<!ENTITY sendDefaultCharset.label         "Outgoing Mail:">
-<!ENTITY sendDefaultCharset.accesskey     "u">
-<!ENTITY languagesTitle1.label            "Character Encodings">
-<!ENTITY composingDescription.label       "Set the default character encodings for sending and receiving mail">
-
-<!ENTITY viewDefaultCharsetList.label     "Incoming Mail:">
-<!ENTITY viewDefaultCharsetList.accesskey  "I">
-<!ENTITY replyInDefaultCharset2.label     "When possible, use the default character encoding in replies">
-<!ENTITY replyInDefaultCharset2.accesskey "h">
+<!ENTITY  fontsAndEncodingsDialog.title           "Fonts &amp; Encodings">
+<!ENTITY  window.width                            "39em">
+<!ENTITY  window.macWidth                         "43em">
+<!ENTITY  window.unixWidth                        "41em">
+
+<!ENTITY  language.label                          "Fonts for:">
+<!ENTITY  language.accesskey                      "t">
+
+<!ENTITY  sizes.label                             "Size (pixels)">
+<!ENTITY  proportionalSize.accesskey              "e">
+<!ENTITY  monospaceSize.accesskey                 "x">
+
+<!ENTITY  proportional.label                      "Proportional:">
+<!ENTITY  proportional.accesskey                  "P">
+
+<!ENTITY  serif.label                             "Serif:">
+<!ENTITY  serif.accesskey                         "s">
+<!ENTITY  sans-serif.label                        "Sans-serif:">
+<!ENTITY  sans-serif.accesskey                    "n">
+<!ENTITY  monospace.label                         "Monospace:">
+<!ENTITY  monospace.accesskey                     "m">
+
+<!ENTITY  font.langGroup.latin1                   "Western">
+<!ENTITY  font.langGroup.latin2                   "Central European">
+<!ENTITY  font.langGroup.japanese                 "Japanese">
+<!ENTITY  font.langGroup.trad-chinese             "Traditional Chinese (Taiwan)">
+<!ENTITY  font.langGroup.simpl-chinese            "Simplified Chinese">
+<!ENTITY  font.langGroup.trad-chinese-hk          "Traditional Chinese (Hong Kong)">
+<!ENTITY  font.langGroup.korean                   "Korean">
+<!ENTITY  font.langGroup.cyrillic                 "Cyrillic">
+<!ENTITY  font.langGroup.baltic                   "Baltic">
+<!ENTITY  font.langGroup.el                       "Greek">
+<!ENTITY  font.langGroup.turkish                  "Turkish">
+<!ENTITY  font.langGroup.unicode                  "Other Languages">
+<!ENTITY  font.langGroup.user-def                 "User Defined">
+<!ENTITY  font.langGroup.thai                     "Thai">
+<!ENTITY  font.langGroup.hebrew                   "Hebrew">
+<!ENTITY  font.langGroup.arabic                   "Arabic">
+<!ENTITY  font.langGroup.devanagari               "Devanagari">
+<!ENTITY  font.langGroup.tamil                    "Tamil">
+<!ENTITY  font.langGroup.armenian                 "Armenian">
+<!ENTITY  font.langGroup.bengali                  "Bengali">
+<!ENTITY  font.langGroup.canadian                 "Unified Canadian Syllabary">
+<!ENTITY  font.langGroup.ethiopic                 "Ethiopic">
+<!ENTITY  font.langGroup.georgian                 "Georgian">
+<!ENTITY  font.langGroup.gujarati                 "Gujarati">
+<!ENTITY  font.langGroup.gurmukhi                 "Gurmukhi">
+<!ENTITY  font.langGroup.khmer                    "Khmer">
+<!ENTITY  font.langGroup.malayalam                "Malayalam">
+
+<!-- Minimum font size -->
+<!ENTITY minSize.label                            "Minimum font size:">
+<!ENTITY minSize.accesskey                        "z">
+<!ENTITY minSize.none                             "None">
+
+<!-- default font type -->
+<!ENTITY  useDefaultFontSerif.label               "Serif">
+<!ENTITY  useDefaultFontSansSerif.label           "Sans Serif">
+
+<!ENTITY  useDocumentFonts.label                  "Allow messages to use other fonts">
+<!ENTITY  useDocumentFonts.accesskey              "o">
+
+<!-- Language settings -->
+<!ENTITY sendDefaultCharset.label         "Outgoing Mail:">
+<!ENTITY sendDefaultCharset.accesskey     "u">
+<!ENTITY languagesTitle1.label            "Character Encodings">
+<!ENTITY composingDescription.label       "Set the default character encodings for sending and receiving mail">
+
+<!ENTITY viewDefaultCharsetList.label     "Incoming Mail:">
+<!ENTITY viewDefaultCharsetList.accesskey  "I">
+<!ENTITY replyInDefaultCharset2.label     "When possible, use the default character encoding in replies">
+<!ENTITY replyInDefaultCharset2.accesskey "h">
--- a/mail/chrome/messenger/preferences/general.dtd
+++ b/mail/chrome/messenger/preferences/general.dtd
@@ -1,42 +1,47 @@
-<!ENTITY systemDefaults.label              "System Defaults">
-<!ENTITY alwaysCheckDefault.label          "Always check to see if &brandShortName; is the default mail client on startup">
-<!ENTITY alwaysCheckDefault.accesskey      "l">
-<!-- LOCALIZATION NOTE (alwaysCheckDefault.height):
-  There's some sort of bug which makes wrapping checkboxes not properly reflow,
-  causing the bottom border of the groupbox to be cut off; set this
-  appropriately if your localization causes this checkbox to wrap.
--->
-<!ENTITY alwaysCheckDefault.height  "3em">
-<!ENTITY checkNow.label             "Check Now">
-<!ENTITY checkNow.accesskey         "N">
-
-<!ENTITY messengerStartPage.label         "&brandShortName; Start Page">
-<!ENTITY enableStartPage.label            "When &brandShortName; launches, show the Start Page in the message area">
-<!ENTITY enableStartPage.accesskey        "W">
-<!ENTITY location.label                   "Location:">
-<!ENTITY location1.accesskey              "L">
-<!ENTITY useDefault.label                 "Restore Default">
-<!ENTITY useDefault.accesskey             "R">
-
-<!ENTITY bounceSystemDockIcon.label       "Animate the dock icon">
-<!ENTITY bounceSystemDockIcon.accesskey   "i">
-
-<!ENTITY newMessagesArrive.label          "When new messages arrive:">
-<!ENTITY playSound.label                  "Play a sound">
-<!ENTITY playSound1.accesskey             "d">
-<!ENTITY showAnimatedAlert.label          "Show an alert">
-<!ENTITY showAnimatedAlert.accesskey      "S">
-<!ENTITY customizeMailAlert.label         "Customise…">
-<!ENTITY customizeMailAlert.accesskey     "C">
-
-<!ENTITY soundNotification1.caption       "Sound">
-<!ENTITY play.label                       "Play">
-<!ENTITY play.accesskey                   "P">
-<!ENTITY systemsound.label                "Default system sound for new mail">
-<!ENTITY systemsoundMac.label             "System Alert Sound">
-<!ENTITY systemsoundMac.accesskey         "y">
-<!ENTITY systemsound.accesskey            "y">
-<!ENTITY customsound.label                "Use the following sound file">
-<!ENTITY customsound.accesskey            "U">
-<!ENTITY browse.label                     "Browse…">
-<!ENTITY browse.accesskey                 "B">
+<!ENTITY systemDefaults.label              "System Defaults">
+<!ENTITY alwaysCheckDefault.label          "Always check to see if &brandShortName; is the default mail client on startup">
+<!ENTITY alwaysCheckDefault.accesskey      "l">
+<!-- LOCALIZATION NOTE (alwaysCheckDefault.height):
+  There's some sort of bug which makes wrapping checkboxes not properly reflow,
+  causing the bottom border of the groupbox to be cut off; set this
+  appropriately if your localization causes this checkbox to wrap.
+-->
+<!ENTITY alwaysCheckDefault.height  "3em">
+<!ENTITY checkNow.label             "Check Now">
+<!ENTITY checkNow.accesskey         "N">
+
+<!ENTITY messengerStartPage.label         "&brandShortName; Start Page">
+<!ENTITY enableStartPage.label            "When &brandShortName; launches, show the Start Page in the message area">
+<!ENTITY enableStartPage.accesskey        "W">
+<!ENTITY location.label                   "Location:">
+<!ENTITY location1.accesskey              "L">
+<!ENTITY useDefault.label                 "Restore Default">
+<!ENTITY useDefault.accesskey             "R">
+
+<!ENTITY bounceSystemDockIcon.label       "Animate the dock icon">
+<!ENTITY bounceSystemDockIcon.accesskey   "i">
+
+<!ENTITY newMessagesArrive.label          "When new messages arrive:">
+<!ENTITY playSound.label                  "Play a sound">
+<!ENTITY playSound1.accesskey             "d">
+<!ENTITY showAnimatedAlert.label          "Show an alert">
+<!ENTITY showAnimatedAlert.accesskey      "S">
+<!ENTITY customizeMailAlert.label         "Customise…">
+<!ENTITY customizeMailAlert.accesskey     "C">
+
+<!ENTITY play.label                       "Play">
+<!ENTITY play.accesskey                   "P">
+<!ENTITY systemsound.label                "Default system sound for new mail">
+<!ENTITY systemsoundMac.label             "System Alert Sound">
+<!ENTITY systemsoundMac.accesskey         "y">
+<!ENTITY systemsound.accesskey            "y">
+<!ENTITY customsound.label                "Use the following sound file">
+<!ENTITY customsound.accesskey            "U">
+<!ENTITY browse.label                     "Browse…">
+<!ENTITY browse.accesskey                 "B">
+
+<!ENTITY addonsMgr.label                  "Add-ons">
+<!ENTITY manageAddonsDescWin.label        "Change options for your add-ons">
+<!ENTITY manageAddonsDescUnix2.label      "Change preferences for your add-ons">
+<!ENTITY manageAddons.label               "Manage Add-ons…">
+<!ENTITY manageAddons.accesskey           "M">
--- a/mail/chrome/messenger/preferences/preferences.dtd
+++ b/mail/chrome/messenger/preferences/preferences.dtd
@@ -1,14 +1,13 @@
-
-<!ENTITY  prefWindow.titleWin     "Options">
-<!ENTITY  prefWindow.titleGNOME   "&brandShortName; Preferences">
-<!ENTITY  prefWindow.styleWindows "width: 44em; min-height: 38.5em;">
-<!ENTITY  prefWindow.styleMac     "width: 47em;">
-<!ENTITY  prefWindow.styleGNOME   "width: 42em; min-height: 38em;">
-
-<!ENTITY paneGeneral.title        "General">
-<!ENTITY paneDisplay.title        "Display">
-<!ENTITY paneTags.title           "Tags">
-<!ENTITY paneComposition.title    "Composition">
-<!ENTITY paneAttachments.title    "Attachments">
-<!ENTITY panePrivacy.title        "Privacy">
-<!ENTITY paneAdvanced.title       "Advanced">
+
+<!ENTITY  prefWindow.titleWin     "Options">
+<!ENTITY  prefWindow.titleGNOME   "&brandShortName; Preferences">
+<!ENTITY  prefWindow.styleWindows "width: 44em; min-height: 38.5em;">
+<!ENTITY  prefWindow.styleMac     "width: 47em;">
+<!ENTITY  prefWindow.styleGNOME   "width: 42em; min-height: 38em;">
+
+<!ENTITY paneGeneral.title        "General">
+<!ENTITY paneDisplay.title        "Display">
+<!ENTITY paneComposition.title    "Composition">
+<!ENTITY paneAttachments.title    "Attachments">
+<!ENTITY panePrivacy.title        "Privacy">
+<!ENTITY paneAdvanced.title       "Advanced">
--- a/mail/chrome/messenger/preferences/preferences.properties
+++ b/mail/chrome/messenger/preferences/preferences.properties
@@ -1,50 +1,48 @@
-#### Add HTML and Plain Text Domain Names for sendOption
-
-html_domainsAddDomainTitle=Add HTML Domain Name
-html_domainsAddDomain=HTML Domain Name:
-plaintext_domainsAddDomainTitle=Add Plain Text Domain Name
-plaintext_domainsAddDomain=Plain Text Domain Name:
-
-domainNameErrorTitle=Domain Name Error
-#### LOCALIZATION NOTE: do not translate %S
-domainDuplicationError=The domain name %S already exists in the HTML or Plain Text lists.
-
-#### Junk
-confirmResetJunkTrainingTitle=Confirm
-confirmResetJunkTrainingText=Are you sure you want to reset the adaptive filter training data?
-
-#### Master Password
-
-setMasterPassword=Set Master Password…
-changeMasterPassword=Change Master Password…
-
-#### Downloads
-
-desktopFolderName=Desktop
-myDownloadsFolderName=My Downloads
-chooseDownloadFolderTitle=Choose Download Folder:
-
-#### Download Actions
-
-extensionNone=(NONE)
-removeButtonSingle=Remove Action
-removeButtonMultiple=Remove Actions
-removeTitleSingle=Remove Action
-removeTitleMultiple=Remove Actions
-removeMessageSingle=The selected Action will no longer be performed when files of the affected types are downloaded. Are you sure you want to remove this Action?
-removeMessageMultiple=The selected Actions will no longer be performed when files of the affected types are downloaded. Are you sure you want to remove these Actions?
-fileEnding=%S file
-saveToDisk=Save to Disc
-openWith=Open with %S
-actionsFiltered=The following Actions match your search:
-actionsAll=Automatically perform the associated Action with each of the following file types:
-
-
-#### Change Action
-
-extensionStringFormat=%S, %S
-fpTitleChooseApp=Select Helper Application
-fpTitleChooseDL=Select Download Folder
-
-#### Sound Notifications
-soundFilePickerTitle=Choose Sound
+#### Add HTML and Plain Text Domain Names for sendOption
+html_domainsAddDomainTitle=Add HTML Domain Name
+html_domainsAddDomain=HTML Domain Name:
+plaintext_domainsAddDomainTitle=Add Plain Text Domain Name
+plaintext_domainsAddDomain=Plain Text Domain Name:
+
+domainNameErrorTitle=Domain Name Error
+#### LOCALIZATION NOTE: do not translate %S
+domainDuplicationError=The domain name %S already exists in the HTML or Plain Text lists.
+
+#### Junk
+confirmResetJunkTrainingTitle=Confirm
+confirmResetJunkTrainingText=Are you sure you want to reset the adaptive filter training data?
+
+#### Master Password
+setMasterPassword=Set Master Password…
+changeMasterPassword=Change Master Password…
+
+#### Downloads
+desktopFolderName=Desktop
+myDownloadsFolderName=My Downloads
+chooseDownloadFolderTitle=Choose Download Folder:
+
+#### Download Actions
+extensionNone=(NONE)
+removeButtonSingle=Remove Action
+removeButtonMultiple=Remove Actions
+removeTitleSingle=Remove Action
+removeTitleMultiple=Remove Actions
+removeMessageSingle=The selected Action will no longer be performed when files of the affected types are downloaded. Are you sure you want to remove this Action?
+removeMessageMultiple=The selected Actions will no longer be performed when files of the affected types are downloaded. Are you sure you want to remove these Actions?
+fileEnding=%S file
+saveToDisk=Save to Disc
+openWith=Open with %S
+actionsFiltered=The following Actions match your search:
+actionsAll=Automatically perform the associated Action with each of the following file types:
+
+#### Change Action
+extensionStringFormat=%S, %S
+fpTitleChooseApp=Select Helper Application
+fpTitleChooseDL=Select Download Folder
+
+#### Sound Notifications
+soundFilePickerTitle=Choose Sound
+
+#### Shell Service
+alreadyDefaultClientTitle=Default Client
+alreadyDefault=%S is already set as your default mail client.
--- a/mail/chrome/messenger/preferences/privacy.dtd
+++ b/mail/chrome/messenger/preferences/privacy.dtd
@@ -1,54 +1,45 @@
-<!ENTITY itemJunk.label          "Junk">
-<!ENTITY itemPhishing.label      "Email Scams">
-<!ENTITY itemPasswords.label     "Passwords">
-<!ENTITY itemAntiVirus.label     "Anti-Virus">
-
-<!-- Junk Mail Controls -->
-<!ENTITY junkMail.intro "Set your default junk mail settings. Account-specific junk mail settings can be configured in Account Settings.">
-<!ENTITY manualMark.label "When I mark messages as junk:">
-<!ENTITY manualMark.accesskey "W">
-<!ENTITY manualMarkModeMove.label "Move them to the account's &quot;Junk&quot; folder">
-<!ENTITY manualMarkModeMove.accesskey "o">
-<!ENTITY manualMarkModeDelete.label "Delete them">
-<!ENTITY manualMarkModeDelete.accesskey "t">
-<!ENTITY markAsReadOnSpam.label "Mark messages determined to be Junk as read">
-<!ENTITY markAsReadOnSpam.accesskey "k">
-<!ENTITY enableJunkLogging.label "Enable junk filter logging">
-<!ENTITY enableJunkLogging.accesskey "g">
-<!ENTITY openJunkLog.label "Show log">
-<!ENTITY openJunkLog.accesskey "h">
-<!ENTITY resetTrainingData.label "Reset Training Data">
-<!ENTITY resetTrainingData.accesskey "D">
-
-<!-- Phishing Detector -->
-<!ENTITY phishingDetector1.intro  "&brandShortName; can analyse messages for suspected email scams by looking for common techniques used to deceive you.">
-<!ENTITY enablePhishingDetector1.label    "Tell me if the message I'm reading is a suspected email scam">
-<!ENTITY enablePhishingDetector1.accesskey  "e">
-<!ENTITY useDownloadedList.label "Use a downloaded list of suspected email scams">
-<!ENTITY useDownloadedList.accesskey "U">
-
-<!-- Passwords -->
-<!ENTITY savedPasswords.intro         "&brandShortName; can remember password information for all of your accounts so you do not need to re-enter your login details.">
-<!ENTITY  encryptEnabled.label        "Use a master password to encrypt stored passwords">
-<!ENTITY  encryptEnabled.accesskey    "s">
-<!ENTITY  masterPassword.intro        "When set, the Master Password protects all your passwords - but you must enter it once per session.">
-<!ENTITY  setMasterPassword.label     "Master Password">
-<!ENTITY  setMasterPassword.accesskey "M">
-<!ENTITY  removeMasterPassword.label  "Remove Master Password…">
-<!ENTITY  removeMasterPassword.accesskey "R">
-<!ENTITY  editPasswords.label         "Edit Saved Passwords">
-<!ENTITY  editPasswords.accesskey     "i">
-
-<!-- Anti Virus -->
-<!ENTITY antiVirus.intro      "&brandShortName; can make it easy for anti-virus software to analyse incoming mail messages for viruses before they are stored locally.">
-<!ENTITY antiVirus.label      "Allow anti-virus clients to quarantine individual incoming messages">
-<!ENTITY antiVirus.accesskey  "l">
-
-<!-- Extra strings we might use after the l10n string freeze in the preferences dialog -->
-<!ENTITY antiVirusCaption.label "Anti-Virus">
-<!ENTITY paswords.label         "Passwords">
-<!ENTITY emailScams.label       "Email Scams">
-<!ENTITY junkMail.label         "Junk Mail">
-<!ENTITY itemIntrusions.label   "Intrusions">
-<!ENTITY itemIntrusionsAndPasswords.label  "Intrusions &amp; Passwords">
-<!ENTITY itemJunkMail.label     "Junk Mail">
+<!ENTITY itemJunk.label          "Junk">
+<!ENTITY itemPhishing.label      "Email Scams">
+<!ENTITY itemPasswords.label     "Passwords">
+<!ENTITY itemAntiVirus.label     "Anti-Virus">
+
+<!-- Junk Mail Controls -->
+<!ENTITY junkMail.intro "Set your default junk mail settings. Account-specific junk mail settings can be configured in Account Settings.">
+<!ENTITY manualMark.label "When I mark messages as junk:">
+<!ENTITY manualMark.accesskey "W">
+<!ENTITY manualMarkModeMove.label "Move them to the account's &quot;Junk&quot; folder">
+<!ENTITY manualMarkModeMove.accesskey "o">
+<!ENTITY manualMarkModeDelete.label "Delete them">
+<!ENTITY manualMarkModeDelete.accesskey "t">
+<!ENTITY markAsReadOnSpam.label "Mark messages determined to be Junk as read">
+<!ENTITY markAsReadOnSpam.accesskey "k">
+<!ENTITY enableJunkLogging.label "Enable junk filter logging">
+<!ENTITY enableJunkLogging.accesskey "g">
+<!ENTITY openJunkLog.label "Show log">
+<!ENTITY openJunkLog.accesskey "h">
+<!ENTITY resetTrainingData.label "Reset Training Data">
+<!ENTITY resetTrainingData.accesskey "D">
+
+<!-- Phishing Detector -->
+<!ENTITY phishingDetector1.intro  "&brandShortName; can analyse messages for suspected email scams by looking for common techniques used to deceive you.">
+<!ENTITY enablePhishingDetector1.label    "Tell me if the message I'm reading is a suspected email scam">
+<!ENTITY enablePhishingDetector1.accesskey  "e">
+<!ENTITY useDownloadedList.label "Use a downloaded list of suspected email scams">
+<!ENTITY useDownloadedList.accesskey "U">
+
+<!-- Passwords -->
+<!ENTITY savedPasswords.intro         "&brandShortName; can remember password information for all of your accounts so you do not need to re-enter your login details.">
+<!ENTITY  encryptEnabled.label        "Use a master password to encrypt stored passwords">
+<!ENTITY  encryptEnabled.accesskey    "s">
+<!ENTITY  masterPassword.intro        "When set, the Master Password protects all your passwords - but you must enter it once per session.">
+<!ENTITY  setMasterPassword.label     "Master Password">
+<!ENTITY  setMasterPassword.accesskey "M">
+<!ENTITY  removeMasterPassword.label  "Remove Master Password…">
+<!ENTITY  removeMasterPassword.accesskey "R">
+<!ENTITY  editPasswords.label         "Edit Saved Passwords">
+<!ENTITY  editPasswords.accesskey     "i">
+
+<!-- Anti Virus -->
+<!ENTITY antiVirus.intro      "&brandShortName; can make it easy for anti-virus software to analyse incoming mail messages for viruses before they are stored locally.">
+<!ENTITY antiVirus.label      "Allow anti-virus clients to quarantine individual incoming messages">
+<!ENTITY antiVirus.accesskey  "l">
--- a/mail/chrome/messenger/preferences/receipts.dtd
+++ b/mail/chrome/messenger/preferences/receipts.dtd
@@ -1,10 +1,9 @@
 <!ENTITY dialog.title                  "Return Receipts">
-<!ENTITY receiptSettings.label         "Return Receipts">
 <!ENTITY requestReceipt.label          "When sending messages, always request a return receipt">
 <!ENTITY requestReceipt.accesskey      "W">
 <!ENTITY receiptArrive.label           "When a receipt arrives:">
 <!ENTITY leaveIt.label                 "Leave it in my Inbox">
 <!ENTITY leaveIt.accesskey             "i">
 <!ENTITY moveToSent.label              "Move it to my &quot;Sent&quot; folder">
 <!ENTITY moveToSent.accesskey          "m">
 <!ENTITY requestMDN.label              "When I receive a request for a return receipt:">
--- a/mail/chrome/messenger/preferences/sendoptions.dtd
+++ b/mail/chrome/messenger/preferences/sendoptions.dtd
@@ -1,41 +1,31 @@
-<!ENTITY dialog.title                 "Send Options">
-<!ENTITY sendMail.title               "Text Format">
-<!ENTITY sendMaildesc.label           "When sending messages in HTML format and one or more recipients are not listed as being able to receive HTML:">
-<!ENTITY askMe.label                  "Ask me what to do">
-<!ENTITY askMe.accesskey              "k">
-<!ENTITY convertPlain.label           "Convert the message to plain text">
-<!ENTITY convertPlain.accesskey       "c">
-<!ENTITY sendHTML.label               "Send the message in HTML anyway">
-<!ENTITY sendHTML.accesskey           "s">
-<!ENTITY sendBoth.label               "Send the message in both plain text and HTML">
-<!ENTITY sendBoth.accesskey           "e">
-<!ENTITY receiveHTML.label            "If you know a particular recipient can receive HTML mail, untick the 'Send email as plain text (no HTML)' box on the recipient's Address Book card.">
-<!ENTITY override.label               "Note: Use the Address Book to specify preferred text formats for recipients.">
-
-<!ENTITY domaindesc.label             "When you send a message to an address with one of the domain names listed below, &brandShortName; automatically sends the message in the correct format.">
-<!ENTITY HTMLTab.label                "HTML Domains">
-<!ENTITY HTMLTab.accesskey            "h">
-<!ENTITY PlainTextTab.label           "Plain Text Domains">
-<!ENTITY PlainTextTab.accesskey       "p">
-<!ENTITY AddHtmlDomain.label          "Add…">
-<!ENTITY AddHtmlDomain.accesskey      "a">
-<!ENTITY AddPlainText.label           "Add…">
-<!ENTITY AddPlainText.accesskey       "d">
-<!ENTITY DeleteHtmlDomain.label       "Delete">
-<!ENTITY DeleteHtmlDomain.accesskey   "l">
-<!ENTITY DeletePlainText.label        "Delete">
-<!ENTITY DeletePlainText.accesskey    "t">
-
-<!ENTITY add.htmltitle                "Add HTML Domain Name">
-<!ENTITY add.htmldomain               "HTML Domain Name:">
-<!ENTITY add.htmldomain.accesskey     "d">
-<!ENTITY add.plaintexttitle           "Add Plain Text Domain Name">
-<!ENTITY add.plaintextdomain          "Plain Text Domain Name:">
-<!ENTITY add.plaintext.accesskey      "d">
-
-<!-- LOCALIZATION NOTE: do not translate @string@ -->
-<!ENTITY domainnameError.title        "Domain Name Error">
-<!ENTITY duplicationError.label       "The domain name @string@ already exists in this list.">
-
-<!-- LOCALIZATION NOTE: do not translate @string@ -->
-<!ENTITY dualEntryError.label         "A domain name cannot appear in both the HTML and Plain Text lists. The domain name @string@ already exists.">
+<!ENTITY dialog.title                 "Send Options">
+<!ENTITY sendMail.title               "Text Format">
+<!ENTITY sendMaildesc.label           "When sending messages in HTML format and one or more recipients are not listed as being able to receive HTML:">
+<!ENTITY askMe.label                  "Ask me what to do">
+<!ENTITY askMe.accesskey              "k">
+<!ENTITY convertPlain.label           "Convert the message to plain text">
+<!ENTITY convertPlain.accesskey       "C">
+<!ENTITY sendHTML.label               "Send the message in HTML anyway">
+<!ENTITY sendHTML.accesskey           "S">
+<!ENTITY sendBoth.label               "Send the message in both plain text and HTML">
+<!ENTITY sendBoth.accesskey           "e">
+<!ENTITY override.label               "Note: Use the Address Book to specify preferred text formats for recipients.">
+
+<!ENTITY domaindesc.label             "When you send a message to an address with one of the domain names listed below, &brandShortName; automatically sends the message in the correct format.">
+<!ENTITY HTMLTab.label                "HTML Domains">
+<!ENTITY HTMLTab.accesskey            "H">
+<!ENTITY PlainTextTab.label           "Plain Text Domains">
+<!ENTITY PlainTextTab.accesskey       "P">
+<!ENTITY AddHtmlDomain.label          "Add…">
+<!ENTITY AddHtmlDomain.accesskey      "A">
+<!ENTITY AddPlainText.label           "Add…">
+<!ENTITY AddPlainText.accesskey       "A">
+<!ENTITY DeleteHtmlDomain.label       "Delete">
+<!ENTITY DeleteHtmlDomain.accesskey   "D">
+<!ENTITY DeletePlainText.label        "Delete">
+<!ENTITY DeletePlainText.accesskey    "D">
+
+<!ENTITY add.htmltitle                "Add HTML Domain Name">
+<!ENTITY add.htmldomain               "HTML Domain Name:">
+<!ENTITY add.plaintexttitle           "Add Plain Text Domain Name">
+<!ENTITY add.plaintextdomain          "Plain Text Domain Name:">
--- a/mail/chrome/messenger/prefs.properties
+++ b/mail/chrome/messenger/prefs.properties
@@ -1,57 +1,51 @@
-#
 # The following are used by the Account Wizard
 #
-enterAccountName=Please enter a name for this account.
-enterUserName=Please enter a username.
-enterName=Please enter your name.
 enterValidEmail=Please enter a valid email address.
 accountExists=A mail or newsgroup account with the same user name and server name already exists. Click Back and enter a different server name, or click Cancel.
 modifiedAccountExists=An account with that user name and server name already exists. Please enter a different user name and/or server name.
 userNameChanged=Your User Name has been updated. You may also need to update your Email Address and/or User Name associated with this account.
 serverNameChanged=The server name setting has changed. Please verify that any folders used by filters exist on the new server.
 # if the user chooses to cancel the wizard when no accounts are there throw a message
 # LOCALIZATION NOTE (cancelWizard) 
 # do not localize "\n\n"
 cancelWizard=Are you sure you want to exit the Account Wizard?\n\nIf you exit, any information you have entered will be lost and the account will not be created.
 accountWizard=Account Wizard
 WizardExit=Exit
 WizardContinue=Cancel
 # when the wizard already has a domain (Should we say something different?)
-enterValidEmailPrefix=Please enter a valid email address.
 enterValidHostname=Please enter a valid hostname.
 failedRemoveAccount=Failed to remove this account.
 failedDuplicateAccount=Failed to duplicate this account.
 #LOCALIZATION NOTE: confirmRemoveAccount: %S is the account pretty name
 confirmRemoveAccount=Are you sure you want to remove the account "%S"?
 confirmRemoveAccountTitle=Remove Account
 #LOCALIZATION NOTE: accountName: %1$S is server name, %2$S is user name
 accountName=%1$S - %2$S
 
 confirmDeferAccount=If you store this account's new mail in a different account's Inbox, you will no longer be able to access already downloaded email for this account. If you have mail in this account, please copy it to another account first. If you have filters that filter mail into this account, you should disable them or change the destination folder. If any accounts have special folders in this account (Sent, Drafts, Templates), you should change them to be in another account. Do you still want to store this account's email in a different account?
 confirmDeferAccountTitle=Defer Account?
 
-directoryUsedByOtherServer=This directory is already used by another server. Please pick a different directory.
+directoryUsedByOtherAccount=This directory is already used by the %S account. Please pick a different directory.
 #Provide default example values for sample email address
 exampleEmailUserName=user
 exampleEmailDomain=example.net
 emailFieldText=Email Address:
 #LOCALIZATION NOTE: defaultEmailText: %1$S is user name, %2$S is domain
 defaultEmailText=Enter your email address. This is the address others will use to send email to you (for example, "%1$S@%2$S"). 
 #LOCALIZATION NOTE: customizedEmailText: %1$S is provider, %2$S is email username, %3$S is sample email, %4$S is sample username
 customizedEmailText=Enter your %1$S %2$S (for example, if your %1$S email address is "%3$S", your %2$S is "%4$S"). 
 
 # account manager stuff
 prefPanel-server=Server Settings
 prefPanel-copies=Copies & Folders
 prefPanel-syncing-and-diskspace=Synchronising & Disc Space
 prefPanel-diskspace=Disc Space
 prefPanel-addressing=Composition & Addressing
-prefPanel-advanced=Advanced
 prefPanel-junk=Junk Settings
 ## LOCALIZATION NOTE (prefPanel-smtp): Don't translate "SMTP"
 prefPanel-smtp=Outgoing Server (SMTP)
 
 # account manager multiple identity support
 #LOCALIZATION NOTE: accountName: %1$S 
 identity-list-title=Identities for %1$S
 
--- a/mail/chrome/messenger/search.properties
+++ b/mail/chrome/messenger/search.properties
@@ -1,28 +1,23 @@
-# search and filter strings
-
-searchCustomize="Customise Headers…"
-
-# these are the fields that get inserted in the search line
-# for "and" searches, this looks like:
-#
-# searchAnd0 <attribute> searchAnd1 <operator> searchAnd2 <value> searchAnd4
-#
-# for example, in english this looks like:
-# and the [Sender ] [doesn't contain] [John]
-#
-# TODO: need to special-case the first line (filterindex==0)
-#
-
-# filter stuff
-
-searchingMessage=Searching…
-searchSuccessMessage=1 match found
-searchSuccessMessages=%S matches found
-searchFailureMessage=No matches found
-labelForStopButton=Stop
-labelForSearchButton=Search
-labelForStopButton.accesskey=S
-labelForSearchButton.accesskey=S
-
-moreButtonTooltipText=Add a new rule
-lessButtonTooltipText=Remove this rule
+# these are the fields that get inserted in the search line
+# for "and" searches, this looks like:
+#
+# searchAnd0 <attribute> searchAnd1 <operator> searchAnd2 <value> searchAnd4
+#
+# for example, in english this looks like:
+# and the [Sender ] [doesn't contain] [John]
+#
+# TODO: need to special-case the first line (filterindex==0)
+
+# filter stuff
+
+searchingMessage=Searching…
+searchSuccessMessage=1 match found
+searchSuccessMessages=%S matches found
+searchFailureMessage=No matches found
+labelForStopButton=Stop
+labelForSearchButton=Search
+labelForStopButton.accesskey=S
+labelForSearchButton.accesskey=S
+
+moreButtonTooltipText=Add a new rule
+lessButtonTooltipText=Remove this rule
deleted file mode 100644
--- a/mail/chrome/messenger/shellservice.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-optionsLabel=%S &Options
-safeModeLabel=%S &Safe Mode
-alreadyDefaultClientTitle=Default Client
-alreadyDefault=%S is already set as your default mail client.
-
--- a/mail/chrome/messenger/start.dtd
+++ b/mail/chrome/messenger/start.dtd
@@ -22,11 +22,9 @@
 <!ENTITY startpage.help "Thunderbird Help">
 <!ENTITY startpage.helpInfo "For frequently asked questions, tips and general help, visit">
 <!ENTITY startpage.helpURL "http://www.mozilla.org/support/thunderbird/">
 
 <!ENTITY startpage.page "Thunderbird Product Page">
 <!ENTITY startpage.pageInfo "For product information, visit the">
 <!ENTITY startpage.pageURL "http://www.mozilla.org/products/thunderbird/">
 
-<!ENTITY startpage.extra "<p>For British English (and other) spell-checking dictionaries, visit mozdev&#8217;s <a href='http://dictionaries.mozdev.org/installation.html'>Dictionaries for Mozilla</a>, or just:</p> <ul><li><a href='http://downloads.mozdev.org/dictionaries/spell-en-GB.xpi'>Directly download the British English dictionary</a></li></ul>">
-
-<!ENTITY startpage.poweredByGecko "Powered by Gecko.">
+<!ENTITY startpage.extra "<p>For British English (and other) spell-checking dictionaries, visit mozdev&#8217;s <a href='http://dictionaries.mozdev.org/installation.html'>Dictionaries for Mozilla</a>, or just:</p> <ul><li><a href='http://downloads.mozdev.org/dictionaries/spell-en-GB.xpi'>Directly download the British English dictionary</a></li></ul>">
\ No newline at end of file
--- a/mail/chrome/messenger/tabmail.dtd
+++ b/mail/chrome/messenger/tabmail.dtd
@@ -1,12 +1,2 @@
-<!ENTITY  untitledTab              "(Untitled)">
-<!ENTITY  newTab.label             "New Tab">
-<!ENTITY  newTab.accesskey         "N">
-<!ENTITY  closeTab.label           "Close Tab">
-<!ENTITY  closeTab.accesskey       "c">
-<!ENTITY  closeOtherTabs.accesskey "o">
-<!ENTITY  closeOtherTabs.label     "Close Other Tabs">
-<!ENTITY  reloadAllTabs.label      "Reload All Tabs">
-<!ENTITY  reloadAllTabs.accesskey  "A">
-<!ENTITY  reloadTab.label          "Reload Tab">
-<!ENTITY  reloadTab.accesskey      "r">
-<!ENTITY  listAllTabs.label        "List all tabs">
+<!ENTITY  closeTab.label           "Close Tab">
+<!ENTITY  listAllTabs.label        "List all tabs">
deleted file mode 100644
--- a/mail/chrome/messenger/virtualFolderName.dtd
+++ /dev/null
@@ -1,40 +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
-   - David Bienvenu.
-   - Portions created by the Initial Developer are Copyright (C) 2000
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   David Bienvenu <bienvenu@nventure.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 createVFDialog.title              "Save Search">
-<!ENTITY virtualFolder.label               "Enter the name for your saved search folder: ">
-<!ENTITY virtualFolder.accesskey           "E">
--- a/mail/installer/custom.properties
+++ b/mail/installer/custom.properties
@@ -1,114 +1,100 @@
-# ***** 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 Mozilla Installer code.
-#
-# The Initial Developer of the Original Code is Mozilla Foundation
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Robert Strong <robert.bugzilla@gmail.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 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:
-
-# This file must be saved as UTF8
-
-# Accesskeys are defined by prefixing the letter that is to be used for the
-# accesskey with an ampersand (e.g. &).
-
-# Don't replace ${BrandShortName}, $(^Name), or $(^NameDA) with a custom string.
-
-# You can use \n to create a newline in the string but only when the string
-# from en-US contains a \n.
-
-REG_APP_DESC=${BrandShortName} is a full-featured email application. ${BrandShortName} supports IMAP and POP mail protocols, as well as HTML mail formatting. Built-in junk mail controls, RSS capabilities, powerful quick search, spell check as you type, global inbox, and advanced message filtering round out ${BrandShortName}'s modern feature set.
-OPTIONAL_COMPONENTS_TITLE=Choose Optional Components
-OPTIONAL_COMPONENTS_SUBTITLE=Choose which features of $(^NameDA) you want to install.
-OPTIONAL_COMPONENTS_LABEL=Optional Components:
-APP_DESC=Required files for the ${BrandShortName} application
-DOMI_TITLE=DOM Inspector
-DOMI_TEXT=Inspects the structure and properties of a window and its contents.
-QFA_TITLE=Quality Feedback Agent
-QFA_TEXT=Sends information about program crashes to Mozilla.
-CONTEXT_OPTIONS=${BrandShortName} &Options
-CONTEXT_SAFE_MODE=${BrandShortName} &Safe Mode
-SAFE_MODE=Safe Mode
-OPTIONS_PAGE_TITLE=Setup Type
-OPTIONS_PAGE_SUBTITLE=Choose setup options
-SHORTCUTS_PAGE_TITLE=Set Up Shortcuts
-SHORTCUTS_PAGE_SUBTITLE=Create Program Icons
-SUMMARY_PAGE_TITLE=Summary
-SUMMARY_PAGE_SUBTITLE=Ready to start installing ${BrandShortName}
-SUMMARY_INSTALLED_TO=${BrandShortName} will be installed to the following location:
-SUMMARY_REBOOT_REQUIRED_INSTALL=A restart of your computer may be required to complete the installation.
-SUMMARY_REBOOT_REQUIRED_UNINSTALL=A restart of your computer may be required to complete the uninstall.
-SUMMARY_CLICK=Click Install to continue.
-SURVEY_TEXT=&Tell us what you thought of ${BrandShortName}
-LAUNCH_TEXT=&Launch $(^Name) now
-WARN_APP_RUNNING_INSTALL=$(^Name) must be closed to proceed with the installation.\n\nClick "OK" to exit $(^Name) automatically and continue.
-CREATE_ICONS_DESC=Create icons for ${BrandShortName}:
-ICONS_DESKTOP=On my &Desktop
-ICONS_STARTMENU=In my &Start Menu Programs folder
-ICONS_QUICKLAUNCH=In my &Quick Launch bar
-WARN_MANUALLY_CLOSE_APP_INSTALL=$BrandShortName must be closed to proceed with the installation.\n\nPlease close $BrandShortName to continue.
-WARN_MANUALLY_CLOSE_APP_UNINSTALL=${BrandFullName} must be closed to proceed with the uninstall.\n\nPlease close ${BrandFullName} to continue.
-WARN_MANUALLY_CLOSE_APP_LAUNCH=${BrandFullName} is already running.\n\nPlease close ${BrandFullName} prior to launching the version you have just installed.
-WARN_WRITE_ACCESS=You don't have access to write to the installation directory.\n\nClick OK to select a different directory.
-WARN_DISK_SPACE=You don't have sufficient disc space to install to this location.\n\nClick OK to select a different location.
-WARN_UNSUPPORTED_MSG=Sorry, ${BrandShortName} can't be installed. This version of ${BrandShortName} requires ${MinUnsupportedVer} or newer.
-WARN_RESTART_REQUIRED_UNINSTALL=Your computer must be restarted to complete a previous uninstall of ${BrandShortName}. Do you want to reboot now?
-WARN_RESTART_REQUIRED_UPGRADE=Your computer must be restarted to complete a previous upgrade of ${BrandShortName}. Do you want to reboot now?
-ERROR_CREATE_DIRECTORY=Error creating directory:\n\n$0\n\nClick Cancel to stop the installation or\nRetry to try again.
-ERROR_CREATE_DIRECTORY_PREFIX=Error creating directory:
-ERROR_CREATE_DIRECTORY_SUFFIX=Click Cancel to stop the installation or\nRetry to try again.
-
-UN_CONFIRM_PAGE_TITLE=Uninstall $BrandFullName
-UN_CONFIRM_PAGE_SUBTITLE=Remove $BrandFullName from your computer.
-UN_CONFIRM_UNINSTALLED_FROM=$BrandShortName will be uninstalled from the following location:
-UN_CONFIRM_CLICK=Click Uninstall to continue.
-
-BANNER_CHECK_EXISTING=Checking existing installation…
-
-STATUS_INSTALL_APP=Installing ${BrandShortName}…
-STATUS_INSTALL_LANG=Installing Language Files (${AB_CD})…
-STATUS_INSTALL_OPTIONAL=Installing Optional Components…
-STATUS_UNINSTALL_MAIN=Uninstalling ${BrandShortName}…
-STATUS_CLEANUP=Cleaning up the birdcage…
-
-# _DESC strings support approximately 65 characters per line.
-# One line
-OPTIONS_SUMMARY=Choose the type of setup you prefer, then click Next.
-# One line
-OPTION_STANDARD_DESC=${BrandShortName} will be installed with the most common options.
-OPTION_STANDARD_RADIO=&Standard
-# One line
-OPTION_COMPLETE_DESC=${BrandShortName} will be installed with all available options.
-OPTION_COMPLETE_RADIO=C&omplete
-# Two lines
-OPTION_CUSTOM_DESC=You may choose individual options to be installed. Recommended for experienced users.
-OPTION_CUSTOM_RADIO=&Custom
+# ***** 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 Mozilla Installer code.
+#
+# The Initial Developer of the Original Code is Mozilla Foundation
+# Portions created by the Initial Developer are Copyright (C) 2006
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#  Robert Strong <robert.bugzilla@gmail.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 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:
+
+# This file must be saved as UTF8
+
+# Accesskeys are defined by prefixing the letter that is to be used for the
+# accesskey with an ampersand (e.g. &).
+
+# Don't replace ${BrandShortName}, $(^Name), or $(^NameDA) with a custom string.
+
+# You can use \n to create a newline in the string but only when the string
+# from en-US contains a \n.
+
+REG_APP_DESC=${BrandShortName} is a full-featured email application. ${BrandShortName} supports IMAP and POP mail protocols, as well as HTML mail formatting. Built-in junk mail controls, RSS capabilities, powerful quick search, spell check as you type, global inbox, and advanced message filtering round out ${BrandShortName}'s modern feature set.
+CONTEXT_OPTIONS=${BrandShortName} &Options
+CONTEXT_SAFE_MODE=${BrandShortName} &Safe Mode
+SAFE_MODE=Safe Mode
+OPTIONS_PAGE_TITLE=Setup Type
+OPTIONS_PAGE_SUBTITLE=Choose setup options
+SHORTCUTS_PAGE_TITLE=Set Up Shortcuts
+SHORTCUTS_PAGE_SUBTITLE=Create Program Icons
+SUMMARY_PAGE_TITLE=Summary
+SUMMARY_PAGE_SUBTITLE=Ready to start installing ${BrandShortName}
+SUMMARY_INSTALLED_TO=${BrandShortName} will be installed to the following location:
+SUMMARY_REBOOT_REQUIRED_INSTALL=A restart of your computer may be required to complete the installation.
+SUMMARY_REBOOT_REQUIRED_UNINSTALL=A restart of your computer may be required to complete the uninstall.
+SUMMARY_CLICK=Click Install to continue.
+SURVEY_TEXT=&Tell us what you thought of ${BrandShortName}
+LAUNCH_TEXT=&Launch $(^Name) now
+CREATE_ICONS_DESC=Create icons for ${BrandShortName}:
+ICONS_DESKTOP=On my &Desktop
+ICONS_STARTMENU=In my &Start Menu Programs folder
+ICONS_QUICKLAUNCH=In my &Quick Launch bar
+WARN_MANUALLY_CLOSE_APP_INSTALL=$BrandShortName must be closed to proceed with the installation.\n\nPlease close $BrandShortName to continue.
+WARN_MANUALLY_CLOSE_APP_UNINSTALL=${BrandFullName} must be closed to proceed with the uninstall.\n\nPlease close ${BrandFullName} to continue.
+WARN_MANUALLY_CLOSE_APP_LAUNCH=${BrandFullName} is already running.\n\nPlease close ${BrandFullName} prior to launching the version you have just installed.
+WARN_WRITE_ACCESS=You don't have access to write to the installation directory.\n\nClick OK to select a different directory.
+WARN_DISK_SPACE=You don't have sufficient disc space to install to this location.\n\nClick OK to select a different location.
+WARN_UNSUPPORTED_MSG=Sorry, ${BrandShortName} can't be installed. This version of ${BrandShortName} requires ${MinUnsupportedVer} or newer.
+WARN_RESTART_REQUIRED_UNINSTALL=Your computer must be restarted to complete a previous uninstall of ${BrandShortName}. Do you want to reboot now?
+WARN_RESTART_REQUIRED_UPGRADE=Your computer must be restarted to complete a previous upgrade of ${BrandShortName}. Do you want to reboot now?
+ERROR_CREATE_DIRECTORY_PREFIX=Error creating directory:
+ERROR_CREATE_DIRECTORY_SUFFIX=Click Cancel to stop the installation or\nRetry to try again.
+
+UN_CONFIRM_PAGE_TITLE=Uninstall $BrandFullName
+UN_CONFIRM_PAGE_SUBTITLE=Remove $BrandFullName from your computer.
+UN_CONFIRM_UNINSTALLED_FROM=$BrandShortName will be uninstalled from the following location:
+UN_CONFIRM_CLICK=Click Uninstall to continue.
+
+BANNER_CHECK_EXISTING=Checking existing installation…
+
+STATUS_INSTALL_APP=Installing ${BrandShortName}…
+STATUS_INSTALL_LANG=Installing Language Files (${AB_CD})…
+STATUS_UNINSTALL_MAIN=Uninstalling ${BrandShortName}…
+STATUS_CLEANUP=Cleaning up the birdcage…
+
+# _DESC strings support approximately 65 characters per line.
+# One line
+OPTIONS_SUMMARY=Choose the type of setup you prefer, then click Next.
+# One line
+OPTION_STANDARD_DESC=${BrandShortName} will be installed with the most common options.
+OPTION_STANDARD_RADIO=&Standard
+# Two lines
+OPTION_CUSTOM_DESC=You may choose individual options to be installed. Recommended for experienced users.
+OPTION_CUSTOM_RADIO=&Custom