# HG changeset patch
# User t_mrc-ct@users.sourceforge.jp
# Date 1387282734 -32400
# Node ID 8a20028eada16504ef70b3406194d4cded1d09f1
# Parent  87b7a69a524308d3fe086ada675734d059dc8de2
merging merge-pt-BR for v24

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
@@ -126,9 +126,18 @@
 quicknav_Heading     = Títulos
 quicknav_ListItem    = Itens da lista
 quicknav_Link        = Links
 quicknav_List        = Listas
 quicknav_PageTab     = Page tabs
 quicknav_RadioButton = Campos rádio
 quicknav_Separator   = Separadores
 quicknav_Table       = Tabelas
-quicknav_Checkbox    = Campos check box
\ No newline at end of file
+quicknav_Checkbox    = Campos check box
+figureAbbr         =       fig
+imagemapAbbr       =       imgmap
+
+# Shortened role names for braille
+linkAbbr           =       lnk
+passwordtextAbbr   =       passwdtxt
+pushbuttonAbbr     =       btn
+stateHasPopup    =    has pop up
+textareaAbbr       =       txtarea
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
@@ -130,8 +130,13 @@
 # LOCALIZATION NOTE: Do not translate "NodeIterator" or "detach()".
 NodeIteratorDetachWarning=Chamadas para detach() em NodeIterator não produzem mais efeito.
 # LOCALIZATION NOTE: Do not translate "Mozilla Audio Data API" and "Web Audio API".
 MozAudioDataWarning=A Mozilla Audio Data API não deve mais ser usada. No lugar, use a Web Audio API.
 # LOCALIZATION NOTE: Do not translate "LenientThis" and "this"
 LenientThisWarning=Ignorando o get ou set da propriedade que possui [LenientThis] porque o objeto “this” é incorreto.
 # LOCALIZATION NOTE: Do not translate "nsIDOMWindowUtils", "getWindowWithOuterId", or "nsIWindowMediator"
 GetWindowWithOuterIdWarning=O método nsIDOMWindowUtils.getOuterWindowWithId() não deve mais ser usado. No lugar, use o método de nsIWindowMediator de mesmo nome.
+
+# LOCALIZATION NOTE: Do not translate "getPreventDefault" or "defaultPrevented".
+GetPreventDefaultWarning=Use of getPreventDefault() is deprecated.  Use defaultPrevented instead.
+# LOCALIZATION NOTE: Do not translate "getUserData", "setUserData", "WeakMap", or "element.dataset".
+GetSetUserDataWarning=Use of getUserData() or setUserData() is deprecated.  Use WeakMap or element.dataset instead.
diff --git a/dom/chrome/layout/css.properties b/dom/chrome/layout/css.properties
--- a/dom/chrome/layout/css.properties
+++ b/dom/chrome/layout/css.properties
@@ -120,8 +120,21 @@
 PESupportsConditionInParensEOF=“)”
 PESupportsConditionNotEOF=“not”
 PESupportsWhitespaceRequired=Esperado espaço em branco após “not”, “and” ou “or”.
 PESupportsConditionExpectedOpenParenOrFunction=Esperado “(” ou uma função ao processar a condição de “supports” mas encontrado “%1$S”.
 PESupportsConditionExpectedCloseParen=Esperado “)” ao processar a condição de “supports” mas encontrado “%1$S”.
 PESupportsConditionExpectedStart2=Esperado “not”, “(” ou uma função ao processar a condição de “supports” mas encontrado “%1$S”.
 PESupportsConditionExpectedNot=Esperado “not” ao processar a condição de “supports” mas encontrado “%1$S”.
 PESupportsGroupRuleStart=Esperado “{” para começar a regra @supports mas encontrado “%1$S”.
+
+PEFFVBlockStart=Expected opening { of @font-feature-values rule but found '%1$S'.
+PEFFVExpectedIdent=Expected identifier but found '%1$S'.
+PEFFVExpectedValue=Expected non-negative integer value but found '%1$S'.
+PEFFVGenericInFamilyList=Family list cannot contain generic font family name.
+PEFFVNoFamily=Expected font family list for @font-feature-values rule but found '%1$S'.
+PEFFVTooManyValues=Too many values for feature type '%1$S'.
+PEFFVUnexpectedBlockEnd=Expected '}' to end @font-feature-values rule but found '%1$S'.
+PEFFVUnexpectedEOF=Unexpected end of @font-feature-values rule.
+PEFFVUnknownFontVariantPropValue=Unknown font-variant property value '%1$S'.
+PEFFVValueDefinitionTrailing=Expected end of value definition but found '%1$S'.
+PEFFVValueSetStart=Expected opening { of feature value set but found '%1$S'.
+PEGatherMediaReservedMediaType=Found reserved keyword '%1$S' when looking for media type.
diff --git a/dom/chrome/plugins.properties b/dom/chrome/plugins.properties
--- a/dom/chrome/plugins.properties
+++ b/dom/chrome/plugins.properties
@@ -12,8 +12,11 @@
 findpluginupdates_label=Encontre atualizações para os plugins instalados em
 file_label=Arquivo:
 path_label=Caminho:
 version_label=Versão:
 state_label=Status:
 mimetype_label=Tipo MIME
 description_label=Descrição
 suffixes_label=Sufixos
+
+state_disabled=Disabled
+state_enabled=Enabled
diff --git a/mail/chrome/messenger-newsblog/am-newsblog.dtd b/mail/chrome/messenger-newsblog/am-newsblog.dtd
--- a/mail/chrome/messenger-newsblog/am-newsblog.dtd
+++ b/mail/chrome/messenger-newsblog/am-newsblog.dtd
@@ -15,8 +15,11 @@
 <!ENTITY manageSubscriptions.label "Inscrições RSS…"> 
 <!ENTITY manageSubscriptions.accesskey "I">
 
 <!-- entities from rss.rdf -->
 <!ENTITY feeds.accountName "RSS de blogs e notícias">
 <!ENTITY feeds.wizardShortName "RSS">
 <!ENTITY feeds.wizardLongName "RSS de blogs e notícias">
 <!ENTITY feeds.wizardLongName.accesskey "R">
+
+
+<!ENTITY feedWindowTitle.label "Feed Account Wizard">
diff --git a/mail/chrome/messenger/AccountManager.dtd b/mail/chrome/messenger/AccountManager.dtd
--- a/mail/chrome/messenger/AccountManager.dtd
+++ b/mail/chrome/messenger/AccountManager.dtd
@@ -25,8 +25,11 @@
      Localizers ONLY can increase these widths if they are having difficulty getting
      panel content to fit.
      1ch = The width of the "0" (ZERO, U+0030) glyph for the current font.
      1em = The height of the font.
      XUL/FE DEVELOPERS: DO NOT MODIFY THIS VALUE. It represents the correct size of
      this window for en-US. -->
 <!ENTITY accountManager.size "width:105ch; height:55em;">
 <!ENTITY accountTree.width "width:31ch;">
+
+<!ENTITY addFeedAccountButton.accesskey "F">
+<!ENTITY addFeedAccountButton.label "Add Feed Account…">
diff --git a/mail/chrome/messenger/aboutDialog.dtd b/mail/chrome/messenger/aboutDialog.dtd
--- a/mail/chrome/messenger/aboutDialog.dtd
+++ b/mail/chrome/messenger/aboutDialog.dtd
@@ -68,8 +68,19 @@
 
 <!-- LOCALIZATION NOTE (channel.description.start,channel.description.end): channel.description.start and
      channel.description.end create one sentence, with the current channel label inserted in between.
      example: You are currently on the _Stable_ update channel. -->
 <!ENTITY channel.description.start  "Usando o canal de atualização ">
 <!ENTITY channel.description.end    ". ">
 
 <!ENTITY cmdCloseMac.commandKey "w">
+
+<!ENTITY update.unsupported.end      "">
+<!ENTITY update.unsupported.linkText "Learn more">
+
+<!-- LOCALIZATION NOTE (update.unsupported.start,update.unsupported.linkText,update.unsupported.end):
+     update.unsupported.start, update.unsupported.linkText, and
+     update.unsupported.end all go into one line with linkText being wrapped in
+     an anchor that links to a site to provide additional information regarding
+     why the system is no longer supported. As this is all in one line, try to
+     make the localized text short (see bug 843497 for screenshots). -->
+<!ENTITY update.unsupported.start    "You can not perform further updates on this system. ">
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
@@ -217,8 +217,113 @@
 ## @name POP3_AUTH_MECH_NOT_SUPPORTED
 ## @loc None
 4051=O servidor não suporta o modo de autenticação selecionado. Por favor, altere o “Modo de autenticação” em “Configurar contas | Servidor”.
 
 # Status - Could not log in to GSSAPI, and it was the only method
 ## @name POP3_GSSAPI_FAILURE
 ## @loc None
 4052=O ticket Kerberos/GSSAPI não foi aceito pelo servidor POP. Por favor, verifique se você está identificado no domínio Kerberos/GSSAPI.
+
+
+# Status - parsing folder
+#LOCALIZATION NOTE (buildingSummary): Do not translate %S in the following line.
+# Place the word %S where the name of the mailbox should appear
+buildingSummary=Building summary file for %S…
+
+copyingMessagesStatus=Copying %S of %S messages to %S
+
+# Status - parsing folder
+localStatusDocumentDone=Done
+
+movemailCantCreateLock=Unable to create lock file %S. For movemail to work, it is necessary to create lock files in the mail spool directory. On many systems, this is best accomplished by making the spool directory be mode 01777.
+
+movemailCantDeleteLock=Unable to delete lock file %S.
+
+movemailCantOpenSpoolFile=Unable to open mail spool file %S.
+
+#LOCALIZATION NOTE (movemailCantParseSpool): %S is file name
+movemailCantParseSpool=Unable to parse spool file %S. The file may be corrupt or not valid.
+
+movemailCantTruncateSpoolFile=Unable to truncate spool file %S.
+
+movemailSpoolFileNotFound=Unable to locate mail spool file.
+
+movingMessagesStatus=Moving %S of %S messages to %S
+
+nsErrorCouldNotConnectViaTls=Unable to establish TLS connection to POP3 server. The server may be down or may be incorrectly configured. Please verify the correct configuration in the Server Settings for your mail server in the Account Settings window and try again.
+
+pop3AuthChangeEncryptToPlainNoSSL=This POP3 server does not seem to support encrypted passwords. If you just set up the account, please try changing to 'Password, transmitted insecurely' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, this is a common scenario how someone could steal your password.
+
+pop3AuthChangeEncryptToPlainSSL=This POP3 server does not seem to support encrypted passwords. If you just set up this account, please try changing to 'Normal password' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, please contact your email administrator or provider.
+
+pop3AuthChangePlainToEncrypt=This POP3 server does not allow plaintext passwords. Please try changing to 'Encrypted password' as the 'Authentication method' in the 'Account Settings | Server settings'.
+
+pop3AuthInternalError=Internal state error during POP3 server authentication. This is an internal, unexpected error in the application, please report it as bug.
+
+# Authentication server caps and pref don't match
+pop3AuthMechNotSupported=The server does not support the selected authentication method. Please change the 'Authentication method' in the 'Account Settings | Server settings'.
+
+# Status - delete error 
+pop3DeleFailure=The DELE command did not succeed. Error marking a message as deleted.
+
+pop3DeleteFolderButtonLabel=&Delete Folder
+
+pop3DeleteFolderDialogTitle=Delete Folder
+
+# Status - Could not log in to GSSAPI, and it was the only method
+pop3GssapiFailure=The Kerberos/GSSAPI ticket was not accepted by the POP server. Please check that you are logged in to the Kerberos/GSSAPI realm.
+
+# Status - list failure
+pop3ListFailure=The LIST command did not succeed. Error getting the ID and size of a message.
+
+# Status - write error occurred
+pop3MessageFolderBusy=This folder is being processed. Please wait until processing is complete to get messages.
+
+# Status - write error occurred
+pop3MessageWriteError=Unable to write the email to the mailbox. Make sure the file system allows you write privileges, and you have enough disk space to copy the mailbox.
+
+# LOCALIZATION NOTE (pop3MoveFolderToTrash): Do not translate the word %S below.
+# "%S" is the the name of the folder.
+pop3MoveFolderToTrash=Are you sure you want to delete the folder '%S'?
+
+pop3OutOfDiskSpace=There is not enough disk space to download new messages. Try deleting old mail, emptying the Trash folder, and compacting your mail folders, and then try again.
+
+# Status - password failed
+pop3PasswordFailure=Sending of password did not succeed.
+
+# Status - password undefined 
+pop3PasswordUndefined=Error getting mail password.
+
+# Status - retr failure from the server
+pop3RetrFailure=The RETR command did not succeed. Error retrieving a message.
+
+# Status - the server doesn't support the top command
+# LOCALIZATION NOTE(pop3ServerDoesNotSupportTopCommand): The following sentence should be translated in this way:
+# Do not translate "POP3"
+# Do not translate "%S". Place %S in your translation where the name of the server should appear.
+# Do not translate "TOP"
+pop3ServerDoesNotSupportTopCommand=The POP3 mail server (%S) does not support the TOP command. Without server support for this, we cannot implement the ``Maximum Message Size'' or ``Fetch Headers Only'' preference.  This option has been disabled, and messages will be downloaded regardless of their size.
+
+# Status - the server doesn't support UIDL…
+# LOCALIZATION NOTE(pop3ServerDoesNotSupportUidlEtc): The following sentence should be translated in this way:
+# Do not translate "POP3"
+# Do not translate "%S". Place %S in your translation where the name of the server should appear.
+# Do not translate "UIDL"
+pop3ServerDoesNotSupportUidlEtc=The POP3 mail server (%S) does not support UIDL or XTND XLST, which are required to implement the ``Leave on Server'', ``Maximum Message Size'' or ``Fetch Headers Only'' options. To download your mail, turn off these options in the Server Settings for your mail server in the Account Settings window.
+
+# Status - pop3 server error
+#LOCALIZATION NOTE (pop3ServerError): Do not translate POP3 in the following line.
+pop3ServerError=An error occurred with the POP3 mail server.
+
+#LOCALIZATION NOTE (pop3ServerSaid): Do not remove the leading space during translation.
+pop3ServerSaid= Mail server %S responded: 
+
+# Status - stat failed
+pop3StatFail=The STAT command did not succeed. Error getting message number and sizes.
+
+pop3TmpDownloadError=There was an error downloading the following message:   \nFrom: %S\n   Subject: %S\n This message may contain a virus or there is not enough disk space. Skip this message?
+
+# Status - pop3 user name failed
+pop3UsernameFailure=Sending of username did not succeed.
+
+# Status - username undefined 
+pop3UsernameUndefined=You have not supplied a username for this server.  Please provide one in the account setup menu and try again.
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
@@ -883,8 +883,33 @@
 <!ENTITY servicesMenuMac.label          "Serviços">
 <!ENTITY hideThisAppCmdMac.label        "Ocultar &brandShortName;">
 <!ENTITY hideThisAppCmdMac.commandkey   "H">
 <!ENTITY hideThisAppCmdMac.modifiers    "accel">
 <!ENTITY hideOtherAppsCmdMac.label      "Ocultar Outros">
 <!ENTITY hideOtherAppsCmdMac.commandkey "H">
 <!ENTITY hideOtherAppsCmdMac.modifiers  "accel,alt">
 <!ENTITY showAllAppsCmdMac.label        "Mostrar Tudo">
+
+<!ENTITY allowRemoteDebugging.accesskey "g">
+<!ENTITY allowRemoteDebugging.label "Allow Remote Debugging">
+<!ENTITY buttonMenuForwardAsAttachment.label "Forward As Attachment">
+
+<!-- Toolbar Button Popup -->
+<!ENTITY buttonMenuForwardAsInline.label "Forward Inline">
+<!ENTITY contextForwardAsAttachmentItem.accesskey "A">
+<!ENTITY contextForwardAsAttachmentItem.label "Attachment">
+<!ENTITY contextForwardAsInline.accesskey "I">
+<!ENTITY contextForwardAsInline.label "Inline">
+<!ENTITY contextForwardAsMenu.accesskey "o">
+<!ENTITY contextForwardAsMenu.label "Forward As">
+<!ENTITY contextKillSubthreadMenu.label "Ignore Subthread">
+<!ENTITY contextKillThreadMenu.accesskey "I">
+<!ENTITY contextKillThreadMenu.label "Ignore Thread">
+<!ENTITY contextMultiForwardAsAttachment.accesskey "o">
+<!ENTITY contextMultiForwardAsAttachment.label "Forward as Attachments">
+<!ENTITY contextWatchThreadMenu.label "Watch Thread">
+<!ENTITY folderContextOpenInNewWindow.accesskey "O">
+<!ENTITY folderContextOpenInNewWindow.label "Open in New Window">
+<!ENTITY forwardAsAttachment.tooltip "Forward selected message as an attachment">
+<!ENTITY forwardAsInline.tooltip "Forward selected message as inline text">
+<!ENTITY newFeedAccountCmd.accesskey "d">
+<!ENTITY newFeedAccountCmd.label "Feed Account…">
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
@@ -714,8 +714,27 @@
 # LOCALIZATION NOTE (sanitizeEverythingWarning2): Warning that appears when
 # "Time range to clear" is set to "Everything" in Clear Recent History dialog,
 # provided that the user has not modified the default set of history items to clear.
 sanitizeEverythingWarning2=Todos os dados de navegação serão limpos.
 # LOCALIZATION NOTE (sanitizeSelectedWarning): Warning that appears when
 # "Time range to clear" is set to "Everything" in Clear Recent History dialog,
 # provided that the user has modified the default set of history items to clear.
 sanitizeSelectedWarning=Todos os itens selecionados serão limpos.
+
+confirmMsgDelete.deleteNoTrash.desc=This will delete messages immediately, without saving a copy to Trash. Are you sure you want to continue?
+# LOCALIZATION NOTE (ignoredSubthreadFeedback): #1 is the message subthread title
+ignoredSubthreadFeedback=Replies to the subthread "#1" will not be shown.
+# LOCALIZATION NOTE (ignoredSubthreadsFeedback): Semi-colon list of plural forms.
+# #1 is number of subthreads
+ignoredSubthreadsFeedback=Replies to the subthread that was selected will not be shown.;Replies to the #1 subthreads that were selected will not be shown.
+# LOCALIZATION NOTE (ignoredThreadFeedback): #1 is the message thread title
+ignoredThreadFeedback=Replies to the thread "#1" will not be shown.
+# LOCALIZATION NOTE (ignoredThreadsFeedback): Semi-colon list of plural forms.
+# #1 is the number of threads
+ignoredThreadsFeedback=Replies to the thread that was selected will not be shown.;Replies to the #1 threads that were selected will not be shown.
+
+learnMoreAboutIgnoreThread=Learn More…
+learnMoreAboutIgnoreThreadAccessKey = L
+undoIgnoreSubthread=Undo Ignore Subthread
+undoIgnoreSubthreadAccessKey=U
+undoIgnoreThread=Undo Ignore Thread
+undoIgnoreThreadAccessKey=U
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
@@ -289,8 +289,10 @@
 
 <!-- Spell checker context menu items -->
 <!ENTITY spellAddDictionaries.label "Adicionar dicionários…">
 <!ENTITY spellAddDictionaries.accesskey "A">
 
 <!-- Title for the address picker panel -->
 <!ENTITY addressesSidebarTitle.label "Contatos">
 
+
+<!ENTITY findReplaceCmd.key "H">
diff --git a/mail/chrome/messenger/msgAccountCentral.dtd b/mail/chrome/messenger/msgAccountCentral.dtd
--- a/mail/chrome/messenger/msgAccountCentral.dtd
+++ b/mail/chrome/messenger/msgAccountCentral.dtd
@@ -17,8 +17,13 @@
 <!ENTITY settingsLink.label           "Configurar esta conta"> 
 <!ENTITY newAcctLink.label            "Criar uma nova conta"> 
 
 <!ENTITY advFeaturesSectionHdr.label  "Recursos avançados"> 
 <!ENTITY searchMsgsLink.label         "Pesquisar"> 
 <!ENTITY filtersLink.label            "Criar filtros para mensagens">
 <!ENTITY junkSettings.label           "Configurações de spam">
 <!ENTITY offlineLink.label            "Configurar modo off-line">
+
+
+<!ENTITY chat.label                   "Chat">
+<!ENTITY movemail.label               "Movemail">
+<!ENTITY newAcct.label                "Create a new account:">
diff --git a/mail/chrome/messenger/msgHdrViewOverlay.dtd b/mail/chrome/messenger/msgHdrViewOverlay.dtd
--- a/mail/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/chrome/messenger/msgHdrViewOverlay.dtd
@@ -102,8 +102,30 @@
 <!ENTITY copyLinkCmd.accesskey    "o">
 
 <!ENTITY CopyMessageId.label "Copiar identificador de mensagem">
 <!ENTITY CopyMessageId.accesskey "C">
 <!ENTITY OpenMessageForMsgId.label "Abrir mensagem do identificador">
 <!ENTITY OpenMessageForMsgId.accesskey "A">
 <!ENTITY OpenBrowserWithMsgId.label "Abrir identificador de mensagem no navegador">
 <!ENTITY OpenBrowserWithMsgId.accesskey "b">
+
+<!ENTITY bccField4.label "Bcc">
+<!ENTITY ccField4.label "Cc">
+<!ENTITY dateField4.label "Date">
+<!ENTITY followupToField4.label "Followup to">
+<!ENTITY fromField4.label "From">
+<!ENTITY hdrMenuForwardButton.label "Forward As">
+<!ENTITY inReplyToField4.label "In reply to">
+<!ENTITY messageIdField4.label "Message ID">
+<!ENTITY newsgroupsField4.label "Newsgroups">
+<!ENTITY organizationField4.label "Organization">
+<!ENTITY originalWebsite4.label "Website">
+<!ENTITY referencesField4.label "References">
+<!ENTITY replyToField4.label "Reply to">
+<!ENTITY senderField4.label "Sender">
+
+<!ENTITY subjectField4.label "Subject">
+<!ENTITY tagsHdr4.label "Tags">
+
+
+<!ENTITY toField4.label "To">
+<!ENTITY userAgentField4.label "User agent">
diff --git a/mail/chrome/messenger/multimessageview.properties b/mail/chrome/messenger/multimessageview.properties
--- a/mail/chrome/messenger/multimessageview.properties
+++ b/mail/chrome/messenger/multimessageview.properties
@@ -12,8 +12,10 @@
 countUnread=, #1 não lida;, #1 não lidas
 Nmessages=(#1 mensagem);(#1 mensagens)
 
 noSubject=(assunto em branco)
 
 # thread and multiple message selection summaries
 messagesSize=Estas mensagens ocupam #1#2.
 noticeText= (Nota: #1 mensagens estão selecionadas, as primeiras #2 são exibidas)
+
+ignoredCount=#1 ignored;#1 ignored
diff --git a/mail/chrome/messenger/quickFilterBar.dtd b/mail/chrome/messenger/quickFilterBar.dtd
--- a/mail/chrome/messenger/quickFilterBar.dtd
+++ b/mail/chrome/messenger/quickFilterBar.dtd
@@ -244,8 +244,34 @@
          "Pesquise em todas as pastas">
 
 <!-- LOCALIZATION NOTE (quickFilterBar.glodaUpsell.pressEnterAndCurrent):
      The second line of the panel popup that tells the user we found no matches.
      This line will have #1 replaced with what the user has typed so far.
      -->
 <!ENTITY quickFilterBar.glodaUpsell.pressEnterAndCurrent
          "Pressione “Enter” de novo para continuar pesquisando por: #1">
+
+
+<!-- LOCALIZATION NOTE (quickFilterBar.booleanMode.tooltip):
+     Tooltip of the Any of / All of tagging mode selector.
+     -->
+<!ENTITY quickFilterBar.booleanMode.tooltip "Tag filtering mode">
+
+<!-- LOCALIZATION NOTE (quickFilterBar.booleanModeAll.label):
+     Tooltip of the Any of / All of tagging mode selector.
+     -->
+<!ENTITY quickFilterBar.booleanModeAll.label "All of">
+
+<!-- LOCALIZATION NOTE (quickFilterBar.booleanModeAll.tooltip):
+     Tooltip of the Any of / All of tagging mode selector.
+     -->
+<!ENTITY quickFilterBar.booleanModeAll.tooltip "All of the selected tag criteria must match">
+
+<!-- LOCALIZATION NOTE (quickFilterBar.booleanModeAny.label):
+     Tooltip of the Any of / All of tagging mode selector.
+     -->
+<!ENTITY quickFilterBar.booleanModeAny.label "Any of">
+
+<!-- LOCALIZATION NOTE (quickFilterBar.booleanModeAny.tooltip):
+     Tooltip of the Any of / All of tagging mode selector.
+     -->
+<!ENTITY quickFilterBar.booleanModeAny.tooltip "At least one of the selected tag criteria should match">
diff --git a/security/manager/chrome/pippki/pippki.properties b/security/manager/chrome/pippki/pippki.properties
--- a/security/manager/chrome/pippki/pippki.properties
+++ b/security/manager/chrome/pippki/pippki.properties
@@ -185,8 +185,13 @@
 addExceptionUnverifiedOrBadSignatureLong=O certificado não é considerado confiável porque não foi homologado por uma autoridade reconhecida usando uma assinatura segura.
 addExceptionValidShort=Certificado válido
 addExceptionValidLong=Este site fornece identificação válida e homologada. Não é necessário adicionar uma exceção.
 addExceptionCheckingShort=Verificando informações
 addExceptionCheckingLong=Tentando identificar o site…
 addExceptionNoCertShort=Nenhuma informação disponível
 addExceptionNoCertLong=Não é possível obter status de identificação para o site especificado.
 addExceptionConnectionFailed=Falha na conexão
+
+caCertExistsMessage=The Certificate already exists.
+
+#Certificate Exists in database
+caCertExistsTitle=Certificate Exists
diff --git a/toolkit/chrome/global/aboutSupport.dtd b/toolkit/chrome/global/aboutSupport.dtd
--- a/toolkit/chrome/global/aboutSupport.dtd
+++ b/toolkit/chrome/global/aboutSupport.dtd
@@ -61,8 +61,14 @@
 
 <!ENTITY aboutSupport.libraryVersionsTitle "Versões das bibliotecas">
 
 <!ENTITY aboutSupport.installationHistoryTitle "Histórico de instalações">
 <!ENTITY aboutSupport.updateHistoryTitle "Histórico de atualizações">
 
 <!ENTITY aboutSupport.copyTextToClipboard.label "Copiar como texto">
 <!ENTITY aboutSupport.copyRawDataToClipboard.label "Copiar como estrutura de dados">
+
+<!ENTITY aboutSupport.appBasicsShowUpdateHistory "Show Update History">
+
+<!-- LOCALIZATION NOTE (aboutSupport.appBasicsUpdateHistory, aboutSupport.appBasicsShowUpdateHistory):
+"Update" is a noun here, not a verb. -->
+<!ENTITY aboutSupport.appBasicsUpdateHistory "Update History">
diff --git a/toolkit/chrome/mozapps/downloads/downloads.properties b/toolkit/chrome/mozapps/downloads/downloads.properties
--- a/toolkit/chrome/mozapps/downloads/downloads.properties
+++ b/toolkit/chrome/mozapps/downloads/downloads.properties
@@ -127,8 +127,18 @@
 fileExecutableSecurityWarning=“%S” é um aplicativo.\nTome cuidado, ele pode conter vírus ou instruções que podem danificar o seu computador.\nTem certeza que deseja executar “%S”?
 fileExecutableSecurityWarningTitle=Executar um aplicativo?
 fileExecutableSecurityWarningDontAsk=Não perguntar de novo
 
 displayNameDesktop=Área de trabalho
 
 # Desktop folder name for downloaded files
 downloadsFolder=Downloads
+
+
+# LOCALIZATION NOTE (infiniteRate):
+# If download speed is a JavaScript Infinity value, this phrase is used
+infiniteRate=Really fast
+
+# LOCALIZATION NOTE (statusFormatInfiniteRate): — is the "em dash" (long dash)
+# %1$S transfer progress; %2$S substitute phrase for Infinity speed; %3$S time left
+# example: 4 minutes left — 1.1 of 11.1 GB (Really fast)
+statusFormatInfiniteRate=%3$S — %1$S (%2$S)
diff --git a/toolkit/chrome/search/search.properties b/toolkit/chrome/search/search.properties
--- a/toolkit/chrome/search/search.properties
+++ b/toolkit/chrome/search/search.properties
@@ -13,8 +13,10 @@
 error_duplicate_engine_msg=O %S não conseguiu instalar a pesquisa de:\n%S\n\nUma pesquisa com o mesmo nome já está instalada.
 
 error_invalid_engine_title=Erro na instalação
 # LOCALIZATION NOTE (error_invalid_engine_msg): %S = brandShortName
 error_invalid_engine_msg=Este mecanismo de pesquisa não é suportado pelo %S e não pôde ser instalado.
 
 suggestion_label=Sugestões
 
+
+addEngineAsCurrentText=Make this the c&urrent search engine
