Bug 789686 - Update en-GB for Thunderbird 17 r=pending
authorIan Neal <iann_cvs@blueyonder.co.uk>
Sun, 07 Oct 2012 11:02:19 +0100
changeset 183 e7c8cd94ecd9524c01d70f11c62f27d5592bdd09
parent 182 b16e1353b4077c534865389ee7affe106a7d38ba
child 184 89262471136a5c0365d380b743d3b9394cd71eab
push id35
push useriann_cvs@blueyonder.co.uk
push dateSun, 07 Oct 2012 10:02:52 +0000
reviewerspending
bugs789686
Bug 789686 - Update en-GB for Thunderbird 17 r=pending
chat/conversations.properties
chat/irc.properties
mail/chrome/messenger/FilterEditor.dtd
mail/chrome/messenger/FilterListDialog.dtd
mail/chrome/messenger/aboutDialog.dtd
mail/chrome/messenger/am-mdn.dtd
mail/chrome/messenger/filter.properties
mail/chrome/messenger/folderProps.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/sendProgress.dtd
mail/chrome/messenger/messengercompose/sendProgress.properties
mail/chrome/messenger/msgHdrViewOverlay.dtd
mail/chrome/messenger/preferences/general.dtd
mail/chrome/messenger/prefs.properties
mail/chrome/messenger/sanitize.dtd
mail/chrome/messenger/searchTermOverlay.dtd
--- a/chat/conversations.properties
+++ b/chat/conversations.properties
@@ -17,26 +17,46 @@ statusChanged=%1$S is now %2$S.
 #  %3$S is the status text (eg. "I'm currently away from the computer").
 statusChangedWithStatusText=%1$S is now %2$S: %3$S.
 # LOCALIZATION NOTE (statusChangedFromUnknown[WithStatusText]):
 #  special case of the previous 2 strings for when the status was
 #  previously unknown. These 2 strings should not mislead the user
 #  into thinking the person's status has just changed.
 statusChangedFromUnknown=%1$S is %2$S.
 statusChangedFromUnknownWithStatusText=%1$S is %2$S: %3$S.
-
+# LOCALIZATION NOTE (statusKnown[WithStatusText]):
+# special case of the previous 2 strings for when an account has just
+# been reconnected, so the status is now known. These 2 strings should not
+# mislead the user into thinking the person's status has just changed.
+statusKnown=Your account has been reconnected (%1$S is %2$S).
+statusKnownWithStatusText=Your account has been reconnected (%1$S is %2$S: %3$S).
 # LOCALIZATION NOTE (statusUnknown):
 #  %S is the display name of the contact.
 statusUnknown=Your account is disconnected (the status of %S is no longer known).
+
 accountDisconnected=Your account is disconnected.
+accountReconnected=Your account has been reconnected.
 
 # LOCALIZATION NOTE (autoReply):
 #  %S is replaced by the text of a message that was sent as an automatic reply.
 autoReply=Auto-reply - %S
 
+# LOCALIZATION NOTE (topicSet):
+#  %1$S is the conversation name, %2$S is the topic.
+topicSet=The topic for %1$S is: %2$S.
+# LOCALIZATION NOTE (topicNotSet):
+#  %S is the conversation name.
+topicNotSet=There is no topic for %S.
+# LOCALIZATION NOTE (topicChanged):
+#  %1$S is the user who changed the topic, %2$S is the new topic.
+topicChanged=%1$S has changed the topic to: %2$S.
+# LOCALIZATION NOTE (topicCleared):
+#  %1$S is the user who cleared the topic.
+topicCleared=%1$S has cleared the topic.
+
 # LOCALIZATION NOTE (messenger.conversations.selections.ellipsis):
 #  ellipsis is used when copying a part of a message to show that the message was cut
 messenger.conversations.selections.ellipsis=[…]
 
 # LOCALIZATION NOTE (messenger.conversations.selections.{system,content,action}MessagesTemplate):
 #  These 3 templates are used to format selected messages before copying them.
 #  Do not translate the texts between % characters, but feel free to adjust
 #  whitespace and separators to make them fit your locale.
--- a/chat/irc.properties
+++ b/chat/irc.properties
@@ -66,17 +66,16 @@ command.quit=%S &lt;message&gt;: Disconn
 command.quote=%S &lt;command&gt;: Send a raw command to the server.
 command.time=%S: Displays the current local time at the IRC server.
 command.topic=%S [&lt;new topic&gt;]: View or change the channel topic.
 command.umode=%S (+|-)&lt;new mode&gt;: Set or unset a user mode.
 command.version=%S &lt;nick&gt;: Request the version of a user's client.
 command.voice=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Grant channel voice status to someone. You must be a channel operator to do this.
 command.wallops=%S &lt;message&gt;: If you don't know what this is, you probably can't use it (sends a command to all connected with the +w flag and all operators on the server.
 command.whois=%S &lt;nick&gt;: Get information on a user.
-command.whowas=%S &lt;nick&gt;: Get information on a user that has logged off.
 
 # LOCALIZATION NOTE (message.*):
 #    These are shown as system messages in the conversation.
 #    %1$S is the nick and %2$S is the nick and host of the user who joined.
 message.join=%1$S [%2$S] entered the room.
 #    %1$S is the nick of who kicked you.
 #    %2$S is message.kicked.reason, if a kick message was given.
 message.kicked.you=You have been kicked by %1$S%2$S.
@@ -97,24 +96,19 @@ message.parted.you=You have left the roo
 #    %1$S is the user's nick, %2$S is message.parted.reason, if a part message is given.
 message.parted=%1$S has left the room (Part%2$S).
 #    %S is the part message supplied by the user.
 message.parted.reason=: %S
 #    %1$S is the user's nick, %2$S is message.quit2 if a quit message is given.
 message.quit=%1$S has left the room (Quit%2$S).
 #    The paramter is the quit message given by the user.
 message.quit2=: %S
-#    %1$S is the user who changed the topic, %2$S is the new topic.
-message.topicChanged=%1$S has changed the topic to: %2$S.
-#    %1$S is the user who cleared the topic.
-message.topicCleared=%1$S has cleared the topic.
-#    %1$S is the conversation name, %2$S is the topic.
-message.topic=The topic for %1$S is: %2$S.
-#    %S is the conversation name.
-message.topicNotSet=There is no topic for %S.
+#    %1$S is the nickname of the user that invited us, %2$S is the conversation
+#    name.
+message.inviteReceived=%1$S has invited you to %2$S.
 #    %1$S is the nickname of the invited user, %2$S is the conversation name
 #    they were invited to.
 message.invited=%1$S was successfully invited to %2$S.
 #    %S is the nickname of the user who was summoned.
 message.summoned=%S was summoned.
 #    %S is the nickname of the user whose WHOIS information follows this message.
 message.whois=WHOIS information for %S:
 #    %1$S is the nickname of the (offline) user whose WHOWAS information follows this message.
@@ -126,16 +120,17 @@ message.unknownNick=%S is an unknown nic
 
 # LOCALIZATION NOTE (error.*):
 #    These are shown as error messages in the conversation.
 #    %S is the channel name.
 error.noChannel=There is no channel: %S.
 error.tooManyChannels=Cannot join %S; you've joined too many channels.
 #    %1$S is your new nick, %2$S is the kill message from the server.
 error.nickCollision=Nick already in use, changing nick to %1$S [%2$S].
+error.erroneousNickname=%S is not an allowed nickname.
 error.banned=You are banned from this server.
 error.bannedSoon=You will soon be banned from this server.
 error.mode.wrongUser=You cannot change modes for other users.
 #    %S is the nickname or channel name that isn't available.
 error.noSuchNick=%S is not online.
 error.wasNoSuchNick=There was no nickname: %S
 error.noSuchChannel=There is no channel: %S.
 #    %S is the channel name.
@@ -143,20 +138,29 @@ error.cannotSendToChannel=You cannot sen
 error.nonUniqueTarget=%S is not a unique user@host or shortname or you have tried to join too many channels at once.
 error.notChannelOp=You are not a channel operator on %S.
 
 # LOCALIZATION NOTE (tooltip.*):
 #    These are the descriptions given in a tooltip with information received
 #    from a whois response.
 #    The human readable ("realname") description of the user.
 tooltip.realname=Name
+tooltip.server=Connected to
 #    The username and hostname that the user connects from (usually based on the
 #    reverse DNS of the user's IP, but often mangled by the server to
 #    protect users).
 tooltip.connectedFrom=Connected from
+tooltip.registered=Registered
+tooltip.secure=Using a secure connection
 # The away message of the user
 tooltip.away=Away
 tooltip.ircOp=IRC Operator
+tooltip.idleTime=Idle for
 tooltip.channels=Currently on
-tooltip.server=Connected to
-#    %1$S is the server name, %2$S is the server location.
+
+#    %1$S is the server name, %2$S is some generic server information (usually a
+#    location or the date the user was last seen).
 tooltip.serverValue=%1$S (%2$S)
-tooltip.idleTime=Idle for
+
+# LOCALIZATION NOTE (yes, no):
+#  These are used to turn true/false values into a yes/no response.
+yes=Yes
+no=No
--- a/mail/chrome/messenger/FilterEditor.dtd
+++ b/mail/chrome/messenger/FilterEditor.dtd
@@ -42,8 +42,16 @@
 <!ENTITY fetchFromPOP.label "Fetch From POP Server">
 <!ENTITY ignoreThread.label "Ignore Thread">
 <!ENTITY ignoreSubthread.label "Ignore Subthread">
 <!ENTITY watchThread.label "Watch Thread">
 <!ENTITY stopExecution.label "Stop Filter Execution">
 
 <!ENTITY addAction.tooltip "Add a new action">
 <!ENTITY removeAction.tooltip "Remove this action">
+
+<!-- LOCALIZATION NOTE
+  The values below are used to control the widths of the filter action widgets.
+  Change the values only when the localized strings in the popup menus
+  are truncated in the widgets.
+ -->
+<!ENTITY filterActionTypeFlexValue "1">
+<!ENTITY filterActionTargetFlexValue "4">
--- a/mail/chrome/messenger/FilterListDialog.dtd
+++ b/mail/chrome/messenger/FilterListDialog.dtd
@@ -6,28 +6,35 @@
 <!ENTITY nameColumn.label "Filter Name">
 <!ENTITY activeColumn.label "Enabled">
 <!ENTITY newButton.label "New…">
 <!ENTITY newButton.accesskey "N">
 <!ENTITY editButton.label "Edit…">
 <!ENTITY editButton.accesskey "E">
 <!ENTITY deleteButton.label "Delete">
 <!ENTITY deleteButton.accesskey "t">
+<!ENTITY reorderTopButton "Move to Top">
+<!ENTITY reorderTopButton.accessKey "o">
+<!ENTITY reorderTopButton.toolTip "Rearrange filter so it executes before all others">
 <!ENTITY reorderUpButton.label "Move Up">
 <!ENTITY reorderUpButton.accesskey "U">
 <!ENTITY reorderDownButton.label "Move Down">
 <!ENTITY reorderDownButton.accesskey "D">
+<!ENTITY reorderBottomButton "Move to Bottom">
+<!ENTITY reorderBottomButton.accessKey "B">
+<!ENTITY reorderBottomButton.toolTip "Rearrange filter so it executes after all others">
 <!ENTITY filterHeader.label "Enabled filters are run automatically in the order shown below.">
 <!ENTITY filtersForPrefix.label "Filters for:">
 <!ENTITY filtersForPrefix.accesskey "F">
 <!ENTITY viewLogButton.label "Filter Log">
 <!ENTITY viewLogButton.accesskey "L">
 <!ENTITY runFilters.label "Run Now">
 <!ENTITY runFilters.accesskey "R">
 <!ENTITY stopFilters.label "Stop">
 <!ENTITY stopFilters.accesskey "S">
 <!ENTITY folderPickerPrefix.label "Run selected filter(s) on:">
 <!ENTITY folderPickerPrefix.accesskey "c">
 <!ENTITY choosethis.label "choose this folder">
 <!ENTITY choosethisnewsserver.label "choose this news server">
 <!ENTITY helpButton.label "Help">
 <!ENTITY helpButton.accesskey "H">
 <!ENTITY closeCmd.key "W"> 
+<!ENTITY searchBox.emptyText "Search filters by name…">
--- a/mail/chrome/messenger/aboutDialog.dtd
+++ b/mail/chrome/messenger/aboutDialog.dtd
@@ -1,9 +1,10 @@
 <!ENTITY aboutDialog.title      "About &brandFullName;">
+
 <!ENTITY community.start2           "&brandShortName; is designed by ">
 <!-- LOCALIZATION NOTE (community.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
 <!ENTITY community.mozillaLink      "&vendorShortName;">
 <!ENTITY community.middle2          ", a ">
 <!-- LOCALIZATION NOTE (community.creditsLink): This is a link title that links to about:credits. -->
 <!ENTITY community.creditsLink      "global community">
 <!ENTITY community.end2             " working together to make the Internet better. We believe that the Internet should be open, public, and accessible to everyone without any restrictions.">
 
@@ -50,15 +51,17 @@
 <!-- LOCALIZATION NOTE (update.downloading.start,update.downloading.end): update.downloading.start and 
      update.downloading.end all go into one line, with the amount downloaded inserted in between. As this
      is all in one line, try to make the localized text short (see bug 596813 for screenshots). The — is
      the "em dash" (long dash).
      example: Downloading update — 111 KB of 13 MB -->
 <!ENTITY update.downloading.start   "Downloading update — ">
 <!ENTITY update.downloading.end     "">
 
+<!ENTITY update.applying            "Applying update…">
+
 <!-- LOCALIZATION NOTE (channel.description.start,channel.description.end): channel.description.start and
      channel.description.end create one sentence, with the current channel label inserted in between.
      example: You are currently on the _Stable_ update channel. -->
 <!ENTITY channel.description.start  "You are currently on the ">
 <!ENTITY channel.description.end    " update channel. ">
 
 <!ENTITY cmdCloseMac.commandKey "w">
--- a/mail/chrome/messenger/am-mdn.dtd
+++ b/mail/chrome/messenger/am-mdn.dtd
@@ -1,15 +1,17 @@
 <!-- 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/. -->
 
 <!ENTITY pane.title                   "Return Receipts">
 <!ENTITY useGlobalPrefs.label         "Use my global return receipt preferences for this account">
 <!ENTITY useGlobalPrefs.accesskey     "U">
+<!ENTITY globalReceipts.label         "Global Preferences…">
+<!ENTITY globalReceipts.accesskey     "G">
 <!ENTITY useCustomPrefs.label         "Customise return receipts for this account">
 <!ENTITY useCustomPrefs.accesskey     "C">
 <!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">
 <!-- LOCALIZATION NOTE moveToSent.label Translate: 'Sent' according to Netscape glossary -->
--- a/mail/chrome/messenger/filter.properties
+++ b/mail/chrome/messenger/filter.properties
@@ -19,17 +19,21 @@ continueFilterExecution=Applying filter 
 promptTitle=Running Filters
 promptMsg=You are currently in the process of filtering messages.\nWould you like to continue applying filters?
 stopButtonLabel=Stop
 continueButtonLabel=Continue
 cannotEnableFilter=This filter was probably created by future version of mozilla/netscape. You cannot enable this filter because we don't know how to apply it.
 dontWarnAboutDeleteCheckbox=Don't ask me again
 searchTermsInvalidTitle=Search Terms Invalid
 searchTermsInvalidMessage=This filter cannot be saved because some search terms are invalid in the current context.
-
+filterCountVisibleOfTotal=%1$S of %2$S
+## LOCALIZATION NOTE(filterCountItems): Semi-colon list of plural forms.
+## See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+## #1 is the count of items in the list.# filterCountItems is a pluralForm - see 
+filterCountItems=#1 item; #1 items
 # for junk mail logging / mail filter logging
 # LOCALIZATION NOTE(junkLogDetectStr)
 # %1$S=author, %2$S=subject, %3$S=date
 junkLogDetectStr=Detected junk message from %1$S - %2$S at %3$S
 # LOCALIZATION NOTE(logMoveStr)
 # %1$S=message id, %2$S=folder URI
 logMoveStr=moved message id = %1$S to %2$S
 # LOCALIZATION NOTE(logCopyStr)
--- a/mail/chrome/messenger/folderProps.dtd
+++ b/mail/chrome/messenger/folderProps.dtd
@@ -59,8 +59,15 @@
 <!ENTITY privileges.button.accesskey             "P">
 <!ENTITY permissionsDesc.label                   "You have the following permissions:">
 <!ENTITY folderType.label                        "Folder Type:">
 
 <!ENTITY folderQuotaTab.label                    "Quota">
 <!ENTITY folderQuotaRoot.label                   "Quota Root:">
 <!ENTITY folderQuotaUsage.label                  "Usage:">
 <!ENTITY folderQuotaStatus.label                 "Status:">
+
+<!ENTITY numberOfMessages.label                  "Number of messages:">
+<!-- LOCALIZATION NOTE: When the number of messages can't be determined, this string is displayed as the number -->
+<!ENTITY numberUnknown.label                     "unknown">
+<!ENTITY sizeOnDisk.label                        "Size on disc:">
+<!-- LOCALIZATION NOTE: When the size can't be determined, this string is displayed as the size -->
+<!ENTITY sizeUnknown.label                       "unknown">
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -502,16 +502,18 @@ you can use these alternative items. Oth
 <!ENTITY runJunkControls.accesskey "C">
 <!ENTITY deleteJunk.label "Delete Mail Marked as Junk in Folder">
 <!ENTITY deleteJunk.accesskey "D">
 <!ENTITY importCmd.label "Import…">
 <!ENTITY importCmd.accesskey "m">
 <!ENTITY errorConsoleCmd.label "Error Console">
 <!ENTITY errorConsoleCmd.accesskey "E">
 <!ENTITY errorConsoleCmd.commandkey "j">
+<!ENTITY clearRecentHistory.label "Clear Recent History…">
+<!ENTITY clearRecentHistory.accesskey "H">
 <!ENTITY accountManagerCmd.label "Account Settings…">
 <!ENTITY accountManagerCmd.accesskey "S">
 <!-- LOCALIZATION NOTE (accountManagerCmdUnix.accesskey): belongs to accountManagerCmd.label,
         which is placed under the Edit menu on Unix systems -->
 <!ENTITY accountManagerCmdUnix.accesskey "A">
 
 <!-- Mail Toolbar -->
 <!ENTITY getMsgButton.label "Get Mail">
@@ -543,16 +545,17 @@ you can use these alternative items. Oth
 <!ENTITY addressBookButton.label "Address Book">
 <!ENTITY chatButton.label "Chat">
 <!ENTITY glodaSearch.title "Global Search">
 <!ENTITY searchItem.title "Quick Search">
 <!ENTITY mailViewsToolbarItem.title "Mail Views">
 <!ENTITY folderLocationToolbarItem.title "Folder Location">
 <!ENTITY tagButton.label "Tag">
 <!ENTITY compactButton.label "Compact">
+<!ENTITY appmenuButton.label "AppMenu">
 
 <!-- Mail Toolbar Tooltips-->
 <!ENTITY advancedButton.tooltip "Advanced message search">
 <!ENTITY getMsgButton.tooltip "Get new messages">
 <!ENTITY getAllNewMsgCmd.label "Get All New Messages">
 <!ENTITY getAllNewMsgCmd.accesskey "G">
 <!ENTITY newMsgButton.tooltip "Create a new message">
 <!ENTITY replyButton.tooltip "Reply to the message">
@@ -573,16 +576,24 @@ you can use these alternative items. Oth
 <!ENTITY printButton.tooltip "Print this message">
 <!ENTITY stopButton.tooltip "Stop the current transfer">
 <!ENTITY junkButton.tooltip "Mark the selected messages as junk">
 <!ENTITY notJunkButton.tooltip "Mark the selected messages as not junk">
 <!ENTITY addressBookButton.tooltip "Go to the address book">
 <!ENTITY chatButton.tooltip "Show the Chat tab">
 <!ENTITY tagButton.tooltip "Tag messages">
 <!ENTITY compactButton.tooltip "Remove deleted messages from selected folder">
+<!ENTITY appmenuButton.tooltip "Displays the Application Menu">
+
+<!-- AppMenu Popup -->
+<!ENTITY appmenuNewMsgCmd.label "New Message">
+<!ENTITY appmenuNewContactCmd.label "Address Book Contact…">
+<!ENTITY appmenuEditMenu.label "Edit">
+<!ENTITY appmenuQFBMenu.label "Quick Filter Bar">
+<!ENTITY appmenuToolbarLayout.label "Toolbar Layout…">
 
 <!-- Tags Menu Popup -->
 <!ENTITY addNewTag.label "New Tag…">
 <!ENTITY addNewTag.accesskey "N">
 <!ENTITY manageTags.label "Manage Tags…">
 <!ENTITY manageTags.accesskey "M">
 
 <!-- Folder Pane -->
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -666,16 +666,18 @@ safeModeRestartButton=Restart
 update.checkInsideButton.label=Check for Updates
 update.checkInsideButton.accesskey=C
 update.resumeButton.label=Resume Downloading %S…
 update.resumeButton.accesskey=D
 update.openUpdateUI.applyButton.label=Apply Update…
 update.openUpdateUI.applyButton.accesskey=A
 update.restart.updateButton.label=Restart to Update
 update.restart.updateButton.accesskey=R
+update.restart.restartButton.label=Update & Restart
+update.restart.restartButton.accesskey=R
 update.openUpdateUI.upgradeButton.label=Upgrade Now…
 update.openUpdateUI.upgradeButton.accesskey=U
 update.restart.upgradeButton.label=Upgrade Now
 update.restart.upgradeButton.accesskey=U
 
 websearch.setDefault=Set this search engine as the default
 websearch.isDefault=This search engine is currently the default
 
@@ -695,8 +697,23 @@ crashedpluginsMessage.title=The %S plugi
 crashedpluginsMessage.reloadButton.label=Reload page
 crashedpluginsMessage.reloadButton.accesskey=R
 crashedpluginsMessage.submitButton.label=Submit a crash report
 crashedpluginsMessage.submitButton.accesskey=S
 crashedpluginsMessage.learnMore=Learn More…
 carbonFailurePluginsMessage.message=This page wants to use a plugin that can only run in 32-bit mode
 carbonFailurePluginsMessage.restartButton.label=Restart in 32-bit mode
 carbonFailurePluginsMessage.restartButton.accesskey=R
+
+# Sanitize
+# LOCALIZATION NOTE (sanitizeDialog2.everything.title): When "Time range to
+# clear" is set to "Everything", the Clear Recent History dialog's title is
+# changed to this.  See UI mockup and comment 11 at bug 480169 -->
+sanitizeDialog2.everything.title=Clear All History
+sanitizeButtonOK=Clear Now
+# LOCALIZATION NOTE (sanitizeEverythingWarning2): Warning that appears when
+# "Time range to clear" is set to "Everything" in Clear Recent History dialog,
+# provided that the user has not modified the default set of history items to clear.
+sanitizeEverythingWarning2=All history will be cleared.
+# LOCALIZATION NOTE (sanitizeSelectedWarning): Warning that appears when
+# "Time range to clear" is set to "Everything" in Clear Recent History dialog,
+# provided that the user has modified the default set of history items to clear.
+sanitizeSelectedWarning=All selected items will be cleared.
--- a/mail/chrome/messenger/messengercompose/sendProgress.dtd
+++ b/mail/chrome/messenger/messengercompose/sendProgress.dtd
@@ -1,8 +1,8 @@
 <!-- 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/. -->
 
-<!--LOCALIZATION NOTE sendprogress.dtd Main UI for Send Message Progress Dialog -->
-<!ENTITY sendWindow.title "Sending Messages"> 
-<!ENTITY status.label "Status:">
-<!ENTITY progress.label "Progress:">
+<!--LOCALIZATION NOTE sendprogress.dtd Main UI for Send Message Progress Dialog -->
+<!ENTITY sendDialog.title "Processing Message">
+<!ENTITY status.label "Status:">
+<!ENTITY progress.label "Progress:">
--- a/mail/chrome/messenger/messengercompose/sendProgress.properties
+++ b/mail/chrome/messenger/messengercompose/sendProgress.properties
@@ -1,14 +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/.
 
-titlePrefixSave=Saving Messages -
-titlePrefixSend=Sending Messages -
-
-# LOCALIZATION NOTE (percentMsg):
-# This string is used to format the text to the right of the progress meter.
-# %S% will be replaced by the percentage of the file that has been saved
-percentMsg=%S%%
-
-messageSent=Your message has been sent.
-messageSaved=Your message has been saved.
+# LOCALIZATION NOTE (titleSendMsgSubject):
+# %S will be replaced by the message subject.
+titleSendMsgSubject=Sending Message - %S
+titleSendMsg=Sending Message
+# LOCALIZATION NOTE (titleSaveMsgSubject):
+# %S will be replaced by the message subject.
+titleSaveMsgSubject=Saving Message - %S
+titleSaveMsg=Saving Message
+
+# LOCALIZATION NOTE (percentMsg):
+# This string is used to format the text to the right of the progress meter.
+# %S% will be replaced by the percentage of the file that has been saved
+percentMsg=%S%%
+
+messageSent=Your message has been sent.
+messageSaved=Your message has been saved.
--- a/mail/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/chrome/messenger/msgHdrViewOverlay.dtd
@@ -63,16 +63,20 @@
 <!ENTITY markAsUnreadMenuItem1.accesskey "r">
 <!ENTITY saveAsMenuItem1.label "Save as…">
 <!ENTITY saveAsMenuItem1.accesskey "S">
 <!ENTITY viewSourceMenuItem1.label "View Source">
 <!ENTITY viewSourceMenuItem1.accesskey "V">
 <!ENTITY otherActionsPrint1.label "Print…">
 <!ENTITY otherActionsPrint1.accesskey "P">
 
+<!-- Attachment bar context menu items -->
+<!ENTITY startExpandedCmd.label    "Initially Show Attachment Pane">
+<!ENTITY startExpandedCmd.accesskey    "S">
+
 <!-- Attachment context menu items -->
 <!ENTITY openAttachmentCmd.label    "Open">
 <!ENTITY openAttachmentCmd.accesskey    "O">
 <!ENTITY saveAsAttachmentCmd.label    "Save As…">
 <!ENTITY saveAsAttachmentCmd.accesskey    "S">
 <!ENTITY detachAttachmentCmd.label    "Detach…">
 <!ENTITY detachAttachmentCmd.accesskey    "D">
 <!ENTITY deleteAttachmentCmd.label    "Delete">
--- a/mail/chrome/messenger/preferences/general.dtd
+++ b/mail/chrome/messenger/preferences/general.dtd
@@ -26,14 +26,8 @@
 <!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/prefs.properties
+++ b/mail/chrome/messenger/prefs.properties
@@ -56,11 +56,18 @@ prefPanel-smtp=Outgoing Server (SMTP)
 
 # account manager multiple identity support
 #LOCALIZATION NOTE: accountName: %1$S 
 identity-list-title=Identities for %1$S
 
 identity-edit-req=You must specify a valid email address for this identity.
 identity-edit-req-title=Error Creating Identity
 
+## LOCALIZATION NOTE (identity-delete-confirm): %S is the identity name
+# and should be put on a new line. The new line is produced with the "\n" string.
+identity-delete-confirm=Are you sure you want to delete the identity\n%S?
+## LOCALIZATION NOTE (identity-delete-confirm-title): %S is the account name
+identity-delete-confirm-title=Deleting identity for %S
+identity-delete-confirm-button=Delete
+
 choosefile=Choose a file
 
 forAccount=For account "%S"
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/sanitize.dtd
@@ -0,0 +1,50 @@
+<!-- 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/. -->
+
+<!ENTITY sanitizePrefs2.title          "Settings for Clearing History">
+<!ENTITY sanitizeDialog2.title         "Clear Recent History">
+
+<!ENTITY sanitizeItems.label          "Clear the following items now:">
+<!ENTITY clearDataSettings2.label     "When I quit &brandShortName;, it should automatically clear all:">
+
+<!-- XXX rearrange entities to match physical layout when l10n isn't an issue -->
+<!-- LOCALIZATION NOTE (clearTimeDuration.*): "Time range to clear" dropdown.
+     See UI mockup at bug 480169 -->
+<!ENTITY clearTimeDuration.label          "Time range to clear: ">
+<!ENTITY clearTimeDuration.accesskey      "T">
+<!ENTITY clearTimeDuration.lastHour       "Last Hour">
+<!ENTITY clearTimeDuration.last2Hours     "Last Two Hours">
+<!ENTITY clearTimeDuration.last4Hours     "Last Four Hours">
+<!ENTITY clearTimeDuration.today          "Today">
+<!ENTITY clearTimeDuration.everything     "Everything">
+<!-- Localization note (clearTimeDuration.suffix) - trailing entity for languages
+that require it.  -->
+<!ENTITY clearTimeDuration.suffix         "">
+<!ENTITY clearTimeDuration.dateColumn     "Visit Date">
+<!ENTITY clearTimeDuration.nameColumn     "Name">
+
+<!-- LOCALIZATION NOTE (detailsProgressiveDisclosure.*): Labels and accesskeys
+     of the "Details" progressive disclosure button.  See UI mockup at bug
+     480169 -->
+<!ENTITY detailsProgressiveDisclosure.label     "Details">
+<!ENTITY detailsProgressiveDisclosure.accesskey "e">
+
+<!ENTITY historySection.label         "History">
+<!ENTITY dataSection.label            "Data">
+
+<!-- LOCALIZATION NOTE (item*): itemHistoryAndDownloads.* and
+     itemBrowsingHistory.* will never be used at the same time, so they can
+     have the same accesskey. -->
+<!ENTITY itemCookies.label                 "Cookies">
+<!ENTITY itemCookies.accesskey             "C">
+<!ENTITY itemCache.label                   "Cache">
+<!ENTITY itemCache.accesskey               "A">
+
+<!-- LOCALIZATION NOTE (sanitizeEverythingUndoWarning): Second warning paragraph
+     that appears when "Time range to clear" is set to "Everything".  See UI
+     mockup at bug 480169 -->
+<!ENTITY sanitizeEverythingUndoWarning     "This action cannot be undone.">
+
+<!ENTITY dialog.width                 "28em">
+<!ENTITY column.width                 "14em">
--- a/mail/chrome/messenger/searchTermOverlay.dtd
+++ b/mail/chrome/messenger/searchTermOverlay.dtd
@@ -1,20 +1,19 @@
 <!-- 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/. -->
 
-<!ENTITY matchAll.label     "Match all of the following">
-<!ENTITY matchAll.accesskey "a">
-<!ENTITY matchAny.label     "Match any of the following">
-<!ENTITY matchAny.accesskey "o">
-<!ENTITY matchAllMsgs.label     "Match all messages">
-<!ENTITY matchAllMsgs.accesskey "m">
-
-<!-- LOCALIZATION NOTE  
-  The values below are used to control the widths of the search widgets.
-  Change the values only when the localized strings in the popup menus
-  are truncated in the widgets.
- -->
-<!ENTITY searchTermListAttributesFlexValue "5">
-<!ENTITY searchTermListOperatorsFlexValue "5">
-<!ENTITY searchTermListValueFlexValue "5">
-<!ENTITY searchTermListButtonsFlexValue "2">
+<!ENTITY matchAll.label     "Match all of the following">
+<!ENTITY matchAll.accesskey "a">
+<!ENTITY matchAny.label     "Match any of the following">
+<!ENTITY matchAny.accesskey "o">
+<!ENTITY matchAllMsgs.label     "Match all messages">
+<!ENTITY matchAllMsgs.accesskey "m">
+
+<!-- LOCALIZATION NOTE  
+  The values below are used to control the widths of the search widgets.
+  Change the values only when the localized strings in the popup menus
+  are truncated in the widgets.
+ -->
+<!ENTITY searchTermListAttributesFlexValue "1">
+<!ENTITY searchTermListOperatorsFlexValue "1">
+<!ENTITY searchTermListValueFlexValue "3">