# HG changeset patch
# User t_mrc-ct@users.sourceforge.jp
# Date 1406793349 -32400
# Node ID d31f12bcd7d796a8ef843a8ff6758e4b02c12526
# Parent  a37afb09b45d5eb0ac1295847e6a2f77fad04e7b
merge Part2: gmake merge-pt-BR LOCALE_MERGEDIR=$(LOCALE_MERGEDIR)

diff --git a/chat/irc.properties b/chat/irc.properties
--- a/chat/irc.properties
+++ b/chat/irc.properties
@@ -198,8 +198,12 @@
 #    they were invited to but are already in
 message.alreadyInChannel=%1$S já está em %2$S.
 # LOCALIZATION NOTE (message.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 or the server that was pinged.
 #   #2 is the delay (in milliseconds).
 message.ping=Resposta de %1$S em #2 milissegundo.;Resposta de %1$S em #2 milissegundos.
 options.alternateNicks=Alcunhas alternativas
+
+tooltip.lastActivity=Last activity
+# %S is the timespan elapsed since the last activity.
+tooltip.timespan=%S ago
diff --git a/chat/status.properties b/chat/status.properties
--- a/chat/status.properties
+++ b/chat/status.properties
@@ -11,8 +11,14 @@
 mobileStatusType=No celular
 # LOCALIZATION NOTE (unknownStatusType):
 # the status of a buddy is unknown when it's in the list of a disconnected account
 unknownStatusType=Desconhecido
 
 # LOCALIZATION NOTE (messenger.status.defaultIdleAwayMessage):
 #  This will be the away message put automatically when the user is idle.
 messenger.status.defaultIdleAwayMessage=No momento não estou no computador.
+
+
+# LOCALIZATION NOTE (statusWithStatusMessage):
+# Used to display the status of a buddy together with its status message.
+# %1$S is the status type, %2$S is the status message text.
+statusWithStatusMessage=%1$S - %2$S
diff --git a/dom/chrome/accessibility/AccessFu.properties b/dom/chrome/accessibility/AccessFu.properties
--- a/dom/chrome/accessibility/AccessFu.properties
+++ b/dom/chrome/accessibility/AccessFu.properties
@@ -196,8 +196,10 @@
 # Text input types
 textInputType_date   =       data
 textInputType_email  =       endereço eletrónico
 textInputType_search =       procurar
 textInputType_tel    =       telefone
 textInputType_url    =       URL
 textareaAbbr       =       txtarea
 unselectAction =      não selecionado
+
+statePressed     =    pressed
diff --git a/dom/chrome/dom/dom.properties b/dom/chrome/dom/dom.properties
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -145,8 +145,15 @@
 # LOCALIZATION NOTE: Do not translate "mozGetAsFile" or "toBlob"
 MozGetAsFileWarning=O método mozGetAsFile foi descontinuado e será removido brevemente. Em alternativa, utilize o método toBlob.
 # LOCALIZATION NOTE: Do not translate "window.showModalDialog()" or "window.open()" 
 ShowModalDialogWarning=O uso de window.showModalDialog() está obsoleto. Em alternativa use window.open(). Para mais ajuda https://developer.mozilla.org/en-US/docs/Web/API/Window.open
 # LOCALIZATION NOTE: Do not translate "XMLHttpRequest"
 SyncXMLHttpRequestWarning=XMLHttpRequest síncrono no tópico principal está obsoleto devido ao seu efeito negativo na experiência do utilizador. Para mais ajuda http://xhr.spec.whatwg.org/
 # LOCALIZATION NOTE: Do not translate "window._content" or "window.content"
 Window_ContentWarning=window._content está obsoleto.  Em alternativa use window.content.
+
+# LOCALIZATION NOTE: Do not translate "DataContainerEvent" or "CustomEvent"
+DataContainerEventWarning=Use of DataContainerEvent is deprecated. Use CustomEvent instead.
+# LOCALIZATION NOTE: Do not translate "sendAsBinary" or "send(Blob data)"
+SendAsBinaryWarning=The non-standard sendAsBinary method is deprecated and will soon be removed. Use the standard send(Blob data) method instead.
+# LOCALIZATION NOTE: Do not translate "window.controllers"
+Window_ControllersWarning=window.controllers is deprecated. Do not use it for UA detection.
diff --git a/editor/ui/chrome/composer/editorOverlay.dtd b/editor/ui/chrome/composer/editorOverlay.dtd
--- a/editor/ui/chrome/composer/editorOverlay.dtd
+++ b/editor/ui/chrome/composer/editorOverlay.dtd
@@ -337,8 +337,13 @@
 <!ENTITY insertTOC.label          "Inserir…">
 <!ENTITY insertTOC.accesskey      "I">
 <!ENTITY updateTOC.label          "Atualizar">
 <!ENTITY updateTOC.accesskey      "A">
 <!ENTITY removeTOC.label          "Remover">
 <!ENTITY removeTOC.accesskey      "R">
 <!ENTITY tocMenu.label            "Sumário">
 <!ENTITY tocMenu.accesskey        "S">
+
+<!ENTITY findBarCmd.label "Find…">
+<!ENTITY findReplaceCmd.label "Find and Replace…">
+<!ENTITY insertMathCmd.accesskey "M">
+<!ENTITY insertMathCmd.label "Math…">
diff --git a/mail/chrome/communicator/utilityOverlay.dtd b/mail/chrome/communicator/utilityOverlay.dtd
--- a/mail/chrome/communicator/utilityOverlay.dtd
+++ b/mail/chrome/communicator/utilityOverlay.dtd
@@ -56,8 +56,11 @@
 <!ENTITY quitApplicationCmd.key    "q">
 <!ENTITY quitApplicationCmd.accesskey  "S">
 
 <!ENTITY quitApplicationCmdUnix.label  "Sair">
 <!ENTITY quitApplicationCmdUnix.accesskey  "S">
 
 <!ENTITY quitApplicationCmdMac.label  "Sair do &brandShortName;">
 <!ENTITY quitApplicationCmdMac.accesskey  "S">
+
+<!ENTITY preferencesCmd2.accesskey "O">
+<!ENTITY preferencesCmd2.label "Options">
diff --git a/mail/chrome/messenger-newsblog/feed-subscriptions.dtd b/mail/chrome/messenger-newsblog/feed-subscriptions.dtd
--- a/mail/chrome/messenger-newsblog/feed-subscriptions.dtd
+++ b/mail/chrome/messenger-newsblog/feed-subscriptions.dtd
@@ -32,8 +32,15 @@
 <!ENTITY button.importOPML.accesskey "I">
 <!ENTITY button.exportOPML.label     "Exportar">
 <!ENTITY button.exportOPML.accesskey "o">
 <!ENTITY button.exportOPML.tooltip   "Exporta mantendo a estrutra de pastas; clique segurando Ctrl ou pressione Ctrl + Enter para exportar como uma lista">
 
 <!ENTITY cmd.close.commandKey        "W">
 
 <!ENTITY button.close.label          "Fechar">
+
+<!ENTITY autoTagPrefix.placeholder   "Enter a tag prefix">
+<!ENTITY autotagEnable.accesskey     "c">
+
+<!ENTITY autotagEnable.label         "Automatically create tags from feed &lt;category&gt; names">
+<!ENTITY autotagUsePrefix.accesskey  "P">
+<!ENTITY autotagUsePrefix.label      "Prefix tags with:">
diff --git a/mail/chrome/messenger/addressbook/abMainWindow.dtd b/mail/chrome/messenger/addressbook/abMainWindow.dtd
--- a/mail/chrome/messenger/addressbook/abMainWindow.dtd
+++ b/mail/chrome/messenger/addressbook/abMainWindow.dtd
@@ -212,8 +212,13 @@
 <!ENTITY statusText.label "">
 
 <!--  Mac OS X Window Menu -->
 <!ENTITY windowMenu.label "Janela">
 <!ENTITY minimizeWindow.label "Minimizar">
 <!ENTITY minimizeWindow.key "M">
 <!ENTITY bringAllToFront.label "Trazer Todas para Frente">
 <!ENTITY zoomWindow.label "Ampliar/Reduzir">
+
+<!ENTITY preferencesCmd2.accesskey                      "O">
+<!ENTITY preferencesCmd2.label                          "Options">
+<!ENTITY propertiesCmd2.accesskey                       "i">
+<!ENTITY propertiesCmd2.label                           "Properties">
diff --git a/mail/chrome/messenger/localMsgs.properties b/mail/chrome/messenger/localMsgs.properties
--- a/mail/chrome/messenger/localMsgs.properties
+++ b/mail/chrome/messenger/localMsgs.properties
@@ -312,8 +312,27 @@
 pop3StatFail=O comando STAT não foi bem sucedido. Erro ao obter o número e tamanho das mensagens.
 pop3TmpDownloadError=Ocorreu um um erro ao receber esta mensagem:   \nDe: %S\n   Assunto: %S\n Esta mensagem pode conter vírus ou não existe espaço suficiente em disco. Rejeitar esta mensagem?
 
 # Status - pop3 user name failed
 pop3UsernameFailure=O envio do nome de utilizador não foi bem sucedido.
 
 # Status - username undefined 
 pop3UsernameUndefined=Não introduziu o utilizador deste servidor. Introduza-o nas definições da conta e tente novamente.
+
+
+# Status - connecting to host
+hostContact=Host contacted, sending login information…
+
+# Status - no messages to download
+noNewMessages=There are no new messages.
+
+# Status - messages received after the download
+#LOCALIZATION NOTE : Do not translate %1$S or %2$S in the following line.
+# %1$S will receive the number of messages received
+# %2$S will receive the total number of messages
+receivedMsgs=Received %1$S of %2$S messages
+
+# Status - Downloading message n of m
+# LOCALIZATION NOTE (receivingMessages): Do not translate %1$S or %2$S in the following lines.
+# Place the word %1$S where the number of messages downloaded so far should appear.
+# Place the word %2$S where the total number of messages to receive should appear;
+receivingMessages=Downloading message %1$S of %2$S…
diff --git a/mail/chrome/messenger/messenger.dtd b/mail/chrome/messenger/messenger.dtd
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -956,8 +956,36 @@
 <!ENTITY sizeColumn2.tooltip "Ordenar por tamanho">
 <!ENTITY starredColumn2.tooltip "Ordenar por estrela">
 <!ENTITY statusColumn2.tooltip "Ordenar por estado">
 <!ENTITY subjectColumn2.tooltip "Ordenar por assunto">
 <!ENTITY tagsColumn2.tooltip "Ordenar por etiquetas">
 <!ENTITY threadColumn2.tooltip "Mostrar tópicos da mensagem">
 <!ENTITY totalColumn2.tooltip "Número total de mensagens no tópico">
 <!ENTITY unreadColumn2.tooltip "Número de mensagens não lidas no tópico">
+
+<!ENTITY accountManagerCmd2.accesskey "S">
+<!ENTITY accountManagerCmd2.label "Account Settings">
+<!-- LOCALIZATION NOTE (accountManagerCmdUnix2.accesskey): belongs to accountManagerCmd2.label,
+        which is placed under the Edit menu on Unix systems -->
+<!ENTITY accountManagerCmdUnix2.accesskey "A">
+<!ENTITY compactVersion.accesskey "C">
+<!ENTITY compactVersion.label "Compact View">
+<!ENTITY contextOpenContainingFolder.accesskey "n">
+<!ENTITY contextOpenContainingFolder.label "Open Message in Containing Folder">
+<!ENTITY editRemoteContentSettings.accesskey "E">
+<!ENTITY editRemoteContentSettings.label "Edit remote content options…">
+<!ENTITY editRemoteContentSettingsUnix.accesskey "E">
+<!ENTITY editRemoteContentSettingsUnix.label "Edit remote content preferences…">
+<!ENTITY filtersCmd2.accesskey "F">
+<!ENTITY filtersCmd2.label "Message Filters">
+<!ENTITY folderContextProperties2.accesskey "P">
+<!ENTITY folderContextProperties2.label "Properties">
+<!ENTITY folderContextSettings2.accesskey "e">
+<!ENTITY folderContextSettings2.label "Settings">
+<!ENTITY folderPropsCmd2.label "Properties">
+<!ENTITY folderPropsFolderCmd2.label "Folder Properties">
+<!ENTITY folderPropsNewsgroupCmd2.label "Newsgroup Properties">
+
+<!-- Mac OS X Application Menu (Cocoa widgets) -->
+<!ENTITY preferencesCmdMac2.label       "Preferences">
+<!ENTITY settingsOfflineCmd2.accesskey "e">
+<!ENTITY settingsOfflineCmd2.label "Offline Settings">
diff --git a/mail/chrome/messenger/messenger.properties b/mail/chrome/messenger/messenger.properties
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -779,8 +779,22 @@
 undoIgnoreSubthreadAccessKey=u
 undoIgnoreThread=Anular Ignorar tópico
 undoIgnoreThreadAccessKey=u
 update.downloadAndInstallButton.accesskey=u
 
 # LOCALIZATION NOTE (downloadAndInstallButton.label): %S is replaced by the
 # version of the update: "Update to 28.0".
 update.downloadAndInstallButton.label=Atualizar para a versão %S
+
+# LOCALIZATION NOTE(confirmDuplicateFolderRename): %1$S is name of folder being moved, %2$S is parent folder name, %3$S is proposed new folder name
+confirmDuplicateFolderRename=A subfolder with the name '%1$S' already exists in the folder '%2$S'. Would you like to move this folder using the new name '%3$S'?
+folderPaneModeHeader_favorite_compact=Favorite Folders - Compact View
+folderPaneModeHeader_recent_compact=Recent Folders - Compact View
+folderPaneModeHeader_unread_compact=Unread Folders - Compact View
+# LOCALIZATION NOTE(longMsgSubjectTruncator): A suffix string appended to the filename
+# (created from message subject) if it needed to be truncated due to length.
+longMsgSubjectTruncator=...
+
+# LOCALIZATION NOTE(remoteAllow): %S is host name
+remoteAllow=Allow remote content for %S
+# LOCALIZATION NOTE (saveAsType): replace %S with the extension of the file to be saved.
+saveAsType=%S file
diff --git a/mail/chrome/messenger/messengercompose/composeMsgs.properties b/mail/chrome/messenger/messengercompose/composeMsgs.properties
--- a/mail/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/chrome/messenger/messengercompose/composeMsgs.properties
@@ -453,8 +453,58 @@
 ## user specified
 mailnews.forward_header_originalmessage=-------- Mensagem reencaminhada --------
 ## LOCALIZATION NOTE (quitComposeWindowSaveMessage): don't translate \n
 quitComposeWindowSaveMessage=O %1$S está a guardar uma mensagem.\nDeseja esperar até que a mensagem seja guardada ou quer sair agora?
 quitComposeWindowSaveTitle=A guardar mensagem
 remindLaterButton.accesskey=L
 ## LOCALIZATION NOTE (SaveDlogMessages): %1$S is folder name
 saveDlogMessages=A mensagem não foi enviada. Deseja guardar a mensagem na pasta de rascunhos (%1$S)?
+
+
+assemblingMailInformation=Assembling mail information…
+assemblingMessage=Assembling message…
+
+assemblingMessageDone=Assembling message…Done
+copyMessageComplete=Copy complete.
+copyMessageFailed=Copy failed.
+
+## LOCALIZATION NOTE (copyMessageStart): argument %S is folder name
+copyMessageStart=Copying message to %S folder…
+creatingMailMessage=Creating mail message…
+
+## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSaving): argument %.200S is file name/URI of object to be embedded
+failureOnObjectEmbeddingWhileSaving=There was a problem including the file %.200S in the message. Would you like to continue saving the message without this file?
+## LOCALIZATION NOTE (failureOnObjectEmbeddingWhileSending): argument %.200S is file name/URI of object to be embedded
+failureOnObjectEmbeddingWhileSending=There was a problem including the file %.200S in the message. Would you like to continue sending the message without this file?
+## LOCALIZATION NOTE (gatheringAttachment): argument %S is file name/URI of attachment
+gatheringAttachment=Attaching %S…
+
+genericFailureExplanation=Please verify that your Mail & Newsgroups account settings are correct and try again.
+## LOCALIZATION NOTE (mailnews.reply_header_authorwroteondate): #1 is author, #2 is date, #3 is time
+mailnews.reply_header_authorwroteondate=#1 wrote on #2 #3:
+
+## reply header in composeMsg
+## LOCALIZATION NOTE (mailnews.reply_header_authorwrotesingle): #1 is author (name of person replying to)
+mailnews.reply_header_authorwrotesingle=#1 wrote:
+## LOCALIZATION NOTE (mailnews.reply_header_ondateauthorwrote): #1 is author, #2 is date, #3 is time
+mailnews.reply_header_ondateauthorwrote=On #2 #3, #1 wrote:
+postingMessage=Posting message…
+replaceButton.accesskey=l
+
+replaceButton.label=Replace…
+replaceButton.tooltip=Show the Find and Replace dialog
+returnToComposeWindowQuestion=Would you like to return to the compose window?
+saveDraftErrorTitle=Save Draft Error
+saveTemplateErrorTitle=Save Template Error
+
+sendLargeMessageWarning=Warning! You are about to send a %d byte message. Are you sure that you want to do this?
+
+sendLaterErrorTitle=Send Later Error
+sendMessageErrorTitle=Send Message Error
+
+sendingMessage=Sending message…
+
+smtpDeliveringMail=Delivering mail…
+smtpMailSent=Mail sent successfully
+
+## LOCALIZATION NOTE (undisclosedRecipients): this string must use only US_ASCII characters
+undisclosedRecipients=undisclosed-recipients
diff --git a/mail/chrome/messenger/messengercompose/messengercompose.dtd b/mail/chrome/messenger/messengercompose/messengercompose.dtd
--- a/mail/chrome/messenger/messengercompose/messengercompose.dtd
+++ b/mail/chrome/messenger/messengercompose/messengercompose.dtd
@@ -297,8 +297,19 @@
 
 <!ENTITY findReplaceCmd.key "n">
 <!ENTITY printButton.label "Imprimir">
 <!ENTITY printButton.tooltip "Imprimir esta mensagem">
 <!ENTITY printPreviewCmd.accesskey "v">
 <!ENTITY printPreviewCmd.label "Pré-visualizar impressão">
 <!ENTITY remindLater.accesskey "L">
 <!ENTITY remindLater.label "Lembrar mais tarde">
+
+<!ENTITY accountManagerCmd2.accesskey "S">
+<!ENTITY accountManagerCmd2.label "Account Settings">
+<!ENTITY accountManagerCmdUnix2.accesskey "S">
+<!ENTITY findBarCmd.accesskey "F">
+<!ENTITY findBarCmd.key "F">
+<!ENTITY findBarCmd.label "Find…">
+<!ENTITY findReplaceCmd.accesskey "l">
+<!ENTITY findReplaceCmd.label "Find and Replace…">
+<!ENTITY preferencesCmd2.accesskey "O">
+<!ENTITY preferencesCmd2.label "Options">
diff --git a/mail/chrome/messenger/preferences/chat.dtd b/mail/chrome/messenger/preferences/chat.dtd
--- a/mail/chrome/messenger/preferences/chat.dtd
+++ b/mail/chrome/messenger/preferences/chat.dtd
@@ -17,8 +17,23 @@
 <!ENTITY  reportIdleAfter.accesskey     "N">
 <!ENTITY  idleTime                      "minutos de inatividade">
 
 <!ENTITY  andSetStatusToAway.label      "e definir meu status como Ausente com esta mensagem de status:">
 <!ENTITY  andSetStatusToAway.accesskey  "A">
 
 <!ENTITY  sendTyping.label              "Enviar notificações de digitação durante conversas">
 <!ENTITY  sendTyping.accesskey          "E">
+
+<!ENTITY  browse.accesskey                    "B">
+<!ENTITY  browse.label                        "Browse…">
+
+<!ENTITY  chatNotifications.label             "When messages directed at you arrive:">
+<!ENTITY  chatSound.accesskey                 "d">
+<!ENTITY  chatSound.label                     "Play a sound">
+<!ENTITY  customsound.accesskey               "U">
+<!ENTITY  customsound.label                   "Use the following sound file">
+<!ENTITY  desktopChatNotifications.accesskey  "c">
+<!ENTITY  desktopChatNotifications.label      "Show a notification">
+<!ENTITY  play.accesskey                      "P">
+<!ENTITY  play.label                          "Play">
+<!ENTITY  systemSound.accesskey               "D">
+<!ENTITY  systemSound.label                   "Default system sound for new mail">
diff --git a/mail/chrome/messenger/preferences/preferences.dtd b/mail/chrome/messenger/preferences/preferences.dtd
--- a/mail/chrome/messenger/preferences/preferences.dtd
+++ b/mail/chrome/messenger/preferences/preferences.dtd
@@ -10,8 +10,10 @@
 
 <!ENTITY paneGeneral.title        "Geral">
 <!ENTITY paneDisplay.title        "Aparência">
 <!ENTITY paneComposition.title    "Edição">
 <!ENTITY paneChat.title           "Bate-papo">
 <!ENTITY paneAttachments.title    "Anexos">
 <!ENTITY paneSecurity.title       "Segurança">
 <!ENTITY paneAdvanced.title       "Avançado">
+
+<!ENTITY panePrivacy.title        "Privacy">
diff --git a/mail/chrome/messenger/preferences/preferences.properties b/mail/chrome/messenger/preferences/preferences.properties
--- a/mail/chrome/messenger/preferences/preferences.properties
+++ b/mail/chrome/messenger/preferences/preferences.properties
@@ -83,8 +83,13 @@
 canSession=Excluir ao sair
 cannot=Bloquear
 noCookieSelected=<nenhum cookie selecionado>
 cookiesAll=Estes cookies estão armazenados no seu computador:
 cookiesFiltered=Estes cookies satisfazem a sua pesquisa:
 removeCookies=Excluir cookies
 removeCookie=Excluir cookie
 
+
+
+#### Remote content
+imagepermissionstext=You can specify from which web sites images and other remote content are allowed to load. You can also allow all remote content based on sender e-mail address. Type the address of the site or e-mail you want to manage and then click Block or Allow.
+imagepermissionstitle=Exceptions - Remote Content
diff --git a/security/manager/chrome/pippki/certManager.dtd b/security/manager/chrome/pippki/certManager.dtd
--- a/security/manager/chrome/pippki/certManager.dtd
+++ b/security/manager/chrome/pippki/certManager.dtd
@@ -107,8 +107,11 @@
 <!ENTITY exceptionMgr.certlocation.url        "Endereço:">
 <!ENTITY exceptionMgr.certlocation.download   "Verificar certificado">
 <!ENTITY exceptionMgr.certlocation.accesskey  "V">
 <!ENTITY exceptionMgr.certstatus.caption      "Status do certificado">
 <!ENTITY exceptionMgr.certstatus.viewCert     "Exibir">
 <!ENTITY exceptionMgr.certstatus.accesskey    "x">
 <!ENTITY exceptionMgr.permanent.label         "Salvar esta exceção permanentemente">
 <!ENTITY exceptionMgr.permanent.accesskey     "S">
+
+<!ENTITY certmgr.begins                       "Begins On">
+<!ENTITY certmgr.periodofvalidity.label       "Period of Validity" >
diff --git a/toolkit/chrome/global/videocontrols.dtd b/toolkit/chrome/global/videocontrols.dtd
--- a/toolkit/chrome/global/videocontrols.dtd
+++ b/toolkit/chrome/global/videocontrols.dtd
@@ -32,8 +32,10 @@
 <!ENTITY error.generic "Execução do vídeo interrompida por um erro desconhecido.">
 
 <!-- LOCALIZATION NOTE (scrubberScale.nameFormat): the #1 string is the current
 media position, and the #2 string is the total duration. For example, when at
 the 5 minute mark in a 6 hour long video, #1 would be "5:00" and #2 would be
 "6:00:00", result string would be "5:00 of 6:00:00 elapsed".
 -->
 <!ENTITY scrubberScale.nameFormat "Decorridos #1 de #2">
+
+<!ENTITY castingButton.castingLabel "Cast to Screen">
diff --git a/toolkit/chrome/mozapps/extensions/extensions.dtd b/toolkit/chrome/mozapps/extensions/extensions.dtd
--- a/toolkit/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/chrome/mozapps/extensions/extensions.dtd
@@ -208,8 +208,21 @@
 <!ENTITY addon.createdBy.label                "Criação: ">
 
 <!ENTITY eula.title                           "Acordo de licença para o usuário final">
 <!ENTITY eula.width                           "560px">
 <!ENTITY eula.height                          "400px">
 <!ENTITY eula.accept                          "Aceitar e instalar…">
 
 <!ENTITY settings.path.button.label           "Procurar…">
+
+<!ENTITY cmd.debugAddon.label                 "Debug">
+<!ENTITY experiment.info.changetelemetry "Telemetry Settings">
+<!ENTITY experiment.info.changetelemetry.accesskey "T">
+
+<!-- LOCALIZATION NOTE (experiment.info.label): The strings related to
+     experiments are present on the "Experiments" tab of the add-ons manager.
+     This tab won't be displayed unless an Experiment add-on is installed.
+     Install https://people.mozilla.org/~gszorc/dummy-experiment-addon.xpi
+     to cause this tab to appear. -->
+<!ENTITY experiment.info.label "What's this? Telemetry may install and run experiments from time to time.">
+<!ENTITY experiment.info.learnmore "Learn More">
+<!ENTITY experiment.info.learnmore.accesskey "L">
diff --git a/toolkit/chrome/mozapps/extensions/extensions.properties b/toolkit/chrome/mozapps/extensions/extensions.properties
--- a/toolkit/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/chrome/mozapps/extensions/extensions.properties
@@ -126,8 +126,48 @@
 eulaHeader=O %S necessita que você aceite, para prosseguir com a instalação, o Acordo de Licença para o Usuário Final:
 
 type.extension.name=Extensões
 type.theme.name=Aparência
 type.locale.name=Idiomas
 type.plugin.name=Plugins
 type.dictionary.name=Dicionários
 type.service.name=Serviços
+
+#LOCALIZATION NOTE (details.experiment.state.active) This experiment is active (detail view).
+details.experiment.state.active=Active
+#LOCALIZATION NOTE (details.experiment.state.complete) This experiment is complete (it was previously active) (detail view).
+details.experiment.state.complete=Complete
+# LOCALIZATION NOTE (details.experiment.time.daysPassed):
+# Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of days since the experiment ran (detail view).
+details.experiment.time.daysPassed=#1 day ago;#1 days ago
+
+# LOCALIZATION NOTE (details.experiment.time.daysRemaining):
+# Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of days from now that the experiment will remain active (detail view).
+details.experiment.time.daysRemaining=#1 day remaining;#1 days remaining
+#LOCALIZATION NOTE (details.experiment.time.endedToday) The experiment ended less than a day ago (detail view).
+details.experiment.time.endedToday=Less than a day ago
+#LOCALIZATION NOTE (details.experiment.time.endsToday) The experiment will end in less than a day (detail view).
+details.experiment.time.endsToday=Less than a day remaining
+#LOCALIZATION NOTE (experiment.state.active) This experiment is active (list view item).
+experiment.state.active=Active
+#LOCALIZATION NOTE (experiment.state.complete) This experiment is complete (it was previously active) (list view item).
+experiment.state.complete=Complete
+# LOCALIZATION NOTE (experiment.time.daysPassed):
+# Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of days since the experiment ran (list view item).
+experiment.time.daysPassed=#1 day ago;#1 days ago
+
+# LOCALIZATION NOTE (experiment.time.daysRemaining):
+# Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of days from now that the experiment will remain active (list view item).
+experiment.time.daysRemaining=#1 day remaining;#1 days remaining
+#LOCALIZATION NOTE (experiment.time.endedToday) The experiment ended less than a day ago (list view item).
+experiment.time.endedToday=Less than a day ago
+#LOCALIZATION NOTE (experiment.time.endsToday) The experiment will end in less than a day (list view item).
+experiment.time.endsToday=Less than a day remaining
+type.experiment.name=Experiments
diff --git a/toolkit/chrome/mozapps/update/updates.dtd b/toolkit/chrome/mozapps/update/updates.dtd
--- a/toolkit/chrome/mozapps/update/updates.dtd
+++ b/toolkit/chrome/mozapps/update/updates.dtd
@@ -76,8 +76,22 @@
 <!ENTITY  update.status.label             "Status:">
 
 <!ENTITY  unsupported.label               "O &brandShortName; está desatualizado mas o seu sistema operativo
                                            não possui suporte à versão mais recente. Atualize o sistema e tente novamente.
                                            Este aviso não será mostrado novamente, mas pode obter">
 
 <!ENTITY  unsupported.title               "Sistema não suportado">
 <!ENTITY  unsupportedLink.label           "mais informações..">
+
+<!ENTITY  manualUpdate2.desc               "A recommended security and stability update is available for your browser.
+                                           You should download and install it to make sure your browser is up to date.">
+<!ENTITY  manualUpdate2.space.desc         "A recommended security and stability update is available, but you do
+                                           not have enough space to install it.">
+
+<!ENTITY  manualUpdate2.title              "Update Available">
+<!ENTITY  manualUpdate2GetMsg.label        "Visit the main download page to get this browser update:">
+<!ENTITY  manualUpdate3.desc               "You are now ready to update your browser.">
+<!ENTITY  manualUpdate3.space.desc         "A recommended security and stability update is available, but you do
+                                           not have enough space to install it.">
+
+<!ENTITY  manualUpdate3.title              "Download Update Now">
+<!ENTITY  manualUpdate3GetMsg.label        "Visit the main download page to get the browser update:">
