update stuff to beta
authorToni Hermoso Pulido <toniher@softcatala.org>
Sun, 02 Sep 2012 12:16:39 +0200
changeset 1070 218e1e7fc8ef872c36cff4f9abd42feee8e5e433
parent 1046 870b4f6ef8439937871ec9fc4efcc18529eb2cf1
child 1071 b2e1c5c2f8d6a2c29680f888be875151d97e6e7e
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:43:21 +0000
update stuff to beta
browser/chrome/browser/aboutSessionRestore.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/gcli.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/inspector.properties
browser/chrome/browser/devtools/scratchpad.dtd
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/migration/migration.properties
browser/chrome/browser/preferences/advanced-scripts.dtd
browser/pdfviewer/chrome.properties
browser/pdfviewer/viewer.properties
browser/webapprt/webapp.properties
calendar/chrome/calendar/calendar-event-dialog.dtd
calendar/chrome/calendar/calendar-event-dialog.properties
calendar/chrome/lightning/lightning.dtd
dom/chrome/accessibility/AccessFu.properties
dom/chrome/accessibility/mac/accessible.properties
dom/chrome/dom/dom.properties
dom/chrome/layout/HtmlForm.properties
dom/chrome/security/csp.properties
dom/chrome/xslt/xslt.properties
mail/chrome/messenger/accountCreation.properties
mail/chrome/messenger/addressbook/abMainWindow.dtd
mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd
mail/chrome/messenger/addressbook/addressBook.properties
mail/chrome/messenger/cloudfile/Box/auth.dtd
mail/chrome/messenger/cloudfile/Box/management.dtd
mail/chrome/messenger/cloudfile/Box/settings.dtd
mail/chrome/messenger/cloudfile/YouSendIt/fileExceeds2GB.dtd
mail/chrome/messenger/cloudfile/YouSendIt/fileExceedsLimit.dtd
mail/chrome/messenger/cloudfile/YouSendIt/fileExceedsQuota.dtd
mail/chrome/messenger/imapMsgs.properties
mail/chrome/messenger/importDialog.dtd
mail/chrome/messenger/junkLog.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/offline.properties
mail/chrome/messenger/pgpmime.properties
mail/chrome/messenger/preferences/advanced.dtd
mail/chrome/messenger/preferences/fonts.dtd
mobile/android/base/android_strings.dtd
mobile/android/base/sync_strings.dtd
mobile/android/chrome/aboutAddons.dtd
mobile/android/chrome/aboutAddons.properties
mobile/android/chrome/aboutReader.properties
mobile/android/chrome/browser.properties
mobile/overrides/passwordmgr.properties
security/manager/chrome/pipnss/pipnss.properties
security/manager/chrome/pippki/pippki.properties
suite/chrome/browser/pageInfo.dtd
suite/chrome/common/dataman/dataman.properties
suite/chrome/common/permissions/permissionsManager.properties
suite/chrome/common/pref/pref-offlineapps.dtd
suite/chrome/common/pref/pref-scripts.dtd
suite/chrome/common/pref/preferences.dtd
suite/chrome/common/pref/prefutilities.properties
suite/chrome/mailnews/addressbook/abCardOverlay.dtd
suite/chrome/mailnews/addressbook/abMainWindow.dtd
suite/chrome/mailnews/addressbook/addressBook.properties
suite/chrome/mailnews/compose/messengercompose.dtd
suite/chrome/mailnews/imapMsgs.properties
suite/chrome/mailnews/importDialog.dtd
suite/chrome/mailnews/junkLog.dtd
suite/chrome/mailnews/messenger.dtd
suite/chrome/mailnews/messenger.properties
suite/chrome/mailnews/msgHdrViewPopup.dtd
suite/chrome/mailnews/pgpmime.properties
suite/chrome/mailnews/pref/am-server-advanced.dtd
suite/chrome/mailnews/pref/pref-offline.dtd
toolkit/chrome/global-platform/mac/platformKeys.properties
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/global/console.dtd
toolkit/chrome/global/dialog.properties
toolkit/chrome/global/dialogOverlay.dtd
toolkit/chrome/global/filepicker.properties
toolkit/chrome/global/intl.properties
toolkit/chrome/mozapps/downloads/settingsChange.dtd
toolkit/chrome/mozapps/downloads/unknownContentType.dtd
toolkit/chrome/mozapps/plugins/plugins.dtd
toolkit/chrome/mozapps/profile/profileSelection.properties
toolkit/chrome/passwordmgr/passwordManager.dtd
--- a/browser/chrome/browser/aboutSessionRestore.dtd
+++ b/browser/chrome/browser/aboutSessionRestore.dtd
@@ -9,15 +9,15 @@
 <!ENTITY restorepage.errorTitle     "Bé, és lamentable.">
 <!ENTITY restorepage.problemDesc    "El &brandShortName; té problemes per recuperar les vostres finestres i pestanyes. Normalment és a causa d'una pàgina web oberta recentment.">
 <!ENTITY restorepage.tryThis        "Podeu provar el següent:">
 <!ENTITY restorepage.restoreSome    "Descartar una o més pestanyes que creieu que poden estar causant el problema">
 <!ENTITY restorepage.startNew       "Iniciar una sessió de navegació completament nova">
 
 <!ENTITY restorepage.tryagainButton "Restaura">
 <!ENTITY restorepage.restore.access "R">
-<!ENTITY restorepage.cancelButton   "Inicia una sessió nova">
-<!ENTITY restorepage.cancel.access  "s">
+<!ENTITY restorepage.closeButton    "Tanca">
+<!ENTITY restorepage.close.access   "c">
 
 <!ENTITY restorepage.restoreHeader  "Restaura">
 <!ENTITY restorepage.listHeader     "Finestres i pestanyes">
 <!-- LOCALIZATION NOTE: &#37;S will be replaced with a number. -->
 <!ENTITY restorepage.windowLabel    "Finestra &#37;S">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -79,19 +79,19 @@ can reach it easily. -->
 <!ENTITY pageSourceCmd.accesskey "o">
 <!ENTITY pageSourceCmd.commandkey "u">
 <!ENTITY pageInfoCmd.label "Informació de la pàgina">
 <!ENTITY pageInfoCmd.accesskey "I">
 <!ENTITY pageInfoCmd.commandkey "i">
 <!-- LOCALIZATION NOTE (enterFullScreenCmd.label, exitFullScreenCmd.label):
 These should match what Safari and other Apple applications use on OS X Lion. -->
 <!ENTITY enterFullScreenCmd.label "Obre a pantalla completa">
-<!ENTITY enterFullScreenCmd.accesskey "P">
+<!ENTITY enterFullScreenCmd.accesskey "p">
 <!ENTITY exitFullScreenCmd.label "Surt de la pantalla completa">
-<!ENTITY exitFullScreenCmd.accesskey "P">
+<!ENTITY exitFullScreenCmd.accesskey "p">
 <!ENTITY fullScreenCmd.label "Pantalla completa">
 <!ENTITY fullScreenCmd.accesskey "P">
 <!ENTITY fullScreenCmd.macCommandKey "f">
 <!ENTITY showAllTabsCmd.label "Mostra totes les pestanyes">
 <!ENTITY showAllTabsCmd.accesskey "a">
 
 <!ENTITY fullScreenMinimize.tooltip "Minimitza">
 <!ENTITY fullScreenRestore.tooltip "Restaura">
@@ -110,16 +110,17 @@ These should match what Safari and other
 
 <!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">
+<!ENTITY sharePageCmd.commandkey "l">
 <!ENTITY subscribeToPageMenupopup.label "Subscriu-me a la pàgina">
 <!ENTITY subscribeToPageMenuitem.label "Subscriu-me a la pàgina…">
 <!ENTITY addCurPagesCmd.label "Afegeix-hi totes les pestanyes…">
 <!ENTITY showAllBookmarks2.label "Mostra totes les adreces d'interès">
 <!ENTITY unsortedBookmarksCmd.label "Adreces d'interès desordenades">
 <!ENTITY bookmarksToolbarChevron.tooltip "Mostra més adreces d'interès">
 
 <!ENTITY backCmd.label                "Enrere">
@@ -210,19 +211,18 @@ These should match what Safari and other
 <!ENTITY inspectMenu.label            "Inspecciona">
 <!ENTITY inspectMenu.accesskey        "o">
 <!ENTITY inspectMenu.commandkey       "I">
 
 <!ENTITY inspectContextMenu.label     "Inspecciona l'element">
 <!ENTITY inspectContextMenu.accesskey "I">
 
 <!ENTITY responsiveDesignTool.label   "Vista de disseny responsiu">
-<!ENTITY responsiveDesignTool.accesskey "R">
+<!ENTITY responsiveDesignTool.accesskey "r">
 <!ENTITY responsiveDesignTool.commandkey "M">
-
 <!-- LOCALIZATION NOTE (scratchpad.label): This menu item label appears
   -  in the Tools menu. See bug 653093.
   -  The Scratchpad is intended to provide a simple text editor for creating
   -  and evaluating bits of JavaScript code for the purposes of function
   -  prototyping, experimentation and convenient scripting.
   -
   -  It's quite possible that you won't have a good analogue for the word
   -  "Scratchpad" in your locale. You should feel free to find a close
@@ -234,21 +234,21 @@ These should match what Safari and other
 <!ENTITY scratchpad.keycode           "VK_F4">
 <!ENTITY scratchpad.keytext           "F4">
 
 <!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.commandkey             "v">
+<!ENTITY devToolbar.keycode                "VK_F2">
+<!ENTITY devToolbar.keytext                "F2">
 
 <!ENTITY webConsoleButton.label "Consola web">
 <!ENTITY inspectorButton.label "Inspector">
-<!ENTITY scriptsButton.label "Scripts">
 
 <!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 ">
@@ -257,17 +257,17 @@ These should match what Safari and other
   -  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">
+<!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">
@@ -434,43 +434,41 @@ These should match what Safari and other
 <!ENTITY setDesktopBackgroundCmd.label      "Defineix com a fons d'escriptori…">
 <!ENTITY setDesktopBackgroundCmd.accesskey  "D">
 <!ENTITY bookmarkPageCmd2.label       "Afegeix a les adreces d'interès">
 <!ENTITY bookmarkPageCmd2.accesskey   "d">
 <!ENTITY bookmarkThisLinkCmd.label      "Afegeix l'enllaç a les adreces d'interès">
 <!ENTITY bookmarkThisLinkCmd.accesskey  "l">
 <!ENTITY bookmarkThisFrameCmd.label      "Afegeix el marc a les adreces d'interès">
 <!ENTITY bookmarkThisFrameCmd.accesskey  "m">
-<!ENTITY sendPageCmd.label            "Envia la pàgina…">
-<!ENTITY sendPageCmd.accesskey        "v">
+<!ENTITY emailPageCmd.label           "Envia l'enllaç per correu…">
+<!ENTITY emailPageCmd.accesskey       "E">
 <!ENTITY savePageCmd.label            "Anomena i desa la pàgina…">
 <!ENTITY savePageCmd.accesskey        "s">
 <!-- alternate for content area context menu -->
 <!ENTITY savePageCmd.accesskey2       "d">
 <!ENTITY savePageCmd.commandkey       "s">
 <!ENTITY saveFrameCmd.label           "Anomena i desa el marc…">
 <!ENTITY saveFrameCmd.accesskey       "m">
 <!ENTITY printFrameCmd.label          "Imprimeix el marc…">
 <!ENTITY printFrameCmd.accesskey      "p">
 <!ENTITY saveLinkCmd.label            "Anomena i desa el contingut de l'enllaç…">
 <!ENTITY saveLinkCmd.accesskey        "s">
-<!ENTITY sendLinkCmd.label            "Envia l'enllaç…"> 
-<!ENTITY sendLinkCmd.accesskey        "i">
 <!ENTITY saveImageCmd.label           "Anomena i desa la imatge…">
 <!ENTITY saveImageCmd.accesskey       "A">
 <!ENTITY saveVideoCmd.label           "Anomena i desa el vídeo…">
 <!ENTITY saveVideoCmd.accesskey       "v">
 <!ENTITY saveAudioCmd.label           "Anomena i desa l'àudio…">
 <!ENTITY saveAudioCmd.accesskey       "u">
-<!ENTITY sendImageCmd.label           "Envia la imatge…">
-<!ENTITY sendImageCmd.accesskey       "n">
-<!ENTITY sendVideoCmd.label           "Envia el vídeo…">
-<!ENTITY sendVideoCmd.accesskey       "n">
-<!ENTITY sendAudioCmd.label           "Envia l'àudio…">
-<!ENTITY sendAudioCmd.accesskey       "n">
+<!ENTITY emailImageCmd.label          "Envia la imatge per correu…">
+<!ENTITY emailImageCmd.accesskey      "a">
+<!ENTITY emailVideoCmd.label          "Envia el vídeo per correu…">
+<!ENTITY emailVideoCmd.accesskey      "a">
+<!ENTITY emailAudioCmd.label          "Envia l'àudio per correu…">
+<!ENTITY emailAudioCmd.accesskey      "a">
 <!ENTITY copyLinkCmd.label            "Copia l'enllaç">
 <!ENTITY copyLinkCmd.accesskey        "C">
 <!ENTITY copyImageCmd.label           "Copia la ubicació de la imatge">
 <!ENTITY copyImageCmd.accesskey       "o">
 <!ENTITY copyImageContentsCmd.label   "Copia la imatge">
 <!ENTITY copyImageContentsCmd.accesskey  "m"> 
 <!ENTITY copyVideoURLCmd.label        "Copia la ubicació del vídeo">
 <!ENTITY copyVideoURLCmd.accesskey    "o">
@@ -650,8 +648,16 @@ just addresses the organization to follo
 located in front of the breadcrumbs display in the inspector toolbar. The button
 doesn't display any label, but exposes a label to screen-readers with "aria-label".
 -->
 
 <!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ó">
+
+<!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">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -352,18 +352,23 @@ telemetryYesButtonAccessKey = S
 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ó
 
 # 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
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -50,16 +50,32 @@ pauseTooltip=Feu clic per fer una pausa.
 # LOCALIZATION NOTE (resumeLabel): The label that is displayed on the pause
 # button when the debugger is in a paused state.
 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 (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
+breakpointMenuItem.enableAll=Habilita tots els punts de ruptura
+breakpointMenuItem.disableAll=Inhabilita tots els punts de ruptura
+breakpointMenuItem.deleteAll=Suprimeix tots els punts de ruptura
+
 # LOCALIZATION NOTE (loadingText): The text that is displayed in the script
 # editor when the laoding process has started but there is no file to display
 # yet.
 loadingText=S'està carregant…
 
 # LOCALIZATION NOTE (loadingError):
 # This is the error message that is displayed on failed attempts to load an
 # external resource file.
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -15,16 +15,25 @@
 # or command parameter when no description has been provided.
 canonDescNone=(sense descripció)
 
 # LOCALIZATION NOTE (cliEvalJavascript): The special '{' command allows entry
 # of JavaScript like traditional developer tool command lines. This describes
 # the '{' command.
 cliEvalJavascript=Escriu Javascript directament
 
+# LOCALIZATION NOTE (cliUnusedArg): When the command line has more arguments
+# than the current command can understand this is the error message shown to
+# the user.
+cliUnusedArg=Massa arguments
+
+# LOCALIZATION NOTE (cliOptions): The title of the dialog which displays the
+# options that are available to the current command.
+cliOptions=Opcions disponibles
+
 # LOCALIZATION NOTE (fieldSelectionSelect): When a command has a parameter
 # that has a number of pre-defined options the user interface presents these
 # in a drop-down menu, where the first 'option' is an indicator that a
 # selection should be made. This string describes that first option.
 fieldSelectionSelect=Selecciona un %S…
 
 # LOCALIZATION NOTE (fieldArrayAdd): When a command has a parameter that can
 # be repeated a number of times (e.g. like the 'cat a.txt b.txt' command) the
@@ -33,16 +42,21 @@ fieldSelectionSelect=Selecciona un %S…
 fieldArrayAdd=Afegeix
 
 # LOCALIZATION NOTE (fieldArrayDel): When a command has a parameter that can
 # be repeated a number of times (e.g. like the 'cat a.txt b.txt' command) the
 # user interface presents buttons to add and remove arguments. This string is
 # used to remove arguments.
 fieldArrayDel=Suprimeix
 
+# LOCALIZATION NOTE (fieldMenuMore): When the menu has displayed all the
+# matches that it should (i.e. about 10 items) then we display this to alert
+# the user that more matches are available.
+fieldMenuMore=Més coincidències, continueu escrivint
+
 # LOCALIZATION NOTE (jstypeParseScope): The command line provides completion
 # for JavaScript commands, however there are times when the scope of what
 # we're completing against can't be used. This error message is displayed when
 # this happens.
 jstypeParseScope=Fora de context
 
 # LOCALIZATION NOTE (jstypeParseMissing): When the command line is doing
 # JavaScript completion, sometimes the property to be completed does not
@@ -132,16 +146,38 @@ helpManDescription=Descripció
 # LOCALIZATION NOTE (helpManParameters): A heading shown above the parameters
 # in a help page for a command in the console.
 helpManParameters=Paràmetres
 
 # LOCALIZATION NOTE (helpManNone): Some text shown under the parameters
 # heading in a help page for a command which has no parameters.
 helpManNone=Cap
 
+# LOCALIZATION NOTE (helpListAll): The heading shown in response to the 'help'
+# command when used without a filter, just above the list of known commands.
+helpListAll=Odres disponibles:
+
+# LOCALIZATION NOTE (helpListPrefix): The heading shown in response to the
+# 'help <search>' command (i.e. with a search string), just above the list of
+# matching commands.
+helpListPrefix=Ordres que comencen amb '%1$S':
+
+# LOCALIZATION NOTE (helpListNone): The heading shown in response to the 'help
+# <search>' command (i.e. with a search string), when there are no matching
+# commands.
+helpListNone=No hi ha cap ordre que comenci amb '%1$S'
+
+# LOCALIZATION NOTE (helpManRequired): When the 'help x' command wants to show
+# the manual for the 'x' command it needs to be able to describe the
+# parameters as either required or optional. See also 'helpManOptional'.
+helpManRequired=necessari
+
+# LOCALIZATION NOTE (helpManOptional): See description of 'helpManRequired'
+helpManOptional=opcional
+
 # LOCALIZATION NOTE (subCommands): Text shown as part of the output of the
 # 'help' command when the command in question has sub-commands, before a list
 # of the matching sub-commands
 subCommands=Subordres
 
 # LOCALIZATION NOTE (subCommandsNone): Text shown as part of the output of the
 # 'help' command when the command in question should have sub-commands but in
 # fact has none
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -75,16 +75,34 @@ screenshotDelayManual=Temps que cal espe
 # a dialog when the user is using this command.
 screenshotFullPageDesc=La pàgina web sencera? (cert/fals)
 
 # LOCALIZATION NOTE (screenshotFullscreenManual) A fuller description of the
 # 'fullscreen' parameter to the 'screenshot' command, displayed when the user
 # asks for help on what it does.
 screenshotFullPageManual=Cert si la captura de pantalla ha d'incloure les parts de la pàgina web que queden fora dels límits visibles actuals.
 
+# LOCALIZATION NOTE (restartFirefoxDesc) A very short description of the
+# 'restart' 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.
+restartFirefoxDesc=Reinicia el Firefox
+
+# LOCALIZATION NOTE (restartFirefoxNocacheDesc) A very short string to
+# describe the 'nocache' parameter to the 'restart' command, which is
+# displayed in a dialog when the user is using this command.
+restartFirefoxNocacheDesc=Inhabilita la càrrega de contingut de la memòria cau en reiniciar
+
+# LOCALIZATION NOTE (restartFirefoxRequestCancelled) A string dispalyed to the
+# user when a scheduled restart has been aborted by the user.
+restartFirefoxRequestCancelled=L'usuari ha cancel·lat la sol·licitud de reinici.
+
+# LOCALIZATION NOTE (restartFirefoxRestarting) A string dispalyed to the
+# user when a restart has been initiated without a delay.
+restartFirefoxRestarting=S'està reiniciant el Firefox…
+
 # LOCALIZATION NOTE (inspectDesc) A very short description of the 'inspect'
 # command. See inspectManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 inspectDesc=Inspecciona un node
 
 # LOCALIZATION NOTE (inspectManual) A fuller description of the 'inspect'
 # command, displayed when the user asks for help on what it does.
@@ -298,37 +316,541 @@ breakdelBreakidDesc=Índex del punt de ruptura
 # LOCALIZATION NOTE (breakdelRemoved) Used in the output of the 'break del'
 # command to explain that a breakpoint was removed.
 breakdelRemoved=S'ha suprimit el punt de ruptura
 
 # LOCALIZATION NOTE (breakNotFound) Used in the output of the 'break del'
 # command to explain that the breakpoint was not found.
 breakNotFound=No s'ha trobat el punt de ruptura
 
+# LOCALIZATION NOTE (dbgDesc) A very short string used to describe the
+# function of the dbg command.
+dbgDesc=Gestiona el depurador
+
+# LOCALIZATION NOTE (dbgManual) A longer description describing the
+# set of commands that control the debugger.
+dbgManual=Ordres per interrompre o reprendre el fil principal, entrar, sortir i saltar les línies de codi
+
+# LOCALIZATION NOTE (dbgInterrupt) A very short string used to describe the
+# function of the dbg interrupt command.
+dbgInterrupt=Posa en pausa el fil principal
+
+# LOCALIZATION NOTE (dbgContinue) A very short string used to describe the
+# function of the dbg continue command.
+dbgContinue=Reprèn el fil principal i continua l'execució seguint un punt de ruptura, fins al proper punt de ruptura o quan acabi l'script.
+
+# LOCALIZATION NOTE (dbgStepDesc) A very short string used to describe the
+# function of the dbg step command.
+dbgStepDesc=Gestiona els passos
+
+# LOCALIZATION NOTE (dbgStepManual) A longer description describing the
+# set of commands that control stepping.
+dbgStepManual=Ordres per entrar, sortir i saltar les línies de codi
+
+# LOCALIZATION NOTE (dbgStepOverDesc) A very short string used to describe the
+# function of the dbg step over command.
+dbgStepOverDesc=Executa la sentència actual i llavors s'atura a la següent. Si la sentència actual és una crida de funció, després el depurador executa la funció completa i s'atura a la sentència següent després de la crida.
+
+# LOCALIZATION NOTE (dbgStepInDesc) A very short string used to describe the
+# function of the dbg step over command.
+dbgStepInDesc=Executa la sentència actual i llavors s'atura a la següent. Si la sentència actual és una crida de funció, després el depurador entra en la funció, sinó s'atura a la sentència següent.
+
+# LOCALIZATION NOTE (dbgStepOutDesc) A very short string used to describe the
+# function of the dbg step over command.
+dbgStepOutDesc=Surt de la funció actual i puja un nivell si la funció és imbricada. Si es troba en el cos principal, l'script s'executa fins al final, o fins al punt de ruptura següent. Les sentències omeses s'executen, però no s'entra dins.
+
 # LOCALIZATION NOTE (consolecloseDesc) A very short description of the
 # 'console close' 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.
 consolecloseDesc=Tanca la consola
 
 # LOCALIZATION NOTE (consoleopenDesc) A very short description of the
 # 'console open' 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.
 consoleopenDesc=Obre la consola
 
 # LOCALIZATION NOTE (editDesc) A very short description of the 'edit'
-# command. See editManual for a fuller description of what it does. This
+# command. See editManual2 for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 editDesc=Ajusta un recurs de la pàgina
 
-# LOCALIZATION NOTE (editManual) A fuller description of the 'edit' command,
+# LOCALIZATION NOTE (editManual2) A fuller description of the 'edit' command,
 # displayed when the user asks for help on what it does.
-editManual=Edita un dels recursos que és part de la pàgina (o potser qualsevol recurs web genèric?)
+editManual2=Edita un dels recursos que és part de la pàgina
 
 # LOCALIZATION NOTE (editResourceDesc) A very short string to describe the
 # 'resource' parameter to the 'edit' command, which is displayed in a dialog
 # when the user is using this command.
 editResourceDesc=URL per editar
 
 # LOCALIZATION NOTE (editLineToJumpToDesc) A very short string to describe the
 # 'line' parameter to the 'edit' command, which is displayed in a dialog
 # when the user is using this command.
 editLineToJumpToDesc=Línia on saltar
+
+# LOCALIZATION NOTE (resizePageDesc) A very short string to describe the
+# 'resizepage' 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.
+resizePageDesc=Redimensiona la pàgina
+
+# LOCALIZATION NOTE (resizePageArgWidthDesc) A very short string to describe the
+# 'width' parameter to the 'resizepage' command, which is displayed in a dialog
+# when the user is using this command.
+resizePageArgWidthDesc=Amplada en píxels
+
+# LOCALIZATION NOTE (resizePageArgWidthDesc) A very short string to describe the
+# 'height' parameter to the 'resizepage' command, which is displayed in a dialog
+# when the user is using this command.
+resizePageArgHeightDesc=Alçada en píxels
+
+# LOCALIZATION NOTE (resizeModeOnDesc) A very short string to describe the
+# 'resizeon ' 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.
+resizeModeOnDesc=Entra al mode de disseny responsiu
+
+# LOCALIZATION NOTE (resizeModeOffDesc) A very short string to describe the
+# 'resize off' 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.
+resizeModeOffDesc=Surt del mode de disseny responsiu
+
+# LOCALIZATION NOTE (resizeModeToggleDesc) A very short string to describe the
+# 'resize toggle' 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.
+resizeModeToggleDesc=Commuta el mode de disseny responsiu
+
+# LOCALIZATION NOTE (resizeModeToDesc) A very short string to describe the
+# 'resize to' 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.
+resizeModeToDesc=Altra la mida de la pàgina
+
+# LOCALIZATION NOTE (resizeModeDesc) A very short string to describe the
+# 'resize' 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.
+resizeModeDesc=Controla el mode de disseny responsiu
+
+# LOCALIZATION NOTE (resizeModeManual) A fuller description of the 'resize'
+# command, displayed when the user asks for help on what it does.
+resizeModeManual=Els llocs web responsius responen al seu entorn. Per tant, tenen un bon aspecte tant en un mòbil com en una pantalla de cinema, com en qualsevol cosa entremig. El mode de disseny responsiu us permet provar fàcilment tota una varietat de mides de pàgina en el Firefox sense haver de redimensionar el vostre navegador completament.
+
+# LOCALIZATION NOTE (cmdDesc) A very short description of the 'cmd'
+# 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.
+cmdDesc=Manipula les ordres
+
+# LOCALIZATION NOTE (cmdRefreshDesc) A very short description of the 'cmd refresh'
+# 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.
+cmdRefreshDesc=Torna a llegir el directori mozcmd
+
+# LOCALIZATION NOTE (addonDesc) A very short description of the 'addon'
+# 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.
+addonDesc=Manipula els complements
+
+# LOCALIZATION NOTE (addonListDesc) A very short description of the 'addon list'
+# 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.
+addonListDesc=Llista els complements instal·lats
+
+# LOCALIZATION NOTE (addonListTypeDesc) A very short description of the
+# 'addon list <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.
+addonListTypeDesc=Seleccioneu un tipus de complement
+
+# LOCALIZATION NOTE (addonListDictionaryHeading, addonListExtensionHeading,
+# addonListLocaleHeading, addonListPluginHeading, addonListThemeHeading,
+# addonListUnknownHeading) Used in the output of the 'addon list' command as the
+# first line of output.
+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
+# 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.
+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.
+addonAlreadyEnabled=%S ja està habilitat.
+
+# LOCALIZATION NOTE (addonEnabled) Used in the output of the 'addon enable'
+# command when an addon 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.
+addonAlreadyDisabled=%S ja està inhabilitat.
+
+# LOCALIZATION NOTE (addonDisabled) Used in the output of the 'addon disable'
+# command when an addon 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
+# html' 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.
+exportHtmlDesc=Exporta l'HTML de la pàgina
+
+# LOCALIZATION NOTE (pagemodDesc) A very short description of the 'pagemod'
+# 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.
+pagemodDesc=Fes canvis a la pàgina
+
+# LOCALIZATION NOTE (pagemodReplaceDesc) A very short description of the
+# 'pagemod replace' 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.
+pagemodReplaceDesc=Cerca i reemplaça els elements de pàgina
+
+# LOCALIZATION NOTE (pagemodReplaceSearchDesc) A very short string to describe
+# the 'search' parameter to the 'pagemod replace' command, which is displayed in
+# a dialog when the user is using this command.
+pagemodReplaceSearchDesc=Què cercar
+
+# LOCALIZATION NOTE (pagemodReplaceReplaceDesc) A very short string to describe
+# the 'replace' parameter to the 'pagemod replace' command, which is displayed in
+# a dialog when the user is using this command.
+pagemodReplaceReplaceDesc=Cadena per reemplaçar
+
+# LOCALIZATION NOTE (pagemodReplaceIgnoreCaseDesc) A very short string to
+# describe the 'ignoreCase' parameter to the 'pagemod replace' command, which is
+# displayed in a dialog when the user is using this command.
+pagemodReplaceIgnoreCaseDesc=Fes una cerca ignorant les majúscules
+
+# LOCALIZATION NOTE (pagemodReplaceRootDesc) A very short string to describe the
+# 'root' parameter to the 'pagemod replace' command, which is displayed in
+# a dialog when the user is using this command.
+pagemodReplaceRootDesc=Selector CSS de l'arrel de la cerca
+
+# LOCALIZATION NOTE (pagemodReplaceSelectorDesc) A very short string to describe
+# the 'selector' parameter to the 'pagemod replace' command, which is displayed
+# in a dialog when the user is using this command.
+pagemodReplaceSelectorDesc=Selector CSS per coincidir a la cerca
+
+# LOCALIZATION NOTE (pagemodReplaceAttributesDesc) A very short string to
+# describe the 'attributes' parameter to the 'pagemod replace' command, which is
+# displayed in a dialog when the user is using this command.
+pagemodReplaceAttributesDesc=Expressió regular per cercar un atribut
+
+# LOCALIZATION NOTE (pagemodReplaceAttrOnlyDesc) A very short string to describe
+# the 'attrOnly' parameter to the 'pagemod replace' command, which is displayed
+# in a dialog when the user is using this command.
+pagemodReplaceAttrOnlyDesc=Restringeix la cerca als atributs
+
+# LOCALIZATION NOTE (pagemodReplaceContentOnlyDesc) A very short string to
+# describe the 'contentOnly' parameter to the 'pagemod replace' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodReplaceContentOnlyDesc=Restringeix la cerca als nodes de text
+
+# LOCALIZATION NOTE (pagemodReplaceResultMatchedElements) A string displayed as
+# the result of the 'pagemod replace' command.
+pagemodReplaceResult=Elements que concorden amb el sel·lector: %1$S. Reemplaçaments en els nodes de text: %2$S. Reemplaçaments en els atributs: %3$S
+
+# LOCALIZATION NOTE (pagemodRemoveDesc) A very short description of the
+# 'pagemod remove' 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.
+pagemodRemoveDesc=Suprimeix els elements i els atributs de la pàgina
+
+# LOCALIZATION NOTE (pagemodRemoveElementDesc) A very short description of the
+# 'pagemod remove element' 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.
+pagemodRemoveElementDesc=Suprimeix els elements de la pàgina
+
+# LOCALIZATION NOTE (pagemodRemoveElementSearchDesc) A very short string to
+# describe the 'search' parameter to the 'pagemod remove element' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodRemoveElementSearchDesc=Selector CSS que especifica els elements per suprimir
+
+# LOCALIZATION NOTE (pagemodRemoveElementRootDesc) A very short string to
+# describe the 'root' parameter to the 'pagemod remove element' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodRemoveElementRootDesc=Selector CSS que especifica l'arrel de la cerca
+
+# LOCALIZATION NOTE (pagemodRemoveElementStripOnlyDesc) A very short string to
+# describe the 'stripOnly' parameter to the 'pagemod remove element' command,
+# which is displayed in a dialog when the user is using this command.
+pagemodRemoveElementStripOnlyDesc=Suprimeix l'element, però hi deixa el contingut
+
+# LOCALIZATION NOTE (pagemodRemoveElementIfEmptyOnlyDesc) A very short string to
+# describe the 'ifEmptyOnly' parameter to the 'pagemod remove element' command,
+# which is displayed in a dialog when the user is using this command.
+pagemodRemoveElementIfEmptyOnlyDesc=Suprimeix només els elements buits
+
+# LOCALIZATION NOTE (pagemodRemoveElementResultMatchedAndRemovedElements)
+# A string displayed as the result of the 'pagemod remove element' command.
+pagemodRemoveElementResultMatchedAndRemovedElements=Elements que coincideixen amb el selector: %1$S. Elements eliminats: %2$S.
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeDesc) A very short description of the
+# 'pagemod remove attribute' 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.
+pagemodRemoveAttributeDesc=Suprimeix els atributs que coincideixen
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeSearchAttributesDesc) A very short
+# string to describe the 'searchAttributes' parameter to the 'pagemod remove
+# attribute' command, which is displayed in a dialog when the user is using this
+# command.
+pagemodRemoveAttributeSearchAttributesDesc=Expressió regular que especifica els atributs que s'han de suprimir
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeSearchElementsDesc) A very short
+# string to describe the 'searchElements' parameter to the 'pagemod remove
+# attribute' command, which is displayed in a dialog when the user is using this
+# command.
+pagemodRemoveAttributeSearchElementsDesc=Selector CSS dels elements per incloure
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeRootDesc) A very short string to
+# describe the 'root' parameter to the 'pagemod remove attribute' command, which
+# is displayed in a dialog when the user is using this command.
+pagemodRemoveAttributeRootDesc=Selector CSS de l'arrel de la cerca
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeIgnoreCaseDesc) A very short string
+# to describe the 'ignoreCase' parameter to the 'pagemod remove attribute'
+# command, which is displayed in a dialog when the user is using this command.
+pagemodRemoveAttributeIgnoreCaseDesc=Realitza una cerca que ignora les majúscules
+
+# LOCALIZATION NOTE (pagemodRemoveAttributeResult) A string displayed as the
+# result of the 'pagemod remove attribute' command.
+pagemodRemoveAttributeResult=Elements trobats pel selector: %1$S, Atributs suprimits: %2$S.
+
+# LOCALIZATION NOTE (cookieDesc) A very short description of the 'cookie'
+# command. See cookieManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+cookieDesc=Mostra i modifica les galetes
+
+# LOCALIZATION NOTE (cookieManual) A fuller description of the 'cookie'
+# command, displayed when the user asks for help on what it does.
+cookieManual=Ordres per llistar, crear, esborrar y modificar galetes per aquest domini.
+
+# LOCALIZATION NOTE (cookieListDesc) A very short description of the
+# 'cookie list' 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.
+cookieListDesc=Mostra les galetes
+
+# LOCALIZATION NOTE (cookieListManual) A fuller description of the 'cookie list'
+# command, displayed when the user asks for help on what it does.
+cookieListManual=Mostra una llista de les galetes relevants a aquesta pàgina.
+
+# LOCALIZATION NOTE (cookieListOutKey) A heading used in the output from the
+# 'cookie list' command above a list of cookie keys
+cookieListOutKey=Tecla
+
+# LOCALIZATION NOTE (cookieListOutValue) A heading used in the output from the
+# 'cookie list' command above a list of cookie values
+cookieListOutValue=Valor
+
+# LOCALIZATION NOTE (cookieListOutActions) A heading used in the output from the
+# 'cookie list' command above a list of actions to take on cookies
+cookieListOutActions=Accions
+
+# LOCALIZATION NOTE (cookieListOutEdit) A title used in the output from the
+# 'cookie list' command on a button which can be used to edit cookie values
+cookieListOutEdit=Edita
+
+# LOCALIZATION NOTE (cookieListOutRemove) A title used in the output from the
+# 'cookie list' command on a button which can be used to remove cookies
+cookieListOutRemove=Suprimeix
+
+# LOCALIZATION NOTE (cookieRemoveDesc) A very short description of the
+# 'cookie remove' 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.
+cookieRemoveDesc=Suprimeix una galeta
+
+# LOCALIZATION NOTE (cookieRemoveManual) A fuller description of the 'cookie remove'
+# command, displayed when the user asks for help on what it does.
+cookieRemoveManual=Esborra una galeta a partir de la seva clau.
+
+# LOCALIZATION NOTE (cookieRemoveKeyDesc) A very short string to describe the
+# 'key' parameter to the 'cookie remove' command, which is displayed in a dialog
+# when the user is using this command.
+cookieRemoveKeyDesc=La clau de la galeta que s'ha d'esborrar
+
+# LOCALIZATION NOTE (cookieSetDesc) A very short description of the
+# 'cookie set' 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.
+cookieSetDesc=Defineix una galeta
+
+# LOCALIZATION NOTE (cookieSetManual) A fuller description of the 'cookie set'
+# command, displayed when the user asks for help on what it does.
+cookieSetManual=Defineix una galeta especificant la seva clau, el seu valor i, opcionalment, un o més dels següents atributs: expiració (edat màxima en segons o data d'expiració en el format GMTString), camí, domini i protocol segur.
+
+# LOCALIZATION NOTE (cookieSetKeyDesc) A very short string to describe the
+# 'key' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetKeyDesc=La clau de la galeta que s'ha de definir
+
+# LOCALIZATION NOTE (cookieSetValueDesc) A very short string to describe the
+# 'value' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetValueDesc=El valor de la galeta que s'ha de definir
+
+# LOCALIZATION NOTE (cookieSetOptionsDesc) The title of a set of options to
+# the 'cookie set' command, displayed as a heading to the list of option.
+cookieSetOptionsDesc=Opcions
+
+# LOCALIZATION NOTE (cookieSetPathDesc) A very short string to describe the
+# 'path' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetPathDesc=El camí de la galeta que s'ha de definir
+
+# LOCALIZATION NOTE (cookieSetDomainDesc) A very short string to describe the
+# 'domain' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetDomainDesc=El domini de la galeta que s'ha de definir
+
+# LOCALIZATION NOTE (cookieSetSecureDesc) A very short string to describe the
+# 'secure' parameter to the 'cookie set' command, which is displayed in a dialog
+# when the user is using this command.
+cookieSetSecureDesc=Transmet només a través de https
+
+# LOCALIZATION NOTE (jsbDesc) A very short description of the
+# 'jsb' 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.
+jsbDesc=Embellidor del Javascript
+
+# LOCALIZATION NOTE (jsbUrlDesc) A very short description of the
+# 'jsb <url>' 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.
+jsbUrlDesc=L'URL del fitxer JS per embellir
+
+# LOCALIZATION NOTE (jsbIndentSizeDesc) A very short description of the
+# 'jsb <indentSize>' 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.
+jsbIndentSizeDesc=Mida del sagnat en caràcters
+
+# LOCALIZATION NOTE (jsbIndentSizeManual) A fuller description of the
+# 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
+# does.
+jsbIndentSizeManual=El nombre de caràcters amb què sagnar cada línia
+
+# LOCALIZATION NOTE (jsbIndentCharDesc) A very short description of the
+# 'jsb <indentChar>' 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.
+jsbIndentCharDesc=Els caràcters utilitzats per sagnar cada línia
+
+# LOCALIZATION NOTE (jsbIndentCharManual) A fuller description of the
+# 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
+# does.
+jsbIndentCharManual=Els caràcters utilitzats per sagnar cada línia, les possibles opcions són espai i tabulació.
+
+# LOCALIZATION NOTE (jsbPreserveNewlinesDesc) A very short description of the
+# 'jsb <jsbPreserveNewlines>' 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.
+jsbPreserveNewlinesDesc=Es conserven els salts de línia?
+
+# LOCALIZATION NOTE (jsbPreserveNewlinesManual) A fuller description of the
+# 'jsb <jsbPreserveNewlines>' parameter, displayed when the user asks for help
+# on what it does.
+jsbPreserveNewlinesManual=S'haurien de conservar els salts de línia?
+
+# LOCALIZATION NOTE (jsbPreserveMaxNewlinesDesc) A very short description of the
+# 'jsb <preserveMaxNewlines>' 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.
+jsbPreserveMaxNewlinesDesc=Salts de línia consecutius
+
+# LOCALIZATION NOTE (jsbPreserveMaxNewlinesManual) A fuller description of the
+# 'jsb <preserveMaxNewlines>' parameter, displayed when the user asks for help
+# on what it does.
+jsbPreserveMaxNewlinesManual=El nombre màxim de salts de línia consecutius que cal conservar
+
+# LOCALIZATION NOTE (jsbJslintHappyDesc) A very short description of the
+# 'jsb <jslintHappy>' 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.
+jsbJslintHappyDesc=S'imposa el mode jslint-stricter?
+
+# LOCALIZATION NOTE (jsbJslintHappyManual) A fuller description of the
+# 'jsb <jslintHappy>' parameter, displayed when the user asks for help
+# on what it does.
+jsbJslintHappyManual=Quan es configura com a veritat (true), s'imposa el mode jslint-stricter
+
+# LOCALIZATION NOTE (jsbBraceStyleDesc) A very short description of the
+# 'jsb <braceStyle>' 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.
+jsbBraceStyleDesc=Collapse, expand, end-expand, expand-strict
+
+# LOCALIZATION NOTE (jsbBraceStyleManual) A fuller description of the
+# 'jsb <braceStyle>' parameter, displayed when the user asks for help
+# on what it does.
+jsbBraceStyleManual=L'estil de codi de les claus: collapse (redueix), expand (amplia), end-expand (amplia al final) o expand-strict (amplia estrictament)
+
+# LOCALIZATION NOTE (jsbSpaceBeforeConditionalDesc) A very short description of
+# the 'jsb <spaceBeforeConditional>' 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.
+jsbSpaceBeforeConditionalDesc=Es posa un espai abans de les sentències if?
+
+# LOCALIZATION NOTE (jsbSpaceBeforeConditionalManual) A fuller description of
+# the 'jsb <spaceBeforeConditional>' parameter, displayed when the user asks for
+# help on what it does.
+jsbSpaceBeforeConditionalManual=S'hauria d'afegir un espai abans de les sentències condicionals?
+
+# LOCALIZATION NOTE (jsbUnescapeStringsDesc) A very short description of the
+# 'jsb <unescapeStrings>' 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.
+jsbUnescapeStringsDesc=Es desescapen els caràcters \\xNN?
+
+# LOCALIZATION NOTE (jsbUnescapeStringsManual) A fuller description of the
+# 'jsb <unescapeStrings>' parameter, displayed when the user asks for help
+# on what it does.
+jsbUnescapeStringsManual=S'haurien de desescapar els caràcters impresos en cadenes amb la notació \\xNN?
+
+# LOCALIZATION NOTE (jsbInvalidURL) Displayed when an invalid URL is passed to
+# the jsb command.
+jsbInvalidURL=Introduïu una URL vàlida
+
+# LOCALIZATION NOTE (calllogDesc) A very short description of the
+# 'calllog' 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.
+calllogDesc=Ordres per manipular el registre de la crida a les funcions
+
+# LOCALIZATION NOTE (calllogStartDesc) A very short description of the
+# 'calllog start' 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.
+calllogStartDesc=Inicia el registre de la crida a les funciones en la consola
+
+# LOCALIZATION NOTE (calllogStartReply) A string displayed as the result of
+# the 'calllog start' command.
+calllogStartReply=S'ha iniciat el registre de les crides.
+
+# LOCALIZATION NOTE (calllogStopDesc) A very short description of the
+# 'calllog stop' 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.
+calllogStopDesc=S'ha aturat el registre de la crida a les funcions.
+
+# 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.
--- a/browser/chrome/browser/devtools/inspector.properties
+++ b/browser/chrome/browser/devtools/inspector.properties
@@ -36,16 +36,16 @@ inspectButtonWithShortcutKey.tooltip=Selecciona l'element amb el ratolí (%S)
 inspectButton.tooltip=Selecciona l'element amb el ratolí
 
 # LOCALIZATION NOTE (markupButton.*):
 # This button is the button located at the beginning of the breadcrumbs
 # in the inspector toolbar. Its tooltip is built dynamically.
 # markupButton.tooltip is used on Mac.
 # On Windows and Linux, we use markupButton.tooltipWithAccesskey, where we append
 # the keyboard shortcut.
-markupButton.tooltip=Panel de marcat
-markupButton.tooltipWithAccesskey=Panel de marcat (%S)
+markupButton.tooltip=Tauler de marcatge
+markupButton.tooltipWithAccesskey=Tauler de marcatge (%S)
 
 
 # LOCALIZATION NOTE (nodeMenu.tooltiptext)
 # This menu appears in the Infobar (on top of the highlighted node) once
 # the node is selected.
 nodeMenu.tooltiptext=Operacions del node
--- a/browser/chrome/browser/devtools/scratchpad.dtd
+++ b/browser/chrome/browser/devtools/scratchpad.dtd
@@ -28,16 +28,19 @@
 <!ENTITY newWindowCmd.label           "Finestra nova">
 <!ENTITY newWindowCmd.accesskey       "n">
 <!ENTITY newWindowCmd.commandkey      "n">
 
 <!ENTITY openFileCmd.label            "Obre un fitxer…">
 <!ENTITY openFileCmd.accesskey        "O">
 <!ENTITY openFileCmd.commandkey       "o">
 
+<!ENTITY openRecentMenu.label         "Obre allò recent">
+<!ENTITY openRecentMenu.accesskey     "r">
+
 <!ENTITY saveFileCmd.label            "Desa">
 <!ENTITY saveFileCmd.accesskey        "s">
 <!ENTITY saveFileCmd.commandkey       "s">
 
 <!ENTITY saveFileAsCmd.label          "Anomena i desa…">
 <!ENTITY saveFileAsCmd.accesskey      "A">
 
 <!ENTITY closeCmd.label               "Tanca">
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -29,16 +29,20 @@ browserWindow.unavailable=El bloc de pro
 # LOCALIZATION NOTE  (openFile.title): This is the file picker title, when you
 # open a file from Scratchpad.
 openFile.title=Obre un fitxer
 
 # LOCALIZATION NOTE  (openFile.failed): This is the message displayed when file
 # open fails.
 openFile.failed=No s'ha pogut llegir el fitxer.
 
+# LOCALIZATION NOTE (clearRecentMenuItems.label): This is the label for the
+# menuitem in the 'Open Recent'-menu which clears all recent files.
+clearRecentMenuItems.label=Neteja els elements
+
 # LOCALIZATION NOTE  (saveFileAs): This is the file picker title, when you save
 # a file in Scratchpad.
 saveFileAs=Anomena i desa el fitxer
 
 # LOCALIZATION NOTE  (saveFile.failed): This is the message displayed when file
 # save fails.
 saveFile.failed=Ha fallat l'operació de desar el fitxer.
 
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -42,17 +42,17 @@ btnPageLogging=Registra l'activitat
 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
+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
@@ -145,16 +145,21 @@ webConsolePositionBelow=Davall
 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
 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
--- a/browser/chrome/browser/migration/migration.properties
+++ b/browser/chrome/browser/migration/migration.properties
@@ -10,16 +10,18 @@ sourceNameSafari=Safari
 sourceNameChrome=Google Chrome
 sourceNameFirefox=Mozilla Firefox
 
 importedBookmarksFolder=De %S
 
 importedSafariReadingList=S'està llegint la llista (des del Safari)
 
 # Import Sources
+# Note: When adding an import source for profile reset, add the string name to
+# resetProfile.js if it should be listed in the reset dialog.
 1_ie=Opcions d'Internet
 1_safari=Preferències
 1_chrome=Preferències
 
 2_ie=Galetes
 2_safari=Galetes
 2_chrome=Galetes
 2_firefox=Galetes
--- a/browser/chrome/browser/preferences/advanced-scripts.dtd
+++ b/browser/chrome/browser/preferences/advanced-scripts.dtd
@@ -2,14 +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/. -->
 
 <!ENTITY advancedJSDialog.title         "Paràmetres avançats del JavaScript">
 <!ENTITY window.width                   "42em">
 
 <!ENTITY allowScripts.label             "Permet als scripts:">
 
-<!ENTITY moveResizePopupWindows.label     "Mou o canvia la mida de la finestra emergent">
+<!ENTITY moveResizePopupWindows.label     "Moure o canviar la mida de finestres emergents">
 <!ENTITY moveResizePopupWindows.accesskey "M">
-<!ENTITY raiseLowerWindows.label        "Posar en primer o segon pla finestres">
+<!ENTITY raiseLowerWindows.label        "Posar finestres en primer o segon pla">
 <!ENTITY raiseLowerWindows.accesskey    "r">
 <!ENTITY disableContextMenus.label      "Inhabilitar o reemplaçar menús contextuals">
 <!ENTITY disableContextMenus.accesskey  "I">
--- a/browser/pdfviewer/chrome.properties
+++ b/browser/pdfviewer/chrome.properties
@@ -1,3 +1,4 @@
 # Chrome notification bar messages and buttons
 unsupported_feature=Aquest document PDF potser no es mostra correctament.
 open_with_different_viewer=Obre amb un altre visor
+open_with_different_viewer.accessKey=o
--- a/browser/pdfviewer/viewer.properties
+++ b/browser/pdfviewer/viewer.properties
@@ -73,19 +73,19 @@ rendering_error=S'ha produït un error mentre es renderitzava la pàgina
 
 # Predefined zoom values
 page_scale_width=Amplària de la pàgina
 page_scale_fit=Ajusta la pàgina
 page_scale_auto=Zoom automàtic
 page_scale_actual=Mida real
 
 # Loading indicator messages
-# LOCALIZATION NOTE (error_line): "{{[percent}}" will be replaced with a percentage
-loading=Carregant... {{percent}}%
 loading_error_indicator=Error
 loading_error=S'ha produït un error en carregar el PDF.
 
 # LOCALIZATION NOTE (text_annotation_type): This is used as a tooltip.
-# "{{[type}}" will be replaced with an annotation type from a list defined in
+# "{{type}}" will be replaced with an annotation type from a list defined in
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
 text_annotation_type=[{{type}} anotació]
 request_password=El fitxer PDF està protegit per una contrasenya: 
+
+printing_not_supported=Avís: la impressió no és plenament funcional en aquest navegador.
--- a/browser/webapprt/webapp.properties
+++ b/browser/webapprt/webapp.properties
@@ -18,8 +18,17 @@ hideApplicationCmdMac.label=Amaga el %S
 
 # LOCALIZATION NOTE (geolocation.title): %S will be replaced with the name of
 # the webapp.
 geolocation.title=%S - Comparteix la ubicació
 geolocation.description=Voleu compartir la vostra ubicació?
 geolocation.sharelocation=Comparteix la ubicació
 geolocation.dontshare=No la comparteixis
 geolocation.remember=Recorda la meva tria
+
+# LOCALIZATION NOTE (webapps.install.title): %S will be replaced with the name
+# of the webapp being installed.
+webapps.install.title=Instal·la %S
+# LOCALIZATION NOTE (webapps.install.description): %S will be replaced with the
+# name of the webapp being installed.
+webapps.install.description=Voleu instal·lar %S?
+webapps.install.install=Instal·la l'aplicació
+webapps.install.dontinstall=No la instal·lis
--- a/calendar/chrome/calendar/calendar-event-dialog.dtd
+++ b/calendar/chrome/calendar/calendar-event-dialog.dtd
@@ -175,16 +175,26 @@
 <!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" >
--- a/calendar/chrome/calendar/calendar-event-dialog.properties
+++ b/calendar/chrome/calendar/calendar-event-dialog.properties
@@ -302,16 +302,17 @@ emailSubjectReply=Re: %1$S
 
 # Link Location Dialog
 specifyLinkLocation=Especifiqueu l'adreça de l'enllaç
 enterLinkLocation=Escriviu l'adreça d'una pàgina web o la ubicació d'un document.
 
 summaryDueTaskLabel=Motiu:
 
 # Attach File Dialog
+attachViaFilelink=Fitxer fent servir %1$S
 selectAFile=Seleccioneu un o més fitxers per adjuntar
 removeCalendarsTitle=Suprimeix les adjuncions
 removeCalendarsText=Segur que voleu suprimir %1$S adjuncions?
 
 # Recurrence Dialog Widget Order
 # LOCALIZATION NOTE: You can change the order of below params
 # Edit recurrence window -> Recurrence pattern -> Repeat monthly
 # %1$S - ordinal with article, %2$S - weekday
--- a/calendar/chrome/lightning/lightning.dtd
+++ b/calendar/chrome/lightning/lightning.dtd
@@ -3,17 +3,17 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!-- WARNING! This file contains UTF-8 encoded characters!
    - If this ==> … <== doesn't look like an ellipsis (three dots in a row),
    - your editor isn't using UTF-8 encoding and may munge up the document!
   -->
 <!-- Tools menu -->
 
 
-<!ENTITY lightning.taskLabel "Lightning">
+<!ENTITY lightning.preferencesLabel "Calendari">
 <!-- New menu popup in File menu -->
 
 <!ENTITY lightning.menupopup.new.event.label    "Cita…">
 <!ENTITY lightning.menupopup.new.event.accesskey "C">
 <!ENTITY lightning.menupopup.new.task.label     "Tasca…">
 <!ENTITY lightning.menupopup.new.task.accesskey "T">
 <!ENTITY lightning.menupopup.new.calendar.label "Calendari…">
 <!ENTITY lightning.menupopup.new.calendar.accesskey "n">
@@ -53,11 +53,11 @@
 <!-- today-pane-specific -->
 
 <!ENTITY todaypane.showMinimonth.label "Mostra el Mini-mes">
 <!ENTITY todaypane.showMinimonth.accesskey "M">
 <!ENTITY todaypane.showMiniday.label "Mostra el Mini-dia">
 <!ENTITY todaypane.showMiniday.accesskey  "d">
 <!ENTITY todaypane.showNone.label "No mostris res">
 <!ENTITY todaypane.showNone.accesskey "r">
-<!ENTITY todaypane.showTodayPane.label "Mostra el Plafó d'avui">
+<!ENTITY todaypane.showTodayPane.label "Mostra el plafó d'avui">
 <!ENTITY todaypane.showTodayPane.accesskey "a">
 <!ENTITY todaypane.statusButton.label "Plafó d'avui">
--- a/dom/chrome/accessibility/AccessFu.properties
+++ b/dom/chrome/accessibility/AccessFu.properties
@@ -102,8 +102,12 @@ tabReload      =      s'està tornant a carregar...
 # Object states
 stateChecked     =    verificat
 stateNotChecked  =    no verificat
 stateExpanded    =    expandit
 stateCollapsed   =    reduït
 stateUnavailable =    no disponible
 stateRequired    =    requerit
 stateTraversed   =    visitat
+
+# App modes
+editingMode    =      s'està editant
+navigationMode =      s'està navegant
--- a/dom/chrome/accessibility/mac/accessible.properties
+++ b/dom/chrome/accessibility/mac/accessible.properties
@@ -20,8 +20,15 @@ cycle   =       Cicla
 # (Mac Only)
 # The Role Description for AXWebArea (the web widget). Like in Safari.
 htmlContent = Contingut HTML
 # The Role Description for the Tab button.
 tab     =       pestanya
 # The Role Description for definition list dl, dt and dd
 term    =       terme
 definition =    definició
+# The Role Description for WAI-ARIA Landmarks
+search  =       cerca
+banner  =       bàner
+navigation =    navegació
+complementary = complementari
+content =       contingut
+main    =       principal
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -35,16 +35,24 @@ FormValidationCheckboxMissing=Marqueu aq
 FormValidationRadioMissing=Seleccioneu una d'aquestes opcions.
 FormValidationFileMissing=Seleccioneu un fitxer.
 FormValidationSelectMissing=Seleccioneu un element de la llista.
 FormValidationInvalidEmail=Introduïu una adreça electrònica.
 FormValidationInvalidURL=Introduïu un URL.
 FormValidationPatternMismatch=Feu que coincideixi amb el format sol·licitat.
 # LOCALIZATION NOTE (FormValidationPatternMismatchWithTitle): %S is the (possibly truncated) title attribute value.
 FormValidationPatternMismatchWithTitle=Feu que coincideixi amb el format sol·licitat: %S.
+# LOCALIZATION NOTE (FormValidationRangeOverflow): %S can be a number or a date.
+FormValidationRangeOverflow=Seleccioneu un valor que sigui menor que %S.
+# LOCALIZATION NOTE (FormValidationRangeUnderflow): %S can be a number or a date.
+FormValidationRangeUnderflow=Seleccioneu un valor més gran que %S.
+# LOCALIZATION NOTE (FormValidationStepMismatch): both %S can be a number or a date.
+FormValidationStepMismatch=Seleccioneu un valor vàlid. Els dos valors vàlid més propers són %S i %S.
+# LOCALIZATION NOTE (FormValidationStepMismatchWitoutMax): %S can be a number or a date. This is called instead of FormValidationStepMismatch when the second value isn't valid because it's higher than the maximum allowed value.
+FormValidationStepMismatchWithoutMax=Seleccioneu un valor vàlid. El valor vàlid més proper és %S.
 GetAttributeNodeWarning=getAttributeNode() està en desús. Utilitzeu millor getAttribute().
 SetAttributeNodeWarning=setAttributeNode() està en desús. Utilitzeu millor setAttribute().
 GetAttributeNodeNSWarning=getAttributeNodeNS() està en desús. Utilitzeu millor getAttributeNS().
 SetAttributeNodeNSWarning=setAttributeNodeNS() està en desús. Utilitzeu millor setAttributeNS().
 RemoveAttributeNodeWarning=removeAttributeNode() està en desús. Utilitzeu millor removeAttribute().
 CreateAttributeWarning=document.createAttribute() està en desús. Utilitzeu millor element.setAttribute().
 CreateAttributeNSWarning=document.createAttributeNS() està en desús. Utilitzeu millor element.setAttributeNS().
 SpecifiedWarning=L'atribut especificat està en desús. Sempre retorna el valor vertader.
@@ -121,10 +129,8 @@ MozBlobBuilderWarning=El MozBlobBuilder és en desús. Utilitzeu millor el constructor Blob.
 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.
-# LOCALIZATION NOTE: Do not translate "java" or "Packages".
-JavaPackagesWarning=L'ús dels objectes DOM 'java' i 'Packages' per accedir a la funcionalitat de Java és obsolet. Aviat s'eliminarà.
--- a/dom/chrome/layout/HtmlForm.properties
+++ b/dom/chrome/layout/HtmlForm.properties
@@ -12,8 +12,9 @@ MediaUpload=Puja un fitxer multimèdia
 # input field. The space needs be escaped in the property file to avoid 
 # trimming.
 IsIndexPromptWithSpace=Dins d'aquest índex s'hi pot cercar. Introduïu les paraules clau de cerca: 
 ForgotPostWarning=El formulari conté enctype=%S, però no method=post. Al seu lloc, s'envia normalment amb method=GET i sense tipus de codificació.
 ForgotFileEnctypeWarning=El formulari conté una entrada de fitxer, però hi manquen method=POST i enctype=multipart/form-data. El fitxer no s'enviarà.
 # LOCALIZATION NOTE (DefaultFormSubject): %S will be replaced with brandShortName
 DefaultFormSubject=Enviament de formulari de %S
 CannotEncodeAllUnicode=Un formulari ha enviat informació codificada amb %S. Aquesta codificació no pot codificar tots els caràcters Unicode, per tant les dades que hagi introduït l'usuari poden haver canviat. Per evitar aquest problema, s'hauria de canviar la pàgina perquè enviï les dades en la codificació UTF-8. Això es pot fer especificant que  la codificació de la pàgina sigui UTF-8 o bé indicant que l'element del formulari accepti UTF-8 posant accept-charset=utf-8.
+AllSupportedTypes=Tots els tipus permesos
new file mode 100644
--- /dev/null
+++ b/dom/chrome/security/csp.properties
@@ -0,0 +1,106 @@
+# 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/.
+
+# CSP Warnings:
+# LOCALIZATION NOTE (directiveViolated):
+# %1$S is the directive that has been violated.
+directiveViolated = S'ha violat la directiva %1$S
+# LOCALIZATION NOTE (directiveViolatedWithURI):
+# %1$S is the directive that has been violated.
+# %2$S is the URI of the resource which violated the directive.
+directiveViolatedWithURI = %2$S ha violat la directiva %1$S
+# LOCALIZATION NOTE (triedToSendReport):
+# %1$S is the URI we attempted to send a report to.
+triedToSendReport = S'ha provat d'enviar un informe a un URI no vàlid: «%1$S»
+# LOCALIZATION NOTE (errorWas):
+# %1$S is the error resulting from attempting to send the report
+errorWas = l'error ha estat: «%1$S»
+# LOCALIZATION NOTE (couldNotParseReportURI):
+# %1$S is the report URI that could not be parsed
+couldNotParseReportURI = no s'ha pogut analitzar l'URI de l'informe: %1$S
+# LOCALIZATION NOTE (couldNotProcessUnknownDirective):
+# %1$S is the unknown directive
+couldNotProcessUnknownDirective = No s'ha pogut processar la directiva desconeguda '%1$S'
+# LOCALIZATION NOTE (doNotUnderstandOption):
+# %1$S is the option that could not be understood
+doNotUnderstandOption = no s'entén l'opció '%1$S'. S'ignora.
+# LOCALIZATION NOTE (notETLDPlus1):
+# %1$S is the ETLD of the report URI that could not be used
+notETLDPlus1 = no es pot utilitzar l'URI de l'informe d'un eTLD+1 que no coincideix: %1$S
+# LOCALIZATION NOTE (notSameScheme):
+# %1$S is the report URI that could not be used
+notSameScheme = no es pot utilitzar l'URI de l'informe amb un esquema diferent del document des d'on s'origina: %1$S
+# LOCALIZATION NOTE (notSamePort):
+# %1$S is the report URI that could not be used
+notSamePort = no es pot utilitzar l'URI de l'informe amb un port diferent del document on s'origina: %1$S
+# LOCALIZATION NOTE (pageCannotSendReportsTo):
+# %1$S is the URI of the page with the policy
+# %2$S is the report URI that could not be used
+pageCannotSendReportsTo = la pàgina a %1$S no pot enviar informes a %2$S
+allowOrDefaultSrcRequired = Cal una directiva 'allow' o 'default-src', però no és present. Es revertirà a "default-src 'none'"
+# LOCALIZATION NOTE (failedToParseUnrecognizedSource):
+# %1$S is the CSP Source that could not be parsed
+failedToParseUnrecognizedSource = No s'ha pogut analitzar la font %1$S
+# LOCALIZATION NOTE (reportPostRedirect):
+# %1$S is the specified report URI before redirect
+reportPostRedirect = Ha fallat l'enviament de l'informe de violació a %1$S, perquè ha s'ha produït una redirecció
+
+# CSP Errors:
+policyURINotAlone = la directiva policy-uri només pot aparèixer sola
+noParentRequest = No es pot recuperar una policy-uri sense una sol·licitud pare i un CSP.
+# LOCALIZATION NOTE (policyURIParseError):
+# %1$S is the URI that could not be parsed
+policyURIParseError = no s'ha pogut analitzar l'URI en l'URI de política: %1$S
+# LOCALIZATION NOTE (nonMatchingHost):
+# %1$S is the URI host that does not match
+nonMatchingHost = no es pot recuperar l'uri de política d'un nom de servidor central que no coincideix: %1$S
+# LOCALIZATION NOTE (nonMatchingPort):
+# %1$S is the URI port that does not match
+nonMatchingPort = no es pot recuperar l'uri de política d'un port que no coincideix: %1$S
+# LOCALIZATION NOTE (nonMatchingScheme):
+# %1$S is the URI scheme that does not match
+nonMatchingScheme = no es pot recuperar l'uri de política d'un esquema que no coincideix: %1$S
+# LOCALIZATION NOTE (errorFetchingPolicy):
+# %1$S is the error that caused fetching to fail
+errorFetchingPolicy = S'ha produït un error en recuperar el policy-uri: %1$S
+cspSourceNotURI = L'argument proporcionat no és un nsIURI
+argumentIsNotString = L'argument proporcionat no és una cadena
+selfDataNotProvided = No es pot utilitzar 'self' si no es proporcionen les dades pròpies
+# LOCALIZATION NOTE (uriWithoutScheme):
+# %1$S is the URI without a scheme
+uriWithoutScheme = no es pot analitzar un URI sense un esquema: %1$S
+selfKeywordNoSelfData = s'ha utilitzat la paraula clau self, però s'ha especificat cap dada pròpia
+# LOCALIZATION NOTE (couldntParseInvalidSource):
+# %1$S is the source that could not be parsed
+couldntParseInvalidSource = No s'ha pogut analitzar la font no vàlida %1$S
+# LOCALIZATION NOTE (hostSourceWithoutData):
+# %1$S is the source
+hostSourceWithoutData = No s'ha pogut crear una font %1$S de només servidor central sense unes dades 'self'
+# LOCALIZATION NOTE (sourceWithoutData):
+# %1$S is the source
+sourceWithoutData = No s'ha pogut crear una font %1$S sense unes dades 'self'
+# LOCALIZATION NOTE (couldntParseInvalidHost):
+# %1$S is the host that's invalid
+couldntParseInvalidHost = No s'ha pogut analitzar el servidor central no vàlid %1$S
+# LOCALIZATION NOTE (couldntParseScheme):
+# %1$S is the string source
+couldntParseScheme = No s'ha pogut analitzar l'esquema en %1$S
+# LOCALIZATION NOTE (couldntParsePort):
+# %1$S is the string source
+couldntParsePort = No s'ha pogut analitzar el port en %1$S
+# LOCALIZATION NOTE (notIntersectPort):
+# %1$S is one source we tried to intersect
+# %2$S is the other
+notIntersectPort = No s'ha pogut realitzar una intersecció de %1$S amb %2$S per problemes de ports.
+# LOCALIZATION NOTE (notIntersectScheme):
+# %1$S is one source we tried to intersect
+# %2$S is the other
+notIntersectScheme = No s'ha pogut realitzar una intersecció de %1$S amb %2$S per problemes d'esquemes.
+# LOCALIZATION NOTE (intersectingSourceWithUndefinedHost):
+# %1$S is the source
+intersectingSourceWithUndefinedHost = s'està realitzant la intersecció d'una font amb un servidor central no definit: %1$S
+# LOCALIZATION NOTE (intersectingSourcesWithUndefinedHosts):
+# %1$S is the first source
+# %2$S is the second source
+intersectingSourcesWithUndefinedHosts = s'està realitzant la intersecció de dos fonts amb uns servidors centrals no definits: %1$S i %2$S
--- a/dom/chrome/xslt/xslt.properties
+++ b/dom/chrome/xslt/xslt.properties
@@ -1,15 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 1  = L'anàlisi d'un full d'estil XSLT ha fallat.
 2  = L'anàlisi d'una expressió XPath ha fallat.
-3  =  
+3  = 
 4  = La transformació XSLT ha fallat.
 5  = XSLT/Xpath ha intentat cridar una funció desconeguda.
 6  = El full d'estil XSLT conté (possiblement) una recursió.
 7  = El valor de l'atribut és il·legal en XSLT 1.0.
 8  = S'esperava que una expressió XPath retornés un NodeSet.
 9  = <xsl:message> ha finalitzat la transformació XSLT.
 10 = S'ha produït un error de xarxa en carregar un full d'estil XSLT:
 11 = Un full d'estil XSLT no té cap tipus MIME XML:
--- a/mail/chrome/messenger/accountCreation.properties
+++ b/mail/chrome/messenger/accountCreation.properties
@@ -13,25 +13,25 @@ default_server_tag= (predeterminat)
 # Content of server port field (usually a number), used when the user didn't
 # enter anything yet and we'll automatically detect it later.
 port_auto=Auto
 
 # config titles
 # LOCALIZATION NOTE(looking_up_settings_disk): Referring to Thunderbird installation folder on user's harddisk. %1$S will be the brandShortName.
 looking_up_settings_disk=S'està cercant la configuració: la instal·lació del %1$S
 looking_up_settings_isp=S'està cercant la configuració: el proveïdor de correu electrònic
-# LOCALIZATION NOTE(looking_up_settings_db): Do not translate or replace Mozilla. It stands for the public project mozilla.org, not Mozilla Messaging. The database is a generic, public domain facility usable by any client.
+# LOCALIZATION NOTE(looking_up_settings_db): Do not translate or replace Mozilla. It stands for the public project mozilla.org, not Mozilla Corporation. The database is a generic, public domain facility usable by any client.
 looking_up_settings_db=S'està cercant la configuració: la base de dades ISP de Mozilla
 # LOCALIZATION NOTE(looking_up_settings_guess): We are checking common server names like pop., pop3., smtp., mail., without knowing whether they exist or really serve this email account. If a server responds, we try to talk to it via POP/IMAP/SMTP protocols and query its capabilities. If that succeeds, we assume we found a configuration. Of course, it may still be wrong, but it often works.
 looking_up_settings_guess=S'està cercant la configuració: s'estan provant els noms de servidors més típics
 looking_up_settings_halfmanual=S'està cercant la configuració: s'està provant el servidor
 # LOCALIZATION NOTE(found_settings_disk): Referring to Thunderbird installation folder on user's harddisk. %1$S will be the brandShortName.
 found_settings_disk=S'ha trobat la següent configuració a la instal·lació del %1$S
 found_settings_isp=S'ha trobat la següent configuració al proveïdor de correu electrònic
-# LOCALIZATION NOTE(found_settings_db): Do not translate or replace Mozilla. It stands for the public project mozilla.org, not Mozilla Messaging. The database is a generic, public domain facility usable by any client.
+# LOCALIZATION NOTE(found_settings_db): Do not translate or replace Mozilla. It stands for the public project mozilla.org, not Mozilla Corporation. The database is a generic, public domain facility usable by any client.
 found_settings_db=S'ha trobat la següent configuració a la base de dades ISP de Mozilla
 # LOCALIZATION NOTE(found_settings_guess): We tried common mail server names and we found a mail server and talked to it and it responded properly, so we think we found a suitable configuration, but we are only about 80% certain that it is the correct setting for this email address. There's a chance that email address may not actually be served by this server and it won't work, or that there is a better server.
 found_settings_guess=S'ha trobat la següent configuració provant els noms de servidors més típics
 found_settings_halfmanual=S'ha trobat la següent configuració després de provar el servidor indicat
 # LOCALIZATION NOTE(failed_to_find_settings): %1$S will be the brandShortName.
 failed_to_find_settings=El %1$S no ha pogut trobar la configuració per al vostre compte de correu.
 manually_edit_config=S'està editant la configuració
 # LOCALIZATION NOTE(guessed_settings_offline) User is offline, so we just took a wild guess and the user will have to enter the right settings.
@@ -88,11 +88,11 @@ resultIMAP=IMAP
 resultPOP3=POP3
 resultSMTP=SMTP
 # LOCALIZATION NOTE(resultNoEncryption): Neither SSL/TLS nor STARTTLS. Transmission of emails in cleartext over the Internet.
 resultNoEncryption=Sense encriptació
 resultSSL=SSL
 resultSTARTTLS=STARTTLS
 # LOCALIZATION NOTE(resultSSLCertWeak): \u0020 is just a space
 resultSSLCertWeak=(Atenció: no s'ha pogut verificar el servidor)
-resultSSLCertOK= 
+resultSSLCertOK=
 resultUsernameBoth=%1$S
 resultUsernameDifferent=Entrada: %1$S, Sortida: %2$S
--- a/mail/chrome/messenger/addressbook/abMainWindow.dtd
+++ b/mail/chrome/messenger/addressbook/abMainWindow.dtd
@@ -160,17 +160,17 @@ because displayed names don't have the c
 <!ENTITY searchItem.title "Cerca ràpida">
 <!-- Results Pane -->
 
 <!ENTITY GeneratedName.label                            "Nom">
 <!ENTITY GeneratedName.accesskey                        "N">
 <!ENTITY PrimaryEmail.label                             "Adreça electrònica">
 <!ENTITY PrimaryEmail.accesskey                         "e">
 <!ENTITY ChatName.label                                 "Nom de xat">
-<!ENTITY ChatName.accesskey                             "X">
+<!ENTITY ChatName.accesskey                             "x">
 <!ENTITY Company.label                                  "Empresa">
 <!ENTITY Company.accesskey                              "m">
 <!ENTITY NickName.label                                 "Sobrenom">
 <!ENTITY NickName.accesskey                             "S">
 <!ENTITY SecondEmail.label                              "Adreça electrònica alternativa">
 <!ENTITY SecondEmail.accesskey                          "l">
 <!ENTITY Department.label                               "Departament">
 <!ENTITY Department.accesskey                           "r">
--- a/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd
+++ b/mail/chrome/messenger/addressbook/abResultsPaneOverlay.dtd
@@ -24,13 +24,13 @@
 <!ENTITY PagerNumber.accesskey                 "p">
 <!ENTITY FaxNumber.label                       "Fax">
 <!ENTITY FaxNumber.accesskey                   "F">
 <!ENTITY HomePhone.label                       "Telèfon particular">
 <!ENTITY HomePhone.accesskey                   "u">
 <!ENTITY WorkPhone.label                       "Telèfon de la feina">
 <!ENTITY WorkPhone.accesskey                   "f">
 <!ENTITY ChatName.label                        "Nom de xat">
-<!ENTITY ChatName.accesskey                    "X">
+<!ENTITY ChatName.accesskey                    "x">
 <!ENTITY sortAscending.label                   "Ascendent">
 <!ENTITY sortAscending.accesskey               "A">
 <!ENTITY sortDescending.label                  "Descendent">
 <!ENTITY sortDescending.accesskey              "D">
--- a/mail/chrome/messenger/addressbook/addressBook.properties
+++ b/mail/chrome/messenger/addressbook/addressBook.properties
@@ -78,17 +78,17 @@ dateformat=%e %B
 cityAndStateAndZip=%1$S, %2$S %3$S
 ## LOCALIZATION NOTE (cityAndStateNoZip): 
 ## %1$S is city, %2$S is state
 cityAndStateNoZip=%1$S, %2$S
 ## LOCALIZATION NOTE (cityOrStateAndZip): 
 ## %1$S is city or state, %2$S is zip
 cityOrStateAndZip=%1$S %2$S
 
-stateZipSeparator= 
+stateZipSeparator=
 
 prefixTo=A
 prefixCc=Cc
 prefixBcc=Cco
 addressBook=Llibreta d'adreces
 
 browsePhoto=Fotografia del contacte
 
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/Box/auth.dtd
@@ -0,0 +1,5 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this file,
+   - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
+
+<!ENTITY auth.title   "Autenticació a Box">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/Box/management.dtd
@@ -0,0 +1,5 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this file,
+   - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
+
+<!ENTITY boxMgmt.viewSettings "Mostra la configuració del meu compte a box.com">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/Box/settings.dtd
@@ -0,0 +1,5 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this file,
+   - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
+
+<!ENTITY boxSettings.needAnAccount "Aconsegueix un compte Box...">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/YouSendIt/fileExceeds2GB.dtd
@@ -0,0 +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/.  -->
+<!ENTITY fileExceeds2GB.title   "YouSendIt">
+<!ENTITY fileExceeds2GB.cancel "D'acord">
+<!ENTITY fileExceeds2GB.description "No es pot enviar fitxers de més de 2 GB.">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/YouSendIt/fileExceedsLimit.dtd
@@ -0,0 +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 fileExceedsLimit.title   "YouSendIt">
+<!ENTITY fileExceedsLimit.thatsBigFile   "Enviar fitxers de més de 50 MB">
+<!ENTITY fileExceedsLimit.thatsBigFile2   "és una característica premium.">
+<!ENTITY fileExceedsLimit.accept "Actualitza">
+<!ENTITY fileExceedsLimit.cancel "Cancel·la">
+<!ENTITY fileExceedsLimit.style "width: 48em; min-height: 28em;">
+<!ENTITY fileExceedsLimit.proIncludes "Actualitzeu-vos ara per enviar aquest fitxer i a més:">
+<!ENTITY fileExceedsLimit.pros1 "Enviar fitxers i carpetes de fins a 2 GB">
+<!ENTITY fileExceedsLimit.pros2 "Emmagatzemar fitxers en línia sense límit">
+<!ENTITY fileExceedsLimit.pros3 "Accedeix i comparteix fitxers des de qualsevol lloc">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/YouSendIt/fileExceedsQuota.dtd
@@ -0,0 +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/.  -->
+<!ENTITY fileExceedsQuota.title   "YouSendIt">
+<!ENTITY fileExceedsQuota.storageLimitReached   "S'ha arribat al límit d'emmagatzemament">
+<!ENTITY fileExceedsQuota.accept "Actualitza">
+<!ENTITY fileExceedsQuota.cancel "Cancel·la">
+<!ENTITY fileExceedsQuota.description "Heu arribat al vostre límit d'emmagatzematge de 2 GB.">
+<!ENTITY fileExceedsQuota.description1 "El vostre emmagatzematge actual és de #XXX GB.">
+<!ENTITY fileExceedsQuota.description2 "Actualitzeu avui el vostre compte de Pro Plus per aconseguir més emmagatzematge.">
+<!ENTITY fileExceedsQuota.description3 "Podeu també triar eliminar fitxers en el vostre compte per crear més espai.">
--- a/mail/chrome/messenger/imapMsgs.properties
+++ b/mail/chrome/messenger/imapMsgs.properties
@@ -188,17 +188,17 @@ 5047=Introduïu la contrasenya per a %S:
 5048=El servidor de correu %S no és IMAP4.
 
 ## @name IMAP_SERVER_SAID
 ## @loc None
 5049=L'ordre en curs no ha tingut èxit. El servidor de correu ha respost:
 
 ## @name IMAP_DONE
 ## @loc None
-5050= 
+5050=
 
 ## @name IMAP_ENTER_PASSWORD_PROMPT_TITLE
 ## @loc None
 5051=Cal una contrasenya per al servidor de correu
 
 ## @name IMAP_UNKNOWN_HOST_ERROR
 ## @loc None
 5052=No s'ha pogut connectar amb el servidor %S.
--- a/mail/chrome/messenger/importDialog.dtd
+++ b/mail/chrome/messenger/importDialog.dtd
@@ -11,17 +11,17 @@ LOCALIZATION NOTE : Do not translate any
 
 
 <!ENTITY importDialog.windowTitle "Importa">
 <!ENTITY importAll.label          "Importa-ho tot">
 <!ENTITY importAll.accesskey      "t">
 <!ENTITY importMail.label         "Correu">
 <!ENTITY importMail.accesskey     "C">
 <!ENTITY importFeeds.label        "Subscripció al canal de notícies">
-<!ENTITY importFeeds.accesskey    "s">
+<!ENTITY importFeeds.accesskey    "S">
 <!ENTITY importAddressbook.label  "Llibretes d'adreces">
 <!ENTITY importAddressbook.accesskey "a">
 <!ENTITY importSettings.label     "Paràmetres">
 <!ENTITY importSettings.accesskey "P">
 <!ENTITY importFilters.label      "Filtres">
 <!ENTITY importFilters.accesskey  "F">
 
 <!ENTITY  window.width            "45em">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/junkLog.dtd
@@ -0,0 +1,10 @@
+<!-- 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 de l'activitat de control de correu brossa adaptatiu">
+<!ENTITY clearLog.label "Neteja el registre">
+<!ENTITY clearLog.accesskey "N">
+<!ENTITY closeLog.label "Tanca">
+<!ENTITY closeLog.accesskey "c">
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -482,17 +482,17 @@ you can use these alternative items. Oth
 <!ENTITY activitymanager.accesskey "a">
 <!ENTITY imAccountsStatus.label "Estat del xat">
 <!ENTITY imAccountsStatus.accesskey "x">
 <!ENTITY imStatus.available          "Disponible">
 <!ENTITY imStatus.unavailable        "No disponible">
 <!ENTITY imStatus.offline            "Fora de línia">
 <!ENTITY imStatus.showAccounts       "Mostra els comptes…">
 <!ENTITY joinChatCmd.label "Uniu-vos al xat...">
-<!ENTITY joinChatCmd.accesskey "u">
+<!ENTITY joinChatCmd.accesskey "U">
 <!ENTITY savedFiles.label "Fitxers desats">
 <!ENTITY savedFiles.accesskey "d">
 <!ENTITY savedFiles.key "j">
 <!ENTITY filtersCmd.label "Filtres de missatge…">
 <!ENTITY filtersCmd.accesskey "F">
 <!ENTITY filtersApply.label "Executa els filtres en la carpeta">
 <!ENTITY filtersApply.accesskey "r">
 <!ENTITY filtersApplyToSelection.label "Executa els filtres en els missatges seleccionats">
@@ -578,16 +578,18 @@ you can use these alternative items. Oth
 <!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">
 <!-- 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 -->
 
 <!ENTITY folderColumn.label "Nom">
 <!ENTITY folderSizeColumn.label "Mida">
 <!-- Folder Pane Context Menu -->
 
 <!ENTITY folderContextGetMessages.label "Recupera els missatges">
 <!ENTITY folderContextGetMessages.accesskey "g">
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -124,17 +124,17 @@ serverType-none=Emmagatzematge local del
 serverType-movemail=Unix Movemail
 
 sizeColumnTooltip=Feu un clic per ordenar per mida
 sizeColumnHeader=Mida
 linesColumnTooltip=Feu clic per ordenar per línies
 linesColumnHeader=Línies
 
 # status feedback stuff
-documentDone= 
+documentDone=
 documentLoading=S'està carregant el document…
 
 # LOCALIZATION NOTE (autosyncProgress): Do not translate the word "%1$S" or "%2$S" below.
 # Place the word %1$S in your translation where the name of the comma separated folders should appear.
 # Place the word %2$S in your translation where the name of the comma separated accounts should appear.
 autosyncProgress=Se sincronitzen els missatges a %1$S de %2$S…
 
 unreadMsgStatus=Per llegir: %S
--- a/mail/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/chrome/messenger/messengercompose/composeMsgs.properties
@@ -361,16 +361,17 @@ bigFileHideNotification.check=No em tornis a notificar més sobre això.
 cloudFileUploadingTooltip=S'està pujant a %S…
 # LOCALIZATION NOTE(cloudFileUploadedTooltip): Do not translate the string
 # %S. %S is the display name for the cloud account the attachment was uploaded
 # to.
 cloudFileUploadedTooltip=S'ha pujat a %S
 cloudFileUploadingNotification=S'està enllaçant el fitxer. Apareixerà en el cos del missatge quan s'hagi fet.;S'estan enllaçant els fitxers. Apareixeran en el cos del missatge quan s'hagin fet.
 cloudFileUploadingCancel.label=Cancel·la
 cloudFileUploadingCancel.accesskey=c
+cloudFilePrivacyNotification=S'ha completat l'enllaçament. Tingueu en compte que les adjuncions enllaçades poden ser accessibles a aquells que poden veure o endevinar els enllaços.
 
 ## LOCALIZATION NOTE(smtpEnterPasswordPrompt): Do not translate the
 ## word $S. Place the word $S where the host name should appear.
 smtpEnterPasswordPrompt=Introduïu la vostra contrasenya per %S:
 ## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the
 ## words %1$S and %2$S. Place the word %1$S where the host name should appear,
 ## and %2$S where the user name should appear.
 smtpEnterPasswordPromptWithUsername=Introduïu la vostra contrasenya per %2$S al servidor %1$S:
@@ -393,16 +394,21 @@ errorCloudFileUpload.title=Error de puja
 ## %1$S is the name of the online storage service that uploading failed against.
 ## %2$S is the name of the file that failed to upload.
 errorCloudFileUpload.message=No s'ha pogut pujar %2$S a %1$S.
 errorCloudFileQuota.title=Error de quota
 ## LOCALIZATION NOTE(errorCloudFileQuota.message):
 ## %1$S is the name of the online storage service being uploaded to.
 ## %2$S is the name of the file that could not be uploaded due to exceeding the storage limit.
 errorCloudFileQuota.message=En pujar %2$S a %1$S s'excediria la vostra quota d'espai.
+errorCloudFileNameLimit.title=Error del nom de fitxer
+## LOCALIZATION NOTE(errorCloudFileNameLimit.message):
+## %1$S is the name of the online storage service being uploaded to.
+## %2$S is the name of the file that could not be uploaded due to the excess file name length
+errorCloudFileNameLimit.message=La pujada de %2$S a %1$S conté més de 120 caràcters al seu nom. Reanomeneu el fitxer per tenir 120 caràcters o menys en el seu nom i torneu-lo a pujar.
 errorCloudFileLimit.title=Error de mida del fitxer
 ## LOCALIZATION NOTE(errorCloudFileLimit.message):
 ## %1$S is the name of the online storage service being uploaded to.
 ## %2$S is the name of the file that could not be uploaded due to size restrictions.
 errorCloudFileLimit.message=%2$S excedeix la mida màxima de %1$S.
 errorCloudFileOther.title=Error desconegut
 ## LOCALIZATION NOTE(errorCloudFileOther.message):
 ## %1$S is the name of the online storage service that cannot be communicated with.
--- a/mail/chrome/messenger/offline.properties
+++ b/mail/chrome/messenger/offline.properties
@@ -1,23 +1,27 @@
 # 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/.
 
 # Download Messages Prompt
 downloadMessagesWindowTitle1=Baixada dels missatges
 downloadMessagesLabel1=Voleu baixar els missatges per a un ús fora de línia abans de posar-vos-hi?
 downloadMessagesCheckboxLabel1=Demana-m'ho sempre quan em posi fora de línia
+downloadMessagesNow=Baixa-ho ara
 
 # Send Messages Prompt
 sendMessagesWindowTitle1=Missatges per enviar
 sendMessagesLabel2=Voleu enviar els vostres missatges pendents per enviar?
 sendMessagesCheckboxLabel1=Demana-m'ho sempre quan em posi en línia
+sendMessagesNow=Envia-ho ara
 
-# GetMessages While Offline Prompt 
+processMessagesLater=Més tard
+
+# GetMessages While Offline Prompt
 getMessagesOfflineWindowTitle1=Recuperació dels missatges 
 getMessagesOfflineLabel1=Esteu actualment fora de línia. Voleu posar-vos en línia per recuperar els nous missatges?
 
 # Send Messages Offline Prompt
 sendMessagesOfflineWindowTitle1=Missatges per enviar
 sendMessagesOfflineLabel1=Esteu actualment fora de línia. Voleu posar-vos en línia per enviar els missatges per enviar?
 
 offlineTooltip=Esteu actualment fora de línia.
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/pgpmime.properties
@@ -0,0 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#
+# The following are used by the pgpmime content type handler
+#
+
+# LOCALIZATION NOTE(pgpMimeNeedsAddon): The text can contain HTML tags.
+# %S is the url to Enigmail on AMO supplied from preferences.
+pgpMimeNeedsAddon=Això és un missatge OpenPGP xifrat.<br>Per desxifrar aquest missatge cal que instal·leu un <a href="%S">complement OpenPGP</a>.
+
--- a/mail/chrome/messenger/preferences/advanced.dtd
+++ b/mail/chrome/messenger/preferences/advanced.dtd
@@ -10,16 +10,23 @@
 <!-- General Settings -->
 
 
 <!ENTITY submitTelemetry.label         "Envia dades del rendiment ">
 <!ENTITY submitTelemetry.accesskey     "r">
 <!ENTITY telemetryInfoLink.label       "Més informació sobre el Telemetry">
 <!ENTITY enableGlodaSearch.label       "Habilita el cercador i indexador de missatges">
 <!ENTITY enableGlodaSearch.accesskey   "i">
+
+<!ENTITY scrolling.label               "Desplaçament">
+<!ENTITY useAutoScroll.label           "Utilitza el desplaçament automàtic">
+<!ENTITY useAutoScroll.accesskey       "U">
+<!ENTITY useSmoothScrolling.label      "Utilitza el desplaçament suau">
+<!ENTITY useSmoothScrolling.accesskey  "m">
+
 <!ENTITY systemIntegration.label       "Integració amb el sistema">
 <!ENTITY alwaysCheckDefault.label      "A l'inici, comprova sempre si el &brandShortName; és el client de correu per defecte">
 <!ENTITY alwaysCheckDefault.accesskey  "l">
 <!ENTITY searchIntegration.label       "Permet al &searchIntegration.engineName; que cerqui missatges">
 <!ENTITY searchIntegration.accesskey   "c">
 <!ENTITY checkNow.label                "Comprova-ho ara">
 <!ENTITY checkNow.accesskey            "h">
 <!ENTITY configEditDesc.label          "Configuració avançada">
@@ -79,20 +86,20 @@
 <!ENTITY showSettings.accesskey        "m">
 <!ENTITY proxiesConfigure.label        "Configura com es connecta el &brandShortName; a Internet">
 <!ENTITY connectionsInfo.caption       "Connexió">
 <!ENTITY offlineInfo.caption           "Fora de línia">
 <!ENTITY offlineInfo.label             "Configura els paràmetres de fora de línia">
 <!ENTITY showOffline.label             "Fora de línia…">
 <!ENTITY showOffline.accesskey         "o">
 
-<!ENTITY Diskspace "Espai de disc">
-<!ENTITY offlineCompact.label "Compacta les carpetes quan l'estalvi sigui superior a">
-<!ENTITY offlineCompact.accesskey "C">
-<!ENTITY mb.label "Mb">
+<!ENTITY Diskspace                       "Espai de disc">
+<!ENTITY offlineCompactFolders.label     "Compacta totes les carpetes quan es desarà">
+<!ENTITY offlineCompactFolders.accesskey "a">
+<!ENTITY offlineCompactFoldersMB.label   "MB en total">
 <!-- LOCALIZATION NOTE:
   The entities useCacheBefore.label and useCacheAfter.label appear on a single
   line in preferences as follows:
 
   &useCacheBefore.label  [ textbox for cache size in MB ]   &useCacheAfter.label;
 -->
 
 <!ENTITY useCacheBefore.label            "Utilitza fins a">
--- a/mail/chrome/messenger/preferences/fonts.dtd
+++ b/mail/chrome/messenger/preferences/fonts.dtd
@@ -30,17 +30,17 @@
 <!ENTITY  font.langGroup.trad-chinese             "Xinès tradicional (Taiwan)">
 <!ENTITY  font.langGroup.simpl-chinese            "Xinès simplificat">
 <!ENTITY  font.langGroup.trad-chinese-hk          "Xinès tradicional (Hong Kong)">
 <!ENTITY  font.langGroup.korean                   "Coreà">
 <!ENTITY  font.langGroup.cyrillic                 "Ciríl·lic">
 <!ENTITY  font.langGroup.baltic                   "Bàltic">
 <!ENTITY  font.langGroup.el                       "Grec">
 <!ENTITY  font.langGroup.turkish                  "Turc">
-<!ENTITY  font.langGroup.unicode                  "Unicode">
+<!ENTITY  font.langGroup.unicode1                 "Unicode">
 <!ENTITY  font.langGroup.user-def                 "Definit per l'usuari">
 <!ENTITY  font.langGroup.thai                     "Tailandès">
 <!ENTITY  font.langGroup.hebrew                   "Hebreu">
 <!ENTITY  font.langGroup.arabic                   "Àrab">
 <!ENTITY  font.langGroup.devanagari               "Devanagari">
 <!ENTITY  font.langGroup.tamil                    "Tàmil">
 <!ENTITY  font.langGroup.armenian                 "Armeni">
 <!ENTITY  font.langGroup.bengali                  "Bengalí">
--- a/mobile/android/base/android_strings.dtd
+++ b/mobile/android/base/android_strings.dtd
@@ -49,16 +49,17 @@
 <!ENTITY forward "Endavant">
 <!ENTITY menu "Menú">
 <!ENTITY back "Enrere">
 <!ENTITY stop "Atura">
 <!ENTITY site_security "Seguretat del lloc">
 
 <!ENTITY close_tab "Tanca la pestanya">
 <!ENTITY new_tab "Pestanya nova">
+<!ENTITY one_tab "1 pestanya">
 <!-- Localization note (num_tabs) : Number of tabs is always more than one. 
      We can't use android plural forms, sadly. See bug #753859. -->
 <!ENTITY num_tabs "&#037;d pestanyes">
 <!ENTITY new_tab_opened "S\'ha obert una pestanya nova">
 
 <!ENTITY settings "Opcions">
 <!ENTITY settings_title "Opcions">
 <!ENTITY pref_category_general "General">
@@ -81,39 +82,40 @@
 <!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_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_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 pref_search_suggestions "Mostra els suggeriments de cerca">
 
 <!ENTITY quit "Surt">
 
 <!ENTITY addons "Complements">
 <!ENTITY downloads "Baixades">
+<!ENTITY apps "Aplicacions">
 <!ENTITY char_encoding "Codificació dels caràcters">
 
 <!ENTITY share "Comparteix">
 <!ENTITY share_title "Comparteix mitjançant">
+<!ENTITY share_image_failed "No es pot compartir la imatge">
 <!ENTITY save_as_pdf "Desa com a PDF">
 <!ENTITY find_in_page "Cerca a la pàgina">
 <!ENTITY desktop_mode "Sol·licita el lloc per a escriptori">
-
 <!-- Localization note (find_text, find_prev, find_next, find_close) : These strings are used
      as alternate text for accessibility. They are not visible in the UI. -->
 
 <!ENTITY find_text "Cerca a la pàgina">
 <!ENTITY find_prev "Enrere">
 <!ENTITY find_next "Endavant">
 <!ENTITY find_close "Tanca">
 
@@ -136,19 +138,20 @@
 <!ENTITY bookmark_edit_location "Ubicació">
 <!ENTITY bookmark_edit_keyword "Paraula clau">
 
 <!ENTITY site_settings_title        "Neteja les opcions 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 add_to_reading_list "S\'ha afegit a la pàgina de lectura">
+<!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">
 <!ENTITY reader_mode "mode lector">
 
 <!ENTITY masterpassword_create_title "Crea una contrasenya mestra">
 <!ENTITY masterpassword_remove_title "Suprimeix la contrasenya mestra">
 <!ENTITY masterpassword_password "Contrasenya">
 <!ENTITY masterpassword_confirm "Confirmeu la contrasenya">
 
 <!ENTITY button_ok "D\'acord">
@@ -180,19 +183,21 @@ which is run by
 Example Enterprises, Inc.
 
 The layout of the identity dialog prevents combining this into a single string with
 substitution variables.  If it is difficult to translate the sense of the string
 with that structure, consider a translation which ignores the preceding domain and
 just addresses the organization to follow, e.g. "This site is run by " -->
 <!ENTITY identity_run_by "funciona mitjançant">
 
+<!ENTITY private_data_success "S'han netejat les dades privades">
+<!ENTITY private_data_fail "No s'han pogut netejar algunes dades privades">
+
 <!ENTITY bookmarkhistory_button_import "Importa">
-<!ENTITY bookmarkhistory_import_both "S\'estan important les adreces d\'interès i historial
-                                      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 bookmarkhistory_import_both "S\'estan important les adreces d\'interès i historial 
+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 private_data_success "S\'han netejat les dades privades">
-<!ENTITY private_data_fail "No s\'han pogut netejar algunes dades privades">
+<!ENTITY webapp_generic_name "Aplicacions">
--- a/mobile/android/base/sync_strings.dtd
+++ b/mobile/android/base/sync_strings.dtd
@@ -36,26 +36,28 @@
 <!ENTITY sync.input.server.label "URL del servidor">
 <!-- Setup Fail -->
   
 <!ENTITY sync.title.fail.label "No s\'ha pogut configurar el &syncBrand.shortName.label;">
 <!ENTITY sync.subtitle.fail.label "El &syncBrand.fullName.label; no s\'ha pogut connectar al servidor. Voleu que ho provi una altra vegada?">
 <!ENTITY sync.button.tryagain.label "Torna-ho a provar">
 <!ENTITY sync.button.manual.label "Configuració manual">
 <!ENTITY sync.subtitle.nointernet.label "No hi ha cap connexió a Internet disponible.">
+<!ENTITY sync.subtitle.failaccount.label "Ha fallat la creació del compte al dispositiu.">
+<!ENTITY sync.subtitle.failmultiple.label "Teniu més d'un Firefox instal·lat? Actualment, el &syncBrand.fullName.label; només permet una instal·lació del Firefox alhora. Desinstal·leu les altres instàncies per poder utilitzar el &syncBrand.shortName.label;.">
 <!-- Setup Success -->
   
 <!ENTITY sync.title.success.label "S\'ha finalitzat la configuració">
 <!ENTITY sync.subtitle.success.label1 "Les vostres dades s\'estan baixant en segon pla. Podeu anar a les Opcions per gestionar el vostre compte, o començar a navegar amb el &brandShortName;.">
 <!ENTITY sync.settings.label "Opcions">
 <!ENTITY sync.subtitle.manage.label1 "El vostre compte &syncBrand.fullName.label; ja està configurat. Podeu anar a les opcions per gestionar el vostre compte, o iniciar el &brandShortName;.">
 <!-- Pair Device -->
 
 <!ENTITY sync.pair.tryagain.label "Torna-ho a provar.">
-<!ENTITY sync.pair.connectlocation.label 'Per activar el nou dispositiu, seleccioneu «Configura el &syncBrand.shortName.label;» al dispositiu, i després seleccioneu «Tinc un compte».'>
+<!ENTITY sync.pair.connectlocation.label "Per activar el nou dispositiu, seleccioneu «Configura el &syncBrand.shortName.label;» al dispositiu, i després seleccioneu «Tinc un compte».">
 <!-- Firefox SyncAdapter Settings Screen -->
 
 <!ENTITY sync.settings.options.label "Opcions">
 <!ENTITY sync.summary.pair.label "Vinculeu un altre dispositiu al vostre compte de &syncBrand.shortName.label;">
 <!-- Common text -->
 
 <!ENTITY sync.button.cancel.label "Cancel·la">
 <!ENTITY sync.button.connect.label "Connecta">
@@ -73,9 +75,20 @@
 <!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 -->
 
 <!ENTITY sync.notification.oneaccount.label "Només es permet un compte de &syncBrand.fullName.label;">
 <!-- Incorrect settings and changing credentials. -->
 
+<!ENTITY sync.invalidcreds.label "El nom del compte o de la contrasenya són incorrectes.">
+<!ENTITY sync.invalidserver.label "Introduïu un URL de servidor vàlid">
+<!ENTITY sync.verifying.label "S'està verificant…">
 <!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!">
--- a/mobile/android/chrome/aboutAddons.dtd
+++ b/mobile/android/chrome/aboutAddons.dtd
@@ -4,9 +4,9 @@
 
 <!ENTITY aboutAddons.title                      "Gestor de 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.cancel                     "Cancel·la">
+<!ENTITY addonAction.undo                       "Desfés">
--- a/mobile/android/chrome/aboutAddons.properties
+++ b/mobile/android/chrome/aboutAddons.properties
@@ -9,8 +9,10 @@ addonAction.cancel=Cancel·la
 addonAction.options=Opcions
 
 addonsSearchEngine.description=Cerca integrada
 
 addonType.extension=Extensió
 addonType.theme=Tema
 addonType.locale=Idioma
 addonType.search=Cerca
+
+addonStatus.uninstalled=Es desinstal·larà el %S després del reinici.
new file mode 100644
--- /dev/null
+++ b/mobile/android/chrome/aboutReader.properties
@@ -0,0 +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/.
+
+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
--- a/mobile/android/chrome/browser.properties
+++ b/mobile/android/chrome/browser.properties
@@ -208,16 +208,17 @@ selectionHelper.textCopied=Text copiat a
 
 # Context menu
 contextmenu.openInNewTab=Obre l'enllaç en una pestanya nova
 contextmenu.share=Comparteix
 contextmenu.shareLink=Comparteix un enllaç
 contextmenu.bookmarkLink=Afegeix a les adreces d'interès
 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.selectAll=Selecciona-ho tot
 contextmenu.paste=Enganxa
 
@@ -260,8 +261,12 @@ masterPassword.incorrect=Contrasenya inc
 # Debugger
 # LOCALIZATION NOTE (remoteIncomingPromptTitle): The title displayed on the
 # 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.openWithApp2=Obre amb l'aplicació %S
+helperapps.openWithList2=Obre amb una aplicació
--- a/mobile/overrides/passwordmgr.properties
+++ b/mobile/overrides/passwordmgr.properties
@@ -7,30 +7,30 @@ rememberPassword = Utilitza el gestor de
 savePasswordTitle = Confirmació
 # 1st string is product name, 2nd is the username for the login, 3rd is the
 #   login's hostname. Note that long usernames may be truncated.
 saveLoginText = Voleu que el %1$S recordi la contrasenya de «%2$S» a %3$S?
 # 1st string is product name, 2nd is the login's hostname
 saveLoginTextNoUsername = Voleu que el %1$S recordi la contrasenya a %2$S?
 promptNotNowButtonText = Ara no
 notifyBarNotNowButtonText = Ara no 
-notifyBarNotNowButtonAccessKey = 
+notifyBarNotNowButtonAccessKey =
 promptNeverForSiteButtonText = Mai
 notifyBarNeverForSiteButtonText = Mai
-notifyBarNeverForSiteButtonAccessKey = 
+notifyBarNeverForSiteButtonAccessKey =
 promptRememberButtonText = Recorda-la
 notifyBarRememberButtonText = Recorda-la
-notifyBarRememberButtonAccessKey = 
+notifyBarRememberButtonAccessKey =
 passwordChangeTitle = Confirmeu el canvi de contrasenya
 passwordChangeText = Voleu canviar la contrasenya emmagatzemada per %S?
 passwordChangeTextNoUser = Voleu canviar la contrasenya emmagatzemada per a aquest inici de sessió?
 notifyBarChangeButtonText = Canvia-la
-notifyBarChangeButtonAccessKey = 
+notifyBarChangeButtonAccessKey =
 notifyBarDontChangeButtonText = No la canviïs
-notifyBarDontChangeButtonAccessKey = 
+notifyBarDontChangeButtonAccessKey =
 userSelectText = Confirmeu a quin usuari esteu canviant-li la contrasenya
 hidePasswords=Amaga les contrasenyes
 hidePasswordsAccessKey=g
 showPasswords=Mostra les contrasenyes
 showPasswordsAccessKey=s
 noMasterPasswordPrompt=Esteu segur que voleu mostrar les vostres contrasenyes?
 removeAllPasswordsPrompt=Esteu segur que voleu suprimir totes les contrasenyes?
 removeAllPasswordsTitle=Supressió de totes les contrasenyes
--- a/security/manager/chrome/pipnss/pipnss.properties
+++ b/security/manager/chrome/pipnss/pipnss.properties
@@ -307,16 +307,17 @@ SSLConnectionErrorPrefix=S'ha produït un error durant la connexió a %S.
 
 certErrorIntro=S'ha produït un error durant la connexió a %S perquè no utilitza un certificat de seguretat vàlid.
 
 certErrorTrust_SelfSigned=No es confia en el certificat perquè està signat per ell mateix.
 certErrorTrust_UnknownIssuer=No es confia en el certificat perquè se'n desconeix l'emissor.
 certErrorTrust_MissingChain=No es confia en el certificat perquè no s'ha proporcionat cap cadena de l'emissor.
 certErrorTrust_CaInvalid=No es confia en el certificat perquè fou emès per un certificat de CA no vàlid.
 certErrorTrust_Issuer=No es confia en el certificat perquè no es confia tampoc en l'emissor del certificat.
+certErrorTrust_SignatureAlgorithmDisabled=No es confia en el certificat perquè ha estat signat amb un algorisme de signatura que va ser inhabilitat per no ser segur.
 certErrorTrust_ExpiredIssuer=No es confia en el certificat perquè l'emissor del certificat ha vençut.
 certErrorTrust_Untrusted=El certificat no prové d'una font de confiança.
 
 certErrorMismatch=El certificat no és vàlid per al nom de domini %S.
 # LOCALIZATION NOTE (certErrorMismatchSingle2): Do not translate <a id="cert_domain_link" title="%1$S">%1$S</a>
 certErrorMismatchSingle2=El certificat només és vàlid per a <a id="cert_domain_link" title="%1$S">%1$S</a>.
 certErrorMismatchMultiple=El certificat només és vàlid per als noms següents:
 certErrorMismatchNoNames=El certificat no és vàlid per a cap dels noms de servidor.
@@ -350,16 +351,17 @@ NSSInitProblemX=No s'ha pogut inicialitzar l'element de seguretat de l'aplicació. El motiu més probable és que hi hagi problemes de fitxers al directori de perfils de l'aplicació. Comproveu que aquest directori no tingui restriccions de lectura/escriptura i que el disc dur no sigui ple o gairebé ple. És recomanable que sortiu de l'aplicació i solucioneu el problema. Si continueu utilitzant aquesta sessió, pot ser que l'aplicació no funcioni bé en accedir a característiques de seguretat.
 ProfileSwitchSocketsStillActive=L'operació no es pot completar a causa d'una fallada interna. Una comunicació segura de xarxa no s'ha buidat correctament.
 ProfileSwitchCryptoUIActive=En aquest moment és impossible realitzar aquesta operació. Completeu l'operació que demana la vostra atenció en una altra de les finestres obertes.
 VerifyExpired=<Caducat>
 VerifyRevoked=<Revocat>
 VerifyNotTrusted=<No fiable>
 VerifyIssuerNotTrusted=<L'emissor no és de confiança>
 VerifyIssuerUnknown=<L'emissor és desconegut>
 VerifyInvalidCA=<CA no vàlida>
+VerifyDisabledAlgorithm=<Algorisme de signatura no segur>
 VerifyUnknown=<Desconegut>
 CertUser=El vostre certificat
 CertCA=CA (Autoritat certificadora)
 CertSSL=Servidor SSL
 CertEmail=Usuari S/MIME
 CertUnknown=Desconegut
 CertNoNickname=(sense sobrenom)
 CertNoEmailAddress=(sense adreça electrònica)
--- a/security/manager/chrome/pippki/pippki.properties
+++ b/security/manager/chrome/pippki/pippki.properties
@@ -54,16 +54,17 @@ resetPreferences=Utilitzeu aquest botó per reiniciar els paràmetres de seguretat de %S i tornar-los a donar els valors de fàbrica.
 #Cert verification
 certVerified=S'ha verificat el certificat per als usos següents:
 certNotVerified_CertRevoked=No s'ha pogut comprovar el certificat perquè ha estat revocat.
 certNotVerified_CertExpired=No s'ha pogut comprovar el certificat perquè ha vençut.
 certNotVerified_CertNotTrusted=No s'ha pogut comprovar el certificat perquè no s'hi confia.
 certNotVerified_IssuerNotTrusted=No s'ha pogut comprovar el certificat perquè no es confia en l'emissor.
 certNotVerified_IssuerUnknown=No s'ha pogut comprovar el certificat perquè l'emissor és desconegut.
 certNotVerified_CAInvalid=No s'ha pogut comprovar el certificat perquè el certificat de la CA no és vàlid.
+certNotVerified_AlgorithmDisabled=No s'ha pogut verificar el certificat perquè ha estat signat amb un algorisme de signatura que va ser inhabilitat per no ser segur.
 certNotVerified_Unknown=No s'ha pogut comprovar el certificat per raons desconegudes.
 
 #Client auth
 clientAuthMessage1=Organització: «%S»
 clientAuthMessage2=Emès sota: «%S»
 
 #Page Info
 pageInfo_SiteNotVerified=La identitat del lloc web no ha estat verificada
@@ -175,17 +176,17 @@ writeFileUnknownError=Error desconegut
 
 #Add Security Exception dialog
 addExceptionBrandedWarning2=Esteu a punt de sobreescriure com el %S identifica aquest lloc.
 addExceptionInvalidHeader=Aquest lloc intenta identificar-se amb informació que no és vàlida.
 addExceptionDomainMismatchShort=Lloc web incorrecte
 addExceptionDomainMismatchLong=El certificat pertany a un lloc web diferent, fet que podria indicar una suplantació d'identitat.
 addExceptionExpiredShort=Informació desactualitzada
 addExceptionExpiredLong=El certificat no és vàlid actualment. És impossible verificar llavors si s'hagués pogut informar que aquesta identitat s'hagi suplantat o perdut.
-addExceptionUnverifiedShort=Identitat desconeguda
-addExceptionUnverifiedLong=No es confia en el certificat, perquè no l'ha verificat una autoritat reconeguda.
+addExceptionUnverifiedOrBadSignatureShort=Identitat desconeguda
+addExceptionUnverifiedOrBadSignatureLong=No es confia en el certificat, perquè no s'ha verificat per una autoritat reconeguda que utilitzi una signatura segura.
 addExceptionValidShort=Certificat vàlid
 addExceptionValidLong=El lloc web proporciona identificació vàlida i verificada. No cal afegir cap excepció.
 addExceptionCheckingShort=Comprovació de la informació
 addExceptionCheckingLong=S'està intentant identificar el lloc web…
 addExceptionNoCertShort=No hi ha cap informació disponible
 addExceptionNoCertLong=No es pot obtenir l'estat d'identificació per al lloc web donat.
 addExceptionConnectionFailed=Ha fallat la connexió
--- a/suite/chrome/browser/pageInfo.dtd
+++ b/suite/chrome/browser/pageInfo.dtd
@@ -11,21 +11,21 @@
 <!ENTITY  copy.label             "Copia">
 <!ENTITY  copy.accesskey         "C">
 <!ENTITY  selectall.key          "A">
 <!ENTITY  selectall.label        "Selecciona-ho tot">
 <!ENTITY  selectall.accesskey    "a">
 <!ENTITY  openHelpMac.key        "?">
 <!ENTITY  closeWindow.key        "w">
 <!ENTITY  copyLinks.label           "Copia l'enllaç(os)">
-<!ENTITY  copyLinks.accesskey       "E">
+<!ENTITY  copyLinks.accesskey       "e">
 <!ENTITY  openInNewTab.label        "Obre en una pestanya nova">
-<!ENTITY  openInNewTab.accesskey    "P">
+<!ENTITY  openInNewTab.accesskey    "p">
 <!ENTITY  openInNewWindow.label     "Obre en una finestra nova">
-<!ENTITY  openInNewWindow.accesskey "F">
+<!ENTITY  openInNewWindow.accesskey "f">
 
 <!ENTITY  generalTab            "General">
 <!ENTITY  generalTab.accesskey  "G">
 <!ENTITY  generalURL            "URL:">
 <!ENTITY  generalType           "Tipus:">
 <!ENTITY  generalMode           "Mode de representació:">
 <!ENTITY  generalSize           "Mida:">
 <!ENTITY  generalReferrer       "URL referent:">
--- a/suite/chrome/common/dataman/dataman.properties
+++ b/suite/chrome/common/dataman/dataman.properties
@@ -15,16 +15,17 @@ cookies.deleteSelectedTitle=Suprimeix le
 cookies.deleteSelectedYes=Sup&rimeix
 
 # permissions
 perm.allowXULXBL.label=Utilitza etiquetatge XUL/XBL
 perm.cookie.label=Estableix galetes
 perm.geo.label=Comparteix la ubicació
 perm.image.label=Carrega imatges
 perm.install.label=Instal·la complements
+perm.offline-app.label=Aplicacions web fora de línia
 perm.object.label=Executa els connectors
 perm.password.label=Desa contrasenyes
 perm.plugins.label=Activa els connectors
 perm.popup.label=Obre finestres emergents
 perm.script.label=Executa els scripts
 perm.stylesheet.label=Carrega les etiquetes d'estil
 
 perm.type.default=Seleccioneu un tipus
--- a/suite/chrome/common/permissions/permissionsManager.properties
+++ b/suite/chrome/common/permissions/permissionsManager.properties
@@ -6,15 +6,18 @@ installpermissionstext=Podeu especificar quins llocs web tenen permís per instal·lar extensions i actualitzacions. Escriviu l'adreça exacte del lloc que voleu permetre i llavors feu clic a Permet.
 installpermissionstitle=Llocs permesos per a la instal·lació de programari
 installpermissionshelp=advanced_pref_installation
 popuppermissionstext=Podeu especificar quins llocs web tenen permís per obrir finestres emergents. Escriviu l'adreça exacte del lloc que voleu permetre i llavors feu clic a Permet.
 popuppermissionstitle=Llocs permesos per a les emergents
 popuppermissionshelp=pop_up_blocking
 imagepermissionstext=Podeu especificar quins llocs web tenen permís per carregar imatges. Escriviu l'adreça exacte del lloc que voleu gestionar i llavors feu clic a Bloca o Permet.
 imagepermissionstitle=Excepcions per a les imatges
 imagepermissionshelp=images-help-managing
+offline-apppermissionstext=Podeu especificar quins llocs web tenen permís per emmagatzemar dades per a un ús fora de línia. Escriviu l'adreça exacte del lloc web que voleu gestionar i feu clic a Bloca o Permet.
+offline-apppermissionstitle=Dades fora de línia
+offline-apppermissionshelp=offline_apps
 
 can=Permet
 canSession=Permet per aquesta sessió
 cannot=Bloca
 
 alertInvalidTitle=S'ha introduït un lloc web no vàlid
 alertInvalid=El lloc web %S no és vàlid.
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/pref/pref-offlineapps.dtd
@@ -0,0 +1,17 @@
+<!-- extracted from content/pref-offlineapps.xul -->
+<!--LOCALIZATION NOTE : FILE Offline Apps prefs dialog -->
+
+<!ENTITY pref.offlineapps.title             "Aplicacions web fora de línia">
+<!ENTITY pref.offlineCache.caption          "Contingut web fora de línia i dades de l'usuari">
+
+<!ENTITY clearOfflineAppCache.label         "Neteja">
+<!ENTITY clearOfflineAppCache.accesskey     "N">
+
+<!ENTITY offlineNotify.label                "Notifiqueu-me quan un lloc web vulgui emmagatzemar dades per al seu ús fora de línia">
+<!ENTITY offlineNotify.accesskey            "N">
+<!ENTITY offlineNotifyPermissions.label     "Gestiona els permisos">
+<!ENTITY offlineNotifyPermissions.accesskey "p">
+
+<!ENTITY offlineAppsList.label              "Els llocs web següents estan autoritzats a emmagatzemar dades per el seu ús fora de línia:">
+<!ENTITY offlineAppsListRemove.label        "Neteja les dades…">
+<!ENTITY offlineAppsListRemove.accesskey    "N">
--- a/suite/chrome/common/pref/pref-scripts.dtd
+++ b/suite/chrome/common/pref/pref-scripts.dtd
@@ -10,21 +10,23 @@
 <!ENTITY navigator.label                 "Navegador">
 <!ENTITY navigator.accesskey             "r">
 <!--LOCALIZATION NOTE (enableJavaScript.label): 'JavaScript' should never be translated -->
 
 <!ENTITY enableJavaScript.label          "Habilita el Javascript per a:">
 <!ENTITY allowScripts.label              "Permet als scripts:">
 <!ENTITY allowScripts.accesskey          "s">
 <!ENTITY allowWindowMoveResize.label     "Moure o canviar la mida de finestres ja existents">
-<!ENTITY allowWindowFlip.label           "Aixecar o abaixar finestres">
+<!ENTITY allowWindowFlip.label           "Posar finestres en primer o segon pla">
 <!ENTITY allowWindowStatusChange.label   "Canviar el text de la barra d'estat">
 <!ENTITY allowWindowImageSrcChange.label "Canviar les imatges">
 <!ENTITY allowContextmenuDisable.label   "Inhabilitar o reemplaçar menús contextuals">
 <!ENTITY allowHideStatusBar.label        "Amagar la barra d'estat">
 
-<!ENTITY enablePlugin.label              "Habilita els connectors per a:">
+<!ENTITY enablePlugins.label             "Habilita els connectors per a">
 <!ENTITY enablePluginForSuite.label      "Suite">
 <!ENTITY enablePluginForSuite.accesskey  "u">
 
-<!ENTITY whenPluginsRequired.label       "Quan calguin connectors addicionals:">
-<!ENTITY displayNotification.label       "Mostra una barra de notificació a la part superior de l'àrea de contingut">
-<!ENTITY displayNotification.accesskey   "n">
+<!ENTITY whenPageRequiresPlugins.label   "Quan una pàgina necessita extensions">
+<!ENTITY activateAllPlugins.label        "Activa totes les extensions per defecte">
+<!ENTITY activateAllPlugins.accesskey    "d">
+<!ENTITY warnPluginsRequired.label       "Avisa'm si cal instal·lar extensions addicionals">
+<!ENTITY warnPluginsRequired.accesskey   "v">
--- a/suite/chrome/common/pref/preferences.dtd
+++ b/suite/chrome/common/pref/preferences.dtd
@@ -25,16 +25,17 @@
 <!ENTITY masterpass.label "Contrasenyes mestres">
 <!ENTITY ssl.label "SSL">
 <!ENTITY certs.label "Certificats">
 <!ENTITY validation.label "Validació">
 <!ENTITY sync.label "Sync">
 <!ENTITY advance.label "Avançat">
 <!ENTITY down.label "Baixades">
 <!ENTITY cache.label "Memòria cau">
+<!ENTITY offlineApps.label "Aplicacions fora de línia">
 <!ENTITY proxies.label "Servidors intermediaris">
 <!ENTITY httpnetworking.label "Xarxa HTTP">
 <!ENTITY smart.label "Instal·lació de programari">
 <!ENTITY download.label "Baixades">
 <!ENTITY keynav.label "Navegació amb teclat">
 <!ENTITY findAsYouType.label "Cerca a mesura que s'escriu">
 <!ENTITY search.label "Cerca a Internet">
 <!ENTITY policies.label "Polítiques de seguretat">
--- a/suite/chrome/common/pref/prefutilities.properties
+++ b/suite/chrome/common/pref/prefutilities.properties
@@ -1,15 +1,29 @@
 # 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/.
 
 cachefolder=Tria la carpeta de la memòria cau
 #LOCALIZATION NOTE (%1$S) is the size and (%2$S) is the unit of disk space.
 cacheSizeInfo=La memòria cau està fent servir actualment %1$S %2$S de l'espai de disc.
+
+# Offline apps
+appCacheSizeInfo=La memòria cau de la vostra aplicació utilitza actualment %1$S %2$S d'espai de disc.
+offlineAppRemoveTitle=Suprimeix les dades del lloc web per a l'ús fora de línia
+offlineAppRemovePrompt=Després de suprimir aquestes dades, %S no estarà disponible fora de línia. Esteu segur que voleu suprimir aquest lloc web fora de línia?
+offlineAppRemoveConfirm=Suprimeix les dades d'ús en fora de línia
+
+# LOCALIZATION NOTE: The next string is for the disk usage of the
+# offline application
+#   e.g. offlineAppUsage : "50.23 MB"
+#   %1$S = size (in bytes or megabytes, ...)
+#   %2$S = unit of measure (bytes, KB, MB, ...)
+offlineAppUsage=%1$S %2$S
+
 choosehomepage=Tria la pàgina d'inici
 downloadfolder=Tria una carpeta de baixades
 desktopFolderName=Escriptori
 downloadsFolderName=Baixades
 choosesound=Tria un so
 
 SoundFiles=Sons
 
--- a/suite/chrome/mailnews/addressbook/abCardOverlay.dtd
+++ b/suite/chrome/mailnews/addressbook/abCardOverlay.dtd
@@ -26,16 +26,18 @@
 <!ENTITY NameField1.label               "Nom:">
 <!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 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:">
--- a/suite/chrome/mailnews/addressbook/abMainWindow.dtd
+++ b/suite/chrome/mailnews/addressbook/abMainWindow.dtd
@@ -42,20 +42,22 @@
 <!ENTITY propertiesCmd.label                            "Propietats…">
 <!-- LOCALIZATION NOTE (propertiesCmd.accesskey) : DONT_TRANSLATE -->  
 <!ENTITY propertiesCmd.accesskey                        "i">  
 <!ENTITY propertiesCmd.key                              "i">  
 <!-- View Menu -->
 
 <!ENTITY showAbToolbarCmd.label                         "Barra d'eines de la llibreta d'adreces"> 
 <!ENTITY showAbToolbarCmd.accesskey                     "r">  
-
-<!ENTITY showCardPane.label                             "Quadre resum del contacte">
-<!ENTITY showCardPane.accesskey                         "Q">
-  
+<!ENTITY layoutMenu.label                               "Disposició">
+<!ENTITY layoutMenu.accesskey                           "s">
+<!ENTITY showDirectoryPane.label                        "Directoris">
+<!ENTITY showDirectoryPane.accesskey                    "D">
+<!ENTITY showContactPane2.label                         "Contactes">
+<!ENTITY showContactPane2.accesskey                     "C">
 <!ENTITY menu_ShowNameAs.label                          "Mostra el nom com a"> 
 <!ENTITY menu_ShowNameAs.accesskey                      "n"> 
 <!ENTITY firstLastCmd.label                             "Nom Cognom">  
 <!ENTITY firstLastCmd.accesskey                         "N"> 
 <!ENTITY lastFirstCmd.label                             "Cognom, Nom">  
 <!ENTITY lastFirstCmd.accesskey                         "C"> 
 <!ENTITY displayNameCmd.label                           "Nom a mostrar">  
 <!ENTITY displayNameCmd.accesskey                       "m"> 
@@ -90,15 +92,29 @@
 <!ENTITY newmsgButton.tooltip                           "Envia un missatge de correu"> 
 <!ENTITY newIM.tooltip                                  "Envia un missatge instantani o xat"> 
 <!ENTITY deleteItemButton.tooltip                       "Suprimeix l'element seleccionat">
 <!ENTITY throbber.tooltip                               "Va a la pàgina principal del &vendorShortName;">
 <!ENTITY advancedButton.tooltip                         "Cerca avançada d'adreces">
 <!-- Dir Tree header -->
 
 <!ENTITY dirTreeHeader.label                            "Llibretes d'adreces">
+<!-- Card Summary Pane -->
+<!-- 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                              "Aconsegueix el mapa">
+<!ENTITY mapIt.tooltip                                  "Mostra un mapa d'aquesta adreça del web">
 <!-- Status Bar -->  
 
 <!ENTITY statusText.label                               "">
 <!-- LOCALIZATION NOTE (hideSwapFnLnUI) : DONT_TRANSLATE -->
 <!-- Swap FN/LN UI  Set to "false" to show swap fn/ln UI -->
 
 <!ENTITY  hideSwapFnLnUI                                "true">
--- a/suite/chrome/mailnews/addressbook/addressBook.properties
+++ b/suite/chrome/mailnews/addressbook/addressBook.properties
@@ -68,17 +68,17 @@ dateformat=%e %B
 cityAndStateAndZip=%1$S, %2$S %3$S
 ## LOCALIZATION NOTE (cityAndStateNoZip): 
 ## %1$S is city, %2$S is state
 cityAndStateNoZip=%1$S, %2$S
 ## LOCALIZATION NOTE (cityOrStateAndZip): 
 ## %1$S is city or state, %2$S is zip
 cityOrStateAndZip=%1$S %2$S
 
-stateZipSeparator= 
+stateZipSeparator=
 
 prefixTo=A
 prefixCc=Cc
 prefixBcc=Cco
 emptyEmailAddCard=No podeu afegir un contacte que no tingui una adreça de correu primària
 emptyEmailAddCardTitle=No es pot afegir el contacte
 addressBook=Llibreta d'adreces
 
--- a/suite/chrome/mailnews/compose/messengercompose.dtd
+++ b/suite/chrome/mailnews/compose/messengercompose.dtd
@@ -78,16 +78,19 @@
 <!ENTITY normalPriorityCmd.accesskey "N">
 <!ENTITY highPriorityCmd.label "Alta">
 <!ENTITY highPriorityCmd.accesskey "A">
 <!ENTITY highestPriorityCmd.label "Màxima">
 <!ENTITY highestPriorityCmd.accesskey "x">
 
 <!ENTITY returnReceiptMenu.label "Confirmació de recepció">
 <!ENTITY returnReceiptMenu.accesskey "r">
+<!ENTITY dsnMenu.label "Notificació d'estat de lliurament">
+<!ENTITY dsnMenu.accesskey "N">
+
 <!ENTITY outputFormatMenu.label "Format">
 <!ENTITY outputFormatMenu.accesskey  "F">
 <!ENTITY autoFormatCmd.label "Detecció automàtica">
 <!ENTITY autoFormatCmd.accesskey "a">
 <!ENTITY plainTextFormatCmd.label "Només text net">
 <!ENTITY plainTextFormatCmd.accesskey "t">
 <!ENTITY htmlFormatCmd.label "Només text enriquit (HTML)">
 <!ENTITY htmlFormatCmd.accesskey "r">
--- a/suite/chrome/mailnews/imapMsgs.properties
+++ b/suite/chrome/mailnews/imapMsgs.properties
@@ -182,17 +182,17 @@ 5047=Introduïu la contrasenya per a %S:
 
 ## @name IMAP_SERVER_NOT_IMAP4
 ## @loc None
 # LOCALIZATION NOTE (Error 5048): Do not translate the word "IMAP4" below.
 5048=El servidor de correu %S no és IMAP4.
 
 ## @name IMAP_DONE
 ## @loc None
-5050= 
+5050=
 
 ## @name IMAP_ENTER_PASSWORD_PROMPT_TITLE
 ## @loc None
 5051=Cal una contrasenya per al servidor de correu
 
 ## @name IMAP_UNKNOWN_HOST_ERROR
 ## @loc None
 5052=No s'ha pogut connectar amb el servidor %S.
--- a/suite/chrome/mailnews/importDialog.dtd
+++ b/suite/chrome/mailnews/importDialog.dtd
@@ -3,17 +3,17 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY importDialog.windowTitle "Importa">
 <!ENTITY importAll.label          "Importa-ho tot">
 <!ENTITY importAll.accesskey      "t">
 <!ENTITY importMail.label         "Correu">
 <!ENTITY importMail.accesskey     "C">
 <!ENTITY importFeeds.label        "Subscripcions al canal de notícies">
-<!ENTITY importFeeds.accesskey    "s">
+<!ENTITY importFeeds.accesskey    "S">
 <!ENTITY importAddressbook.label  "Llibretes d'adreces">
 <!ENTITY importAddressbook.accesskey "a">
 <!ENTITY importSettings.label     "Paràmetres">
 <!ENTITY importSettings.accesskey "P">
 <!ENTITY importFilters.label      "Filtres">
 <!ENTITY importFilters.accesskey  "F">
 
 <!ENTITY  window.width            "45em">
--- a/suite/chrome/mailnews/junkLog.dtd
+++ b/suite/chrome/mailnews/junkLog.dtd
@@ -1,10 +1,10 @@
 <!-- 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 junkLog.title "Registre de correu brossa">
-<!ENTITY junkLogInfo.label "Registre de l'activitat de control del correu brossa.">
+<!ENTITY adaptiveJunkLog.title "Registre de correu brossa adaptatiu">
+<!ENTITY adaptiveJunkLogInfo.label "Registre de l'activitat de control de correu brossa adaptatiu.">
 <!ENTITY clearLog.label "Buida el registre">
 <!ENTITY clearLog.accesskey "B">
 <!ENTITY closeLog.label "Tanca">
 <!ENTITY closeLog.accesskey "c">
--- a/suite/chrome/mailnews/messenger.dtd
+++ b/suite/chrome/mailnews/messenger.dtd
@@ -535,11 +535,12 @@
 <!ENTITY remoteContentMessage.label "Per protegir la vostra privadesa, el &brandShortName; ha blocat el contingut remot d'aquest missatge.">
 <!ENTITY loadRemoteContentButton.label "Mostra el contingut remot">
 <!-- Phishing Bar -->
 
 <!ENTITY phishingBarMessage.label "El &brandShortName; pensa que Aquest missatge podria ser fraudulent.">
 <!ENTITY removePhishingBarButton.label "No és cap missatge fraudulent">
 <!-- MDN Bar -->
 
-<!ENTITY mdnBarMessage.label "El remitent d'aquest missatge ha demanat que se li enviï una notificació quan hàgiu llegit aquest missatge. Voleu que se li enviï la notificació?">
 <!ENTITY mdnBarIgnoreButton.label "Ignora la sol·licitud">
+<!ENTITY mdnBarIgnoreButton.accesskey "l">
 <!ENTITY mdnBarSendButton.label "Envia la notificació">
+<!ENTITY mdnBarSendButton.accesskey "v">
--- a/suite/chrome/mailnews/messenger.properties
+++ b/suite/chrome/mailnews/messenger.properties
@@ -125,17 +125,17 @@ serverType-none=Emmagatzematge local del
 serverType-movemail=Unix Movemail
 
 sizeColumnTooltip=Feu un clic per ordenar per mida
 sizeColumnHeader=Mida
 linesColumnTooltip=Feu clic per ordenar per línies
 linesColumnHeader=Línies
 
 # status feedback stuff
-documentDone= 
+documentDone=
 documentLoading=S'està carregant el document…
 
 unreadMsgStatus=Per llegir: %S
 selectedMsgStatus=Seleccionats: %S
 totalMsgStatus=Total: %S
 
 # localized folder names
 
@@ -374,16 +374,21 @@ errorOpenMessageForMessageIdMessage=No s
 confirmPhishingTitle=Alerta de correu fraudulent
 #LOCALIZATION NOTE %1$S is the brand name, %2$S is the host name of the url being visited
 confirmPhishingUrl1=El %1$S creu que aquest missatge és fraudulent. Podria estar intentant suplantar la pàgina web que voleu visitar. La majoria de llocs legítims utilitzen nomes en comptes de números. Esteu segur que voleu visitar %2$S?
 confirmPhishingUrl2=El %1$S creu que aquest missatge és fraudulent. Podria estar intentant suplantar la pàgina web que voleu visitar. Esteu segur que voleu visitar %2$S?
 
 #LOCALIZATION NOTE %1$S is the e-mail address of the person we will allow remote content for
 alwaysLoadRemoteContentForSender=Feu clic aquí per carregar sempre el contingut remot de %1$S.
 
+#LOCALIZATION NOTE(mdnBarMessageNormal) %1$S is the name of the sender
+mdnBarMessageNormal=El remitent d'aquest missatge (%1$S) ha sol·licitat ser notificat quan llegiu aquest missatge.
+#LOCALIZATION NOTE(mdnBarMessageAddressDiffers) %1$S is the name of the sender, %2$S is the address(es) to send return receipt to
+mdnBarMessageAddressDiffers=El remitent d'aquest missatge (%1$S) ha sol·licitat ser notificat a %2$S quan llegiu aquest missatge.
+
 # Strings for growl notifications on Mac OS X
 growlNotification=Correu nou
 
 # mailCommands.js
 emptyJunkTitle=Confirmació
 emptyJunkMessage=Esteu segur que voleu suprimir permanentment tots els missatges i subcarpetes de la carpeta del correu brossa?
 emptyJunkDontAsk=No m'ho tornis a demanar.
 emptyTrashTitle=Confirmació
--- a/suite/chrome/mailnews/msgHdrViewPopup.dtd
+++ b/suite/chrome/mailnews/msgHdrViewPopup.dtd
@@ -1,15 +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/. -->
 <!-- Message Header View Popup -->
 
 <!ENTITY AddToAddressBook.label            "Afegeix a la llibreta d'adreces…">
 <!ENTITY AddToAddressBook.accesskey        "b">
+<!ENTITY EditContact.label                 "Edita el contacte…">
+<!ENTITY EditContact.accesskey             "E">
+<!ENTITY ViewContact.label                 "Mostra el contacte">
+<!ENTITY ViewContact.accesskey             "M">
 <!ENTITY SendMailTo.label                  "Redacta un missatge per a…">
 <!ENTITY SendMailTo.accesskey              "s">
 <!ENTITY CopyEmailAddress.label            "Copia l'adreça electrònica">
 <!ENTITY CopyEmailAddress.accesskey        "C">
 <!ENTITY CreateFilterFrom.label            "Crea un filtre de…">
 <!ENTITY CreateFilterFrom.accesskey        "f">
 <!ENTITY openInBrowser.label               "Obre en el navegador">
 <!ENTITY openInBrowser.accesskey           "O">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/mailnews/pgpmime.properties
@@ -0,0 +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/.
+
+#
+# The following are used by the pgpmime content type handler
+#
+
+# LOCALIZATION NOTE(pgpMimeNeedsAddon): The text can contain HTML tags.
+# %S is the url to Enigmail on AMO supplied from preferences.
+pgpMimeNeedsAddon=Això és un missatge OpenPGP xifrat.<br>Per desxifrar aquest missatge cal que instal·leu un <a href="%S">complement OpenPGP</a>.
+
+
--- a/suite/chrome/mailnews/pref/am-server-advanced.dtd
+++ b/suite/chrome/mailnews/pref/am-server-advanced.dtd
@@ -1,16 +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/. -->
 
 <!ENTITY serverAdvanced.label "Paràmetres avançats del compte">
 <!-- LOCALIZATION NOTE (serverDirectory.label): DONT_TRANSLATE "IMAP" -->
 <!ENTITY serverDirectory.label "IMAP server directory:">
-<!ENTITY serverDirectory.accesskey "p">
+<!ENTITY serverDirectory.accesskey "d">
 <!ENTITY usingSubscription.label "Mostra només les carpetes subscrites">
 <!ENTITY usingSubscription.accesskey "o">
 <!ENTITY dualUseFolders.label "El servidor permet l'ús de carpetes que contenen subcarpetes i missatges">
 <!ENTITY dualUseFolders.accesskey "v">
 <!ENTITY useIdle.label "Utilitza l'ordre IDLE si ho permet el servidor">
 <!ENTITY useIdle.accesskey "I">
 <!ENTITY maximumConnectionsNumber.label "Nombre màxim de connexions del servidor per posar a la memòria cau">
 <!ENTITY maximumConnectionsNumber.accesskey "m">
--- a/suite/chrome/mailnews/pref/pref-offline.dtd
+++ b/suite/chrome/mailnews/pref/pref-offline.dtd
@@ -28,11 +28,11 @@
 <!ENTITY radioNotDownload.accesskey       "o">
 <!ENTITY radioAskDownload                 "Demana'm si els vull baixar">
 <!ENTITY radioAskDownload.accesskey       "i">
 <!ENTITY mailConnections.caption          "Connexions del correu">
 <!ENTITY mailnewsTimeout.label            "Temps màxim de connexió:">
 <!ENTITY mailnewsTimeout.accesskey        "m">
 <!ENTITY mailnewsTimeoutSeconds.label     "segons">
 <!ENTITY Diskspace                        "Espai de disc">
-<!ENTITY offlineCompact.label             "Compacta les carpetes quan s'estalviïn més de">
-<!ENTITY offlineCompact.accesskey         "C">
-<!ENTITY mb.label                         "MB">
+<!ENTITY offlineCompactFolders.label      "Compacta totes les carpetes quan es desarà">
+<!ENTITY offlineCompactFolders.accesskey  "C">
+<!ENTITY offlineCompactFoldersMB.label    "MB en total">
--- a/toolkit/chrome/global-platform/mac/platformKeys.properties
+++ b/toolkit/chrome/global-platform/mac/platformKeys.properties
@@ -14,9 +14,9 @@ VK_META=⌘
 
 #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/aboutSupport.dtd
+++ b/toolkit/chrome/global/aboutSupport.dtd
@@ -43,14 +43,18 @@ variant of aboutSupport.showDir.label. -
 <!ENTITY aboutSupport.modifiedPrefsName "Nom">
 <!ENTITY aboutSupport.modifiedPrefsValue "Valor">
 
 <!ENTITY aboutSupport.graphicsTitle "Gràfics">
 
 <!ENTITY aboutSupport.jsTitle "JavaScript">
 <!ENTITY aboutSupport.jsIncrementalGC "Context Gràfic (GC) incremental">
 
+<!ENTITY aboutSupport.a11yTitle "Accessibilitat">
+<!ENTITY aboutSupport.a11yActivated "Activat">
+<!ENTITY aboutSupport.a11yForceDisabled "Evita l'accessibilitat">
+
 <!ENTITY aboutSupport.libraryVersionsTitle "Versions de la llibreria">
 
 <!ENTITY aboutSupport.installationHistoryTitle "Historial d'instal·lació">
 <!ENTITY aboutSupport.updateHistoryTitle "Historial d'actualització">
 
 <!ENTITY aboutSupport.copyToClipboard.label "Copia-ho tot al porta-retalls">
--- a/toolkit/chrome/global/console.dtd
+++ b/toolkit/chrome/global/console.dtd
@@ -17,16 +17,18 @@
 <!ENTITY messages.label     "Missatges">
 <!ENTITY messages.accesskey "M">
 <!ENTITY clear.label        "Esborra">
 <!ENTITY clear.accesskey    "E">
 <!ENTITY codeEval.label     "Codi:">
 <!ENTITY codeEval.accesskey "o">
 <!ENTITY evaluate.label     "Avalua">
 <!ENTITY evaluate.accesskey "v">
+<!ENTITY filter.label       "Filtre">
+<!ENTITY filter.accesskey   "F">
 
 <!ENTITY copyCmd.label       "Copia">  
 <!ENTITY copyCmd.accesskey   "C"> 
 <!ENTITY copyCmd.commandkey  "C"> 
 <!ENTITY sortFirst.label     "Ordre: del primer a l'últim">
 <!ENTITY sortFirst.accesskey "p">
 <!ENTITY sortLast.label      "Ordre: de l'últim al primer">
 <!ENTITY sortLast.accesskey  "l">
--- a/toolkit/chrome/global/dialog.properties
+++ b/toolkit/chrome/global/dialog.properties
@@ -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/.
 
 button-accept=D'acord
 button-cancel=Cancel·la
 button-help=Ajuda
 button-disclosure=Més informació
-accesskey-accept= 
-accesskey-cancel= 
+accesskey-accept=
+accesskey-cancel=
 accesskey-help=j
 accesskey-disclosure=i
--- a/toolkit/chrome/global/dialogOverlay.dtd
+++ b/toolkit/chrome/global/dialogOverlay.dtd
@@ -1,13 +1,10 @@
-<!-- -*- Mode: HTML -*-
-# 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/.
-#
-# WARNING!!! This file is obsoleted by the dialog.xml widget
-#
--->
+<!-- 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/. -->
+<!-- WARNING!!! This file is obsoleted by the dialog.xml widget -->
 <!-- OK Cancel Buttons -->
 
+
 <!ENTITY okButton.label      "D'acord">
 <!ENTITY cancelButton.label  "Cancel·la">
 <!ENTITY helpButton.label    "Ajuda">
--- a/toolkit/chrome/global/filepicker.properties
+++ b/toolkit/chrome/global/filepicker.properties
@@ -23,17 +23,17 @@ openButtonLabel=Obre
 saveButtonLabel=Desa
 selectFolderButtonLabel=Seleccioneu
 noButtonLabel=No
 formatLabel=Format:
 
 errorOpenFileDoesntExistTitle=S'ha produït un error en obrir %S
 errorOpenFileDoesntExistMessage=El fitxer %S no existeix
 errorDirDoesntExistTitle=S'ha produït un error en accedir a %S
-errorDirDoesntExistMessage=El directori %S no existeix\t
+errorDirDoesntExistMessage=El directori %S no existeix
 
 errorOpeningFileTitle=S'ha produït un error en obrir %S
 openWithoutPermissionMessage_file=No es pot llegir el fitxer %S
 
 errorSavingFileTitle=S'ha produït un error en desar %S
 saveParentIsFileMessage=%S és un fitxer, no es pot desar %S
 saveParentDoesntExistMessage=El camí %S no existeix, no es pot desar %S
 
--- a/toolkit/chrome/global/intl.properties
+++ b/toolkit/chrome/global/intl.properties
@@ -1,36 +1,68 @@
 # 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/.
 
-# all.js
+# LOCALIZATION NOTE (general.useragent.locale):
+# This is the valid BCP 47 language tag representing your locale.
+#
+# In most cases, this will simply be your locale code. However, in rare cases
+# (such as 'jp-JP-mac'), you may need to modify your locale code in order to
+# make it a valid BCP 47 language tag. (If your locale code does not include a
+# region subtag, do not include one in the language tag representing your
+# locale.)
+general.useragent.locale=ca
+
+# LOCALIZATION NOTE (intl.accept_languages):
+# This is a comma-separated list of valid BCP 47 language tags.
+#
+# Begin with the value of 'general.useragent.locale'. Next, include language
+# tags for other languages that you expect most users of your locale to be
+# able to speak, so that their browsing experience degrades gracefully if
+# content is not available in their primary language.
+#
+# It is recommended that you include "en-US, en" at the end of the list as a
+# last resort. However, if you know that users of your locale would prefer a
+# different variety of English, or if they are not likely to understand
+# English at all, you may opt to include a different English language tag, or
+# to exclude English altogether.
 #
-# Localization Note: Cases of charset names must be preserved. If you're 
-# adding charsets to your localized version, please refer to 
-# intl/uconv/src/charsetalias.properties file for the list of canonical 
-# charset names and use canonical names exactly as listed there.
-# Also note that "UTF-8" should always be included in intl.charsetmenu.browser.static
-general.useragent.locale=ca
+# For example, the Breton [br] locale might consider including French and
+# British English in their list, since those languages are commonly spoken in
+# the same area as Breton:
+# intl.accept_languages=br, fr-FR, fr, en-GB, en
+intl.accept_languages=ca, en-us, en
+
+# LOCALIZATION NOTE (font.language.group):
+# This preference controls the initial setting of the language drop-down menu
+# in the Content > Fonts & Colors > Advanced preference panel.
+#
+# Set it to the value of one of the menuitems in the "selectLangs" menulist in
+# http://mxr.mozilla.org/mozilla/source/browser/components/preferences/fonts.xul
+font.language.group=x-western
+
+# LOCALIZATION NOTE (intl.charset.detector, intl.charset.default, intl.charsetmenu.browser.static, intl.charsetmenu.mailedit):
+# For the list of canonical charset values, refer to:
+# http://mxr.mozilla.org/mozilla-central/source/intl/locale/src/charsetalias.properties
+#
+# If you are modifying the charset preferences for your locale, be sure to use
+# the values from that list, not the keys. Note that these values are
+# case-sensitive and must be reproduced exactly as listed.
+#
+# Note also that the list of charsets in 'intl.charsetmenu.browser.static'
+# must always include "UTF-8".
+intl.charset.detector=
+intl.charset.default=ISO-8859-1
+intl.charsetmenu.browser.static=ISO-8859-1, UTF-8
+intl.charsetmenu.mailedit=ISO-8859-1, ISO-8859-15, ISO-8859-6, armscii-8, geostd8, ISO-8859-13, ISO-8859-14, ISO-8859-2, GB2312, GB18030, Big5, KOI8-R, windows-1251, KOI8-U, ISO-8859-7, ISO-8859-8-I, windows-1255, ISO-2022-JP, EUC-KR, ISO-8859-10, ISO-8859-3, TIS-620, ISO-8859-9, UTF-8, VISCII
 
 # LOCALIZATION NOTE (pluralRule): Pick the appropriate plural rule for your
 # language. This will determine how many plural forms of a word you will need
 # to provide and in what order.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 pluralRule=1
 
-# Localization Note: font.language.group controls the initial setting of the
-# language drop-down in the fonts pref panel. Set it to the value of one of the
-# menuitems in the "selectLangs" menulist in
-# browser/components/preferences/fonts.xul
-font.language.group=x-western
-# Localization Note: Add the code for your language at the front of this entry,
-# leaving "en-us, en" for fallback. It's recommended to use the same form, e.g.
-# "ja-jp, ja, en-us, en"
-intl.accept_languages=ca, en-us, en
-intl.charsetmenu.browser.static=ISO-8859-1, UTF-8
-intl.charset.default=ISO-8859-1
-intl.charset.detector= 
-intl.charsetmenu.mailedit=ISO-8859-1, ISO-8859-15, ISO-8859-6, armscii-8, geostd8, ISO-8859-13, ISO-8859-14, ISO-8859-2, GB2312, GB18030, Big5, KOI8-R, windows-1251, KOI8-U, ISO-8859-7, ISO-8859-8-I, windows-1255, ISO-2022-JP, EUC-KR, ISO-8859-10, ISO-8859-3, TIS-620, ISO-8859-9, UTF-8, VISCII
-# valid intl.menuitems.appendedacceskeys are: true or false, <empty string> (missing or empty preference equals false)
-intl.menuitems.alwaysappendaccesskeys= 
-# valid intl.menuitems.insertseparatorbeforeaccesskeys are: true or false, <empty string> (missing or empty preference equals false)
+# LOCALIZATION NOTE (intl.menuitems.alwaysappendaccesskeys, intl.menuitems.insertseparatorbeforeaccesskeys):
+# Valid values are: true, false, <empty string>
+# Missing preference or empty value equals false.
+intl.menuitems.alwaysappendaccesskeys=
 intl.menuitems.insertseparatorbeforeaccesskeys=true
--- a/toolkit/chrome/mozapps/downloads/settingsChange.dtd
+++ b/toolkit/chrome/mozapps/downloads/settingsChange.dtd
@@ -1,8 +1,6 @@
-<!-- -*- 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/.
--->
+<!-- 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 a les preferències del &brandShortName;.">
 <!ENTITY  settingsChangeOptions.label      "Els paràmetres de configuració poden canviar-se a les opcions del &brandShortName;.">
--- a/toolkit/chrome/mozapps/downloads/unknownContentType.dtd
+++ b/toolkit/chrome/mozapps/downloads/unknownContentType.dtd
@@ -1,15 +1,13 @@
-<!-- -*- 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/.
--->
+<!-- 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  intro.label                 "Heu triat obrir">
+<!ENTITY  intro2.label                "Heu triat obrir:">
 <!ENTITY  from.label                  "des de:">
 <!ENTITY  actionQuestion.label        "Què hauria de fer el &brandShortName; amb aquest fitxer?">
 
 <!ENTITY  openWith.label              "Obre amb">
 <!ENTITY  openWith.accesskey          "O">
 <!ENTITY  other.label                 "Altres…">
 
 <!ENTITY  saveFile.label              "Desa el fitxer">
--- a/toolkit/chrome/mozapps/plugins/plugins.dtd
+++ b/toolkit/chrome/mozapps/plugins/plugins.dtd
@@ -14,31 +14,33 @@
 
 <!ENTITY pluginWizard.installPluginsPage.title               "S'estan instal·lant els connectors">
 <!ENTITY pluginWizard.installPluginsPage.description.label   "El &brandShortName; està instal·lant els connectors…">
 
 <!ENTITY pluginWizard.finalPage.description.label            "El &brandShortName; ha acabat d'instal·lar els connectors que hi mancaven:">
 
 <!ENTITY pluginWizard.finalPage.moreInfo.label               "Informeu-vos sobre els connectors o cerqueu manualment els connectors que hi manquen.">
 <!ENTITY pluginWizard.finalPage.restart.label                "Cal que es reiniciï el &brandShortName; per a que els connectors funcionin.">
-
 <!-- LOCALIZATION NOTE (unsupportedPlatform.pre): Mobile only. Flash (the only plugin available on mobile)
      is not supported on some devices. Include a trailing space as needed. -->
-<!ENTITY unsupportedPlatform.pre                             "Ho sentim, però el &brandShortName; no pot reproduir Flash en aquest dispositiu. ">
+
+<!ENTITY unsupportedPlatform.pre                             "Ho sentim, però el &brandShortName; no pot reproduir contingut Flash en aquest dispositiu. ">
 <!-- LOCALIZATION NOTE (unsupportedPlatform.learnMore): Mobile only. This text is used to link to a SUMO page explaining why Flash is not
      supported on this device. Use the unicode ellipsis char, \u2026, or use "..." if \u2026 doesn't suit traditions in your locale. -->
 <!ENTITY unsupportedPlatform.learnMore                       "Més informació…">
 <!-- LOCALIZATION NOTE (unsupportedPlatform.post): Mobile only. Include text here if needed for your locale. -->
 <!ENTITY unsupportedPlatform.post                            "">
 
-
 <!ENTITY missingPlugin                                       "Cal un connector per mostrar aquest contingut.">
 <!-- LOCALIZATION NOTE (tapToPlayPlugin): Mobile (used for touch interfaces) only has one type of plugin possible. -->
 <!ENTITY tapToPlayPlugin                                     "Toqueu aquí per activar el connector.">
 <!ENTITY clickToPlayPlugin                                   "Toqueu aquí per activar el complement.">
+<!ENTITY clickToPlayPluginVulnerableUpdateAvailable          "Feu clic aquí per activar el connector vulnerable.">
+<!ENTITY clickToPlayPluginVulnerableNoUpdate                 "Feu clic aquí per activar el connector vulnerable (no n'hi ha cap actualització)">
+<!ENTITY checkForUpdates                                     "Comprova si hi ha actualitzacions…">
 <!ENTITY disabledPlugin                                      "S'ha inhabilitat el connector.">
 <!ENTITY blockedPlugin.label                                 "S'ha blocat aquest connector per la vostra protecció.">
 
 <!ENTITY installPlugin                                       "Instal·la un connector…">
 <!ENTITY managePlugins                                       "Gestiona els connectors…">
 <!-- LOCALIZATION NOTE (reloadPlugin.pre): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (reloadPlugin.middle): avoid leading/trailing spaces, this text is a link -->
 <!-- LOCALIZATION NOTE (reloadPlugin.post): include a starting space as needed -->
--- a/toolkit/chrome/mozapps/profile/profileSelection.properties
+++ b/toolkit/chrome/mozapps/profile/profileSelection.properties
@@ -1,18 +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/.
 
+# LOCALIZATION NOTE: These strings are used for startup/profile problems and the profile manager.
+
+# Application not responding
+# LOCALIZATION NOTE (restartTitle, restartMessageNoUnlocker, restartMessageUnlocker, restartMessageNoUnlockerMac, restartMessageUnlockerMac): Messages displayed when the application is running but is not responding to commands. %S is the application name.
 restartTitle=Tanca el %S
 restartMessageNoUnlocker=El %S ja s'està executant, però no està responent. Per obrir una nova finestra, primer heu de tancar el procés %S que ja existeix, o reiniciar el vostre sistema.
 restartMessageUnlocker=El %S ja s'està executant, però no està responent. El procés antic %S ha de tancar-se per obrir una nova finestra.
 restartMessageNoUnlockerMac=Ja s'està executant una còpia del %S. Només pot executar-se una còpia del %S cada vegada.
 restartMessageUnlockerMac=Ja s'està executant una còpia del %S. Se sortirà de la còpia del %S en execució per poder obrir aquesta.
 
+# Profile manager
+# LOCALIZATION NOTE (profileTooltip): First %S is the profile name, second %S is the path to the profile folder.
 profileTooltip=Perfil: «%S» - Camí: «%S»
 
 pleaseSelectTitle=Seleccioneu un perfil
 pleaseSelect=Seleccioneu un perfil per començar el %S, o creeu un nou perfil.
 
 profileLockedTitle=Perfil en ús
 profileLocked2=El %S no pot utilitzar el perfil «%S» perquè està utilitzant-se.\n\nPer continuar, tanqueu la instància de %S que s'està executant o trieu un perfil diferent.
 
@@ -35,9 +41,11 @@ profileCreationFailed=El perfil no ha po
 profileCreationFailedTitle=La creació del perfil ha fallat
 profileExists=Ja existeix un perfil amb aquest nom. Trieu un altre nom.
 profileExistsTitle=El perfil ja existeix
 profileFinishText=Feu clic a Finalitza per crear el nou perfil.
 profileFinishTextMac=Feu clic a Fet per crear el nou perfil.
 profileMissing=No es pot carregar el vostre perfil del %S. Potser no hi és o no és accessible.
 profileMissingTitle=Manca el perfil
 
+# Profile reset
+# LOCALIZATION NOTE (resetBackupDirectory): Directory name for the profile directory backup created during reset. This directory is placed in a location users will see it (ie. their desktop). %S is the application name.
 resetBackupDirectory=%S dades obsoletes
--- a/toolkit/chrome/passwordmgr/passwordManager.dtd
+++ b/toolkit/chrome/passwordmgr/passwordManager.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      savedPasswords.title            "Contrasenyes desades">
 <!ENTITY      savedPasswordsExceptions.title  "Excepcions - Contrasenyes desades">
 <!ENTITY      closebutton.label               "Tanca">
 <!ENTITY      closebutton.accesskey           "c">
 
 <!ENTITY      loginsSpielExceptions.label     "No es desaran les contrasenyes dels llocs següents:">
 
@@ -23,8 +21,10 @@
 <!ENTITY      filter.accesskey                "r">
 
 <!ENTITY      windowClose.key                 "w">
 <!ENTITY      focusSearch1.key                "f">
 <!ENTITY      focusSearch2.key                "k">
 
 <!ENTITY      copyPasswordCmd.label           "Copia la contrasenya">
 <!ENTITY      copyPasswordCmd.accesskey       "C">
+
+<!ENTITY      copyUsernameCmd.label           "Copia el nom d'usuari">