partial catalan (ca) localization to test fennec in aurora for the multilocale build (bug 885073)
authorEduard Gamonal <edu@eduard-gamonal.net>
Thu, 18 Jul 2013 23:24:09 -0400
changeset 1332 6900afc7b5bad14c3725f8b168f2b203e3f955f8
parent 1331 719f413d84c00487d14723bad2a66dfa1cc9c69d
child 1333 2133e0389c2f2c5fa49bf0d8ec5b7cbc2410ea07
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:43:21 +0000
bugs885073
partial catalan (ca) localization to test fennec in aurora for the multilocale build (bug 885073)
browser/chrome/browser/aboutDialog.dtd
browser/chrome/browser/aboutRobots.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/appcacheutils.properties
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/gcli.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/netmonitor.dtd
browser/chrome/browser/devtools/netmonitor.properties
browser/chrome/browser/devtools/profiler.properties
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/toolbox.dtd
browser/chrome/browser/devtools/toolbox.properties
browser/chrome/browser/devtools/webConsole.dtd
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/pageInfo.dtd
browser/chrome/browser/preferences/advanced.dtd
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/preferences/privacy.dtd
browser/pdfviewer/viewer.properties
browser/profile/bookmarks.inc
calendar/chrome/calendar/calendar-event-dialog.dtd
calendar/chrome/calendar/calendar-extract.properties
calendar/chrome/calendar/calendar.dtd
calendar/chrome/calendar/calendar.properties
calendar/chrome/calendar/preferences/preferences.dtd
dom/chrome/accessibility/AccessFu.properties
dom/chrome/dom/dom.properties
dom/chrome/layout/css.properties
dom/chrome/plugins.properties
mail/chrome/messenger-newsblog/am-newsblog.dtd
mail/chrome/messenger/AccountManager.dtd
mail/chrome/messenger/aboutDialog.dtd
mail/chrome/messenger/am-server-advanced.dtd
mail/chrome/messenger/folderWidgets.properties
mail/chrome/messenger/localMsgs.properties
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/messengercompose.dtd
mail/chrome/messenger/msgAccountCentral.dtd
mail/chrome/messenger/msgHdrViewOverlay.dtd
mail/chrome/messenger/multimessageview.properties
mail/chrome/messenger/preferences/advanced.dtd
mail/chrome/messenger/quickFilterBar.dtd
mobile/android/base/android_strings.dtd
mobile/android/chrome/about.dtd
mobile/android/chrome/aboutReader.properties
mobile/android/chrome/browser.properties
security/manager/chrome/pipnss/pipnss.properties
security/manager/chrome/pipnss/security.properties
security/manager/chrome/pippki/pippki.dtd
security/manager/chrome/pippki/pippki.properties
security/manager/chrome/pippki/validation.dtd
suite/chrome/browser/navigator.properties
suite/chrome/browser/pageInfo.dtd
suite/chrome/common/notification.properties
suite/chrome/common/pref/pref-ssl.dtd
suite/chrome/mailnews/folderWidgets.properties
suite/chrome/mailnews/localMsgs.properties
suite/chrome/mailnews/messenger.properties
suite/chrome/mailnews/pref/am-server-advanced.dtd
suite/chrome/mailnews/pref/pref-notifications.dtd
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/mozapps/downloads/downloads.properties
toolkit/chrome/mozapps/update/updates.dtd
toolkit/chrome/search/search.properties
--- a/browser/chrome/browser/aboutDialog.dtd
+++ b/browser/chrome/browser/aboutDialog.dtd
@@ -30,44 +30,56 @@
 <!ENTITY contribute.getInvolvedLink "Col·laboreu-hi!">
 <!ENTITY contribute.end             "">
 <!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
 
 <!ENTITY bottomLinks.license        "Informació de la llicència">
 <!-- LOCALIZATION NOTE (bottomLinks.rights): This is a link title that links to about:rights. -->
 
 <!ENTITY bottomLinks.rights         "Drets dels usuaris finals">
-<!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to http://www.mozilla.com/legal/privacy/. -->
+<!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to https://www.mozilla.org/legal/privacy/. -->
 
 <!ENTITY bottomLinks.privacy        "Política de privadesa">
 <!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
 
 <!ENTITY update.checkingForUpdates  "Comprovació de les actualitzacions…">
 <!-- LOCALIZATION NOTE (update.checkingAddonCompat): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.checkingAddonCompat "Compatibilitat dels complements…">
 <!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.noUpdatesFound      "El &brandShortName; està actualitzat">
 <!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.adminDisabled       "L'administrador ha inhabilitat les actualitzacions">
+<!-- LOCALIZATION NOTE (update.otherInstanceHandlingUpdates): try to make the localized text short -->
+<!ENTITY update.otherInstanceHandlingUpdates "&brandShortName; is being updated by another instance">
 <!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
      update.failed.start, update.failed.linkText, and update.failed.end all go into
      one line with linkText being wrapped in an anchor that links to a site to download
      the latest version of Firefox (e.g. http://www.firefox.com). As this is all in
      one line, try to make the localized text short (see bug 596813 for screenshots). -->
 
 <!ENTITY update.failed.start        "L'actualització ha fallat. ">
 <!ENTITY update.failed.linkText     "Baixeu la darrera versió">
 <!ENTITY update.failed.end          "">
 <!-- LOCALIZATION NOTE (update.manual.start,update.manual.end): update.manual.start and update.manual.end
      all go into one line and have an anchor in between with text that is the same as the link to a site
      to download the latest version of Firefox (e.g. http://www.firefox.com). As this is all in one line,
      try to make the localized text short (see bug 596813 for screenshots). -->
 
 <!ENTITY update.manual.start        "Hi ha actualitzacions disponibles a ">
 <!ENTITY update.manual.end          "">
+<!-- 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. ">
+<!ENTITY update.unsupported.linkText "Learn more">
+<!ENTITY update.unsupported.end      "">
 <!-- LOCALIZATION NOTE (update.downloading.start,update.downloading.end): update.downloading.start and 
      update.downloading.end all go into one line, with the amount downloaded inserted in between. As this
      is all in one line, try to make the localized text short (see bug 596813 for screenshots). The — is
      the "em dash" (long dash).
      example: Downloading update — 111 KB of 13 MB -->
 
 <!ENTITY update.downloading.start   "S'està baixant l'actualització — ">
 <!ENTITY update.downloading.end     "">
--- a/browser/chrome/browser/aboutRobots.dtd
+++ b/browser/chrome/browser/aboutRobots.dtd
@@ -1,15 +1,13 @@
 <!-- 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/. -->
 <!-- These strings are used in the about:robots page, which ties in with the
-     robots theme used in the Firefox 3 Beta 2/3 first run pages...
-         https://www.mozilla.com/en-US/firefox/3.0b2/firstrun/
-         https://www.mozilla.com/en-US/firefox/3.0b3/firstrun/
+     robots theme used in the Firefox 3 Beta 2/3 first run pages.
      They're just meant to be fun and whimsical, with references to some geeky
      but well-known robots in movies and books. Be creative with translations! -->
 <!-- Nonsense line from the movie "The Day The Earth Stood Still". No translation needed. -->
 
 
 <!ENTITY robots.pagetitle  "Gort! Klaatu barada nikto!">
 <!-- Movie: Logan's Run... Box (cybog): "Welcome Humans! I am ready for you." -->
 <!ENTITY robots.errorTitleText "Benvinguts humans!">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -15,16 +15,21 @@
                                                                 inside the private browsing mode -->
 <!ENTITY mainWindow.titlePrivateBrowsingSuffix "(Navegació privada)">
 <!-- Tab context menu -->
 
 <!ENTITY  reloadTab.label                    "Torna a carregar la pestanya">
 <!ENTITY  reloadTab.accesskey                "r">
 <!ENTITY  reloadAllTabs.label                "Torna a carregar totes les pestanyes">
 <!ENTITY  reloadAllTabs.accesskey            "a">
+<!-- LOCALIZATION NOTE (closeTabsToTheEnd.label): This should indicate the
+direction in which tabs are closed, i.e. locales that use RTL mode should say
+left instead of right. -->
+<!ENTITY  closeTabsToTheEnd.label            "Close Tabs to the Right">
+<!ENTITY  closeTabsToTheEnd.accesskey        "i">
 <!ENTITY  closeOtherTabs.label               "Tanca les altres pestanyes">
 <!ENTITY  closeOtherTabs.accesskey           "l">
 <!-- LOCALIZATION NOTE (pinTab.label, unpinTab.label): "Pin" is being
 used as a metaphor for expressing the fact that these tabs are "pinned" to the
 left edge of the tabstrip. Really we just want the string to express the idea
 that this is a lightweight and reversible action that keeps your tab where you
 can reach it easily. -->
 
@@ -113,17 +118,17 @@ These should match what Safari and other
 
 <!ENTITY bookmarksMenu.label "Adreces d'interès">
 <!ENTITY bookmarksMenu.accesskey "r">
 <!ENTITY bookmarkThisPageCmd.label "Afegeix a les adreces d'interès">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
 <!ENTITY markPageCmd.commandkey "l">
 <!ENTITY sharePageCmd.label "Comparteix aquesta pàgina">
 <!ENTITY sharePageCmd.commandkey "S">
-<!ENTITY sharePageCmd.accesskey "c">
+<!ENTITY sharePageCmd.accesskey "C">
 <!ENTITY shareLinkCmd.label "Comparteix aquest enllaç">
 <!ENTITY shareLinkCmd.accesskey "l">
 <!ENTITY shareImageCmd.label "Comparteix aquesta imatge">
 <!ENTITY shareImageCmd.accesskey "i">
 <!ENTITY shareSelectCmd.label "Comparteix la selecció">
 <!ENTITY shareSelectCmd.accesskey "s">
 <!ENTITY shareVideoCmd.label "Comparteix aquest vídeo">
 <!ENTITY shareVideoCmd.accesskey "v">
@@ -209,21 +214,22 @@ These should match what Safari and other
 <!ENTITY webDeveloperMenu.label       "Desenvolupador web">
 <!ENTITY webDeveloperMenu.accesskey   "w">
 
 <!ENTITY devtoolsConnect.label        "Connecta...">
 <!ENTITY devtoolsConnect.accesskey    "e">
 
 <!ENTITY errorConsoleCmd.label        "Consola d'errors">
 <!ENTITY errorConsoleCmd.accesskey    "C">
-<!ENTITY errorConsoleCmd.commandkey   "j">
 
 <!ENTITY remoteWebConsoleCmd.label    "Consola web remota">
 
 <!ENTITY browserConsoleCmd.label      "Consola del navegador">
+<!ENTITY browserConsoleCmd.commandkey "j">
+<!ENTITY browserConsoleCmd.accesskey  "B">
 
 <!ENTITY inspectContextMenu.label     "Inspecciona l'element">
 <!ENTITY inspectContextMenu.accesskey "I">
 
 <!ENTITY responsiveDesignTool.label   "Vista de disseny responsiu">
 <!ENTITY responsiveDesignTool.accesskey "r">
 <!ENTITY responsiveDesignTool.commandkey "M">
 <!-- LOCALIZATION NOTE (scratchpad.label): This menu item label appears
@@ -236,16 +242,20 @@ These should match what Safari and other
   -  "Scratchpad" in your locale. You should feel free to find a close
   -  approximation to it or choose a word (or words) that means
   -  "simple discardable text editor". -->
 
 <!ENTITY scratchpad.label             "Bloc de proves">
 <!ENTITY scratchpad.accesskey         "s">
 <!ENTITY scratchpad.keycode           "VK_F4">
 <!ENTITY scratchpad.keytext           "F4">
+<!-- LOCALIZATION NOTE (chromeDebuggerMenu.label): This is the label for the
+  -  application menu item that opens the browser debugger UI in the Tools menu. -->
+
+<!ENTITY chromeDebuggerMenu.label       "Browser Debugger">
 
 <!ENTITY devToolbarCloseButton.tooltiptext "Tanca la barra per a desenvolupadors">
 <!ENTITY devToolbarMenu.label              "Barra d'eines per a desenvolupadors">
 <!ENTITY devToolbarMenu.accesskey          "v">
 <!ENTITY devToolbar.keycode                "VK_F2">
 <!ENTITY devToolbar.keytext                "F2">
 <!ENTITY devToolboxMenuItem.label          "Mostra les eines">
 <!ENTITY devToolboxMenuItem.accesskey      "e">
@@ -667,8 +677,16 @@ just addresses the organization to follo
 
 <!ENTITY webrtcIndicatorButton.label "Accés al micròfon/càmera">
 <!ENTITY webrtcIndicatorButton.tooltip "Mostra els llocs on s'està compartint la càmera o el micròfon">
 
 <!ENTITY mixedContentBlocked.helplink "Més informació">
 <!ENTITY mixedContentBlocked.moreinfo "La majoria de llocs webs seguiran funcionant bé encara que aquest contingut estigui blocat.">
 
 <!ENTITY pointerLock.notification.message "Premeu la tecla d'escapada en qualsevol moment per tornar-ho a mostrar.">
+
+<!ENTITY pluginNotification.showAll.label "Show All">
+<!ENTITY pluginNotification.showAll.accesskey "S">
+<!-- LOCALIZATION NOTE (pluginActivateNow.label, pluginActivateAlways.label, pluginBlockNow.label): These should be the same as the matching strings in browser.properties -->
+
+<!ENTITY pluginActivateNow.label "Allow Now">
+<!ENTITY pluginActivateAlways.label "Allow and Remember">
+<!ENTITY pluginBlockNow.label "Block Plugin">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -99,47 +99,74 @@ popupWarningDontShowFromLocationbar=No mostris la barra d'informació quan les finestres emergents estiguin blocades
 popupShowPopupPrefix=Mostra «%S»
 
 # missing plugin installer
 installPlugin.message = Voleu instal·lar el complement necessari per mostrar els continguts multimèdia d'aquesta pàgina?
 installPlugin.button.label=Instal·la %S
 installPlugin.button.accesskey=I
 installPlugin.ignoreButton.label=No ho tornis a demanar
 installPlugin.ignoreButton.accesskey=N
-outdatedpluginsMessage.title=Alguns connectors que utilitza la pàgina no estan actualitzats.
-outdatedpluginsMessage.updateButton.label=Actualitza els connectors…
-outdatedpluginsMessage.updateButton.accesskey=U
-blockedpluginsMessage.title=S'han blocat alguns dels connectors que necessita aquesta pàgina per a la vostra protecció.
-blockedpluginsMessage.infoButton.label=Detalls…
-blockedpluginsMessage.infoButton.accesskey=D
-blockedpluginsMessage.searchButton.label=Actualitza els connectors…
-blockedpluginsMessage.searchButton.accesskey=u
+
 crashedpluginsMessage.title=El connector %S ha fallat.
 crashedpluginsMessage.reloadButton.label=Torna a carregar la pàgina
 crashedpluginsMessage.reloadButton.accesskey=r
 crashedpluginsMessage.submitButton.label=Envia un informe de fallada
 crashedpluginsMessage.submitButton.accesskey=f
 crashedpluginsMessage.learnMore=Més informació…
-activatePluginsMessage.message=Voleu activar els connectors en aquesta pàgina?
-activateAllPluginsMessage.label=Activa tots els connectors
-activatePluginsMessage.accesskey=A
-activatePluginsMessage.always=Activa sempre els connectors per aquest lloc
-activatePluginsMessage.always.accesskey=s
-activatePluginsMessage.never=No activis mai els connectors per aquest lloc
-activatePluginsMessage.never.accesskey=N
-activateSinglePlugin=Activa
+
+## Plugin doorhanger strings
+# LOCALIZATION NOTE (pluginActivateNw.message): Used for newly-installed
+# plugins which are not known to be unsafe. %1$S is the plugin name and %2$S
+# is the site domain.
+pluginActivateNew.message=Allow %2$S to run "%1$S"?
+pluginActivateMultiple.message=Allow %S to run plugins?
+pluginActivate.learnMore=Learn More…
+# LOCALIZATION NOTE (pluginActivateOutdated.message, pluginActivateOutdated.label):
+# These strings are used when an unsafe plugin has an update available.
+# %1$S is the plugin name, %2$S is the domain, and %3$S is brandShortName.
+pluginActivateOutdated.message=%3$S has prevented the outdated plugin "%1$S" from running on %2$S.
+pluginActivateOutdated.label=Outdated plugin
+pluginActivate.updateLabel=Update now…
+# LOCALIZATION NOTE (pluginActivateVulnerable.message, pluginActivateVulnerable.label):
+# These strings are used when an unsafe plugin has no update available.
+# %1$S is the plugin name, %2$S is the domain, and %3$S is brandShortName.
+pluginActivateVulnerable.message=%3$S has prevented the unsafe plugin "%1$S" from running on %2$S.
+pluginActivateVulnerable.label=Vulnerable plugin!
+pluginActivate.riskLabel=What's the risk?
+# LOCALIZATION NOTE (pluginActivateBlocked.message): %1$S is the plugin name, %2$S is brandShortName
+pluginActivateBlocked.message=%2$S has blocked "%1$S" for your protection.
+pluginActivateBlocked.label=Blocked for your protection
+pluginActivateDisabled.message="%S" is disabled.
+pluginActivateDisabled.label=Disabled
+pluginActivateDisabled.manage=Manage plugins…
+pluginEnabled.message="%S" is enabled on %S.
+pluginEnabledOutdated.message=Outdated plugin "%S" is enabled on %S.
+pluginEnabledVulnerable.message=Insecure plugin "%S" is enabled on %S.
+pluginInfo.unknownPlugin=Desconegut
+
+# LOCALIZATION NOTE (pluginActivateNow.label, pluginActivateAlways.label, pluginBlockNow.label): These should be the same as the matching strings in browser.dtd
+# LOCALIZATION NOTE (pluginActivateNow.label): This button will enable the
+# plugin in the current session for an short time (about an hour), auto-renewed
+# if the site keeps using the plugin.
+pluginActivateNow.label=Allow Now
+pluginActivateNow.accesskey=N
+# LOCALIZATION NOTE (pluginActivateAlways.label): This button will enable the
+# plugin for a long while (90 days), auto-renewed if the site keeps using the
+# plugin.
+pluginActivateAlways.label=Allow and Remember
+pluginActivateAlways.accesskey=R
+pluginBlockNow.label=Block Plugin
+pluginBlockNow.accesskey=B
+pluginContinue.label=Continue Allowing
+pluginContinue.accesskey=C
+
+# in-page UI
 PluginClickToActivate=Activa el %S.
-# LOCALIZATION NOTE - "vulnerable" indicates there is a security bug in the
-# plugin that is being exploited by attackers.
 PluginVulnerableUpdatable=Aquest connector és vulnerable i cal actualitzar-lo.
 PluginVulnerableNoUpdate=Aquest connector comporta un risc de seguretat.
-vulnerableUpdatablePluginWarning=Versió obsoleta!
-vulnerableNoUpdatePluginWarning=Connector amb risc!
-vulnerablePluginsMessage=S'han inhabilitat els connectors que poden posar en perill el vostre ordinador.
-pluginInfo.unknownPlugin=Desconegut
 
 # Sanitize
 # LOCALIZATION NOTE (sanitizeDialog2.everything.title): When "Time range to
 # clear" is set to "Everything", the Clear Recent History dialog's title is
 # changed to this.  See UI mockup and comment 11 at bug 480169 -->
 sanitizeDialog2.everything.title=Neteja tot l'historial
 sanitizeButtonOK=Neteja-ho ara
 # LOCALIZATION NOTE (sanitizeButtonClearing): The label for the default
@@ -428,33 +455,33 @@ identity.newIdentity.description = Introduïu la vostra adreça electrònica per iniciar una sessió a %S
 identity.next.label = Següent
 identity.next.accessKey = n
 # LOCALIZATION NOTE: shown in the popup notification when a user successfully logs into a website
 # LOCALIZATION NOTE (identity.loggedIn.description): %S is the user's identity (e.g. user@example.com)
 identity.loggedIn.description = Sessió Iniciada com a: %S
 identity.loggedIn.signOut.label = Finalitza la sessió
 identity.loggedIn.signOut.accessKey = O
 
-# LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message, getUserMedia.shareCameraAndMicrophone.message, getUserMedia.sharingCamera.message, getUserMedia.sharingMicrophone.message, getUserMedia.sharingCameraAndMicrophone.message): %S is the website origin (e.g. www.mozilla.org)
+# LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message, getUserMedia.shareCameraAndMicrophone.message): %S is the website origin (e.g. www.mozilla.org)
 # LOCALIZATION NOTE (getUserMedia.shareSelectedDevices.label):
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # The number of devices can be either one or two.
 getUserMedia.shareCamera.message = Voleu compartir la vostra càmera amb %S?
 getUserMedia.shareMicrophone.message = Voleu compartir el micròfon amb %S?
 getUserMedia.shareCameraAndMicrophone.message = Voleu compartir la càmera i el micròfon amb %S?
 getUserMedia.noVideo.label = Sense vídeo
 getUserMedia.noAudio.label = Sense àudio
 getUserMedia.shareSelectedDevices.label = Comparteix el dispositiu seleccionat;Comparteix els dispositius seleccionats
 getUserMedia.shareSelectedDevices.accesskey = S
 getUserMedia.denyRequest.label = No ho comparteixis
 getUserMedia.denyRequest.accesskey = D
-getUserMedia.sharingCamera.message = Esteu compartint la càmera amb %S.
-getUserMedia.sharingMicrophone.message = Esteu compartint el micròfon amb %S.
-getUserMedia.sharingCameraAndMicrophone.message = Esteu compartint la càmera i el micròfon amb %S.
+getUserMedia.sharingCamera.message2 = You are currently sharing your camera with this page.
+getUserMedia.sharingMicrophone.message2 = You are currently sharing your microphone with this page.
+getUserMedia.sharingCameraAndMicrophone.message2 = You are currently sharing your camera and microphone with this page.
 
 # Mixed Content Blocker Doorhanger Notification
 # LOCALIZATION NOTE - %S is brandShortName
 mixedContentBlocked.message = El %S ha blocat contingut que no és segur.
 mixedContentBlocked.keepBlockingButton.label = Mantén el blocatge
 mixedContentBlocked.keepBlockingButton.accesskey = B
 mixedContentBlocked.unblock.label = Inhabilita la protecció en aquesta pàgina
 mixedContentBlocked.unblock.accesskey = I
--- a/browser/chrome/browser/devtools/appcacheutils.properties
+++ b/browser/chrome/browser/devtools/appcacheutils.properties
@@ -1,123 +1,123 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# LOCALIZATION NOTE These strings are used inside the Inspector
-# which is available from the Web Developer sub-menu -> 'Inspect'.
-#
+# LOCALIZATION NOTE These strings are used inside the Web Console
+# command line which is available from the Web Developer sub-menu
+# -> 'Web Console'.
+# These messages are displayed when an attempt is made to validate a
+# page or a cache manifest using AppCacheUtils.jsm
+
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
-# LOCALIZATION NOTE (noManifest): Used when an attempt is made to validate a
-# page using AppCacheUtils.jsm that has no cache manifest.
+# LOCALIZATION NOTE (noManifest): the specified page has no cache manifest.
 noManifest=La pàgina especificada no té manifest.
 
-# LOCALIZATION NOTE (notUTF8): Used when an attempt is made to validate a
-# cache manifest using AppCacheUtils.jsm having a character encoding that is not
-# UTF-8.
+# LOCALIZATION NOTE (notUTF8): the associated cache manifest has a character
+# encoding that is not UTF-8. Parameters: %S is the current encoding.
 notUTF8=La codificació de caràcters del manifest és %S però ha de ser utf-8.
 
-# LOCALIZATION NOTE (badMimeType): Used when an attempt is made to validate a
-# cache manifest using AppCacheUtils.jsm having a mimetype that is not
-# text/cache-manifest.
+# LOCALIZATION NOTE (badMimeType): the associated cache manifest has a
+# mimetype that is not text/cache-manifest. Parameters: %S is the current
+# mimetype.
 badMimeType=El tipus mime del manifest és %S però ha de ser text/cache-manifest.
 
-# LOCALIZATION NOTE (duplicateURI): Used when an attempt is made to validate a
-# page using AppCacheUtils.jsm that has a cache manifest which references the
-# same URI from multiple locations.
+# LOCALIZATION NOTE (duplicateURI): the associated cache manifest references
+# the same URI from multiple locations. Parameters: %1$S is the URI, %2$S is a
+# list of references to this URI.
 duplicateURI=L'URI %S està referenciada en diverses ubicacions. Això no està permès: %S.
 
-# LOCALIZATION NOTE (networkBlocksURI): Used when an attempt is made to validate
-# a page using AppCacheUtils.jsm that has a cache manifest which references the
-# same URI in the NETWORK section as it does in other sections.
+# LOCALIZATION NOTE (networkBlocksURI, fallbackBlocksURI): the associated
+# cache manifest references the same URI in the NETWORK (or FALLBACK) section
+# as it does in other sections. Parameters: %1$S is the line number, %2$S is
+# the resource name, %3$S is the line number, %4$S is the resource name, %5$S
+# is the section name.
 networkBlocksURI=La línia %S (%S) de la secció «NETWORK» impedeix desar a la memòria cau la línia %S (%S) de la secció %S.
-
-# LOCALIZATION NOTE (fallbackBlocksURI): Used when an attempt is made to
-# validate a page using AppCacheUtils.jsm that has a cache manifest which
-# references the same URI in the FALLBACK section as it does in other sections.
 fallbackBlocksURI=La línia %S (%S) de la secció «FALLBACK» impedeix desar a la memòria cau la línia %S (%S) de la secció %S.
 
-# LOCALIZATION NOTE (fileChangedButNotManifest): Used when an attempt is made to
-# validate a page using AppCacheUtils.jsm that has a cache manifest which
+# LOCALIZATION NOTE (fileChangedButNotManifest): the associated cache manifest
 # references a URI that has a file modified after the cache manifest.
+# Parameters: %1$S is the resource name, %2$S is the cache manifest, %3$S is
+# the line number.
 fileChangedButNotManifest=S'ha modificat el fitxer %S després de %S. Llevat que el text del fitxer manifest canviï, s'utilitzarà la versió de la memòria cau en la línia %S.
 
-# LOCALIZATION NOTE (cacheControlNoStore): Used when an attempt is made to
-# validate a page using AppCacheUtils.jsm that has a header preventing caching
-# or storing information.
+# LOCALIZATION NOTE (cacheControlNoStore): the specified page has a header
+# preventing caching or storing information. Parameters: %1$S is the resource
+# name, %2$S is the line number.
 cacheControlNoStore=%S té «cache-control» establert a «no-store». Això impedirà a la memòria cau d'aplicacions desar el fitxer a la línia %S.
 
-# LOCALIZATION NOTE (notAvailable): Used when an attempt is made to validate a
-# page using AppCacheUtils.jsm that is not available.
+# LOCALIZATION NOTE (notAvailable): the specified resource is not available.
+# Parameters: %1$S is the resource name, %2$S is the line number.
 notAvailable=%S apunta a un recurs que no està disponible a la línia %S.
 
-# LOCALIZATION NOTE (invalidURI): Used when an invalid URI is passed to the
-# appcache.
+# LOCALIZATION NOTE (invalidURI): it's used when an invalid URI is passed to
+# the appcache.
 invalidURI=L'URI que s'ha passat a AppCacheUtils no és vàlida.
 
-# LOCALIZATION NOTE (noResults) Used when a search returns no results.
+# LOCALIZATION NOTE (noResults): it's used when a search returns no results.
 noResults=La vostra cerca no ha retornat cap resultat.
 
-# LOCALIZATION NOTE (cacheDisabled) Used when the cache is disabled and an
-# attempt is made to view offline data.
+# LOCALIZATION NOTE (cacheDisabled): it's used when the cache is disabled and
+# an attempt is made to view offline data.
 cacheDisabled=La memòria cau del disc està inhabilitada. Establiu «browser.cache.disk.enable» a «true» en «about:config» i torneu-ho a intentar.
 
-# LOCALIZATION NOTE (firstLineMustBeCacheManifest): Used when an attempt is made
-# to validate a cache manifest using AppCacheUtils.jsm having a first line that
-# is not "CACHE MANIFEST."
+# LOCALIZATION NOTE (firstLineMustBeCacheManifest): the associated cache
+# manifest has a first line that is not "CACHE MANIFEST". Parameters: %S is
+# the line number.
 firstLineMustBeCacheManifest=La primera línia del manifest cal que sigui «CACHE MANIFEST» a la línia %S.
 
-# LOCALIZATION NOTE (cacheManifestOnlyFirstLine): Used when an attempt is made
-# to validate a cache manifest using AppCacheUtils.jsm having "CACHE MANIFEST"
-# on a line other than the first line.
-cacheManifestOnlyFirstLine=«CACHE MANIFEST» només és vàlid en la primera línia a la línia %S.
+# LOCALIZATION NOTE (cacheManifestOnlyFirstLine2): the associated cache
+# manifest has "CACHE MANIFEST" on a line other than the first line.
+# Parameters: %S is the line number where "CACHE MANIFEST" appears.
+cacheManifestOnlyFirstLine2="CACHE MANIFEST" is only valid on the first line but was found at line %S.
 
-# LOCALIZATION NOTE (asteriskInWrongSection): Used when an attempt is made
-# to validate a cache manifest using AppCacheUtils.jsm having an asterisk (*) in
-# a section other than the network section.
-asteriskInWrongSection=S'ha utilitzat l'asterisc com comodí en la secció %S a la línia %S. Una línia que només conté un asterisc s'anomena «on-line whitelist wildcard flag» i només és vàlid en la secció «NETWORK». Estan prohibits altres usos del caràcter «*». La presència d'aquest  indicador fa que qualsevol URI que no estigui llistada com desada a la memòria cau es tractarà com si fos en la llista blanca d'espais de noms per a recursos en línia. Si no hi ha l'indicador, l'estat de blocatge fa que les URIs que no són explícitament al manifest es tractin com no disponibles.
+# LOCALIZATION NOTE (asteriskInWrongSection2): the associated cache manifest
+# has an asterisk (*) in a section other than the NETWORK section. Parameters:
+# %1$S is the section name, %2$S is the line number.
+asteriskInWrongSection2=Asterisk (*) incorrectly used in the %1$S section at line %2$S. If a line in the NETWORK section contains only a single asterisk character, then any URI not listed in the manifest will be treated as if the URI was listed in the NETWORK section. Otherwise such URIs will be treated as unavailable. Other uses of the * character are prohibited.
 
-# LOCALIZATION NOTE (escapeSpaces): Used when an attempt is made to validate a
-# cache manifest using AppCacheUtils.jsm having a space in a URI. Spaces are to
-# be replaced with %20.
+# LOCALIZATION NOTE (escapeSpaces): the associated cache manifest has a space
+# in a URI. Spaces must be replaced with %20. Parameters: %S is the line
+# number where this error occurs.
 escapeSpaces=Cal reemplaçar els espais en les URIs per %20 a la línia %S.
 
-# LOCALIZATION NOTE (slashDotDotSlashBad): Used when an attempt is made to
-# validate a cache manifest using AppCacheUtils.jsm having a URI containing
-# /../, which is invalid.
+# LOCALIZATION NOTE (slashDotDotSlashBad): the associated cache manifest has a
+# URI containing /../, which is invalid. Parameters: %S is the line number
+# where this error occurs.
 slashDotDotSlashBad=«/../» no és un prefix vàlid d'URI a la línia %S.
 
-# LOCALIZATION NOTE (tooManyDotDotSlashes): Used when an attempt is made to
-# validate a cache manifest using AppCacheUtils.jsm having a URI containing
-# too many ../ operators. Too many of these operaters mean that the file would
-# be below the root of the site, which is not possible.
+# LOCALIZATION NOTE (tooManyDotDotSlashes): the associated cache manifest has
+# a URI containing too many ../ operators. Too many of these operators mean
+# that the file would be below the root of the site, which is not possible.
+# Parameters: %S is the line number where this error occurs.
 tooManyDotDotSlashes=Hi ha massa operadors «../» a la línia %S.
 
-# LOCALIZATION NOTE (fallbackUseSpaces): Used when an attempt is made to
-# validate a cache manifest using AppCacheUtils.jsm having a FALLBACK section
-# containing more or less than the standard two URIs seperated by a single
-# space.
+# LOCALIZATION NOTE (fallbackUseSpaces): the associated cache manifest has a
+# FALLBACK section containing more or less than the standard two URIs
+# separated by a single space. Parameters: %S is the line number where this
+# error occurs.
 fallbackUseSpaces=Només es permeten dues URIs separades per espais en la secció «FALLBACK» a la línia %S.
 
-# LOCALIZATION NOTE (fallbackAsterisk): Used when an attempt is made to validate
-# a cache manifest using AppCacheUtils.jsm having a FALLBACK section that
-# attempts to use an asterisk (*) as a wildcard. In this section the URI is
-# simply a path prefix.
-fallbackAsterisk=S'ha utilitzat l'asterisc (*) incorrectament com comodí en un espai de noms «fallback» a la línia %S. Cal que els espais de noms concordin amb un prefix de camí.
+# LOCALIZATION NOTE (fallbackAsterisk2): the associated cache manifest has a
+# FALLBACK section that attempts to use an asterisk (*) as a wildcard. In this
+# section the URI is simply a path prefix. Parameters: %S is the line number
+# where this error occurs.
+fallbackAsterisk2=Asterisk (*) incorrectly used in the FALLBACK section at line %S. URIs in the FALLBACK section simply need to match a prefix of the request URI.
 
-# LOCALIZATION NOTE (settingsBadValue): Used when an attempt is made to validate
-# a cache manifest using AppCacheUtils.jsm having a SETTINGS section containing
-# something other than the valid "prefer-online" or "fast."
-settingsBadValue= La secció «SETTINGS» només pot contenir un sol valor. «prefer-online» o «fast» a la línia %S.
+# LOCALIZATION NOTE (settingsBadValue): the associated cache manifest has a
+# SETTINGS section containing something other than the valid "prefer-online"
+# or "fast". Parameters: %S is the line number where this error occurs.
+settingsBadValue=La secció «SETTINGS» només pot contenir un sol valor. «prefer-online» o «fast» a la línia %S.
 
-# LOCALIZATION NOTE (invalidSectionName): Used when an attempt is made to
-# validate a cache manifest using AppCacheUtils.jsm containing an invalid
-# section name.
+# LOCALIZATION NOTE (invalidSectionName): the associated cache manifest
+# contains an invalid section name. Parameters: %1$S is the section name, %2$S
+# is the line number.
 invalidSectionName=El nom de secció (%S) no és vàlid a la línia %S.
 
-# LOCALIZATION NOTE (entryNotFound): Used when an attempt is made to view a
-# cache entry that does not exist.
+# LOCALIZATION NOTE (entryNotFound): the requested cache entry that does not
+# exist.
 entryNotFound=No s'ha trobat l'entrada.
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -3,40 +3,20 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!-- LOCALIZATION NOTE : FILE This file contains the Debugger strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
-<!-- LOCALIZATION NOTE (debuggerMenu.label): This is the label for the
-  -  application menu item that opens the debugger UI. -->
-
+<!-- LOCALIZATION NOTE (debuggerUI.closeButton.tooltip): This is the tooltip for
+  -  the button that closes the debugger UI. -->
 
 
-<!ENTITY debuggerMenu.label2            "Depurador">
-<!-- LOCALIZATION NOTE (debuggerMenu.accesskey): This is accesskey for the
-  -  Tools menu entry of Debugger that opens the debugger UI. -->
-
-<!ENTITY debuggerMenu.accesskey         "D">
-<!-- LOCALIZATION NOTE (remoteDebuggerMenu.label): This is the label for the
-  -  application menu item that opens the remote debugger UI. -->
-
-<!ENTITY remoteDebuggerMenu.label       "Depurador remot">
-<!-- LOCALIZATION NOTE (chromeDebuggerMenu.label): This is the label for the
-  -  application menu item that opens the browser debugger UI. -->
-
-<!ENTITY chromeDebuggerMenu.label       "Depurador del navegador">
-<!-- LOCALIZATION NOTE (debuggerMenu.commandkey): This is the command key that
-  -  launches the debugger UI. Do not translate this one! -->
-
-<!ENTITY debuggerMenu.commandkey        "S">
-<!-- LOCALIZATION NOTE (debuggerUI.closeButton.tooltip): This is the tooltip for
-  -  the button that closes the debugger UI. -->
 
 <!ENTITY debuggerUI.closeButton.tooltip "Tanca">
 <!-- LOCALIZATION NOTE (debuggerUI.panesButton.tooltip): This is the tooltip for
   -  the button that toggles the panes visible or hidden in the debugger UI. -->
 
 <!ENTITY debuggerUI.panesButton.tooltip "Panell d'eines">
 <!-- LOCALIZATION NOTE (debuggerUI.optsButton.tooltip): This is the tooltip for
   -  the button that opens up an options context menu for the debugger UI. -->
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -5,51 +5,30 @@
 # LOCALIZATION NOTE These strings are used inside the Debugger
 # which is available from the Web Developer sub-menu -> 'Debugger'.
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
-# LOCALIZATION NOTE (open.commandkey): The key used to open the debugger in
-# combination to e.g. ctrl + shift
-open.commandkey=S
-
-# LOCALIZATION NOTE (debuggerMenu.accesskey): The access key used to open the
-# debugger.
-debuggerMenu.accesskey=D
-
-# LOCALIZATION NOTE (chromeDebuggerWindowTitle): The title displayed for the
-# chrome (browser) debugger window.
-chromeDebuggerWindowTitle=Depurador del navegador
-
-# LOCALIZATION NOTE (remoteDebuggerWindowTitle): The title displayed for the
-# remote debugger window.
-remoteDebuggerWindowTitle=Depurador remot
+# LOCALIZATION NOTE (ToolboxDebugger.label):
+# This string is displayed in the title of the tab when the debugger is
+# displayed inside the developer tools window and in the Developer Tools Menu.
+ToolboxDebugger.label=Depurador
 
-# LOCALIZATION NOTE (remoteDebuggerPromptTitle): The title displayed on the
-# debugger prompt asking for the remote host and port to connect to.
-remoteDebuggerPromptTitle=Connexió remota
-
-# LOCALIZATION NOTE (remoteDebuggerPromptMessage): The message displayed on the
-# debugger prompt asking for the remote host and port to connect to.
-remoteDebuggerPromptMessage=Introduïu el servidor i el número del port (servidor:port)
+# LOCALIZATION NOTE (ToolboxDebugger.tooltip):
+# This string is displayed in the tooltip of the tab when the debugger is
+# displayed inside the developer tools window..
+ToolboxDebugger.tooltip=Depurador de JavaScript
 
-# LOCALIZATION NOTE (remoteDebuggerPromptCheck): The message displayed on the
-# debugger prompt asking if the prompt should be shown again next time.
-remoteDebuggerPromptCheck=No tornis a preguntar
-
-# LOCALIZATION NOTE (remoteDebuggerReconnectMessage): The message displayed on the
-# debugger prompt asking for the remote host and port to connect to.
-remoteDebuggerReconnectMessage=No s'ha trobat el servidor. Voleu tornar-ho a intentar? (servidor:port)
-
-# LOCALIZATION NOTE (remoteDebuggerReconnectMessage): The message displayed on the
-# debugger prompt asking for the remote host and port to connect to.
-remoteDebuggerConnectionFailedMessage=No s'ha pogut trobar cap servidor al servidor i port especificats.
+# LOCALIZATION NOTE (debuggerMenu.commandkey, debuggerMenu.accesskey)
+# Used for the menuitem in the tool menu
+debuggerMenu.commandkey=S
+debuggerMenu.accesskey=D
 
 # LOCALIZATION NOTE (collapsePanes): This is the tooltip for the button
 # that collapses the left and right panes in the debugger UI.
 collapsePanes=Redueix els panells
 
 # LOCALIZATION NOTE (expandPanes): This is the tooltip for the button
 # that expands the left and right panes in the debugger UI.
 expandPanes=Expandeix els panells
@@ -163,26 +142,16 @@ scopeLabel=Àmbit %S
 # the watch expressions scope.
 watchExpressionsScopeLabel=Expressions de vigilància
 
 # LOCALIZATION NOTE (globalScopeLabel): The name of the global scope. This text
 # is added to scopeLabel and displayed in the variables pane as a header for
 # the global scope.
 globalScopeLabel=Global
 
-# LOCALIZATION NOTE (ToolboxDebugger.label):
-# This string is displayed in the title of the tab when the debugger is
-# displayed inside the developer tools window and in the Developer Tools Menu.
-ToolboxDebugger.label=Depurador
-
-# LOCALIZATION NOTE (ToolboxDebugger.tooltip):
-# This string is displayed in the tooltip of the tab when the debugger is
-# displayed inside the developer tools window..
-ToolboxDebugger.tooltip=Depurador de JavaScript
-
 # LOCALIZATION NOTE (variablesEditableNameTooltip): The text that is displayed
 # in the variables list on an item with an editable name.
 variablesEditableNameTooltip=Feu doble clic per editar
 
 # LOCALIZATION NOTE (variablesEditableValueTooltip): The text that is displayed
 # in the variables list on an item with an editable value.
 variablesEditableValueTooltip=Feu clic per canviar el valor
 
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -109,16 +109,31 @@ typesNumberMax=%1$S és un número més gran que el màxim permès: %2$S
 # number, but the number is lower than the smallest allowed number, this error
 # message is displayed.
 typesNumberMin=%1$S és un número més petit que el mínim permès: %2$S
 
 # LOCALIZATION NOTE (typesNumberNotInt2): When the command line is passed a
 # number, but the number has a decimal part and floats are not allowed.
 typesNumberNotInt2=No s'ha pogut convertir "%S" a enter.
 
+# LOCALIZATION NOTE (typesDateNan): When the command line is passed a date,
+# however the input string is not a valid date, this error message is
+# displayed.
+typesDateNan=Can't convert "%S" to a date.
+
+# LOCALIZATION NOTE (typesDateMax): When the command line is passed a date,
+# but the number is later than the latest allowed date, this error message is
+# displayed.
+typesDateMax=%1$S is later than maximum allowed: %2$S.
+
+# LOCALIZATION NOTE (typesDateMin): When the command line is passed a date,
+# but the date is earlier than the earliest allowed number, this error message
+# is displayed.
+typesDateMin=%1$S is earlier than minimum allowed: %2$S.
+
 # LOCALIZATION NOTE (typesSelectionNomatch): When the command line is passed
 # an option with a limited number of correct values, but the passed value is
 # not one of them, this error message is displayed.
 typesSelectionNomatch=No es pot utilitzar «%S».
 
 # LOCALIZATION NOTE (nodeParseSyntax): When the command line is expecting a
 # CSS query string, however the passed string is not valid, this error message
 # is displayed.
@@ -183,22 +198,27 @@ helpListPrefix=Ordres que comencen amb '
 
 # LOCALIZATION NOTE (helpListNone): The heading shown in response to the 'help
 # <search>' command (i.e. with a search string), when there are no matching
 # commands.
 helpListNone=No hi ha cap ordre que comenci amb '%1$S'
 
 # LOCALIZATION NOTE (helpManRequired): When the 'help x' command wants to show
 # the manual for the 'x' command it needs to be able to describe the
-# parameters as either required or optional. See also 'helpManOptional'.
+# parameters as either required or optional, or if they have a default value.
+# See also 'helpManOptional' and 'helpManDefault'.
 helpManRequired=necessari
 
 # LOCALIZATION NOTE (helpManOptional): See description of 'helpManRequired'
 helpManOptional=opcional
 
+# LOCALIZATION NOTE (helpManDefault): See description of 'helpManRequired'. %1$
+# S is the default value
+helpManDefault=optional, default=%1$S
+
 # LOCALIZATION NOTE (subCommands): Text shown as part of the output of the
 # 'help' command when the command in question has sub-commands, before a list
 # of the matching sub-commands
 subCommands=Subordres
 
 # LOCALIZATION NOTE (subCommandsNone): Text shown as part of the output of the
 # 'help' command when the command in question should have sub-commands but in
 # fact has none
@@ -281,20 +301,31 @@ disconnectDesc=Importa les ordres del se
 disconnectManual=Connecta al servidor i crea versions locals de les seves ordres. Les ordres remotes tenen inicialment un prefix per distingir-les de les locals. Vegeu l'ordre «context» per passar això per alt.
 
 # LOCALIZATION NOTE (disconnectPrefixDesc): A short description of the
 # 'prefix' parameter to the 'disconnect' command. This string is designed to
 # be shown in a dialog with restricted space, which is why it should be as
 # short as possible.
 disconnectPrefixDesc=Prefix pare per ordres importades
 
+# LOCALIZATION NOTE (disconnectForceDesc): A short description of the 'force'
+# parameter to the 'disconnect' command. This string is designed to be shown
+# in a dialog with restricted space, which is why it should be as short as
+# possible.
+disconnectForceDesc=Ignore outstanding requests
+
 # LOCALIZATION NOTE (disconnectReply): The output of the 'disconnect' command,
 # telling the user what it's done.
 disconnectReply=S'han eliminat %S ordres.
 
+# LOCALIZATION NOTE (disconnectOutstanding): An error message displayed when
+# the user attempts to disconnect before all requests have completed. %1$S is
+# a list of commands which are incomplete
+disconnectOutstanding=Outstanding requests (%1$S)
+
 # LOCALIZATION NOTE (prefDesc): A very short description of the 'pref'
 # command. This string is designed to be shown in a menu alongside the command
 # name, which is why it should be as short as possible. See prefManual for a
 # fuller description of what it does.
 prefDesc=Ordres per controlar els paràmetres
 
 # LOCALIZATION NOTE (prefManual): A fuller description of the 'pref' command.
 # Displayed when the user asks for help on what it does.
@@ -467,17 +498,19 @@ introTextF1Escape=F1/Esc
 # introTextOpening2. The text on the button that dismisses the intro text.
 introTextGo=Ho entenc
 
 # LOCALIZATION NOTE (hideIntroDesc): Short description of the 'hideIntro'
 # setting. Displayed when the user asks for help on the settings.
 hideIntroDesc=Mostra el missatge inicial de benvinguda
 
 # LOCALIZATION NOTE (eagerHelperDesc): Short description of the 'eagerHelper'
-# setting. Displayed when the user asks for help on the settings.
+# setting. Displayed when the user asks for help on the settings. eagerHelper
+# allows users to select between showing no tooltips, permanent tooltips, and
+# only important tooltips
 eagerHelperDesc=Quan cal mostrar els indicadors de funció
 
 # LOCALIZATION NOTE (allowSetDesc): Short description of the 'allowSetDesc'
 # setting. Displayed when the user asks for help on the settings.
 allowSetDesc=L'usuari ha habilitat l'ordre «pref set»?
 
 # LOCALIZATION NOTE (introBody): The text displayed at the top of the output
 # for the help command, just before the list of commands. This text is wrapped
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -362,20 +362,16 @@ breakdelDesc=Suprimeix un punt de ruptur
 # LOCALIZATION NOTE (breakdelBreakidDesc) A very short string used to describe
 # the function of the index parameter in the 'break del' command.
 breakdelBreakidDesc=Índex del punt de ruptura
 
 # LOCALIZATION NOTE (breakdelRemoved) Used in the output of the 'break del'
 # command to explain that a breakpoint was removed.
 breakdelRemoved=S'ha suprimit el punt de ruptura
 
-# LOCALIZATION NOTE (breakNotFound) Used in the output of the 'break del'
-# command to explain that the breakpoint was not found.
-breakNotFound=No s'ha trobat el punt de ruptura
-
 # LOCALIZATION NOTE (dbgDesc) A very short string used to describe the
 # function of the dbg command.
 dbgDesc=Gestiona el depurador
 
 # LOCALIZATION NOTE (dbgManual) A longer description describing the
 # set of commands that control the debugger.
 dbgManual=Ordres per interrompre o reprendre el fil principal, entrar, sortir i saltar les línies de codi
 
@@ -1208,28 +1204,42 @@ profilerOpenDesc=Obre l'analitzador de r
 # LOCALIZATION NOTE (profilerClose) A very short string used to describe the function
 # of the profiler close command.
 profilerCloseDesc=Tanca l'analitzador de rendiment
 
 # LOCALIZATION NOTE (profilerStart) A very short string used to describe the function
 # of the profiler start command.
 profilerStartDesc=Inicia l'anàlisi de rendiment
 
+# LOCALIZATION NOTE (profilerStartManual) A fuller description of the 'profile name'
+# parameter. This parameter is used to name a newly created profile or to lookup
+# an existing profile by its name.
+profilerStartManual=Name of a profile you wish to start.
+
 # LOCALIZATION NOTE (profilerStop) A very short string used to describe the function
 # of the profiler stop command.
 profilerStopDesc=Atura l'anàlisi de rendiment
 
+# LOCALIZATION NOTE (profilerStopManual) A fuller description of the 'profile name'
+# parameter. This parameter is used to lookup an existing profile by its name.
+profilerStopManual=Name of a profile you wish to stop.
+
 # LOCALIZATION NOTE (profilerList) A very short string used to describe the function
 # of the profiler list command.
 profilerListDesc=Llista tots els anàlisis de rendiment
 
 # LOCALIZATION NOTE (profilerShow) A very short string used to describe the function
 # of the profiler show command.
 profilerShowDesc=Mostra un anàlisi de rendiment individual
 
+# LOCALIZATION NOTE (profilerShowManual) A fuller description of the 'profile name'
+# parameter. This parameter is used to name a newly created profile or to lookup
+# an existing profile by its name.
+profilerShowManual=Name of a profile.
+
 # LOCALIZATION NOTE (profilerAlreadyStarted) A message that is displayed whenever
 # an operation cannot be completed because the profile in question has already
 # been started.
 profilerAlreadyStarted=Aquest anàlisi de rendiment ja s'ha iniciat
 
 # LOCALIZATION NOTE (profilerAlreadyFinished) A message that is displayed whenever
 # an operation cannot be completed because the profile in question has already
 # been finished. It also contains a hint to use the 'profile show' command to see
@@ -1258,19 +1268,19 @@ profilerStopping2=S'està aturant...
 # LOCALIZATION NOTE (profilerNotReady) A message that is displayed whenever
 # an operation cannot be completed because the profiler has not been opened yet.
 profilerNotReady=Per aquesta ordre cal que primer obriu l'analitzador de rendiment
 
 # LOCALIZATION NOTE (listenDesc) A very short string used to describe the
 # function of the 'listen' command.
 listenDesc=Obre un port de depuració remota.
 
-# LOCALIZATION NOTE (listenManual) A longer description of the 'listen'
+# LOCALIZATION NOTE (listenManual2) A longer description of the 'listen'
 # command.
-listenManual=Amb el Firefox es pot depurar remotament a través d'una connexió TCP/IP. Per seguretat està desactivat per defecte però es pot habilitar amb aquesta ordre.
+listenManual2=%1$S can allow remote debugging over a TCP/IP connection. For security reasons this is turned off by default, but can be enabled using this command.
 
 # LOCALIZATION NOTE (listenPortDesc) A very short string used to describe the
 # function of 'port' parameter to the 'listen' command.
 listenPortDesc=El port TCP per escoltar
 
 # LOCALIZATION NOTE (listenDisabledOutput) Text of a message output during the
 # execution of the 'listen' command.
 listenDisabledOutput=L'escolta està inhabilitada per la preferència «devtools.debugger.remote-enabled»
--- a/browser/chrome/browser/devtools/netmonitor.dtd
+++ b/browser/chrome/browser/devtools/netmonitor.dtd
@@ -3,22 +3,22 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!-- LOCALIZATION NOTE : FILE This file contains the Network Monitor strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
-<!-- LOCALIZATION NOTE (netmonitorUI.emptyNotice): This is the label displayed
+<!-- LOCALIZATION NOTE (netmonitorUI.emptyNotice2): This is the label displayed
   -  in the network table when empty. -->
 
 
 
-<!ENTITY netmonitorUI.emptyNotice         "Recarregueu la pàgina per a veure informació detallada sobre l'activitat de la xarxa.">
+<!ENTITY netmonitorUI.emptyNotice2        "Perform a request or reload the page to see detailed information about network activity.">
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.status): This is the label displayed
   -  in the network table toolbar, above the "status" column. -->
 
 <!ENTITY netmonitorUI.toolbar.status      "√">
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.method): This is the label displayed
   -  in the network table toolbar, above the "method" column. -->
 
 <!ENTITY netmonitorUI.toolbar.method      "Mètode">
@@ -57,16 +57,52 @@
 <!-- LOCALIZATION NOTE (debuggerUI.tab.response): This is the label displayed
   -  in the network details pane identifying the response tab. -->
 
 <!ENTITY netmonitorUI.tab.response        "Resposta">
 <!-- LOCALIZATION NOTE (debuggerUI.tab.timings): This is the label displayed
   -  in the network details pane identifying the timings tab. -->
 
 <!ENTITY netmonitorUI.tab.timings         "Temps">
+<!-- LOCALIZATION NOTE (debuggerUI.footer.filterAll): This is the label displayed
+  -  in the network details footer for the "All" filtering button. -->
+
+<!ENTITY netmonitorUI.footer.filterAll    "All">
+<!-- LOCALIZATION NOTE (debuggerUI.footer.filterHTML): This is the label displayed
+  -  in the network details footer for the "HTML" filtering button. -->
+
+<!ENTITY netmonitorUI.footer.filterHTML   "HTML">
+<!-- LOCALIZATION NOTE (debuggerUI.footer.filterCSS): This is the label displayed
+  -  in the network details footer for the "CSS" filtering button. -->
+
+<!ENTITY netmonitorUI.footer.filterCSS    "CSS">
+<!-- LOCALIZATION NOTE (debuggerUI.footer.filterJS): This is the label displayed
+  -  in the network details footer for the "JS" filtering button. -->
+
+<!ENTITY netmonitorUI.footer.filterJS     "JS">
+<!-- LOCALIZATION NOTE (debuggerUI.footer.filterXHR): This is the label displayed
+  -  in the network details footer for the "XHR" filtering button. -->
+
+<!ENTITY netmonitorUI.footer.filterXHR    "XHR">
+<!-- LOCALIZATION NOTE (debuggerUI.footer.filterFonts): This is the label displayed
+  -  in the network details footer for the "Fonts" filtering button. -->
+
+<!ENTITY netmonitorUI.footer.filterFonts  "Fonts">
+<!-- LOCALIZATION NOTE (debuggerUI.footer.filterImages): This is the label displayed
+  -  in the network details footer for the "Images" filtering button. -->
+
+<!ENTITY netmonitorUI.footer.filterImages "Images">
+<!-- LOCALIZATION NOTE (debuggerUI.footer.filterMedia): This is the label displayed
+  -  in the network details footer for the "Media" filtering button. -->
+
+<!ENTITY netmonitorUI.footer.filterMedia  "Media">
+<!-- LOCALIZATION NOTE (debuggerUI.footer.filterFlash): This is the label displayed
+  -  in the network details footer for the "Flash" filtering button. -->
+
+<!ENTITY netmonitorUI.footer.filterFlash  "Flash">
 <!-- LOCALIZATION NOTE (debuggerUI.panesButton.tooltip): This is the tooltip for
   -  the button that toggles the panes visible or hidden in the netmonitor UI. -->
 
 <!ENTITY netmonitorUI.panesButton.tooltip "Mostra/amaga la informació de la xarxa">
 <!-- LOCALIZATION NOTE (debuggerUI.summary.url): This is the label displayed
   -  in the network details headers tab identifying the URL. -->
 
 <!ENTITY netmonitorUI.summary.url         "URL de la sol·licitud:">
--- a/browser/chrome/browser/devtools/netmonitor.properties
+++ b/browser/chrome/browser/devtools/netmonitor.properties
@@ -100,16 +100,27 @@ jsonpScopeName=JSONP → callback %S()
 # LOCALIZATION NOTE (networkMenu.sortedAsc): This is the tooltip displayed
 # in the network table toolbar, for any column that is sorted ascending.
 networkMenu.sortedAsc=Ordre ascendent
 
 # LOCALIZATION NOTE (networkMenu.sortedDesc): This is the tooltip displayed
 # in the network table toolbar, for any column that is sorted descending.
 networkMenu.sortedDesc=Ordre descendent
 
+# LOCALIZATION NOTE (networkMenu.empty): This is the label displayed
+# in the network table footer when there are no requests available.
+networkMenu.empty=No requests
+
+# LOCALIZATION NOTE (networkMenu.summary): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# This label is displayed in the network table footer providing concise
+# information about all requests. Parameters: #1 is the number of requests,
+# #2 is the size, #3 is the number of seconds.
+networkMenu.summary=One request, #2 KB, #3 s;#1 requests, #2 KB, #3 s
+
 # LOCALIZATION NOTE (networkMenu.sizeKB): This is the label displayed
 # in the network menu specifying the size of a request (in kilobytes).
 networkMenu.sizeKB=%S KB
 
 # LOCALIZATION NOTE (networkMenu.totalMS): This is the label displayed
 # in the network menu specifying the time for a request to finish (in milliseconds).
 networkMenu.totalMS=→ %S ms
 
--- a/browser/chrome/browser/devtools/profiler.properties
+++ b/browser/chrome/browser/devtools/profiler.properties
@@ -15,20 +15,20 @@
 # displayed inside the developer tools window and in the Developer Tools Menu.
 profiler.label=Analitzador de rendiment
 
 # LOCALIZATION NOTE (profiler2.commandkey, profiler.accesskey)
 # Used for the menuitem in the tool menu
 profiler2.commandkey=VK_F5
 profiler.accesskey=P
 
-# LOCALIZATION NOTE (profiler.tooltip):
+# LOCALIZATION NOTE (profiler.tooltip2):
 # This string is displayed in the tooltip of the tab when the profiler is
 # displayed inside the developer tools window.
-profiler.tooltip=Analitzador de rendiment
+profiler.tooltip2=JavaScript Profiler
 
 # LOCALIZATION NOTE (profiler.profileName):
 # This string is the default name for new profiles. Its parameter is a number.
 # For example: "Profile 1", "Profile 2", etc.
 profiler.profileName=Perfil %S
 
 # LOCALIZATION NOTE (profiler.completeProfile):
 # This string is displayed as a tab in the profiler UI. Clicking on it
@@ -77,8 +77,23 @@ profiler.stop=Atura
 # This string is displayed above the progress bar when the profiler
 # is busy loading and parsing the report.
 profiler.loading=S'està carregant el perfil…
 
 # LOCALIZATION NOTE (profiler.alreadyRunning)
 # This string is displayed in the profiler whenever there is already
 # another running profile. Users can run only one profile at a time.
 profiler.alreadyRunning=Ja s'està executant l'analitzador de rendiment. Si voleu executar aquest perfil, atureu primer el perfil %S.
+
+# LOCALIZATION NOTE (profiler.stateIdle)
+# This string is used to show that the profile in question is in IDLE
+# state meaning that it hasn't been started yet.
+profiler.stateIdle=Idle
+
+# LOCALIZATION NOTE (profiler.stateRunning)
+# This string is used to show that the profile in question is in RUNNING
+# state meaning that it has been started and currently gathering profile data.
+profiler.stateRunning=Running
+
+# LOCALIZATION NOTE (profiler.stateCompleted)
+# This string is used to show that the profile in question is in COMPLETED
+# state meaning that it has been started and stopped already.
+profiler.stateCompleted=Completed
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -76,8 +76,12 @@ browserContext.notification=Aquest bloc 
 
 # LOCALIZATION NOTE (help.openDocumentationPage): This returns a localized link with
 # documentation for Scratchpad on MDN.
 help.openDocumentationPage=https://developer.mozilla.org/en/Tools/Scratchpad
 
 # LOCALIZATION NOTE (fileExists.notification): This is the message displayed
 # over the top of the the editor when a file does not exist.
 fileNoLongerExists.notification=El fitxer no existeix.
+
+# LOCALIZATION NOTE (propertiesFilterPlaceholder): this is the text that
+# appears in the filter text box for the properties view container.
+propertiesFilterPlaceholder=Filter properties
--- a/browser/chrome/browser/devtools/toolbox.dtd
+++ b/browser/chrome/browser/devtools/toolbox.dtd
@@ -4,43 +4,78 @@
 <!-- LOCALIZATION NOTE : FILE This file contains the Toolbox strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate key -->
 
 
 <!ENTITY closeCmd.key  "W">
 
 <!ENTITY toolboxCloseButton.tooltip    "Tanca les eines per a desenvolupadors">
 <!ENTITY toolboxOptionsButton.key      "O">
-<!-- LOCALIZATION NOTE (options.context.label): This is the label for the
-  -  heading of the group of two about:config preferences to toggle chrome
-  -  and remote debugging in the options panel. -->
+<!-- LOCALIZATION NOTE (options.context.advancedSettings): This is the label for
+  -  the heading of the advanced settings group in the options panel. -->
+
+<!ENTITY options.context.advancedSettings "Advanced settings">
+<!-- LOCALIZATION NOTE (options.context.requiresRestart2): This is the requires
+  -  restart label at right of settings that require a browser restart to be
+  -  effective. -->
 
-<!ENTITY options.context.label         "Paràmetres avançats (cal reiniciar el navegador)">
-<!-- LOCALIZATION NOTE (options.enableChrome.label): This is the label for the
+<!ENTITY options.context.requiresRestart2  "Requires browser restart">
+<!-- LOCALIZATION NOTE (options.restartButton.label): This is the label for the
+  -  restart button next to options.context.requiresRestart2 label. -->
+
+<!ENTITY options.restartButton.label  "Restart now">
+<!-- LOCALIZATION NOTE (options.context.triggersPageRefresh2): This is the
+  -  triggers page refresh label next to the settings in the advanced settings
+  -  group in the options panel which trigger page reload. -->
+
+<!ENTITY options.context.triggersPageRefresh2  "Current session only, reloads the page">
+<!-- LOCALIZATION NOTE (options.enableChrome.label3): This is the label for the
   -  checkbox that toggles chrome debugging, i.e. devtools.chrome.enabled
   -  boolean preference in about:config, in the options panel. -->
 
-<!ENTITY options.enableChrome.label    "Habilita la depuració del chrome">
-<!ENTITY options.enableChrome.tooltip  "Activar aquesta opció us permetrà utilitzar diverses eines per a desenvolupadors en el context del navegador">
-<!-- LOCALIZATION NOTE (options.enableRemote.label): This is the label for the
+<!ENTITY options.enableChrome.label3    "Enable chrome debugging">
+<!ENTITY options.enableChrome.tooltip   "Activar aquesta opció us permetrà utilitzar diverses eines per a desenvolupadors en el context del navegador">
+<!-- LOCALIZATION NOTE (options.enableRemote.label3): This is the label for the
   -  checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled
   -  boolean preference in about:config, in the options panel. -->
 
-<!ENTITY options.enableRemote.label    "Habilita la depuració remota">
-<!ENTITY options.enableRemote.tooltip  "Habilitar aquesta opció permetrà a les eines per a desenvolupadors depurar instàncies remotes del Firefox, com el Firefox OS">
+<!ENTITY options.enableRemote.label3    "Enable remote debugging">
+<!ENTITY options.enableRemote.tooltip   "Habilitar aquesta opció permetrà a les eines per a desenvolupadors depurar instàncies remotes del Firefox, com el Firefox OS">
+<!-- LOCALIZATION NOTE (options.disableJavaScript.label2,
+  -  options.disableJavaScript.tooltip): This is the options panel label and
+  -  tooltip for the checkbox that toggles JavaScript on or off. -->
+
+<!ENTITY options.disableJavaScript.label2    "Disable JavaScript">
+<!ENTITY options.disableJavaScript.tooltip   "Turning this option on will disable JavaScript for the current tab. If the tab or the toolbox is closed then this setting will be forgotten.">
 <!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the default developer
   -  tools. -->
 
 <!ENTITY options.selectDefaultTools.label     "Eines per a desenvolupadors per defecte del Firefox">
-<!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
+<!-- LOCALIZATION NOTE (options.selectAdditionalTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the developer tools
   -  added by add-ons. This heading is hidden when there is no developer tool
   -  installed by add-ons. -->
 
 <!ENTITY options.selectAdditionalTools.label  "Eines per a desenvolupadors instal·lades per complements">
+<!-- LOCALIZATION NOTE (options.toolNotSupported.label): This is the label for
+  -  the explanation of the * marker on a tool which is currently not supported
+  -  for the target of the toolbox. -->
+
+<!ENTITY options.toolNotSupported.label  "* Not supported for current toolbox target">
 <!-- LOCALIZATION NOTE (options.selectDevToolsTheme.label): This is the label for
   -  the heading of the radiobox corresponding to the theme of the developer
   -  tools. -->
 
 <!ENTITY options.selectDevToolsTheme.label   "Tema de les eines per a desenvolupadors:">
 <!ENTITY options.darkTheme.label             "Tema fosc">
 <!ENTITY options.lightTheme.label            "Tema clar">
+<!-- LOCALIZATION NOTE (options.webconsole.label): This is the label for the
+  -  heading of the group of Web Console preferences in the options panel. -->
+
+<!ENTITY options.webconsole.label            "Web Console">
+<!-- LOCALIZATION NOTE (options.enablePersistentLogging.label): This is the
+  -  label for the checkbox that toggles persistent logs in the Web Console,
+  -  i.e. devtools.webconsole.persistlog a boolean preference in about:config,
+  -  in the options panel. -->
+
+<!ENTITY options.enablePersistentLogging.label    "Enable persistent logs">
+<!ENTITY options.enablePersistentLogging.tooltip  "If you enable this option the Web Console will not clear the output each time you navigate to a new page">
--- a/browser/chrome/browser/devtools/toolbox.properties
+++ b/browser/chrome/browser/devtools/toolbox.properties
@@ -33,8 +33,14 @@ toolbox.titleTemplate=%1$S - %2$S
 
 # LOCALIZATION NOTE (toolbox.defaultTitle): This is used as the tool
 # name when no tool is selected.
 toolbox.defaultTitle=Eines per a desenvolupadors
 
 # LOCALIZATION NOTE (optionsButton.tooltip): This is used as the tooltip
 # for the optiosn panel tab.
 optionsButton.tooltip=Opcions de les eines
+
+# LOCALIZATION NOTE (options.toolNotSupported): This is the template
+# used to add a * marker to the label for the Options Panel tool checkbox for the
+# tool which is not supported for the current toolbox target.
+# The name of the tool: %1$S.
+options.toolNotSupportedMarker=%1$S *
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -40,45 +40,59 @@
 <!ENTITY openURL.accesskey "t">
 <!-- LOCALIZATION NOTE (btnPageNet.label): This string is used for the menu
   -  button that allows users to toggle the network logging output.
   -  This string and the following strings toggle various kinds of output
   -  filters. -->
 
 <!ENTITY btnPageNet.label   "Xarxa">
 <!ENTITY btnPageNet.tooltip "Registra l'accés a la xarxa">
+<!ENTITY btnPageNet.accesskey "N">
+<!-- LOCALIZATION NOTE (btnPageNet.accesskeyMacOSX): This string is used as
+  -  access key for the menu button that allows users to toggle the network
+  -  logging output. On MacOSX accesskeys are available with Ctrl-*. Please make
+  -  sure you do not use the following letters: A, E, N and P. These are used
+  -  for editing commands in text inputs. -->
+<!ENTITY btnPageNet.accesskeyMacOSX "t">
 <!ENTITY btnPageCSS.label   "CSS">
 <!ENTITY btnPageCSS.tooltip "Registra els errors d'anàlisi de CSS">
+<!ENTITY btnPageCSS.accesskey "C">
 <!ENTITY btnPageJS.label    "JS">
 <!ENTITY btnPageJS.tooltip  "Registra les excepcions de JavaScript">
+<!ENTITY btnPageJS.accesskey  "J">
 <!ENTITY btnPageSecurity.label "Seguretat">
 <!ENTITY btnPageSecurity.tooltip "Registra errors de seguretat i avisos">
+<!ENTITY btnPageSecurity.accesskey "S">
 <!-- LOCALIZATION NOTE (btnPageLogging): This is used as the text of the
   -  the toolbar. It shows or hides messages that the web developer inserted on
   -  the page for debugging purposes, using calls such console.log() and
   -  console.error(). -->
 
 <!ENTITY btnPageLogging.label   "Registre">
 <!ENTITY btnPageLogging.tooltip "Registra els missatges enviats a l'objecte window.console">
+<!ENTITY btnPageLogging.accesskey "L">
 <!ENTITY btnConsoleErrors       "Errors">
 <!ENTITY btnConsoleInfo         "Informació">
 <!ENTITY btnConsoleWarnings     "Avisos">
 <!ENTITY btnConsoleLog          "Registre">
 
 <!ENTITY filterOutput.placeholder "Filtra la sortida">
 <!ENTITY btnClear.label        "Neteja">
 <!ENTITY btnClear.tooltip      "Neteja la sortida de la consola web">
+<!ENTITY btnClear.accesskey    "r">
 
 <!ENTITY fullZoomEnlargeCmd.commandkey  "+">
 <!-- + is above this key on many keyboards -->
 <!ENTITY fullZoomEnlargeCmd.commandkey2 "="> 
 <!ENTITY fullZoomEnlargeCmd.commandkey3 "">
 
 <!ENTITY fullZoomReduceCmd.commandkey   "-">
 <!ENTITY fullZoomReduceCmd.commandkey2  "">
 
 <!ENTITY fullZoomResetCmd.commandkey    "0">
 <!ENTITY fullZoomResetCmd.commandkey2   "">
 
 <!ENTITY copyURLCmd.label     "Copia la ubicació de l'enllaç">
 <!ENTITY copyURLCmd.accesskey "C">
 
-<!ENTITY closeCmd.key  "W">
+<!ENTITY closeCmd.key         "W">
+<!ENTITY findCmd.key          "F">
+<!ENTITY clearOutputCmd.key   "K">
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -36,159 +36,150 @@ cmd.commandkey=k
 webConsoleCmd.accesskey=W
 
 # LOCALIZATION NOTE (timestampFormat): %1$02S = hours (24-hour clock),
 # %2$02S = minutes, %3$02S = seconds, %4$03S = milliseconds.
 timestampFormat=%02S:%02S:%02S.%03S
 
 helperFuncUnsupportedTypeError=No es pot cridar el pprint en aquest tipus d'objecte.
 NetworkPanel.label=Inspecciona les sol·licituds a la xarxa
-# LOCALIZATION NOTE (NetworkPanel.deltaDurationMS):
-#
-# This string is used to show the duration between two network events (e.g
-# request and response header or response header and response body).
+
+# LOCALIZATION NOTE (NetworkPanel.deltaDurationMS): this string is used to
+# show the duration between two network events (e.g request and response
+# header or response header and response body). Parameters: %S is the duration.
 NetworkPanel.durationMS=%Sms
-# LOCALIZATION NOTE (NetworkPanel.imageSizeDeltaDurationMS):
-# This string is used to show the duration between the response header and the
-# response body event. It also shows the size of the received or cached image.
-#
-# The first %S is replace by the width of the inspected image.
-# The second %S is replaced by the height of the inspected image.
-# The third %S is replaced by the duration between the response header and the
-# response body event.
+
+# LOCALIZATION NOTE (NetworkPanel.imageSizeDeltaDurationMS): this string is
+# used to show the duration between the response header and the response body
+# event. It also shows the size of the received or cached image. Parameters:
+# %1$S is the width of the inspected image, %2$S is the height of the
+# inspected image, %3$S is the duration between the response header and the
+# response body event. Example: 150x100px, Δ50ms.
 NetworkPanel.imageSizeDeltaDurationMS=%Sx%Spx, Δ%Sms
-# LOCALIZATION NOTE (NetworkPanel.responseBodyUnableToDisplay.content):
-#
-# This string is displayed within the response body section of the NetworkPanel
-# if the content type of the network request can't be displayed in the
-# NetworkPanel. E.g. any kind of text is easy to display, but some audio or
-# flash data received from the server can't be displayed.
-#
-# The %S is replaced by the content type, that can't be displayed, examples are
-#  o application/x-shockwave-flash
-#  o music/crescendo
+
+# LOCALIZATION NOTE (NetworkPanel.responseBodyUnableToDisplay.content): this
+# string is displayed within the response body section of the NetworkPanel if
+# the content type of the network request can't be displayed. E.g. any kind of
+# text is easy to display, but some audio or flash data received from the
+# server can't be displayed. Parameters: %S is the content type that can't be
+# displayed, examples are application/x-shockwave-flash, music/crescendo.
 NetworkPanel.responseBodyUnableToDisplay.content=No es poden mostrar respostes del tipus «%S»
+
 ConsoleAPIDisabled=L'API de registre de la consola web (console.log, console.info, console.warn, console.error) ha estat inhabilitada per un script de la pàgina.
 
-# LOCALIZATION NOTE (webConsoleWindowTitleAndURL): The Web Console floating
-# panel title, followed by the web page URL.
-# For RTL languages you need to set the LRM in the string to give the URL
-# the correct direction.
+# LOCALIZATION NOTE (webConsoleWindowTitleAndURL): the Web Console floating
+# panel title. For RTL languages you need to set the LRM in the string to give
+# the URL the correct direction. Parameters: %S is the web page URL.
 webConsoleWindowTitleAndURL=Consola web - %S
 
-# LOCALIZATION NOTE (webConsoleMixedContentWarning): Message displayed after a
-# URL in the Web Console that has been flagged for Mixed Content (i.e. http
-# content in an https page)
+# LOCALIZATION NOTE (webConsoleMixedContentWarning): the message displayed
+# after a URL in the Web Console that has been flagged for Mixed Content (i.e.
+# http content in an https page).
 webConsoleMixedContentWarning=Mixed Content
 
-# LOCALIZATION NOTE (scratchpad.linkText):
-# The text used in the right hand side of the web console command line when
-# JavaScript is being entered, to indicate how to jump into scratchpad mode
+# LOCALIZATION NOTE (scratchpad.linkText): the text used in the right hand
+# side of the Web Console command line when JavaScript is being entered, to
+# indicate how to jump into scratchpad mode.
 scratchpad.linkText=Shift+RETURN - Open in Scratchpad
 
-# LOCALIZATION NOTE (gcliterm.instanceLabel): The console displays
-# objects using their type (from the constructor function) in this descriptive
-# string
+# LOCALIZATION NOTE (gcliterm.instanceLabel): the console displays objects
+# using their type (from the constructor function) in this descriptive string.
+# Parameters: %S is the object type.
 gcliterm.instanceLabel=Instància de %S
 
-# LOCALIZATION NOTE (stacktrace.anonymousFunction):
-# This string is used to display JavaScript functions that have no given name -
-# they are said to be anonymous. See stacktrace.outputMessage.
+# LOCALIZATION NOTE (stacktrace.anonymousFunction): this string is used to
+# display JavaScript functions that have no given name - they are said to be
+# anonymous. See also stacktrace.outputMessage.
 stacktrace.anonymousFunction=<anonymous>
 
-# LOCALIZATION NOTE (stacktrace.outputMessage):
-# This string is used in the Web Console output to identify a web developer call
-# to console.trace(). The stack trace of JavaScript function calls is displayed.
-# In this minimal message we only show the last call.
+# LOCALIZATION NOTE (stacktrace.outputMessage): this string is used in the Web
+# Console output to identify a web developer call to console.trace(). The
+# stack trace of JavaScript function calls is displayed. In this minimal
+# message we only show the last call. Parameters: %1$S is the file name, %2$S
+# is the function name, %3$S is the line number.
 stacktrace.outputMessage=Traça de la pila de %S, funció %S, línia %S.
 
-# LOCALIZATION NOTE (timerStarted):
-# This string is used to display the result of the console.time() call.
-# %S=name of timer
+# LOCALIZATION NOTE (timerStarted): this string is used to display the result
+# of the console.time() call. Parameters: %S is the name of the timer.
 timerStarted=%S: s'ha iniciat el cronòmetre
 
-# LOCALIZATION NOTE (timeEnd):
-# This string is used to display the result of the console.timeEnd() call.
-# %1$S=name of timer, %2$S=number of milliseconds
+# LOCALIZATION NOTE (timeEnd): this string is used to display the result of
+# the console.timeEnd() call. Parameters: %1$S is the name of the timer, %2$S
+# is the number of milliseconds.
 timeEnd=%1$S: %2$Sms
 
-# LOCALIZATION NOTE (Autocomplete.blank):
-# This string is used when inputnode string containing anchor doesn't
-# doesn't matches to any property in the content.
+# LOCALIZATION NOTE (Autocomplete.blank): this string is used when inputnode
+# string containing anchor doesn't matches to any property in the content.
 Autocomplete.blank=  <- sense resultat
 
 maxTimersExceeded=S'ha superat el nombre màxim de cronòmetres de la pàgina.
 
-# LOCALIZATION NOTE (JSTerm.updateNotInspectable):
-# This string is used when the user inspects an evaluation result in the Web
-# Console and tries the Update button, but the new result no longer returns an
-# object that can be inspected.
+# LOCALIZATION NOTE (JSTerm.updateNotInspectable): this string is used when
+# the user inspects an evaluation result in the Web Console and tries the
+# Update button, but the new result no longer returns an object that can be
+# inspected.
 JSTerm.updateNotInspectable=Un cop reavaluada l'entrada, el resultat ja no es pot inspeccionar.
 
-# LOCALIZATION NOTE (remoteWebConsolePromptTitle): The title displayed on the
+# LOCALIZATION NOTE (remoteWebConsolePromptTitle): the title displayed on the
 # Web Console prompt asking for the remote host and port to connect to.
 remoteWebConsolePromptTitle=Connexió remota
 
-# LOCALIZATION NOTE (remoteWebConsolePromptMessage): The message displayed on the
-# Web Console prompt asking for the remote host and port to connect to.
+# LOCALIZATION NOTE (remoteWebConsolePromptMessage): the message displayed on
+# the Web Console prompt asking for the remote host and port to connect to.
 remoteWebConsolePromptMessage=Introduïu el nom de l'ordinador central i el número de port (ordinador:port)
 
-# LOCALIZATION NOTE (remoteWebConsoleSelectTabTitle): The title displayed on the
-# Web Console prompt asking the user to pick a tab to attach to.
+# LOCALIZATION NOTE (remoteWebConsoleSelectTabTitle): the title displayed on
+# the Web Console prompt asking the user to pick a tab to attach to.
 remoteWebConsoleSelectTabTitle=Llista de pestanyes - connexió remota
 
-# LOCALIZATION NOTE (remoteWebConsoleSelectTabMessage): The message displayed on the
-# Web Console prompt asking the user to pick a tab to attach to.
+# LOCALIZATION NOTE (remoteWebConsoleSelectTabMessage): the message displayed
+# on the Web Console prompt asking the user to pick a tab to attach to.
 remoteWebConsoleSelectTabMessage=Seleccioneu una de les pestanyes o la consola global
 
-# LOCALIZATION NOTE (listTabs.globalConsoleActor): The string displayed for the
-# global console in the tabs selection.
+# LOCALIZATION NOTE (listTabs.globalConsoleActor): the string displayed for
+# the global console in the tabs selection.
 listTabs.globalConsoleActor=*Consola global*
 
-# LOCALIZATION NOTE (MenuWebconsole.label):
-# This string is displayed in the Tools menu as a shortcut to open the devtools
-# with the web console tab selected.
+# LOCALIZATION NOTE (MenuWebconsole.label): the string displayed in the Tools
+# menu as a shortcut to open the devtools with the Web Console tab selected.
 MenuWebconsole.label=Consola web
 
-# LOCALIZATION NOTE (ToolboxTabWebconsole.label):
-# This string is displayed as the label of the tab in the devtools window.
+# LOCALIZATION NOTE (ToolboxTabWebconsole.label): the string displayed as the
+# label of the tab in the devtools window.
 ToolboxTabWebconsole.label=Consola
 
-# LOCALIZATION NOTE (ToolboxWebconsole.tooltip):
-# This string is displayed in the tooltip of the tab when the web console is
-# displayed inside the developer tools window.
+# LOCALIZATION NOTE (ToolboxWebconsole.tooltip): the string displayed in the
+# tooltip of the tab when the Web Console is displayed inside the developer
+# tools window.
 ToolboxWebconsole.tooltip=Consola web
 
-# LOCALIZATION NOTE (longStringEllipsis): The string displayed after a long
-# string. This string is clickable such that the rest of the string is retrieved
-# from the server.
+# LOCALIZATION NOTE (longStringEllipsis): the string displayed after a long
+# string. This string is clickable such that the rest of the string is
+# retrieved from the server.
 longStringEllipsis=[…]
 
-# LOCALIZATION NOTE (longStringTooLong): The string displayed after the user
+# LOCALIZATION NOTE (longStringTooLong): the string displayed after the user
 # tries to expand a long string.
 longStringTooLong=The string you are trying to view is too long to be displayed by the Web Console.
 
-# LOCALIZATION NOTE (executeEmptyInput): This is displayed when the user tries
-# to execute code, but the input is empty.
-executeEmptyInput=Cap valor per executar.
-
-# LOCALIZATION NOTE (NetworkPanel.fetchRemainingResponseContentLink): This is
-# displayed in the network panel when the response body is only partially
-# available.
+# LOCALIZATION NOTE (NetworkPanel.fetchRemainingResponseContentLink): the
+# string  displayed in the network panel when the response body is only
+# partially available. Parameters: %S is the amount of bytes that need to be
+# fetched.
 NetworkPanel.fetchRemainingResponseContentLink=Recull els %1$S bytes restants
 
-# LOCALIZATION NOTE (NetworkPanel.fetchRemainingRequestContentLink): This is
-# displayed in the network panel when the request body is only partially
-# available.
+# LOCALIZATION NOTE (NetworkPanel.fetchRemainingRequestContentLink): the
+# string displayed in the network panel when the request body is only
+# partially available. Parameters: %S is the amount of bytes that need to be
+# fetched.
 NetworkPanel.fetchRemainingRequestContentLink=Recull el cos de la sol·licitud (%1$S bytes)
 
-# LOCALIZATION NOTE (connectionTimeout): Message displayed when the Remote Web
+# LOCALIZATION NOTE (connectionTimeout): message displayed when the Remote Web
 # Console fails to connect to the server due to a timeout.
 connectionTimeout=S'ha esgotat el temps de la connexió. Verifiqueu els errors de la consola en tots dos sentits cercant possibles missatges d'error. Obriu novament la Consola web i torneu a provar.
 
-# LOCALIZATION NOTE (propertiesFilterPlaceholder): This is the text that
+# LOCALIZATION NOTE (propertiesFilterPlaceholder): this is the text that
 # appears in the filter text box for the properties view container.
 propertiesFilterPlaceholder=Filtra propietats
 
-# LOCALIZATION NOTE (emptyPropertiesList): The text that is displayed in the
+# LOCALIZATION NOTE (emptyPropertiesList): the text that is displayed in the
 # properties pane when there are no properties to display.
 emptyPropertiesList=No hi ha propietats per a mostrar
-
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -10,17 +10,17 @@
 <!ENTITY  copy.accesskey        "C">
 <!ENTITY  selectall.key         "A">
 <!ENTITY  selectall.label       "Selecciona-ho tot">
 <!ENTITY  selectall.accesskey   "a">
 <!ENTITY  closeWindow.key       "w">
 
 <!ENTITY  generalTab            "General">
 <!ENTITY  generalTab.accesskey  "G">
-<!ENTITY  generalURL            "URL:">
+<!ENTITY  generalURL            "Adreça:">
 <!ENTITY  generalType           "Tipus:">
 <!ENTITY  generalMode           "Mode de renderització:">
 <!ENTITY  generalSize           "Mida:">
 <!ENTITY  generalReferrer       "URL referent:">
 <!ENTITY  generalSource         "Origen:">
 <!ENTITY  generalModified       "Modificat:">
 <!ENTITY  generalEncoding       "Codificació:">
 <!ENTITY  generalMetaName       "Nom">
--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -80,26 +80,33 @@
 <!ENTITY clearOfflineAppCacheNow.label   "Neteja-la ara">
 <!ENTITY clearOfflineAppCacheNow.accesskey "e">
 <!ENTITY overrideSmartCacheSize.label    "Ignora la gestió automàtica de la memòria cau">
 <!ENTITY overrideSmartCacheSize.accesskey "g">
 
 <!ENTITY updateTab.label                 "Actualització">
 
 <!ENTITY updateApp.label                 "Actualitzacions del &brandShortName;:">
-<!ENTITY updateAuto.label                "Instal·la les actualitzacions automàticament (és l'opció recomanada per seguretat)">
-<!ENTITY updateAuto.accesskey            "I">
+<!-- Note either updateAuto1 is used or (updateAutoMetro and updateAutoDesktop),
+     so re-using accesss key in updateAuto1 is OK. updateAutoDesktop can be found
+     in preferences.properties -->
+<!ENTITY updateAuto1.label               "Automatically install updates (recommended: improved security)">
+<!ENTITY updateAuto1.accesskey           "A">
+<!ENTITY updateAutoMetro.label           "Automatically update from desktop and Windows 8 style &brandShortName;">
+<!ENTITY updateAutoMetro.accesskey       "s">
 <!ENTITY updateCheck.label               "Comprova les actualitzacions, però pregunta'm si vull instal·lar-les">
 <!ENTITY updateCheck.accesskey           "C">
 <!ENTITY updateManual.label              "No comprovis mai si hi ha actualitzacions (poc recomanable pel risc de seguretat que comporta)">
 <!ENTITY updateManual.accesskey          "N">
 
 <!ENTITY updateAutoAddonWarn.label       "Avisa'm quan això inhabilitarà un dels meus complements">
 <!ENTITY updateAutoAddonWarn.accesskey   "A">
 
+<!ENTITY updateAutoMetroWarn.label       "(Windows 8 style &brandShortName; does not check add-on compatibility)">
+
 <!ENTITY updateHistory.label             "Mostra l'historial d'actualització">
 <!ENTITY updateHistory.accesskey         "h">
 
 <!ENTITY useService.label                "Instal·la les actualitzacions en un segon pla">
 <!ENTITY useService.accesskey            "s">
 
 <!ENTITY updateOthers.label              "Actualitza automàticament:">
 <!ENTITY enableSearchUpdate.label        "Motors de cerca">
@@ -119,14 +126,12 @@
 <!ENTITY certificateTab.label            "Certificats">
 <!ENTITY certSelection.description       "Quan un servidor demani el meu certificat personal:">
 <!ENTITY certs.auto                      "Selecciona'n un automàticament">
 <!ENTITY certs.auto.accesskey            "s">
 <!ENTITY certs.ask                       "Demana-m'ho cada vegada">
 <!ENTITY certs.ask.accesskey             "d">
 <!ENTITY viewCerts.label                 "Visualitza els certificats">
 <!ENTITY viewCerts.accesskey             "V">
-<!ENTITY viewCRLs.label                  "Llistes de revocació">
-<!ENTITY viewCRLs.accesskey              "r">
 <!ENTITY verify2.label                   "Validació">
 <!ENTITY verify2.accesskey               "a">
 <!ENTITY viewSecurityDevices.label       "Dispositius de seguretat">
 <!ENTITY viewSecurityDevices.accesskey   "i">
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -117,16 +117,21 @@ actualDiskCacheSize=La memòria cau de contingut web actualment utilitza %1$S %2$S d'espai de disc
 
 ####Preferences::Advanced::Network
 #LOCALIZATION NOTE: The next string is for the disk usage of the application cache.
 #   e.g., "Your application cache is currently using 200 MB"
 #   %1$S = size
 #   %2$S = unit (MB, KB, etc.)
 actualAppCacheSize=La memòria cau de l'aplicacioó actualment utilitza %1$S %2$S d'espai de disc
 
+###Preferences::Advanced::Update
+#LOCALIZATION NOTE: The next string is for updating in Windows 8 only instead of updateAuto1.label.  %S = brandShortName
+updateAutoDesktop.label=Automatically install updates from desktop %S
+updateAutoDesktop.accessKey=A
+
 syncUnlink.title=Voleu desvincular el dispositiu?
 syncUnlink.label=Aquest dispositiu ha estat desvinculat amb el vostre compte Sync. Totes les vostres dades personals tant al dispositiu com al vostre compte Sync romandran intactes.
 syncUnlinkConfirm.label=Desvincula
 
 # LOCALIZATION NOTE (featureEnableRequiresRestart, featureDisableRequiresRestart, restartTitle): %S = brandShortName
 featureEnableRequiresRestart=Heu de reiniciar el %S per habilitar aquesta característica.
 featureDisableRequiresRestart=Heu de reiniciar el %S per inhabilitar aquesta característica.
 shouldRestartTitle=Reinicia el %S
--- a/browser/chrome/browser/preferences/privacy.dtd
+++ b/browser/chrome/browser/preferences/privacy.dtd
@@ -1,19 +1,19 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY tracking.label                 "Seguiment">
 
-<!ENTITY dntTrackingNopref.label        "No facis saber res als llocs sobre les meves preferències de seguiment.">
+<!ENTITY dntTrackingNopref.label2       "Do not tell sites anything about my tracking preferences">
 <!ENTITY dntTrackingNopref.accesskey    "o">
-<!ENTITY dntTrackingNotOkay.label       "Fes saber als llocs web que no vull que se'm segueixi.">
+<!ENTITY dntTrackingNotOkay.label2      "Tell sites that I do not want to be tracked">
 <!ENTITY dntTrackingNotOkay.accesskey   "n">
-<!ENTITY dntTrackingOkay.label          "Fes saber als llocs web que vull que se'm segueixi.">
+<!ENTITY dntTrackingOkay.label2         "Tell sites that I want to be tracked">
 <!ENTITY dntTrackingOkay.accesskey      "F">
 <!ENTITY doNotTrackInfo.label           "Més informació">
 
 <!ENTITY  history.label                 "Historial">
 
 <!ENTITY  locationBar.label             "Barra d'ubicació">
 
 <!ENTITY  locbar.pre.label              "Quan s'utilitzi la barra d'ubicació, suggereix:">
--- a/browser/pdfviewer/viewer.properties
+++ b/browser/pdfviewer/viewer.properties
@@ -105,19 +105,20 @@ page_scale_auto=Zoom automàtic
 page_scale_actual=Mida real
 
 # Loading indicator messages
 loading_error_indicator=Error
 loading_error=S'ha produït un error en carregar el PDF.
 invalid_file_error=El fitxer PDF no és vàlid o està corrupte.
 missing_file_error=Manca el fitxer PDF.
 
-# LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
+# LOCALIZATION NOTE (text_annotation_type.alt): This is used as a tooltip.
 # "{{type}}" will be replaced with an annotation type from a list defined in
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
-text_annotation_type=[Anotació de {{type}}]
+text_annotation_type.alt=[{{type}} Annotation]
 request_password=El fitxer PDF està protegit per una contrasenya: 
+invalid_password=Invalid Password.
 
 printing_not_supported=Avís: la impressió no és plenament funcional en aquest navegador.
 printing_not_ready=Atenció: el PDF no s'ha acabat de carregar per a imprimir.
 web_fonts_disabled=Les fonts web estan inhabilitades: no es poden incrustar fitxers PDF.
-web_colors_disabled=S'han inhabilitat els colors web
+document_colors_disabled=PDF documents are not allowed to use their own colors: 'Allow pages to choose their own colors' is deactivated in the browser.
--- a/browser/profile/bookmarks.inc
+++ b/browser/profile/bookmarks.inc
@@ -20,17 +20,17 @@
 
 
 #define bookmarks_toolbarfolder_description Afegiu les adreces d'interès a aquesta carpeta per veure-les a la barra de les adreces d'interès
 
 
 # LOCALIZATION NOTE (getting_started):
 
 
-# link title for http://en-US.www.mozilla.com/en-US/firefox/central/
+# link title for https://www.mozilla.org/en-US/firefox/central/
 
 
 #define getting_started Primers passos
 
 
 # LOCALIZATION NOTE (firefox_heading):
 
 
@@ -38,42 +38,42 @@
 
 
 #define firefox_heading Mozilla Firefox
 
 
 # LOCALIZATION NOTE (firefox_help):
 
 
-# link title for http://en-US.www.mozilla.com/en-US/firefox/help/
+# link title for https://www.mozilla.org/en-US/firefox/help/
 
 
 #define firefox_help Ajuda i guies
 
 
 # LOCALIZATION NOTE (firefox_customize):
 
 
-# link title for http://en-US.www.mozilla.com/en-US/firefox/customize/
+# link title for https://www.mozilla.org/en-US/firefox/customize/
 
 
 #define firefox_customize Personalitzeu el Firefox
 
 
 # LOCALIZATION NOTE (firefox_community):
 
 
-# link title for http://en-US.www.mozilla.com/en-US/firefox/community/
+# link title for https://www.mozilla.org/en-US/contribute/
 
 
 #define firefox_community Col·laboreu-hi
 
 
 # LOCALIZATION NOTE (firefox_about):
 
 
-# link title for http://en-US.www.mozilla.com/en-US/about/
+# link title for https://www.mozilla.org/en-US/about/
 
 
 #define firefox_about Quant a Mozilla
 
 
 #unfilter emptyLines
--- a/calendar/chrome/calendar/calendar-event-dialog.dtd
+++ b/calendar/chrome/calendar/calendar-event-dialog.dtd
@@ -148,16 +148,18 @@
 <!-- Main page -->
 
 <!ENTITY event.title.textbox.label                        "Títol:" >
 <!ENTITY event.title.textbox.accesskey                    "T">
 <!ENTITY event.location.label                             "Ubicació:" >
 <!ENTITY event.location.accesskey                         "U">
 <!ENTITY event.categories.label                           "Categoria:">
 <!ENTITY event.categories.accesskey                       "g">
+<!ENTITY event.categories.textbox.label                   "Add a new category" >
+<!ENTITY event.categories.textbox.accesskey               "A">
 <!ENTITY event.calendar.label                             "Calendari:" >
 <!ENTITY event.calendar.accesskey                         "C">
 <!ENTITY event.attendees.label                            "Assistents:" >
 <!ENTITY event.attendees.accesskey                        "A" >
 <!ENTITY event.alldayevent.label                          "Cita de tot el dia" >
 <!ENTITY event.alldayevent.accesskey                      "d">
 <!ENTITY event.from.label                                 "Inici:" >
 <!ENTITY event.from.accesskey                             "I">
new file mode 100644
--- /dev/null
+++ b/calendar/chrome/calendar/calendar-extract.properties
@@ -0,0 +1,294 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE:
+# Strings here are used to create events and tasks with start and end times
+# based on email content.
+# None of the strings are displayed in the user interface.
+#
+# You don't have to fill all from.*, until.*, *.prefix and *.suffix patterns.
+# It's ok to leave some empty.
+# Please consider declensions and gender if your language has them.
+# Don't just translate directly. The number of variants doesn't have to be
+# the same as in en-US. All of 0, 1, 2, etc is allowed in patterns except alphabet.
+# patterns. You can and should add language specific variants.
+#
+# There are two different ways to find a start time text in email:
+# 1) it matches a from.* pattern and does not have end.prefix or end.suffix next to it
+# 2) it matches until.* pattern and has start.prefix or start.suffix next to it
+# Similar inverse logic applies to end times.
+# These rules enable using prefix and suffix values with only start.* or only until.*
+# patterns localized for some languages and thus not having to repeat the same
+# values in both.
+#
+# Patterns are partially space-insensitive.
+# "deadline is" pattern will find both "deadlineis" and "deadline  is"
+# but "deadlineis" won't find "deadline is" or "deadline  is".
+# Therefore you should include all spaces that are valid within a pattern.
+
+# LOCALIZATION NOTE (start.prefix):
+# datetimes with these in front are extracted as start times
+# can be a list of values, separate variants by |
+start.prefix =
+
+# LOCALIZATION NOTE (start.suffix):
+# datetimes followed by these are extracted as start times
+start.suffix = by | until | to | - | till | til | and
+
+# LOCALIZATION NOTE (end.prefix):
+# datetimes followed by these are extracted as end times
+end.prefix = by | until | to | - | till | til | and | due: | due | ends | deadline is | deadline:
+
+# LOCALIZATION NOTE (end.suffix):
+# datetimes followed by these are extracted as end times
+# can be a list of values, separate variants by |
+end.suffix =
+
+# LOCALIZATION NOTE (no.datetime.prefix):
+# datetimes with these in front won't be used
+# specify full words here
+no.datetime.prefix = last week | sent | email | e-mail | instead of | > | unfortunately | in | not
+
+# LOCALIZATION NOTE (no.datetime.suffix):
+# datetimes follwed by these won't be used
+no.datetime.suffix = floor | flr | : | email | e-mail | > | % | usd | dollars
+
+# LOCALIZATION NOTE (from.*):
+# can be a list of values, separate variants by |
+
+# LOCALIZATION NOTE (from.today):
+# must not be empty!
+from.today = today
+
+from.tomorrow = tomorrow
+# LOCALIZATION NOTE (until.*):
+# can be a list of values, separate variants by |
+until.tomorrow =
+
+# LOCALIZATION NOTE (ordinal.date):
+# %1$S = matches numbers 1-31 and number.x
+# should not have "%1$S" as this would match any single number in email to a time
+from.ordinal.date = %1$Sst | %1$Snd | %1$Srd | %1$Sth
+
+# LOCALIZATION NOTE (until.ordinal.date):
+# %1$S = matches numbers 1-31 and number.x
+until.ordinal.date =
+
+from.noon = noon
+until.noon =
+
+# LOCALIZATION NOTE (hour.only):
+# %1$S = matches numbers 0-23 and number.0-number.23
+# should not have "%1$S" as this would match any single number in email to a time
+from.hour = at %1$S | around %1$S | %1$S - | %1$S to
+
+# LOCALIZATION NOTE (until.hour):
+# %1$S = matches numbers 0-23 and number.0-number.23
+# should also list how to find end of a timeframe
+until.hour = - %1$S | to %1$S | until %1$S | by %1$S
+
+# LOCALIZATION NOTE (hour.only.am):
+# %1$S = matches numbers 0-23 and number.0-number.23
+from.hour.am = %1$S am | %1$S a.m
+
+# LOCALIZATION NOTE (until.hour.am):
+# %1$S = matches numbers 0-23 and number.0-number.23
+# should also list how to find end of a timeframe
+until.hour.am =
+
+# LOCALIZATION NOTE (hour.only.pm):
+# %1$S = matches numbers 0-23 and number.0-number.23
+from.hour.pm = %1$S pm | %1$S p.m | %1$S p
+
+# LOCALIZATION NOTE (until.hour.pm):
+# %1$S = matches numbers 0-23 and number.0-number.23
+# should also list how to find end of a timeframe
+until.hour.pm =
+
+# LOCALIZATION NOTE (from.half.hour.before):
+# denotes times 30 minutes before next full hour
+from.half.hour.before = half an hour before %1$S
+
+# LOCALIZATION NOTE (until.half.hour.before):
+# denotes times 30 minutes before next full hour
+until.half.hour.before =
+
+# LOCALIZATION NOTE (from.half.hour.after):
+# denotes times 30 minutes after last full hour
+from.half.hour.after = half past %1$S
+
+# LOCALIZATION NOTE (until.half.hour.after):
+# denotes times 30 minutes after last full hour
+until.half.hour.after =
+
+# LOCALIZATION NOTE (hour.minutes):
+# %1$S = matches numbers 0-23
+# %2$S = matches numbers 0-59
+from.hour.minutes = %1$S:%2$S | at %1$S%2$S
+
+# LOCALIZATION NOTE (until.hour.minutes):
+# %1$S = matches numbers 0-23
+# %2$S = matches numbers 0-59
+until.hour.minutes =
+
+# LOCALIZATION NOTE (hour.minutes.am):
+# %1$S = matches numbers 0-23
+# %2$S = matches numbers 0-59
+from.hour.minutes.am = %1$S:%2$S am | %1$S:%2$S a.m
+
+# LOCALIZATION NOTE (until.hour.minutes.am):
+# %1$S = matches numbers 0-23
+# %2$S = matches numbers 0-59
+until.hour.minutes.am =
+
+# LOCALIZATION NOTE (hour.minutes.pm):
+# %1$S = matches numbers 0-23
+# %2$S = matches numbers 0-59
+from.hour.minutes.pm = %1$S:%2$S pm | %1$S:%2$S p.m | %1$S:%2$S p
+
+# LOCALIZATION NOTE (until.hour.minutes.pm):
+# %1$S = matches numbers 0-23
+# %2$S = matches numbers 0-59
+until.hour.minutes.pm =
+
+# LOCALIZATION NOTE (monthname.day):
+# %1$S = matches numbers 1-31 and number.x
+# %2$S = matches monthname
+from.monthname.day = %1$S %2$S | %2$S %1$S | %2$S %1$Sst | %2$S %1$Snd | %2$S %1$Srd | %2$S %1$Sth | %1$Sst of %2$S | %1$Snd of %2$S | %1$Srd of %2$S | %1$Sth of %2$S
+
+# LOCALIZATION NOTE (until.monthname.day):
+# %1$S = matches numbers 1-31
+# %2$S = matches monthname
+until.monthname.day =
+
+# LOCALIZATION NOTE (month.day):
+# %1$S = matches numbers 1-31
+# %2$S = matches numbers 1-12
+from.month.day = %2$S/%1$S
+
+# LOCALIZATION NOTE (until.month.day):
+# %1$S = matches numbers 1-31 and number.x
+# %2$S = matches numbers 1-12
+until.month.day =
+
+# LOCALIZATION NOTE (year.month.day):
+# %1$S = matches numbers 1-31
+# %2$S = matches numbers 1-12
+# %3$S = matches 2/4 numbers
+from.year.month.day = %2$S/%1$S/%3$S | %3$S/%2$S/%1$S | %3$S-%2$S-%1$S
+
+# LOCALIZATION NOTE (until.year.month.day):
+# %1$S = matches numbers 1-31
+# %2$S = matches numbers 1-12
+# %3$S = matches 2/4 numbers
+until.year.month.day =
+
+# LOCALIZATION NOTE (year.monthname.day):
+# %1$S = matches numbers 1-31
+# %2$S = matches monthname
+# %3$S = matches 2/4 numbers
+from.year.monthname.day = %1$S %2$S %3$S | %1$Sst %2$S %3$S | %1$Snd %2$S %3$S | %1$Srd %2$S %3$S | %1$Sth %2$S %3$S | %2$S %1$S, %3$S | %3$S-%2$S-%1$S
+
+# LOCALIZATION NOTE (until.year.monthname.day):
+# %1$S = matches numbers 1-31
+# %2$S = matches monthname
+# %3$S = matches 2/4 numbers
+until.year.monthname.day =
+
+# LOCALIZATION NOTE (duration.*):
+# can be a list of values, separate variants by |
+
+# LOCALIZATION NOTE (duration.minutes):
+# %1$S = matches 1/2 numbers and number.0 - and number.31
+duration.minutes = %1$S minutes | %1$S min | %1$S mins
+
+# LOCALIZATION NOTE (duration.hours):
+# %1$S = matches 1/2 numbers and number.0 - and number.31
+duration.hours = %1$S hour | %1$S hours
+
+# LOCALIZATION NOTE (duration.days):
+# %1$S = matches 1/2 numbers and number.0 - and number.31
+duration.days = %1$S days
+
+# LOCALIZATION NOTE (month.*):
+# can be a list of values, separate variants by |
+month.1 = january | jan | jan.
+month.2 = february | feb | feb.
+month.3 = march | mar | mar.
+month.4 = april | apr | apr.
+month.5 = may
+month.6 = june | jun | jun.
+month.7 = july | jul | jul.
+month.8 = august | aug | aug.
+month.9 = september | sep | sep. | sept.
+month.10 = october | oct | oct.
+month.11 = november | nov | nov.
+month.12 = december | dec | dec.
+
+# LOCALIZATION NOTE (weekday.*):
+# used to derive start date based on weekdays mentioned
+# can be a list of values, separate variants by |
+# LOCALIZATION NOTE (weekday.0):
+# Regardless of what the first day of the week is in your country, 0 is Sunday here.
+from.weekday.0 = sunday | sundays
+from.weekday.1 = monday | mondays
+from.weekday.2 = tuesday | tuesdays
+from.weekday.3 = wednesday | wednesdays
+from.weekday.4 = thursday | thursdays
+from.weekday.5 = friday | fridays
+from.weekday.6 = saturday | saturdays
+
+# LOCALIZATION NOTE (until.weekday.*):
+# used to derive end date based on weekdays mentioned
+# can be a list of values, separate variants by |
+# LOCALIZATION NOTE (until.weekday.0):
+# Regardless of what the first day of the week is in your country, 0 is Sunday here.
+until.weekday.0 =
+until.weekday.1 =
+until.weekday.2 =
+until.weekday.3 =
+until.weekday.4 =
+until.weekday.5 =
+until.weekday.6 =
+
+# LOCALIZATION NOTE (number.*):
+# used within other patterns to understand dates where day of month isn't written with digits
+# can be a list of values, separate variants by |
+number.0 = zero
+number.1 = one | first
+number.2 = two | second
+number.3 = three | third
+number.4 = four | fourth
+number.5 = five | fifth
+number.6 = six | sixth
+number.7 = seven | seventh
+number.8 = eight | eighth
+number.9 = nine | ninth
+number.10 = ten | tenth
+number.11 = eleven | eleventh
+number.12 = twelve | twelfth
+number.13 = thirteen | thirteenth
+number.14 = fourteen | fourteenth
+number.15 = fifteen | fifteenth
+number.16 = sixteen | sixteenth
+number.17 = seventeen | seventeenth
+number.18 = eighteen | eighteenth
+number.19 = nineteen | nineteenth
+number.20 = twenty | twentieth
+number.21 = twenty one | twenty first
+number.22 = twenty two | twenty second
+number.23 = twenty three | twenty third
+number.24 = twenty four | twenty fourth
+number.25 = twenty five | twenty fifth
+number.26 = twenty six | twenty sixth
+number.27 = twenty seven | twenty seventh
+number.28 = twenty eight | twenty eighth
+number.29 = twenty nine | twenty ninth
+number.30 = thirty | thirtieth
+number.31 = thirty one | thirty first
+
+# LOCALIZATION NOTE (alphabet):
+# list all lower and uppercase letters if your language has an alphabet
+# otherwise leave it empty
+alphabet = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
--- a/calendar/chrome/calendar/calendar.dtd
+++ b/calendar/chrome/calendar/calendar.dtd
@@ -344,8 +344,14 @@
 <!ENTITY calendar.print.taskswithnoduedate.label "Tasques sense data de venciment">
 <!ENTITY calendar.print.completedtasks.label "Tasques acabades">
 <!-- Error reporting -->
 
 <!ENTITY calendar.error.detail "Detalls…">
 <!ENTITY calendar.error.code "Codi d'error:">
 <!ENTITY calendar.error.description "Descripció:">
 <!ENTITY calendar.error.title "S'ha produït un error">
+<!-- Extract buttons in message header -->
+
+<!ENTITY calendar.extract.event.button         "Add as event">
+<!ENTITY calendar.extract.task.button          "Add as task">
+<!ENTITY calendar.extract.event.button.tooltip "Extract calendaring information from the message and add it to your calendar as an event">
+<!ENTITY calendar.extract.task.button.tooltip  "Extract calendaring information from the message and add it to your calendar as a task">
--- a/calendar/chrome/calendar/calendar.properties
+++ b/calendar/chrome/calendar/calendar.properties
@@ -312,16 +312,17 @@ storageName=Local (SQLite)
 htmlPrefixTitle=Títol
 htmlPrefixWhen=Quan
 htmlPrefixLocation=Ubicació
 htmlPrefixDescription=Descripció
 htmlTaskCompleted=%1$S (acabada)
 
 # Categories
 addCategory=Afegeix una categoria
+multipleCategories=Multiple Categories
 
 today=Avui
 tomorrow=Demà
 yesterday=Ahir
 
 #Today pane
 eventsonly=Cites
 eventsandtasks=Cites i tasques
@@ -590,8 +591,13 @@ deleteTaskAccesskey=S
 deleteItemLabel=Suprimeix
 deleteItemMessage=Segur que voleu suprimir-ho?
 deleteItemAccesskey=S
 deleteEventLabel=Suprimeix la cita
 deleteEventMessage=Segur que voleu suprimir aquesta cita?
 deleteEventAccesskey=S
 
 calendarPropertiesEveryMinute=Cada minut;Cada #1 minuts
+
+# LOCALIZATION NOTE (extractUsing)
+# Used in message header
+#    %1$S will be replaced with language name from languageNames.properties
+extractUsing=Using %1$S
--- a/calendar/chrome/calendar/preferences/preferences.dtd
+++ b/calendar/chrome/calendar/preferences/preferences.dtd
@@ -1,16 +1,9 @@
 <!-- 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  prefWindow.titleWin     "Opcions">
-<!ENTITY  prefWindow.titleGNOME   "Preferències del &brandShortName;">
-<!ENTITY  prefWindow.styleWin     "width: 52em; height: 42em;">
-<!ENTITY  prefWindow.styleMac     "width: 53em;">
-<!ENTITY  prefWindow.styleGNOME   "width: 53em; height: 39.5em;">
-
 <!ENTITY  paneGeneral.title       "General">
 <!ENTITY  paneAlarms.title        "Recordatoris">
 <!ENTITY  paneCategories.title    "Categories">
 <!ENTITY  paneViews.title         "Vistes">
 <!ENTITY  paneTimezones.title     "Fus horari">
-<!ENTITY  paneAdvanced.title      "Avançat">
--- a/dom/chrome/accessibility/AccessFu.properties
+++ b/dom/chrome/accessibility/AccessFu.properties
@@ -105,16 +105,17 @@ tabReload      =      s'està tornant a carregar
 # Object states
 stateChecked     =    verificat
 stateNotChecked  =    no verificat
 stateExpanded    =    expandit
 stateCollapsed   =    reduït
 stateUnavailable =    no disponible
 stateRequired    =    requerit
 stateTraversed   =    visitat
+stateHasPopup    =    té una finestra emergent
 
 # App modes
 editingMode    =      s'està editant
 navigationMode =      s'està navegant
 
 # Quick navigation modes
 quicknav_Simple      = Per defecte
 quicknav_Anchor      = Àncores
@@ -127,8 +128,16 @@ quicknav_Heading     = Capçaleres
 quicknav_ListItem    = Elements de la llista
 quicknav_Link        = Enllaços
 quicknav_List        = Llistes
 quicknav_PageTab     = Pestanyes de pàgina
 quicknav_RadioButton = Botons d'opció
 quicknav_Separator   = Separadors
 quicknav_Table       = Taules
 quicknav_Checkbox    = Caselles de selecció
+
+# Shortened role names for braille
+linkAbbr           =       enl
+pushbuttonAbbr     =       botó
+passwordtextAbbr   =       txtcontr
+imagemapAbbr       =       mapimg
+figureAbbr         =       fig
+textareaAbbr       =       àreatxt
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -11,22 +11,16 @@ DebugScriptButton=Script de depuració
 WaitForScriptButton=Continua
 DontAskAgain=No m'ho tornis a &demanar
 JSURLLoadBlockedWarning=S'ha produït un intent de carregar un javascript: l'URL d'un \nordinador central en una finestra, que mostra el \ncontingut d'un altre, ha estat blocat\n pel gestor de seguretat.
 WindowCloseBlockedWarning=Els scripts no poden tancar finestres que no han obert.
 OnBeforeUnloadTitle=N'esteu segur?
 OnBeforeUnloadMessage=Aquesta pàgina us demana que confirmeu que voleu sortir-ne. Les dades que heu introduït no es desaran.
 OnBeforeUnloadStayButton=Roman a la pàgina
 OnBeforeUnloadLeaveButton=Surt de la pàgina
-DocumentAllUsed=S'ha utilitzat una propietat document.all no estàndard. Utilitzeu l'estàndard del W3C document.getElementById().
-UseOfCaptureEventsWarning=captureEvents() està en desús. Per actualitzar el vostre codi, utilitzeu el mètode DOM 2 addEventListener(). Per a més ajuda, visiteu http://developer.mozilla.org/en/docs/DOM:element.addEventListener
-UseOfReleaseEventsWarning=releaseEvents() està en desús. Per actualitzar el vostre codi, utilitzeu el mètode DOM 2 removeEventListener(). Per a més ajuda, visiteu http://developer.mozilla.org/en/docs/DOM:element.removeEventListener
-UseOfRouteEventWarning=routeEvent() està en desús. Per actualitzar el vostre codi, utilitzeu el mètode DOM 2 dispatchEvent(). Per a més ajuda, visiteu http://developer.mozilla.org/en/docs/DOM:element.dispatchEvent
-UseOfPreventBubbleWarning=Event=%S, preventBubble() està en desús. Utilitzeu millor l'estàndard de W3C stopPropagation().
-UseOfPreventCaptureWarning=Event=%S, preventCapture() està en desús. Utilitzeu millor l'estàndard de W3C stopPropagation().
 UseOfDOM3LoadMethodWarning=Document.load() està en desús. Per actualitzar el vostre codi, utilitzeu l'objecte DOM XMLHttpRequest. Per a més ajuda, consulteu https://developer.mozilla.org/en/XMLHttpRequest
 UnexpectedCanvasVariantStyle=canvas: s'ha ignorat un intent de definir strokeStyle o fillStyle a un valor que no és ni una cadena, ni un CanvasGradient, ni tampoc un CanvasPattern.
 EmptyGetElementByIdParam=S'ha passat una cadena en blanc a getElementById().
 LowMemoryTitle=Avís: Memòria baixa
 LowMemoryMessage=S'ha aturat un script a la pàgina perquè l'entorn es troba en condicions de baixa memòria.
 SpeculationFailed=S'ha escrit un arbre no balancejat fent servir document.write(), provocant que les dades de la xarxa hagin de tornar-se a analitzar. Per a més informació, consulteu https://developer.mozilla.org/en/Optimizing_Your_Pages_for_Speculative_Parsing
 DocumentWriteIgnored=S'ha ignorat una crida a document.write() des d'un script extern carregat asíncronament.
 FormValidationTextTooLong=Escurceu el text a %S caràcters o menys (actualment en feu servir %S).
@@ -125,13 +119,17 @@ PluginHangUITitle=Atenció: el connector no respon
 PluginHangUIMessage=%S està ocupat, o pot haver deixat de respondre. Podeu aturar-lo ara, o continuar i veure si acaba.
 PluginHangUIWaitButton=Continua
 PluginHangUIStopButton=Atura el connector
 # LOCALIZATION NOTE: Do not translate "mozHidden", "mozVisibilityState", "hidden", or "visibilityState"
 PrefixedVisibilityApiWarning='mozHidden' i 'mozVisibilityState' estan en desús. En lloc, utilitzeu 'hidden' i 'visibilityState' sense prefix.
 # LOCALIZATION NOTE: Do not translate "NodeIterator" or "detach()".
 NodeIteratorDetachWarning=Cridar detach() en un NodeIterator ja no té cap efecte.
 # LOCALIZATION NOTE: Do not translate "Mozilla Audio Data API" and "Web Audio API".
-MozAudioDataWarning=La Mozilla Audio Data API està desfassada. Utilitzeu la Web Audio API.
+MozAudioDataWarning=L'API Mozilla Audio Data està desfasada. En lloc, utilitzeu l'API Web Audio.
 # LOCALIZATION NOTE: Do not translate "LenientThis" and "this"
 LenientThisWarning=S'ignora l'obtenció o l'assignació de la propietat que té [LenientThis] perquè l'objecte «this» és incorrecte.
 # LOCALIZATION NOTE: Do not translate "nsIDOMWindowUtils", "getWindowWithOuterId", or "nsIWindowMediator"
 GetWindowWithOuterIdWarning=L'ús de nsIDOMWindowUtils.getOuterWindowWithId() està desfasat. Utilitzeu el mètode del mateix nom en nsIWindowMediator.
+# LOCALIZATION NOTE: Do not translate "getPreventDefault" or "defaultPrevented".
+GetPreventDefaultWarning=L'ús de getPreventDefault() està obsolet.  Utilitzeu el mètode defaultPrevented.
+# LOCALIZATION NOTE: Do not translate "getUserData", "setUserData", "WeakMap", or "element.dataset".
+GetSetUserDataWarning=L'ús de getUserData() o setUserData() està obsolet.  Utilitzeu el mètode WeakMap o element.dataset.
--- a/dom/chrome/layout/css.properties
+++ b/dom/chrome/layout/css.properties
@@ -15,16 +15,17 @@ PEExpectEndValue=S'esperava un final de valor però s'ha trobat «%1$S».
 PERuleTrailing=S'esperava un final de regla però no s'ha trobat «%1$S».
 PESkipAtRuleEOF2=Final de la regla
 PEUnknownAtRule=No s'ha reconegut la regla-a o s'ha produït un error en reconèixer la regla-a «%1$S».
 PECharsetRuleEOF=cadena de joc de caràcters a la regla @charset
 PECharsetRuleNotString=S'esperava una cadena de joc de caràcters, però s'ha trobat «%1$S».
 PEGatherMediaEOF=final de la llista de mitjans a @import o de la regla @media
 PEGatherMediaNotComma=S'esperava «,» de la llista de mitjans, però s'ha trobat «%1$S».
 PEGatherMediaNotIdent=S'esperava un identificador de la llista, però s'ha trobat «%1$S».
+PEGatherMediaReservedMediaType=S'ha trobat la paraula clau reservada «%1$S» durant la recerca del fitxer multimèdia.
 PEImportNotURI=S'esperava un URI a la regla @import, però s'ha trobat «%1$S».
 PEImportBadURI=L'URI en la regla @import no és vàlida: «%1$S».
 PEImportUnexpected=S'ha trobat «%1$S» de forma inesperada dins @import.
 PEGroupRuleEOF2=final de la regla @media, @suport o @-moz-document
 PEGroupRuleNestedAtRule=No es permet la regla %1$S des de dins de la regla @media o @-moz-document.
 PEMozDocRuleBadFunc=S'esperava url(), url-prefix(), o domain() a la regla @-moz-document, però s'ha trobat «%1$S».
 PEMozDocRuleNotURI=S'esperava un URI a la regla @-moz-document, però s'ha trobat «%1$S».
 PEMozDocRuleNotString=S'esperava una cadena a la funció regexp() de la regla @-moz-document però s'ha trobat «%1$S».
@@ -110,16 +111,27 @@ PEMQExpectedExpressionStart=S'esperava «(» per iniciar l'expressió de consulta multimèdia, però s'ha trobat «%1$S».
 PEMQExpressionEOF=contingut de l'expressió de consulta multimèdia
 PEMQExpectedFeatureName=S'esperava un nom de característica multimèdia, però s'ha trobat «%1$S».
 PEMQExpectedFeatureNameEnd=S'esperava «:» o «)» després d'un nom de característica multimèdia, però s'ha trobat «%1$S».
 PEMQNoMinMaxWithoutValue=Les característiques multimèdia amb min- o max- cal que tinguin un valor.
 PEMQExpectedFeatureValue=S'ha trobat un valor no vàlid per a la característica multimèdia.
 PEBadFontBlockStart=S'esperava «{» per començar la regla @font-face, però s'ha trobat «%1$S».
 PEBadFontBlockEnd=S'esperava «}» per acabar la regla @font-face, però s'ha trobat «%1$S».
 PEAnonBoxNotAlone=No s'esperava un quadre anònim.
+PEFFVUnexpectedEOF=Final no esperat de la regla @font-feature-values.
+PEFFVBlockStart=S'esperava un «{» d'obertura de la regla @font-feature-values, però s'ha trobat «%1$S».
+PEFFVValueSetStart=S'esperava un «{» d'obertura del conjunt de valors de la característica, però s'ha trobat «%1$S».
+PEFFVNoFamily=S'espera una llista de famílies de tipus de lletra de @font-feature-values, però s'ha trobat «%1$S».
+PEFFVUnexpectedBlockEnd=S'esperava «}» per finalitzar la regla @font-feature-values, però s'ha trobat «%1$S».
+PEFFVUnknownFontVariantPropValue=Valor desconegut «%1$S» de la propietat font-variant,
+PEFFVExpectedIdent=S'esperava un identificador, però s'ha trobat «%1$S».
+PEFFVExpectedValue=S'esperava un valor enter no negatiu, però s'ha trobat «%1$S».
+PEFFVTooManyValues=Massa valors del tipus de característica «%1$S».
+PEFFVGenericInFamilyList=La llista de famílies no pot contenir noms genèrics de famílies de tipus de lletra.
+PEFFVValueDefinitionTrailing=S'esperava un final de la definició del valor, però s'ha trobat «%1$S».
 PEBadDirValue=S'esperava «ltr» o «rtl» en el selector de direcció, però s'ha trobat «%1$S».
 PESupportsConditionStartEOF2=«not», «(», o funció
 PESupportsConditionInParensEOF=«(»
 PESupportsConditionNotEOF=«not»
 PESupportsWhitespaceRequired=S'esperava un espai en blanc després de «not», «and» o «or»
 PESupportsConditionExpectedOpenParenOrFunction=S'esperava «)» o una funció mentre l'anàlisi dóna suport a la condició però s'ha trobat «%1$S».
 PESupportsConditionExpectedCloseParen=S'esperava «)» mentre l'anàlisi dóna suport a la condició però s'ha trobat «%1$S».
 PESupportsConditionExpectedStart2=S'esperava «not», «(» o una funció mentre l'anàlisi dóna suport a la condició però s'ha trobat «%1$S».
--- a/dom/chrome/plugins.properties
+++ b/dom/chrome/plugins.properties
@@ -9,11 +9,13 @@
 title_label=Quant als connectors
 installedplugins_label=Connectors instal·lats
 nopluginsareinstalled_label=No s'han trobat connectors instal·lats
 findpluginupdates_label=Cerca actualitzacions dels connectors instal·lats a
 file_label=Fitxer:
 path_label=Camí:
 version_label=Versió:
 state_label=Estat:
+state_enabled=Habilitat
+state_disabled=Inhabilitat
 mimetype_label=Tipus MIME
 description_label=Descripció
 suffixes_label=Sufixos
--- a/mail/chrome/messenger-newsblog/am-newsblog.dtd
+++ b/mail/chrome/messenger-newsblog/am-newsblog.dtd
@@ -9,14 +9,16 @@
 <!ENTITY loginAtStartup.label "En iniciar, comprova si hi ha nous articles"> 
 <!ENTITY loginAtStartup.accesskey "i">
 
 <!ENTITY useQuickMode.label "Per defecte, mostra el resum de l'article en comptes de carregar la pàgina web"> 
 <!ENTITY useQuickMode.accesskey "f">
 
 <!ENTITY manageSubscriptions.label "Gestiona les subscripcions…"> 
 <!ENTITY manageSubscriptions.accesskey "G">
+
+<!ENTITY feedWindowTitle.label "Feed Account Wizard">
 <!-- entities from rss.rdf -->
 
 <!ENTITY feeds.accountName "Blogs i canals de notícies">
 <!ENTITY feeds.wizardShortName "Canals">
 <!ENTITY feeds.wizardLongName "Blogs i canals de notícies">
 <!ENTITY feeds.wizardLongName.accesskey "B">
--- a/mail/chrome/messenger/AccountManager.dtd
+++ b/mail/chrome/messenger/AccountManager.dtd
@@ -7,16 +7,18 @@
 <!ENTITY accountManagerTitle.label "Paràmetres del compte">
 
 <!ENTITY accountActionsButton.label "Accions del compte">
 <!ENTITY accountActionsButton.accesskey "A">
 <!ENTITY addMailAccountButton.label "Afegeix un compte de correu…">
 <!ENTITY addMailAccountButton.accesskey "A">
 <!ENTITY addIMAccountButton.label "Afegeix un compte de xat…">
 <!ENTITY addIMAccountButton.accesskey "x">
+<!ENTITY addFeedAccountButton.label "Add Feed Account…">
+<!ENTITY addFeedAccountButton.accesskey "F">
 <!ENTITY addOtherAccountButton.label "Afegeix un altre tipus de compte…">
 <!ENTITY addOtherAccountButton.accesskey "t">
 <!ENTITY setDefaultButton.label "Defineix com a predeterminat">
 <!ENTITY setDefaultButton.accesskey "f">
 <!ENTITY removeButton.label "Suprimeix el compte">
 <!ENTITY removeButton.accesskey "i">
 <!-- AccountManager.xul -->
 <!-- LOCALIZATION NOTE : this is part of an inline-style attribute on the account
--- a/mail/chrome/messenger/aboutDialog.dtd
+++ b/mail/chrome/messenger/aboutDialog.dtd
@@ -42,16 +42,26 @@
 <!-- LOCALIZATION NOTE (update.manual.start,update.manual.end): update.manual.start and update.manual.end
      all go into one line and have an anchor in between with text that is the same as the link to a site
      to download the latest version of Firefox (e.g. http://www.firefox.com). As this is all in one line,
      try to make the localized text short (see bug 596813 for screenshots). -->
 
 <!ENTITY update.manual.start        "Baixeu la ">
 <!ENTITY update.manual.linkText     "darrera versió">
 <!ENTITY update.manual.end          "">
+<!-- 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. ">
+<!ENTITY update.unsupported.linkText "Learn more">
+<!ENTITY update.unsupported.end      "">
 <!-- LOCALIZATION NOTE (update.downloading.start,update.downloading.end): update.downloading.start and 
      update.downloading.end all go into one line, with the amount downloaded inserted in between. As this
      is all in one line, try to make the localized text short (see bug 596813 for screenshots). The — is
      the "em dash" (long dash).
      example: Downloading update — 111 KB of 13 MB -->
 
 <!ENTITY update.downloading.start   "S'està baixant l'actualització — ">
 <!ENTITY update.downloading.end     "">
--- a/mail/chrome/messenger/am-server-advanced.dtd
+++ b/mail/chrome/messenger/am-server-advanced.dtd
@@ -20,16 +20,14 @@
 <!ENTITY personalNamespace.accesskey "p">
 <!ENTITY publicNamespace.label "Públic (compartit):">
 <!ENTITY publicNamespace.accesskey "b">
 <!ENTITY otherUsersNamespace.label "Altres usuaris:">
 <!ENTITY otherUsersNamespace.accesskey "u">
 <!ENTITY overrideNamespaces.label "Permet que el servidor substitueixi aquests espais de noms">
 <!ENTITY overrideNamespaces.accesskey "a">
 <!ENTITY pop3Desc.label "Quan es baixi el correu POP d'aquest servidor, utilitza la carpeta següent per al correu nou:" >
-<!ENTITY globalInbox.label "Safata d'entrada global (compte de les carpetes locals)">
-<!ENTITY globalInbox.accesskey "g">
 <!ENTITY accountDirectory.label "Safata d'entrada per al compte d'aquest servidor">
 <!ENTITY accountDirectory.accesskey "S">
 <!ENTITY deferToServer.label "Una safata d'entrada per cada compte diferent">
 <!ENTITY deferToServer.accesskey "f">
 <!ENTITY deferGetNewMail.label "Inclou aquest servidor en comprovar si hi ha correu nou">
 <!ENTITY deferGetNewMail.accesskey "I">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/folderWidgets.properties
@@ -0,0 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE(globalInbox)
+# %S=name of the Local folders account
+globalInbox=Global Inbox (%S)
--- a/mail/chrome/messenger/localMsgs.properties
+++ b/mail/chrome/messenger/localMsgs.properties
@@ -14,211 +14,134 @@ pop3EnterPasswordPromptTitle=Introduïu la vostra contrasenya
 pop3EnterPasswordPrompt=Introduïu la vostra contrasenya per a %1$S del servidor %2$S:
 
 # LOCALIZATION NOTE(pop3PreviouslyEnteredPasswordIsInvalidPrompt): Do not
 # translate the words "%1$S" and "%2$S" below. Place the word %1$S where the
 # user name should appear, and %2$S where the host name should appear.
 pop3PreviouslyEnteredPasswordIsInvalidPrompt=Introduïu correctament la vostra contrasenya per a %1$S del servidor %2$S:
 
 # Status - Downloading message n of m to account
-## @name receivingMsgs
-## @loc None
 #LOCALIZATION NOTE (receivingMsgs): Do not translate %1$S, %2$S, or %3$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;
 # Place %3$S where the account name should appear.
 receivingMsgs=S'està baixant el missatge %1$S de %2$S a %3$S
 
 # Status - connecting to host
-## @name hostContacted
-## @loc None
 #LOCALIZATION NOTE : Do not translate %1$S in the following line.
 # Place %1$S where the account name should appear
 hostContacted=Connexió: S'ha contactat amb el servidor %1$S, s'està enviant la informació d'autenticació…
 
 # Status - no messages to download 
-## @name noMessages
-## @loc None
 #LOCALIZATION NOTE : Do not translate %1$S in the following line.
 # Place %1$S where the account name should appear
 noMessages=No hi ha missatges nous a %1$S.
 
 # Status - messages received after the download
-## @name receivedMessages
-## @loc None
 #LOCALIZATION NOTE : Do not translate %1$S, %2$S or %3$S in the following line.
 # %1$S will receive the number of messages received
 # %2$S will receive the total number of messages
 # Place %3$S where the account name should appear
 receivedMessages=El compte %3$S ha rebut %1$S missatges de %2$S que hi ha en total
 
-## @name MK_POP3_OUT_OF_DISK_SPACE
-## @loc None
--321=No hi ha prou espai al disc per baixar nous missatges. Intenteu suprimir missatges antics, buidar la carpeta Paperera i compactar les carpetes de correu, i torneu-ho a provar.
+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 - parsing folder
-## @name LOCAL_STATUS_SELECTING_MAILBOX
-## @loc None
-#LOCALIZATION NOTE (4000): Do not translate %s in the following line.
-# Place the word %s where the name of the mailbox should appear
-4000=S'està construint el fitxer de resum per a %S…
+#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…
 
 # Status - parsing folder
-## @name LOCAL_STATUS_DOCUMENT_DONE
-## @loc None
-4001=Fet
+localStatusDocumentDone=Done
 
 # Status - pop3 server error
-## @name POP3_SERVER_ERROR
-## @loc None
-#LOCALIZATION NOTE (4003): Do not translate POP3 in the following line.
-4003=S'ha produït un error amb el servidor de correu POP3.
+#LOCALIZATION NOTE (pop3ServerError): Do not translate POP3 in the following line.
+pop3ServerError=An error occurred with the POP3 mail server.
 
 # Status - pop3 user name failed
-## @name POP3_USERNAME_FAILURE
-## @loc None
-4004=L'ordre USER no ha tingut èxit.
+pop3UsernameFailure=Sending of username did not succeed.
 
 # Status - password failed
-## @name POP3_PASSWORD_FAILURE
-## @loc None
-4005=L'ordre PASS no ha tingut èxit.
+pop3PasswordFailure=Sending of password did not succeed.
 
 # Status - write error occurred
-## @name POP3_MESSAGE_WRITE_ERROR
-## @loc None
-4006=No es pot escriure el correu a la bústia. Assegureu-vos que teniu privilegis d'escriptura del sistema de fitxers i que teniu prou espai al disc per copiar-hi la bústia.
+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.
 
 # Status - retr failure from the server
-## @name POP3_RETR_FAILURE
-## @loc None
-# LOCALIZATION NOTE(4012): Do not translate the word "POP3" below.
-4012=L'ordre RETR no ha tingut èxit.
+pop3RetrFailure=The RETR command did not succeed. Error retrieving a message.
 
 # Status - password undefined 
-## @name POP3_PASSWORD_UNDEFINED
-## @loc None
-4013=S'ha produït un error en recuperar la contrasenya de correu.
+pop3PasswordUndefined=Error getting mail password.
 
 # Status - username undefined 
-## @name POP3_USERNAME_UNDEFINED
-## @loc None
-4014=No heu indicat cap nom d'usuari per a aquest servidor. Indiqueu-ne un al menú de configuració de comptes i torneu-ho a provar.
+pop3UsernameUndefined=You have not supplied a username for this server.  Please provide one in the account setup menu and try again.
 
 # Status - list failure
-## @name POP3_LIST_FAILURE
-## @loc None
-# LOCALIZATION NOTE(4015): Do not translate the word "POP3" below.
-4015=L'ordre LIST no ha tingut èxit.
+pop3ListFailure=The LIST command did not succeed. Error getting the ID and size of a message.
 
 # Status - delete error 
-## @name POP3_DELE_FAILURE
-## @loc None
-# LOCALIZATION NOTE(4016): Do not translate the word "POP3" below.
-4016=L'ordre DELE no ha tingut èxit.
+pop3DeleFailure=The DELE command did not succeed. Error marking a message as deleted.
 
 # Status - stat failed
-## @name POP3_STAT
-## @loc None
-4024= L'ordre STAT no ha tingut èxit.
-
-## @name POP3_SERVER_SAID
-## @loc None
-4025= El servidor de correu %S ha respost:
+pop3StatFail=The STAT command did not succeed. Error getting message number and sizes.
 
-## @name COPYING_MSGS_STATUS
-## @loc None
-4027=S'estan copiant %S de %S missatges a %S
+#LOCALIZATION NOTE (pop3ServerSaid): Do not remove the leading space during translation.
+pop3ServerSaid= Mail server %S responded: 
 
-## @name MOVING_MSGS_STATUS
-## @loc None
-4028=S'estan movent %S de %S missatges a %S
+copyingMessagesStatus=Copying %S of %S messages to %S
+
+movingMessagesStatus=Moving %S of %S messages to %S
 
 # Status - write error occurred
-## @name POP3_MESSAGE_FOLDER_BUSY
-## @loc None
-4029=Aquesta carpeta s'està processant. Espereu fins que el processament acabi per rebre els missatges.
+pop3MessageFolderBusy=This folder is being processed. Please wait until processing is complete to get messages.
+
+movemailCantOpenSpoolFile=Unable to open mail spool file %S.
 
-## @name MOVEMAIL_CANT_OPEN_SPOOL_FILE
-## @loc None
-4033=No es pot obrir el fitxer de la impressora del correu %S.
+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.
 
-## @name MOVEMAIL_CANT_CREATE_LOCK
-## @loc None
-4034=No es pot crear el fitxer de blocatge %S. Per poder treballar-hi, és necessari crear fitxers de blocatge en el directori de gestió de cues del correu. En alguns sistemes, això s'assoleix fent que el directori de gestió de cues tingui el mode 01777.
+movemailCantDeleteLock=Unable to delete lock file %S.
 
-## @name MOVEMAIL_CANT_DELETE_LOCK
-## @loc None
-4035=No es pot suprimir el fitxer de bloqueig %S.
+movemailCantTruncateSpoolFile=Unable to truncate spool file %S.
 
-## @name MOVEMAIL_CANT_TRUNCATE_SPOOL_FILE
-## @loc None
-4036=No es pot truncar el fitxer de gestió de cues %S.
+movemailSpoolFileNotFound=Unable to locate mail spool file.
 
-## @name MOVEMAIL_SPOOL_FILE_NOT_FOUND
-## @loc None
-4037=No es pot localitzar el fitxer de gestió de cues del correu.
+#LOCALIZATION NOTE (movemailCantParseSpool): %S is file name
+movemailCantParseSpool=Unable to parse spool file %S. The file may be corrupt or not valid.
 
-## @name POP3_TMP_DOWNLOAD_FAILED
-## @loc None
-4038=S'ha produït un error en baixar el missatge següent:   \nDe: %S\n   Assumpte: %S\n Aquest missatge pot contenir un virus o no hi ha prou espai de disc. Voleu ometre aquest missatge?
+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 - the server doesn't support UIDL…
-## @name POP3_SERVER_DOES_NOT_SUPPORT_UIDL_ETC
-## @loc None
-# LOCALIZATION NOTE(4010): The following sentence should be translated in this way:
+# 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"
-4040=El servidor POP3 (%S) no permet l'ús d'UIDL, que és necessari per utilitzar les opcions «Deixa al servidor» i «Mida màxima del missatge». Per baixar el correu, desactiveu aquestes opcions al quadre Servidor de correu de Preferències.
+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 - the server doesn't support the top command
-## @name POP3_SERVER_DOES_NOT_SUPPORT_THE_TOP_COMMAND
-## @loc None
-# LOCALIZATION NOTE(4011): The following sentence should be translated in this way:
+# 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"
-4041=El servidor de correu POP3 (%S) no permet l'ús de l'ordre TOP. Per això, no es pot utilitzar l'opció «Mida màxima del missatge» o «Recull només les capçaleres». Aquesta opció ha estat inhabilitada: els missatges es baixaran independentment de la mida.
+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.
 
-## @name NS_ERROR_COULD_NOT_CONNECT_VIA_TLS
-## @loc None
-4043=No s'ha pogut establir una connexió TLS amb el servidor POP3. El servidor pot haver caigut o estar configurat incorrectament. Comproveu que tingueu la configuració correcta dels paràmetres del vostre servidor de correu a la finestra de Paràmetres del compte i torneu-ho a provar.
+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.
 
-## @name POP3_MOVE_FOLDER_TO_TRASH
-## @loc None
-# LOCALIZATION NOTE (4044): Do not translate the word %S below.
+# LOCALIZATION NOTE (pop3MoveFolderToTrash): Do not translate the word %S below.
 # "%S" is the the name of the folder.
-4044=Esteu segur que voleu suprimir la carpeta «%S»?
+pop3MoveFolderToTrash=Are you sure you want to delete the folder '%S'?
 
-## @name POP3_DELETE_FOLDER_DIALOG_TITLE
-## @loc None
-4045=Suprimeix la carpeta
+pop3DeleteFolderDialogTitle=Delete Folder
 
-## @name POP3_DELETE_FOLDER_BUTTON_LABEL
-## @loc None
-4046=&Suprimeix la carpeta
+pop3DeleteFolderButtonLabel=&Delete Folder
 
-## @name POP3_AUTH_INTERNAL_ERROR
-## @loc None
-4047=S'ha produït un error intern mentre es realitzava l'autenticació al servidor POP3. Aquest error intern de l'aplicació no s'hauria d'haver produït, notifiqueu-lo.
+pop3AuthInternalError=Internal state error during POP3 server authentication. This is an internal, unexpected error in the application, please report it as bug.
 
-## @name POP3_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
-## @loc None
-4048=El servidor POP3 no sembla que permeti les contrasenyes encriptades. Si només heu configurat aquest compte, proveu de posar «Contrasenya, enviada sense seguretat» com a «Mètode d'autenticació» a «Opcions del compte | opcions del servidor». Si el feu servir a la feina i ara comença a donar errors, pot ser que algú estigui intentant de robar-vos la contrasenya.
+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.
 
-## @name POP3_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
-## @loc None
-4049=El servidor POP3 no sembla que permeti les contrasenyes encriptades. Si només heu configurat aquest compte, proveu de posar «Contrasenya normal» com a «Mètode d'autenticació» a «Opcions del compte | opcions del servidor». Si el feu servir a la feina i ara comença a donar errors, contacteu amb el vostre administrador del compte o amb el vostre proveïdor.
+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.
 
-## @name POP3_AUTH_CHANGE_PLAIN_TO_ENCRYPT
-## @loc None
-4050=El servidor POP3 no sembla que permeti les contrasenyes normals. Proveu de posar «Contrasenya encriptada» com a «Mètode d'autenticació» a «Opcions del compte | opcions del servidor».
+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'.
 
 # Authentication server caps and pref don't match
-## @name POP3_AUTH_MECH_NOT_SUPPORTED
-## @loc None
-4051=El servidor no permet el mètode d'autenticació seleccionat. Canvieu el «Mètode d'autenticació» a «Opcions del compte | opcions del servidor».
+pop3AuthMechNotSupported=The server does not support the selected authentication method. Please change the 'Authentication method' in the 'Account Settings | Server settings'.
 
 # Status - Could not log in to GSSAPI, and it was the only method
-## @name POP3_GSSAPI_FAILURE
-## @loc None
-4052=El segell Kerberos/GSSAPI no ha sigut acceptat pel servidor POP. Assegureu-vos que heu iniciat una sessió al servidor Kerberos/GSSAPI.
+pop3GssapiFailure=The Kerberos/GSSAPI ticket was not accepted by the POP server. Please check that you are logged in to the Kerberos/GSSAPI realm.
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -27,16 +27,18 @@
 <!ENTITY newOtherAccountsCmd.label "Altres comptes…">
 <!ENTITY newOtherAccountsCmd.accesskey "A">
 <!ENTITY newCreateEmailAccountCmd.label "Obtén un compte nou de correu...">
 <!ENTITY newCreateEmailAccountCmd.accesskey "O">
 <!ENTITY newExistingEmailAccountCmd.label "Compte de correu existent...">
 <!ENTITY newExistingEmailAccountCmd.accesskey "e">
 <!ENTITY newIMAccountCmd.label "Compte de xat…">
 <!ENTITY newIMAccountCmd.accesskey "x">
+<!ENTITY newFeedAccountCmd.label "Feed Account…">
+<!ENTITY newFeedAccountCmd.accesskey "d">
 <!ENTITY newIMContactCmd.label "Contacte del xat...">
 <!ENTITY newIMContactCmd.accesskey "a">
 <!ENTITY openMessageFileCmd.label "Obre un missatge desat…">
 <!ENTITY openMessageFileCmd.accesskey "O">
 <!ENTITY saveAsMenu.label "Anomena i desa">
 <!ENTITY saveAsMenu.accesskey "s">
 <!ENTITY saveAsFileCmd.label "Fitxer">
 <!ENTITY saveAsFileCmd.accesskey "F">
@@ -482,16 +484,18 @@
 <!ENTITY errorConsoleCmd.commandkey "j">
 <!ENTITY clearRecentHistory.label "Neteja l'historial recent…">
 <!ENTITY clearRecentHistory.accesskey "h">
 <!ENTITY accountManagerCmd.label "Paràmetres dels comptes…">
 <!ENTITY accountManagerCmd.accesskey "P">
 <!-- LOCALIZATION NOTE (accountManagerCmdUnix.accesskey): belongs to accountManagerCmd.label,
         which is placed under the Edit menu on Unix systems -->
 <!ENTITY accountManagerCmdUnix.accesskey "a">
+<!ENTITY allowRemoteDebugging.label "Allow Remote Debugging">
+<!ENTITY allowRemoteDebugging.accesskey "g">
 <!-- Mail Toolbar -->
 
 <!ENTITY getMsgButton.label "Recupera">
 <!ENTITY newMsgButton.label "Redacta">
 <!ENTITY replyButton.label "Respon">
 <!ENTITY replyAllButton.label "Respon a tots">
 <!ENTITY replyListButton.label "Respon a la llista">
 <!ENTITY forwardButton.label "Reenvia">
@@ -530,16 +534,18 @@
 <!ENTITY getMsgButton.tooltip "Recupera els missatges nous">
 <!ENTITY getAllNewMsgCmd.label "Recupera tots els missatges nous">
 <!ENTITY getAllNewMsgCmd.accesskey "p">
 <!ENTITY newMsgButton.tooltip "Crea un nou missatge">
 <!ENTITY replyButton.tooltip "Respon el missatge">
 <!ENTITY replyAllButton.tooltip "Respon al remitent i a tots els destinataris">
 <!ENTITY replyListButton.tooltip "Respon a una llista de correu">
 <!ENTITY forwardButton.tooltip "Reenvia el missatge seleccionat">
+<!ENTITY forwardAsInline.tooltip "Forward selected message as inline text">
+<!ENTITY forwardAsAttachment.tooltip "Forward selected message as an attachment">
 <!ENTITY fileButton.tooltip "Mou el missatge seleccionat">
 <!ENTITY archiveButton.tooltip "Arxiva els missatges seleccionats">
 <!ENTITY nextButton.tooltip "Vés al següent missatge per llegir">
 <!ENTITY nextMsgButton.tooltip "Vés al missatge següent">
 <!ENTITY previousButton.tooltip "Vés a l'anterior missatge per llegir">
 <!ENTITY previousMsgButton.tooltip "Vés al missatge anterior">
 <!ENTITY goForwardButton.tooltip "Vés endavant un missatge">
 <!ENTITY goBackButton.tooltip "Vés enrere un missatge">
@@ -550,16 +556,20 @@
 <!ENTITY stopButton.tooltip "Atura la transferència actual">
 <!ENTITY junkButton.tooltip "Marca els missatges seleccionats com a brossa">
 <!ENTITY notJunkButton.tooltip "Marca els missatges seleccionats com a legítims">
 <!ENTITY addressBookButton.tooltip "Vés a la llibreta d'adreces">
 <!ENTITY chatButton.tooltip "Mostra la pestanya de xat">
 <!ENTITY tagButton.tooltip "Etiqueta els missatges">
 <!ENTITY compactButton.tooltip "Treu els missatges suprimits de la carpeta seleccionada">
 <!ENTITY appmenuButton1.tooltip "Mostra el menú del &brandShortName;">
+<!-- Toolbar Button Popup -->
+
+<!ENTITY buttonMenuForwardAsInline.label "Forward Inline">
+<!ENTITY buttonMenuForwardAsAttachment.label "Forward As Attachment">
 <!-- AppMenu Popup -->
 
 <!ENTITY appmenuNewMsgCmd.label "Missatge nou">
 <!ENTITY appmenuNewContactCmd.label "Contacte de la llibreta d'adreces…">
 <!ENTITY appmenuEditMenu.label "Edita">
 <!ENTITY appmenuQFBMenu.label "Barra del filtre ràpid">
 <!ENTITY appmenuToolbarLayout.label "Format de la barra d'eines…">
 <!ENTITY appmenuSelectThread.label "Selecciona la conversa">
@@ -573,18 +583,18 @@
 <!-- Folder Pane -->
 
 <!ENTITY folderColumn.label "Nom">
 <!ENTITY folderSizeColumn.label "Mida">
 <!-- Folder Pane Context Menu -->
 
 <!ENTITY folderContextGetMessages.label "Recupera els missatges">
 <!ENTITY folderContextGetMessages.accesskey "g">
-<!ENTITY folderContextOpenNewWindow.label "Obre">
-<!ENTITY folderContextOpenNewWindow.accesskey "O">
+<!ENTITY folderContextOpenInNewWindow.label "Open in New Window">
+<!ENTITY folderContextOpenInNewWindow.accesskey "O">
 <!ENTITY folderContextOpenNewTab.label "Obre en una nova pestanya">
 <!ENTITY folderContextOpenNewTab.accesskey "t">
 <!ENTITY folderContextNew.label "Crea una subcarpeta…">
 <!ENTITY folderContextNew.accesskey "n">
 <!ENTITY folderContextRename.label "Reanomena">
 <!ENTITY folderContextRename.accesskey "R">
 <!ENTITY folderContextRemove.label "Suprimeix">
 <!ENTITY folderContextRemove.accesskey "u">
@@ -692,24 +702,34 @@
 <!ENTITY contextReplyNewsgroup2.label "Segueix al grup de notícies">
 <!ENTITY contextReplyNewsgroup2.accesskey "u">
 <!ENTITY contextReplyAll.label "Respon a tots">
 <!ENTITY contextReplyAll.accesskey "p">
 <!ENTITY contextReplyList.label "Respon a la llista">
 <!ENTITY contextReplyList.accesskey "l">
 <!ENTITY contextForward.label "Reenvia">
 <!ENTITY contextForward.accesskey "v">
-<!ENTITY contextForwardAsAttachment.label "Reenvia com a adjuncions">
-<!ENTITY contextForwardAsAttachment.accesskey "e">
+<!ENTITY contextForwardAsMenu.label "Forward As">
+<!ENTITY contextForwardAsMenu.accesskey "o">
+<!ENTITY contextForwardAsInline.label "Inline">
+<!ENTITY contextForwardAsInline.accesskey "I">
+<!ENTITY contextForwardAsAttachmentItem.label "Attachment">
+<!ENTITY contextForwardAsAttachmentItem.accesskey "A">
+<!ENTITY contextMultiForwardAsAttachment.label "Forward as Attachments">
+<!ENTITY contextMultiForwardAsAttachment.accesskey "o">
 <!ENTITY contextMoveMsgMenu.label "Mou a">
 <!ENTITY contextMoveMsgMenu.accesskey "o">
 <!ENTITY contextMoveCopyMsgRecentMenu.label "Recent">
 <!ENTITY contextMoveCopyMsgRecentMenu.accesskey "R">
 <!ENTITY contextCopyMsgMenu.label "Copia a">
 <!ENTITY contextCopyMsgMenu.accesskey "C">
+<!ENTITY contextKillThreadMenu.label "Ignore Thread">
+<!ENTITY contextKillThreadMenu.accesskey "I">
+<!ENTITY contextKillSubthreadMenu.label "Ignore Subthread">
+<!ENTITY contextWatchThreadMenu.label "Watch Thread">
 <!ENTITY contextSaveAs.label "Anomena i desa…">
 <!ENTITY contextSaveAs.accesskey "s">
 <!ENTITY contextPrint.label "Imprimeix…">
 <!ENTITY contextPrint.accesskey "I">
 <!ENTITY contextPrintPreview.label "Exemple d'impressió">
 <!ENTITY contextPrintPreview.accesskey "E">
 <!-- Thread Pane Column Picker -->
 <!-- LOCALIZATION NOTE (columnPicker.resetToInbox.label):
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -582,17 +582,17 @@ addonLocalError-1=No s'ha pogut instal·lar el complement degut a un error del sistema de fitxers.
 addonLocalError-2=No s'ha pogut instal·lar el complement perquè no es corresponia amb el complement que esperava el #3.
 addonLocalError-3=No s'ha pogut instal·lar el complement perquè estava malmès.
 addonLocalError-4=No s'ha pogut instal·lar el complement #1 perquè el #3 no ha pogut modificar un fitxer necessari.
 addonErrorIncompatible=No s'ha pogut instal·lar el complement #1 perquè no és compatible amb el #3 #4.
 addonErrorBlocklisted=No s'ha pogut instal·lar el complement #1 perquè s'ha detectat que té un risc elevat de provocar problemes d'estabilitat o de seguretat.
 
 confirmMsgDelete.title=Confirma la supressió
 confirmMsgDelete.collapsed.desc=Se suprimiran els missatges dels fils reduïts. Voleu continuar?
-confirmMsgDelete.shiftDel.desc=Els missatges se suprimiran immediatament, sense desar una còpia a la Paperera. Voleu continuar?
+confirmMsgDelete.deleteNoTrash.desc=This will delete messages immediately, without saving a copy to Trash. Are you sure you want to continue?
 confirmMsgDelete.dontAsk.label=No m'ho tornis a demanar.
 confirmMsgDelete.delete.label=Suprimeix
 
 mailServerLoginFailedTitle=L'inici de sessió ha fallat
 # LOCALIZATION NOTE (mailServerLoginFailedTitle): Insert "%S" in your
 # translation where you wish to display the hostname of the server to which
 # login failed.
 mailServerLoginFailed=L'inici de sessió amb el servidor %S ha fallat.
@@ -708,8 +708,27 @@ sanitizeButtonOK=Neteja'l ara
 # 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=Es netejarà tot l'historial.
 # 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=Es netejaran tots els elements seleccionats.
+
+learnMoreAboutIgnoreThread=Learn More…
+learnMoreAboutIgnoreThreadAccessKey = L
+undoIgnoreThread=Undo Ignore Thread
+undoIgnoreThreadAccessKey=U
+undoIgnoreSubthread=Undo Ignore Subthread
+undoIgnoreSubthreadAccessKey=U
+# LOCALIZATION NOTE (ignoredThreadFeedback): #1 is the message thread title
+ignoredThreadFeedback=Replies to the thread "#1" will not be shown.
+# LOCALIZATION NOTE (ignoredSubthreadFeedback): #1 is the message subthread title
+ignoredSubthreadFeedback=Replies to the subthread "#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.
+# 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.
+
+
--- a/mail/chrome/messenger/messengercompose/messengercompose.dtd
+++ b/mail/chrome/messenger/messengercompose/messengercompose.dtd
@@ -82,16 +82,17 @@
 <!ENTITY renameAttachmentCmd.label "Canvia el nom del fitxer adjunt...">
 <!ENTITY renameAttachmentCmd.accesskey "e">
 <!ENTITY selectAllCmd.label "Selecciona-ho tot">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "a">
 <!ENTITY findCmd.label "Cerca i reemplaça…">
 <!ENTITY findCmd.key "F">
 <!ENTITY findCmd.accesskey "m">
+<!ENTITY findReplaceCmd.key "H">
 <!ENTITY findAgainCmd.label "Torna a cercar">
 <!ENTITY findAgainCmd.key "G">
 <!ENTITY findAgainCmd.accesskey "o">
 <!ENTITY findAgainCmd.key2 "VK_F3">
 <!ENTITY findPrevCmd.label "Cerca l'anterior">
 <!ENTITY findPrevCmd.key "G">
 <!ENTITY findPrevCmd.key2 "VK_F3">
 <!ENTITY findPrevCmd.accesskey "n">
--- a/mail/chrome/messenger/msgAccountCentral.dtd
+++ b/mail/chrome/messenger/msgAccountCentral.dtd
@@ -7,18 +7,22 @@
 <!ENTITY composeMsgLink.label         "Redacta un nou missatge">
 
 <!ENTITY newsSectionHdr.label         "Grups de discussió">
 <!ENTITY subscribeNewsLink.label      "Subscriu-me als grups de discussió">
 
 <!ENTITY feedsSectionHdr.label        "Canals">
 <!ENTITY subscribeFeeds.label         "Gestiona les subscripcions">
 
+<!ENTITY chat.label                   "Chat">
+<!ENTITY movemail.label               "Movemail">
+
 <!ENTITY accountsSectionHdr.label     "Comptes">
 <!ENTITY subscribeImapFolders.label   "Gestiona les subscripcions de carpeta">
 <!ENTITY settingsLink.label           "Paràmetres d'aquest compte">
 <!ENTITY newAcctLink.label            "Crea un compte nou">
+<!ENTITY newAcct.label                "Create a new account:">
 
 <!ENTITY advFeaturesSectionHdr.label  "Característiques avançades">
 <!ENTITY searchMsgsLink.label         "Cerca missatges">
 <!ENTITY filtersLink.label            "Crea filtres de missatge">
 <!ENTITY junkSettings.label           "Paràmetres del correu brossa…">
 <!ENTITY offlineLink.label            "Paràmetres de fora de línia">
--- a/mail/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/chrome/messenger/msgHdrViewOverlay.dtd
@@ -1,44 +1,45 @@
 <!-- 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 toField3.label "A ">
-<!ENTITY fromField3.label "De ">
-<!ENTITY senderField3.label "Remitent ">
-<!ENTITY organizationField3.label "Organització ">
-<!ENTITY replyToField3.label "Respon a ">
+<!ENTITY toField4.label "To">
+<!ENTITY fromField4.label "From">
+<!ENTITY senderField4.label "Sender">
+<!ENTITY organizationField4.label "Organization">
+<!ENTITY replyToField4.label "Reply to">
 
-<!ENTITY subjectField3.label "Assumpte ">
-<!ENTITY ccField3.label "Cc ">
-<!ENTITY bccField3.label "Cco ">
-<!ENTITY newsgroupsField3.label "Grups de discussió ">
-<!ENTITY followupToField3.label "Segueix a ">
-<!ENTITY tagsHdr3.label "Etiquetes ">
-<!ENTITY dateField3.label "Data ">
-<!ENTITY userAgentField3.label "Agent d'usuari ">
-<!ENTITY referencesField3.label "Referències ">
-<!ENTITY messageIdField3.label "ID del missatge ">
-<!ENTITY inReplyToField3.label "En resposta a ">
-<!ENTITY originalWebsite3.label "Pàgina web ">
+<!ENTITY subjectField4.label "Subject">
+<!ENTITY ccField4.label "Cc">
+<!ENTITY bccField4.label "Bcc">
+<!ENTITY newsgroupsField4.label "Newsgroups">
+<!ENTITY followupToField4.label "Followup to">
+<!ENTITY tagsHdr4.label "Tags">
+<!ENTITY dateField4.label "Date">
+<!ENTITY userAgentField4.label "User agent">
+<!ENTITY referencesField4.label "References">
+<!ENTITY messageIdField4.label "Message ID">
+<!ENTITY inReplyToField4.label "In reply to">
+<!ENTITY originalWebsite4.label "Website">
 
 <!ENTITY editMessageDescription.label "Esteu en un esborrany">
 <!ENTITY editMessageButton.label "Edita…">
 <!ENTITY hdrArchiveButton1.label "Arxiva">
 <!ENTITY hdrArchiveButton1.tooltip "Arxiva aquest missatge">
 <!ENTITY hdrSmartReplyButton1.label "Resposta intel·ligent">
 <!ENTITY hdrReplyButton1.label "Respon">
 <!ENTITY hdrReplyButton2.tooltip "Respon al remitent d'aquest missatge">
 <!ENTITY hdrReplyAllButton1.label "Respon a tots">
 <!ENTITY hdrReplyAllButton1.tooltip "Respon al remitent i a tots els destinataris">
 <!ENTITY hdrReplyListButton1.label "Respon a la llista">
 <!ENTITY hdrReplyListButton1.tooltip "Respon a la llista de correus">
 <!ENTITY hdrFollowupButton1.label "Segueix">
 <!ENTITY hdrFollowupButton1.tooltip "Publica al grup de notícies">
+<!ENTITY hdrMenuForwardButton.label "Forward As">
 <!ENTITY hdrForwardButton1.label "Reenvia">
 <!ENTITY hdrForwardButton1.tooltip "Reenvia aquest missatge">
 <!ENTITY hdrJunkButton1.label "Brossa">
 <!ENTITY hdrJunkButton1.tooltip "Marca aquest missatge com a correu brossa">
 <!ENTITY hdrTrashButton1.label "Suprimeix">
 <!ENTITY hdrTrashButton1.tooltip "Suprimeix aquest missatge">
 
 <!ENTITY hdrViewToolbarShowFull.label "Mostra les icones i el text">
--- a/mail/chrome/messenger/multimessageview.properties
+++ b/mail/chrome/messenger/multimessageview.properties
@@ -5,15 +5,15 @@
 # LOCALIZATION NOTE (selectedNMessages, acrossNThreads): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
 # #1 number of threads or solitary messages selected
 # example: 4 conversations
 NConversations=#1 conversa; #1 converses
 
 numMsgs=#1 missatge;#1 missatges
 countUnread=, #1 llegit;, #1 llegits
-Nmessages=(#1 missatge);(#1 missatges)
+ignoredCount=#1 ignored;#1 ignored
 
 noSubject=(sense assumpte)
 
 # thread and multiple message selection summaries
 messagesSize=Aquests missatges ocupen: #1 #2.
 noticeText= (atenció: #1 missatges estan seleccionats, però només se'n mostren #2)
--- a/mail/chrome/messenger/preferences/advanced.dtd
+++ b/mail/chrome/messenger/preferences/advanced.dtd
@@ -22,18 +22,18 @@
 <!ENTITY useSmoothScrolling.label      "Utilitza el desplaçament suau">
 <!ENTITY useSmoothScrolling.accesskey  "m">
 
 <!ENTITY systemIntegration.label       "Integració amb el sistema">
 <!ENTITY alwaysCheckDefault.label      "A l'inici, comprova sempre si el &brandShortName; és el client de correu per defecte">
 <!ENTITY alwaysCheckDefault.accesskey  "l">
 <!ENTITY searchIntegration.label       "Permet al &searchIntegration.engineName; que cerqui missatges">
 <!ENTITY searchIntegration.accesskey   "c">
-<!ENTITY checkDefaultsNow.label        "Check Now…">
-<!ENTITY checkDefaultsNow.accesskey    "N">
+<!ENTITY checkDefaultsNow.label        "Comprova-ho ara…">
+<!ENTITY checkDefaultsNow.accesskey    "h">
 <!ENTITY configEditDesc.label          "Configuració avançada">
 <!ENTITY configEdit.label              "Editor de la configuració…">
 <!ENTITY configEdit.accesskey          "c">
 <!ENTITY returnReceiptsInfo.label      "Determina com el &brandShortName; gestiona les confirmacions de recepció">
 <!ENTITY showReturnReceipts.label      "Confirmacions de recepció…">
 <!ENTITY showReturnReceipts.accesskey  "r">
 <!-- Display and Reading Settings -->
 
--- a/mail/chrome/messenger/quickFilterBar.dtd
+++ b/mail/chrome/messenger/quickFilterBar.dtd
@@ -152,16 +152,41 @@
 
 <!ENTITY quickFilterBar.textbox.emptyText.keyLabel2.nonmac "&lt;Ctrl+Shift+K&gt;">
 <!-- LOCALIZATION NOTE (quickFilterBar.textbox.emptyText.keyLabel.mac):
      The description of the key-binding to get into the box on mac systems.
      This should match the value of quickFilterBar.show.key above.
      -->
 
 <!ENTITY quickFilterBar.textbox.emptyText.keyLabel2.mac "&lt;&#x21E7;&#x2318;K&gt;">
+<!-- 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.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">
+<!-- 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.textbox.idealWidth):
      The number of pixels for the ideal width of the quick filter box textbox.
      Choose this value so that the emptyText fits nicely with a little bit of
      extra whitespace.
      -->
 
 <!ENTITY quickFilterBar.textbox.idealWidth "320">
 <!-- LOCALIZATION NOTE (quickFilterBar.textbox.minWidth):
--- a/mobile/android/base/android_strings.dtd
+++ b/mobile/android/base/android_strings.dtd
@@ -11,21 +11,21 @@
 
 <!ENTITY  awesomebar_all_pages_title "Habituals">
 <!ENTITY  awesomebar_bookmarks_title "D\u0027interès">
 <!ENTITY  awesomebar_history_title "Historial">
 <!ENTITY  awesomebar_switch_to_tab "Canvia a la pestanya">
 
 <!ENTITY  crash_reporter_title "Informe de fallades del &brandShortName;">
 <!ENTITY  crash_message2 "El &brandShortName; ha tingut un problema i ha fallat. Es mostraran les vostres pestanyes a la pàgina d\u0027inici del &brandShortName; quan reinicieu. ">
-<!ENTITY  crash_send_report_message2 "Informa a Mozilla sobre aquest problema, així podran corregir-lo">
+<!ENTITY  crash_send_report_message3 "Notifiqueu a &vendorShortName; el problema perquè pugui solucionar-ho">
 <!ENTITY  crash_include_url2 "Inclou l\u0027adreça de la pàgina on em trobava">
 <!ENTITY  crash_sorry "Ho lamentem">
 <!ENTITY  crash_comment "Afegeix un comentari (els comentaris són visibles públicament)">
-<!ENTITY  crash_allow_contact "Permet a Mozilla contactar amb mi sobre aquest informe">
+<!ENTITY  crash_allow_contact2 "Permet que &vendorShortName; pugui contactar amb mi en referència a aquest problema">
 <!ENTITY  crash_email "La vostra adreça electrònica">
 <!ENTITY  crash_closing_alert "Voleu sortir sense enviar un informe d\u0027error?">
 <!ENTITY  sending_crash_report "S\u0027està enviant un informe de fallada\u2026">
 <!ENTITY  crash_close_label "Tanca">
 <!ENTITY  crash_restart_label "Reinicia el &brandShortName;">
 <!ENTITY  exit_label "Surt">
 
 <!ENTITY  launcher_shortcuts_title "Aplicacions web del &brandShortName;">
@@ -37,16 +37,17 @@
 
 <!ENTITY remote_tabs "Pestanyes sincronitzades">
 <!ENTITY remote_tabs_show_all "Mostra totes les pestanyes">
 
 <!ENTITY bookmark "Adreça d\u0027interès">
 <!ENTITY bookmark_added "S\u0027ha afegit l\u0027adreça d\u0027interès">
 <!ENTITY bookmark_removed "S\u0027ha suprimit l\u0027adreça d\u0027interès">
 <!ENTITY bookmark_updated "S\u0027ha actualitzat l\u0027adreça d\u0027interès">
+<!ENTITY bookmark_options "Opcions">
 
 <!ENTITY history_today_section "Avui">
 <!ENTITY history_yesterday_section "Ahir">
 <!ENTITY history_week_section "Fa 7 dies">
 <!ENTITY history_older_section "Fa més de 7 dies">
 
 <!ENTITY go "Vés-hi">
 <!ENTITY search "Cerca">
@@ -95,17 +96,17 @@
 <!ENTITY pref_char_encoding_on "Mostra el menú">
 <!ENTITY pref_char_encoding_off "No mostris el menú">
 <!ENTITY pref_clear_private_data "Neteja les dades privades">
 <!ENTITY pref_plugins "Connectors">
 <!ENTITY pref_plugins_enabled "Habilitats">
 <!ENTITY pref_plugins_tap_to_play "Toca per iniciar-los">
 <!ENTITY pref_plugins_disabled "Inhabilitats">
 <!ENTITY pref_text_size "Mida de la lletra">
-<!ENTITY pref_reflow_on_zoom2 "Reajusta el text en pessigar">
+<!ENTITY pref_reflow_on_zoom3 "Toqueu dues vegades per ajustar el text">
 <!ENTITY pref_font_size_tiny "Molt petita">
 <!ENTITY pref_font_size_small "Petita">
 <!ENTITY pref_font_size_medium "Mitjana">
 <!ENTITY pref_font_size_large "Grossa">
 <!ENTITY pref_font_size_xlarge "Molt grossa">
 <!ENTITY pref_font_size_set "Defineix">
 <!-- Localization note (pref_font_size_adjust_char): A button with a small version of this character
 (or combination of characters) is used to decrease the preview font size; a larger version of the
@@ -128,35 +129,39 @@ size. -->
 <!ENTITY pref_private_data_cookies2 "Galetes i sessions actives">
 <!ENTITY pref_private_data_passwords "Contrasenyes desades">
 <!ENTITY pref_private_data_cache "Memòria cau">
 <!ENTITY pref_private_data_offlineApps "Dades fora de línia dels llocs web">
 <!ENTITY pref_private_data_siteSettings2 "Paràmetres del lloc">
 <!ENTITY pref_private_data_downloadFiles "Fitxers baixats">
 
 <!ENTITY datareporting_notification_title "Estadístiques i dades del &brandShortName;">
+<!ENTITY datareporting_notification_action_long "Trieu quina informació voleu compartir">
 <!ENTITY datareporting_notification_action "Tria què compartir">
 <!ENTITY datareporting_notification_summary "Perquè puguem millorar la vostra experiència, el &brandShortName; tramet automàticament informació a &vendorShortName;. ">
 <!ENTITY datareporting_notification_summary_short "Perquè puguem millorar la vostra experiència, el &brandShortName;...">
-<!-- Localization note (datareporting_fhr_title, datareporting_fhr_summary,
+<!ENTITY datareporting_notification_ticker_text "datareporting_notification_title;: datareporting_notification_action_long;">
+<!-- Localization note (datareporting_fhr_title, datareporting_fhr_summary2,
      reporting_telemetry_title, datareporting_telemetry_summary,
      datareporting_crashreporter_summary) : These match the strings in
-     chrome/browser/preferences/advanced.dtd (healthReportSection.label,
+     en-US/chrome/browser/preferences/advanced.dtd (healthReportSection.label,
      healthReportDesc.label, telemetrySection.label, telemetryDesc.label,
      crashReporterDesc.label). -->
 
 <!ENTITY datareporting_fhr_title "Informe de salut del &brandShortName;">
-<!ENTITY datareporting_fhr_summary "Ens ajuda a entendre el rendiment del navegador i comparteix dades amb &vendorShortName; sobre la salut del navegador">
+<!ENTITY datareporting_fhr_summary2 "Comparteix la informació de l\u0027ús i rendiment del navegador amb &vendorShortName; per ajudar a millorar-ho">
+<!ENTITY datareporting_abouthr_title "Mostra l\u0027informe d\u0027estat">
 <!ENTITY datareporting_telemetry_title "Telemesura">
 <!ENTITY datareporting_telemetry_summary "Comparteix dades sobre el rendiment, ús, maquinari i personalització del navegador amb &vendorShortName; per ajudar-nos a millorar el &brandShortName;">
 <!ENTITY datareporting_crashreporter_summary "El &brandShortName; tramet informes de fallades per ajudar a &vendorShortName; a fer el navegador més estable i segur">
-<!-- Localization note (datareporting_crashreporter_title) : This string matches
-     (crashReporterSection.label) in chrome/browser/preferences/advanced.dtd
-     except in branding. -->
-<!ENTITY datareporting_crashreporter_title "Informe de fallades del &brandShortName;">
+<!-- Localization note (datareporting_crashreporter_title_short) : This string matches
+     (crashReporterSection.label) in en-US/chrome/browser/preferences/advanced.dtd.-->
+<!ENTITY datareporting_crashreporter_title_short "Informe de fallades">
+<!ENTITY datareporting_wifi_title "Servei d\u0027ubicació de &vendorShortName;">
+<!ENTITY datareporting_wifi_summary "Ajudeu a millorar el servei d\u0027ubicació de l\u0027Open Web, permetent a &brandShortName; recollir dades anònimes de les antenes de telefonia">
 
 <!ENTITY pref_update_autodownload "Actualitzacions automàtiques">
 <!ENTITY pref_update_autodownload_wifi "Només amb xarxa sense fil">
 <!ENTITY pref_update_autodownload_disabled "Inhabilitades">
 <!ENTITY pref_update_autodownload_enabled "Habilitades">
 
 <!ENTITY quit "Surt">
 
@@ -278,16 +283,25 @@ example.com
 which is run by
 Example Enterprises, Inc.
 
 The layout of the identity dialog prevents combining this into a single string with
 substitution variables.  If it is difficult to translate the sense of the string
 with that structure, consider a translation which ignores the preceding domain and
 just addresses the organization to follow, e.g. "This site is run by " -->
 <!ENTITY identity_run_by "funciona mitjançant">
+<!-- Mixed content notifications in site identity popup -->
+
+<!ENTITY loaded_mixed_content_message "Aquesta pàgina mostra contingut no segur.">
+<!ENTITY blocked_mixed_content_message_top "&brandShortName; ha blocat el contingut no segur.">
+<!ENTITY blocked_mixed_content_message_bottom "La majoria de pàgines web continuen funcionant correctament encara que s\u0027hagi blocat contingut.">
+<!ENTITY learn_more "Aprendre\u0027n més">
+<!ENTITY enable_protection "Habilita la protecció">
+<!ENTITY disable_protection "Inhabilita la protecció">
+<!ENTITY keep_blocking "Continua blocant">
 
 <!ENTITY private_data_success "S\u0027han netejat les dades privades">
 <!ENTITY private_data_fail "No s\u0027han pogut netejar algunes dades privades">
 
 <!ENTITY bookmarkhistory_button_import "Importa">
 <!ENTITY bookmarkhistory_import_both "S\u0027estan important les adreces d\u0027interès i historial 
 de l\u0027Android">
 <!ENTITY bookmarkhistory_import_bookmarks "S\u0027estan important les adreces d\u0027interès 
--- a/mobile/android/chrome/about.dtd
+++ b/mobile/android/chrome/about.dtd
@@ -4,18 +4,18 @@
 <!ENTITY aboutPage.title                        "Quant al &brandShortName;">
 <!ENTITY aboutPage.warningVersion               "El &brandShortName; és experimental i pot ser inestable.">
 <!ENTITY aboutPage.telemetryStart               " Envia automàticament informació sobre el rendiment, maquinari, ús i personalització a ">
 <!ENTITY aboutPage.telemetryMozillaLink         "&vendorShortName;">
 <!ENTITY aboutPage.telemetryEnd                 " per ajudar a millorar el &brandShortName;.">
 <!ENTITY aboutPage.checkForUpdates.link         "Comprova si hi ha actualitzacions »">
 <!ENTITY aboutPage.checkForUpdates.checking     "S'estan cercant actualitzacions…">
 <!ENTITY aboutPage.checkForUpdates.none         "No hi ha cap actualització">
-<!ENTITY aboutPage.checkForUpdates.available    "Actualització disponible; feu clic per baixar-la">
+<!ENTITY aboutPage.checkForUpdates.available2   "Baixa l'actualització">
 <!ENTITY aboutPage.checkForUpdates.downloading  "S'està baixant l'actualització…">
-<!ENTITY aboutPage.checkForUpdates.downloaded   "S'ha baixat l'actualització; feu clic per instal·lar-la">
+<!ENTITY aboutPage.checkForUpdates.downloaded2  "Instal·la l'actualització">
 <!ENTITY aboutPage.faq.label                    "PMF">
 <!ENTITY aboutPage.support.label                "Assistència">
 <!ENTITY aboutPage.privacyPolicy.label          "Política de privadesa">
 <!ENTITY aboutPage.rights.label                 "Conegueu els vostres drets">
 <!ENTITY aboutPage.relNotes.label               "Notes de la versió">
 <!ENTITY aboutPage.credits.label                "Crèdits">
 <!ENTITY aboutPage.license.label                "Informació de la llicència">
--- a/mobile/android/chrome/aboutReader.properties
+++ b/mobile/android/chrome/aboutReader.properties
@@ -1,18 +1,25 @@
 # 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/.
 
 aboutReader.loading=S'està carregant…
 aboutReader.loadError=No s'ha pogut carregar l'article de la pàgina
 
-aboutReader.textTitle=Text
-aboutReader.marginTitle=Marges
-
 aboutReader.colorSchemeLight=Clar
 aboutReader.colorSchemeDark=Fosc
 aboutReader.colorSchemeSepia=Sèpia
+aboutReader.colorSchemeAuto=Automàtic
 
-aboutReader.fontTypeSansSerif=Sans
-aboutReader.fontTypeSerif=Serif
+# LOCALIZATION NOTE (aboutReader.fontTypeCharis, aboutReader.fontTypeOpenSans):
+# These are the names of the fonts that are used.
+aboutReader.fontTypeCharis=Charis
+aboutReader.fontTypeOpenSans=Open Sans
+
+# LOCALIZATION NOTE (aboutReader.fontTypeSample): String used to sample font types.
+aboutReader.fontTypeSample=Àà·Çç
+
+# LOCALIZATION NOTE (aboutReader.fontSizeSample): String used to sample a relative font size
+# for the font size setting. Tapping different samples will change the font size.
+aboutReader.fontSizeSample=A
 
 aboutReader.toolbarTip=Toqueu la pantalla per mostrar les opcions del lector
--- a/mobile/android/chrome/browser.properties
+++ b/mobile/android/chrome/browser.properties
@@ -67,17 +67,17 @@ xpinstallDisabledMessage2=La instal·lació de programari ara està inhabilitada. Feu clic a Habilita-la i torneu-ho a provar.
 xpinstallDisabledButton=Habilita-la
 
 # Site Identity
 identity.identified.verifier=Verificat per: %S
 identity.identified.verified_by_you=Heu afegit una excepció de seguretat per al lloc
 identity.identified.state_and_country=%S, %S
 identity.identified.title_with_country=%S (%S)
 identity.encrypted2=Xifrat
-identity.ownerUnknown2=(desconegut)
+identity.ownerUnknown3=Desconegut
 
 # Geolocation UI
 geolocation.allow=Comparteix
 geolocation.dontAllow=No ho comparteixis
 geolocation.ask=Voleu compartir la vostra ubicació amb %S?
 # LOCALIZATION NOTE (geolocation.shareLocation): Label that will be used in
 # site settings dialog.
 geolocation.shareLocation=Comparteix la ubicació
@@ -161,16 +161,17 @@ contextmenu.saveImage=Desa la imatge
 contextmenu.setWallpaper=Defineix com a fons d'escriptori
 contextmenu.addSearchEngine=Afegeix un motor de cerca
 contextmenu.playMedia=Reprodueix
 contextmenu.pauseMedia=Pausa
 contextmenu.shareMedia=Comparteix el vídeo
 contextmenu.showControls2=Mostra els controls
 contextmenu.saveVideo=Desa el vídeo
 contextmenu.saveAudio=Desa l'àudio
+contextmenu.addToContacts=Afegeix als contactes
 
 contextmenu.copy=Copia
 contextmenu.copyAll=Copia-ho tot
 contextmenu.selectWord=Selecciona la paraula
 contextmenu.selectAll=Selecciona-ho tot
 contextmenu.paste=Enganxa
 
 # Select UI
@@ -251,11 +252,19 @@ lwthemeInstallRequest.message=Aquest lloc (%S) ha intentat instal·lar un tema.
 lwthemeInstallRequest.allowButton=Permet
 
 # LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message, getUserMedia.shareCameraAndMicrophone.message, getUserMedia.sharingCamera.message, getUserMedia.sharingMicrophone.message, getUserMedia.sharingCameraAndMicrophone.message): %S is the website origin (e.g. www.mozilla.org)
 getUserMedia.shareCamera.message = Voleu compartir la càmera amb %S?
 getUserMedia.shareMicrophone.message = Voleu compartir el micròfon amb %S?
 getUserMedia.shareCameraAndMicrophone.message = Voleu compartir la càmera i el micròfon amb %S?
 getUserMedia.denyRequest.label = No comparteixis
 getUserMedia.shareRequest.label = Comparteix
-getUserMedia.sharingCamera.message = Esteu compartint la càmera amb %S.
-getUserMedia.sharingMicrophone.message = Esteu compartint el micròfon amb %S.
-getUserMedia.sharingCameraAndMicrophone.message = Esteu compartint la càmera i el micròfon amb %S.
+getUserMedia.videoDevice.default = Càmera %S
+getUserMedia.videoDevice.front = Frontal
+getUserMedia.videoDevice.back = Posterior
+getUserMedia.videoDevice.none = Sense vídeo
+getUserMedia.videoDevice.prompt = Càmera que s'utilitzarà
+getUserMedia.audioDevice.default = Micròfon %S
+getUserMedia.audioDevice.none = Sense àudio
+getUserMedia.audioDevice.prompt = Micròfon que s'utilitzarà
+getUserMedia.sharingCamera.message2 = Càmera habilitada
+getUserMedia.sharingMicrophone.message2 = Micròfon habilitat
+getUserMedia.sharingCameraAndMicrophone.message2 = Càmera i micròfon habilitats
--- a/security/manager/chrome/pipnss/pipnss.properties
+++ b/security/manager/chrome/pipnss/pipnss.properties
@@ -1,14 +1,13 @@
 #
 # 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/.
 
-SignedBy=Autenticat per %S
 CertPassPrompt=Introduïu la contrasenya mestra per al %S.
 # the following strings have special requirements:
 # they must fit in a 32 or 64 byte buffer after being translated
 # to UTF8.  Note to translator. It's not easy for you to figure
 # whether the escaped unicode string you produce will fit in 
 # the space allocated.
 #
 # 64 bytes long after conversion to UTF8
@@ -334,25 +333,16 @@ CertInfoIssuedFor=Emès per a:
 CertInfoIssuedBy=Emès per:
 CertInfoValid=Vàlid
 CertInfoFrom=des del
 CertInfoTo=fins al
 CertInfoPurposes=Finalitats
 CertInfoEmail=Adreça electrònica
 CertInfoStoredIn=Emmagatzemat a:
 P12DefaultNickname=Certificat importat
-CrlImportFailure1x=L'aplicació no pot importar la llista de revocació de certificats (CRL).
-CrlImportFailureExpired=Hi ha disponible una versió més recent d'aquesta CRL.
-CrlImportFailureBadSignature=La CRL té una signatura no vàlida
-CrlImportFailureInvalid=La nova CRL té un format no vàlid.
-CrlImportFailureOld=La nova CRL és més antiga que l'actual.
-CrlImportFailureNotYetValid=La CRL encara no és vàlida. Comproveu el rellotge del sistema.
-CrlImportFailureNetworkProblem=La baixada de la CRL ha fallat a causa de problemes a la xarxa.
-CrlImportFailureReasonUnknown=S'ha produït un error en importar la CRL a la base de dades local. Codi d'error:
-CrlImportFailure2=Existeix una versió més nova d'aquesta CRL.
 NSSInitProblemX=No s'ha pogut inicialitzar l'element de seguretat de l'aplicació. El motiu més probable és que hi hagi problemes de fitxers al directori de perfils de l'aplicació. Comproveu que aquest directori no tingui restriccions de lectura/escriptura i que el disc dur no sigui ple o gairebé ple. És recomanable que sortiu de l'aplicació i solucioneu el problema. Si continueu utilitzant aquesta sessió, pot ser que l'aplicació no funcioni bé en accedir a característiques de seguretat.
 VerifyExpired=<Caducat>
 VerifyRevoked=<Revocat>
 VerifyNotTrusted=<No fiable>
 VerifyIssuerNotTrusted=<L'emissor no és de confiança>
 VerifyIssuerUnknown=<L'emissor és desconegut>
 VerifyInvalidCA=<CA no vàlida>
 VerifyDisabledAlgorithm=<Algorisme de signatura no segur>
--- a/security/manager/chrome/pipnss/security.properties
+++ b/security/manager/chrome/pipnss/security.properties
@@ -1,10 +1,7 @@
-#
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 Title=Avís de seguretat
 PostToInsecureFromSecureMessage=Tot i que aquesta pàgina està xifrada, la informació que heu introduït s'enviarà a través d'una connexió no xifrada i terceres persones poden llegir-la fàcilment. ##Esteu segur que encara voleu enviar aquesta informació?##
-SecurityButtonTooltipText=Mostra la informació de seguretat per a la pàgina actual
-SecurityButtonMixedContentTooltipText=Avís: Conté contingut sense autenticar
 Continue=Continua
--- a/security/manager/chrome/pippki/pippki.dtd
+++ b/security/manager/chrome/pippki/pippki.dtd
@@ -40,20 +40,16 @@
 <!ENTITY downloadCert.trustSSL "Confia en aquesta CA per identificar llocs web.">
 <!ENTITY downloadCert.trustEmail "Confia en aquesta CA per identificar usuari de correu electrònic.">
 <!ENTITY downloadCert.trustObjSign "Confia en aquesta CA per identificar desenvolupadors de programari.">
 <!ENTITY downloadCert.message3 "Abans de confiar en aquesta CA amb qualsevol finalitat, cal que n'examineu el certificat i les normes i procediments (si estan disponibles).">
 <!ENTITY downloadCert.viewCert.label "Visualitza">
 <!ENTITY downloadCert.viewPolicy.label "Normes">
 <!ENTITY downloadCert.viewCert.text "Examina el certificat de la CA">
 <!ENTITY downloadCert.viewPolicy.text "Examina les normes i procediments de la CA">
-<!-- Certificate Exists in database -->
-
-<!ENTITY caCertExists.title "El certificat existeix">
-<!ENTITY caCertExists.message "El certificat ja existeix.">
 <!-- Strings for the SSL client auth ask dialog -->
 
 <!ENTITY clientAuthAsk.title "Sol·licitud d'identificació de l'usuari">
 <!ENTITY clientAuthAsk.message1 "Aquest lloc ha sol·licitat que us identifiqueu amb un certificat:">
 <!ENTITY clientAuthAsk.message2 "Trieu un certificat per presentar-lo com a identificació:">
 <!ENTITY clientAuthAsk.message3 "Detalls del certificat seleccionat:">
 <!-- Strings for the cert picker dialog -->
 
@@ -74,18 +70,16 @@
 <!ENTITY chooseToken.message1 "Trieu un testimoni.">
 
 <!ENTITY escrowWarn.title "Còpia de la clau de xifratge">
 <!ENTITY escrowWarn.message1 "Important: Aquesta entitat certificadora ha demanat fer una còpia de seguretat de la vostra clau privada de xifratge">
 <!ENTITY escrowWarn.benefit1 "L'avantatge és que, si perdeu l'accés a la vostra clau privada de xifratge, en podeu sol·licitar una còpia a aquesta entitat certificadora.">
 <!ENTITY escrowWarn.message2 "Tanmateix, atès que l'entitat certificadora emmagatzemarà la vostra clau privada de xifratge, podria utilitzar-la per llegir el vostre correu o altres documents xifrats sense la vostra autorització.">
 <!ENTITY examineCert.label "Visualitza el certificat">
 <!ENTITY examineCert.accesskey "V">
-
-<!ENTITY serverCrlNextupdate.message "Demaneu ajuda a l'administrador del sistema">
 <!-- Strings for the CreateCertInfo dialog  -->
 
 <!ENTITY createCertInfo.title "S'està generant una clau privada">
 <!ENTITY createCertInfo.msg1 "S'està generant la clau… Pot trigar uns minuts…">
 <!ENTITY createCertInfo.msg2 "Espereu…">
 <!-- Form Signing confirmation prompt -->
 
 <!ENTITY formSigning.title "Sol·licitud de signatura del text">
--- a/security/manager/chrome/pippki/pippki.properties
+++ b/security/manager/chrome/pippki/pippki.properties
@@ -1,14 +1,13 @@
 #
 # 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/.
 
-SignedBy=Autenticat per %S
 CertPassPrompt=Introduïu la contrasenya de seguretat personal per a les claus privades del dispositiu de seguretat.
 
 #These are for dialogs
 #Download Cert dialog
 newCAMessage1=Voleu confiar en «%S» per a les finalitats següents?
 unnamedCA=Entitat certificadora (sense nom)
 
 #For editing cert trust
@@ -121,40 +120,18 @@ devinfo_stat_uninitialized=No inicialitz
 devinfo_stat_notloggedin=No s'ha iniciat la sessió
 devinfo_stat_loggedin=S'ha iniciat la sessió
 devinfo_stat_ready=Preparat
 enable_fips=Habilita els FIPS
 disable_fips=Inhabilita els FIPS
 fips_nonempty_password_required=El mode FIPS requereix que tingueu una contrasenya mestra definida per a cada dispositiu de seguretat. Definiu la contrasenya abans d'habilitar el mode FIPS. 
 unable_to_toggle_fips=No s'ha pogut canviar el mode FIPS del dispositiu de seguretat. Es recomana que sortiu i reinicieu l'aplicació.
 
-# CRL next update.
-crlNextUpdateMsg1=El %S no ha pogut establir una connexió xifrada amb «%S».
-crlNextUpdateMsg2=Cal actualitzar la llista de revocació de certificats (CRL) de «%S».
-NoUpdateFailure=Cap
-lastFetchUrlLabel=URL recollit originalment de
-advertisedUrlLabel=URL anunciat per la CA
-crlAutoUpdateDayCntError=El nombre de dies abans de la propera actualització ha de ser més gran que zero.
-crlAutoUpdtaeFreqCntError=La freqüència d'actualització ha de ser un nombre més gran que zero.
-disabledStatement=L'actualització automàtica no és habilitada per a aquesta CRL.
-enabledStatement=S'ha habilitat l'actualització automàtica per a aquesta CRL.
-crlAutoupdateQuestion1=Voleu habilitar l'actualització automàtica?
-crlAutoupdateQuestion2=Voleu visualitzar els paràmetres d'actualització automàtics?
-undefinedValStr=<No definit>
-undefinedURL=L'URL d'actualització automàtica no s'ha definit.
-yesButton=Sí
-noButton=No
 resetPasswordConfirmationTitle=Reinicia la contrasenya mestra
 resetPasswordConfirmationMessage=S'ha reiniciat la vostra contrasenya.
-crlAutoupdateEnabled=S'ha habilitat
-crlAutoupdateNotEnabled=No s'ha habilitat
-crlAutoupdateOk=D'acord
-crlAutoupdateFailed=Ha fallat
-crlImportNewCRLTitle=Importa la llista de revocació de certificats
-crlImportNewCRLLabel=Importa la CRL de:
 
 #Import certificate(s) file dialog
 importEmailCertPrompt=Seleccioneu el fitxer que conté el certificat de correu electrònic d'algú a importar
 importCACertsPrompt=Seleccioneu el fitxer que conté els certificats de CA per importar
 importServerCertPrompt=Seleccioneu el fitxer que conté el certificat de servidor per importar
 file_browse_Certificate_spec=Fitxers certificat
 
 # Form Signing confirmation prompt
@@ -185,8 +162,12 @@ addExceptionUnverifiedOrBadSignatureShor
 addExceptionUnverifiedOrBadSignatureLong=No es confia en el certificat, perquè no l'ha verificat una autoritat reconeguda mitjançant una signatura segura.
 addExceptionValidShort=Certificat vàlid
 addExceptionValidLong=El lloc web proporciona identificació vàlida i verificada. No cal afegir cap excepció.
 addExceptionCheckingShort=Comprovació de la informació
 addExceptionCheckingLong=S'està intentant identificar el lloc web…
 addExceptionNoCertShort=No hi ha cap informació disponible
 addExceptionNoCertLong=No es pot obtenir l'estat d'identificació per al lloc web donat.
 addExceptionConnectionFailed=Ha fallat la connexió
+
+#Certificate Exists in database
+caCertExistsTitle=Certificate Exists
+caCertExistsMessage=The Certificate already exists.
deleted file mode 100644
--- a/security/manager/chrome/pippki/validation.dtd
+++ /dev/null
@@ -1,34 +0,0 @@
-<!-- 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  validation.crlmanager.label             "Gestiona les CRL">
-<!ENTITY  validation.crlmanager.description       "Aquestes llistes de revocació de certificats (CRL) s'emmagatzemen en la vostra base de dades de certificats:">
-<!ENTITY  validation.crlname.label                "Nom">
-<!ENTITY  validation.crllastupdate.label          "Darrera actualització">
-<!ENTITY  validation.crlnextupdate.label          "Següent actualització">
-<!ENTITY  validation.crlautoupdateenabled.label   "Actualització automàtica">
-<!ENTITY  validation.crlautoupdatestatus.label    "Estat de l'actualització automàtica">
-<!ENTITY  validation.deletecrl.label              "Suprimeix">
-<!ENTITY  validation.deletecrl.accesskey          "u">
-<!ENTITY  validation.updatecrl.label              "Actualitza">
-<!ENTITY  validation.updatecrl.accesskey          "z">
-<!ENTITY  validation.advanced.label               "Paràmetres">
-<!ENTITY  validation.advanced.accesskey           "P">
-
-<!ENTITY  validation.crl.autoupdate.title         "Preferències d'actualització automàtica de la CRL">
-<!ENTITY  validation.crl.autoupdate.enable.label  "Habilita automàticament l'actualització per a aquesta CRL">
-<!ENTITY  validation.crl.autoupdate.time.label1   "Actualitza">
-<!ENTITY  validation.crl.autoupdate.time.label2   "Dia/es abans de la propera data d'actualització">
-<!ENTITY  validation.crl.autoupdate.freq.label1   "Actualitza cada">
-<!ENTITY  validation.crl.autoupdate.freq.label2   "Dia/es">
-<!ENTITY  validation.crl.autoupdate.url.label     "La CRL s'hauria d'importar des de:">
-<!ENTITY  crl.import.status.title                 "Estat d'importació de la CRL">
-<!ENTITY  crl.import.success.message              "La llista de revocació de certificats (CRL) s'ha importat amb èxit.">
-<!ENTITY  crl.issuer.label                        "CRL emesa per:">
-<!ENTITY  crl.issuer.org.label                    "Organització: ">
-<!ENTITY  crl.issuer.orgunit.label                "Unitat: ">
-<!ENTITY  crl.import.nextupdate.label             "Següent actualització el: ">
-<!ENTITY  crl.autoupdate.fail.cnt.label           "Fallades d'actualització consecutives anteriors: ">
-<!ENTITY  crl.autoupdate.fail.reason.label        "Detalls de la darrera fallada d'actualització: ">
-<!ENTITY  edit.button                             "Paràmetres">
--- a/suite/chrome/browser/navigator.properties
+++ b/suite/chrome/browser/navigator.properties
@@ -13,20 +13,21 @@ droponhometitle=Defineix la pàgina inicial
 droponhomemsg=Voleu que aquest document sigui la vostra nova pàgina inicial?
 droponhomeokbutton=Defineix la pàgina inicial
 
 jserror=S'ha produït un error en aquesta pàgina; feu doble clic aquí per als detalls.
 
 #SessionHistory.js
 nothingAvailable=(No hi ha res disponible)
 
-#nsContextMenu.js (setWallpaper confirmation dialog)
-wallpaperConfirmTitle  = Assigna com a fons d'escriptori
-wallpaperConfirmButton = Configura el fons d'escriptori
-wallpaperConfirmMsg    = Voleu configurar aquesta imatge com a fons d'escriptori?
+#nsBrowserStatusHandler.js
+# LOCALIZATION NOTE: %S is the security certifiate issuer
+securityButtonTooltipSecure=Signed by %S
+securityButtonTooltipMixedContent=Warning: Contains unauthenticated content
+securityButtonTooltipInsecure=Displays security information about the current page
 
 # menu_close labels
 tabs.closeTab.label=Tanca la pestanya
 tabs.closeTab.accesskey=c
 tabs.close.label=Tanca
 tabs.close.accesskey=c
 
 tabs.recentlyClosed.format=%1$S %2$S
--- a/suite/chrome/browser/pageInfo.dtd
+++ b/suite/chrome/browser/pageInfo.dtd
@@ -19,17 +19,17 @@
 <!ENTITY  copyLinks.accesskey       "e">
 <!ENTITY  openInNewTab.label        "Obre en una pestanya nova">
 <!ENTITY  openInNewTab.accesskey    "p">
 <!ENTITY  openInNewWindow.label     "Obre en una finestra nova">
 <!ENTITY  openInNewWindow.accesskey "f">
 
 <!ENTITY  generalTab            "General">
 <!ENTITY  generalTab.accesskey  "G">
-<!ENTITY  generalURL            "URL:">
+<!ENTITY  generalURL            "Adreça:">
 <!ENTITY  generalType           "Tipus:">
 <!ENTITY  generalMode           "Mode de representació:">
 <!ENTITY  generalSize           "Mida:">
 <!ENTITY  generalReferrer       "URL referent:">
 <!ENTITY  generalSource         "Origen:">
 <!ENTITY  generalModified       "Modificat:">
 <!ENTITY  generalEncoding       "Codificació:">
 <!ENTITY  generalMetaName       "Nom">
@@ -55,17 +55,17 @@
 <!ENTITY  linkName              "Nom">
 <!ENTITY  linkAddress           "Adreça">
 <!ENTITY  linkType              "Tipus">
 <!ENTITY  linkTarget            "Objectiu">
 <!ENTITY  linkAccessKey         "Drecera de teclat">
 
 <!ENTITY  mediaTab              "Multimèdia">
 <!ENTITY  mediaTab.accesskey    "M">
-<!ENTITY  mediaURL              "URL:">
+<!ENTITY  mediaURL              "Adreça:">
 <!ENTITY  mediaAlt              "Text alternatiu:">
 <!ENTITY  mediaAltHeader        "Text alternatiu">
 <!ENTITY  mediaAddress          "Adreça">
 <!ENTITY  mediaType             "Tipus">
 <!ENTITY  mediaSize             "Mida">
 <!ENTITY  mediaCount            "Recompte">
 <!ENTITY  mediaDimensions       "Dimensions:">
 <!ENTITY  mediaPhysDimensions   "Dimensions reals:">
@@ -88,16 +88,17 @@
 <!ENTITY  permAskAlways         "Demana-m'ho sempre">
 <!ENTITY  permAllow             "Permet">
 <!ENTITY  permAllowSession      "Permet durant la sessió">
 <!ENTITY  permBlock             "Bloca">
 <!ENTITY  permissionsFor        "Permisos per:">
 <!ENTITY  permImage             "Carregar imatges">
 <!ENTITY  permPopup             "Obrir finestres emergents">
 <!ENTITY  permCookie            "Definir galetes">
+<!ENTITY  permNotifications     "Show Notifications">
 <!ENTITY  permInstall           "Instal·lar extensions o temes">
 <!ENTITY  permGeo               "Compartir la ubicació">
 
 <!ENTITY  securityTab           "Seguretat">
 <!ENTITY  securityTab.accesskey "S">
 <!ENTITY  securityHeader        "Informació de seguretat de la pàgina">
 <!ENTITY  securityView.certView "Visualitza el certificat">
 <!ENTITY  securityView.accesskey "V">
--- a/suite/chrome/common/notification.properties
+++ b/suite/chrome/common/notification.properties
@@ -37,16 +37,24 @@ activatepluginsMessage.activate.label=Ac
 activatepluginsMessage.activate.accesskey=A
 activatepluginsMessage.dismiss.label=No activis
 activatepluginsMessage.dismiss.accesskey=D
 activatepluginsMessage.remember=Recorda per aquest lloc
 activatepluginsMessage.always.label=Activa sempre els connectors per aquest lloc
 activatepluginsMessage.always.accesskey=c
 activatepluginsMessage.never.label=No activis mai els connectors per aquest lloc
 activatepluginsMessage.never.accesskey=N
+activateSinglePlugin=Activate
+PluginClickToActivate=Activate %S.
+PluginVulnerableUpdatable=This plugin is vulnerable and should be updated.
+PluginVulnerableNoUpdate=This plugin has security vulnerabilities.
+vulnerableUpdatablePluginWarning=Outdated Version!
+vulnerableNoUpdatePluginWarning=Vulnerable Plugin!
+vulnerablePluginsMessage=Some plugins have been deactivated for your safety.
+pluginInfo.unknownPlugin=Unknown
 
 popupWarning=El %S ha evitat que el lloc web obri una finestra emergent.
 popupWarningMultiple=El %S ha evitat que el lloc web obri %S finestres emergents.
 popupWarningButton=Preferències
 popupWarningButton.accesskey=P
 
 xpinstallHostNotAvailable=servidor central desconegut
 xpinstallPromptWarning=El %S ha evitat que el lloc (%S) us demani instal·lar programari al vostre ordinador.
@@ -121,16 +129,28 @@ geolocation.neverShareLocation=Mai la co
 geolocation.neverShareLocation.accesskey=M
 geolocation.siteWantsToKnow=Aquest lloc web (%S) vol conèixer la vostra ubicació.
 geolocation.fileWantsToKnow=El fitxer %S vol conèixer la vostra ubicació.
 # LOCALIZATION NOTE (geolocation.learnMore): Use the unicode ellipsis char, \u2026,
 # or use "..." unless \u2026 doesn't suit traditions in your locale.
 geolocation.learnMore=Més informació…
 geolocation.remember=Recorda-ho per a aquest lloc
 
+# Desktop Notifications
+webNotifications.showForSession=Show Notifications
+webNotifications.showForSession.accesskey=w
+webNotifications.dontShowForSession=Don't Show
+webNotifications.dontShowForSession.accesskey=o
+webNotifications.alwaysShow=Always Show
+webNotifications.alwaysShow.accesskey=A
+webNotifications.neverShow=Never Show
+webNotifications.neverShow.accesskey=N
+webNotifications.showFromSite=Would you like to show notifications from %S?
+webNotifications.remember=Remember for this website
+
 # IndexedDB
 offlineApps.permissions=El lloc web (%S) està demanant emmagatzemar dades en el vostre ordinador per a un ús fora de línia.
 offlineApps.quota=El lloc web (%1$S) està intentant emmagatzemar més de %2$S MB de dades en el vostre ordinador per a un ús fora de línia.
 offlineApps.allow=Permet
 offlineApps.allow.accesskey=P
 offlineApps.later=Ara no
 offlineApps.later.accesskey=n
 offlineApps.deny=Mai per a aquest lloc
--- a/suite/chrome/common/pref/pref-ssl.dtd
+++ b/suite/chrome/common/pref/pref-ssl.dtd
@@ -11,16 +11,18 @@
 <!ENTITY limit.description                  "Podeu restringir els protocols que s'utilitzaran en les connexions segures. Seleccioneu una única versió o un interval continu de versions.">
 <!ENTITY limit.enable.label                 "Habilita:">
 <!ENTITY limit.ssl30.label                  "SSL 3.0">
 <!ENTITY limit.ssl30.accesskey              "3">
 <!ENTITY limit.tls10.label                  "TLS 1.0">
 <!ENTITY limit.tls10.accesskey              "T">
 <!ENTITY limit.tls11.label                  "TLS 1.1">
 <!ENTITY limit.tls11.accesskey              "1">
+<!ENTITY limit.tls12.label                  "TLS 1.2">
+<!ENTITY limit.tls12.accesskey              "2">
 
 <!ENTITY warn.description                   "El &brandShortName; pot avisar-vos de l'estat de seguretat de la pàgina web que estigueu visitant. Pot fer-se que el &brandShortName; mostri un avís i demani permís abans de:">
 <!ENTITY warn.enteringsecure                "Carregar una pàgina xifrada">
 <!ENTITY warn.enteringsecure.accesskey      "C">
 <!ENTITY warn.insecurepost                  "Enviar dades de formulari d'una pàgina sense xifrar a una altra que tampoc ho estigui">
 <!ENTITY warn.insecurepost.accesskey        "s">
 <!ENTITY warn.leavingsecure                 "Abandonar una pàgina amb xifratge">
 <!ENTITY warn.leavingsecure.accesskey       "A">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/mailnews/folderWidgets.properties
@@ -0,0 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE(globalInbox)
+# %S=name of the Local folders account
+globalInbox=Global Inbox (%S)
--- a/suite/chrome/mailnews/localMsgs.properties
+++ b/suite/chrome/mailnews/localMsgs.properties
@@ -14,211 +14,134 @@ pop3EnterPasswordPromptTitle=Introduïu la vostra contrasenya
 pop3EnterPasswordPrompt=Introduïu la vostra contrasenya per a %1$S del servidor %2$S:
 
 # LOCALIZATION NOTE(pop3PreviouslyEnteredPasswordIsInvalidPrompt): Do not
 # translate the words "%1$S" and "%2$S" below. Place the word %1$S where the
 # user name should appear, and %2$S where the host name should appear.
 pop3PreviouslyEnteredPasswordIsInvalidPrompt=Introduïu correctament la vostra contrasenya per a %1$S del servidor %2$S:
 
 # Status - Downloading message n of m to account
-## @name receivingMsgs
-## @loc None
 #LOCALIZATION NOTE (receivingMsgs): Do not translate %1$S, %2$S, or %3$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;
 # Place %3$S where the account name should appear.
 receivingMsgs=S'està baixant el missatge %1$S de %2$S a %3$S
 
 # Status - connecting to host
-## @name hostContacted
-## @loc None
 #LOCALIZATION NOTE : Do not translate %1$S in the following line.
 # Place %1$S where the account name should appear
 hostContacted=Connexió: S'ha contactat amb el servidor %1$S, s'està enviant la informació d'autenticació…
 
 # Status - no messages to download 
-## @name noMessages
-## @loc None
 #LOCALIZATION NOTE : Do not translate %1$S in the following line.
 # Place %1$S where the account name should appear
 noMessages=No hi ha missatges nous a %1$S.
 
 # Status - messages received after the download
-## @name receivedMessages
-## @loc None
 #LOCALIZATION NOTE : Do not translate %1$S, %2$S or %3$S in the following line.
 # %1$S will receive the number of messages received
 # %2$S will receive the total number of messages
 # Place %3$S where the account name should appear
 receivedMessages=El compte %3$S ha rebut %1$S missatges de %2$S que hi ha en total
 
-## @name MK_POP3_OUT_OF_DISK_SPACE
-## @loc None
--321=No hi ha prou espai al disc per baixar nous missatges. Intenteu suprimir missatges antics, buidar la carpeta Paperera i compactar les carpetes de correu, i torneu-ho a provar.
+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 - parsing folder
-## @name LOCAL_STATUS_SELECTING_MAILBOX
-## @loc None
-#LOCALIZATION NOTE (4000): Do not translate %s in the following line.
-# Place the word %s where the name of the mailbox should appear
-4000=S'està construint el fitxer de resum per a %S…
+#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…
 
 # Status - parsing folder
-## @name LOCAL_STATUS_DOCUMENT_DONE
-## @loc None
-4001=Fet
+localStatusDocumentDone=Done
 
 # Status - pop3 server error
-## @name POP3_SERVER_ERROR
-## @loc None
-#LOCALIZATION NOTE (4003): Do not translate POP3 in the following line.
-4003=S'ha produït un error amb el servidor de correu POP3.
+#LOCALIZATION NOTE (pop3ServerError): Do not translate POP3 in the following line.
+pop3ServerError=An error occurred with the POP3 mail server.
 
 # Status - pop3 user name failed
-## @name POP3_USERNAME_FAILURE
-## @loc None
-4004=L'ordre USER no ha tingut èxit.
+pop3UsernameFailure=Sending of username did not succeed.
 
 # Status - password failed
-## @name POP3_PASSWORD_FAILURE
-## @loc None
-4005=L'ordre PASS no ha tingut èxit.
-
-# Status - write error occurred
-## @name POP3_MESSAGE_WRITE_ERROR
-## @loc None
-4006=No es pot escriure el correu a la bústia. Assegureu-vos que teniu privilegis d'escriptura del sistema de fitxers i que teniu prou espai al disc per copiar-hi la bústia.
+pop3PasswordFailure=Sending of password did not succeed.
 
 # Status - write error occurred
-## @name POP3_MESSAGE_FOLDER_BUSY
-## @loc None
-4029=Aquesta carpeta s'està processant. Espereu fins que el processament acabi per rebre els missatges.
+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.
+
+# Status - write error occurred
+pop3MessageFolderBusy=This folder is being processed. Please wait until processing is complete to get messages.
 
 # Status - retr failure from the server
-## @name POP3_RETR_FAILURE
-## @loc None
-# LOCALIZATION NOTE(4012): Do not translate the word "POP3" below.
-4012=L'ordre RETR no ha tingut èxit.
+pop3RetrFailure=The RETR command did not succeed. Error retrieving a message.
 
 # Status - password undefined 
-## @name POP3_PASSWORD_UNDEFINED
-## @loc None
-4013=S'ha produït un error en recuperar la contrasenya de correu.
+pop3PasswordUndefined=Error getting mail password.
 
 # Status - username undefined 
-## @name POP3_USERNAME_UNDEFINED
-## @loc None
-4014=No heu indicat cap nom d'usuari per a aquest servidor. Indiqueu-ne un al menú de configuració de comptes i torneu-ho a provar.
+pop3UsernameUndefined=You have not supplied a username for this server.  Please provide one in the account setup menu and try again.
 
 # Status - list failure
-## @name POP3_LIST_FAILURE
-## @loc None
-# LOCALIZATION NOTE(4015): Do not translate the word "POP3" below.
-4015=L'ordre LIST no ha tingut èxit.
+pop3ListFailure=The LIST command did not succeed. Error getting the ID and size of a message.
 
 # Status - delete error 
-## @name POP3_DELE_FAILURE
-## @loc None
-# LOCALIZATION NOTE(4016): Do not translate the word "POP3" below.
-4016=L'ordre DELE no ha tingut èxit.
+pop3DeleFailure=The DELE command did not succeed. Error marking a message as deleted.
 
 # Status - stat failed
-## @name POP3_STAT
-## @loc None
-4024= L'ordre STAT no ha tingut èxit.
+pop3StatFail=The STAT command did not succeed. Error getting message number and sizes.
 
-## @name POP3_SERVER_SAID
-## @loc None
-4025= El servidor de correu %S ha respost:
+#LOCALIZATION NOTE (pop3ServerSaid): Do not remove the leading space during translation.
+pop3ServerSaid= Mail server %S responded: 
 
-## @name COPYING_MSGS_STATUS
-## @loc None
-4027=S'estan copiant %S de %S missatges a %S
+copyingMessagesStatus=Copying %S of %S messages to %S
 
-## @name MOVING_MSGS_STATUS
-## @loc None
-4028=S'estan movent %S de %S missatges a %S
+movingMessagesStatus=Moving %S of %S messages to %S
 
-## @name MOVEMAIL_CANT_OPEN_SPOOL_FILE
-## @loc None
-4033=No es pot obrir el fitxer de la impressora del correu %S.
+movemailCantOpenSpoolFile=Unable to open mail spool file %S.
 
-## @name MOVEMAIL_CANT_CREATE_LOCK
-## @loc None
-4034=No es pot crear el fitxer de blocatge %S. Per poder treballar-hi, és necessari crear fitxers de blocatge en el directori de gestió de cues del correu. En alguns sistemes, això s'assoleix fent que el directori de gestió de cues tingui el mode 01777.
+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.
 
-## @name MOVEMAIL_CANT_DELETE_LOCK
-## @loc None
-4035=No es pot suprimir el fitxer de bloqueig %S.
+movemailCantDeleteLock=Unable to delete lock file %S.
+
+movemailCantTruncateSpoolFile=Unable to truncate spool file %S.
 
-## @name MOVEMAIL_CANT_TRUNCATE_SPOOL_FILE
-## @loc None
-4036=No es pot truncar el fitxer de gestió de cues %S.
+movemailSpoolFileNotFound=Unable to locate mail spool file.
 
-## @name MOVEMAIL_SPOOL_FILE_NOT_FOUND
-## @loc None
-4037=No es pot localitzar el fitxer de gestió de cues del correu.
+#LOCALIZATION NOTE (movemailCantParseSpool): %S is file name
+movemailCantParseSpool=Unable to parse spool file %S. The file may be corrupt or not valid.
 
-## @name POP3_TMP_DOWNLOAD_FAILED
-## @loc None
-4038=S'ha produït un error en baixar el missatge següent:   \nDe: %S\n   Assumpte: %S\n Aquest missatge pot contenir un virus o no hi ha prou espai de disc. Voleu ometre aquest missatge?
+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 - the server doesn't support UIDL…
-## @name POP3_SERVER_DOES_NOT_SUPPORT_UIDL_ETC
-## @loc None
-# LOCALIZATION NOTE(4010): The following sentence should be translated in this way:
+# 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"
-4040=El servidor POP3 (%S) no permet l'ús d'UIDL, que és necessari per utilitzar les opcions «Deixa al servidor» i «Mida màxima del missatge». Per baixar el correu, desactiveu aquestes opcions al quadre Servidor de correu de Preferències.
+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 - the server doesn't support the top command
-## @name POP3_SERVER_DOES_NOT_SUPPORT_THE_TOP_COMMAND
-## @loc None
-# LOCALIZATION NOTE(4011): The following sentence should be translated in this way:
+# 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"
-4041=El servidor de correu POP3 (%S) no permet l'ús de l'ordre TOP. Per això, no es pot utilitzar l'opció «Mida màxima del missatge» o «Recull només les capçaleres». Aquesta opció ha estat inhabilitada: els missatges es baixaran independentment de la mida.
+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.
 
-## @name NS_ERROR_COULD_NOT_CONNECT_VIA_TLS
-## @loc None
-4043=No s'ha pogut establir una connexió TLS amb el servidor POP3. El servidor pot haver caigut o estar configurat incorrectament. Comproveu que tingueu la configuració correcta dels paràmetres del vostre servidor de correu a la finestra de Paràmetres del compte i torneu-ho a provar.
+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.
 
-## @name POP3_MOVE_FOLDER_TO_TRASH
-## @loc None
-# LOCALIZATION NOTE (4044): Do not translate the word %S below.
+# LOCALIZATION NOTE (pop3MoveFolderToTrash): Do not translate the word %S below.
 # "%S" is the name of the folder.
-4044=Esteu segur que voleu suprimir la carpeta «%S»?
+pop3MoveFolderToTrash=Are you sure you want to delete the folder '%S'?
 
-## @name POP3_DELETE_FOLDER_DIALOG_TITLE
-## @loc None
-4045=Suprimeix la carpeta
+pop3DeleteFolderDialogTitle=Delete Folder
 
-## @name POP3_DELETE_FOLDER_BUTTON_LABEL
-## @loc None
-4046=&Suprimeix la carpeta
+pop3DeleteFolderButtonLabel=&Delete Folder
 
-## @name POP3_AUTH_INTERNAL_ERROR
-## @loc None
-4047=S'ha produït un error intern mentre es realitzava l'autenticació al servidor POP3. Aquest error intern de l'aplicació no s'hauria d'haver produït, notifiqueu-lo.
+pop3AuthInternalError=Internal state error during POP3 server authentication. This is an internal, unexpected error in the application, please report it as bug.
 
-## @name POP3_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
-## @loc None
-4048=El servidor POP3 no sembla que permeti les contrasenyes encriptades. Si només heu configurat aquest compte, proveu de posar «Contrasenya, enviada sense seguretat» com a «Mètode d'autenticació» a «Opcions del compte | opcions del servidor». Si el feu servir a la feina i ara comença a donar errors, pot ser que algú estigui intentant de robar-vos la contrasenya.
+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.
 
-## @name POP3_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
-## @loc None
-4049=El servidor POP3 no sembla que permeti les contrasenyes encriptades. Si només heu configurat aquest compte, proveu de posar «Contrasenya normal» com a «Mètode d'autenticació» a «Opcions del compte | opcions del servidor». Si el feu servir a la feina i ara comença a donar errors, contacteu amb el vostre administrador del compte o amb el vostre proveïdor.
+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.
 
-## @name POP3_AUTH_CHANGE_PLAIN_TO_ENCRYPT
-## @loc None
-4050=El servidor POP3 no sembla que permeti les contrasenyes normals. Proveu de posar «Contrasenya encriptada» com a «Mètode d'autenticació» a «Opcions del compte | opcions del servidor».
+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'.
 
 # Authentication server caps and pref don't match
-## @name POP3_AUTH_MECH_NOT_SUPPORTED
-## @loc None
-4051=El servidor no permet el mètode d'autenticació seleccionat. Canvieu el «Mètode d'autenticació» a «Opcions del compte | opcions del servidor».
+pop3AuthMechNotSupported=The server does not support the selected authentication method. Please change the 'Authentication method' in the 'Account Settings | Server settings'.
 
 # Status - Could not log in to GSSAPI, and it was the only method
-## @name POP3_GSSAPI_FAILURE
-## @loc None
-4052=El segell Kerberos/GSSAPI no ha sigut acceptat pel servidor POP. Assegureu-vos que heu iniciat una sessió al servidor Kerberos/GSSAPI.
+pop3GssapiFailure=The Kerberos/GSSAPI ticket was not accepted by the POP server. Please check that you are logged in to the Kerberos/GSSAPI realm.
--- a/suite/chrome/mailnews/messenger.properties
+++ b/suite/chrome/mailnews/messenger.properties
@@ -414,17 +414,17 @@ tabs.closeWarningPromptMe=Avisa'm abans 
 
 # Messenger bootstrapping messages
 fileNotFoundTitle = No s'ha trobat el fitxer
 #LOCALIZATION NOTE(fileNotFoundMsg): %S is the filename
 fileNotFoundMsg = El fitxer %S no existeix.
 
 confirmMsgDelete.title=Confirmeu la supressió
 confirmMsgDelete.collapsed.desc=Se suprimiran els missatges dels fils reduïts. Voleu continuar?
-confirmMsgDelete.shiftDel.desc=Els missatges se suprimiran immediatament, sense desar una còpia a la Paperera. Voleu continuar?
+confirmMsgDelete.deleteNoTrash.desc=This will delete messages immediately, without saving a copy to Trash. Are you sure you want to continue?
 confirmMsgDelete.dontAsk.label=No m'ho tornis a demanar.
 confirmMsgDelete.delete.label=Suprimeix
 
 mailServerLoginFailedTitle=L'inici de sessió ha fallat
 # LOCALIZATION NOTE (mailServerLoginFailedTitle): Insert "%S" in your
 # translation where you wish to display the hostname of the server to which
 # login failed.
 mailServerLoginFailed=L'inici de sessió amb el servidor %S ha fallat.
--- a/suite/chrome/mailnews/pref/am-server-advanced.dtd
+++ b/suite/chrome/mailnews/pref/am-server-advanced.dtd
@@ -20,16 +20,14 @@
 <!ENTITY personalNamespace.accesskey "p">
 <!ENTITY publicNamespace.label "Públic (compartit):">
 <!ENTITY publicNamespace.accesskey "b">
 <!ENTITY otherUsersNamespace.label "Altres usuaris:">
 <!ENTITY otherUsersNamespace.accesskey "u">
 <!ENTITY overrideNamespaces.label "Permet que el servidor substitueixi aquests espais de noms">
 <!ENTITY overrideNamespaces.accesskey "a">
 <!ENTITY pop3Desc.label "Quan es baixi el correu POP d'aquest servidor, utilitza la carpeta següent per al correu nou:" >
-<!ENTITY globalInbox.label "Safata d'entrada global (compte de les carpetes locals)">
-<!ENTITY globalInbox.accesskey "g">
 <!ENTITY accountDirectory.label "Safata d'entrada per al compte d'aquest servidor">
 <!ENTITY accountDirectory.accesskey "S">
 <!ENTITY deferToServer.label "Una safata d'entrada per cada compte diferent">
 <!ENTITY deferToServer.accesskey "f">
 <!ENTITY deferGetNewMail.label "Inclou aquest servidor en comprovar si hi ha correu nou">
 <!ENTITY deferGetNewMail.accesskey "I">
--- a/suite/chrome/mailnews/pref/pref-notifications.dtd
+++ b/suite/chrome/mailnews/pref/pref-notifications.dtd
@@ -7,19 +7,18 @@
 <!ENTITY newMessagesArrive.label          "En arribar missatges nous:">
 <!-- LOCALIZATION NOTE: (showAlertFor.label, showAlertTimeEnd.label)
      showAlertFor.label is associated with the checkbox to show the alert,
      leading into a numerical field to enter a time in seconds, followed by
      showAlertTimeEnd.label which in en-US is the unit of the value -->
 
 
 <!ENTITY showAlertFor.label               "Mostra una alerta durant">
-<!ENTITY showAlertFor.accesskey           "S">
+<!ENTITY showAlertFor.accesskey           "s">
 <!ENTITY showAlertTimeEnd.label           "segons">
-<!ENTITY showAlertTimeEnd.accesskey       "g">
 
 <!ENTITY showAlertPreviewText.label       "Mostra una previsualització del text del missatge">
 <!ENTITY showAlertPreviewText.accesskey   "v">
 <!ENTITY showAlertSubject.label           "Mostra l'assumpte">
 <!ENTITY showAlertSubject.accesskey       "u">
 <!ENTITY showAlertSender.label            "Mostra el remitent">
 <!ENTITY showAlertSender.accesskey        "n">
 
--- a/toolkit/chrome/global/aboutSupport.dtd
+++ b/toolkit/chrome/global/aboutSupport.dtd
@@ -12,16 +12,21 @@ del &brandShortName;, visiteu el nostre <a id='supportLink'>lloc web d'assistència</a>.">
 <!ENTITY aboutSupport.extensionName "Nom">
 <!ENTITY aboutSupport.extensionEnabled "Habilitada">
 <!ENTITY aboutSupport.extensionVersion "Versió">
 <!ENTITY aboutSupport.extensionId "ID">
 
 <!ENTITY aboutSupport.appBasicsTitle "Paràmetres bàsics de l'aplicació">
 <!ENTITY aboutSupport.appBasicsName "Nom">
 <!ENTITY aboutSupport.appBasicsVersion "Versió">
+<!-- LOCALIZATION NOTE (aboutSupport.appBasicsUpdateHistory, aboutSupport.appBasicsShowUpdateHistory):
+"Update" is a noun here, not a verb. -->
+
+<!ENTITY aboutSupport.appBasicsUpdateHistory "Actualitza l'historial">
+<!ENTITY aboutSupport.appBasicsShowUpdateHistory "Mostra l'actualització de l'historial">
 
 <!ENTITY aboutSupport.appBasicsProfileDir "Directori del perfil">
 <!-- LOCALIZATION NOTE (aboutSupport.appBasicsProfileDirWinMac):
 This is the Windows- and Mac-specific variant of aboutSupport.appBasicsProfileDir.
 Windows/Mac use the term "Folder" instead of "Directory" -->
 <!ENTITY aboutSupport.appBasicsProfileDirWinMac "Carpeta del perfil">
 
 <!ENTITY aboutSupport.appBasicsEnabledPlugins "Connectors habilitats">
--- a/toolkit/chrome/mozapps/downloads/downloads.properties
+++ b/toolkit/chrome/mozapps/downloads/downloads.properties
@@ -39,21 +39,30 @@ cancelDownloadsOKTextMultiple=Cancel·la %S baixades
 dontQuitButtonWin=No surtis
 dontQuitButtonMac=No surtis
 dontGoOfflineButton=Roman en línia
 dontEnterPrivateBrowsingButton=No iniciïs el mode de navegació privada
 dontLeavePrivateBrowsingButton=Continua en el mode de navegació privada
 downloadsCompleteTitle=Les baixades s'han acabat
 downloadsCompleteMsg=S'han acabat de baixar tots els fitxers.
 
+# LOCALIZATION NOTE (infiniteRate):
+# If download speed is a JavaScript Infinity value, this phrase is used
+infiniteRate=Molt ràpid
+
 # LOCALIZATION NOTE (statusFormat3): — is the "em dash" (long dash)
 # %1$S transfer progress; %2$S rate number; %3$S rate unit; %4$S time left
 # example: 4 minutes left — 1.1 of 11.1 GB (2.2 MB/sec)
 statusFormat3=%4$S — %1$S (%2$S %3$S/seg)
 
+# 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)
+
 # LOCALIZATION NOTE (statusFormatNoRate): — is the "em dash" (long dash)
 # %1$S transfer progress; %2$S time left
 # example: 4 minutes left — 1.1 of 11.1 GB
 statusFormatNoRate=%2$S — %1$S
 
 bytes=bytes
 kilobyte=KB
 megabyte=MB
--- a/toolkit/chrome/mozapps/update/updates.dtd
+++ b/toolkit/chrome/mozapps/update/updates.dtd
@@ -14,16 +14,22 @@
 <!ENTITY  noupdatesautoenabled.intro      "No hi ha cap actualització disponible. El &brandShortName; comprovarà periòdicament si hi ha noves actualitzacions.">
 <!ENTITY  noupdatesautodisabled.intro     "No hi ha cap actualització disponible. Torneu-ho a provar més endavant o habiliteu la comprovació d'actualitzacions automàtica del &brandShortName;.">
 
 <!ENTITY  manualUpdate.title              "No es pot actualitzar">
 <!ENTITY  manualUpdate.desc               "Hi ha una actualització de seguretat i estabilitat recomanada disponible, però no teniu els permisos necessaris per instal·lar-la. Contacteu amb el vostre administrador de sistemes o torneu a provar-ho des d'un compte que tingui permisos per instal·lar programari en aquest ordinador.">
 <!ENTITY  manualUpdate.space.desc         "Hi ha una actualització de seguretat i estabilitat recomanada disponible, però no teniu espai suficient per instal·lar-la.">
 <!ENTITY  manualUpdateGetMsg.label        "Sempre podeu aconseguir la darrera versió del &brandShortName; a:">
 
+<!ENTITY  unsupported.title               "Sistema no suportat">
+<!ENTITY  unsupported.label               "el &brandShortName; no està actualitzat, però la darrera versió 
+no té suport per al vostre sistema. Actualitzeu el sistema i torneu a provar. 
+Aquest missatge només es mostra una vegada però podeu">
+<!ENTITY  unsupportedLink.label           "aprendre'n més">
+
 <!ENTITY  incompatibleCheck.title         "S'està comprovant la compatibilitat dels complements">
 <!ENTITY  incompatibleCheck.label         "S'estan cercant versions més noves dels vostres complements…">
 
 <!ENTITY  clickHere.label                 "Feu clic aquí per a més informació general d'aquesta actualització">
 
 <!ENTITY  evangelism.desc                 "És molt recomanable que apliqueu aquesta actualització en el &brandShortName; tan aviat com sigui possible.">
 
 <!ENTITY  license.instructions            "Si esteu d'acord amb els termes d'aquest acord, feu clic a Accepto 
--- a/toolkit/chrome/search/search.properties
+++ b/toolkit/chrome/search/search.properties
@@ -1,15 +1,15 @@
 # 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/.
 
 addEngineConfirmTitle=Addició d'un motor de cerca
 addEngineConfirmation=Voleu afegir «%S» a la llista de motors disponibles a la barra de cerca?\n\nDe: %S
-addEngineUseNowText=Comença a &utilitzar-lo a partir d'ara
+addEngineAsCurrentText=Fes que aquest sigui el motor de cerca per defecte
 addEngineAddButtonLabel=Afegeix
 
 error_loading_engine_title=Error en la baixada
 # LOCALIZATION NOTE (error_loading_engine_msg2): %1$S = brandShortName, %2$S = location
 error_loading_engine_msg2=El %S no ha pogut baixar el connector de cerca de:\n%S
 error_duplicate_engine_msg=El %S no ha pogut instal·lar el motor de cerca de «%S» perquè ja n'existeix un amb el mateix nom.
 
 error_invalid_engine_title=Error d'instal·lació