Bug 749952 - Update en-GB for Thunderbird 13 - review pending
authorIan Neal <iann_cvs@blueyonder.co.uk>
Mon, 14 May 2012 13:46:55 +0100
changeset 208 d12ca64bcd07a81592987006537c98f319cea412
parent 207 f474f21f91e481fb3e9439c23b743ebe89e3cfd2
child 209 7b3b80d4d38eb8c339a7028dc62512169c56f214
push id78
push userfrancesco.lodolo@mozillaitalia.org
push dateTue, 26 Nov 2013 14:54:15 +0000
bugs749952
Bug 749952 - Update en-GB for Thunderbird 13 - review pending
chat/accounts.properties
chat/commands.properties
chat/conversations.properties
chat/facebook.properties
chat/irc.properties
chat/status.properties
chat/twitter.properties
chat/xmpp.properties
mail/chrome/messenger-newsblog/am-newsblog.properties
mail/chrome/messenger-newsblog/feed-properties.dtd
mail/chrome/messenger-newsblog/feed-subscriptions.dtd
mail/chrome/messenger-newsblog/newsblog.properties
mail/chrome/messenger/AccountManager.dtd
mail/chrome/messenger/AccountWizard.dtd
mail/chrome/messenger/addbuddy.dtd
mail/chrome/messenger/am-identities-list.dtd
mail/chrome/messenger/am-im.dtd
mail/chrome/messenger/chat.dtd
mail/chrome/messenger/chat.properties
mail/chrome/messenger/cloudfile/Dropbox/management.dtd
mail/chrome/messenger/cloudfile/YouSendIt/management.dtd
mail/chrome/messenger/cloudfile/YouSendIt/settings.dtd
mail/chrome/messenger/cloudfile/addAccountDialog.dtd
mail/chrome/messenger/cloudfile/management.dtd
mail/chrome/messenger/glodaComplete.properties
mail/chrome/messenger/imAccountWizard.dtd
mail/chrome/messenger/imAccounts.dtd
mail/chrome/messenger/imAccounts.properties
mail/chrome/messenger/joinChat.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/messengercompose/messengercompose.dtd
mail/chrome/messenger/mime.properties
mail/chrome/messenger/newmailaccount/accountProvisioner.dtd
mail/chrome/messenger/news.properties
mail/chrome/messenger/preferences/applications.dtd
mail/chrome/messenger/preferences/applications.properties
mail/chrome/messenger/preferences/chat.dtd
mail/chrome/messenger/preferences/preferences.dtd
mail/chrome/messenger/prefs.properties
new file mode 100644
--- /dev/null
+++ b/chat/accounts.properties
@@ -0,0 +1,5 @@
+# LOCALIZATION NOTE (passwordPromptTitle, passwordPromptText):
+# %S is replaced with the name of the account
+passwordPromptTitle=Password for %S
+passwordPromptText=Please enter your password for %S in order to connect it.
+passwordPromptSaveCheckbox=Use Password Manager to remember this password.
new file mode 100644
--- /dev/null
+++ b/chat/commands.properties
@@ -0,0 +1,23 @@
+# LOCALIZATION NOTE (commands):
+#  %S is a comma separated list of command names.
+commands=Commands: %S.\nUse /help &lt;command&gt; for more information.
+# LOCALIZATION NOTE (noCommand, noHelp):
+#  %S is the command name the user typed.
+noCommand=No '%S' command.
+noHelp=No help message for the '%S' command, sorry!
+
+sayHelpString=say &lt;message&gt;: send a message without processing commands.
+rawHelpString=raw &lt;message&gt;: send a message without escaping HTML entities.
+helpHelpString=help &lt;name&gt;: show the help message for the &lt;name&gt; command, or the list of possible commands when used without parameter.
+
+# LOCALIZATION NOTE (statusCommand):
+#  %1$S is replaced with a status command name
+#   (one of "back", "away", "busy", "dnd", or "offline").
+#  %2$S is replaced with the localized version of that status type
+#   (one of the 5 strings below).
+statusCommand=%1$S &lt;status message&gt;: set the status to %2$S with an optional status message.
+back=available
+away=away
+busy=unavailable
+dnd=unavailable
+offline=offline
new file mode 100644
--- /dev/null
+++ b/chat/conversations.properties
@@ -0,0 +1,41 @@
+# LOCALIZATION NOTE (targetChanged):
+#  %1$S is the new conversation title (display name of the new target),
+#  %2$S is the protocol name used for the new target.
+targetChanged=The conversation will continue with %1$S, using %2$S.
+
+# LOCALIZATION NOTE (statusChanged):
+#  %1$S is the display name of the contact.
+#  %2$S is the new status type (a value from status.properties).
+statusChanged=%1$S is now %2$S.
+# LOCALIZATION NOTE (statusChangedWithStatusText):
+#  %1$S is the display name of the contact.
+#  %2$S is the new status type (a value from status.properties).
+#  %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 (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.
+
+# 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 (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.
+messenger.conversations.selections.systemMessagesTemplate=%time% - %message%
+messenger.conversations.selections.contentMessagesTemplate=%time% - %sender%: %message%
+messenger.conversations.selections.actionMessagesTemplate=%time% * %sender% %message%
new file mode 100644
--- /dev/null
+++ b/chat/facebook.properties
@@ -0,0 +1,1 @@
+connection.error.useUsernameNotEmailAddress=Please use your Facebook username, not an email address
new file mode 100644
--- /dev/null
+++ b/chat/irc.properties
@@ -0,0 +1,147 @@
+# LOCALIZATION NOTE (connection.error.*):
+#   These will show in the account manager if the account is
+#   disconnected because of an error.
+connection.error.lost=Lost connection with server
+connection.error.timeOut=Connection timed out
+connection.error.certError=Certification error when connecting to server
+
+# LOCALIZATION NOTE (joinChat.*):
+#   These show up on the join chat menu. An underscore is for the access key.
+joinChat.channel=_Channel
+joinChat.password=_Password
+
+# LOCALIZATION NOTE (options.*):
+#   These are the protocol specific options shown in the account manager and
+#   account wizard windows.
+options.server=Server
+options.port=Port
+options.ssl=Use SSL
+options.encoding=Character Set
+options.quitMessage=Quit message
+options.partMessage=Part message
+options.showServerTab=Show messages from the server
+
+# LOCALIZATION NOTE (ctcp.ping): Semi-colon list of plural forms.
+#  See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+#   %1$S is the nickname of the user who was pinged.
+#   #2 is the delay (in seconds).
+ctcp.ping=Ping reply from %1$S in #2 second.;Ping reply from %1$S in #2 seconds.
+# LOCALIZATION NOTE (ctcp.version):
+#   %1$S is the nickname of the user whose version was requested.
+#   %2$S is the version response from the client.
+ctcp.version=%1$S is using "%2$S"
+# LOCALIZATION NOTE (ctcp.time):
+#   %1$S is the nickname of the user whose time was requested.
+#   %2$S is the time response.
+ctcp.time=The time for %1$S is %2$S.
+
+# LOCALZIATION NOTE (command.*):
+#   These are the help messages for each command, the %S is the command name
+#   Each command first gives the parameter it accepts and then a description of
+#   the command.
+command.action=%S &lt;action to perform&gt;: Perform an action.
+command.ctcp=%S &lt;nick&gt; &lt;msg&gt;: Sends a CTCP message to the nick.
+command.chanserv=%S &lt;command&gt;: Send a command to ChanServ.
+command.deop=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Remove channel operator status from someone. You must be a channel operator to do this.
+command.devoice=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this.
+command.invite=%S &lt;nick&gt; [&lt;room&gt;]: Invite someone to join you in the specified channel, or the current channel.
+command.join=%S &lt;room1&gt;[,&lt;room2&gt;]* [&lt;key1&gt;[,&lt;key2&gt;]*]: Enter one or more channels, optionally providing a channel key for each if needed.
+command.kick=%S &lt;nick&gt; [&lt;message&gt;]: Remove someone from a channel. You must be a channel operator to do this.
+command.list=%S: Display a list of chat rooms on the network. Warning, some servers may disconnect you upon doing this.
+command.memoserv=%S &lt;command&gt;: Send a command to MemoServ.
+command.mode=%S (&lt;nick&gt;|&lt;channel&gt;) (+|-)&lt;new mode&gt;: Set or unset a channel or user mode.
+command.msg=%S &lt;nick&gt; &lt;message&gt;: Send a private message to a user (as opposed to a channel).
+command.nick=%S &lt;new nickname&gt;: Change your nickname.
+command.nickserv=%S &lt;command&gt;: Send a command to NickServ.
+command.notice=%S &lt;target&gt; &lt;message&gt;: Send a notice to a user or channel.
+command.op=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Grant channel operator status to someone. You must be a channel operator to do this.
+command.operserv=%S &lt;command&gt;: Send a command to OperServ.
+command.part=%S [message]: Leave the current channel with an optional message.
+command.ping=%S [&lt;nick&gt;]: Asks how much lag a user (or the server if no user specified) has.
+command.quit=%S &lt;message&gt;: Disconnect from the server, with an optional message.
+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.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.
+#    %1$S is the nick that is kicked, %2$S the nick of the person who kicked
+#    %1$S. %3$S is message.kicked.reason, if a kick message was given.
+message.kicked=%1$S has been kicked by %2$S%3$S.
+#    %S is the kick message
+message.kicked.reason=: %S
+#    %1$S is the nickname of the user whose mode was changed, %2$S is the new
+#    mode and %3$S is who set the mode.
+message.mode=mode (%1$S %2$S) by %3$S.
+#    %1$S is the old nick and %2$S is the new nick.
+message.nick=%1$S is now known as %2$S.
+#    %S is your new nick.
+message.nick.you=You are now known as %S.
+#    The paramter is the message.parted.reason, if a part message is given.
+message.parted.you=You have left the room (Part%1$S).
+#    %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.topicRemoved=The topic for %S was removed.
+#    %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.
+
+# 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.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.
+
+# 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
+#    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
+# The away message of the user
+tooltip.away=Away
+tooltip.ircOp=IRC Operator
+tooltip.channels=Currently on
+tooltip.server=Connected to
+#    %1$S is the server name, %2$S is the server location.
+tooltip.serverValue=%1$S (%2$S)
+tooltip.idleTime=Idle for
+
+# LOCALIZATION NOTE (gtalk.usernameHint):
+#  This is displayed inside the accountUsernameInfoWithDescription
+#  string defined in imAccounts.properties when the user is
+#  configuring an IRC account.
+usernameHint=and server
new file mode 100644
--- /dev/null
+++ b/chat/status.properties
@@ -0,0 +1,14 @@
+availableStatusType=Available
+awayStatusType=Away
+unavailableStatusType=Unavailable
+offlineStatusType=Offline
+invisibleStatusType=Invisible
+idleStatusType=Idle
+mobileStatusType=Mobile
+# LOCALIZATION NOTE (unknownStatusType):
+# the status of a buddy is unknown when it's in the list of a disconnected account
+unknownStatusType=Unknown
+
+# LOCALIZATION NOTE (messenger.status.defaultIdleAwayMessage):
+#  This will be the away message put automatically when the user is idle.
+messenger.status.defaultIdleAwayMessage=I am currently away from the computer.
new file mode 100644
--- /dev/null
+++ b/chat/twitter.properties
@@ -0,0 +1,101 @@
+# LOCALIZATION NOTE (error.*):
+#   These are errors that will be shown to the user in conversation.
+error.tooLong=Status is over 140 characters.
+# LOCALIZATION NOTE (error.general, error.retweet, error.delete):
+#   %1$S will be either the error string returned by the twitter server,
+#   in English, inside parenthesis, or the empty string if we have no specific
+#   message for the error.
+#   %2$S is the message that caused the error.
+error.general=An error %1$S occurred while sending: %2$S
+error.retweet=An error %1$S occurred while retweeting: %2$S
+error.delete=An error %1$S occurred while deleting: %2$S
+
+# LOCALIZATION NOTE (timeline):
+#   This is the title of the conversation tab, %S will be replaced by
+#   @<username>.
+timeline=%S timeline
+
+# LOCALIZATION NOTE (action.*):
+#  This will be an action in the context menu of displayed tweets.
+action.copyLink=Copy Link to Tweet
+action.retweet=Retweet
+action.reply=Reply
+action.delete=Delete
+# LOCALIZATION NOTE (action.follow, action.stopFollowing):
+#  %S will be replaced by the screen name of a twitter user.
+action.follow=Follow %S
+action.stopFollowing=Stop following %S
+
+# LOCALIZATION NOTE (event.follow, event.unfollow, event.followed):
+#  This will be displayed in system messages inside the timeline conversation.
+#  %S will be replaced by the screen name of a twitter user.
+event.follow=You are now following %S.
+event.unfollow=You are no longer following %S.
+event.followed=%S is now following you.
+# LOCALIZATION NOTE (event.deleted):
+#  %S will be replaced by the text of the deleted tweet.
+event.deleted=You have deleted this tweet: "%S".
+
+# LOCALIZATION NOTE (replyingToStatusText):
+#  This will be visible in the status bar of the conversation window
+#  while the user is typing a reply to a tweet.
+#  %S will be replaced by the text of the tweet the user is replying to.
+replyingToStatusText=Replying to: %S
+
+# LOCALIZATION NOTE (connection.*):
+#   These will be displayed in the account manager in order to show the progress
+#   of the connection.
+#   (These will be displayed in account.connection.progress from
+#    accounts.properties, which adds … at the end, so do not include
+#    periods at the end of these messages.)
+connection.initAuth=Initiating authentication process
+connection.requestAuth=Waiting for your authorisation
+connection.requestAccess=Finalising authentication
+connection.requestTimelines=Requesting user timelines
+# LOCALIZATION NOTE (connection.error.*):
+#   These will show in the account manager if an error occurs during the
+#   connection attempt.
+connection.error.userMismatch=Username mismatch.
+connection.error.failedToken=Failed to get request token.
+connection.error.authCancelled=You cancelled the authorisation process.
+connection.error.authFailed=Failed to get authorisation.
+connection.error.noNetwork=There is no network connection available.
+
+# LOCALIZATION NOTE (authPrompt):
+#   This is the prompt in the browser window that pops up to authorize us
+#   to use a Twitter account. It is shown in the title bar of the authorization
+#   window.
+authPrompt=Give permission to use your Twitter account
+
+# LOCALIZATION NOTE (options.*):
+#   These are the protocol specific options shown in the account manager and
+#   account wizard windows.
+options.track=Tracked keywords
+
+# LOCALIZATION NOTE (tooltip.*):
+#   These are the Twitter information that will appear in the tooltip
+#   for each participant on the home timeline.
+# LOCALIZATION NOTE (tooltip.created_at): the date the user joined.
+tooltip.created_at=User Since
+tooltip.location=Location
+tooltip.lang=Language
+tooltip.time_zone=Timezone
+tooltip.url=Homepage
+# LOCALIZATION NOTE (tooltip.protected):
+#  whether the user's tweets are publicly visible.
+tooltip.protected=Protects Tweets
+# LOCALIZATION NOTE (tooltip.following):
+#  whether you are subscribed to the user's tweets.
+tooltip.following=Currently Following
+tooltip.description=Description
+# LOCALIZATION NOTE (tooltip.*_count):
+#  Please see the right side of the official Twitter website UI.
+tooltip.friends_count=Following
+tooltip.statuses_count=Tweets
+tooltip.followers_count=Followers
+tooltip.listed_count=Listed
+
+# LOCALIZATION NOTE (yes, no):
+#  These are used to turn true/false values into a yes/no response.
+yes=Yes
+no=No
new file mode 100644
--- /dev/null
+++ b/chat/xmpp.properties
@@ -0,0 +1,72 @@
+# LOCALIZATION NOTE (connection.*)
+#   These will be displayed in the account manager in order to show the progress
+#   of the connection.
+#   (These will be displayed in account.connection.progress from
+#    accounts.properties, which adds … at the end, so do not include
+#    periods at the end of these messages.)
+connection.initializingStream=Initialising stream
+connection.initializingEncryption=Initialising encryption
+connection.authenticating=Authenticating
+connection.gettingResource=Getting resource
+connection.downloadingRoster=Downloading contact list
+
+# LOCALIZATION NOTE (connection.error.*)
+#   These will show in the account manager if an error occurs during the
+#   connection attempt.
+connection.error.failedToCreateASocket=Failed to create a socket (Are you offline?)
+connection.error.serverClosedConnection=The server closed the connection
+connection.error.resetByPeer=Connection reset by peer
+connection.error.timedOut=The connection timed out
+connection.error.receivedUnexpectedData=Received unexpected data
+connection.error.incorrectResponse=Received an incorrect response
+connection.error.startTLSRequired=The server requires encryption but you disabled it
+connection.error.startTLSNotSupported=The server doesn't support encryption but your configuration requires it
+connection.error.failedToStartTLS=Failed to start encryption
+connection.error.noAuthMec=No authentication mechanism offered by the server
+connection.error.noCompatibleAuthMec=None of the authentication mechanisms offered by the server are supported
+connection.error.notSendingPasswordInClear=The server only supports authentication by sending the password in cleartext
+connection.error.authenticationFailure=Authentication failure
+connection.error.notAuthorized=Not authorised (Did you enter the wrong password?)
+connection.error.failedToGetAResource=Failed to get a resource
+
+# LOCALIZATION NOTE (tooltip.*):
+#   These are the titles of lines of information that will appear in
+#   the tooltip showing details about a contact or conversation.
+# LOCALIZATION NOTE (tooltip.status):
+#   %S will be replaced by the XMPP resource identifier
+tooltip.status=Status (%S)
+tooltip.statusNoResource=Status
+tooltip.subscription=Subscription
+
+# LOCALIZATION NOTE (chatRoomField.*):
+#   These are the name of fields displayed in the 'Join Chat' dialog
+#   for XMPP accounts.
+#   The _ character won't be displayed; it indicates the next
+#   character of the string should be used as the access key for this
+#   field.
+chatRoomField.room=_Room
+chatRoomField.server=_Server
+chatRoomField.nick=_Nick
+chatRoomField.password=_Password
+
+# LOCALIZATION NOTE
+#  Buddies that aren't in any group on the server will appear in this group.
+#  Try to use the same translation as for defaultGroup in instantbird.properties
+defaultGroup=Contacts
+
+# LOCALIZATION NOTE (options.*):
+#   These are the protocol specific options shown in the account manager and
+#   account wizard windows.
+options.resource=Resource
+options.connectionSecurity=Connection security
+options.connectionSecurity.requireEncryption=Require encryption
+options.connectionSecurity.opportunisticTLS=Use encryption if available
+options.connectionSecurity.allowUnencryptedAuth=Allow sending the password unencrypted
+options.connectServer=Server
+options.connectPort=Port
+
+# LOCALIZATION NOTE (gtalk.usernameHint):
+#  This is displayed inside the accountUsernameInfoWithDescription
+#  string defined in imAccounts.properties when the user is
+#  configuring a Google Talk account.
+gtalk.usernameHint=email address
deleted file mode 100644
--- a/mail/chrome/messenger-newsblog/am-newsblog.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-## Strings used in the Account Manager
-prefPanel-newsblog=Feed Settings
deleted file mode 100644
--- a/mail/chrome/messenger-newsblog/feed-properties.dtd
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- Feed Properties Dialog -->
-<!ENTITY window.title             "Feed Properties">
-
-<!ENTITY feedFolder.label         "Store Articles in: ">
-<!ENTITY feedFolder.accesskey     "S">
-
-<!ENTITY feedLocation.label       "Feed URL: ">
-<!ENTITY feedLocation.accesskey   "F">
-
-<!ENTITY choosethisfolder.label   "choose this folder">
-
-<!ENTITY quickMode.label          "Show the article summary instead of loading the web page">
-<!ENTITY quickMode.accesskey      "h">
-
-<!ENTITY copyLinkCmd.label        "Copy Link Location">
-<!ENTITY copyLinkCmd.accesskey    "C">
-
-<!ENTITY pasteLinkCmd.label       "Paste">
-<!ENTITY pasteLinkCmd.accesskey   "P">
--- a/mail/chrome/messenger-newsblog/feed-subscriptions.dtd
+++ b/mail/chrome/messenger-newsblog/feed-subscriptions.dtd
@@ -1,18 +1,31 @@
 <!-- Subscription Dialog -->
-<!ENTITY feedSubscriptions.label "Feed Subscriptions">
-<!ENTITY subscriptionDesc.label "Note: Removing or changing the folder for a feed will not affect previously downloaded articles.">
-<!ENTITY feedTitle.label "Title:">
-<!ENTITY location.label  "Location:">
+<!ENTITY feedSubscriptions.label     "Feed Subscriptions">
+<!ENTITY subscriptionDesc.label      "Note: Removing or changing the folder for a feed will not affect previously downloaded articles.">
+
+<!ENTITY feedTitle.label             "Title:">
+<!ENTITY feedTitle.accesskey         "T">
+
+<!ENTITY feedLocation.label          "Feed URL:">
+<!ENTITY feedLocation.accesskey      "U">
+<!ENTITY feedLocation.placeholder    "Enter a valid feed url to Add">
+
+<!ENTITY feedFolder.label            "Store Articles in:">
+<!ENTITY feedFolder.accesskey        "S">
 
-<!ENTITY button.addFeed.label       "Add">
-<!ENTITY button.addFeed.accesskey   "A">
-<!ENTITY button.editFeed.label      "Edit">
-<!ENTITY button.editFeed.accesskey  "E">
-<!ENTITY button.removeFeed.label "Remove">
-<!ENTITY button.removeFeed.accesskey   "R">
-<!ENTITY button.importOPML.label "Import">
-<!ENTITY button.importOPML.accesskey   "I">
-<!ENTITY button.exportOPML.label "Export">
-<!ENTITY button.exportOPML.accesskey   "X">
+<!ENTITY quickMode.label             "Show the article summary instead of loading the web page">
+<!ENTITY quickMode.accesskey         "h">
+
+<!ENTITY validateText.label          "Check validation and retrieve a valid url.">
 
-<!ENTITY cmd.close.commandKey             "w">
+<!ENTITY button.addFeed.label        "Add">
+<!ENTITY button.addFeed.accesskey    "A">
+<!ENTITY button.editFeed.label       "Edit">
+<!ENTITY button.editFeed.accesskey   "E">
+<!ENTITY button.removeFeed.label     "Remove">
+<!ENTITY button.removeFeed.accesskey "R">
+<!ENTITY button.importOPML.label     "Import">
+<!ENTITY button.importOPML.accesskey "I">
+<!ENTITY button.exportOPML.label     "Export">
+<!ENTITY button.exportOPML.accesskey "x">
+
+<!ENTITY cmd.close.commandKey        "w">
--- a/mail/chrome/messenger-newsblog/newsblog.properties
+++ b/mail/chrome/messenger-newsblog/newsblog.properties
@@ -1,44 +1,56 @@
 subscribe-validating-feed=Verifying the feed…
 subscribe-cancelSubscription=Are you sure you wish to cancel subscribing to the current feed?
 subscribe-cancelSubscriptionTitle=Subscribing to a Feed…
-subscribe-noFeedIsSelected=<no feed selected>
 subscribe-feedAlreadySubscribed=You already have a subscription for this feed.
 subscribe-errorOpeningFile=Could not open the file.
+subscribe-feedAdded=Feed added.
+subscribe-feedUpdated=Feed updated.
+subscribe-feedMoved=Feed subscription moved.
+subscribe-feedRemoved=Feed unsubscribed.
+subscribe-feedNotValid=The Feed URL is not a valid feed.
+subscribe-networkError=The Feed URL could not be found. Please check the name and try again.
 
 subscribe-OPMLImportTitle=Select OPML file to import
 subscribe-OPMLExportTitle=Export feeds as an OPML file
 ## LOCALIZATION NOTE(subscribe-OPMLExportFileDialogTitle): %S is the brandShortName
 subscribe-OPMLExportFileDialogTitle=%S OPML Export
 ## LOCALIZATION NOTE(subscribe-OPMLExportDefaultFileName): %S is the brandShortName
 subscribe-OPMLExportDefaultFileName=My%SFeeds.opml
 ## LOCALIZATION NOTE(subscribe-OPMLImportInvalidFile): %S is the name of the OPML file the user tried to import.
 subscribe-OPMLImportInvalidFile=The file %S does not seem to be a valid OPML file.
-## LOCALIZATION NOTE(subscribe-OPMLImportNewFeeds): %S is the count of new imported entries.
-subscribe-OPMLImportNewFeeds=Imported %S new feeds.
-## LOCALIZATION NOTE(subscribe-OPMLImportTotalFeeds):
-## - The first %S is the the count of new imported entries,
-## - The second %S is total number of elements found in the file
-subscribe-OPMLImportTotalFeeds=Imported %S new feeds to which you aren't already subscribed (out of %S total entries found).
+## LOCALIZATION NOTE(subscribe-OPMLImportFeedCount): Semi-colon list of plural forms.
+## See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+## #1 is the count of new imported entries.
+subscribe-OPMLImportFeedCount=Imported #1 new feed.;Imported #1 new feeds.
+## LOCALIZATION NOTE(subscribe-OPMLImportUniqueFeeds): Semi-colon list of plural forms.
+## #1 is the count of new imported entries
+subscribe-OPMLImportUniqueFeeds=Imported #1 new feed to which you aren't already subscribed;Imported #1 new feeds to which you aren't already subscribed
+## LOCALIZATION NOTE(subscribe-OPMLImportFoundFeeds):
+## #1 is total number of elements found in the file
+subscribe-OPMLImportFoundFeeds=(out of #1 entry found);(out of #1 total entries found)
+## LOCALIZATION NOTE(subscribe-OPMLImportStatus):
+## This is the concatenation of the two strings defined above to compose 1 sentence.
+## %1$S = subscribe-OPMLImportUniqueFeeds
+## %2$S = subscribe-OPMLImportFoundFeeds
+subscribe-OPMLImportStatus=%1$S %2$S.
 
 subscribe-OPMLExportOPMLFilesFilterText=OPML Files
 
 subscribe-confirmFeedDeletionTitle=Remove Feed
 ## LOCALIZATION NOTE(subscribe-confirmFeedDeletion): %S is the name of the feed the user wants to unsubscribe from.
 subscribe-confirmFeedDeletion=Are you sure you want to unsubscribe from the feed: \n %S?
 
 ## LOCALIZATION NOTE(subscribe-gettingFeedItems):
 ##  - The first %S is the number of articles processed so far;
 ##  - The second %S is the total number of items
 subscribe-gettingFeedItems=Downloading feed articles (%S of %S)…
 
 newsblog-noNewArticlesForFeed=There are no new articles for this feed.
-newsblog-networkErrorTitle=Network Error
 ## LOCALIZATION NOTE(newsblog-networkError): %S is the feed URL
 newsblog-networkError=%S could not be found. Please check the name and try again.
-newsblog-feedNotValidTitle=Invalid Feed
 ## LOCALIZATION NOTE(newsblog-feedNotValid): %S is the feed URL
 newsblog-feedNotValid=%S is not a valid feed.
 newsblog-getNewMsgsCheck=Checking feeds for new items…
 
 ## LOCALIZATION NOTE(feeds-accountname): This string should be the same as feeds.accountName in am-newsblog.dtd
 feeds-accountname=Blogs & News Feeds
--- a/mail/chrome/messenger/AccountManager.dtd
+++ b/mail/chrome/messenger/AccountManager.dtd
@@ -1,16 +1,18 @@
 <!-- extracted from AccountManager.xul -->
 
 <!ENTITY accountManagerTitle.label "Account Settings">
 
 <!ENTITY accountActionsButton.label "Account Actions">
 <!ENTITY accountActionsButton.accesskey "A">
 <!ENTITY addMailAccountButton.label "Add Mail Account…">
 <!ENTITY addMailAccountButton.accesskey "A">
+<!ENTITY addIMAccountButton.label "Add Chat Account…">
+<!ENTITY addIMAccountButton.accesskey "C">
 <!ENTITY addOtherAccountButton.label "Add Other Account…">
 <!ENTITY addOtherAccountButton.accesskey "O">
 <!ENTITY setDefaultButton.label "Set as Default">
 <!ENTITY setDefaultButton.accesskey "f">
 <!ENTITY removeButton.label "Remove Account">
 <!ENTITY removeButton.accesskey "R">
 
 <!-- AccountManager.xul -->
--- a/mail/chrome/messenger/AccountWizard.dtd
+++ b/mail/chrome/messenger/AccountWizard.dtd
@@ -27,67 +27,66 @@
 -->
 <!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">
 
-<!-- Entities for Server page -->
+<!-- Entities for Incoming Server page -->
 
-<!ENTITY serverTitle.label "Server Information">
+<!ENTITY incomingTitle.label "Incoming Server Information">
 <!ENTITY incomingServerTypeDesc.label "Select the type of incoming server you are using.">
-<!-- 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 (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 leaveMsgsOnSrvr.label "Leave messages on server">
 <!ENTITY leaveMsgsOnSrvr.accesskey "L">
 <!ENTITY portNum.label "Port:">
 <!ENTITY portNum.accesskey "o">
 <!ENTITY defaultPortLabel.label "Default:">
 <!ENTITY defaultPortValue.label "">
+<!-- LOCALIZATION NOTE (incomingServerNameDesc.label) : Do not translate "&quot;pop.example.net&quot;" in below line -->
+<!ENTITY incomingServer.description "Enter the name of your incoming server (for example, &quot;mail.example.net&quot;).">
+<!ENTITY incomingServer.label "Incoming Server:">
+<!ENTITY incomingServer.accesskey "S">
+<!-- LOCALIZATION NOTE (incomingUsername.description) : do not translate "&quot;jsmith&quot;" in below line -->
+<!ENTITY incomingUsername.description "Enter the incoming user name given to you by your email provider (for example, &quot;jsmith&quot;).">
+<!ENTITY incomingUsername.label "User Name:">
+<!ENTITY incomingUsername.accesskey "U">
+<!-- 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;).">
+<!ENTITY newsServerLabel.label "Newsgroup Server:">
+<!ENTITY newsServerLabel.accesskey "S">
+ 
+<!-- Entities for Outgoing Server page -->
+
+<!ENTITY outgoingTitle.label "Outgoing Server Information">
+<!-- LOCALIZATION NOTE (outgoingServer.description) : Do not translate "SMTP" and "&quot;smtp.example.net&quot;" in below line -->
+<!ENTITY outgoingServer.description "Enter the name of your outgoing server (SMTP) (for example, &quot;smtp.example.net&quot;).">
+<!ENTITY outgoingServer.label "Outgoing Server:">
+<!ENTITY outgoingServer.accesskey "S">
+<!ENTITY outgoingUsername.description "Enter the outgoing user name given to you by your email provider (this is typically the same as your incoming user name).">
+<!ENTITY outgoingUsername.label "Outgoing User Name:">
+<!ENTITY outgoingUsername.accesskey "U">
 
 <!-- LOCALIZATION NOTE (modifyOutgoing.suffix) : This string will be appended after each of
      haveSmtp1.suffix3, haveSmtp2.suffix3, haveSmtp3.suffix3 .
 -->
 <!ENTITY modifyOutgoing.suffix "You can change outgoing servers in the account settings.">
 <!-- LOCALIZATION NOTE (haveSmtp1.prefix and haveSmtp1.suffix3) : Do not translate "SMTP" and "&quot;" in
      these variables. Also, translate haveSmtp1.prefix and haveSmtp1.suffix3 as a single sentence, inserting
      text after the "&quot;" entity in haveSmtp1.suffix3, if required grammatically.
 -->
 <!ENTITY haveSmtp1.prefix "Your existing outgoing server (SMTP), &quot;">
 <!ENTITY haveSmtp1.suffix3 "&quot;, will be used.">
-
-<!-- Entities for Login page -->
-
-<!ENTITY loginTitle.label "User Names">
-<!ENTITY usernameDesc.label "Enter the incoming user name given to you by your email provider ">
-<!-- LOCALIZATION NOTE (usernameExample.label) : do not translate "&quot;jsmith&quot;" in below line -->
-<!ENTITY usernameExample.label "(for example, &quot;jsmith&quot;).">
-<!ENTITY usernameLabel.label "Incoming User Name:">
-<!ENTITY usernameLabel.accesskey "I">
-<!ENTITY usernameSmtpDesc.label "Enter the outgoing user name given to you by your email provider (this is typically the same as your incoming user name).">
-<!ENTITY usernameSmtpLabel.label "Outgoing User Name:">
-<!ENTITY usernameSmtpLabel.accesskey "O">
 <!-- LOCALIZATION NOTE (haveSmtp2.prefix and haveSmtp2.suffix3) : Do not translate "SMTP" and "&quot;" in
      these variables. Also, translate haveSmtp2.prefix and haveSmtp2.suffix3 as a single sentence, inserting
      text after the "&quot;" entity in haveSmtp2.suffix3, if required grammatically.
 -->
 <!ENTITY haveSmtp2.prefix "Your existing outgoing (SMTP) username, &quot;">
 <!ENTITY haveSmtp2.suffix3 "&quot;, will be used.">
 <!-- LOCALIZATION NOTE (haveSmtp3.prefix and haveSmtp3.suffix3) : Do not translate "SMTP" and "&quot;" in
      these variables. Also, translate haveSmtp3.prefix and haveSmtp3.suffix3 as a single sentence, inserting
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/addbuddy.dtd
@@ -0,0 +1,3 @@
+<!ENTITY addBuddyWindow.title           "Add contact">
+<!ENTITY name.label                     "Username">
+<!ENTITY account.label                  "Account">
--- a/mail/chrome/messenger/am-identities-list.dtd
+++ b/mail/chrome/messenger/am-identities-list.dtd
@@ -1,7 +1,9 @@
 <!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">
+<!ENTITY identitiesListClose.label "Close">
+<!ENTITY identitiesListClose.accesskey "C">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/am-im.dtd
@@ -0,0 +1,12 @@
+<!ENTITY accountWindow.title           "Account properties">
+<!ENTITY accountWindow.width           "300">
+<!ENTITY account.general               "General">
+<!ENTITY account.advanced              "Advanced Options">
+<!ENTITY account.name                  "Username:">
+<!ENTITY account.password              "Password:">
+<!ENTITY account.alias                 "Alias:">
+<!ENTITY account.newMailNotification   "Notify on new Mail">
+<!ENTITY account.autojoin              "Auto-Joined Channels:">
+<!ENTITY account.proxySettings.caption "Proxy Settings:">
+<!ENTITY account.proxySettings.change.label     "Change…">
+<!ENTITY account.proxySettings.change.accessKey "C">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/chat.dtd
@@ -0,0 +1,51 @@
+<!ENTITY onlineContactsHeader.label    "Online Contacts">
+<!ENTITY offlineContactsHeader.label   "Offline Contacts">
+<!ENTITY conversationsHeader.label     "Conversations">
+<!ENTITY searchResultConversation.label "Search result">
+<!ENTITY chat.noConv.title             "Conversations will be displayed here.">
+<!ENTITY chat.noConv.description       "Use the contact list in the left panel to start a conversation.">
+<!ENTITY chat.noPreviousConv.description       "&brandShortName; currently doesn't have any previous conversations stored for this contact.">
+<!ENTITY chat.noAccount.title             "You haven't set up a chat account yet.">
+<!ENTITY chat.noAccount.description       "Let &brandShortName; guide you through the process of setting up your chat account.">
+<!ENTITY chat.accountWizard.button       "Get started">
+<!ENTITY chat.noConnectedAccount.title             "Your chat accounts are not connected.">
+<!ENTITY chat.noConnectedAccount.description       "You can connect them from the 'Chat status' dialog:">
+<!ENTITY chat.showAccountManager.button       "Show chat status">
+
+<!ENTITY chat.participants             "Participants:">
+<!ENTITY chat.previousConversations    "Previous Conversations:">
+<!ENTITY chat.ongoingConversation      "Ongoing conversation">
+
+<!ENTITY openConversationCmd.label     "Start a Conversation">
+<!ENTITY openConversationCmd.accesskey "c">
+<!ENTITY closeConversationCmd.label    "Close Conversation">
+<!ENTITY closeConversationCmd.accesskey "C">
+<!ENTITY aliasCmd.label                "Rename">
+<!ENTITY aliasCmd.accesskey            "R">
+<!ENTITY deleteCmd.label               "Remove Contact">
+<!ENTITY deleteCmd.accesskey           "v">
+
+<!ENTITY openConversationButton.tooltip  "Start a conversation">
+<!ENTITY closeConversationButton.tooltip "Close conversation">
+
+<!ENTITY addBuddyButton.label          "Add Contact">
+<!ENTITY joinChatButton.label          "Join Chat">
+<!ENTITY chatAccountsButton.label      "Show Accounts">
+
+<!-- LOCALIZATION NOTE (searchAllChatMessages.label.base):
+     This is the base of the empty text for the chat search box.  We replace
+     #1 with the contents of the appropriate search.keyLabel.* value for the
+     platform (defined in messenger/messenger.dtd).
+     The goal is to convey to the user that typing in the box will allow them
+     to search for conversations and that there is a hotkey they can press
+     to get to the box faster.  If the global indexer is disabled, the search
+     box will be collapsed and the user will never see this message.
+     -->
+<!ENTITY searchAllChatMessages.label.base "Search all conversations… #1">
+
+<!ENTITY status.available          "Available">
+<!ENTITY status.unavailable        "Unavailable">
+<!ENTITY status.offline            "Offline">
+
+<!ENTITY openLinkCmd.label            "Open Link…">
+<!ENTITY openLinkCmd.accesskey        "O">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/chat.properties
@@ -0,0 +1,86 @@
+chatTabTitle=Chat
+goBackToCurrentConversation.button=Back to current conversation
+# LOCALIZATION NOTE (startAConversationWith.button):
+#  %S is replaced with the display name of a contact.
+startAConversationWith.button=Start a conversation with %S
+
+# LOCALIZATION NOTE (defaultGroup):
+#  this is used in the addBuddies dialog if the list of existing groups is empty
+defaultGroup=Contacts
+
+# LOCALIZATION NOTE (buddy.authRequest.label):
+# This string appears in a notification bar at the
+# top of the Contacts window when someone added the user to his/her
+# contact list, to request the permission from the user to share
+# status information with this potential new contact.
+# %S is replaced with the user name of the potential new contact.
+buddy.authRequest.label=%S wants to chat with you
+buddy.authRequest.allow.label=Allow
+buddy.authRequest.allow.accesskey=A
+buddy.authRequest.deny.label=Deny
+buddy.authRequest.deny.accesskey=D
+
+# LOCALIZATION NOTE (buddy.deletePrompt.title):
+# %S here will be replaced by the alias (or username) of a buddy about
+# to be removed from the buddy list.
+buddy.deletePrompt.title=Delete %S?
+
+# LOCALIZATION NOTE (buddy.deletePrompt.message):
+# %1$S will be replaced by the name of a buddy (either the alias
+# followed by the username between parenthesis if an alias is set, or
+# only the username otherwise).
+# %2$S will be the name of the protocol on which this buddy is removed
+# (for example: AIM, MSN, Google Talk).
+#
+# Please find a wording that will keep the username as close as
+# possible to the beginning of the string, because this is the
+# important information that an user should see when looking quickly
+# at this prompt.
+buddy.deletePrompt.message=%1$S will be permanently removed from your %2$S buddy list if you continue.
+
+# LOCALIZATION NOTE (buddy.deletePrompt.displayName):
+# This is used to format the display name inserted in buddy.deletePrompt.message
+# %1$S is the alias, %2$S is the username.
+buddy.deletePrompt.displayName=%1$S (%2$S)
+
+# LOCALIZATION NOTE (buddy.deletePrompt.button):
+# the & symbol indicates the position of the character that should be
+# used as the accesskey for this button.
+buddy.deletePrompt.button=&Delete
+
+displayNameEmptyText=Display Name
+userIconFilePickerTitle=Select the new icon…
+
+# LOCALIZATION NOTE (chat.isTyping, chat.hasStoppedTyping):
+# The contact display name is displayed with a big font on a first
+# line and these two strings are displayed on a second line with a
+# smaller font. Please try to find a wording that make this look
+# almost like a sentence.
+chat.isTyping=is typing…
+chat.hasStoppedTyping=has stopped typing.
+# LOCALIZATION NOTE (chat.contactIsTyping, chat.contactHasStoppedTyping):
+#  These strings are displayed in a tooltip when hovering the status type icon.
+#  %S is replaced with the display name of the contact.
+chat.contactIsTyping=%S is typing.
+chat.contactHasStoppedTyping=%S has stopped typing.
+
+noTopic=No topic message for this room.
+
+# LOCALIZATION NOTE (unknownCommand):
+# This is shown when an unknown command (/foo) is attempted. %S is the command.
+unknownCommand=%S is not a supported command. Type /help to see the list of commands.
+
+# LOCALIZATION NOTE (buddytooltip.username, buddytooltip.account):
+# This is for the tooltip that appears when hovering
+# a contact or a conversation in the left pane.
+buddytooltip.username=Username
+buddytooltip.account=Account
+
+# LOCALIZATION NOTE (today, yesterday):
+# These 3 strings are used to display when previous conversations happened.
+# In 'today' and 'yesterday', %S is replaced with the time.
+today=Today %S
+yesterday=Yesterday %S
+# LOCALIZATION NOTE (dateTime):
+# %1$S is the date, %2$S is the date.
+dateTime=%1$S %2$S
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/Dropbox/management.dtd
@@ -0,0 +1,4 @@
+<!-- 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 dropboxMgmt.viewSettings "View my account settings on dropbox.com">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/YouSendIt/management.dtd
@@ -0,0 +1,4 @@
+<!-- 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 youSendItMgmt.viewSettings "View my account settings on yousendit.com">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/YouSendIt/settings.dtd
@@ -0,0 +1,5 @@
+<!-- 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 youSendItSettings.username "Username:">
+<!ENTITY youSendItSettings.needAnAccount "Need an account?">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/addAccountDialog.dtd
@@ -0,0 +1,12 @@
+<!-- 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 addAccountDialog.title   "Set up Filelink">
+<!ENTITY addAccountDialog.menuTitle "Select an online storage service">
+<!ENTITY addAccountDialog.style "width: 40em; min-height: 20em;">
+<!ENTITY addAccountDialog.accountName.label "Account Name:">
+<!ENTITY addAccountDialog.noAccountText "We're sorry, but the current version of &brandShortName; only allows one account from each online storage service.">
+<!ENTITY addAccountDialog.createAccountText "This feature allows you to send large attachments using one of several online storage services. You can either connect to an existing account, or sign up for a new account.">
+<!ENTITY addAccountDialog.authorizing "Checking authorisation...">
+<!ENTITY addAccountDialog.error "An error occurred while setting up the account!">
+<!ENTITY addAccountDialog.acceptButton.label "Set up Account">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/management.dtd
@@ -0,0 +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/.  -->
+<!ENTITY cloudfileMgmt.privacyPolicy "Privacy Policy">
+<!ENTITY cloudfileMgmt.termsOfService "Terms of Service">
+<!ENTITY cloudfileMgmt.usedSpace "Used Space:">
+<!ENTITY cloudfileMgmt.unusedSpace "Unused Space:">
+<!ENTITY cloudfileMgmt.upgradeOffer "Get more space">
--- a/mail/chrome/messenger/glodaComplete.properties
+++ b/mail/chrome/messenger/glodaComplete.properties
@@ -46,18 +46,19 @@ glodaComplete.messagesTagged.label=Messa
 glodaComplete.messagesMentioning.label=Messages mentioning: #1
 
 # LOCALIZATION NOTE (glodaComplete.messagesWithMany.label): The label used
 #  in the autocomplete widget to refer to a search for all messages mentioning
 #  a set of words, or a phrase containing multiple words (e.g. "red pepper")
 #  We use the same words in en-US, but maybe that's not always true.
 glodaComplete.messagesMentioningMany.label=Messages mentioning: #1
 
-# LOCALIZATION NOTE (glodaComplete.webSearch.label): The label used in the
+# LOCALIZATION NOTE (glodaComplete.webSearch1.label): The label used in the
 #  autocomplete widget to refer to a search on the web for a short string
-#  containing at most 15 characters. #1 is the string to search for.
-glodaComplete.webSearch.label=Search the web for: #1
+#  containing at most 15 characters. #1 is the search provider to use. #2 is
+#  the string to search for, truncated to 15 characters.
+glodaComplete.webSearch1.label=Search #1 for: #2
 
-# LOCALIZATION NOTE (glodaComplete.webSearch.label.truncated): The label used in
+# LOCALIZATION NOTE (glodaComplete.webSearch1.label.truncated): The label used in
 #  the autocomplete widget to refer to a search on the web for a short string
-#  containing more than 15 characters. #1 is the string to search for, truncated
-#  to 15 characters.
-glodaComplete.webSearch.label.truncated=Search the web for: #1…
+#  containing more than 15 characters. #1 is the search provider to use. #2 is
+#  the string to search for, truncated to 15 characters.
+glodaComplete.webSearch1.label.truncated=Search #1 for: #2…
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/imAccountWizard.dtd
@@ -0,0 +1,28 @@
+<!ENTITY windowTitle.label            "Chat Account Wizard">
+
+<!ENTITY accountProtocolTitle.label   "Chat network">
+<!ENTITY accountProtocolInfo.label    "Please choose the network of your chat account.">
+<!ENTITY accountProtocolField.label   "Network:">
+<!ENTITY accountProtocolGetMore.label "Get more…">
+
+<!ENTITY accountUsernameTitle.label   "Username">
+<!ENTITY accountUsernameDuplicate.label "This account is already configured!">
+
+<!ENTITY accountPasswordTitle.label   "Password">
+<!ENTITY accountPasswordInfo.label    "Please enter your password in the box below.">
+<!ENTITY accountPasswordField.label   "Password:">
+<!ENTITY accountPasswordManager.label "The password entered here will be stored in the Password Manager. Leave this box empty if you want to be prompted for your password each time this account is connected.">
+
+<!ENTITY accountAdvancedTitle.label   "Advanced Options">
+<!ENTITY accountAdvancedInfo.label    "Feel free to skip this step if you want to.">
+<!ENTITY accountAdvanced.newMailNotification.label   "Notify on new Mail">
+<!ENTITY accountAliasGroupbox.caption "Local Alias">
+<!ENTITY accountAliasField.label      "Alias:">
+<!ENTITY accountAliasInfo.label       "This will only be displayed in your conversations when you talk, remote contacts won't see it.">
+<!ENTITY accountProxySettings.caption "Proxy Settings">
+<!ENTITY accountProxySettings.change.label     "Change…">
+<!ENTITY accountProxySettings.change.accessKey "C">
+
+<!ENTITY accountSummaryTitle.label   "Summary">
+<!ENTITY accountSummaryInfo.label    "A summary of the information you entered is displayed below. Please check it before the account is created.">
+<!ENTITY accountSummary.connectNow.label "Connect this account now.">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/imAccounts.dtd
@@ -0,0 +1,26 @@
+<!ENTITY accountsWindow.title                "Instant messaging status">
+<!ENTITY accountsWindow.style                "width: 28em; height: 19em;">
+<!ENTITY accountManager.newAccount.label     "New Account">
+<!ENTITY accountManager.newAccount.accesskey "N">
+<!ENTITY accountManager.close.label          "Close">
+<!ENTITY accountManager.close.accesskey      "l">
+<!-- This should match account.commandkey in instantbird.dtd -->
+<!ENTITY accountManager.close.commandkey     "a">
+<!-- This title must be short, displayed with a big font size -->
+<!ENTITY accountManager.noAccount.title      "No account configured yet">
+<!ENTITY accountManager.noAccount.description "Click on the &accountManager.newAccount.label; button to let &brandShortName; guide you through the process of configuring one.">
+<!ENTITY account.autoSignOn.label     "Sign-on at startup">
+<!ENTITY account.autoSignOn.accesskey "S">
+<!ENTITY account.connect.label        "Connect">
+<!ENTITY account.connect.accesskey    "o">
+<!ENTITY account.disconnect.label     "Disconnect">
+<!ENTITY account.disconnect.accesskey "i">
+<!ENTITY account.edit.label           "Properties">
+<!ENTITY account.edit.accesskey       "P">
+<!ENTITY account.moveup.label         "Move up">
+<!ENTITY account.movedown.label       "Move down">
+<!ENTITY account.cancelReconnection.label         "Cancel reconnection">
+<!ENTITY account.cancelReconnection.accesskey     "a">
+<!ENTITY account.connecting           "Connecting…">
+<!ENTITY account.disconnecting        "Disconnecting…">
+<!ENTITY account.disconnected         "Not Connected">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/imAccounts.properties
@@ -0,0 +1,59 @@
+# LOCALIZATION NOTE (protoOptions):
+# %S is replaced by the name of a protocol
+protoOptions=%S Options
+accountUsername=Username:
+# LOCALIZATION NOTE (accountColon):
+# This string is used to append a colon after the label of each
+# option. It's localizable so that the typography can be adapted.
+accountColon=%S:
+# LOCALIZATION NOTE (accountUsernameInfo):
+# %S is replaced by the name of a protocol
+accountUsernameInfo=Please enter the username for your %S account.
+# LOCALIZATION NOTE (accountUsernameInfoWithDescription):
+# %1$S is a hint for the expected format of the username
+# %2$S is the name of a protocol
+accountUsernameInfoWithDescription=Please enter the username (%1$S) for your %2$S account.
+
+# LOCALIZATION NOTE (account.connection.error):
+# %S is the error message.
+account.connection.error=Error: %S
+# LOCALIZATION NOTE (account.connection.errorUnknownPrpl)
+# %S is the id (not very user friendly; hence the quotes) of the missing plugin.
+account.connection.errorUnknownPrpl=No '%S' protocol plugin.
+account.connection.errorEnteringPasswordRequired=Entering a password is required to connect this account.
+account.connection.errorCrashedAccount=A crash occurred while connecting this account.
+# LOCALIZATION NOTE (account.connection.progress):
+# %S is a message indicating progress of the connection process
+account.connection.progress=Connecting: %S…
+account.connecting=Connecting…
+account.connectedForSeconds=Connected for a few seconds.
+# LOCALIZATION NOTE (account.connectedFor{Double,Single},
+#                    account.reconnectIn{Double,Single}):
+# Each pair of %S is a number followed by a unit. The units are
+# already localized in a downloads.properties file of the toolkit.
+account.connectedForDouble=Connected for %1$S %2$S and %3$S %4$S.
+account.connectedForSingle=Connected for about %1$S %2$S.
+account.reconnectInDouble=Reconnection in %1$S %2$S and %3$S %4$S.
+account.reconnectInSingle=Reconnection in %1$S %2$S.
+
+requestAuthorizeTitle=Authorisation request
+# LOCALIZATION NOTE (requestAuthorizeAllow, requestAuthorizeDeny):
+# the & symbol indicates the position of the character that should be
+# used as the accesskey for this button.
+requestAuthorizeAllow=&Allow
+requestAuthorizeDeny=&Deny
+# LOCALIZATION NOTE (requestAuthorizeText):
+# %S is a contact username.
+requestAuthorizeText=%S added you to his/her buddy list, do you want to allow him/her to see you?
+
+accountsManager.notification.button.accessKey=C
+accountsManager.notification.button.label=Connect Now
+accountsManager.notification.userDisabled.label=You have disabled automatic connections.
+accountsManager.notification.safeMode.label=Automatic Connection Settings have been ignored because the application is currently running in Safe-Mode.
+accountsManager.notification.startOffline.label=Automatic Connection Settings have been ignored because the application was started in Offline Mode.
+accountsManager.notification.crash.label=The last run exited unexpectedly while connecting. Automatic Connections have been disabled to give you an opportunity to Edit your Settings.
+# LOCALIZATION NOTE (accountsManager.notification.singleCrash.label): Semi-colon list of plural forms.
+#  See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+#  #1 is the number of accounts that are suspected to have caused a crash.
+accountsManager.notification.singleCrash.label=A previous run exited unexpectedly while connecting a new or edited account. It has not been connected so that you can Edit its Settings.;A previous run exited unexpectedly while connecting #1 new or edited accounts. They have not been connected so that you can Edit their Settings.
+accountsManager.notification.other.label=Automatic connection has been disabled.
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/joinChat.dtd
@@ -0,0 +1,6 @@
+<!ENTITY joinChatWindow.title           "Join chat">
+<!ENTITY name.label                     "Room">
+<!ENTITY optional.label                 "(optional)">
+<!ENTITY account.label                  "Account">
+<!ENTITY autojoin.label                 "Auto-join this Chat Room">
+<!ENTITY autojoin.accesskey             "A">
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -21,16 +21,18 @@
 <!ENTITY newVirtualFolderCmd.label "Saved Search…">
 <!ENTITY newVirtualFolderCmd.accesskey "S">
 <!ENTITY newOtherAccountsCmd.label "Other Accounts…">
 <!ENTITY newOtherAccountsCmd.accesskey "O">
 <!ENTITY newCreateEmailAccountCmd.label "Get a New Mail Account…">
 <!ENTITY newCreateEmailAccountCmd.accesskey "G">
 <!ENTITY newExistingEmailAccountCmd.label "Existing Mail Account…">
 <!ENTITY newExistingEmailAccountCmd.accesskey "E">
+<!ENTITY newIMAccountCmd.label "Chat Account…">
+<!ENTITY newIMAccountCmd.accesskey "C">
 <!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">
@@ -320,16 +322,19 @@ you can use these alternative items. Oth
 <!ENTITY prevUnreadMsgCmd.accesskey "U">
 <!ENTITY prevUnreadMsgCmd.key "p">
 <!ENTITY goForwardCmd.label "Forwards">
 <!ENTITY goForwardCmd.accesskey "F">
 <!ENTITY goForwardCmd.commandKey "]">
 <!ENTITY goBackCmd.label "Back">
 <!ENTITY goBackCmd.accesskey "B">
 <!ENTITY goBackCmd.commandKey "[">
+<!ENTITY goChatCmd.label "Chat">
+<!ENTITY goChatCmd.accesskey "C">
+<!ENTITY goChatCmd.commandKey "C">
 <!ENTITY prevStarredMsgCmd.label "Starred Message">
 <!ENTITY prevStarredMsgCmd.accesskey "S">
 <!ENTITY folderMenu.label "Folder">
 <!ENTITY folderMenu.accesskey "O">
 <!ENTITY thisFolder.label "This Folder">
 <!ENTITY thisFolder.accesskey "F">
 <!ENTITY goRecentlyClosedTabs.label "Recently Closed Tabs">
 <!ENTITY goRecentlyClosedTabs.accesskey "R">
@@ -463,25 +468,31 @@ you can use these alternative items. Oth
 <!ENTITY messengerCmd.accesskey "N">
 <!ENTITY addressBookCmd.label "Address Book">
 <!ENTITY addressBookCmd.accesskey "B">
 <!ENTITY addressBookCmd.key "B">
 <!ENTITY addons.label "Add-ons">
 <!ENTITY addons.accesskey "A">
 <!ENTITY activitymanager.label "Activity Manager">
 <!ENTITY activitymanager.accesskey "v">
+<!ENTITY imAccountsStatus.label "Chat status">
+<!ENTITY imAccountsStatus.accesskey "C">
+<!ENTITY imStatus.available          "Available">
+<!ENTITY imStatus.unavailable        "Unavailable">
+<!ENTITY imStatus.offline            "Offline">
+<!ENTITY imStatus.showAccounts       "Show Accounts…">
 <!ENTITY savedFiles.label "Saved Files">
 <!ENTITY savedFiles.accesskey "l">
 <!ENTITY savedFiles.key "j">
 <!ENTITY filtersCmd.label "Message Filters…">
 <!ENTITY filtersCmd.accesskey "F">
 <!ENTITY filtersApply.label "Run Filters on Folder">
 <!ENTITY filtersApply.accesskey "R">
 <!ENTITY filtersApplyToSelection.label "Run Filters on Selected Messages">
-<!ENTITY filtersApplyToSelection.accesskey "S">
+<!ENTITY filtersApplyToSelection.accesskey "u">
 <!ENTITY filtersApplyToMessage.label "Run Filters on Message">
 <!ENTITY filtersApplyToMessage.accesskey "u">
 <!ENTITY runJunkControls.label "Run Junk Mail Controls on Folder">
 <!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">
@@ -498,30 +509,35 @@ you can use these alternative items. Oth
 <!ENTITY newMsgButton.label "Write">
 <!ENTITY replyButton.label "Reply">
 <!ENTITY replyAllButton.label "Reply All">
 <!ENTITY replyListButton.label "Reply to List">
 <!ENTITY forwardButton.label "Forward">
 <!ENTITY fileButton.label "File">
 <!ENTITY archiveButton.label "Archive">
 <!ENTITY nextButton.label "Next">
+<!ENTITY nextButtonToolbarItem.label "Next Unread">
+<!ENTITY nextMsgButton.label "Next">
 <!ENTITY previousButton.label "Previous">
+<!ENTITY previousButtonToolbarItem.label "Previous Unread">
+<!ENTITY previousMsgButton.label "Previous">
 <!ENTITY backButton1.label "Back">
 <!ENTITY goForwardButton1.label "Forwards">
 <!ENTITY deleteItem.title "Delete">
 <!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 junkItem.title "Junk">
 <!ENTITY junkButton.label "Junk">
 <!ENTITY notJunkButton.label "Not Junk">
 <!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">
 
 <!-- Mail Toolbar Tooltips-->
@@ -532,27 +548,30 @@ you can use these alternative items. Oth
 <!ENTITY newMsgButton.tooltip "Create a new message">
 <!ENTITY replyButton.tooltip "Reply to the message">
 <!ENTITY replyAllButton.tooltip "Reply to sender and all recipients">
 <!ENTITY replyListButton.tooltip "Reply to mailing list">
 <!ENTITY forwardButton.tooltip "Forward selected message">
 <!ENTITY fileButton.tooltip "File selected message">
 <!ENTITY archiveButton.tooltip "Archive selected messages">
 <!ENTITY nextButton.tooltip "Move to the next unread message">
+<!ENTITY nextMsgButton.tooltip "Move to the next message">
 <!ENTITY previousButton.tooltip "Move to the previous unread message">
+<!ENTITY previousMsgButton.tooltip "Move to the previous message">
 <!ENTITY goForwardButton.tooltip "Go forwards one message">
 <!ENTITY goBackButton.tooltip "Go back one message">
 <!ENTITY deleteButton.tooltip "Delete selected message or folder">
 <!ENTITY undeleteButton.tooltip "Undelete selected message">
 <!ENTITY markButton.tooltip "Mark messages">
 <!ENTITY printButton.tooltip "Print this message">
 <!ENTITY stopButton.tooltip "Stop the current transfer">
 <!ENTITY junkButton.tooltip "Mark the selected messages as junk">
 <!ENTITY notJunkButton.tooltip "Mark the selected messages as not junk">
 <!ENTITY addressBookButton.tooltip "Go to the address book">
+<!ENTITY chatButton.tooltip "Show the Chat tab">
 <!ENTITY tagButton.tooltip "Tag messages">
 <!ENTITY compactButton.tooltip "Remove deleted messages from selected folder">
 
 <!-- Tags Menu Popup -->
 <!ENTITY addNewTag.label "New Tag…">
 <!ENTITY addNewTag.accesskey "N">
 
 <!-- Folder Pane -->
@@ -775,38 +794,38 @@ you can use these alternative items. Oth
 <!ENTITY mdnBarSendButton2.accesskey "S">
 
 <!-- Quick Search Bar -->
 <!-- LOCALIZATION NOTE (quickSearchCmd.key):
      This is actually the key used for the global message search box; we have
      not changed 
      -->
 <!ENTITY quickSearchCmd.key "k">
-<!-- LOCALIZATION NOTE (searchAllMessages.label.base):
+<!-- LOCALIZATION NOTE (search.label.base):
      This is the base of the empty text for the global search box.  We replace
-     #1 with the contents of the appropriate
-     searchAllMessages.keyLabel2.* value for the platform.
+     #1 with the contents of the appropriate search.keyLabel.* value for the
+     platform.
      The goal is to convey to the user that typing in the box will allow them
      to search for messages globally and that there is a hotkey they can press
      to get to the box faster.  If the global indexer is disabled, the search
      box will be collapsed and the user will never see this message.
      -->
-<!ENTITY searchAllMessages.label.base "Search… #1">
-<!-- LOCALIZATION NOTE (searchAllMessages.keyLabel.nonmac):
+<!ENTITY search.label.base "Search… #1">
+<!-- LOCALIZATION NOTE (search.keyLabel.nonmac):
      The description of the key-binding to get into the global search box on
      windows and linux (which use the control key).  We use the key defined in
      the quickSearchCmd.key entity defined above, the letter should match it.
      -->
-<!ENTITY searchAllMessages.keyLabel2.nonmac "&lt;Ctrl+K&gt;">
-<!-- LOCALIZATION NOTE (searchAllMessages.keyLabel.mac):
+<!ENTITY search.keyLabel.nonmac "&lt;Ctrl+K&gt;">
+<!-- LOCALIZATION NOTE (search.keyLabel.mac):
      The description of the key-binding to get into the global search box on mac
      systems.  We use the key defined in the quickSearchCmd.key entity defined
      above, the letter should match it.
      -->
-<!ENTITY searchAllMessages.keyLabel2.mac "&lt;&#x2318;K&gt;">
+<!ENTITY search.keyLabel.mac "&lt;&#x2318;K&gt;">
 
 <!-- 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">
 <!ENTITY EditContact.label "Edit Contact…">
 <!ENTITY EditContact.accesskey "E">
--- a/mail/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/chrome/messenger/messengercompose/composeMsgs.properties
@@ -267,16 +267,20 @@ 12600=Unable to authenticate to SMTP ser
 ## 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)
 
+# LOCALIZATION NOTE (chooseFileToAttachViaCloud): %1$S is the cloud
+# provider to save the file to.
+chooseFileToAttachViaCloud=Attach File(s) via %1$S
+
 ##
 windowTitlePrefix=Write:
 
 ## Strings used by the empty subject dialog
 subjectEmptyTitle=Subject Reminder
 subjectEmptyMessage=Your message doesn't have a subject.
 sendWithEmptySubjectButton=&Send Without Subject
 cancelSendingButton=&Cancel Sending
@@ -359,24 +363,100 @@ attachmentReminderMsg=Did you forget to 
 # LOCALIZATION NOTE (attachmentReminderKeywordsMsgs): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
 # #1 number of keywords
 attachmentReminderKeywordsMsgs=Found an attachment keyword:;Found #1 attachment keywords:
 attachmentReminderOptionsMsg=Attachment reminder words can be configured in your preferences
 attachmentReminderYesIForgot=Oh, I did!
 attachmentReminderFalseAlarm=No, Send Now
 
+# LOCALIZATION NOTE (bigFileDescription): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/Localization_and_Plurals
+# #1 number of big attached files
+bigFileDescription=This is a large file. It might be better to use Filelink instead.;These are large files. It might be better to use Filelink instead.
+bigFileShare.label=Link
+bigFileShare.accesskey=l
+bigFileAttach.label=Ignore
+bigFileAttach.accesskey=i
+
+bigFileChooseAccount.title=Choose Account
+bigFileChooseAccount.text=Choose a cloud account to upload the attachment to
+
+bigFileHideNotification.title=Don't Upload My Files
+bigFileHideNotification.text=You won't be notified if you attach more big files to this message.
+bigFileHideNotification.check=Never notify me of this again.
+
+# LOCALIZATION NOTE(cloudFileUploadingTooltip): Do not translate the string
+# %S. %S is the display name for the cloud account the attachment is being
+# uploaded to.
+cloudFileUploadingTooltip=Uploading to %S…
+# LOCALIZATION NOTE(cloudFileUploadedTooltip): Do not translate the string
+# %S. %S is the display name for the cloud account the attachment was uploaded
+# to.
+cloudFileUploadedTooltip=Uploaded to %S
+cloudFileUploadingNotification=Your file is being linked. It will appear in the body of the message when it's done.;Your files are being linked. They will appear in the body of the message when they're done.
+cloudFileUploadingCancel.label=Cancel
+cloudFileUploadingCancel.accesskey=c
+
 ## LOCALIZATION NOTE(smtpEnterPasswordPrompt): Do not translate the
 ## word $S. Place the word $S where the host name should appear.
 smtpEnterPasswordPrompt=Enter your password for %S:
 ## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the
 ## words %1$S and %2$S. Place the word %1$S where the host name should appear,
 ## and %2$S where the user name should appear.
 smtpEnterPasswordPromptWithUsername=Enter your password for %2$S on %1$S:
 smtpEnterPasswordPromptTitle=SMTP Server Password Required
 
 # LOCALIZATION NOTE (removeAttachmentMsgs): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
 removeAttachmentMsgs=Remove Attachment;Remove Attachments
 
 ## LOCALIZATION NOTE(errorSavingMsg): Do not translate the word %S. It
 ## will be replaced with the name of the folder the message is being saved to.
 errorSavingMsg=There was an error saving the message to %S. Retry?
+
+errorCloudFileAuth.title=Authentication Error
+## LOCALIZATION NOTE(errorCloudFileAuth.message):
+## %1$S is the name of the online storage service that authentication failed against.
+errorCloudFileAuth.message=Unable to authenticate to %1$S.
+errorCloudFileUpload.title=Upload Error
+## LOCALIZATION NOTE(errorCloudFileUpload.message):
+## %1$S is the name of the online storage service that uploading failed against.
+## %2$S is the name of the file that failed to upload.
+errorCloudFileUpload.message=Unable to upload %2$S to %1$S.
+errorCloudFileQuota.title=Quota Error
+## LOCALIZATION NOTE(errorCloudFileQuota.message):
+## %1$S is the name of the online storage service being uploaded to.
+## %2$S is the name of the file that could not be uploaded due to exceeding the storage limit.
+errorCloudFileQuota.message=Uploading %2$S to %1$S would exceed your space quota.
+errorCloudFileLimit.title=File Size Error
+## LOCALIZATION NOTE(errorCloudFileLimit.message):
+## %1$S is the name of the online storage service being uploaded to.
+## %2$S is the name of the file that could not be uploaded due to size restrictions.
+errorCloudFileLimit.message=%2$S exceeds the maximum size for %1$S.
+errorCloudFileOther.title=Unknown Error
+## LOCALIZATION NOTE(errorCloudFileOther.message):
+## %1$S is the name of the online storage service that cannot be communicated with.
+errorCloudFileOther.message=An unknown error occurred when communicating with %1$S.
+errorCloudFileDeletion.title=Deletion Error
+## LOCALIZATION NOTE(errorCloudFileDeletion.message):
+## %1$S is the name of the online storage service that the file is to be deleted from.
+## %2$S is the name of the file that failed to be deleted.
+errorCloudFileDeletion.message=There was a problem deleting %2$S from %1$S.
+
+errorCloudFileUpgrade.label=Upgrade
+
+## LOCALIZATION NOTE(cloudAttachmentCountHeader): A line of text describing how
+## many uploaded files have been appended to this message.  Emphasis should be
+## on sharing as opposed to attaching. This item is used as a header to a list,
+## hence the colon.  This header is only displayed in HTML emails.
+## Using PluralForm (so don't replace the #1).
+cloudAttachmentCountHeader=I've linked #1 file to this email:;I've linked #1 files to this email:
+## LOCALIZATION NOTE(cloudAttachmentListFooter): %1$S is a link, whose text
+## contents are the brandFullName of this application.
+cloudAttachmentListFooter=%1$S makes it easy to share large files over email.
+
+## LOCALIZATION NOTE(cloudAttachmentListItem): A line of text describing a cloud
+## attachment, to be inserted into the message body. Do not translate the words
+## %1$S, %2$S, %3$S, or %4$S. %1$S is the attachment name, %2$S is its size,
+## %3$S is the name of the cloud storage service, and %4$S is the link to the
+## attachment.
+cloudAttachmentListItem=* %1$S (%2$S) hosted on %3$S: %4$S
--- a/mail/chrome/messenger/messengercompose/messengercompose.dtd
+++ b/mail/chrome/messenger/messengercompose/messengercompose.dtd
@@ -12,16 +12,18 @@
 <!ENTITY newMessage.accesskey "M">
 <!ENTITY newContact.label "Address Book Contact…">
 <!ENTITY newContact.accesskey "C">
 <!ENTITY attachMenu.label "Attach">
 <!ENTITY attachMenu.accesskey "t">
 <!ENTITY attachFileCmd.label "File(s)…">
 <!ENTITY attachFileCmd.accesskey "F">
 <!ENTITY attachFileCmd.key "A">
+<!ENTITY attachCloudCmd.label "Filelink">
+<!ENTITY attachCloudCmd.accesskey "i">
 <!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">
@@ -265,16 +267,24 @@
 <!ENTITY removeAttachment.label "Remove Attachment">
 <!ENTITY removeAttachment.accesskey "M">
 <!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 attachCloud.label "Filelink…">
+<!ENTITY attachCloud.accesskey "i">
+<!ENTITY convertCloud.label "Convert to…">
+<!ENTITY convertCloud.accesskey "C">
+<!ENTITY cancelUpload.label "Cancel Upload">
+<!ENTITY cancelUpload.accesskey "n">
+<!ENTITY convertRegularAttachment.label "Regular Attachment">
+<!ENTITY convertRegularAttachment.accesskey "A">
 <!ENTITY attachPage.label "Attach Web Page…">
 <!ENTITY attachPage.accesskey "W">
 
 <!-- Spell checker context menu items -->
 <!ENTITY spellAddDictionaries.label "Add Dictionaries…">
 <!ENTITY spellAddDictionaries.accesskey "A">
 
 <!-- Title for the address picker panel -->
--- a/mail/chrome/messenger/mime.properties
+++ b/mail/chrome/messenger/mime.properties
@@ -66,17 +66,16 @@ 1004=Resent-From
 # Resent-To
 ## @name MIME_MHTML_RESENT_TO
 ## @loc 
 1005=Resent-To
 
 # Resent-CC
 ## @name MIME_MHTML_RESENT_CC
 ## @loc 
-# LOCALIZATION NOTE (1006): Do not translate "CC" below.
 1006=Resent-CC
 
 # Date
 ## @name MIME_MHTML_DATE
 ## @loc 
 1007=Date
 
 # Sender
@@ -102,17 +101,16 @@ 1011=Organisation
 # To
 ## @name MIME_MHTML_TO
 ## @loc 
 1012=To
 
 # CC
 ## @name MIME_MHTML_CC
 ## @loc 
-# LOCALIZATION NOTE (1013): Do not translate "CC" below.
 1013=CC
 
 # Newsgroups
 ## @name MIME_MHTML_NEWSGROUPS
 ## @loc 
 1014=Newsgroups
 
 # Followup-To
@@ -145,61 +143,44 @@ 1026=Link to Document
 ## @loc 
 1027=<B>Document Info:</B>
 
 # Msg Attachment
 ## @name MIME_MSG_ATTACHMENT
 ## @loc 
 1028=Attachment
 
-# Partial Message Format 1
-## @name MIME_MSG_PARTIAL_FMT_1
-## @loc
-# LOCALIZATION NOTE (1037): In the following line, translate only the word, "Truncated!".
-1037=<P><CENTER><TABLE BORDER CELLSPACING=5 CELLPADDING=10 WIDTH="80%%"><TR><TD ALIGN=CENTER><FONT SIZE="+1"><B>Truncated!</B></FONT><HR>
-
-# Partial Message Format 2
-## @name MIME_MSG_PARTIAL_FMT_2
-## @loc
-# LOCALIZATION NOTE (1038): Translate the following two lines as a single sentence. In the middle of the two sections
-# there will be a URL. You may translate the text in any order you wish, but the html tags must stay in the same locations.
-# In particular, the "<B>" tag must begin the first section, which must end with the "<A HREF=" tag. Do not translate the html tag,"<P>"
-1038=<B>This message exceeded the Maximum Message Size set in Account Settings, so we have only downloaded the first few lines from the mail server.<P><A HREF="
-
-# Partial Message Format 3
-## @name MIME_MSG_PARTIAL_FMT_3
-## @loc
-# LOCALIZATION NOTE (1039): This section must begin with the ">" sign and end with the tags,"</B></TD></TR></TABLE></CENTER>"
-# Do not translate "</A>" tag.
-1039=">Download the rest of the message</A>.</B></TD></TR></TABLE></CENTER>
-
 # default attachment name
 ## @name MIME_MSG_DEFAULT_ATTACHMENT_NAME
 ## @loc 
 # LOCALIZATION NOTE (1040): Do not translate "%s" below.
 # Place the %s where you wish the part number of the attachment to appear
 1040=Part %s
 
 # default forwarded message prefix
 ## @name MIME_FORWARDED_MESSAGE_USER_WROTE
 ## @loc 
 1041=-------- Original Message --------
 
-# Partial Message Format2 1
-## @name MIME_MSG_PARTIAL_FMT2_1
+# Partial Message Truncated
+## @name MIME_MSG_PARTIAL_TRUNCATED
 ## @loc
-# LOCALIZATION NOTE (1042): In the following line, translate only the words, "Not Downloaded".
-1042=<P><CENTER><TABLE BORDER CELLSPACING=5 CELLPADDING=10 WIDTH="80%%"><TR><TD ALIGN=CENTER><FONT SIZE="+1"><B>Not Downloaded</B></FONT><HR>
+MIME_MSG_PARTIAL_TRUNCATED=Truncated!
 
-# Partial Message Format2 2
-## @name MIME_MSG_PARTIAL_FMT2_2
+# Partial Message Truncated Explanation
+## @name MIME_MSG_PARTIAL_TRUNCATED_EXPLANATION
 ## @loc
-# LOCALIZATION NOTE (1043): Translate the following two lines as a single sentence. In the middle of the two sections
-# there will be a URL. You may translate the text in any order you wish, but the html tags must stay in the same locations.
-# In particular, the "<B>" tag must begin the first section, which must end with the "<A HREF=" tag. Do not translate the html tag,"<P>"
-1043=<B>Only the headers for this message were downloaded from the mail server.<P><A HREF="
+MIME_MSG_PARTIAL_TRUNCATED_EXPLANATION=This message exceeded the Maximum Message Size set in Account Settings, so we have only downloaded the first few lines from the mail server.
+
+# Partial Message Not Downloaded
+## @name MIME_MSG_PARTIAL_NOT_DOWNLOADED
+## @loc
+MIME_MSG_PARTIAL_NOT_DOWNLOADED=Not Downloaded
 
-# Partial Message Format2 3
-## @name MIME_MSG_PARTIAL_FMT2_3
+# Partial Message Not Downloaded Explanation
+## @name MIME_MSG_PARTIAL_NOT_DOWNLOADED_EXPLANATION
 ## @loc
-# LOCALIZATION NOTE (1044): This section must begin with the ">" sign and end with the tags,"</B></TD></TR></TABLE></CENTER>"
-# Do not translate "</A>" tag.
-1044=">Download the rest of the message</A>.</B></TD></TR></TABLE></CENTER>
+MIME_MSG_PARTIAL_NOT_DOWNLOADED_EXPLANATION=Only the headers for this message were downloaded from the mail server.
+
+# MIME_MSG_PARTIAL_CLICK_FOR_REST
+## @name MIME_MSG_PARTIAL_CLICK_FOR_REST
+## @loc
+MIME_MSG_PARTIAL_CLICK_FOR_REST=Download the rest of the message.
--- a/mail/chrome/messenger/newmailaccount/accountProvisioner.dtd
+++ b/mail/chrome/messenger/newmailaccount/accountProvisioner.dtd
@@ -1,10 +1,10 @@
 <!ENTITY window.title "Welcome to &brandShortName;">
-<!ENTITY header.label "Would you like a new email address?">
+<!ENTITY header2.label "Would you like a new email address?">
 <!ENTITY other.languages "We are only displaying the providers offering addresses in your area.  Click here to show all providers.">
 <!ENTITY error.line1 "Sorry, we could not find any suggested email addresses.">
 <!ENTITY error.line2 "You try can search for nicknames or any other term to find more emails">
 
 <!-- LOCALIZATION NOTE(error.suggest.before, error.suggest.middle, error.suggest.after):
      error.suggest.before, error.suggest.middle, and error.suggest.after all go into
      one line with error.suggest.middle that links to a site which provides download
      of free account alternatives. -->
--- a/mail/chrome/messenger/news.properties
+++ b/mail/chrome/messenger/news.properties
@@ -41,21 +41,22 @@ htmlNewsErrorTitle=Error!
 # LOCALIZATION NOTE ( htmlNewsError ): In the following item, translate only "Error!" and "newsgroup server responded:"
 htmlNewsError=<H1>Error!</H1>newsgroup server responded: 
 # LOCALIZATION NOTE ( articleExpired ): In the following item, translate only "Perhaps the article has expired"
 articleExpired=<B><P>Perhaps the article has expired</P></B>
 removeExpiredArtLinkText=Click here to remove all expired articles
 cancelDisallowed=This message does not appear to be from you.  You may only cancel your own posts, not those made by others.
 cancelConfirm=Are you sure you want to cancel this message?
 messageCancelled=Message cancelled.
-enterUsername=Please enter a username for news server access:
-enterUsernameTitle=News Server Username Required
-saveUsername=Use Password Manager to remember this value.
-enterPassword=Please enter a password for news server access:
-enterPasswordTitle=News Server Password Required
+enterUserPassTitle=News Server Username and Password Required
+# LOCALIZATION NOTE (enterUserPassServer): %S is the server being accessed
+enterUserPassServer=Please enter a username and password for %S:
+# LOCALIZATION NOTE (enterUserPassGroup): %1$S is a specific newsgroup to set
+# the password for; %2$S is the server from which the newsgroup is accessed
+enterUserPassGroup=Please enter a username and password for %1$S on %2$S:
 okButtonText=Download
 
 noNewMessages=There are no new messages on the server.
 # LOCALIZATION NOTE (newNewsgroupHeaders): %1$S is the number of the current
 # header being downloaded, %2$S is the number of headers to be downloaded, and
 #  %3$S is the newsgroup whose headers are being downloaded.
 newNewsgroupHeaders=Downloading %1$S of %2$S headers for %3$S
 # LOCALIZATION NOTE (newNewsgroupFilteringHeaders): %1$S is the name of the MIME
--- a/mail/chrome/messenger/preferences/applications.dtd
+++ b/mail/chrome/messenger/preferences/applications.dtd
@@ -12,8 +12,23 @@
 <!ENTITY saveTo.label                 "Save files to">
 <!ENTITY saveTo.accesskey             "S">
 <!ENTITY alwaysAsk.label              "Always ask me where to save files">
 <!ENTITY alwaysAsk.accesskey          "A">
 <!ENTITY chooseFolderWin.label        "Browse…">
 <!ENTITY chooseFolderWin.accesskey    "B">
 <!ENTITY chooseFolderMac.label        "Choose…">
 <!ENTITY chooseFolderMac.accesskey    "C">
+
+<!ENTITY attachments.incoming.label   "Incoming">
+<!ENTITY attachments.outgoing.label   "Outgoing">
+
+<!ENTITY addCloudFileAccount.label        "Add">
+<!ENTITY addCloudFileAccount.accesskey    "A">
+<!ENTITY addCloudFileAccount.description  "Add a new Filelink storage service">
+<!ENTITY removeCloudFileAccount.label     "Remove">
+<!ENTITY removeCloudFileAccount.accesskey "R">
+<!ENTITY authRequired.description         "Your authorisation is required in order to see the settings for this storage service.">
+<!ENTITY authRequired.button.label        "Authorise">
+<!ENTITY authRequired.button.accesskey    "U">
+
+<!ENTITY enableCloudFileAccountOffer.label "Offer to share for files larger than">
+<!ENTITY enableCloudFileAccountOffer.mb "MB">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/preferences/applications.properties
@@ -0,0 +1,3 @@
+# LOCALIZATION NOTE (dialog_removeAccount):
+# %S will be replaced with the user-defined name of a storage account.
+dialog_removeAccount=Are you sure you want to remove the account "%S"?
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/preferences/chat.dtd
@@ -0,0 +1,20 @@
+<!ENTITY  startupAction.label         "When &brandShortName; starts:">
+<!ENTITY  startupAction.accesskey     "s">
+<!ENTITY  startupOffline.label        "Keep my Chat Accounts offline">
+<!ENTITY  startupConnectAuto.label    "Connect my chat accounts automatically">
+
+<!-- LOCALIZATION NOTE: reportIdleAfter.label is displayed first, then
+there's a field where the user can enter a number, and itemTime is
+displayed at the end of the line. The translations of the
+reportIdleAfter.label and idleTime parts don't have to mean the exact
+same thing as in English; please try instead to translate the whole
+sentence. -->
+<!ENTITY  reportIdleAfter.label         "Let my contacts know that I am Idle after">
+<!ENTITY  reportIdleAfter.accesskey     "I">
+<!ENTITY  idleTime                      "minutes of inactivity">
+
+<!ENTITY  andSetStatusToAway.label      "and set my status to Away with this status message:">
+<!ENTITY  andSetStatusToAway.accesskey  "A">
+
+<!ENTITY  sendTyping.label              "Send typing notifications in conversations">
+<!ENTITY  sendTyping.accesskey          "t">
--- a/mail/chrome/messenger/preferences/preferences.dtd
+++ b/mail/chrome/messenger/preferences/preferences.dtd
@@ -3,11 +3,12 @@
 <!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 paneChat.title           "Chat">
 <!ENTITY paneAttachments.title    "Attachments">
 <!ENTITY paneSecurity.title       "Security">
 <!ENTITY paneAdvanced.title       "Advanced">
--- a/mail/chrome/messenger/prefs.properties
+++ b/mail/chrome/messenger/prefs.properties
@@ -8,17 +8,17 @@ serverNameChanged=The server name settin
 # 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?)
-enterValidHostname=Please enter a valid hostname.
+enterValidServerName=Please enter a valid server name.
 failedRemoveAccount=Failed to remove 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?