update to last CALENDAR_1_9_BUILD1 CALENDAR_1_9_RELEASE CALENDAR_1_9b2_BUILD1 CALENDAR_1_9b2_RELEASE
authorEduard Gamonal <edu@eduard-gamonal.net>
Sat, 29 Sep 2012 15:25:16 -0400
changeset 1103 36f2883afc0d2a1c5d9831d42e5ac9e0dadb1da4
parent 1102 ecc57c47fde637b5a3283aa083ccefe9ec6e16f2
child 1104 390565223425c1fc28c7ee763ce365bdd820c7f1
child 1112 e953be0ad4dfcc597c2195b23278a27e9b58b5d3
child 1137 ed3574b34ee7a5ef0772f68aa847f1dbd445ff31
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:43:21 +0000
update to last
browser/chrome/browser/aboutHome.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/styleinspector.properties
browser/chrome/browser/devtools/webConsole.dtd
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/downloads/downloads.dtd
browser/chrome/browser/downloads/downloads.properties
browser/chrome/browser/pageInfo.dtd
browser/chrome/browser/preferences/privacy.dtd
browser/chrome/overrides/settingsChange.dtd
calendar/chrome/calendar/calendar-event-dialog-attendees.properties
calendar/chrome/calendar/calendar-event-dialog.dtd
calendar/chrome/calendar/calendar-event-dialog.properties
calendar/chrome/calendar/calendar.dtd
calendar/chrome/lightning/lightning-toolbar.dtd
calendar/chrome/lightning/lightning.properties
chat/conversations.properties
chat/irc.properties
dom/chrome/dom/dom.properties
dom/chrome/layout/css.properties
mail/chrome/messenger/FilterEditor.dtd
mail/chrome/messenger/FilterListDialog.dtd
mail/chrome/messenger/aboutDialog.dtd
mail/chrome/messenger/accountCreation.dtd
mail/chrome/messenger/addressbook/abCardViewOverlay.dtd
mail/chrome/messenger/am-mdn.dtd
mail/chrome/messenger/cloudfile/Box/auth.dtd
mail/chrome/messenger/cloudfile/Box/settings.dtd
mail/chrome/messenger/cloudfile/Dropbox/management.dtd
mail/chrome/messenger/cloudfile/Dropbox/settings.dtd
mail/chrome/messenger/filter.properties
mail/chrome/messenger/folderProps.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/sendProgress.dtd
mail/chrome/messenger/messengercompose/sendProgress.properties
mail/chrome/messenger/msgHdrViewOverlay.dtd
mail/chrome/messenger/preferences/general.dtd
mail/chrome/messenger/preferences/junkLog.dtd
mail/chrome/messenger/prefs.properties
mail/chrome/messenger/sanitize.dtd
mail/chrome/messenger/searchTermOverlay.dtd
mobile/android/base/android_strings.dtd
mobile/android/base/sync_strings.dtd
mobile/android/chrome/aboutAddons.dtd
mobile/android/chrome/aboutApps.dtd
mobile/android/chrome/aboutFeedback.dtd
mobile/android/chrome/aboutReader.properties
mobile/android/chrome/browser.properties
security/manager/chrome/pippki/deviceManager.dtd
suite/chrome/browser/linkToolbar.dtd
suite/chrome/common/contentAreaCommands.dtd
suite/chrome/common/pref/pref-mousewheel.dtd
suite/chrome/common/setDesktopBackground.dtd
suite/chrome/mailnews/FilterEditor.dtd
suite/chrome/mailnews/addressbook/abCardOverlay.dtd
suite/chrome/mailnews/addressbook/abCardViewOverlay.dtd
suite/chrome/mailnews/compose/sendProgress.dtd
suite/chrome/mailnews/compose/sendProgress.properties
suite/chrome/mailnews/folderProps.dtd
suite/chrome/mailnews/pref/am-mdn.dtd
suite/chrome/mailnews/pref/prefs.properties
suite/chrome/mailnews/search.properties
suite/chrome/mailnews/searchTermOverlay.dtd
toolkit/chrome/global-platform/mac/platformKeys.properties
toolkit/chrome/global-platform/unix/platformKeys.properties
toolkit/chrome/global-platform/win/platformKeys.properties
--- a/browser/chrome/browser/aboutHome.dtd
+++ b/browser/chrome/browser/aboutHome.dtd
@@ -21,11 +21,11 @@
      text in <a/> will be linked to the featured add-ons on addons.mozilla.org
 -->
 <!ENTITY abouthome.defaultSnippet2.v1 "És fàcil personalitzar el vostre Firefox exactament tal com voleu. <a>Teniu milers de complements d'on triar</a>.">
 
 <!ENTITY abouthome.bookmarksButton.label "Adreces d'interès">
 <!ENTITY abouthome.historyButton.label   "Historial">
 <!ENTITY abouthome.settingsButton.label  "Preferències">
 <!ENTITY abouthome.addonsButton.label    "Complements">
-<!ENTITY abouthome.appsButton.label      "Mercat">
+<!ENTITY abouthome.appsButton.label      "Marketplace">
 <!ENTITY abouthome.downloadsButton.label "Baixades">
 <!ENTITY abouthome.syncButton.label      "&syncBrand.shortName.label;">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -101,17 +101,17 @@ These should match what Safari and other
 <!ENTITY fullScreenExit.label "Surt del mode en pantalla completa">
 <!ENTITY fullScreenExit.accesskey "p">
 <!ENTITY fullscreenAllowButton.label "Permet">
 <!ENTITY fullscreenExitButton.label "Rebutja">
 <!ENTITY fullscreenApproval.value "Voleu permetre la pantalla completa?">
 
 <!ENTITY fullscreenExitHint.value "Premeu ESC en qualsevol moment per sortir de la pantalla completa.">
 <!ENTITY leaveDOMFullScreen.label "Tanca la pantalla completa">
-<!ENTITY leaveDOMFullScreen.accesskey "u">
+<!ENTITY leaveDOMFullScreen.accesskey "p">
 
 <!ENTITY closeWindow.label "Tanca la finestra">
 <!ENTITY closeWindow.accesskey "f">
 
 <!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">
@@ -236,38 +236,29 @@ These should match what Safari and other
 
 <!ENTITY inspectCloseButton.tooltiptext "Tanca l'Inspector">
 
 <!ENTITY devToolbarCloseButton.tooltiptext "Tanca la barra per a desenvolupadors">
 <!ENTITY devToolbarMenu.label              "Barra de tasques per a desenvolupadors">
 <!ENTITY devToolbarMenu.accesskey          "v">
 <!ENTITY devToolbar.keycode                "VK_F2">
 <!ENTITY devToolbar.keytext                "F2">
+<!ENTITY devToolbarOtherToolsButton.label  "Més eines">
 
 <!ENTITY webConsoleButton.label "Consola web">
 <!ENTITY inspectorButton.label "Inspector">
 
 <!ENTITY inspectorHTMLCopyInner.label       "Copia l'HTML interior">
 <!ENTITY inspectorHTMLCopyInner.accesskey   "i">
 
 <!ENTITY inspectorHTMLCopyOuter.label       "Copia l'HTML exterior">
 <!ENTITY inspectorHTMLCopyOuter.accesskey   "o">
 
 <!ENTITY inspectorHTMLDelete.label          "Suprimeix el node ">
 <!ENTITY inspectorHTMLDelete.accesskey      "d">
-<!-- LOCALIZATION NOTE (inspectOptionButton.*): The menu in the Inspector
-  -  toolbar.  -->
-
-<!ENTITY inspectOptionButton.tooltiptext    "Opcions de l'inspector">
-<!-- LOCALIZATION NOTE: These are for the menu in the Inspector Toolbar -->
-
-<!ENTITY inspectorToggleVeil.label          "Enfosqueix la pàgina">
-<!ENTITY inspectorToggleVeil.accesskey      "E">
-<!ENTITY inspectorToggleInfobar.label       "Mostra la informació del node">
-<!ENTITY inspectorToggleInfobar.accesskey   "n">
 <!-- LOCALIZATION NOTE (inspect3DViewButton.label): This button shows an
   -  alternate view for the Inspector, creating a 3D visualization of the
   -  webpage. -->
 
 <!ENTITY inspect3DViewButton.label     "Vista 3D">
 <!ENTITY inspect3DViewButton.accesskey "3">
 
 <!ENTITY inspectStyleButton.label     "Estil">
@@ -651,13 +642,27 @@ doesn't display any label, but exposes a
 
 <!ENTITY markupButton.arialabel          "Marcat">
 <!-- LOCALIZATION NOTE (markupButton.accesskey): The key bound to the Markup panel's
 toolbar button -->
 <!ENTITY markupButton.accesskey          "M">
 
 <!ENTITY socialToolbar.title        "Botó de barra social">
 <!ENTITY social.notLoggedIn.label   "No s'ha iniciat la sessió">
+<!-- LOCALIZATION NOTE (social.ok.label, social.ok.accesskey): this string is
+     used for the "OK" button for two different social panels. One appears when
+     the feature is activated (social.activated.* below), and the other when
+     the user clicks the "Share" button a second time (social.sharePopup.*
+     below). -->
+
+<!ENTITY social.ok.label       "D'acord">
+<!ENTITY social.ok.accesskey   "O">
 
 <!ENTITY social.sharePopup.undo.label     "Deixa de compartir">
 <!ENTITY social.sharePopup.undo.accesskey "D">
-<!ENTITY social.sharePopup.ok.label       "D'acord">
-<!ENTITY social.sharePopup.ok.accesskey   "o">
+<!ENTITY social.sharePopup.shared.label   "Heu compartit la pàgina.">
+<!ENTITY social.sharePopup.portrait.arialabel "Fotografia del perfil d'usuari">
+
+<!ENTITY social.toggleSidebar.label "Mostra la barra lateral">
+<!ENTITY social.toggleSidebar.accesskey "s">
+
+<!ENTITY social.activated.undobutton.label "Desfés">
+<!ENTITY social.activated.undobutton.accesskey "D">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -353,22 +353,55 @@ telemetryNoButtonLabel = No
 telemetryNoButtonAccessKey = N
 
 # Webapps notification popup
 webapps.install = Instal·la
 webapps.install.accesskey = I
 #LOCALIZATION NOTE (webapps.requestInstall) %1$S is the web app name, %2$S is the site from which the web app is installed
 webapps.requestInstall = Voleu instal·lar «%1$S» des d'aquest lloc (%2$S)?
 webapps.install.success = S'ha instal·lat l'aplicació
+# LOCALIZATION NOTE (webapps.uninstall.notification): %S will be replaced with the name of the uninstalled web app
+webapps.uninstall.notification = S'ha desinstal·lat el %S de l'ordinador.
+webapps.uninstall.label = Desinstal·la l'applicació
 
 # Telemetry opt-out prompt for Aurora and Nightly
 # LOCALIZATION NOTE (telemetryOptOutPrompt): %1$S and %3$S will be replaced by
 # brandFullName, and %2$S by the value of the toolkit.telemetry.server_owner preference.
 telemetryOptOutPrompt = L'%1$S envia informació de rendiment, maquinari, ús i personalitzacions a %2$S per ajudar a millorar el %3$S.
 
 # LOCALIZATION NOTE (fullscreen.entered): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.entered=%S està ara a pantalla completa.
 # LOCALIZATION NOTE (fullscreen.rememberDecision): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.rememberDecision=Recorda aquesta preferència per a %S
 
-social.shareButton.tooltip=Comparteix-ho
-social.shareButton.sharedtooltip=Ho heu compartit
-social.pageShared.label=S'ha compartit la pàgina
+# LOCALIZATION NOTE (social.toggle.label): %1$S is the name of the social provider, %2$S is brandShortName (e.g. Firefox)
+social.toggle.label=%1$S per al %2$S
+social.toggle.accesskey=p
+
+# LOCALIZATION NOTE (social.activated.description): %1$S is the name of the social provider, %2$S is brandShortName (e.g. Firefox)
+social.activated.description=Heu activat %1$S per al %2$S.
+
+# LOCALIZATION NOTE (social.error.message): %1$S is brandShortName (e.g. Firefox), %2$S is the name of the social provider
+social.error.message=%1$S no es pot connectar ara amb el %2$S.
+social.error.tryAgain.label=Torna a provar-ho
+social.error.tryAgain.accesskey=T
+social.error.ok.label=D'acord
+social.error.ok.accesskey=O
+social.error.closeSidebar.label=Tanca aquesta barra lateral
+social.error.closeSidebar.accesskey=C
+
+# Identity notifications popups
+identity.termsOfService = Termes del servei
+identity.privacyPolicy = Política de privadesa
+identity.chooseIdentity.description = Inicia la sessió a %S
+identity.chooseIdentity.label = Utilitzeu una adreça electrònica existent
+identity.newIdentity.label = Utilitzeu una adreça electrònica diferent
+identity.newIdentity.accessKey = e
+identity.newIdentity.email.placeholder = Adreça electrònica
+# LOCALIZATION NOTE (identity.newIdentity.description, identity.chooseIdentity.description): %S is the website origin (ie. https://www.mozilla.org) shown in popup notifications.
+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 website origin (ie. https://www.mozilla.org)
+identity.loggedIn.description = Sessió Iniciada com a: %S
+identity.loggedIn.signOut.label = Finalitza la sessió
+identity.loggedIn.signOut.accessKey = O
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -54,16 +54,24 @@ resumeTooltip=Feu clic per continuar.
 # LOCALIZATION NOTE (emptyStackText): The text that is displayed in the stack
 # frames list when there are no frames to display.
 emptyStackText=No hi ha cap pila per mostrar.
 
 # LOCALIZATION NOTE (emptyBreakpointsText): The text that is displayed in the
 # breakpoints list when there are no breakpoints to display.
 emptyBreakpointsText=No hi ha cap punt de ruptura per mostrar.
 
+# LOCALIZATION NOTE (noScriptsText): The text to display in the menulist when
+# there are no scripts.
+noScriptsText=No hi ha scripts
+
+# LOCALIZATION NOTE (noMatchingScriptsText): The text to display in the
+# menulist when there are no matching scripts after filtering.
+noMatchingScriptsText=No hi ha scripts coincidents
+
 # LOCALIZATION NOTE (breakpointMenuItem): The text for all the elements that
 # are displayed in the breakpoints menu item popup.
 breakpointMenuItem.enableSelf=Habilita un punt de ruptura
 breakpointMenuItem.disableSelf=Inhabilita el punt de ruptura
 breakpointMenuItem.deleteSelf=Suprimeix el punt de ruptura
 breakpointMenuItem.enableOthers=Habilita els altres
 breakpointMenuItem.disableOthers=Inhabilita els altres
 breakpointMenuItem.deleteOthers=Suprimeix els altres
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -464,51 +464,51 @@ addonListDictionaryHeading=Els diccionaris següents són instal·lats actualment:
 addonListExtensionHeading=Les extensions següents són instal·lades actualment:
 addonListLocaleHeading=Els paquets d'idioma següents són instal·lats actualment:
 addonListPluginHeading=Els connectors següents són instal·lats actualment:
 addonListThemeHeading=Els temes següents són instal·lats actualment:
 addonListAllHeading=Els complements següents són instal·lats actualment:
 addonListUnknownHeading=Els complements següents del tipus seleccionat són instal·lats actualment:
 
 # LOCALIZATION NOTE (addonNameDesc) A very short description of the
-# name parameter of numerous addon commands. This string is designed to be shown
+# name parameter of numerous add-on commands. This string is designed to be shown
 # in a menu alongside the command name, which is why it should be as short as
 # possible.
 addonNameDesc=El nom del complement
 
 # LOCALIZATION NOTE (addonNoneOfType) Used in the output of the 'addon list'
-# command when a search for addons of a particular type were not found.
+# command when a search for add-ons of a particular type were not found.
 addonNoneOfType=No hi ha cap complement d'aquest tipus instal·lat.
 
 # LOCALIZATION NOTE (addonEnableDesc) A very short description of the
 # 'addon enable <type>' 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.
 addonEnableDesc=Habilita el complement especificat
 
 # LOCALIZATION NOTE (addonAlreadyEnabled) Used in the output of the
-# 'addon enable' command when an attempt is made to enable an addon is already
-# enabled.
+# 'addon enable' command when an attempt is made to enable an add-on that is
+# already enabled.
 addonAlreadyEnabled=%S ja està habilitat.
 
 # LOCALIZATION NOTE (addonEnabled) Used in the output of the 'addon enable'
-# command when an addon is enabled.
+# command when an add-on is enabled.
 addonEnabled=S'ha habilitat %S.
 
 # LOCALIZATION NOTE (addonDisableDesc) A very short description of the
 # 'addon disable <type>' 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.
 addonDisableDesc=Inhabilita el complement especificat
 
 # LOCALIZATION NOTE (addonAlreadyDisabled) Used in the output of the
-# 'addon disable' command when an attempt is made to disable an addon is already
-# disabled.
+# 'addon disable' command when an attempt is made to disable an add-on that is
+# already disabled.
 addonAlreadyDisabled=%S ja està inhabilitat.
 
 # LOCALIZATION NOTE (addonDisabled) Used in the output of the 'addon disable'
-# command when an addon is disabled.
+# command when an add-on is disabled.
 addonDisabled=S'ha inhabilitat %S.
 
 # LOCALIZATION NOTE (exportDesc) A very short description of the 'export'
 # 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.
 exportDesc=Exporta els recursos
 
 # LOCALIZATION NOTE (exportHtmlDesc) A very short description of the 'export
@@ -849,8 +849,74 @@ calllogStopDesc=S'ha aturat el registre 
 
 # LOCALIZATION NOTE (calllogStopNoLogging) A string displayed as the result of
 # the 'calllog stop' command when there is nothing to stop.
 calllogStopNoLogging=No hi ha cap registre de crides actiu actualment
 
 # LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
 # the 'calllog stop' command when there are logging actions to stop.
 calllogStopReply=Atura la crida de funcions. Contextos actius: %1$S.
+
+# LOCALIZATION NOTE (calllogStartChromeDesc) A very short description of the
+# 'calllog chromestart' 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.
+calllogChromeStartDesc=Inicia el registre de crides a les funcions del codi chrome a la consola
+
+# LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
+# 'calllog chromestart <sourceType>' parameter. This string is designed to be
+# shown in a menu alongside the command name, which is why it should be as short as possible.
+calllogChromeSourceTypeDesc=Objecte global, JSM URI o JS per aconseguir un objecte global de
+
+# LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
+# 'calllog chromestart' 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.
+calllogChromeSourceTypeManual=L'objecte global, la URL d'un JSM o JS per executar a la finestra del chrome des d'on obtenir un objecte global
+
+# LOCALIZATION NOTE (calllogChromeStartReply) A string displayed as the result
+# of the 'calllog chromestart' command.
+calllogChromeStartReply=S'ha iniciat el registre de crides.
+
+# LOCALIZATION NOTE (calllogChromeStopDesc) A very short description of the
+# 'calllog chromestop' 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.
+calllogChromeStopDesc=Atura el registre de la crida a les funcions
+
+# LOCALIZATION NOTE (calllogChromeStopNoLogging) A string displayed as the
+# result of the 'calllog chromestop' command when there is nothing to stop.
+calllogChromeStopNoLogging=No hi ha cap registre de crides de codi chrome actiu ara mateix
+
+# LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
+# the 'calllog chromestop' command when there are logging actions to stop.
+calllogChromeStopReply=S'ha aturat el registre de crides. Contextos actius: %1$S.
+
+# LOCALIZATION NOTE (callLogChromeAnonFunction) A string displayed as the result
+# of the 'calllog chromestart' command when an anonymouse function is to be
+# logged.
+callLogChromeAnonFunction=<anonymous>
+
+# LOCALIZATION NOTE (callLogChromeMethodCall) A string displayed as the result
+# of the 'calllog chromestart' command to proceed a method name when it is to be
+# logged.
+callLogChromeMethodCall=Crida de mètode
+
+# LOCALIZATION NOTE (callLogChromeInvalidJSM) A string displayed as the result
+# of the 'calllog chromestart' command with an invalid JSM or JSM path.
+callLogChromeInvalidJSM=JSM invàlid!
+
+# LOCALIZATION NOTE (callLogChromeVarNotFoundContent) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of
+# content-variable and an invalid variable name.
+callLogChromeVarNotFoundContent=No s'ha trobat la variable a la finestra de continguts.
+
+# LOCALIZATION NOTE (callLogChromeVarNotFoundChrome) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of
+# chrome-variable and an invalid variable name.
+callLogChromeVarNotFoundChrome=No s'ha trobat la variable a la finestra chrome
+
+# LOCALIZATION NOTE (callLogChromeEvalException) A string displayed as the
+# result of the 'calllog chromestart' command with a source type of javascript
+# and invalid JavaScript code.
+callLogChromeEvalException=El javascript avaluat ha disparat l'excepció següent
+
+# LOCALIZATION NOTE (callLogChromeEvalNeedsObject) A string displayed as the
+# result of passing a non-JavaScript object creating source via the
+# 'calllog chromestart javascript' command.
+callLogChromeEvalNeedsObject=El codi JavaScript ha de ser avaluat a un objecte tal que les crides als seus mètodes siguin enregistrades p. ex. «({a1: function() {this.a2()},a2: function() {}});»
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -52,17 +52,17 @@ confirmClose=Voleu desar els canvis que 
 
 # LOCALIZATION NOTE  (confirmClose.title): This is title of the prompt dialog when
 # you try to close a scratchpad with unsaved changes.
 confirmClose.title=Canvis sense desar
 
 # LOCALIZATION NOTE  (scratchpadIntro): This is a multi-line comment explaining
 # how to use the Scratchpad. Note that this should be a valid JavaScript
 # comment inside /* and */.
-scratchpadIntro=/*\n * Això és un bloc de proves de JavaScript.\n *\n * Introduïu-hi codi JavaScript, feu llavors clic amb el botó secundari o trieu del menú d'execució:\n * 1. Executa per avaluar el codi seleccionat,\n * 2. Inspecciona per obrir l'inspector d'objectes per al resultat, o\n * 3. Mostra per inserir el resultat en un comentari després de la selecció.\n */\n\n
+scratchpadIntro1=/*\n * Això és un bloc de proves de JavaScript.\n * \n * Introduïu-hi codi JavaScript, feu llavors clic amb el botó secundari o trieu del menú d'execució:\n * 1. Executa per avaluar el codi seleccionat (%1$S),\n * 2. Inspecciona per obrir l'inspector d'objectes per al resultat (%2$S), o\n * 3. Mostra per inserir el resultat en un comentari després de la selecció. (%3$S)\n */\n\n
 
 # LOCALIZATION NOTE  (notification.browserContext): This is the message displayed
 # over the top of the editor when the user has switched to browser context.
 browserContext.notification=Aquest bloc de proves s'executa en el context del navegador.
 
 # LOCALIZATION NOTE (help.openDocumentationPage): This returns a localized link with
 # documentation for Scratchpad on MDN.
 help.openDocumentationPage=https://developer.mozilla.org/en/Tools/Scratchpad
--- a/browser/chrome/browser/devtools/styleinspector.properties
+++ b/browser/chrome/browser/devtools/styleinspector.properties
@@ -25,21 +25,21 @@ rule.status.UNMATCHED=Sense relació
 
 # LOCALIZATION NOTE (rule.sourceElement, rule.sourceInline): For each
 # style property the panel shows the rules which hold that specific property.
 # For every rule, the rule source is also displayed: a rule can come from a
 # file, from the same page (inline), or from the element itself (element).
 rule.sourceInline=en línia
 rule.sourceElement=element
 
-# LOCALIZATION NOTE (rule.inheritedSource): Shown for CSS rules
-# that were inherited from a parent node.  Will be passed a node
-# identifier and a source location.
-# e.g "Inherited from body#bodyID (styles.css:20)"
-rule.inheritedSource=Hereta de %S (%S)
+# LOCALIZATION NOTE (rule.inheritedFrom): Shown for CSS rules
+# that were inherited from a parent node. Will be passed a node
+# identifier of the parent node.
+# e.g "Inherited from body#bodyID"
+rule.inheritedFrom=Heretat de %S
 
 # LOCALIZATION NOTE (style.highlighter.button): These strings are used inside
 # sidebar of the Highlighter for the style inspector button.
 # "Computed" refers to the Computed Style of the element.
 style.highlighter.button.label2=Calculat
 style.highlighter.accesskey2=C
 style.highlighter.button.tooltip2=Inspecciona els estils calculats de l'element
 
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -3,24 +3,89 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!-- 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. -->
 
 
+<!ENTITY window.title "Consola web">
+
 <!ENTITY networkPanel.requestURL                  "URL de sol·licitud">
 <!ENTITY networkPanel.requestMethod               "Mètode de sol·licitud">
 <!ENTITY networkPanel.statusCode                  "Codi d'estat">
 
 <!ENTITY networkPanel.requestHeaders              "Capçaleres de la sol·licitud">
 <!ENTITY networkPanel.requestCookie               "Galeta enviada">
 <!ENTITY networkPanel.requestBody                 "Cos de la sol·licitud">
 <!ENTITY networkPanel.requestFormData             "Dades del formulari enviat">
 
 <!ENTITY networkPanel.responseHeaders             "Capçaleres de la resposta">
 <!ENTITY networkPanel.responseBody                "Cos de la resposta">
 <!ENTITY networkPanel.responseBodyCached          "Dades en la cau">
 <!ENTITY networkPanel.responseBodyUnknownType     "Tipus de contingut desconegut">
 <!ENTITY networkPanel.responseNoBody              "No hi ha cap cos de la resposta">
 <!ENTITY networkPanel.responseImage               "Imatge rebuda">
 <!ENTITY networkPanel.responseImageCached         "Imatge en la cau">
+<!-- LOCALIZATION NOTE (saveBodies.label): You can see this string in the Web
+   - Console context menu. -->
+
+<!ENTITY saveBodies.label     "Registra la sol·licitud i els cossos de resposta">
+<!ENTITY saveBodies.accesskey "L">
+<!-- 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 "Enregistra l'accés a la xarxa">
+<!ENTITY btnPageCSS.label   "CSS">
+<!ENTITY btnPageCSS.tooltip "Enregistra els errors d'anàlisi de CSS">
+<!ENTITY btnPageJS.label    "JS">
+<!ENTITY btnPageJS.tooltip  "Enregistra les excepcions de JavaScript">
+<!-- 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 "Enregistra els missatges enviats a l'objecte window.console">
+<!ENTITY btnConsoleErrors       "Errors">
+<!ENTITY btnConsoleInfo         "Informació">
+<!ENTITY btnConsoleWarnings     "Avisos">
+<!ENTITY btnConsoleLog          "Registre">
+<!-- LOCALIZATION NOTE (btnPosition.label): The label shown for the menu which
+  -  allows the user to toggle between the Web Console positioning types. -->
+
+<!ENTITY btnPosition.label     "Posició">
+<!-- LOCALIZATION NOTE (btnPosition.tooltip): The tooltip shown when the user
+  -  hovers the Position button in the Web Console toolbar. -->
+
+<!ENTITY btnPosition.tooltip   "Col·loca la consola web a sobre o a sota del document">
+<!-- LOCALIZATION NOTE (positionMenu.above): When this option is selected the
+  -  Web Console interface is displayed above the web page. -->
+
+<!ENTITY positionMenu.above    "A sobre">
+<!-- LOCALIZATION NOTE (positionMenu.below): When this option is selected the
+  -  Web Console interface is displayed below the web page. -->
+
+<!ENTITY positionMenu.below    "A sota">
+<!-- LOCALIZATION NOTE (positionMenu.window): When this option is selected the
+  -  Web Console interface is displayed in a floating panel. -->
+
+<!ENTITY positionMenu.window   "Finestra">
+
+<!ENTITY filterBox.placeholder "Filtre">
+<!ENTITY btnClear.label        "Neteja">
+<!ENTITY btnClear.tooltip      "Neteja la sortida de la consola web">
+<!ENTITY btnClose.tooltip      "Tanca la consola web">
+
+<!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   "">
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -18,52 +18,21 @@ typeStrict=Avís estricte:
 msgCategory=Categoria: 
 errLine=Línia: %S
 btnHide=Amaga
 btnPrefs=Preferències
 categoryPage=Pàgina:
 categoryConsole=Consola:
 btnMutation=Mutació del DOM
 tipMutation=Commuta el registre d'esdeveniments de mutació del DOM
-btnPageNet=Xarxa
-tipPageNet=Registra l'accés a la xarxa
-btnPageCSS=CSS
-tipPageCSS=Registra els errors d'analàsis del CSS
-btnPageJS=JS
-tipPageJS=Registra les excepcions de JavaScript
-# LOCALIZATION NOTE (btnPageLogging):
-#
-# This is used as the text of the "Logging" button on 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().
-btnPageLogging=Registra l'activitat
-# LOCALIZATION NOTE (tipPageLogging):
-#
-# This is used as the text of the tool tip for the "Logging" button on
-# the toolbar.
-tipPageLogging=Registra els missatges que s'envien a l'objecte «console»
-btnConsoleErrors=Errors
-tipConsoleErrors=Registra les crides a console.error()
-btnConsoleInfo=Informació
-tipConsoleInfo=Registra les crides a console.info()
-btnConsoleWarnings=Avisos
-tipConsoleWarnings=Registra les crides a console.warn()
-btnConsoleLog=Registre
-tipConsoleLog=Registra les crides a console.log()
 btnGlobal=Missatges globals
 tipGlobal=Commuta el registre dels missatges globals
 localConsole=Consola local
 clearConsoleCmd.label=Neteja la consola
 clearConsoleCmd.accesskey=e
-# LOCALIZATION NOTE (btnClear):
-#
-# This is used as the text of the "Clear" button for the toolbar. It clears the
-# contents of the console.
-btnClear=Neteja
-stringFilter=Filtre
 close.button=Tanca
 close.accesskey=c
 update.button=Actualitza
 update.accesskey=u
 # LOCALIZATION NOTE FOR `jsPropertyTitle` AND `jsPropertyInspectTitle`:
 #
 # The "PropertyPanel" is used to display a JS object to the user.
 # If it is clear which object is being inspected (e.g., window, document object)
@@ -80,22 +49,16 @@ jsPropertyTitle=Inspector d'objectes
 # The %S is replaced by the evaluated code the user clicked on in the console.
 #
 # Example: The user executed `window.document` in the WebConsole. The `document`
 # object is written to the output. If the user clicks on the `document` output
 # in the console, a PropertyPanel will show up. The title of the PropertyPanel
 # is set to `Inspect: window.document` because the clicked `document` object was
 # evaluated based on the `window.document` string.
 jsPropertyInspectTitle=Inspecciona: %S
-saveBodies.label=Registra la sol·licitud i els cossos de resposta
-saveBodies.accesskey=R
-copyCmd.label=Copia
-copyCmd.accesskey=C
-selectAllCmd.label=Selecciona-ho tot
-selectAllCmd.accesskey=a
 # 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):
 #
@@ -119,50 +82,30 @@ NetworkPanel.imageSizeDeltaDurationMS=%Sx%Spx, Δ%Sms
 # 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
 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 (webConsolePosition): The label shown for the menu which
-# allows the user to toggle between the Web Console positioning types.
-webConsolePosition=Posició
-
-# LOCALIZATION NOTE (webConsolePositionTooltip): The tooltip shown when the user
-# hovers the Position button in the Web Console toolbar.
-webConsolePositionTooltip=Posició de la consola web damunt o davall del document
-
-# LOCALIZATION NOTE (webConsolePositionAbove): When this option is selected the
-# Web Console interface is displayed above the web page.
-webConsolePositionAbove=Damunt
-
-# LOCALIZATION NOTE (webConsolePositionBelow): When this option is selected the
-# Web Console interface is displayed below the web page.
-webConsolePositionBelow=Davall
-
-# LOCALIZATION NOTE (webConsolePositionWindow): When this option is selected the
-# Web Console interface is displayed in a floating panel.
-webConsolePositionWindow=Finestra
-
 # 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.
 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)
 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
+# 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
 gcliterm.instanceLabel=Instància de %S
 
 # LOCALIZATION NOTE (Autocomplete.label):
--- a/browser/chrome/browser/downloads/downloads.dtd
+++ b/browser/chrome/browser/downloads/downloads.dtd
@@ -6,16 +6,23 @@
      -->
 
 <!ENTITY indicator.tooltiptext            "Baixades">
 <!-- LOCALIZATION NOTE (downloads.title):
      Used by screen readers to describe the Downloads Panel.
      -->
 
 <!ENTITY downloads.title                  "Baixades">
+<!-- LOCALIZATION NOTE (downloads.width):
+     Width of the Downloads Panel list items, expressed using a CSS unit.  The
+     longest labels that should fit in the item width are usually those of
+     in-progress downloads and those of blocked downloads.
+     -->
+
+<!ENTITY downloads.width                  "65ch">
 
 <!ENTITY cmd.pause.label                  "Pausa">
 <!ENTITY cmd.pause.accesskey              "P">
 <!ENTITY cmd.resume.label                 "Reprèn">
 <!ENTITY cmd.resume.accesskey             "R">
 <!ENTITY cmd.cancel.label                 "Cancel·la">
 <!ENTITY cmd.cancel.accesskey             "C">
 <!-- LOCALIZATION NOTE (cmd.show.label, cmd.show.accesskey, cmd.showMac.label,
@@ -32,10 +39,8 @@
 <!ENTITY cmd.goToDownloadPage.accesskey   "V">
 <!ENTITY cmd.copyDownloadLink.label       "Copia l'enllaç de la baixada">
 <!ENTITY cmd.copyDownloadLink.accesskey   "l">
 <!ENTITY cmd.removeFromList.label         "Suprimeix de la llista">
 <!ENTITY cmd.removeFromList.accesskey     "e">
 <!ENTITY cmd.clearList.label              "Neteja la llista">
 <!ENTITY cmd.clearList.accesskey          "a">
 
-<!ENTITY downloadshistory.label           "Mostra totes les baixades">
-<!ENTITY downloadshistory.accesskey       "t">
--- a/browser/chrome/browser/downloads/downloads.properties
+++ b/browser/chrome/browser/downloads/downloads.properties
@@ -62,11 +62,25 @@ shortTimeLeftDays=%1$Sd
 # that we use a wider space after the separator when it is followed by a number,
 # just to avoid visually confusing it with with a minus sign with some fonts.
 # If you use a different separator, this might not be necessary.  However, there
 # is usually no need to change the separator or the order of the substitutions,
 # even for right-to-left languages, unless the defaults are not suitable.
 statusSeparator=%1$S — %2$S
 statusSeparatorBeforeNumber=%1$S —  %2$S
 
+# LOCALIZATION NOTE (showMoreDownloads):
+# This string is shown in the Downloads Panel when there are more active
+# downloads than can fit in the available space.  The phrase should be read as
+# "Show N more of my recent downloads".  Use a semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/Localization_and_Plurals
+showMoreDownloads=Mostra 1 baixada més recent; Mostra %1$S baixades més recents
+# LOCALIZATION NOTE (showAllDownloads):
+# This string is shown in place of showMoreDownloads when all the downloads fit
+# in the available space, or when there are no downloads in the panel at all.
+showAllDownloads=Mostra totes les baixades
+# LOCALIZATION NOTE (showDownloadsAccessKey):
+# This access key applies to both showMoreDownloads and showAllDownloads.
+showDownloadsAccessKey=S
+
 fileExecutableSecurityWarning=«%S» és un fitxer executable.. Els fitxers executables poden contenir virus o altre codi maliciós que pot fer mal al vostre ordinador.Aneu amb compte quan obriu aquest fitxer. Esteu segur que voleu executar «%S»?
 fileExecutableSecurityWarningTitle=Voleu obrir el fitxer executable?
 fileExecutableSecurityWarningDontAsk=No m'ho demanis més
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -1,13 +1,11 @@
-<!--
-# 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/.
--->
+<!-- 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  pageInfoWindow.width  "600">
 <!ENTITY  pageInfoWindow.height "500">
 
 <!ENTITY  copy.key              "C">
 <!ENTITY  copy.label            "Copia">
 <!ENTITY  copy.accesskey        "C">
 <!ENTITY  selectall.key         "A">
--- a/browser/chrome/browser/preferences/privacy.dtd
+++ b/browser/chrome/browser/preferences/privacy.dtd
@@ -33,18 +33,18 @@
 <!ENTITY  askEachTime.label             "demana-m'ho cada vegada">
 
 <!ENTITY  cookieExceptions.label        "Excepcions…">
 <!ENTITY  cookieExceptions.accesskey    "E">
 
 <!ENTITY  showCookies.label             "Mostra les galetes…">
 <!ENTITY  showCookies.accesskey         "s">
 
-<!ENTITY  historyHeader.pre.label          "El &brandShortName;:">
-<!ENTITY  historyHeader.pre.accesskey      "w">
+<!ENTITY  historyHeader.pre.label          "El &brandShortName; podrà:">
+<!ENTITY  historyHeader.pre.accesskey      "p">
 <!ENTITY  historyHeader.remember.label     "Recordarà l'historial">
 <!ENTITY  historyHeader.dontremember.label "No recordarà mai l'historial">
 <!ENTITY  historyHeader.custom.label       "Utilitza els paràmetres personalitzats de l'historial">
 <!ENTITY  historyHeader.post.label         "">
 
 <!ENTITY  rememberDescription.label      "El &brandShortName; recordarà el vostre historial, baixades, formularis i historial de cerca, i conservarà les galetes dels llocs web que visiteu.">
 <!-- LOCALIZATION NOTE (rememberActions.pre.label): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (rememberActions.middle.label): include a starting and trailing space as needed -->
--- a/browser/chrome/overrides/settingsChange.dtd
+++ b/browser/chrome/overrides/settingsChange.dtd
@@ -1,8 +1,7 @@
-<!-- -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
+<!-- -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY  settingsChangePreferences.label  "Els paràmetres de configuració poden canviar-se des de la pestanya Aplicacions de les preferències del &brandShortName;.">
 <!ENTITY  settingsChangeOptions.label      "Els paràmetres de configuració poden canviar-se des de la pestanya Aplicacions de les opcions del &brandShortName;.">
--- a/calendar/chrome/calendar/calendar-event-dialog-attendees.properties
+++ b/calendar/chrome/calendar/calendar-event-dialog-attendees.properties
@@ -2,8 +2,14 @@
 # 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/.
 
 event.attendee.role.required = Assistent necessari
 event.attendee.role.optional = Assistent opcional
 event.attendee.role.nonparticipant = No participa
 event.attendee.role.chair = Cap
 event.attendee.role.unknown = Assistent desconegut (%1$S)
+
+event.attendee.usertype.individual = Individual
+event.attendee.usertype.group = Grup
+event.attendee.usertype.resource = Recurs
+event.attendee.usertype.room  = Habitació
+event.attendee.usertype.unknown = Tipus desconegut (%1$S)
--- a/calendar/chrome/calendar/calendar-event-dialog.dtd
+++ b/calendar/chrome/calendar/calendar-event-dialog.dtd
@@ -92,18 +92,16 @@
 <!ENTITY  event.menu.view.toolbars.event.accesskey        "c">
 <!ENTITY  event.menu.view.toolbars.customize.label        "Personalitza…">
 <!ENTITY  event.menu.view.toolbars.customize.accesskey    "P">
 <!ENTITY  event.menu.view.showlink.label                  "Mostra l'enllaç relacionat">
 <!ENTITY  event.menu.view.showlink.accesskey              "r">
 
 <!ENTITY  event.menu.options.label                            "Opcions">
 <!ENTITY  event.menu.options.accesskey                        "O">
-<!ENTITY  event.menu.options.attachments.label                "Adjunta una pàgina web…">
-<!ENTITY  event.menu.options.attachments.accesskey            "w">
 <!ENTITY  event.menu.options.attendees.label                  "Invita assistents…">
 <!ENTITY  event.menu.options.attendees.accesskey              "I">
 <!ENTITY  event.menu.options.spellcheck.label                 "Comprova l'ortografia…">
 <!ENTITY  event.menu.options.spellcheck.accesskey             "o">
 <!ENTITY  event.menu.options.inline.spellcheck.label          "Comprova l'ortografia mentre s'escriu">
 <!ENTITY  event.menu.options.inline.spellcheck.accesskey      "s">
 <!ENTITY  event.menu.options.link.label                       "Afegeix un enllaç…">
 <!ENTITY  event.menu.options.link.accesskey                   "l">
@@ -142,17 +140,16 @@
 <!ENTITY event.email.tentative.attendees.accesskey        "i">
 <!-- Toolbar -->
 
 <!ENTITY  event.toolbar.save.label                        "Desa i tanca">
 <!ENTITY  event.toolbar.delete.label                      "Suprimeix">
 <!ENTITY  event.toolbar.attendees.label                   "Invita assistents">
 <!ENTITY  event.toolbar.spellcheck.label                  "Verificació ortogràfica">
 <!ENTITY  event.toolbar.privacy.label                     "Privadesa">
-<!ENTITY  event.toolbar.attachments.label                 "Adjunta">
 <!-- 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">
@@ -175,26 +172,20 @@
 <!ENTITY event.repeat.label                               "Repetició:" >
 <!ENTITY event.repeat.accesskey                           "R">
 <!ENTITY event.reminder.label                             "Recordatori:" >
 <!ENTITY event.reminder.accesskey                         "e">
 <!ENTITY event.description.label                          "Descripció:" >
 <!ENTITY event.description.accesskey                      "p">
 <!ENTITY event.attachments.label                          "Adjuncions:" >
 <!ENTITY event.attachments.accesskey                      "j" >
-<!-- LOCALIZATION NOTE - These 4 strings are not in production yet,
-  but I want to land Filelink support for Lightning soon. The attach
-  button will become a dropdown button that allows to attach links
-  as usual, but also files via the Filelink providers. -->
-
 <!ENTITY event.attachments.menubutton.label               "Adjunta">
 <!ENTITY event.attachments.menubutton.accesskey           "A">
 <!ENTITY event.attachments.url.label                      "Pàgina web…">
 <!ENTITY event.attachments.url.accesskey                  "w">
-
 <!ENTITY event.attachments.popup.remove.label             "Suprimeix" >
 <!ENTITY event.attachments.popup.remove.accesskey         "S" >
 <!ENTITY event.attachments.popup.open.label               "Obre" >
 <!ENTITY event.attachments.popup.open.accesskey           "O" >
 <!ENTITY event.attachments.popup.removeAll.label          "Suprimeix-les totes" >
 <!ENTITY event.attachments.popup.removeAll.accesskey      "t" >
 <!ENTITY event.attachments.popup.attachPage.label         "Adjunta una pàgina web…" >
 <!ENTITY event.attachments.popup.attachPage.accesskey     "w" >
@@ -333,16 +324,20 @@
 <!ENTITY event.freebusy.legend.busy             "Ocupada" >
 <!ENTITY event.freebusy.legend.busy_tentative   "Intent" >
 <!ENTITY event.freebusy.legend.busy_unavailable "Fora de l'oficina" >
 <!ENTITY event.freebusy.legend.unknown          "Sense informació" >
 <!ENTITY event.attendee.role.required           "Assistent necessari">
 <!ENTITY event.attendee.role.optional           "Assistent opcional">
 <!ENTITY event.attendee.role.chair              "Cap de la reunió">
 <!ENTITY event.attendee.role.nonparticipant     "No participa">
+<!ENTITY event.attendee.usertype.individual     "Individual">
+<!ENTITY event.attendee.usertype.group          "Grup">
+<!ENTITY event.attendee.usertype.resource       "Recurs">
+<!ENTITY event.attendee.usertype.room           "Habitació">
 <!-- Timezone dialog -->
 
 <!ENTITY timezone.title.label            "Especifiqueu el fus horari">
 <!ENTITY event.timezone.custom.label     "Més fusos horaris…">
 <!-- Read-Only dialog -->
 
 <!ENTITY read.only.general.label         "General">
 <!ENTITY read.only.title.label           "Títol:">
--- a/calendar/chrome/calendar/calendar-event-dialog.properties
+++ b/calendar/chrome/calendar/calendar-event-dialog.properties
@@ -281,20 +281,25 @@ repeatDetailsInfinite=Es repeteix %1$S\n
 # %1%$ - A rule string (see above). This is the first line of the link
 # %2%$ - event start date (e.g. mm/gg/yyyy)
 # e.g. with monthlyDayOfNth and all day event:
 # "Occurs day 3 of every 5 month
 #  effective 1/1/2009"
 repeatDetailsInfiniteAllDay=Es repeteix %1$S\na partir del %2$S.
 
 # LOCALIZATION NOTE (ruleTooComplex):
-# This string is shown in the reminder details area if our code can't handle the
+# This string is shown in the repeat details area if our code can't handle the
 # complexity of the recurrence rule yet.
 ruleTooComplex=Feu clic aquí per a més informació
 
+# LOCALIZATION NOTE (ruleTooComplexSummary):
+# This string is shown in the event summary dialog if our code can't handle the
+# complexity of the recurrence rule yet.
+ruleTooComplexSummary=No es coneixen els detalls de repetició
+
 # differences between the dialog for an Event or a Task
 newEvent=Cita nova
 newTask=Tasca nova
 itemMenuLabelEvent=Cita
 itemMenuAccesskeyEvent2=C
 itemMenuLabelTask=Tasca
 itemMenuAccesskeyTask2=T
 
--- a/calendar/chrome/calendar/calendar.dtd
+++ b/calendar/chrome/calendar/calendar.dtd
@@ -304,17 +304,17 @@
 <!ENTITY calendarproperties.wcap.label                     "Servidor de sistema de calendaris de Java de Sun (WCAP)">
 <!ENTITY calendarproperties.format.label                   "Format:">
 <!ENTITY calendarproperties.location.label                 "Ubicació:">
 <!ENTITY calendarproperties.refreshInterval.label          "Actualització:">
 <!ENTITY calendarproperties.refreshInterval.manual.label   "Manual">
 <!ENTITY calendarproperties.name.label                     "Nom:">
 <!ENTITY calendarproperties.readonly.label                 "Només de lectura">
 <!ENTITY calendarproperties.firealarms.label               "Mostra les alertes">
-<!ENTITY calendarproperties.cache2.label                   "Memòria cau">
+<!ENTITY calendarproperties.cache3.label                   "Funcionament fora de línia">
 <!ENTITY calendarproperties.enabled.label                  "Mostra aquest calendari">
 <!ENTITY calendarproperties.forceDisabled.label            "No s'ha pogut trobar el proveïdor d'aquest calendari. Això sol passar quan s'han inhabilitat o s'han desinstal·lat complements.">
 <!ENTITY calendarproperties.unsubscribe.label              "Cancel·la la subscripció">
 <!ENTITY calendarproperties.unsubscribe.accesskey          "C">
 <!-- Calendar Publish Dialog -->
 
 <!ENTITY calendar.publish.dialog.title              "Publica el calendari">
 <!ENTITY calendar.publish.url.label                 "URL de publicació">
--- a/calendar/chrome/lightning/lightning-toolbar.dtd
+++ b/calendar/chrome/lightning/lightning-toolbar.dtd
@@ -1,26 +1,24 @@
 <!-- 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 lightning.toolbar.calendar.name "Barra d'eines del calendari">
-<!ENTITY lightning.toolbar.calendar.accesskey "C">
+<!ENTITY lightning.toolbar.calendar.name.accesskey "C">
 <!ENTITY lightning.toolbar.task.name "Barra d'eines de les tasques">
-<!ENTITY lightning.toolbar.task.accesskey "T">
+<!ENTITY lightning.toolbar.task.name.accesskey "T">
 
 <!ENTITY lightning.toolbar.sync.label "Sincronitza">
 <!ENTITY lightning.toolbar.delete.label "Suprimeix">
 <!ENTITY lightning.toolbar.edit.label "Edita">
 <!ENTITY lightning.toolbar.gototoday.label "Vés al dia">
 <!ENTITY lightning.toolbar.print.label "Imprimeix">
 <!-- Mode Toolbar -->
 
-<!ENTITY lightning.toolbar.mail.label         "Correu">
-<!ENTITY lightning.toolbar.mail.accesskey     "u">
 <!ENTITY lightning.toolbar.calendar.label     "Calendari">
 <!ENTITY lightning.toolbar.calendar.tooltip   "Mostra la pestanya del calendari">
 <!ENTITY lightning.toolbar.calendar.accesskey "C">
 <!ENTITY lightning.toolbar.task.label         "Tasques">
 <!ENTITY lightning.toolbar.task.tooltip       "Mostra la pestanya de les tasques">
 <!ENTITY lightning.toolbar.task.accesskey     "T">
 <!-- Toolbar write button -->
 
--- a/calendar/chrome/lightning/lightning.properties
+++ b/calendar/chrome/lightning/lightning.properties
@@ -59,9 +59,12 @@ itipReplySubjectAccept=Resposta a la invitació (acceptada): %1$S
 itipReplySubjectDecline=Resposta a la invitació (rebutjada): %1$S
 itipReplySubjectTentative=Resposta a la invitació (tentativa): %1$S
 itipRequestSubject=Invitació a una cita: %1$S
 itipRequestUpdatedSubject=Actualització de la invitació a una cita: %1$S
 itipRequestBody=%1$S us ha invitat a %2$S
 itipCancelSubject=Cita cancel·lada: %1$S
 itipCancelBody=En/na %1$S ha cancel·lat aquesta cita: « %2$S »
 
+confirmProcessInvitation=Recentment heu suprimit aquest element. Esteu segur que voleu processar aquesta invitació?
+confirmProcessInvitationTitle=Voleu processar la invitació?
+
 invitationsLink.label=Invitacions: %1$S
--- a/chat/conversations.properties
+++ b/chat/conversations.properties
@@ -17,26 +17,46 @@ statusChanged=%1$S és ara %2$S.
 #  %3$S is the status text (eg. "I'm currently away from the computer").
 statusChangedWithStatusText=%1$S és ara %2$S: %3$S.
 # LOCALIZATION NOTE (statusChangedFromUnknown[WithStatusText]):
 #  special case of the previous 2 strings for when the status was
 #  previously unknown. These 2 strings should not mislead the user
 #  into thinking the person's status has just changed.
 statusChangedFromUnknown=%1$S és %2$S.
 statusChangedFromUnknownWithStatusText=%1$S és %2$S: %3$S.
-
+# LOCALIZATION NOTE (statusKnown[WithStatusText]):
+# special case of the previous 2 strings for when an account has just
+# been reconnected, so the status is now known. These 2 strings should not
+# mislead the user into thinking the person's status has just changed.
+statusKnown=El vostre compte ha tornat a ser connectat (%1$S és %2$S)
+statusKnownWithStatusText=El vostre compte ha tornat a ser connectat (%1$S és %2$S: %3$S).
 # LOCALIZATION NOTE (statusUnknown):
 #  %S is the display name of the contact.
 statusUnknown=El vostre compte s'ha desconnectat (ja no es coneix l'estat de %S).
+
 accountDisconnected=El vostre compte s'ha desconnectat.
+accountReconnected=El vostre compte ha tornat a ser connectat.
 
 # LOCALIZATION NOTE (autoReply):
 #  %S is replaced by the text of a message that was sent as an automatic reply.
 autoReply=Resposta automàtica - %S
 
+# LOCALIZATION NOTE (topicSet):
+#  %1$S is the conversation name, %2$S is the topic.
+topicSet=El tema de %1$S és: %2$S.
+# LOCALIZATION NOTE (topicNotSet):
+#  %S is the conversation name.
+topicNotSet=No hi ha tema per a %S.
+# LOCALIZATION NOTE (topicChanged):
+#  %1$S is the user who changed the topic, %2$S is the new topic.
+topicChanged=%1$S ha canviat el tema a: %2$S.
+# LOCALIZATION NOTE (topicCleared):
+#  %1$S is the user who cleared the topic.
+topicCleared=%1$S ha esborrar el tema.
+
 # LOCALIZATION NOTE (messenger.conversations.selections.ellipsis):
 #  ellipsis is used when copying a part of a message to show that the message was cut
 messenger.conversations.selections.ellipsis=[…]
 
 # LOCALIZATION NOTE (messenger.conversations.selections.{system,content,action}MessagesTemplate):
 #  These 3 templates are used to format selected messages before copying them.
 #  Do not translate the texts between % characters, but feel free to adjust
 #  whitespace and separators to make them fit your locale.
--- a/chat/irc.properties
+++ b/chat/irc.properties
@@ -66,17 +66,16 @@ command.quit=%S &lt;missatge&gt;: Descon
 command.quote=%S &lt;ordre&gt;: Envia una ordre en brut al servidor.
 command.time=%S: Mostra l'hora local actual al servidor IRC.
 command.topic=%S [&lt;tema nou&gt;]: Mostra o canvia el tema del canal.
 command.umode=%S (+|-)&lt;mode nou&gt;: Configura o desconfigura un mode d'usuari.
 command.version=%S &lt;sobrenom&gt;: Sol·licita la versió del client d'un usuari.
 command.voice=%S &lt;sobrenom1&gt;[,&lt;sobrenom2&gt;]*: Dóna l'estat de veu del canal a algú. Heu de ser un operador del canal per fer-ho.
 command.wallops=%S &lt;missatge&gt;: Si no sabeu què és això, probablement no el podeu fer servir (envia una ordre a tots els connectats amb el senyal +w i tots els operadors en el servidor).
 command.whois=%S &lt;sobrenom&gt;: Envia informació d'un usuari.
-command.whowas=%S &lt;sobrenom&gt;: Envia informació d'un usuari que ha finalitzat la sessió.
 
 # LOCALIZATION NOTE (message.*):
 #    These are shown as system messages in the conversation.
 #    %1$S is the nick and %2$S is the nick and host of the user who joined.
 message.join=%1$S [%2$S] ha entrat a la sala.
 #    %1$S is the nick of who kicked you.
 #    %2$S is message.kicked.reason, if a kick message was given.
 message.kicked.you=Heu estat expulsat per %1$S%2$S.
@@ -97,24 +96,19 @@ message.parted.you=Heu deixat la sala (P
 #    %1$S is the user's nick, %2$S is message.parted.reason, if a part message is given.
 message.parted=%1$S ha deixat la sala (Part%2$S).
 #    %S is the part message supplied by the user.
 message.parted.reason=: %S
 #    %1$S is the user's nick, %2$S is message.quit2 if a quit message is given.
 message.quit=%1$S ha deixat la sala (Quit%2$S).
 #    The paramter is the quit message given by the user.
 message.quit2=: %S
-#    %1$S is the user who changed the topic, %2$S is the new topic.
-message.topicChanged=%1$S ha canviat el tema a: %2$S.
-#    %1$S is the user who cleared the topic.
-message.topicCleared=%1$S ha netejat el tema.
-#    %1$S is the conversation name, %2$S is the topic.
-message.topic=El tema de %1$S és: %2$S.
-#    %S is the conversation name.
-message.topicNotSet=No s'ha trobat el tema %S.
+#    %1$S is the nickname of the user that invited us, %2$S is the conversation
+#    name.
+message.inviteReceived=%1$S us ha convidat a %2$S.
 #    %1$S is the nickname of the invited user, %2$S is the conversation name
 #    they were invited to.
 message.invited=%1$S va ser convidat amb èxit a %2$S.
 #    %S is the nickname of the user who was summoned.
 message.summoned=%S va ser convocat.
 #    %S is the nickname of the user whose WHOIS information follows this message.
 message.whois=Informació WHOIS per a %S:
 #    %1$S is the nickname of the (offline) user whose WHOWAS information follows this message.
@@ -126,16 +120,17 @@ message.unknownNick=No s'ha trobat el so
 
 # LOCALIZATION NOTE (error.*):
 #    These are shown as error messages in the server tab.
 #    %S is the channel name.
 error.noChannel=No hi és el canal: %S.
 error.tooManyChannels=No podeu unir-vos a %S; us heu unit a massa canals.
 #    %1$S is your new nick, %2$S is the kill message from the server.
 error.nickCollision=El sobrenom ja és en ús. Es canvia el sobrenom a %1$S [%2$S].
+error.erroneousNickname=%S is not an allowed nickname.
 error.banned=Esteu bandejat en aquest servidor.
 error.bannedSoon=Aviat estareu bandejat en aquest servidor.
 error.mode.wrongUser=No podeu canviar els modes d'altres usuaris.
 #    %S is the nickname or channel name that isn't available.
 error.noSuchNick=%S No està connectat.
 error.wasNoSuchNick=No existeix el sobrenom: %S
 error.noSuchChannel=No existeix el canal: %S.
 #    %S is the channel name.
@@ -143,20 +138,29 @@ error.cannotSendToChannel=No podeu envia
 error.nonUniqueTarget=%S no és un usuari únic usuari@servidor o sobrenom, o bé heu accedit a diversos canals alhora.
 error.notChannelOp=No sou un operador del canal %S.
 
 # LOCALIZATION NOTE (tooltip.*):
 #    These are the descriptions given in a tooltip with information received
 #    from a whois response.
 #    The human readable ("realname") description of the user.
 tooltip.realname=Nom
+tooltip.server=Connectat a
 #    The username and hostname that the user connects from (usually based on the
 #    reverse DNS of the user's IP, but often mangled by the server to
 #    protect users).
 tooltip.connectedFrom=Connectat des de
+tooltip.registered=Registrat
+tooltip.secure=Utilitzant una connexió segura
 # The away message of the user
 tooltip.away=Absent
 tooltip.ircOp=Operador IRC
+tooltip.idleTime=Inactiu per
 tooltip.channels=Actualment en
-tooltip.server=Connectat a
-#    %1$S is the server name, %2$S is the server location.
+
+#    %1$S is the server name, %2$S is some generic server information (usually a
+#    location or the date the user was last seen).
 tooltip.serverValue=%1$S (%2$S)
-tooltip.idleTime=Inactiu per
+
+# LOCALIZATION NOTE (yes, no):
+#  These are used to turn true/false values into a yes/no response.
+yes=Yes
+no=No
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -128,9 +128,8 @@ MozBlobBuilderWarning=El MozBlobBuilder és en desús. Utilitzeu millor el constructor Blob.
 # LOCALIZATION NOTE: Do not translate "DOMException", "code" and "name"
 DOMExceptionCodeWarning=L'atribut de codi DOMException és en desús. Utilitzeu millor name.
 # LOCALIZATION NOTE: Do not translate "__exposedProps__"
 NoExposedPropsWarning=L'exposició del contingut dels objectes del chrome JS sense __exposedProps__ és insegur i obsolet. Veieu https://developer.mozilla.org/en/XPConnect_wrappers per a més informació.
 # LOCALIZATION NOTE: Do not translate "Mutation Event" and "MutationObserver"
 MutationEventWarning=L'ús de «Mutation Events» és obsolet. Millor feu servir «MutationObserver».
 # LOCALIZATION NOTE: Do not translate "Blob", "mozSlice", or "slice"
 MozSliceWarning=L'ús de «mozSlice» a l'objecte blob és obsolet.  Millor feu servir «MutationObserver».
-OnuploadprogressWarning=L'ús de l'atribut «XMLHttpRequest's onuploadprogress» és obsolet.
--- a/dom/chrome/layout/css.properties
+++ b/dom/chrome/layout/css.properties
@@ -17,17 +17,17 @@ 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».
 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.
-PEGroupRuleEOF=final de la regla @media o @-moz-document
+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».
 PEMozDocRuleEOF=el següent URI de la regla @-moz-document
 PEAtNSPrefixEOF=el prefix d'espai de noms a la regla @namespace
 PEAtNSURIEOF=URI de l'espai de noms a la regla @namespace
 PEAtNSUnexpected=Testimoni inesperat dins de @namespace: «%1$S».
@@ -109,8 +109,17 @@ 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.
+PEBadDirValue=S'esperava "ltr' o 'rtl" en el selector de direcció, però s'ha trobat '%1$S'.
+PESupportsConditionStartEOF='not' o '('
+PESupportsConditionInParensStartEOF='not', '(' o idetificador
+PESupportsConditionNotEOF='not'
+PESupportsConditionExpectedOpenParen=S'esperava '(' mentre que l'anàlisi dóna suport a la condició, però s'ha trobat '%1$S'
+PESupportsConditionExpectedCloseParen=S'esperava ')' mentre que l'anàlisi dóna suport a la condició, però s'ha trobat '%1$S'.
+PESupportsConditionExpectedStart=S'esperava 'not' o '(' mentre que l'anàlisi dóna suport a la condició, però s'ha trobat '%1$S'.
+PESupportsConditionExpectedNot=S'esperava 'not' mentre que l'anàlisi dóna suport a la condició, però s'ha trobat '%1$S'.
+PESupportsGroupRuleStart=S'esperava '{' per començar la regla @supports, però s'ha trobat '%1$S'.
--- a/mail/chrome/messenger/FilterEditor.dtd
+++ b/mail/chrome/messenger/FilterEditor.dtd
@@ -42,8 +42,16 @@
 <!ENTITY fetchFromPOP.label "Baixa'l del servidor POP ">
 <!ENTITY ignoreThread.label "Ignora tota la conversa">
 <!ENTITY ignoreSubthread.label "Ignora la subconversa">
 <!ENTITY watchThread.label "Vigila la conversa">
 <!ENTITY stopExecution.label "Atura l'execució del filtre">
 
 <!ENTITY addAction.tooltip "Afegeix una acció nova">
 <!ENTITY removeAction.tooltip "Suprimeix aquesta acció">
+<!-- LOCALIZATION NOTE
+  The values below are used to control the widths of the filter action widgets.
+  Change the values only when the localized strings in the popup menus
+  are truncated in the widgets.
+ -->
+
+<!ENTITY filterActionTypeFlexValue "1">
+<!ENTITY filterActionTargetFlexValue "4">
--- a/mail/chrome/messenger/FilterListDialog.dtd
+++ b/mail/chrome/messenger/FilterListDialog.dtd
@@ -6,28 +6,36 @@
 <!ENTITY nameColumn.label "Nom del filtre">
 <!ENTITY activeColumn.label "Habilitat">
 <!ENTITY newButton.label "Nou…">
 <!ENTITY newButton.accesskey "N">
 <!ENTITY editButton.label "Edita…">
 <!ENTITY editButton.accesskey "E">
 <!ENTITY deleteButton.label "Suprimeix">
 <!ENTITY deleteButton.accesskey "u">
+<!ENTITY reorderTopButton "Mou a la part superior">
+<!ENTITY reorderTopButton.accessKey "o">
+<!ENTITY reorderTopButton.toolTip "Reorganitza el filtre per a que s'executi abans que tots els altres">
 <!ENTITY reorderUpButton.label "Mou cap amunt">
 <!ENTITY reorderUpButton.accesskey "M">
 <!ENTITY reorderDownButton.label "Mou cap avall">
 <!ENTITY reorderDownButton.accesskey "o">
+<!ENTITY reorderBottomButton "Mou a la part inferior">
+<!ENTITY reorderBottomButton.accessKey "i">
+<!ENTITY reorderBottomButton.toolTip "Reorganitza el filtre per a que s'executi després de tots els altres">
 <!ENTITY filterHeader.label "Els filtres habilitats s'executen automàticament en l'ordre que s'indica a sota.">
 <!ENTITY filtersForPrefix.label "Filtres per a:">
 <!ENTITY filtersForPrefix.accesskey "F">
 <!ENTITY viewLogButton.label "Registre dels filtres">
 <!ENTITY viewLogButton.accesskey "l">
 <!ENTITY runFilters.label "Executa ara">
 <!ENTITY runFilters.accesskey "r">
 <!ENTITY stopFilters.label "Atura">
 <!ENTITY stopFilters.accesskey "u">
 <!ENTITY folderPickerPrefix.label "Executa manualment els filtres seleccionats a la carpeta:">
 <!ENTITY folderPickerPrefix.accesskey "i">
 <!ENTITY choosethis.label "tria aquesta carpeta">
 <!ENTITY choosethisnewsserver.label "tria aquest servidor de grups de discussió">
 <!ENTITY helpButton.label "Ajuda">
 <!ENTITY helpButton.accesskey "j">
 <!ENTITY closeCmd.key "W"> 
+<!ENTITY searchBox.emptyText "Cerca els filtres pel nom…">
+
--- a/mail/chrome/messenger/aboutDialog.dtd
+++ b/mail/chrome/messenger/aboutDialog.dtd
@@ -50,16 +50,18 @@
 <!-- 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     "">
+
+<!ENTITY update.applying            "S'està aplicant l'actualització…">
 <!-- LOCALIZATION NOTE (channel.description.start,channel.description.end): channel.description.start and
      channel.description.end create one sentence, with the current channel label inserted in between.
      example: You are currently on the _Stable_ update channel. -->
 
 <!ENTITY channel.description.start  "Actualment esteu al canal ">
 <!ENTITY channel.description.end    " d'actualitzacions. ">
 
 <!ENTITY cmdCloseMac.commandKey "w">
--- a/mail/chrome/messenger/accountCreation.dtd
+++ b/mail/chrome/messenger/accountCreation.dtd
@@ -4,17 +4,17 @@
 
 <!ENTITY autoconfigWizard.title          "Configuració del compte de correu">
 <!ENTITY name.label                      "El vostre nom:">
 <!ENTITY name.accesskey                  "n">
 <!ENTITY name.placeholder                "Nom i cognoms">
 <!ENTITY name.text                       "El vostre nom, com voleu que es vegi">
 <!ENTITY email.label                     "Adreça electrònica:">
 <!ENTITY email.accesskey                 "A">
-<!ENTITY email.placeholder               "email@exemple.com">
+<!ENTITY email.placeholder               "email@example.com">
 <!ENTITY password.label                  "Contrasenya:">
 <!ENTITY password.accesskey              "C">
 <!ENTITY password.placeholder            "Contrasenya">
 <!ENTITY password.text                   "Opcional, només es farà servir per validar el vostre usuari">
 <!ENTITY rememberPassword.label          "Recorda la contrasenya">
 <!ENTITY rememberPassword.accesskey      "R">
 
 <!ENTITY imapLong.label                  "IMAP (carpetes remotes)">
deleted file mode 100644
--- a/mail/chrome/messenger/addressbook/abCardViewOverlay.dtd
+++ /dev/null
@@ -1,17 +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/. -->
-<!-- Box Headings -->
-
-<!ENTITY contact.heading             "Contacte">
-<!ENTITY home.heading                "Particular">
-<!ENTITY other.heading               "Altres">
-<!ENTITY phone.heading               "Telèfon">
-<!ENTITY work.heading                "Feina">
-<!-- Special Box Headings, for mailing lists -->
-<!ENTITY description.heading         "Descripció">
-<!ENTITY addresses.heading           "Adreces">
-<!-- For Map It! -->
-<!ENTITY mapItButton.label           "Obtingues el mapa">
-<!ENTITY mapIt.tooltip               "Mostra un mapa d'aquesta adreça del Web">
-
--- a/mail/chrome/messenger/am-mdn.dtd
+++ b/mail/chrome/messenger/am-mdn.dtd
@@ -1,15 +1,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY pane.title                   "Confirmacions de recepció">
 <!ENTITY useGlobalPrefs.label         "Utilitza les preferències globals de confirmació de recepció en aquest compte">
 <!ENTITY useGlobalPrefs.accesskey     "U">
+<!ENTITY globalReceipts.label         "Preferències globals…">
+<!ENTITY globalReceipts.accesskey     "G">
 <!ENTITY useCustomPrefs.label         "Personalitza les confirmacions de recepció per a aquest compte">
 <!ENTITY useCustomPrefs.accesskey     "P">
 <!ENTITY requestReceipt.label         "Quan s'estan enviant missatges, sempre sol·licita una confirmació de recepció">
 <!ENTITY requestReceipt.accesskey     "Q">
 <!ENTITY receiptArrive.label          "Quan arribi una confirmació de recepció:">
 <!ENTITY leaveIt.label                "Deixa-la a la safata d'entrada">
 <!ENTITY leaveIt.accesskey            "i">
 <!-- LOCALIZATION NOTE moveToSent.label Translate: 'Sent' according to Netscape glossary -->
--- a/mail/chrome/messenger/cloudfile/Box/auth.dtd
+++ b/mail/chrome/messenger/cloudfile/Box/auth.dtd
@@ -1,5 +1,6 @@
 <!-- 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/.  -->
+<!-- Note to localizers, Box is a brand from box.com -->
 
 <!ENTITY auth.title   "Autenticació a Box">
--- a/mail/chrome/messenger/cloudfile/Box/settings.dtd
+++ b/mail/chrome/messenger/cloudfile/Box/settings.dtd
@@ -1,5 +1,6 @@
 <!-- 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/.  -->
+<!-- Note to localizers, Box is a brand from box.com -->
 
 <!ENTITY boxSettings.needAnAccount "Aconsegueix un compte Box...">
deleted file mode 100644
--- a/mail/chrome/messenger/cloudfile/Dropbox/management.dtd
+++ /dev/null
@@ -1,4 +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 dropboxMgmt.viewSettings "Mostra els meus paràmetres de compte a dropbox.com">
deleted file mode 100644
--- a/mail/chrome/messenger/cloudfile/Dropbox/settings.dtd
+++ /dev/null
@@ -1,4 +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 dropboxSettings.learnMore "Més informació...">
--- a/mail/chrome/messenger/filter.properties
+++ b/mail/chrome/messenger/filter.properties
@@ -19,17 +19,21 @@ continueFilterExecution=No s'ha pogut ap
 promptTitle=Filtres en execució
 promptMsg=Actualment us trobeu en el procés de filtratge de missatges. Voleu seguir aplicant filtres?
 stopButtonLabel=Atura
 continueButtonLabel=Continua
 cannotEnableFilter=Probablement, aquest filtre es va crear amb una versió més recent de Mozilla/Netscape. No podeu habilitar aquest filtre perquè es desconeix com aplicar-lo.
 dontWarnAboutDeleteCheckbox=No m'ho tornis a demanar
 searchTermsInvalidTitle=Els criteris de cerca no són vàlids
 searchTermsInvalidMessage=Aquest filtre no es pot desar perquè alguns criteris de cerca no són vàlids en el context actual.
-
+filterCountVisibleOfTotal=%1$S de %2$S
+## LOCALIZATION NOTE(filterCountItems): Semi-colon list of plural forms.
+## See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+## #1 is the count of items in the list.# filterCountItems is a pluralForm - see 
+filterCountItems=#1 element; #1 elements
 # for junk mail logging / mail filter logging
 # LOCALIZATION NOTE(junkLogDetectStr)
 # %1$S=author, %2$S=subject, %3$S=date
 junkLogDetectStr=S'ha detectat un missatge brossa de %1$S - %2$S a %3$S
 # LOCALIZATION NOTE(logMoveStr)
 # %1$S=message id, %2$S=folder URI
 logMoveStr=s'ha mogut el missatge d'id = %1$S a %2$S
 # LOCALIZATION NOTE(logCopyStr)
--- a/mail/chrome/messenger/folderProps.dtd
+++ b/mail/chrome/messenger/folderProps.dtd
@@ -59,8 +59,15 @@
 <!ENTITY privileges.button.accesskey             "P">
 <!ENTITY permissionsDesc.label                   "Teniu els permisos següents:">
 <!ENTITY folderType.label                        "Tipus de carpeta:">
 
 <!ENTITY folderQuotaTab.label                    "Quota">
 <!ENTITY folderQuotaRoot.label                   "Arrel de la quota:">
 <!ENTITY folderQuotaUsage.label                  "Utilització:">
 <!ENTITY folderQuotaStatus.label                 "Estat:">
+
+<!ENTITY numberOfMessages.label                  "Nombre de missatges:">
+<!-- LOCALIZATION NOTE: When the number of messages can't be determined, this string is displayed as the number -->
+<!ENTITY numberUnknown.label                     "desconegut">
+<!ENTITY sizeOnDisk.label                        "Mida al disc:">
+<!-- LOCALIZATION NOTE: When the size can't be determined, this string is displayed as the size -->
+<!ENTITY sizeUnknown.label                       "desconegut">
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -503,16 +503,18 @@ you can use these alternative items. Oth
 <!ENTITY runJunkControls.accesskey "u">
 <!ENTITY deleteJunk.label "Suprimeix la brossa de la carpeta">
 <!ENTITY deleteJunk.accesskey "x">
 <!ENTITY importCmd.label "Importa…">
 <!ENTITY importCmd.accesskey "I">
 <!ENTITY errorConsoleCmd.label "Consola d'errors">
 <!ENTITY errorConsoleCmd.accesskey "C">
 <!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">
 <!-- Mail Toolbar -->
 
 <!ENTITY getMsgButton.label "Recupera">
@@ -544,16 +546,17 @@ you can use these alternative items. Oth
 <!ENTITY addressBookButton.label "Llibreta d'adreces">
 <!ENTITY chatButton.label "Xat">
 <!ENTITY glodaSearch.title "Cerca global">
 <!ENTITY searchItem.title "Cerca ràpida">
 <!ENTITY mailViewsToolbarItem.title "Vistes de la missatgeria">
 <!ENTITY folderLocationToolbarItem.title "Ubicació de la carpeta">
 <!ENTITY tagButton.label "Etiqueta">
 <!ENTITY compactButton.label "Compacta">
+<!ENTITY appmenuButton.label "Menú App">
 <!-- Mail Toolbar Tooltips-->
 
 <!ENTITY advancedButton.tooltip "Cerca avançada de missatges">
 <!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">
@@ -574,16 +577,24 @@ you can use these alternative items. Oth
 <!ENTITY printButton.tooltip "Imprimeix aquest missatge">
 <!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 appmenuButton.tooltip "Mostra el menú d'aplicacions">
+<!-- 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…">
 <!-- Tags Menu Popup -->
 
 <!ENTITY addNewTag.label "Afegeix una etiqueta…">
 <!ENTITY addNewTag.accesskey "n">
 <!ENTITY manageTags.label "Gestiona les etiquetes…">
 <!ENTITY manageTags.accesskey "G">
 <!-- Folder Pane -->
 
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -660,16 +660,18 @@ safeModeRestartButton=Reinicia
 update.checkInsideButton.label=Comprova si hi ha actualitzacions
 update.checkInsideButton.accesskey=C
 update.resumeButton.label=S'està continuant la baixada de %S…
 update.resumeButton.accesskey=b
 update.openUpdateUI.applyButton.label=Aplica l'actualització…
 update.openUpdateUI.applyButton.accesskey=A
 update.restart.updateButton.label=Reinicieu per actualitzar
 update.restart.updateButton.accesskey=R
+update.restart.restartButton.label=Actualitza i reinicia
+update.restart.restartButton.accesskey=R
 update.openUpdateUI.upgradeButton.label=Obtén la nova versió…
 update.openUpdateUI.upgradeButton.accesskey=v
 update.restart.upgradeButton.label=Obtén la nova versió
 update.restart.upgradeButton.accesskey=v
 
 websearch.setDefault=Selecciona com a predeterminat aquest motor de cerca
 websearch.isDefault=Aquest motor de cerca actualment és el predeterminat
 
@@ -689,8 +691,23 @@ crashedpluginsMessage.title=El connector
 crashedpluginsMessage.reloadButton.label=Actualitza la pàgina
 crashedpluginsMessage.reloadButton.accesskey=A
 crashedpluginsMessage.submitButton.label=Envia un informe de fallada
 crashedpluginsMessage.submitButton.accesskey=E
 crashedpluginsMessage.learnMore=Més informació...
 carbonFailurePluginsMessage.message=Aquesta pàgina demana permís per utilitzar un connector que només pot funcionar en mode 32 bits
 carbonFailurePluginsMessage.restartButton.label=Reinicia en mode 32 bits
 carbonFailurePluginsMessage.restartButton.accesskey=R
+
+# Sanitize
+# LOCALIZATION NOTE (sanitizeDialog2.everything.title): When "Time range to
+# clear" is set to "Everything", the Clear Recent History dialog's title is
+# changed to this.  See UI mockup and comment 11 at bug 480169 -->
+sanitizeDialog2.everything.title=Neteja tot l'historial
+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.
--- a/mail/chrome/messenger/messengercompose/sendProgress.dtd
+++ b/mail/chrome/messenger/messengercompose/sendProgress.dtd
@@ -1,8 +1,8 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!--LOCALIZATION NOTE sendprogress.dtd Main UI for Send Message Progress Dialog -->
 
-<!ENTITY sendWindow.title "S'estan enviant els missatges"> 
+<!ENTITY sendDialog.title "S'està processant el missatge">
 <!ENTITY status.label "Estat:">
 <!ENTITY progress.label "Progrés:">
--- a/mail/chrome/messenger/messengercompose/sendProgress.properties
+++ b/mail/chrome/messenger/messengercompose/sendProgress.properties
@@ -1,14 +1,20 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-titlePrefixSave=S'estan desant els missatges -
-titlePrefixSend=S'estan enviant els missatges -
+# LOCALIZATION NOTE (titleSendMsgSubject):
+# %S will be replaced by the message subject.
+titleSendMsgSubject=S'està enviant el missatge - %S
+titleSendMsg=S'està enviant el missatge
+# LOCALIZATION NOTE (titleSaveMsgSubject):
+# %S will be replaced by the message subject.
+titleSaveMsgSubject=S'està desant el missatge - %S
+titleSaveMsg=S'està desant el missatge
 
 # LOCALIZATION NOTE (percentMsg):
 # This string is used to format the text to the right of the progress meter.
 # %S will be replaced by the percentage of the file that has been saved.
 # %% will be replaced a single % sign.
 percentMsg=%S%%
 
 messageSent=S'ha enviat el vostre missatge.
--- a/mail/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/chrome/messenger/msgHdrViewOverlay.dtd
@@ -62,16 +62,20 @@
 <!ENTITY markAsUnreadMenuItem1.label "Marca com a no llegit">
 <!ENTITY markAsUnreadMenuItem1.accesskey "n">
 <!ENTITY saveAsMenuItem1.label "Anomena i desa...">
 <!ENTITY saveAsMenuItem1.accesskey "A">
 <!ENTITY viewSourceMenuItem1.label "Codi font">
 <!ENTITY viewSourceMenuItem1.accesskey "C">
 <!ENTITY otherActionsPrint1.label "Imprimeix...">
 <!ENTITY otherActionsPrint1.accesskey "I">
+<!-- Attachment bar context menu items -->
+
+<!ENTITY startExpandedCmd.label    "Inicialment mostra la subfinestra d'adjuncions">
+<!ENTITY startExpandedCmd.accesskey    "S">
 <!-- Attachment context menu items -->
 
 <!ENTITY openAttachmentCmd.label    "Obre">
 <!ENTITY openAttachmentCmd.accesskey    "O">
 <!ENTITY saveAsAttachmentCmd.label    "Anomena i desa…">
 <!ENTITY saveAsAttachmentCmd.accesskey    "A">
 <!ENTITY detachAttachmentCmd.label    "Separa…">
 <!ENTITY detachAttachmentCmd.accesskey    "p">
--- a/mail/chrome/messenger/preferences/general.dtd
+++ b/mail/chrome/messenger/preferences/general.dtd
@@ -26,14 +26,8 @@
 <!ENTITY systemsound.label                "So del sistema per defecte per al nou correu">
 <!ENTITY systemsoundMac.label             "So d'avís del sistema">
 <!ENTITY systemsoundMac.accesskey         "i">
 <!ENTITY systemsound.accesskey            "i">
 <!ENTITY customsound.label                "Utilitza el fitxer de so següent">
 <!ENTITY customsound.accesskey            "U">
 <!ENTITY browse.label                     "Navega…">
 <!ENTITY browse.accesskey                 "N">
-
-<!ENTITY addonsMgr.label                  "Complements">
-<!ENTITY manageAddonsDescWin.label        "Canvia les opcions dels vostres complements">
-<!ENTITY manageAddonsDescUnix2.label      "Canvia les preferències dels vostres complements">
-<!ENTITY manageAddons.label               "Gestiona els complements…">
-<!ENTITY manageAddons.accesskey           "G">
deleted file mode 100644
--- a/mail/chrome/messenger/preferences/junkLog.dtd
+++ /dev/null
@@ -1,10 +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 adaptiveJunkLog.title "Registre de correu brossa adaptatiu">
-<!ENTITY adaptiveJunkLogInfo.label "Registre del control d'activitat del correu brossa adaptatiu.">
-<!ENTITY clearLog.label "Buida el registre">
-<!ENTITY clearLog.accesskey "B">
-<!ENTITY closeLog.label "Tanca">
-<!ENTITY closeLog.accesskey "c">
--- a/mail/chrome/messenger/prefs.properties
+++ b/mail/chrome/messenger/prefs.properties
@@ -50,17 +50,24 @@ prefPanel-copies=Còpies i carpetes
 prefPanel-synchronization=Sincronització i emmagatzematge
 prefPanel-diskspace=Espai de disc
 prefPanel-addressing=Redacció i adreçament
 prefPanel-junk=Paràmetres del correu brossa
 ## LOCALIZATION NOTE (prefPanel-smtp): Don't translate "SMTP"
 prefPanel-smtp=Servidor de sortida (SMTP)
 
 # account manager multiple identity support
-#LOCALIZATION NOTE: accountName: %1$S 
+#LOCALIZATION NOTE: accountName: %1$S
 identity-list-title=Identitats per a %1$S
 
 identity-edit-req=Heu d'especificar una adreça electrònica vàlida per a aquesta identitat.
 identity-edit-req-title=Hi hagut un error creant la identitat
 
+## LOCALIZATION NOTE (identity-delete-confirm): %S is the identity name
+# and should be put on a new line. The new line is produced with the "\n" string.
+identity-delete-confirm=Esteu segur de voler suprimir la identitat\n%S?
+## LOCALIZATION NOTE (identity-delete-confirm-title): %S is the account name
+identity-delete-confirm-title=S'està suprimint la identitat de %S
+identity-delete-confirm-button=Suprimeix
+
 choosefile=Tria un fitxer
 
 forAccount=Pel compte «%S»
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/sanitize.dtd
@@ -0,0 +1,50 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY sanitizePrefs2.title          "Configuració de la neteja de l'historial">
+<!ENTITY sanitizeDialog2.title         "Neteja l'historial recent">
+
+<!ENTITY sanitizeItems.label          "Neteja ara els següents elements:">
+<!ENTITY clearDataSettings2.label     "En sortir del &brandShortName; s'hauria d'esborrar tot automàticament:">
+<!-- XXX rearrange entities to match physical layout when l10n isn't an issue -->
+<!-- LOCALIZATION NOTE (clearTimeDuration.*): "Time range to clear" dropdown.
+     See UI mockup at bug 480169 -->
+
+<!ENTITY clearTimeDuration.label          "Interval de temps per esborrar:">
+<!ENTITY clearTimeDuration.accesskey      "I">
+<!ENTITY clearTimeDuration.lastHour       "Darrera hora">
+<!ENTITY clearTimeDuration.last2Hours     "Darreres dues hores">
+<!ENTITY clearTimeDuration.last4Hours     "Darreres quatre hores">
+<!ENTITY clearTimeDuration.today          "Avui">
+<!ENTITY clearTimeDuration.everything     "Tot">
+<!-- Localization note (clearTimeDuration.suffix) - trailing entity for languages
+that require it.  -->
+<!ENTITY clearTimeDuration.suffix         "">
+<!ENTITY clearTimeDuration.dateColumn     "Data de visita">
+<!ENTITY clearTimeDuration.nameColumn     "Nom">
+<!-- LOCALIZATION NOTE (detailsProgressiveDisclosure.*): Labels and accesskeys
+     of the "Details" progressive disclosure button.  See UI mockup at bug
+     480169 -->
+
+<!ENTITY detailsProgressiveDisclosure.label     "Detalls">
+<!ENTITY detailsProgressiveDisclosure.accesskey "e">
+
+<!ENTITY historySection.label         "Historial">
+<!ENTITY dataSection.label            "Dades">
+<!-- LOCALIZATION NOTE (item*): itemHistoryAndDownloads.* and
+     itemBrowsingHistory.* will never be used at the same time, so they can
+     have the same accesskey. -->
+
+<!ENTITY itemCookies.label                 "Galetes">
+<!ENTITY itemCookies.accesskey             "G">
+<!ENTITY itemCache.label                   "Memòria cau">
+<!ENTITY itemCache.accesskey               "a">
+<!-- LOCALIZATION NOTE (sanitizeEverythingUndoWarning): Second warning paragraph
+     that appears when "Time range to clear" is set to "Everything".  See UI
+     mockup at bug 480169 -->
+
+<!ENTITY sanitizeEverythingUndoWarning     "Aquesta acció no es pot desfer.">
+
+<!ENTITY dialog.width                 "30em">
+<!ENTITY column.width                 "16em">
--- a/mail/chrome/messenger/searchTermOverlay.dtd
+++ b/mail/chrome/messenger/searchTermOverlay.dtd
@@ -3,18 +3,17 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY matchAll.label     "Tots els següents">
 <!ENTITY matchAll.accesskey "T">
 <!ENTITY matchAny.label     "Qualsevol dels següents">
 <!ENTITY matchAny.accesskey "Q">
 <!ENTITY matchAllMsgs.label     "Tots els missatges">
 <!ENTITY matchAllMsgs.accesskey "m">
-<!-- LOCALIZATION NOTE  
+<!-- LOCALIZATION NOTE
   The values below are used to control the widths of the search widgets.
   Change the values only when the localized strings in the popup menus
   are truncated in the widgets.
  -->
 
 <!ENTITY searchTermListAttributesFlexValue "9">
 <!ENTITY searchTermListOperatorsFlexValue "3">
 <!ENTITY searchTermListValueFlexValue "3">
-<!ENTITY searchTermListButtonsFlexValue "2">
--- a/mobile/android/base/android_strings.dtd
+++ b/mobile/android/base/android_strings.dtd
@@ -40,16 +40,18 @@
 <!ENTITY bookmark_removed "S\'ha suprimit l\'adreça d\'interès">
 <!ENTITY bookmark_updated "S\'ha actualitzat l\'adreça d\'interès">
 
 <!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">
 <!ENTITY reload "Actualitza">
 <!ENTITY forward "Endavant">
 <!ENTITY menu "Menú">
 <!ENTITY back "Enrere">
 <!ENTITY stop "Atura">
 <!ENTITY site_security "Seguretat del lloc">
 
 <!ENTITY close_tab "Tanca la pestanya">
@@ -80,26 +82,37 @@
 <!ENTITY pref_plugins_tap_to_play "Toqueu per engegar">
 <!ENTITY pref_plugins_disabled "Inhabilitat">
 <!ENTITY pref_text_size "Mida de la lletra">
 <!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
+same character/combination is used to increase the preview font size. It should be a concise
+representation of the language it is used in that will help show the text in the preview will change
+size. -->
+<!ENTITY pref_font_size_adjust_char "A">
+<!-- Localization note (pref_font_size_preview_text): This paragraph is used as an example to
+    demonstrate the font size setting.  It is meant to be whimsical and fun. -->
+
+<!ENTITY pref_font_size_preview_text "La ràpida guineu taronja salta per sobre de les vostres expectatives amb més velocitat, més flexibilitat i més seguretat. Com a organització sense ànim de lucre, som lliures d\'innovar en el vostre nom sense cap tipus de pressió a l\'hora de comprometre\'ns. Això vol dir que us podem oferir una millor experiència i un futur més brillant per al Web.">
+
 <!ENTITY pref_use_master_password "Contrasenya mestra">
 <!ENTITY pref_sync "Sincronitza">
 <!ENTITY pref_search_suggestions "Mostra els suggeriments de cerca">
 <!ENTITY pref_import_android "Importa de l\'Android">
 <!ENTITY pref_private_data_history "Historial de navegació i baixades">
 <!ENTITY pref_private_data_formdata "Historial de formularis i cerques">
-<!ENTITY pref_private_data_cookies "Galetes">
+<!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_sessions "Sessions actives">
 <!ENTITY pref_private_data_offlineApps "Dades fora de línia dels llocs web">
 <!ENTITY pref_private_data_siteSettings "Preferències dels lloc web">
 
 <!ENTITY quit "Surt">
 
 <!ENTITY addons "Complements">
 <!ENTITY downloads "Baixades">
 <!ENTITY apps "Aplicacions">
@@ -133,17 +146,17 @@
 
 <!ENTITY history_removed "S\'ha suprimit la pàgina">
 
 <!ENTITY bookmark_edit_title "Edita l\'adreça d\'interès">
 <!ENTITY bookmark_edit_name "Nom">
 <!ENTITY bookmark_edit_location "Ubicació">
 <!ENTITY bookmark_edit_keyword "Paraula clau">
 
-<!ENTITY site_settings_title        "Neteja les opcions del lloc">
+<!ENTITY site_settings_title2       "Paràmetres del lloc...">
 <!ENTITY site_settings_cancel       "Cancel·la">
 <!ENTITY site_settings_clear        "Neteja">
 <!ENTITY site_settings_no_settings  "No hi ha cap opció per netejar.">
 
 <!ENTITY reading_list "Llista de lectura">
 <!ENTITY reading_list_added "S\'ha afegit a la vostra pàgina de lectura">
 <!ENTITY reading_list_removed "S\'ha suprimit de la vostra pàgina de lectura">
 <!ENTITY reading_list_failed "No s\'ha pogut afegir la pàgina a la vostra llista de lectura">
@@ -159,19 +172,29 @@
 <!ENTITY button_clear_data "Neteja les dades">
 
 <!ENTITY abouthome_addons_title "Els complements del &brandShortName;">
 <!ENTITY abouthome_addons_browse "Mostra tots els complements del &brandShortName;">
 <!ENTITY abouthome_last_tabs_title "Les pestanyes de l\'última vegada">
 <!ENTITY abouthome_last_tabs_open "Obre totes les pestanyes de l\'última vegada">
 <!ENTITY abouthome_top_sites_title "Els vostres llocs">
 <!ENTITY abouthome_top_sites_browse "Mostra\'m els meus llocs més habituals">
-<!ENTITY abouthome_no_top_sites "Encara no teniu cap lloc seleccionat. Toqueu la barra del títol per seleccionar-lo.">
-<!ENTITY abouthome_about_sync "Configureu el Firefox Sync per accedir a les adreces d\'interès, l\'historial i les pestanyes dels altres dispositius que teniu">
+<!-- Localization note (abouthome_about_sync3, abouthome_about_apps2): The
+     chevron (ex: "»"; unicode= U+00BB) is used as an arrow to show that
+     clicking this text in the promotions box will perform some action. Note
+     that a non-breaking space (unicode= U+00A0) should be used between this
+     character and the remainder of the string to prevent word wrap. -->
+<!ENTITY abouthome_about_sync3 "Configureu el Firefox Sync per accedir a les adreces d\'interès, l\'historial i les pestanyes dels vostres altres dispositius&#x00A0;»">
+<!ENTITY abouthome_about_apps2 "Obtingueu aplicacions al Mozilla Marketplace i descobriu el millor que us pot oferir el Web&#x00A0;»">
+<!-- Localization note (abouthome_sync_bold_name, abouthome_apps_bold_name):
+     These strings are accentuated as bold text in the "abouthome_about_..."
+     strings above. These strings should be a subset of the strings above and
+     generally be the name of the product the string describes. -->
 <!ENTITY abouthome_sync_bold_name "Firefox Sync">
+<!ENTITY abouthome_apps_bold_name "Mozilla Marketplace">
 
 <!ENTITY filepicker_title "Trieu un fitxer">
 <!ENTITY filepicker_audio_title "Trieu o enregistreu un so">
 <!ENTITY filepicker_image_title "Trieu o feu una foto">
 <!ENTITY filepicker_video_title "Trieu o enregistreu un vídeo">
 <!-- Site identity popup -->
 
 <!ENTITY identity_connected_to "Esteu connectat a">
@@ -196,8 +219,25 @@ just addresses the organization to follo
 de l\'Android">
 <!ENTITY bookmarkhistory_import_bookmarks "S\'estan important les adreces d\'interès 
 de l\'Android">
 <!ENTITY bookmarkhistory_import_history "S\'està important l\'historial 
 de l\'Android">
 <!ENTITY bookmarkhistory_import_wait "Espereu…">
 
 <!ENTITY webapp_generic_name "Aplicacions">
+
+<!-- Updater notifications -->
+<!ENTITY updater_start_title "&brandShortName;">
+<!ENTITY updater_start_ticker "Actualització del &brandShortName; disponible&#8230;">
+<!ENTITY updater_start_select "Select to download update.">
+
+<!ENTITY updater_downloading_title "S\'està baixant el &brandShortName;">
+<!ENTITY updater_downloading_ticker "S\'està baixant l\'actualització del &brandShortName;&#8230;">
+<!ENTITY updater_downloading_ticker_failed "No s\'ha pogut baixar l\'actualització del &brandShortName;#8230;">
+<!ENTITY updater_downloading_select "Selecciona per aplicar l\'actualització quan acabi.">
+<!ENTITY updater_downloading_retry "Selecciona per tornar a baixar l\'actualització.">
+<!ENTITY updater_downloading_willapply "S\'està esperant que acabi l\'actualització.">
+
+<!ENTITY updater_apply_title "&brandShortName;">
+<!ENTITY updater_apply_ticker "Actualització del &brandShortName; disponible&#8230;">
+<!ENTITY updater_apply_select "Selecciona per aplicar l\'actualització baixada.">
+
--- a/mobile/android/base/sync_strings.dtd
+++ b/mobile/android/base/sync_strings.dtd
@@ -63,17 +63,17 @@
 <!ENTITY sync.button.connect.label "Connecta">
 <!ENTITY sync.button.ok.label "D\'acord">
 <!-- Account strings -->
   
 <!ENTITY sync.account.label.label "&syncBrand.fullName.label;">
 <!-- Bookmark folder strings -->
   
 <!ENTITY bookmarks.folder.menu.label "Menú de les adreces d\'interès">
-<!ENTITY bookmarks.folder.places.label ''>
+<!ENTITY bookmarks.folder.places.label "">
 <!ENTITY bookmarks.folder.tags.label "Etiquetes">
 <!ENTITY bookmarks.folder.toolbar.label "Barra d\'eines de les adreces">
 <!ENTITY bookmarks.folder.unfiled.label "Adreces desordenades">
 <!ENTITY bookmarks.folder.desktop.label "Adreces d\'escriptori">
 <!ENTITY bookmarks.folder.mobile.label "Adreces del mòbil">
 <!ENTITY bookmarks.folder.readinglist.label "Llista de lectura">
 <!-- Notification strings -->
 
@@ -86,9 +86,10 @@
 <!ENTITY sync.new.recoverykey.status.incorrect "Recovery Key incorrect. Please try again.">
 <!-- Send tab to device. -->
 
 <!ENTITY sync.title.send.tab.label "Envia la pestanya als dispositius">
 <!ENTITY sync.button.send.label "Envia">
 <!ENTITY sync.button.set.up.sync.label "Configura el &syncBrand.shortName.label;">
 <!ENTITY sync.title.redirect.to.set.up.sync.label "Configura el &syncBrand.shortName.label; per enviar pestanyes">
 <!ENTITY sync.text.redirect.to.set.up.sync.label "Configura el &syncBrand.fullName.label; en el dispositiu per enviar pestanyes a d\'altres.">
-<!ENTITY sync.text.tab.sent.label "S\'ha enviat la pestanya!">
+<!ENTITY sync.text.tab.sent.label "S\'ha enviat la pestanya.">
+<!ENTITY sync.text.tab.not.sent.label "S\'ha produït un problema en enviar la pestanya.">
--- a/mobile/android/chrome/aboutAddons.dtd
+++ b/mobile/android/chrome/aboutAddons.dtd
@@ -1,12 +1,12 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY aboutAddons.title                      "Gestor de complements">
+<!ENTITY aboutAddons.title2                     "Complements">
 <!ENTITY aboutAddons.header2                    "Els vostres complements">
 <!ENTITY aboutAddons.options                    "Opcions">
 
 <!ENTITY addonAction.enable                     "Habilita">
 <!ENTITY addonAction.disable                    "Inhabilita">
 <!ENTITY addonAction.uninstall                  "Desinstal·la">
 <!ENTITY addonAction.undo                       "Desfés">
--- a/mobile/android/chrome/aboutApps.dtd
+++ b/mobile/android/chrome/aboutApps.dtd
@@ -1,12 +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/. -->
 
-<!ENTITY aboutApps.title "Les vostres aplicacions">
+<!ENTITY aboutApps.title2                          "Aplicacions">
+<!ENTITY aboutApps.header                          "Les vostres aplicacions">
 <!-- LOCALIZATION NOTE (aboutApps.noApps.pre): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (aboutApps.noApps.middle): avoid leading/trailing spaces, this text is a link -->
 <!-- LOCALIZATION NOTE (aboutApps.noApps.post): include a starting space as needed -->
 
 <!ENTITY aboutApps.noApps.pre "No s'ha instal·lat cap aplicació web. Aconseguiu-ne de ">
-<!ENTITY aboutApps.noApps.middle "la botiga d'aplicacions">
+<!ENTITY aboutApps.noApps.middle2 "Mercat Mozilla">
 <!ENTITY aboutApps.noApps.post ".">
new file mode 100644
--- /dev/null
+++ b/mobile/android/chrome/aboutFeedback.dtd
@@ -0,0 +1,70 @@
+<!-- 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: The text in some of these strings is supposed to be
+     fun and playful. Please feel free to adjust the tone as works best in
+     your language and/or locale. More detailed notes below. -->
+
+
+<!ENTITY pageTitle                 "Comentaris del &brandShortName;">
+
+<!ENTITY intro.header              "Teniu un minut?">
+<!ENTITY intro.message             "Digueu-nos què en penseu del &brandShortName; per a l'Android de moment.">
+<!ENTITY intro.happyLink           "M'agrada">
+<!ENTITY intro.sadLink             "He tingut alguns problemes">
+<!ENTITY intro.ideaLink            "Tinc una idea">
+<!-- LOCALIZATION NOTE (support.pre): Include a trailing space as needed. -->
+<!-- LOCALIZATION NOTE (support.link): Avoid leading/trailing spaces, this text is a link. -->
+<!-- LOCALIZATION NOTE (support.post): Include a starting space as needed. -->
+
+<!ENTITY support.pre               "Si necessiteu ajuda, o teniu cap problema amb el &brandShortName;, visiteu ">
+<!ENTITY support.link              "Assistència del &brandShortName;">
+<!ENTITY support.post              ".">
+
+<!ENTITY happy.header              "És molt bo sentir això!">
+<!-- LOCALIZATION NOTE (happy.message): "share the love" — This feels purposely exaggerated in English,
+     but essentially it means that we want you to let others know how much you love Firefox. -->
+
+<!ENTITY happy.message             "Voleu compartir la vostra satisfacció donant-nos una puntuació de 5 estrelles al Google Play?">
+<!-- LOCALIZATION NOTE (happy.finePrint): "feels great" — Another exaggeration where we're trying to
+     get people to rate us by playfully telling them there's a benefit in it for them as well. -->
+
+<!ENTITY happy.finePrint           "Es triga menys d'un minut i us farà sentir molt bé.">
+
+<!ENTITY happy.ratingLink          "Si, vés al Google Play">
+<!ENTITY happy.maybeLater          "Potser més tard">
+<!ENTITY happy.noThanks            "No, gràcies">
+
+<!ENTITY sad.message               "Sentim que hàgiu tingut problemes amb el &brandShortName;. Digueu-nos què va passar perquè puguem solucionar-ho.">
+<!ENTITY sad.placeholder           "Introduïu aquí el vostre comentari">
+<!ENTITY sad.lastSite              "Darrer lloc visitat (opcional)">
+<!-- LOCALIZATION NOTE (sad.urlPlaceholder): Placeholder text that appears in "Last visited site" input box when there is no text. -->
+
+<!ENTITY sad.urlPlaceholder        "http://">
+<!ENTITY sad.thanksHeader          "Gràcies per fer-nos-ho saber.">
+<!-- LOCALIZATION NOTE (sad.thanksMessageTop): "real people" — We're stating that an actual human will look at the feedback
+     and that it doesn't just go to some automated system that looks for keywords, or something like that. -->
+
+<!ENTITY sad.thanksMessageTop      "Treballem contínuament per fer el &brandShortName; millor. Tingueu clar que hi ha gent real mirant els vostres comentaris i que farà tot el possible per resoldre el problema.">
+<!-- LOCALIZATION NOTE (sad.thanksMessageBottom): We're suggesting that there will be consequences for the people working
+     on Firefox if they don't resolve the user's problem, like "or if they don't fix it, we'll fire them." If this doesn't
+     work in your language, you can change it to something like "no matter what" or just remove it entirely. -->
+
+<!ENTITY sad.thanksMessageBottom   "No importa com.">
+<!-- LOCALIZATION NOTE (idea.message): In English, "please share your thoughts" could mean that we're asking the user to
+     tell us any thoughts or ideas they have about anything, so we're jokingly telling them not to use the space below
+     to tell us anything they're thinking about. -->
+
+<!ENTITY idea.message              "Ens encanta escoltar les vostres idees! Compartiu els vostres pensaments a continuació. (Només els referents a &brandShortName;)">
+<!ENTITY idea.placeholder          "Introduïu la vostra idea aquí">
+<!ENTITY idea.thanksHeader         "Gràcies!">
+
+<!ENTITY idea.thanksMessageTop     "Us agraïm que us hàgiu pres el temps per compartir els vostres pensaments. Estem treballant contínuament per fer el &brandShortName; millor i contribucions com la vostra poden portar a grans resultats.">
+<!-- LOCALIZATION NOTE (idea.thanksMessageBottom): "high five" — This is a celebratory or congratulatory gesture.
+     It could also be a handshake, a pat on the back, a thumbs up or something similar. The idea is that it's
+     something physical, which is why they can't see it.-->
+
+<!ENTITY idea.thanksMessageBottom  "No podeu veure-ho, però us estem donant un cinc alt ara mateix.">
+
+<!ENTITY feedback.privacy          "Per la vostra privadesa, no inclogueu en el comentari cap informació d'identificació personal.">
+<!ENTITY feedback.send             "Envia el comentari">
--- a/mobile/android/chrome/aboutReader.properties
+++ b/mobile/android/chrome/aboutReader.properties
@@ -6,8 +6,10 @@ 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.toolbarTip=Toqueu la pantalla per mostrar les opcions del lector
--- a/mobile/android/chrome/browser.properties
+++ b/mobile/android/chrome/browser.properties
@@ -204,26 +204,32 @@ intl.charsetmenu.browser.static=iso-8859
 appMenu.more=Més
 
 # Text Selection
 selectionHelper.textCopied=Text copiat al porta-retalls
 
 # Context menu
 contextmenu.openInNewTab=Obre l'enllaç en una pestanya nova
 contextmenu.share=Comparteix
+contextmenu.copyLink=Copia l'enllaç
 contextmenu.shareLink=Comparteix un enllaç
 contextmenu.bookmarkLink=Afegeix a les adreces d'interès
+contextmenu.copyEmailAddress=Copia l'adreça electrònica
+contextmenu.shareEmailAddress=Comparteix l'adreça electrònica
+contextmenu.copyPhoneNumber=Copia el número de telèfon
+contextmenu.sharePhoneNumber=Comparteix el número de telèfon
 contextmenu.changeInputMethod=Selecciona el mètode d'entrada
 contextmenu.fullScreen=Pantalla completa
 contextmenu.shareImage=Comparteix la imatge
 contextmenu.saveImage=Desa la imatge
 contextmenu.addSearchEngine=Afegeix un motor de cerca
 
 contextmenu.copy=Copia
 contextmenu.copyAll=Copia-ho tot
+contextmenu.selectWord=Selecciona la paraula
 contextmenu.selectAll=Selecciona-ho tot
 contextmenu.paste=Enganxa
 
 # Select UI
 selectHelper.closeMultipleSelectDialog=Fet
 
 # Web Console API
 stacktrace.anonymousFunction=<anònim>
@@ -233,16 +239,22 @@ timer.start=%S: s'ha iniciat el temporit
 # LOCALIZATION NOTE (timer.end):
 # This string is used to display the result of the console.timeEnd() call.
 # %1$S=name of timer, %2$S=number of milliseconds
 timer.end=%1$S: %2$Sms
 
 # Webapps
 webapps.installTitle=Instal·la l'aplicació
 webapps.alertSuccess=S'ha instal·lat correctament
+# Shown when there is a generic problem installing an app
+webapps.installError=Error en la instal·lació de l'aplicació
+# Shown when there is something wrong with an apps manifest
+webapps.manifestInstallError=Manifest d'aplicació no vàlid
+# Shown when a network error prevented installing an app
+webapps.networkInstallError=No s'ha pogut baixar el manifest
 
 # Click to play plugins
 clickToPlayPlugins.message1=%S té contingut per a connectors. Voldríeu reproduir-lo?
 clickToPlayPlugins.yes=Sí
 clickToPlayPlugins.no=No
 # LOCALIZATION NOTE (clickToPlayPlugins.dontAskAgain): This label appears next to a
 # checkbox to indicate whether or not the user wants to make a permanent decision.
 clickToPlayPlugins.dontAskAgain=No tornis a demanar per aquest lloc
@@ -263,10 +275,13 @@ masterPassword.incorrect=Contrasenya inc
 # dialog that prompts the user to allow the incoming connection.
 remoteIncomingPromptTitle=Connexió entrant
 # LOCALIZATION NOTE (remoteIncomingPromptMessage): The message displayed on the
 # dialog that prompts the user to allow the incoming connection.
 remoteIncomingPromptMessage=S'ha detectat una sol·licitud entrant per permetre una connexió de depuració remota. Un client remot pot obtenir el control total del vostre navegador! Voleu permetre la connexió?
 remoteIncomingPromptDisable=Desactiva
 
 # Helper apps
+helperapps.open=Obre
+helperapps.ignore=Ignora
+helperapps.dontAskAgain=No ho tornis a demanar per a aquest lloc
 helperapps.openWithApp2=Obre amb l'aplicació %S
 helperapps.openWithList2=Obre amb una aplicació
--- a/security/manager/chrome/pippki/deviceManager.dtd
+++ b/security/manager/chrome/pippki/deviceManager.dtd
@@ -1,13 +1,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY devmgr.title                           "Gestor de dispositius">
+<!-- LOCALIZATION NOTE (devmgr.style): This is CSS style for Device Manager
+     window size. Don't translate "width" nor "height". Adjust the numbers
+     to make window contents fit. -->
+<!ENTITY devmgr.style                           "width: 56em; height: 36em;">
 
 <!ENTITY devmgr.devlist.label                   "Mòduls i dispositius de seguretat">
 <!ENTITY devmgr.details.title                   "Detalls">
 <!ENTITY devmgr.details.title2                  "Valor">
 <!ENTITY devmgr.status.label                    "Estat">
 <!ENTITY devmgr.version.label                   "Versió">
 
 <!ENTITY devmgr.button.changeslotname.label     "Reanomena la ranura">
--- a/suite/chrome/browser/linkToolbar.dtd
+++ b/suite/chrome/browser/linkToolbar.dtd
@@ -1,15 +1,16 @@
 <!-- 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/. -->
 <!-- Link Toolbar Title -->
 
 <!ENTITY linkToolbar.label "Barra de navegació del lloc">
 <!ENTITY linkToolbar.accesskey "B">
+<!ENTITY linkToolbar.tooltip "Barra de navegació del lloc web">
 <!-- Link Toolbar visibility options -->
 
 <!ENTITY linkToolbarAlways.label "Mostra sempre">
 <!ENTITY linkToolbarAlways.accesskey "o">
 <!ENTITY linkToolbarAsNeeded.label "Mostra només quan calgui">
 <!ENTITY linkToolbarAsNeeded.accesskey "o">
 <!ENTITY linkToolbarNever.label "Amaga sempre">
 <!ENTITY linkToolbarNever.accesskey "m">
--- a/suite/chrome/common/contentAreaCommands.dtd
+++ b/suite/chrome/common/contentAreaCommands.dtd
@@ -50,18 +50,18 @@
 <!ENTITY reloadImageCmd.label         "Actualitza la imatge">
 <!ENTITY reloadImageCmd.accesskey     "e">
 <!ENTITY viewImageCmd.label           "Visualitza la imatge">
 <!ENTITY viewImageCmd.accesskey       "V">
 <!ENTITY viewVideoCmd.label           "Visualitza el vídeo">
 <!ENTITY viewVideoCmd.accesskey       "i">
 <!ENTITY viewBGImageCmd.label         "Visualitza la imatge de fons">
 <!ENTITY viewBGImageCmd.accesskey     "f">
-<!ENTITY setWallpaperCmd.label        "Assigna com a fons d'escriptori">
-<!ENTITY setWallpaperCmd.accesskey    "s">
+<!ENTITY setDesktopBackgroundCmd.label     "Defineix el fons d'escriptori...">
+<!ENTITY setDesktopBackgroundCmd.accesskey "o">
 <!ENTITY bookmarkPageCmd.label        "Afegeix aquesta pàgina a les adreces d'interès…">
 <!ENTITY bookmarkPageCmd.accesskey    "p">
 <!ENTITY bookmarkLinkCmd.label        "Afegeix aquest enllaç a les adreces d'interès…">
 <!ENTITY bookmarkLinkCmd.accesskey    "l">
 <!ENTITY bookmarkFrameCmd.label       "Desa aquest marc com a adreça d'interès">
 <!ENTITY bookmarkFrameCmd.accesskey   "m">
 <!ENTITY savePageAsCmd.label          "Anomena i desa la pàgina…">
 <!ENTITY savePageCmd.label            "Anomena i desa la pàgina">
--- a/suite/chrome/common/pref/pref-mousewheel.dtd
+++ b/suite/chrome/common/pref/pref-mousewheel.dtd
@@ -1,32 +1,30 @@
 <!-- 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 : FILE Mouse-wheel management prefs, for those lucky OSes that support mouse wheels -->
 
-
 <!ENTITY pref.mouseWheel.title           "Rodeta del ratolí">
 <!ENTITY mouseWheelPanel.label           "Indiqueu el comportament de la roda del ratolí en utilitzar-lo amb aquesta tecla: ">
 <!ENTITY usingJustTheWheel.label         "Sense tecla modificadora">
 <!ENTITY usingWheelAndAlt.label          "&altKey.label;">
 <!ENTITY usingWheelAndCtrl.label         "&ctrlKey.label;">
 <!ENTITY usingWheelAndShft.label         "&shiftKey.label;">
-<!ENTITY mousewheelGroup.label           "Desplaçament vertical">
-<!ENTITY mousewheelHorizGroup.label      "Desplaçament horitzontal">
-<!ENTITY scroll.label                    "Desplaça el document">
-<!ENTITY scroll.accesskey                "s">
-<!ENTITY scrollHoriz.accesskey           "ç">
-<!ENTITY scrollLines.label               " línies">
-<!ENTITY scrollChars.label               " caràcters">
-<!ENTITY useSystemDefault.label          "Per defecte al sistema">
-<!ENTITY useSystemDefault.accesskey      "i">
-<!ENTITY useSystemDefaultHoriz.accesskey "d">
-<!ENTITY scrollPgUpPgDn.label            "Desplaça una pàgina amunt o avall">
-<!ENTITY scrollPgUpPgDn.accesskey        "p">
-<!ENTITY scrollPgLtPgRt.label            "Desplaça't una pàgina a l'esquerra o a la dreta">
-<!ENTITY scrollPgLtPgRt.accesskey        "o">
+<!ENTITY mouseWheelAction.label          "Acció de la roda del ratolí">
+<!ENTITY doNothing.label                 "Cap">
+<!ENTITY doNothing.accesskey             "C">
+<!ENTITY scrollDocument.label            "Desplaça el document">
+<!ENTITY scrollDocument.accesskey        "S">
+<!ENTITY mouseWheelSpeed.label           "Velocitat de la roda del ratolí">
 <!ENTITY history.label                   "Mou enrere o endavant en l'historial de navegació">
 <!ENTITY history.accesskey               "h">
-<!ENTITY historyHoriz.accesskey          "v">
 <!ENTITY zoom.label                      "Augmenta o redueix la pàgina">
 <!ENTITY zoom.accesskey                  "t">
-<!ENTITY zoomHoriz.accesskey             "e">
+<!ENTITY verticalSpeed.label             "Vertical:">
+<!ENTITY verticalSpeed.accesskey         "V">
+<!ENTITY verticalReverse.label           "Direcció inversa">
+<!ENTITY verticalReverse.accesskey       "i">
+<!ENTITY horizontalSpeed.label           "Horitzontal:">
+<!ENTITY horizontalSpeed.accesskey       "o">
+<!ENTITY horizontalReverse.label         "Direcció inversa">
+<!ENTITY horizontalReverse.accesskey     "e">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/setDesktopBackground.dtd
@@ -0,0 +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 setDesktopBackground.title "Defineix el fons d'escriptori">
+
+<!ENTITY position.label             "Posició:">
+<!ENTITY position.accesskey         "P">
+<!ENTITY position.tile.label        "Mosaic">
+<!ENTITY position.stretch.label     "Amplia">
+<!ENTITY position.center.label      "Centra">
+<!ENTITY position.fill.label        "Omple">
+<!ENTITY position.fit.label         "Ajusta">
+<!ENTITY picker.label               "Color:">
+<!ENTITY picker.accesskey           "C">
+<!ENTITY preview.caption            "Previsualitza">
+<!ENTITY apply.label                "Aplica">
+<!ENTITY apply.accesskey            "A">
+<!ENTITY close.label                "Tanca">
--- a/suite/chrome/mailnews/FilterEditor.dtd
+++ b/suite/chrome/mailnews/FilterEditor.dtd
@@ -43,8 +43,15 @@
 <!ENTITY fetchFromPOP.label "Baixa'l del servidor POP ">
 <!ENTITY ignoreThread.label "Ignora la conversa">
 <!ENTITY ignoreSubthread.label "Ignora la subconversa">
 <!ENTITY watchThread.label "Vigila la conversa">
 <!ENTITY stopExecution.label "Atura l'execució del filtre">
 
 <!ENTITY addAction.tooltip "Afegeix una acció nova">
 <!ENTITY removeAction.tooltip "Suprimeix aquesta acció">
+<!-- LOCALIZATION NOTE
+  The values below are used to control the widths of the filter action widgets.
+  Change the values only when the localized strings in the popup menus
+  are truncated in the widgets.
+ -->
+<!ENTITY filterActionTypeFlexValue "1">
+<!ENTITY filterActionTargetFlexValue "4">
--- a/suite/chrome/mailnews/addressbook/abCardOverlay.dtd
+++ b/suite/chrome/mailnews/addressbook/abCardOverlay.dtd
@@ -27,17 +27,17 @@
 <!ENTITY NameField1.accesskey           "o">
 <!ENTITY NameField2.label               "Cognoms:">
 <!ENTITY NameField2.accesskey           "C">
 <!ENTITY PhoneticField1.label           "Fonètica:">
 <!ENTITY PhoneticField2.label           "Fonètica:">
 <!ENTITY DisplayName.label              "Nom a mostrar:">
 <!ENTITY DisplayName.accesskey          "m">
 <!ENTITY preferDisplayName.label        "Es prefereix mostrar sempre el nom sobre la capçalera del missatge">
-<!ENTITY preferDisplayName.accesskey    "A">
+<!ENTITY preferDisplayName.accesskey    "a">
 <!ENTITY NickName.label                 "Sobrenom:">
 <!ENTITY NickName.accesskey             "S">
 
 <!ENTITY PrimaryEmail.label             "Adreça electrònica:">
 <!ENTITY PrimaryEmail.accesskey         "e">
 <!ENTITY SecondEmail.label              "Adreça electrònica addicional:">
 <!ENTITY SecondEmail.accesskey          "l">
 <!ENTITY PreferMailFormat.label         "Prefereix rebre missatges formatats com:">
@@ -84,17 +84,17 @@ de contingut incrustat en els missatges 
 <!ENTITY HomeWebPage.label              "Pàgina web:">
 <!ENTITY HomeWebPage.accesskey          "w">
 <!ENTITY Birthday.label                 "Aniversari:">
 <!ENTITY Birthday.accesskey             "v">
 <!ENTITY In.label                       "">
 <!ENTITY Year.placeholder               "Any">
 <!ENTITY Or.value                       "o">
 <!ENTITY Age.placeholder                "Edat">
-<!ENTITY YearsOld.label                 "">
+<!ENTITY YearsOld.label                 " anys">
 
 <!ENTITY Work.tab                       "Feina">
 <!ENTITY Work.accesskey                 "F">
 <!ENTITY JobTitle.label                 "Títol:">
 <!ENTITY JobTitle.accesskey             "T">
 <!ENTITY Department.label               "Departament:">
 <!ENTITY Department.accesskey           "m">
 <!ENTITY Company.label                  "Organització:">
deleted file mode 100644
--- a/suite/chrome/mailnews/addressbook/abCardViewOverlay.dtd
+++ /dev/null
@@ -1,17 +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/. -->
-<!-- Box Headings -->
-
-<!ENTITY contact.heading             "Contacte">
-<!ENTITY home.heading                "Particular">
-<!ENTITY other.heading               "Altres">
-<!ENTITY phone.heading               "Telèfon">
-<!ENTITY work.heading                "Feina">
-<!-- Special Box Headings, for mailing lists -->
-<!ENTITY description.heading         "Descripció">
-<!ENTITY addresses.heading           "Adreces">
-<!-- For Map It! -->
-<!ENTITY mapItButton.label           "Obtingues el mapa">
-<!ENTITY mapIt.tooltip               "Mostra un mapa d'aquesta adreça del Web">
-
--- a/suite/chrome/mailnews/compose/sendProgress.dtd
+++ b/suite/chrome/mailnews/compose/sendProgress.dtd
@@ -1,8 +1,8 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!--LOCALIZATION NOTE sendprogress.dtd Main UI for Send Message Progress Dialog -->
 
-<!ENTITY sendWindow.title "S'estan enviant els missatges"> 
+<!ENTITY sendDialog.title "S'està processant el missatge">
 <!ENTITY status.label "Estat:">
 <!ENTITY progress.label "Progrés:">
--- a/suite/chrome/mailnews/compose/sendProgress.properties
+++ b/suite/chrome/mailnews/compose/sendProgress.properties
@@ -1,14 +1,20 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-titlePrefixSave=S'estan desant els missatges -
-titlePrefixSend=S'estan enviant els missatges -
+# LOCALIZATION NOTE (titleSendMsgSubject):
+# %S will be replaced by the message subject.
+titleSendMsgSubject=S'està enviant el missatge - %S
+titleSendMsg=S'està enviant el missatge
+# LOCALIZATION NOTE (titleSaveMsgSubject):
+# %S will be replaced by the message subject.
+titleSaveMsgSubject=S'està desant el missatge - %S
+titleSaveMsg=S'està desant el missatge
 
 # LOCALIZATION NOTE (percentMsg):
 # This string is used to format the text to the right of the progress meter.
 # %S will be replaced by the percentage of the file that has been saved.
 # %% will be replaced a single % sign.
 percentMsg=%S%%
 
 messageSent=S'ha enviat el vostre missatge.
--- a/suite/chrome/mailnews/folderProps.dtd
+++ b/suite/chrome/mailnews/folderProps.dtd
@@ -59,8 +59,15 @@
 <!ENTITY privileges.button.accesskey             "P">
 <!ENTITY permissionsDesc.label                   "Teniu els permisos següents:">
 <!ENTITY folderType.label                        "Tipus de carpeta:">
 
 <!ENTITY folderQuotaTab.label                    "Quota">
 <!ENTITY folderQuotaRoot.label                   "Arrel de la quota:">
 <!ENTITY folderQuotaUsage.label                  "Utilització:">
 <!ENTITY folderQuotaStatus.label                 "Estat:">
+
+<!ENTITY numberOfMessages.label                  "Nombre de missatges:">
+<!-- LOCALIZATION NOTE: When the number of messages can't be determined, this string is displayed as the number -->
+<!ENTITY numberUnknown.label                     "desconegut">
+<!ENTITY sizeOnDisk.label                        "Mida al disc:">
+<!-- LOCALIZATION NOTE: When the size can't be determined, this string is displayed as the size -->
+<!ENTITY sizeUnknown.label                       "desconegut">
--- a/suite/chrome/mailnews/pref/am-mdn.dtd
+++ b/suite/chrome/mailnews/pref/am-mdn.dtd
@@ -1,15 +1,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY pane.title                   "Confirmacions de recepció">
 <!ENTITY useGlobalPrefs.label         "Utilitza les preferències globals de confirmació de recepció en aquest compte">
 <!ENTITY useGlobalPrefs.accesskey     "U">
+<!ENTITY globalReceipts.label         "Preferències globals...">
+<!ENTITY globalReceipts.accesskey     "G">
 <!ENTITY useCustomPrefs.label         "Personalitza les confirmacions de recepció per a aquest compte">
 <!ENTITY useCustomPrefs.accesskey     "P">
 <!ENTITY requestReceipt.label         "Quan s'estan enviant missatges, sempre sol·licita una confirmació de recepció">
 <!ENTITY requestReceipt.accesskey     "Q">
 <!ENTITY receiptArrive.label          "Quan arribi una confirmació de recepció:">
 <!ENTITY leaveIt.label                "Deixa-la a la safata d'entrada">
 <!ENTITY leaveIt.accesskey            "i">
 <!-- LOCALIZATION NOTE moveToSent.label Translate: 'Sent' according to Netscape glossary -->
--- a/suite/chrome/mailnews/pref/prefs.properties
+++ b/suite/chrome/mailnews/pref/prefs.properties
@@ -51,17 +51,24 @@ prefPanel-copies=Còpies i carpetes
 prefPanel-synchronization=Sincronització i emmagatzematge
 prefPanel-diskspace=Espai de disc
 prefPanel-addressing=Redacció i adreçament
 prefPanel-junk=Paràmetres del correu brossa
 ## LOCALIZATION NOTE (prefPanel-smtp): Don't translate "SMTP"
 prefPanel-smtp=Servidor de sortida (SMTP)
 
 # account manager multiple identity support
-#LOCALIZATION NOTE: accountName: %1$S 
+#LOCALIZATION NOTE: accountName: %1$S
 identity-list-title=Identitats per a %1$S
 
 identity-edit-req=Heu d'especificar una adreça electrònica vàlida per a aquesta identitat.
 identity-edit-req-title=Hi hagut un error creant la identitat
 
+## LOCALIZATION NOTE (identity-delete-confirm): %S is the identity name
+# and should be put on a new line. The new line is produced with the "\n" string.
+identity-delete-confirm=¿Esteu segur que voleu suprimir la identitat\n%S?
+## LOCALIZATION NOTE (identity-delete-confirm-title): %S is the account name
+identity-delete-confirm-title=S'està suprimint la identitat de %S
+identity-delete-confirm-button=Suprimeix
+
 choosefile=Tria un fitxer
 
 forAccount=Al compte "%S"
--- a/suite/chrome/mailnews/search.properties
+++ b/suite/chrome/mailnews/search.properties
@@ -11,18 +11,18 @@
 #
 # for example, in english this looks like:
 # and the [Sender ] [doesn't contain] [John]
 #
 # TODO: need to special-case the first line (filterindex==0)
 
 # filter stuff
 searchingMessage=S'està cercant....
-searchSuccessMessage=S'ha trobat 1 coincidència
-searchSuccessMessages=S'han trobat %S coincidències
-searchFailureMessage=No s'ha trobat cap coincidència
+# LOCALIZATION NOTE (matchesFound): #1 number of matches found
+matchesFound=#1 coincidència trobada;#1 coincidències trobades
+noMatchesFound=No s'han trobat coincidències
 labelForStopButton=Atura
 labelForSearchButton=Cerca
 labelForStopButton.accesskey=u
 labelForSearchButton.accesskey=C
 
 moreButtonTooltipText=Afegeix una nova regla
 lessButtonTooltipText=Suprimeix aquesta regla
--- a/suite/chrome/mailnews/searchTermOverlay.dtd
+++ b/suite/chrome/mailnews/searchTermOverlay.dtd
@@ -3,17 +3,16 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY matchAll.label     "Tots els següents">
 <!ENTITY matchAll.accesskey "T">
 <!ENTITY matchAny.label     "Qualsevol dels següents">
 <!ENTITY matchAny.accesskey "Q">
 <!ENTITY matchAllMsgs.label     "Tots els missatges">
 <!ENTITY matchAllMsgs.accesskey "m">
-<!-- LOCALIZATION NOTE  
+<!-- LOCALIZATION NOTE
   The values below are used to control the widths of the search widgets.
   Change the values only when the localized strings in the popup menus
   are truncated in the widgets.
  -->
 <!ENTITY searchTermListAttributesFlexValue "9">
 <!ENTITY searchTermListOperatorsFlexValue "3">
 <!ENTITY searchTermListValueFlexValue "3">
-<!ENTITY searchTermListButtonsFlexValue "2">
--- a/toolkit/chrome/global-platform/mac/platformKeys.properties
+++ b/toolkit/chrome/global-platform/mac/platformKeys.properties
@@ -7,16 +7,19 @@
 #these are used in XP menus to show keyboard shortcuts
 
 #the shift key - open up arrow symbol (ctrl-e)
 VK_SHIFT=⇧
 
 #the command key - clover leaf symbol (ctrl-q)
 VK_META=⌘
 
+#the win key - never generated by native key event
+VK_WIN=win
+
 #the option/alt key - splitting tracks symbol (ctrl-g)
 VK_ALT=⌥
 
 #the control key. hat symbol (ctrl-f)
 VK_CONTROL=⌃
 
 #the separator character used between modifiers (none on Mac OS)
-MODIFIER_SEPARATOR=
+MODIFIER_SEPARATOR= 
--- a/toolkit/chrome/global-platform/unix/platformKeys.properties
+++ b/toolkit/chrome/global-platform/unix/platformKeys.properties
@@ -7,16 +7,19 @@
 #these are used in XP menus to show keyboard shortcuts
 
 #the shift key
 VK_SHIFT=Maj
 
 #the command key
 VK_META=Meta
 
+#the win key (Super key and Hyper keys are mapped to DOM Win key)
+VK_WIN=Win
+
 #the alt key
 VK_ALT=Alt
 
 #the control key
 VK_CONTROL=Ctrl
 
 #the separator character used between modifiers 
 MODIFIER_SEPARATOR=+
--- a/toolkit/chrome/global-platform/win/platformKeys.properties
+++ b/toolkit/chrome/global-platform/win/platformKeys.properties
@@ -7,16 +7,19 @@
 #these are used in XP menus to show keyboard shortcuts
 
 #the shift key
 VK_SHIFT=Maj
 
 #the command key
 VK_META=Meta
 
+#the win key
+VK_WIN=Win
+
 #the alt key
 VK_ALT=Alt
 
 #the control key
 VK_CONTROL=Ctrl
 
 #the separator character used between modifiers 
 MODIFIER_SEPARATOR=+