--- a/suite/chrome/common/contentAreaCommands.dtd
+++ b/suite/chrome/common/contentAreaCommands.dtd
@@ -1,16 +1,16 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- Context Menu -->
-<!ENTITY popupWindowRejectCmd.label     "Reject popup windows from this site">
+<!ENTITY popupWindowRejectCmd.label     "Reject popup windows from this web site">
 <!ENTITY popupWindowRejectCmd.accesskey "o">
-<!ENTITY popupWindowAllowCmd.label      "Allow popup windows from this site">
+<!ENTITY popupWindowAllowCmd.label      "Allow popup windows from this web site">
 <!ENTITY popupWindowAllowCmd.accesskey  "o">
 <!ENTITY openLinkCmdInTab.label       "Open Link in New Tab">
 <!ENTITY openLinkCmdInTab.accesskey   "T">
 <!ENTITY openLinkCmd.label            "Open Link in New Window">
 <!ENTITY openLinkCmd.accesskey        "W">
 <!ENTITY openLinkCmdInPrivateWindow.label     "Open Link in Private Window">
 <!ENTITY openLinkCmdInPrivateWindow.accesskey "d">
 <!ENTITY openLinkInWindowCmd.label    "Open">
@@ -107,20 +107,24 @@
 <!ENTITY mediaUnmute.label            "Unmute">
 <!ENTITY mediaUnmute.accesskey        "m">
 <!ENTITY mediaPlaybackRate.label        "Playback Speed">
 <!ENTITY mediaPlaybackRate.accesskey    "b">
 <!ENTITY mediaPlaybackRate050.label     "Slow Motion (½×)">
 <!ENTITY mediaPlaybackRate050.accesskey "S">
 <!ENTITY mediaPlaybackRate100.label     "Normal Speed">
 <!ENTITY mediaPlaybackRate100.accesskey "N">
+<!ENTITY mediaPlaybackRate125.label     "Fast Speed (1¼×)">
+<!ENTITY mediaPlaybackRate125.accesskey "F">
 <!ENTITY mediaPlaybackRate150.label     "High Speed (1½×)">
 <!ENTITY mediaPlaybackRate150.accesskey "H">
 <!ENTITY mediaPlaybackRate200.label     "Double Speed">
 <!ENTITY mediaPlaybackRate200.accesskey "D">
+<!ENTITY mediaLoop.label              "Loop">
+<!ENTITY mediaLoop.accesskey          "o">
 <!-- LOCALIZATION NOTE: The access keys for "Show Controls" and
 "Hide Controls" are the same because the two context-menu
 items are mutually exclusive. -->
 <!ENTITY mediaShowControls.label      "Show Media Controls">
 <!ENTITY mediaShowControls.accesskey  "a">
 <!ENTITY mediaHideControls.label      "Hide Media Controls">
 <!ENTITY mediaHideControls.accesskey  "a">
 <!ENTITY videoFullScreen.label        "Full Screen">

--- a/suite/chrome/common/pref/pref-fonts.dtd
+++ b/suite/chrome/common/pref/pref-fonts.dtd
@@ -12,64 +12,68 @@
 
 <!ENTITY  typefaces.label                         "Typeface">
 <!ENTITY  sizes.label                             "Size (pixels)">
 
 <!ENTITY  proportional.label                      "Proportional:">
 <!ENTITY  proportional.accesskey                  "P">
 
 <!ENTITY  serif.label                             "Serif:">
-<!ENTITY  serif.accesskey                         "s">
+<!ENTITY  serif.accesskey                         "S">
 <!ENTITY  sans-serif.label                        "Sans Serif:">
 <!ENTITY  sans-serif.accesskey                    "n">
 <!ENTITY  monospace.label                         "Monospace:">
-<!ENTITY  monospace.accesskey                     "m">
+<!ENTITY  monospace.accesskey                     "M">
 <!-- LOCALIZATION NOTE (fantasy.label): 'Fantasy' means 'Ornate' -->
 <!ENTITY  fantasy.label                           "Fantasy:">
-<!ENTITY  fantasy.accesskey                       "f">
+<!ENTITY  fantasy.accesskey                       "F">
 <!ENTITY  cursive.label                           "Cursive:">
-<!ENTITY  cursive.accesskey                       "c">
+<!ENTITY  cursive.accesskey                       "C">
 
-<!ENTITY  font.langGroup.latin1                   "Western">
-<!ENTITY  font.langGroup.latin2                   "Central European">
+<!-- LOCALIZATION NOTE (font.langGroup.latin) :
+     Translate "Latin" as the name of Latin (Roman) script, not as the name of
+     the Latin language. -->
+<!ENTITY  font.langGroup.latin                    "Latin">
 <!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.unicode1                 "Unicode">
-<!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">
 <!ENTITY  font.langGroup.math                     "Mathematics">
+<!ENTITY  font.langGroup.odia                     "Odia">
+<!ENTITY  font.langGroup.telugu                   "Telugu">
+<!ENTITY  font.langGroup.kannada                  "Kannada">
+<!ENTITY  font.langGroup.sinhala                  "Sinhala">
+<!ENTITY  font.langGroup.tibetan                  "Tibetan">
+<!ENTITY  font.langGroup.other                    "Other Writing Systems">
 <!-- 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 documents to use other fonts">
 <!ENTITY  useDocumentFonts.accesskey              "o">
 
 <!-- leaving this stuff in for now -->
 
 <!ENTITY  header2                                 "When a web page chooses its own fonts">
 <!ENTITY  useDefaultFont.label                    "Use my default fonts, ignoring the fonts the page has chosen">
-<!ENTITY  useDefaultFont.accesskey                "u">
+<!ENTITY  useDefaultFont.accesskey                "U">

--- a/suite/chrome/common/tasksOverlay.dtd
+++ b/suite/chrome/common/tasksOverlay.dtd
@@ -1,27 +1,28 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- extracted from tasksOverlay.xul -->
 <!ENTITY navigatorCmd.label "Browser">
 <!ENTITY navigatorCmd.accesskey "B">
 <!ENTITY navigatorCmd.commandkey "1">
+
 <!-- LOCALIZATION NOTE (editorCmd.label): DONT_TRANSLATE -->
-<!ENTITY editorCmd.label					"Composer">
-<!ENTITY editorCmd.accesskey				"c">
-<!ENTITY editorCmd.commandkey				"4">
+<!ENTITY editorCmd.label "Composer">
+<!ENTITY editorCmd.accesskey "c">
+<!ENTITY editorCmd.commandkey "4">
 
-<!ENTITY errorConsoleCmd.label                                  "Error Console">
-<!ENTITY errorConsoleCmd.accesskey				"C">
-<!ENTITY errorConsoleCmd.commandkey				"j">
+<!ENTITY errorConsoleCmd.label "Error Console">
+<!ENTITY errorConsoleCmd.accesskey "C">
+<!ENTITY errorConsoleCmd.commandkey2 "j">
 
-<!ENTITY taskNavigator.tooltip  "Browser">
-<!ENTITY taskComposer.tooltip  "Composer">
+<!ENTITY taskNavigator.tooltip "Browser">
+<!ENTITY taskComposer.tooltip "Composer">
 
 <!ENTITY webDevelopment.label "Web Development">
 <!ENTITY webDevelopment.accesskey "W">
 
 <!ENTITY windowMenu.label "Window">
 <!ENTITY windowMenu.accesskey "W">
 
 <!ENTITY tasksMenu.label "Tools">

--- a/suite/chrome/mailnews/addressbook/abMailListDialog.dtd
+++ b/suite/chrome/mailnews/addressbook/abMailListDialog.dtd
@@ -1,21 +1,20 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- Title -->
 <!ENTITY mailListWindow.title           "Mailing List">
-<!-- Labels -->
+
+<!-- Labels and Access Keys -->
 <!ENTITY addToAddressBook.label         "Add to: ">
-
+<!ENTITY addToAddressBook.accesskey     "A">
 <!ENTITY ListName.label                 "List Name: ">
+<!ENTITY ListName.accesskey             "L">
 <!ENTITY ListNickName.label             "List Nickname: ">
+<!ENTITY ListNickName.accesskey         "N">
 <!ENTITY ListDescription.label          "Description: ">
+<!ENTITY ListDescription.accesskey      "D">
 <!-- 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 AddressTitle.accesskey         "m">
 
-<!-- Access Keys -->
-<!ENTITY addToAddressBook.accesskey     "A">
-<!ENTITY ListName.accesskey             "L">
-<!ENTITY ListNickName.accesskey         "N">
-<!ENTITY ListDescription.accesskey      "e">
-

--- a/suite/chrome/mailnews/messenger.properties
+++ b/suite/chrome/mailnews/messenger.properties
@@ -342,16 +342,22 @@ macBiffNotification_messages_extra=%1$S 
 macBiffNotification_separator=,\u0020
 
 # LOCALIZATION NOTE(newMailNotification_message): %1$S is the name of the account %2$S is the number of new messages  
 newMailNotification_message=%1$S received %2$S new message
 
 # LOCALIZATION NOTE(newMailNotification_messages): %1$S is the name of the account %2$S is the number of new messages  
 newMailNotification_messages=%1$S received %2$S new messages
 
+# LOCALIZATION NOTE(newMailAlert_message):
+# Semi-colon list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the name of the account, #2 is the number of new messages
+newMailAlert_message=#1 received #2 new message;#1 received #2 new messages
+
 # For the Quota tab in the mail folder properties dialog
 quotaUsedFree=%S of %S kB used
 quotaPercentUsed=%S%% full
 
 # for message views
 confirmViewDeleteTitle=Confirm
 confirmViewDeleteMessage=Are you sure you want to delete this view?
 
@@ -441,20 +447,22 @@ fileNotFoundMsg = The file %S does not e
 confirmMsgDelete.title=Confirm Deletion
 confirmMsgDelete.collapsed.desc=This will delete messages in collapsed threads. Are you sure you want to continue?
 confirmMsgDelete.deleteNoTrash.desc=This will delete messages immediately, without saving a copy to Deleted. Are you sure you want to continue?
 confirmMsgDelete.deleteFromTrash.desc=This will permanently delete messages from Deleted. Are you sure you want to continue?
 confirmMsgDelete.dontAsk.label=Don't ask me again.
 confirmMsgDelete.delete.label=Delete
 
 mailServerLoginFailedTitle=Login Failed
-# LOCALIZATION NOTE (mailServerLoginFailedTitle): Insert "%S" in your
-# translation where you wish to display the hostname of the server to which
-# login failed.
-mailServerLoginFailed=Login to server %S failed.
+# LOCALIZATION NOTE (mailServerLoginFailedTitleWithAccount):
+# "%S" is the account name.
+mailServerLoginFailedTitleWithAccount=Login to account "%S" failed
+# LOCALIZATION NOTE (mailServerLoginFailed2):
+# %1$S is the host name of the server, %2$S is the user name.
+mailServerLoginFailed2=Login to server %1$S with username %2$S failed.
 mailServerLoginFailedRetryButton=&Retry
 mailServerLoginFailedEnterNewPasswordButton=&Enter New Password
 
 # LOCALIZATION NOTE (junkBarMessage): %S is the brandname
 junkBarMessage=%S regards this message as junk.
 junkBarButton=Not Junk
 junkBarButtonKey=N
 junkBarInfoButton=?

--- a/suite/chrome/mailnews/pref/removeAccount.dtd
+++ b/suite/chrome/mailnews/pref/removeAccount.dtd
@@ -5,15 +5,18 @@
 <!ENTITY dialogTitle                  "Remove Account and Data">
 <!ENTITY removeButton.label           "Remove">
 <!ENTITY removeButton.accesskey       "R">
 <!ENTITY removeAccount.label          "Remove account information">
 <!ENTITY removeAccount.accesskey      "a">
 <!ENTITY removeAccount.desc           "Removes only &brandShortName;'s knowledge of this account. Does not affect the account itself on the server.">
 <!ENTITY removeData.label             "Remove message data">
 <!ENTITY removeData.accesskey         "d">
+<!ENTITY removeDataChat.label         "Remove conversation data">
+<!ENTITY removeDataChat.accesskey     "d">
 <!ENTITY removeDataLocalAccount.desc  "Removes all messages, folders and filters associated with this account from your local disc. This does not affect some messages which may still be kept on the server. Do not choose this if you plan to archive the local data or re-use it in &brandShortName; later.">
 <!ENTITY removeDataServerAccount.desc "Removes all messages, folders and filters associated with this account from your local disc. Your messages and folders are still kept on the server.">
+<!ENTITY removeDataChatAccount.desc   "Removes all logs of conversations stored for this account on your local disc.">
 <!ENTITY showData.label               "Show data location">
 <!ENTITY showData.accesskey           "S">
 <!ENTITY progressPending              "Removing selected data…">
 <!ENTITY progressSuccess              "Removal succeeded.">
 <!ENTITY progressFailure              "Removal failed.">