firefox and thunderbird ready for Catalan
authorEduard Gamonal <edu@eduard-gamonal.net>
Sat, 17 Nov 2012 18:19:57 -0500
changeset 1141 3b0b37ceb8b0edfe1320a5a4f520a75f95d5b9af
parent 1106 7f4b2d7f29cbc87a95386979eb7b7228eb144d5d
child 1142 34ef5a8e384a07d4dc36e1193e9da7d6accd958b
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:43:21 +0000
firefox and thunderbird ready for Catalan
browser/chrome/browser/aboutSyncTabs.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/responsiveUI.properties
browser/chrome/browser/devtools/scratchpad.dtd
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/webConsole.dtd
browser/chrome/browser/newTab.properties
browser/chrome/browser/preferences/aboutPermissions.dtd
browser/chrome/browser/preferences/main.dtd
browser/chrome/browser/preferences/sync.dtd
browser/chrome/browser/syncKey.dtd
browser/chrome/browser/syncSetup.dtd
browser/chrome/browser/syncSetup.properties
browser/defines.inc
browser/firefox-l10n.js
browser/pdfviewer/viewer.properties
browser/profile/bookmarks.inc
browser/profile/chrome/userChrome-example.css
browser/profile/chrome/userContent-example.css
calendar/chrome/lightning/lightning-toolbar.dtd
calendar/extra-jar.mn
calendar/lightning-l10n.js
calendar/sunbird-l10n.js
chat/irc.properties
chat/twitter.properties
chat/xmpp.properties
dom/chrome/dom/dom.properties
dom/chrome/security/csp.properties
editor/ui/chrome/composer/editorOverlay.dtd
extensions/irc/chrome/about.dtd
extensions/irc/chrome/browserOverlay.dtd
extensions/irc/chrome/ceip.dtd
extensions/irc/chrome/channels.dtd
extensions/irc/chrome/chatzilla.dtd
extensions/irc/chrome/chatzilla.properties
extensions/irc/chrome/chatzillaOverlay.dtd
extensions/irc/chrome/config.dtd
extensions/irc/chrome/install-plugin.dtd
extensions/irc/chrome/pref-irc.dtd
extensions/venkman/chrome/venkman-output-locale.css
extensions/venkman/chrome/venkman-overlay.dtd
extensions/venkman/chrome/venkman.dtd
extensions/venkman/chrome/venkman.properties
mail/all-l10n.js
mail/chrome/messenger/aboutDialog.dtd
mail/chrome/messenger/aboutRights.dtd
mail/chrome/messenger/accountCreation.properties
mail/chrome/messenger/am-addressing.dtd
mail/chrome/messenger/am-identities-list.dtd
mail/chrome/messenger/am-junk.dtd
mail/chrome/messenger/am-mdn.dtd
mail/chrome/messenger/filter.properties
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/messengercompose/messengercompose.dtd
mail/chrome/messenger/msgHdrViewOverlay.dtd
mail/chrome/messenger/preferences/preferences.properties
mail/chrome/messenger/prefs.properties
mobile/android/base/android_strings.dtd
mobile/android/base/sync_strings.dtd
mobile/android/chrome/about.dtd
mobile/android/chrome/aboutApps.dtd
mobile/android/chrome/aboutDownloads.properties
mobile/android/chrome/browser.properties
mobile/android/defines.inc
mobile/android/mobile-l10n.js
mobile/profile/bookmarks.inc
mobile/xul/chrome/about.dtd
mobile/xul/defines.inc
mobile/xul/mobile-l10n.js
other-licenses/branding/sunbird/brand.dtd
other-licenses/branding/sunbird/brand.properties
other-licenses/branding/thunderbird/brand.dtd
other-licenses/branding/thunderbird/brand.properties
security/manager/chrome/pipnss/pipnss.properties
services/sync/sync.properties
suite/chrome/branding/aboutRights.dtd
suite/chrome/common/consoleOverlay.dtd
suite/chrome/common/help/certs_help.xhtml
suite/chrome/common/help/certs_prefs_help.xhtml
suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
suite/chrome/common/help/cs_priv_prefs_popup.xhtml
suite/chrome/common/help/customize_help.xhtml
suite/chrome/common/help/developer_tools.xhtml
suite/chrome/common/help/forieusers.xhtml
suite/chrome/common/help/glossary.xhtml
suite/chrome/common/help/help-glossary.rdf
suite/chrome/common/help/help-index1.rdf
suite/chrome/common/help/help-indexAZ.rdf
suite/chrome/common/help/help-win.rdf
suite/chrome/common/help/helpFileLayout.css
suite/chrome/common/help/help_help.xhtml
suite/chrome/common/help/mailnews_account_settings.xhtml
suite/chrome/common/help/mailnews_addressbooks.xhtml
suite/chrome/common/help/mailnews_blogs_and_feeds.xhtml
suite/chrome/common/help/mailnews_getting_started.xhtml
suite/chrome/common/help/mailnews_newsgroups.xhtml
suite/chrome/common/help/mailnews_offline.xhtml
suite/chrome/common/help/mailnews_organizing.xhtml
suite/chrome/common/help/mailnews_preferences.xhtml
suite/chrome/common/help/mailnews_security.xhtml
suite/chrome/common/help/mailnews_using_mail.xhtml
suite/chrome/common/help/nav_help.xhtml
suite/chrome/common/help/passwords_help.xhtml
suite/chrome/common/help/privacy_help.xhtml
suite/chrome/common/help/privsec_help.xhtml
suite/chrome/common/help/profiles_help.xhtml
suite/chrome/common/help/shortcuts.xhtml
suite/chrome/common/help/shortcuts_composer.xhtml
suite/chrome/common/help/shortcuts_mailnews.xhtml
suite/chrome/common/help/shortcuts_navigator.xhtml
suite/chrome/common/help/ssl_help.xhtml
suite/chrome/common/help/suite-toc.rdf
suite/chrome/common/help/suitehelp.rdf
suite/chrome/common/help/using_priv_help.xhtml
suite/chrome/common/help/validation_help.xhtml
suite/chrome/common/help/welcome_help.xhtml
suite/chrome/common/pref/pref-fonts.dtd
suite/chrome/common/pref/pref-mousewheel.dtd
suite/chrome/common/pref/pref-navigator.dtd
suite/chrome/common/pref/pref-offlineapps.dtd
suite/chrome/common/sync/syncSetup.properties
suite/chrome/mailnews/filter.properties
suite/chrome/mailnews/messenger.properties
suite/chrome/mailnews/pref/am-addressing.dtd
suite/chrome/mailnews/pref/am-identities-list.dtd
suite/chrome/mailnews/pref/am-junk.dtd
suite/chrome/mailnews/pref/am-mdn.dtd
suite/chrome/mailnews/pref/prefs.properties
suite/chrome/mailnews/start.dtd
suite/extra-jar.mn
suite/profile/chrome/userChrome-example.css
suite/profile/chrome/userContent-example.css
suite/suite-l10n.js
toolkit/chrome/global-platform/mac/platformKeys.properties
toolkit/chrome/global/about.dtd
toolkit/chrome/global/aboutRights.dtd
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/global/aboutSupport.properties
toolkit/chrome/global/dialog.properties
toolkit/chrome/global/intl.css
toolkit/chrome/global/intl.properties
toolkit/chrome/global/languageNames.properties
toolkit/chrome/global/notification.dtd
toolkit/chrome/mozapps/extensions/extensions.dtd
toolkit/chrome/mozapps/extensions/extensions.properties
toolkit/chrome/mozapps/help/help-toc.rdf
toolkit/chrome/mozapps/plugins/plugins.dtd
toolkit/chrome/mozapps/plugins/plugins.properties
toolkit/chrome/mozapps/update/updates.dtd
toolkit/chrome/mozapps/update/updates.properties
--- a/browser/chrome/browser/aboutSyncTabs.dtd
+++ b/browser/chrome/browser/aboutSyncTabs.dtd
@@ -1,14 +1,14 @@
 <!-- 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 (tabs.otherComputers.label): Keep this in sync with syncTabsMenu.label from browser.dtd -->
+<!-- LOCALIZATION NOTE (tabs.otherDevices.label): Keep this in sync with syncTabsMenu2.label from browser.dtd -->
 
-<!ENTITY tabs.otherComputers.label               "Pestanyes d'altres ordinadors">
+<!ENTITY tabs.otherDevices.label               "Pestanyes d'altres dispositius">
 
 <!ENTITY tabs.searchText.label                   "Escriviu aquí per cercar pestanyes…">
 <!-- LOCALIZATION NOTE (tabs.context.openTab.accesskey, tabs.context.openMultipleTabs.accesskey):
      Only one of these will show at a time (based on selection), so reusing accesskey is ok. -->
 
 <!ENTITY tabs.context.openTab.label                   "Obre aquesta pestanya">
 <!ENTITY tabs.context.openTab.accesskey               "O">
 <!ENTITY tabs.context.openMultipleTabs.label          "Obre les pestanyes seleccionades">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -17,26 +17,26 @@
 <!-- Tab context menu -->
 
 <!ENTITY  reloadTab.label                    "Torna a carregar la pestanya">
 <!ENTITY  reloadTab.accesskey                "r">
 <!ENTITY  reloadAllTabs.label                "Torna a carregar totes les pestanyes">
 <!ENTITY  reloadAllTabs.accesskey            "a">
 <!ENTITY  closeOtherTabs.label               "Tanca les altres pestanyes">
 <!ENTITY  closeOtherTabs.accesskey           "l">
-<!-- LOCALIZATION NOTE (pinAppTab.label, unpinAppTab.label): "Pin" is being
+<!-- LOCALIZATION NOTE (pinTab.label, unpinTab.label): "Pin" is being
 used as a metaphor for expressing the fact that these tabs are "pinned" to the
 left edge of the tabstrip. Really we just want the string to express the idea
 that this is a lightweight and reversible action that keeps your tab where you
 can reach it easily. -->
 
-<!ENTITY  pinAppTab.label                    "Clava com a pestanya d'aplicació">
-<!ENTITY  pinAppTab.accesskey                "v">
-<!ENTITY  unpinAppTab.label                  "Desclava la pestanya">
-<!ENTITY  unpinAppTab.accesskey              "D">
+<!ENTITY  pinTab.label                       "Fixa la pestanya">
+<!ENTITY  pinTab.accesskey                   "P">
+<!ENTITY  unpinTab.label                     "Allibera la pestanya">
+<!ENTITY  unpinTab.accesskey                 "b">
 <!ENTITY  moveToGroup.label                  "Mou al grup">
 <!ENTITY  moveToGroup.accesskey              "M">
 <!ENTITY  moveToNewGroup.label               "Grup nou">
 <!ENTITY  moveToNewWindow.label              "Mou a una finestra nova">
 <!ENTITY  moveToNewWindow.accesskey          "v">
 <!ENTITY  bookmarkAllTabs.label              "Afegeix totes les pestanyes a les adreces d'interès…">
 <!ENTITY  bookmarkAllTabs.accesskey          "t">
 <!ENTITY  undoCloseTab.label                 "Desfés el tancament de la pestanya">
@@ -230,27 +230,25 @@ These should match what Safari and other
   -  "simple discardable text editor". -->
 
 <!ENTITY scratchpad.label             "Bloc de proves">
 <!ENTITY scratchpad.accesskey         "s">
 <!ENTITY scratchpad.keycode           "VK_F4">
 <!ENTITY scratchpad.keytext           "F4">
 
 <!ENTITY inspectCloseButton.tooltiptext "Tanca l'Inspector">
+<!ENTITY inspectSidebarCloseButton.tooltiptext "Tanca la barra lateral">
 
 <!ENTITY devToolbarCloseButton.tooltiptext "Tanca la barra per a desenvolupadors">
 <!ENTITY devToolbarMenu.label              "Barra de tasques per a desenvolupadors">
 <!ENTITY devToolbarMenu.accesskey          "v">
 <!ENTITY devToolbar.keycode                "VK_F2">
 <!ENTITY devToolbar.keytext                "F2">
 <!ENTITY devToolbarOtherToolsButton.label  "Més eines">
 
-<!ENTITY webConsoleButton.label "Consola web">
-<!ENTITY inspectorButton.label "Inspector">
-
 <!ENTITY inspectorHTMLCopyInner.label       "Copia l'HTML interior">
 <!ENTITY inspectorHTMLCopyInner.accesskey   "i">
 
 <!ENTITY inspectorHTMLCopyOuter.label       "Copia l'HTML exterior">
 <!ENTITY inspectorHTMLCopyOuter.accesskey   "o">
 
 <!ENTITY inspectorHTMLDelete.label          "Suprimeix el node ">
 <!ENTITY inspectorHTMLDelete.accesskey      "d">
@@ -616,19 +614,19 @@ just addresses the organization to follo
 <!ENTITY identity.moreInfoLinkText "Més informació…">
 
 <!ENTITY downloadMonitor2.tooltip "Feu clic per obrir la finestra de baixades">
 
 <!ENTITY allTabs.filter.emptyText "Cerca les pestanyes">
 <!-- Name for the tabs toolbar as spoken by screen readers.
      The word "toolbar" is appended automatically and should not be contained below! -->
 <!ENTITY tabsToolbar.label "Pestanyes del navegador">
-<!-- LOCALIZATION NOTE (syncTabsMenu.label): This appears in the history menu -->
+<!-- LOCALIZATION NOTE (syncTabsMenu2.label): This appears in the history menu -->
 
-<!ENTITY syncTabsMenu.label     "Pestanyes d'altres ordinadors">
+<!ENTITY syncTabsMenu2.label     "Pestanyes d'altres dispositius">
 
 <!ENTITY syncBrand.shortName.label    "Sync">
 
 <!ENTITY syncSetup.label              "Configura el &syncBrand.shortName.label;…">
 <!ENTITY syncSetup.accesskey          "y">
 <!ENTITY syncSyncNowItem.label        "Sincronitza ara">
 <!ENTITY syncSyncNowItem.accesskey    "S">
 <!ENTITY syncToolbarButton.label      "Sincronització">
@@ -642,25 +640,20 @@ doesn't display any label, but exposes a
 
 <!ENTITY markupButton.arialabel          "Marcat">
 <!-- LOCALIZATION NOTE (markupButton.accesskey): The key bound to the Markup panel's
 toolbar button -->
 <!ENTITY markupButton.accesskey          "M">
 
 <!ENTITY socialToolbar.title        "Botó de barra social">
 <!ENTITY social.notLoggedIn.label   "No s'ha iniciat la sessió">
-<!-- LOCALIZATION NOTE (social.ok.label, social.ok.accesskey): this string is
-     used for the "OK" button for two different social panels. One appears when
-     the feature is activated (social.activated.* below), and the other when
-     the user clicks the "Share" button a second time (social.sharePopup.*
-     below). -->
 
 <!ENTITY social.ok.label       "D'acord">
-<!ENTITY social.ok.accesskey   "O">
+<!ENTITY social.ok.accesskey   "o">
 
 <!ENTITY social.toggleSidebar.label "Mostra la barra lateral">
 <!ENTITY social.toggleSidebar.accesskey "s">
 
-<!ENTITY social.toggleNotifications.label "Mostra les notificacions d\'escriptori">
+<!ENTITY social.toggleNotifications.label "Mostra les notificacions d'escriptori">
 <!ENTITY social.toggleNotifications.accesskey "n">
 
 <!ENTITY social.activated.undobutton.label "Desfés">
 <!ENTITY social.activated.undobutton.accesskey "D">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -43,18 +43,16 @@ addonDownloadCancelTooltip=Cancel·la
 # LOCALIZATION NOTE (addonsInstalled, addonsInstalledNeedsRestart):
 # Semi-colon list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 first add-on's name, #2 number of add-ons, #3 application name
 addonsInstalled=S'ha instal·lat #1 amb èxit.;#2 complements s'han instal·lat amb èxit.
 addonsInstalledNeedsRestart=S'instal·larà #1 després que reinicieu el #3.;S'instal·laran #2 complements després que reinicieu el #3.
 addonInstallRestartButton=Reinicia ara
 addonInstallRestartButton.accesskey=R
-addonInstallManage=Obre el gestor de complements
-addonInstallManage.accesskey=O
 
 # LOCALIZATION NOTE (addonError-1, addonError-2, addonError-3, addonError-4):
 # #1 is the add-on name, #2 is the host name, #3 is the application name
 # #4 is the application version
 addonError-1=No s'ha pogut baixar el complement perquè el #2 ha tingut un problema de connexió.
 addonError-2=No s'ha pogut instal·lar el complement de #2 perquè no coincideix amb el complement que esperava el #3.
 addonError-3=No s'ha pogut instal·lar el complement baixat de #2 perquè sembla que era defectuós.
 addonError-4=No s'ha pogut instal·lar #1 perquè el #3 no podia modificar el fitxer necessari.
@@ -115,31 +113,31 @@ crashedpluginsMessage.reloadButton.label=Torna a carregar la pàgina
 crashedpluginsMessage.reloadButton.accesskey=r
 crashedpluginsMessage.submitButton.label=Envia un informe de fallada
 crashedpluginsMessage.submitButton.accesskey=f
 crashedpluginsMessage.learnMore=Més informació…
 carbonFailurePluginsMessage.message=La pàgina demana utilitzar un connector que només pot executar-se en mode 32 bits
 carbonFailurePluginsMessage.restartButton.label=Reinicia en mode 32 bits
 carbonFailurePluginsMessage.restartButton.accesskey=R
 activatePluginsMessage.message=Voleu activar els complements en aquesta pàgina?
-activatePluginsMessage.label=Activa els complements
+activateAllPluginsMessage.label=Activa Tots els Connectors
 activatePluginsMessage.accesskey=A
 activatePluginsMessage.always=Activa sempre els complements per aquest lloc
 activatePluginsMessage.always.accesskey=s
 activatePluginsMessage.never=No activis mai els complements per aquest lloc
 activatePluginsMessage.never.accesskey=N
-activateSinglePlugin=Activa'l
+activateSinglePlugin=Activa
 PluginClickToPlay=Feu clic aquí per activar el connector %S.
 # LOCALIZATION NOTE - "vulnerable" indicates there is a security bug in the
 # plugin that is being exploited by attackers.
 PluginVulnerableUpdatable=Aquest connector és vulnerable i cal actualitzar-lo.
-PluginVulnerableNoUpdate=La seguretat d'aquest connector és vulnerable.
-vulnerableUpdatablePluginWarning=És una versió antiga.
-vulnerableNoUpdatePluginWarning=El connector és vulnerable.
-vulnerablePluginsMessage=S'han desactivat alguns connectors per seguretat.
+PluginVulnerableNoUpdate=S'ha informat que aquest connector comporta un risc de seguretat.
+vulnerableUpdatablePluginWarning=Versió obsoleta!
+vulnerableNoUpdatePluginWarning=Connector amb risc!
+vulnerablePluginsMessage=S'han deshabilitat els connectors que poden posar en perill el vostre ordinador.
 pluginInfo.unknownPlugin=Desconegut
 
 # Sanitize
 # LOCALIZATION NOTE (sanitizeDialog2.everything.title): When "Time range to
 # clear" is set to "Everything", the Clear Recent History dialog's title is
 # changed to this.  See UI mockup and comment 11 at bug 480169 -->
 sanitizeDialog2.everything.title=Neteja tot l'historial
 sanitizeButtonOK=Neteja-ho ara
@@ -345,16 +343,26 @@ browser.menu.showCharacterEncoding=false
 # the add bookmark star panel.  %S will be replaced by syncBrandShortName.
 # The final space separates this text from the Learn More link.
 syncPromoNotification.bookmarks.description=Podeu accedir a totes les adreces d'interès de tots els vostres dispositius amb el %S. 
 # LOCALIZATION NOTE (syncPromoNotification.passwords.label): This appears in
 # the remember password panel.  %S will be replaced by syncBrandShortName.
 # The final space separates this text from the Learn More link.
 syncPromoNotification.passwords.description=Podeu accedir a les contrasenyes de tots els vostres dispositius amb el %S. 
 syncPromoNotification.learnMoreLinkText=Més informació
+# LOCALIZATION NOTE (syncPromoNotification.addons.label): This appears in
+# the add-on install complete panel when Sync isn't set.
+# %S will be replaced by syncBrandShortName.
+# The final space separates this text from the Learn More link.
+syncPromoNotification.addons.description=Podeu accedir als complements de tots els vostres dispositius amb %S. 
+# LOCALIZATION NOTE (syncPromoNotification.addons-sync-disabled.label):
+# This appears in the add-on install complete panel when Sync is set
+# but addons sync is not. %S will be replaced by syncBrandShortName.
+# The final space separates this text from the Learn More link.
+syncPromoNotification.addons-sync-disabled.description=Podeu utilitzar el vostre compte %S per sincronitzar els complements dels diferents dispositius. 
 
 # Telemetry prompt
 # LOCALIZATION NOTE (telemetryOptInPrompt): %1$S will be replaced by
 # brandFullName, and %2$S by the value of the toolkit.telemetry.server_owner
 # preference.
 telemetryOptInPrompt = Voleu ajudar a millorar a %1$S enviant informació quant al rendiment, maquinari, ús i personalitzacions del %2$S?
 telemetryLinkLabel = Més informació
 telemetryYesButtonLabel2 = Sí, vull ajudar
@@ -363,19 +371,16 @@ telemetryNoButtonLabel = No
 telemetryNoButtonAccessKey = N
 
 # Webapps notification popup
 webapps.install = Instal·la
 webapps.install.accesskey = I
 #LOCALIZATION NOTE (webapps.requestInstall) %1$S is the web app name, %2$S is the site from which the web app is installed
 webapps.requestInstall = Voleu instal·lar «%1$S» des d'aquest lloc (%2$S)?
 webapps.install.success = S'ha instal·lat l'aplicació
-# LOCALIZATION NOTE (webapps.uninstall.notification): %S will be replaced with the name of the uninstalled web app
-webapps.uninstall.notification = S'ha desinstal·lat el %S de l'ordinador.
-webapps.uninstall.label = Desinstal·la l'applicació
 
 # Telemetry opt-out prompt for Aurora and Nightly
 # LOCALIZATION NOTE (telemetryOptOutPrompt): %1$S and %3$S will be replaced by
 # brandFullName, and %2$S by the value of the toolkit.telemetry.server_owner preference.
 telemetryOptOutPrompt = L'%1$S envia informació de rendiment, maquinari, ús i personalitzacions a %2$S per ajudar a millorar el %3$S.
 
 # LOCALIZATION NOTE (fullscreen.entered): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.entered=%S està ara a pantalla completa.
@@ -384,34 +389,57 @@ fullscreen.rememberDecision=Recorda aquesta preferència per a %S
 
 # LOCALIZATION NOTE (social.toggle.label): %1$S is the name of the social provider, %2$S is brandShortName (e.g. Firefox)
 social.toggle.label=%1$S per al %2$S
 social.toggle.accesskey=p
 
 # LOCALIZATION NOTE (social.activated.description): %1$S is the name of the social provider, %2$S is brandShortName (e.g. Firefox)
 social.activated.description=Heu activat %1$S per al %2$S.
 
+# LOCALIZATION NOTE (social.remove.label): %S = brandShortName
+social.remove.label=Elimina del %S
+social.remove.accesskey=E
+# LOCALIZATION NOTE (social.remove.confirmationLabel): %1$S is the name of the social provider, %2$S is brandShortName (e.g. Firefox)
+social.remove.confirmationLabel=Esteu segur que voleu eliminar el %1$S del %2$S?
+# LOCALIZATION NOTE (social.remove.confirmationOK): %S is the name of the social provider
+social.remove.confirmationOK=Elimina el %S
+
 # LOCALIZATION NOTE (social.error.message): %1$S is brandShortName (e.g. Firefox), %2$S is the name of the social provider
 social.error.message=%1$S no es pot connectar ara amb el %2$S.
 social.error.tryAgain.label=Torna a provar-ho
 social.error.tryAgain.accesskey=T
 social.error.ok.label=D'acord
 social.error.ok.accesskey=O
 social.error.closeSidebar.label=Tanca aquesta barra lateral
 social.error.closeSidebar.accesskey=C
 
 # Identity notifications popups
 identity.termsOfService = Termes del servei
 identity.privacyPolicy = Política de privadesa
+# LOCALIZATION NOTE (identity.chooseIdentity.description): %S is the website origin (e.g. https://www.mozilla.org) shown in popup notifications.
 identity.chooseIdentity.description = Inicia la sessió a %S
 identity.chooseIdentity.label = Utilitzeu una adreça electrònica existent
 identity.newIdentity.label = Utilitzeu una adreça electrònica diferent
 identity.newIdentity.accessKey = e
 identity.newIdentity.email.placeholder = Adreça electrònica
-# LOCALIZATION NOTE (identity.newIdentity.description, identity.chooseIdentity.description): %S is the website origin (ie. https://www.mozilla.org) shown in popup notifications.
+# LOCALIZATION NOTE (identity.newIdentity.description): %S is the website origin (e.g. https://www.mozilla.org) shown in popup notifications.
 identity.newIdentity.description = Introduïu la vostra adreça electrònica per iniciar una sessió a %S
 identity.next.label = Següent
 identity.next.accessKey = n
 # LOCALIZATION NOTE: shown in the popup notification when a user successfully logs into a website
-# LOCALIZATION NOTE (identity.loggedIn.description): %S is the website origin (ie. https://www.mozilla.org)
+# LOCALIZATION NOTE (identity.loggedIn.description): %S is the user's identity (e.g. user@example.com)
 identity.loggedIn.description = Sessió Iniciada com a: %S
 identity.loggedIn.signOut.label = Finalitza la sessió
 identity.loggedIn.signOut.accessKey = O
+
+# LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message, getUserMedia.shareCameraAndMicrophone.message): %S is the website origin (e.g. www.mozilla.org)
+# LOCALIZATION NOTE (getUserMedia.shareMicrophone.message, getUserMedia.shareSpecificMicrophone.label): %S is the website origin (e.g. www.mozilla.org)
+getUserMedia.shareCamera.message = Voleu compartir la vostra càmera amb %S?
+getUserMedia.shareCamera.label = Comparteix la càmera
+getUserMedia.shareCamera.accesskey = C
+getUserMedia.shareSpecificCamera.label = S'està compartint: %S
+getUserMedia.shareMicrophone.message = Voleu compartir el micròfon amb %S?
+getUserMedia.shareMicrophone.label = Comparteix el micròfon
+getUserMedia.shareMicrophone.accesskey = M
+getUserMedia.shareSpecificMicrophone.label = S'està compartint: %S
+getUserMedia.shareCameraAndMicrophone.message = Voleu compartir la càmera i el micròfon amb %S?
+getUserMedia.shareCameraAndMicrophone.label = Comparteix-ho tot
+getUserMedia.shareCameraAndMicrophone.accesskey = T
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -8,63 +8,37 @@
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 <!-- LOCALIZATION NOTE (debuggerMenu.label): This is the label for the
   -  application menu item that opens the debugger UI. -->
 
 
 
-<!ENTITY debuggerMenu.label2          "Depurador">
+<!ENTITY debuggerMenu.label2            "Depurador">
+<!-- LOCALIZATION NOTE (debuggerMenu.accesskey): This is accesskey for the
+  -  Tools meny entry of Debugger that opens the debugger UI. -->
+
+<!ENTITY debuggerMenu.accesskey         "D">
 <!-- LOCALIZATION NOTE (remoteDebuggerMenu.label): This is the label for the
   -  application menu item that opens the remote debugger UI. -->
 
-<!ENTITY remoteDebuggerMenu.label    "Depurador remot">
+<!ENTITY remoteDebuggerMenu.label       "Depurador remot">
 <!-- LOCALIZATION NOTE (chromeDebuggerMenu.label): This is the label for the
   -  application menu item that opens the browser debugger UI. -->
 
-<!ENTITY chromeDebuggerMenu.label    "Depurador del navegador">
+<!ENTITY chromeDebuggerMenu.label       "Depurador del navegador">
 <!-- LOCALIZATION NOTE (debuggerMenu.commandkey): This is the command key that
   -  launches the debugger UI. Do not translate this one! -->
 
-<!ENTITY debuggerMenu.commandkey     "S">
+<!ENTITY debuggerMenu.commandkey        "S">
 <!-- LOCALIZATION NOTE (debuggerUI.closeButton.tooltip): This is the tooltip for
   -  the button that closes the debugger UI. -->
 
-<!ENTITY debuggerUI.closeButton.tooltip        "Tanca">
+<!ENTITY debuggerUI.closeButton.tooltip "Tanca">
 <!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
   -  checkbox that toggles pausing on exceptions. -->
 
-<!ENTITY debuggerUI.pauseExceptions          "Pausa en excepcions">
-<!-- LOCALIZATION NOTE (debuggerUI.stepOverButton.tooltip): This is the tooltip for
-  -  the button that steps over a function call. -->
-
-<!ENTITY debuggerUI.stepOverButton.tooltip   "Salta">
-<!-- LOCALIZATION NOTE (debuggerUI.stepInButton): This is the tooltip for the
-  -  button that steps into a function call. -->
-
-<!ENTITY debuggerUI.stepInButton.tooltip     "Entra-hi">
-<!-- LOCALIZATION NOTE (debuggerUI.stepOutButton): This is the tooltip for the
-  -  button that steps out of a function call. -->
-
-<!ENTITY debuggerUI.stepOutButton.tooltip    "Surt-ne">
-<!-- LOCALIZATION NOTE (debuggerUI.stackTitle): This is the label for the
-  -  widget that displays the call stack frames in the debugger. -->
+<!ENTITY debuggerUI.pauseExceptions     "Pausa en excepcions">
+<!-- LOCALIZATION NOTE (debuggerUI.searchPanelTitle): This is the text that
+  -  appears in the filter panel popup as a description. -->
 
-<!ENTITY debuggerUI.stackTitle       "Pila de crides">
-<!-- LOCALIZATION NOTE (debuggerUI.scriptTitle): This is the label for the
-  -  widget that displays the source code for the script that is currently
-  -  being inspected in the debugger. -->
-
-<!ENTITY debuggerUI.scriptTitle      "Script">
-<!-- LOCALIZATION NOTE (debuggerUI.propertiesTitle): This is the label for the
-  -  widget that displays the variables in the various available scopes in the
-  -  debugger. -->
-
-<!ENTITY debuggerUI.propertiesTitle  "Variables de l'àmbit">
-<!-- LOCALIZATION NOTE (debuggerUI.emptyFilterText): This is the text that
-  -  appears in the filter text box when it is empty. -->
-
-<!ENTITY debuggerUI.emptyFilterText  "Filtra els scripts">
-<!-- LOCALIZATION NOTE (emptyScriptText): The text to display in the menulist when
-  - there are no scripts. -->
-
-<!ENTITY debuggerUI.emptyScriptText  "Sense scripts.">
+<!ENTITY debuggerUI.searchPanelTitle    "Operadors">
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -38,23 +38,43 @@ remoteDebuggerPromptCheck=No tornis a pr
 # LOCALIZATION NOTE (remoteDebuggerReconnectMessage): The message displayed on the
 # debugger prompt asking for the remote host and port to connect to.
 remoteDebuggerReconnectMessage=No s'ha trobat el servidor. Voleu tornar-ho a intentar? (servidor:port)
 
 # LOCALIZATION NOTE (remoteDebuggerReconnectMessage): The message displayed on the
 # debugger prompt asking for the remote host and port to connect to.
 remoteDebuggerConnectionFailedMessage=No s'ha pogut trobar cap servidor al servidor i port especificats.
 
+# LOCALIZATION NOTE (collapsePanes): This is the tooltip for the button
+# that collapses the left and right panes in the debugger UI. -->
+collapsePanes=Redueix els panells
+
+# LOCALIZATION NOTE (expandPanes): This is the tooltip for the button
+# that expands the left and right panes in the debugger UI. -->
+expandPanes=Expandeix els panells
+
 # LOCALIZATION NOTE (pauseLabel): The label that is displayed on the pause
 # button when the debugger is in a running state.
-pauseTooltip=Feu clic per fer una pausa.
+pauseButtonTooltip=Feu clic per fer una pausa (%S)
 
 # 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.
+resumeButtonTooltip=Feu clic per continuar (%S)
+
+# LOCALIZATION NOTE (stepOverTooltip): The label that is displayed on the
+# button that steps over a function call.
+stepOverTooltip=Omet (%S)
+
+# LOCALIZATION NOTE (stepInTooltip): The label that is displayed on the
+# button that steps into a function call.
+stepInTooltip=Entra (%S)
+
+# LOCALIZATION NOTE (stepOutTooltip): The label that is displayed on the
+# button that steps out of a function call.
+stepOutTooltip=Surt (%S)
 
 # 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.
@@ -62,16 +82,32 @@ emptyBreakpointsText=No hi ha cap punt d
 # LOCALIZATION NOTE (noScriptsText): The text to display in the menulist when
 # there are no scripts.
 noScriptsText=No hi ha scripts
 
 # LOCALIZATION NOTE (noMatchingScriptsText): The text to display in the
 # menulist when there are no matching scripts after filtering.
 noMatchingScriptsText=No hi ha scripts coincidents
 
+# LOCALIZATION NOTE (emptyFilterText): This is the text that appears in the
+# filter text box when it is empty.
+emptyFilterText=Filtra els scripts (%S)
+
+# LOCALIZATION NOTE (searchPanelGlobal): This is the text that appears in the
+# filter panel popup for the global search operation.
+searchPanelGlobal=Cera a tots els fitxers (%S)
+
+# LOCALIZATION NOTE (searchPanelToken): This is the text that appears in the
+# filter panel popup for the token search operation.
+searchPanelToken=Cerca en aquest fitxer (%S)
+
+# LOCALIZATION NOTE (searchPanelLine): This is the text that appears in the
+# filter panel popup for the line search operation.
+searchPanelLine=Salta a la línia (%S)
+
 # 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
@@ -85,29 +121,16 @@ breakpointMenuItem.deleteAll=Suprimeix t
 loadingText=S'està carregant…
 
 # LOCALIZATION NOTE (loadingError):
 # This is the error message that is displayed on failed attempts to load an
 # external resource file.
 # %1$S=URL, %2$S=status code
 loadingError=S'ha produït un error en carregar %1$S: %2$S
 
-# 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ó?
-
-# LOCALIZATION NOTE (remoteIncomingPromptDisable): The label displayed on the
-# third button in the incoming connection dialog that lets the user disable the
-# remote debugger server.
-remoteIncomingPromptDisable=Inhabilita
-
 # LOCALIZATION NOTE (emptyVariablesText): The text that is displayed in the
 # variables pane when there are no variables to display.
 emptyVariablesText=No hi ha variables per mostrar.
 
 # LOCALIZATION NOTE (scopeLabel): The text that is displayed in the variables
 # pane as a header for each variable scope (e.g. "Global scope, "With scope",
 # etc.).
 scopeLabel=Àmbit %S
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -55,16 +55,40 @@ screenshotManual=Desa una image PNG de tota la finestra visible (opcionalment, després d'un retard)
 # a dialog when the user is using this command.
 screenshotFilenameDesc=Nom del fitxer de destí
 
 # LOCALIZATION NOTE (screenshotFilenameManual) A fuller description of the
 # 'filename' parameter to the 'screenshot' command, displayed when the user
 # asks for help on what it does.
 screenshotFilenameManual=El nom del fitxer (ha de tenir l'extensió «.png») on s'escriurà la captura de pantalla.
 
+# LOCALIZATION NOTE (screenshotClipboardDesc) A very short string to describe
+# the 'clipboard' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotClipboardDesc=Voleu copiar la captura de pantalla al porta-retalls? (cert/fals)
+
+# LOCALIZATION NOTE (screenshotClipboardManual) A fuller description of the
+# 'clipboard' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotClipboardManual=Cert si voleu copiar la captura de pantalla en lloc de desar-la en un fitxer.
+
+# LOCALIZATION NOTE (screenshotChromeDesc) A very short string to describe
+# the 'chrome' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotChromeDesc=Voleu capturar la finestra del perfil chrome del Firefox? (cert/false)
+
+# LOCALIZATION NOTE (screenshotChromeManual) A fuller description of the
+# 'chrome' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotChromeManual=Cert si voleu capturar la finestra del Firefox en comptes de la finestra del contingut de la pàgina web.
+
+# LOCALIZATION NOTE (screenshotGroupOptions) A label for the optional options of
+# the screenshot command.
+screenshotGroupOptions=Opcions
+
 # LOCALIZATION NOTE (screenshotDelayDesc) A very short string to describe
 # the 'delay' parameter to the 'screenshot' command, which is displayed in
 # a dialog when the user is using this command.
 screenshotDelayDesc=Retard (segons)
 
 # LOCALIZATION NOTE (screenshotDelayManual) A fuller description of the
 # 'delay' parameter to the 'screenshot' command, displayed when the user
 # asks for help on what it does.
@@ -75,16 +99,43 @@ 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 (screenshotSelectorChromeConflict) Exception thwon when user
+# tries to use 'selector' option along with 'chrome' option of the screenshot
+# command. Refer: https://bugzilla.mozilla.org/show_bug.cgi?id=659268#c7
+screenshotSelectorChromeConflict=no s'admet l'opció de selector quan l'opció chrome es certa
+
+# LOCALIZATION NOTE (screenshotGeneratedFilename) The auto generated filename
+# when no file name is provided. the first argument (%1$S) is the date string
+# in yyyy-mm-dd format and the second argument (%2$S) is the time string
+# in HH.MM.SS format. Please don't add the extension here.
+screenshotGeneratedFilename=Captura de Pantalla %1$S a %2$S
+
+# LOCALIZATION NOTE (screenshotErrorSavingToFile) Text displayed to user upon
+# encountering error while saving the screenshot to the file specified.
+screenshotErrorSavingToFile=Error en desar a
+
+# LOCALIZATION NOTE (screenshotSavedToFile) Text displayed to user when the
+# screenshot is successfully saved to the file specified.
+screenshotSavedToFile=S'ha desat a
+
+# LOCALIZATION NOTE (screenshotErrorCopying) Text displayed to user upon
+# encountering error while copying the screenshot to clipboard.
+screenshotErrorCopying=Hi ha hagut un error en copiar al porta-retalls.
+
+# LOCALIZATION NOTE (screenshotCopied) Text displayed to user when the
+# screenshot is successfully copied to the clipboard.
+screenshotCopied=S'ha copiat al porta-retalls.
+
 # 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.
@@ -324,16 +375,24 @@ breakNotFound=No s'ha trobat el punt de 
 # 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 (dbgOpen) A very short string used to describe the function
+# of the dbg open command.
+dbgOpen=Obre el depurador
+
+# LOCALIZATION NOTE (dbgClose) A very short string used to describe the function
+# of the dbg close command.
+dbgClose=Tanca el depurador
+
 # 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.
 
@@ -345,21 +404,21 @@ dbgStepDesc=Gestiona els passos
 # 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.
+# function of the dbg step in 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.
+# function of the dbg step out 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
@@ -753,21 +812,20 @@ jsbIndentSizeManual=El nombre de caràcters amb què sagnar cada línia
 # 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?
+# the 'jsb <doNotPreserveNewlines>' 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.
+jsbDoNotPreserveNewlinesDesc=No conservis el 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
@@ -786,53 +844,52 @@ jsbPreserveMaxNewlinesManual=El nombre màxim de salts de línia consecutius que cal conservar
 # 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
+# LOCALIZATION NOTE (jsbBraceStyleDesc2) 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
+jsbBraceStyleDesc2=Redueix, expandeix, expandeix-ho tot, expandeix-estricte
 
-# LOCALIZATION NOTE (jsbBraceStyleManual) A fuller description of the
+# LOCALIZATION NOTE (jsbBraceStyleManual2) 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)
+jsbBraceStyleManual2=L'estil de codificació de claus. Qualsevol admès per reduir, expandir, expandir-ho tot o expandir-estricte
 
-# 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 (jsbNoSpaceBeforeConditionalDesc) A very short description
+# of the 'jsb <noSpaceBeforeConditional>' 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.
+jsbNoSpaceBeforeConditionalDesc=Sense espai abans dels enunciats 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 (jsbOptionsDesc) The title of a set of options to
+# the 'jsb' command, displayed as a heading to the list of options.
+jsbOptionsDesc=Opcions
+
 # 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.
@@ -907,16 +964,16 @@ callLogChromeInvalidJSM=JSM invàlid!
 callLogChromeVarNotFoundContent=No s'ha trobat la variable a la finestra de continguts.
 
 # LOCALIZATION NOTE (callLogChromeVarNotFoundChrome) A string displayed as the
 # result of the 'calllog chromestart' command with a source type of
 # chrome-variable and an invalid variable name.
 callLogChromeVarNotFoundChrome=No s'ha trobat la variable a la finestra chrome
 
 # LOCALIZATION NOTE (callLogChromeEvalException) A string displayed as the
-# result of the 'calllog chromestart' command with a source type of javascript
+# result of the 'calllog chromestart' command with a source type of JavaScript
 # and invalid JavaScript code.
 callLogChromeEvalException=El javascript avaluat ha disparat l'excepció següent
 
 # LOCALIZATION NOTE (callLogChromeEvalNeedsObject) A string displayed as the
 # result of passing a non-JavaScript object creating source via the
 # 'calllog chromestart javascript' command.
 callLogChromeEvalNeedsObject=El codi JavaScript ha de ser avaluat a un objecte tal que les crides als seus mètodes siguin enregistrades p. ex. «({a1: function() {this.a2()},a2: function() {}});»
--- a/browser/chrome/browser/devtools/responsiveUI.properties
+++ b/browser/chrome/browser/devtools/responsiveUI.properties
@@ -10,12 +10,31 @@
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 
 # LOCALIZATION NOTE  (responsiveUI.rotate): label of the rotate button.
 responsiveUI.rotate=gira
 
+# LOCALIZATION NOTE  (responsiveUI.addPreset): label of the add preset button.
+responsiveUI.addPreset=Afegeix una preselecció
+
+# LOCALIZATION NOTE  (responsiveUI.removePreset): label of the remove preset button.
+responsiveUI.removePreset=Suprimeix una preselecció
+
 # LOCALIZATION NOTE  (responsiveUI.customResolution): label of the first item
 # in the menulist at the beginning of the toolbar. For %S is replace with the
 # current size of the page. For example: "400x600".
 responsiveUI.customResolution=%S (personalitzat)
+
+# LOCALIZATION NOTE  (responsiveUI.namedResolution): label of custom items with a name
+# in the menulist of the toolbar.
+# For example: "320x480 (phone)".
+responsiveUI.namedResolution=%S (%S)
+
+# LOCALIZATION NOTE  (responsiveUI.customNamePromptTitle): prompt title when asking
+# the user to specify a name for a new custom preset.
+responsiveUI.customNamePromptTitle=Vista de disseny adaptativa
+
+# LOCALIZATION NOTE  (responsiveUI.customNamePromptMsg): prompt message when asking
+# the user to specify a name for a new custom preset.
+responsiveUI.customNamePromptMsg=Indiqueu un nom per la preselecció %Sx%S
--- a/browser/chrome/browser/devtools/scratchpad.dtd
+++ b/browser/chrome/browser/devtools/scratchpad.dtd
@@ -31,16 +31,19 @@
 
 <!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 revertCmd.label              "Desfés...">
+<!ENTITY revertCmd.accesskey          "f">
+
 <!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">
@@ -97,16 +100,20 @@
 <!-- LOCALIZATION NOTE (resetContext2.label): This command allows the developer
   -  to reset/clear the global object of the environment where the code executes.
   -->
 
 
 <!ENTITY resetContext2.label          "Restaura les variables">
 <!ENTITY resetContext2.accesskey      "t">
 
+<!ENTITY reloadAndRun.label           "Torna a carregar i executa">
+<!ENTITY reloadAndRun.accesskey       "T">
+<!ENTITY reloadAndRun.key             "r">
+
 <!ENTITY executeMenu.label            "Executa">
 <!ENTITY executeMenu.accesskey        "x">
 <!-- LOCALIZATION NOTE (errorConsoleCmd.commandkey): This command key launches
   -  the browser Error Console, the key should be identical to the property of
   -  the same name in browser.dtd.
   -->
 
 <!ENTITY errorConsoleCmd.commandkey   "j">
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -21,16 +21,20 @@ propertyPanel.updateButton.accesskey=u
 # the user attempts to save to an already existing file.
 export.fileOverwriteConfirmation=El fitxer existeix. El voleu sobreescriure?
 
 # LOCALIZATION NOTE  (browserWindow.unavailable): This error message is shown
 # when Scratchpad does not find any recently active window of navigator:browser
 # type.
 browserWindow.unavailable=El bloc de proves no troba cap finestra de navegador on executar-hi el codi.
 
+# LOCALIZATION NOTE  (scratchpadContext.invalid): This error message is shown
+# when user tries to run an operation in Scratchpad in an unsupported context.
+scratchpadContext.invalid=El bloc de notes no pot executar aquesta operació en el mode actual.
+
 # 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.
 
@@ -49,16 +53,24 @@ saveFile.failed=Ha fallat l'operació de desar el fitxer.
 # LOCALIZATION NOTE  (confirmClose): This is message in the prompt dialog when
 # you try to close a scratchpad with unsaved changes.
 confirmClose=Voleu desar els canvis que heu fet al bloc de proves?
 
 # LOCALIZATION NOTE  (confirmClose.title): This is title of the prompt dialog when
 # you try to close a scratchpad with unsaved changes.
 confirmClose.title=Canvis sense desar
 
+# LOCALIZATION NOTE  (confirmRevert): This is message in the prompt dialog when
+# you try to revert unsaved content of scratchpad.
+confirmRevert=Voleu desfer els canvis fets en aquest bloc de notes?
+
+# LOCALIZATION NOTE  (confirmRevert.title): This is title of the prompt dialog when
+# you try to revert unsaved content of scratchpad.
+confirmRevert.title=Desfés els canvis
+
 # LOCALIZATION NOTE  (scratchpadIntro): This is a multi-line comment explaining
 # how to use the Scratchpad. Note that this should be a valid JavaScript
 # comment inside /* and */.
 scratchpadIntro1=/*\n * Això és un bloc de proves de JavaScript.\n * \n * Introduïu-hi codi JavaScript, feu llavors clic amb el botó secundari o trieu del menú d'execució:\n * 1. Executa per avaluar el codi seleccionat (%1$S),\n * 2. Inspecciona per obrir l'inspector d'objectes per al resultat (%2$S), o\n * 3. Mostra per inserir el resultat en un comentari després de la selecció. (%3$S)\n */\n\n
 
 # LOCALIZATION NOTE  (notification.browserContext): This is the message displayed
 # over the top of the editor when the user has switched to browser context.
 browserContext.notification=Aquest bloc de proves s'executa en el context del navegador.
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -25,17 +25,22 @@
 <!ENTITY networkPanel.responseBodyUnknownType     "Tipus de contingut desconegut">
 <!ENTITY networkPanel.responseNoBody              "No hi ha cap cos de la resposta">
 <!ENTITY networkPanel.responseImage               "Imatge rebuda">
 <!ENTITY networkPanel.responseImageCached         "Imatge en la cau">
 <!-- LOCALIZATION NOTE (saveBodies.label): You can see this string in the Web
    - Console context menu. -->
 
 <!ENTITY saveBodies.label     "Registra la sol·licitud i els cossos de resposta">
-<!ENTITY saveBodies.accesskey "L">
+<!ENTITY saveBodies.accesskey "l">
+<!-- LOCALIZATION NOTE (openURL.label): You can see this string in the Web
+   - Console context menu. -->
+
+<!ENTITY openURL.label     "Obre l'enllaç en una pestanya nova">
+<!ENTITY openURL.accesskey "T">
 <!-- LOCALIZATION NOTE (btnPageNet.label): This string is used for the menu
   -  button that allows users to toggle the network logging output.
   -  This string and the following strings toggle various kinds of output
   -  filters. -->
 
 <!ENTITY btnPageNet.label   "Xarxa">
 <!ENTITY btnPageNet.tooltip "Enregistra l'accés a la xarxa">
 <!ENTITY btnPageCSS.label   "CSS">
@@ -84,8 +89,11 @@
 <!ENTITY fullZoomEnlargeCmd.commandkey2 "="> 
 <!ENTITY fullZoomEnlargeCmd.commandkey3 "">
 
 <!ENTITY fullZoomReduceCmd.commandkey   "-">
 <!ENTITY fullZoomReduceCmd.commandkey2  "">
 
 <!ENTITY fullZoomResetCmd.commandkey    "0">
 <!ENTITY fullZoomResetCmd.commandkey2   "">
+
+<!ENTITY copyURLCmd.label     "Copia la Ruta de l'enllaç">
+<!ENTITY copyURLCmd.accesskey "c">
--- a/browser/chrome/browser/newTab.properties
+++ b/browser/chrome/browser/newTab.properties
@@ -1,9 +1,9 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-newtab.pin=Clava aquest web aquí
-newtab.unpin=Desclava aquest web
-newtab.block=Suprimeix aquest web
+newtab.pin=Fixa el lloc a la seva posició actual
+newtab.unpin=Desfixa el lloc
+newtab.block=Suprimeix aquest lloc
 newtab.show=Mostra la pàgina de la pestanya nova
 newtab.hide=Amaga la pàgina de la nova pestanya
--- a/browser/chrome/browser/preferences/aboutPermissions.dtd
+++ b/browser/chrome/browser/preferences/aboutPermissions.dtd
@@ -15,16 +15,17 @@
 
 <!ENTITY header.defaults                 "Permisos per defecte per a tots els llocs">
 
 <!ENTITY permissions.forgetSite          "Oblida els d'aquest lloc">
 
 <!ENTITY permission.alwaysAsk            "Demana-m'ho sempre">
 <!ENTITY permission.allow                "Permet">
 <!ENTITY permission.allowForSession      "Permet per a la sessió">
+<!ENTITY permission.allowFirstPartyOnly  "Permet només la primera part">
 <!ENTITY permission.block                "Bloca">
 
 <!ENTITY password.label                  "Emmagatzema les contrasenyes">
 <!ENTITY password.manage                 "Gestiona les contrasenyes…">
 
 <!ENTITY cookie.label                    "Defineix les galetes">
 <!ENTITY cookie.remove                   "Suprimeix les galetes">
 <!ENTITY cookie.manage                   "Gestiona les galetes…">
--- a/browser/chrome/browser/preferences/main.dtd
+++ b/browser/chrome/browser/preferences/main.dtd
@@ -29,14 +29,8 @@
 <!ENTITY saveTo.label "Desa els fitxers a">
 <!ENTITY saveTo.accesskey "s">
 <!ENTITY chooseFolderWin.label        "Navega…">
 <!ENTITY chooseFolderWin.accesskey    "v">
 <!ENTITY chooseFolderMac.label        "Trieu…">
 <!ENTITY chooseFolderMac.accesskey    "e">
 <!ENTITY alwaysAsk.label "Demana'm sempre on desar els fitxers">
 <!ENTITY alwaysAsk.accesskey "a">
-
-<!ENTITY addonsMgr.label               "Complements">
-<!ENTITY manageAddonsDescWin.label     "Canvia les opcions dels vostres complements">
-<!ENTITY manageAddonsDescUnix2.label   "Canvia les preferències dels vostres complements">
-<!ENTITY manageAddons.label            "Gestiona els complements…">
-<!ENTITY manageAddons.accesskey        "G">
--- a/browser/chrome/browser/preferences/sync.dtd
+++ b/browser/chrome/browser/preferences/sync.dtd
@@ -33,15 +33,15 @@
 <!ENTITY engine.passwords.label     "Contrasenyes">
 <!ENTITY engine.passwords.accesskey "y">
 <!ENTITY engine.prefs.label         "Preferències">
 <!ENTITY engine.prefs.accesskey     "s">
 <!ENTITY engine.addons.label        "Complements">
 <!ENTITY engine.addons.accesskey    "C">
 <!-- Device Settings -->
 
-<!ENTITY syncComputerName.label       "Nom de l'ordinador:">
-<!ENTITY syncComputerName.accesskey   "o">
+<!ENTITY syncDeviceName.label       "Nom del dispositiu:">
+<!ENTITY syncDeviceName.accesskey   "n">
 <!ENTITY unlinkDevice.label           "Desvincula aquest dispositiu">
 <!-- Footer stuff -->
 
 <!ENTITY prefs.tosLink.label        "Termes del servei">
 <!ENTITY prefs.ppLink.label         "Política de privadesa">
--- a/browser/chrome/browser/syncKey.dtd
+++ b/browser/chrome/browser/syncKey.dtd
@@ -1,18 +1,18 @@
 <!-- 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 syncKey.page.title               "La vostra clau del &syncBrand.fullName.label;">
-<!ENTITY syncKey.page.description         "S'utilitza aquesta clau per desxifrar les dades del compte del &syncBrand.fullName.label;. Us caldrà introduir la clau cada vegada que configureu el &syncBrand.fullName.label; en un ordinador o dispositiu nou.">
+<!ENTITY syncKey.page.description2        "Aquesta clau s'utilitza per descodificar les dades al vostre compte &syncBrand.fullName.label;. Heu d'inserir la clau cada vegada que configureu &syncBrand.fullName.label; en un dispositiu nou.">
 <!ENTITY syncKey.keepItSecret.heading     "Conserveu-la secreta">
 <!ENTITY syncKey.keepItSecret.description "El vostre compte del &syncBrand.fullName.label; està xifrat per protegir la vostra privadesa. Sense aquesta clau, caldrien anys perquè algú pogués desxifrar la vostra informació personal. Sou l'única persona qui té aquesta clau. Això vol dir que sou l'únic que pot accedir a les dades del &syncBrand.fullName.label;.">
 <!ENTITY syncKey.keepItSafe.heading       "Conserveu-la segura">
 <!ENTITY syncKey.keepItSafe1.description  "No perdeu la clau.">
 <!ENTITY syncKey.keepItSafe2.description  " No conserveu cap còpia de la clau (llavors deixaria de ser secreta!) i, per tant ">
 <!ENTITY syncKey.keepItSafe3.description  "no podem ajudar-vos a recuperar-la">
-<!ENTITY syncKey.keepItSafe4.description  " si es perd. Caldrà que feu servir aquesta clau cada vegada que connecteu un nou ordinador o dispositiu al &syncBrand.fullName.label;.">
+<!ENTITY syncKey.keepItSafe4a.description " si la perdeu. Heu d'utilitzar aquesta clau cada cop que connecteu un dispositiu nou a &syncBrand.fullName.label;.">
 <!ENTITY syncKey.findOutMore1.label       "Teniu més informació del &syncBrand.fullName.label; i de la vostra privadesa a ">
 <!ENTITY syncKey.findOutMore2.label       ".">
 <!ENTITY syncKey.footer1.label            "Els termes del servei del &syncBrand.fullName.label; són disponibles a ">
 <!ENTITY syncKey.footer2.label            ". La política de privadesa és disponible a ">
 <!ENTITY syncKey.footer3.label            ".">
--- a/browser/chrome/browser/syncSetup.dtd
+++ b/browser/chrome/browser/syncSetup.dtd
@@ -7,17 +7,17 @@
 
 
 <!ENTITY setup.pickSetupType.description2 "Benvingut! Si mai no heu fet servir mai el &syncBrand.fullName.label; necessitareu crear un compte nou.">
 <!ENTITY button.createNewAccount.label "Crea un compte">
 <!ENTITY button.haveAccount.label      "Tinc un compte">
 
 <!ENTITY setup.choicePage.title.label     "Heu fet servir el &syncBrand.fullName.label; abans?">
 <!ENTITY setup.choicePage.new.label       "Mai abans he fet servir el &syncBrand.shortName.label;">
-<!ENTITY setup.choicePage.existing.label  "Ja faig servir el &syncBrand.shortName.label; en un altre ordinador">
+<!ENTITY setup.choicePage.existing2.label "Ja estic utilitzant &syncBrand.shortName.label; en altre dispositiu">
 <!-- New Account AND Existing Account -->
 
 <!ENTITY server.label               "Servidor">
 <!ENTITY serverType.default.label      "Per defecte: servidor &syncBrand.fullName.label; de Mozilla">
 <!ENTITY serverType.custom2.label   "Utilitza un servidor personalitzat…">
 <!ENTITY signIn.account2.label      "Compte">
 <!ENTITY signIn.account2.accesskey  "e">
 <!ENTITY signIn.password.label      "Contrasenya">
@@ -73,41 +73,41 @@
 <!ENTITY setup.signInPage.title.label "Inicia una sessió">
 <!ENTITY existingRecoveryKey.description "Per obtenir una còpia de la vostra clau de recuperació, aneu al menú Opcions del &syncBrand.shortName.label; del vostre altre dispositiu i seleccioneu &#x0022;La meva clau de recuperació&#x0022; dins de &#x0022;Gestió del compte&#x0022;.">
 <!ENTITY verifying.label              "S'està verificant…">
 <!ENTITY resetPassword.label          "Reinicia la contrasenya">
 <!ENTITY resetSyncKey.label           "He perdut el meu altre dispositiu.">
 <!-- Sync Options -->
 
 <!ENTITY setup.optionsPage.title      "Opcions de sincronització">
-<!ENTITY syncComputerName.label       "Nom de l'ordinador:">
-<!ENTITY syncComputerName.accesskey   "o">
+<!ENTITY syncDeviceName.label       "Nom del dispositiu:">
+<!ENTITY syncDeviceName.accesskey   "d">
 
 <!ENTITY syncMy.label               "Sincronitza:">
 <!ENTITY engine.bookmarks.label     "Adreces d'interès">
 <!ENTITY engine.bookmarks.accesskey "d">
 <!ENTITY engine.tabs.label          "Pestanyes">
 <!ENTITY engine.tabs.accesskey      "t">
 <!ENTITY engine.history.label       "Historial">
 <!ENTITY engine.history.accesskey   "r">
 <!ENTITY engine.passwords.label     "Contrasenyes">
 <!ENTITY engine.passwords.accesskey "y">
 <!ENTITY engine.prefs.label         "Preferències">
 <!ENTITY engine.prefs.accesskey     "s">
 <!ENTITY engine.addons.label        "Complements">
 <!ENTITY engine.addons.accesskey    "C">
 
-<!ENTITY choice2.merge.main.label      "Fusiona les dades d'aquest ordinador amb les meves dades del &syncBrand.shortName.label;">
+<!ENTITY choice2a.merge.main.label       "Combina les dades d'aquest dispositiu amb les del meu &syncBrand.shortName.label;">
 <!ENTITY choice2.merge.recommended.label "Recomanat:">
-<!ENTITY choice2.client.main.label     "Reemplaça totes les dades d'aquest ordinador amb les meves dades del &syncBrand.shortName.label;">
-<!ENTITY choice2.server.main.label     "Reemplaça tots els altres dispositius amb les meves dades locals">
+<!ENTITY choice2a.client.main.label      "Reemplaça les dades d'aquest dispositiu amb les del meu &syncBrand.shortName.label;">
+<!ENTITY choice2a.server.main.label      "Reemplaça la resta de dispositius amb les dades d'aquest dispositiu">
 <!-- Confirm Merge Options -->
 
 <!ENTITY setup.optionsConfirmPage.title "Confirmació">
-<!ENTITY confirm.merge.label    "El &syncBrand.fullName.label; ara fusionarà les dades de navegació d'aquest ordinador en el vostre compte de sincronització.">
-<!ENTITY confirm.client2.label         "Avís: les dades següents del &brandShortName; se suprimiran en aquest ordinador:">
-<!ENTITY confirm.client.moreinfo.label "Aleshores el &brandShortName; copiarà les vostres dades del &syncBrand.fullName.label; a l'ordinador.">
+<!ENTITY confirm.merge2.label    "&syncBrand.fullName.label; combinarà totes les dades del navegador d'aquest dispositiu al vostre compte del Sync.">
+<!ENTITY confirm.client3.label         "Atenció: Les dades &brandShortName; d'aquest dispositiu  seran suprimides:">
+<!ENTITY confirm.client2.moreinfo.label "El &brandShortName; copiarà les dades de &syncBrand.fullName.label; en aquest dispositiu.">
 <!ENTITY confirm.server2.label         "Avís: se sobreescriuran les dades dels dispositius següents amb les vostres dades locals:">
 <!-- New & Existing Account: Setup Complete -->
 
 <!ENTITY setup.successPage.title "S'ha completat la configuració">
 <!ENTITY changeOptions.label "Podeu canviar aquesta preferència seleccionant les opcions de sincronització a continuació.">
 <!ENTITY continueUsing.label "Podeu continuar utilitzant el &brandShortName;.">
--- a/browser/chrome/browser/syncSetup.properties
+++ b/browser/chrome/browser/syncSetup.properties
@@ -27,21 +27,24 @@ bookmarksCount.label        = #1 adreça d'interès;#1 adreces d'interès
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of days (was %S for a short while, use #1 instead, even if both work)
 historyDaysCount.label      = #1 dia d'historial;#1 dies d'historial
 # LOCALIZATION NOTE (passwordsCount.label):
 # Semi-colon list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of passwords (was %S for a short while, use #1 instead, even if both work)
 passwordsCount.label        = #1 contrasenya;#1 contrasenyes
+# LOCALIZATION NOTE (addonsCount.label):
+# #1 is the number of add-ons, see the link above for forms
+addonsCount.label        = #1 complement;#1 complements
 
 save.recoverykey.title = Desa la clau de recuperació
 save.recoverykey.defaultfilename = Firefox Recovery Key.html
 
 newAccount.action.label = S'ha configurat el Firefox Sync automàticament perquè sincronitzi totes les dades del navegador.
 newAccount.change.label = Podeu triar què voleu sincronitzar exactament seleccionant les opcions de sincronització a continuació.
-resetClient.change.label = El Firefox Sync fusionarà totes les dades del navegador d'aquest ordinador en el vostre compte Sync.
-wipeClient.change.label = El Firefox Sync reemplaçarà totes les dades del navegador d'aquest ordinador amb les del vostre compte Sync.
-wipeRemote.change.label = El Firefox Sync reemplaçarà totes les dades del navegador del vostre compte Sync amb les dades d'aquest ordinador.
+resetClient.change2.label = El Firefox Sync combinarà totes les dades del navegador del vostre dispositiu amb el vostre compte Sync.
+wipeClient.change2.label = El Firefox Sync reemplaçarà totes les dades del navegador d'aquest dispositiu amb les dades del vostre compte Sync.
+wipeRemote.change2.label = El Firefox Sync reemplaçarà totes les dades del navegador del vostre compte Sync amb les dades d'aquest dispositiu.
 existingAccount.change.label = Podeu canviar aquesta preferència seleccionant les opcions del Sync a continuació.
 
 # Several other strings are used (via Weave.Status.login), but they come from
 #  /services/sync
--- a/browser/defines.inc
+++ b/browser/defines.inc
@@ -1,8 +1,8 @@
-#filter emptyLines
+# 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/.#filter emptyLines
 #define MOZ_LANGPACK_CREATOR Mozilla.org / Softcatalà
 
 # If non-English locales wish to credit multiple contributors, uncomment this
 # variable definition and use the format specified.
 #define MOZ_LANGPACK_CONTRIBUTORS <em:contributor>Softcatalà</em:contributor>
 
 #unfilter emptyLines
\ No newline at end of file
--- a/browser/firefox-l10n.js
+++ b/browser/firefox-l10n.js
@@ -1,7 +1,39 @@
-# 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/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Firefox browser.
+#
+# The Initial Developer of the Original Code is
+# Benjamin Smedberg <bsmedberg@covad.net>
+# Portions created by the Initial Developer are Copyright (C) 2004
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 #filter substitution
 
 pref("general.useragent.locale", "@AB_CD@");
--- a/browser/pdfviewer/viewer.properties
+++ b/browser/pdfviewer/viewer.properties
@@ -17,16 +17,18 @@ page_of=de {{pageCount}}
 
 zoom_out.title=Allunya
 zoom_out_label=Allunya
 zoom_in.title=Apropa
 zoom_in_label=Apropa
 zoom.title=Escala
 print.title=Imprimeix
 print_label=Imprimeix
+presentation_mode.title=Canvia a mode de presentació
+presentation_mode_label=Mode de presentació
 open_file.title=Obre el fitxer
 open_file_label=Obre
 download.title=Baixa
 download_label=Baixa
 bookmark.title=Vista actual (copia o obre en una nova finestra)
 bookmark_label=Vista actual
 
 # Tooltips and alt text for side panel toolbar buttons
@@ -47,16 +49,20 @@ no_outline=El contorn no està disponible
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
 thumb_page_title=Pàgina {{page}}
 # LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
 # number.
 thumb_page_canvas=Miniatura de la pàgina {{page}}
 
+# Context menu
+page_rotate_cw.label=Gira cap a la dreta
+page_rotate_ccw.label=Gira cap a l'esquerra
+
 # Search panel button title and messages
 search=Cerca
 search_terms_not_found=(No s'ha trobat)
 
 # Error panel labels
 error_more_info=Més informació
 error_less_info=Menys informació
 error_close=Tanca
--- a/browser/profile/bookmarks.inc
+++ b/browser/profile/bookmarks.inc
@@ -1,9 +1,9 @@
-#filter emptyLines
+# 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/.#filter emptyLines
 # LOCALIZATION NOTE: The 'en-US' strings in the URLs will be replaced with
 # your locale code, and link to your translated pages as soon as they're 
 # live.
 
 #define bookmarks_title Adreces d'interès
 
 
 #define bookmarks_heading Adreces d'interès
--- a/browser/profile/chrome/userChrome-example.css
+++ b/browser/profile/chrome/userChrome-example.css
@@ -1,12 +1,8 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
 /*
  * Edit this file and copy it as userChrome.css into your
  * profile-directory/chrome/
  */
 
 /*
  * This file can be used to customize the look of Mozilla's user interface
  * You should consider using !important on rules which you want to
--- a/browser/profile/chrome/userContent-example.css
+++ b/browser/profile/chrome/userContent-example.css
@@ -1,12 +1,8 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
 /*
  * Edit this file and copy it as userContent.css into your
  * profile-directory/chrome/
  */
 
 /*
  * This file can be used to apply a style to all web pages you view
  * Rules without !important are overruled by author rules if the
--- a/calendar/chrome/lightning/lightning-toolbar.dtd
+++ b/calendar/chrome/lightning/lightning-toolbar.dtd
@@ -29,8 +29,12 @@
 <!ENTITY lightning.toolbar.day.label                 "Dia">
 <!ENTITY lightning.toolbar.day.accesskey             "D">
 <!ENTITY lightning.toolbar.week.label                "Setmana">
 <!ENTITY lightning.toolbar.week.accesskey            "S">
 <!ENTITY lightning.toolbar.multiweek.label           "Diverses setmanes">
 <!ENTITY lightning.toolbar.multiweek.accesskey       "v">
 <!ENTITY lightning.toolbar.month.label               "Mes">
 <!ENTITY lightning.toolbar.month.accesskey           "M">
+<!-- LOCALIZATION NOTE: the same as appmenuButton.label and appmenuButton.tooltip
+     from messenger.dtd -->
+<!ENTITY lightning.toolbar.appmenuButton.label       "Menú d'aplicacions">
+<!ENTITY lightning.toolbar.appmenuButton.tooltip     "Visualitza el menú d'aplicacions">
--- a/calendar/extra-jar.mn
+++ b/calendar/extra-jar.mn
@@ -1,8 +1,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 is an empty file
 # locales can ship "extra" files from here, to ship a custom set
 # of files for the help system
 # do not put any blank lines in this file
--- a/calendar/lightning-l10n.js
+++ b/calendar/lightning-l10n.js
@@ -1,11 +1,43 @@
-# 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/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Firefox browser.
+#
+# The Initial Developer of the Original Code is
+# Benjamin Smedberg <bsmedberg@covad.net>
+# Portions created by the Initial Developer are Copyright (C) 2004
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 #filter substitution
 
 # the default day to start the week on
 #0=Sunday 1=Monday 2=Tuesday 3=Wednesday 4=Thursday 5=Friday 6=Saturday
 pref("calendar.week.start", 1);
 
 # default days off (not in work week)
--- a/calendar/sunbird-l10n.js
+++ b/calendar/sunbird-l10n.js
@@ -1,11 +1,43 @@
-# 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/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Firefox browser.
+#
+# The Initial Developer of the Original Code is
+# Benjamin Smedberg <bsmedberg@covad.net>
+# Portions created by the Initial Developer are Copyright (C) 2004
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 #filter substitution
 
 # the default day to start the week on
 #0=Sunday 1=Monday 2=Tuesday 3=Wednesday 4=Thursday 5=Friday 6=Saturday
 pref("calendar.week.start", 1);
 
 # default days off (not in work week)
--- a/chat/irc.properties
+++ b/chat/irc.properties
@@ -2,17 +2,16 @@
 # 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 (connection.error.*):
 #   These will show in the account manager if the account is
 #   disconnected because of an error.
 connection.error.lost=S'ha perdut la connexió amb el servidor
 connection.error.timeOut=El temps d'espera de la connexió s'ha esgotat
-connection.error.certError=S'ha produït un error de certificació en connectar-se al servidor
 
 # LOCALIZATION NOTE (joinChat.*):
 #   These show up on the join chat menu. An underscore is for the access key.
 joinChat.channel=_Canal
 joinChat.password=_Contrasenya
 
 # LOCALIZATION NOTE (options.*):
 #   These are the protocol specific options shown in the account manager and
@@ -64,33 +63,32 @@ command.part=%S [missatge]: Deixa el can
 command.ping=%S [&lt;sobrenom&gt;]: Demana quant temps de retard té un usuari (o el servidor, si no s'especifica cap usuari).
 command.quit=%S &lt;missatge&gt;: Desconnecta del servidor, amb un missatge opcional.
 command.quote=%S &lt;ordre&gt;: Envia una ordre en brut al servidor.
 command.time=%S: Mostra l'hora local actual al servidor IRC.
 command.topic=%S [&lt;tema nou&gt;]: Mostra o canvia el tema del canal.
 command.umode=%S (+|-)&lt;mode nou&gt;: Configura o desconfigura un mode d'usuari.
 command.version=%S &lt;sobrenom&gt;: Sol·licita la versió del client d'un usuari.
 command.voice=%S &lt;sobrenom1&gt;[,&lt;sobrenom2&gt;]*: Dóna l'estat de veu del canal a algú. Heu de ser un operador del canal per fer-ho.
-command.wallops=%S &lt;missatge&gt;: Si no sabeu què és això, probablement no el podeu fer servir (envia una ordre a tots els connectats amb el senyal +w i tots els operadors en el servidor).
 command.whois=%S &lt;sobrenom&gt;: Envia informació d'un usuari.
 
 # LOCALIZATION NOTE (message.*):
 #    These are shown as system messages in the conversation.
 #    %1$S is the nick and %2$S is the nick and host of the user who joined.
 message.join=%1$S [%2$S] ha entrat a la sala.
 #    %1$S is the nick of who kicked you.
 #    %2$S is message.kicked.reason, if a kick message was given.
 message.kicked.you=Heu estat expulsat per %1$S%2$S.
 #    %1$S is the nick that is kicked, %2$S the nick of the person who kicked
 #    %1$S. %3$S is message.kicked.reason, if a kick message was given.
 message.kicked=%1$S ha estat expulsat per %2$S%3$S.
 #    %S is the kick message
 message.kicked.reason=: %S
-#    %1$S is the nickname of the user whose mode was changed, %2$S is the new
-#    mode and %3$S is who set the mode.
+#    %1$S is the nickname of the user or the channel name whose mode was
+#    changed, %2$S is the new mode and %3$S is who set the mode.
 message.mode=mode (%1$S %2$S) per %3$S.
 #    %1$S is the old nick and %2$S is the new nick.
 message.nick=%1$S es coneix ara com a %2$S.
 #    %S is your new nick.
 message.nick.you=Sou conegut ara com a %S.
 #    The paramter is the message.parted.reason, if a part message is given.
 message.parted.you=Heu deixat la sala (Part%1$S).
 #    %1$S is the user's nick, %2$S is message.parted.reason, if a part message is given.
@@ -112,16 +110,25 @@ message.summoned=%S va ser convocat.
 #    %S is the nickname of the user whose WHOIS information follows this message.
 message.whois=Informació WHOIS per a %S:
 #    %1$S is the nickname of the (offline) user whose WHOWAS information follows this message.
 message.whowas=%1$S està desconnectat. Informació WHOWAS per a %1$S:
 #    %1$S is the entry description (from tooltip.*), %2$S is its value.
 message.whoisEntry=਀a0਀a0%1$S: %2$S
 #    %S is the nickname that is not known to the server.
 message.unknownNick=No s'ha trobat el sobrenom %S.
+#    %1$S is the nickname of the user who changed the mode and %2$S is the new
+#    channel key (password).
+message.channelKeyAdded=%1$S ha canviat la contrasenya del canal a %2$S.
+message.channelKeyRemoved=%S ha suprimit la contrasenya del canal.
+#    This will be followed by a list of ban masks.
+message.banMasks=Els usuaris connectats des de les següents ubicaions estan bandejats de %S.
+message.noBanMasks=No hi ha ubicacions bandejades de %S.
+message.banMaskAdded=Els usuaris connectats des de les ubicacions que coincideixen amb %1$S han estat bandejats per %2$S.
+message.banMaskRemoved=Els usuaris connectats des d'ubicacions que coincideixen amb %1$S ja no estan bandejats per %2$S.
 
 # LOCALIZATION NOTE (error.*):
 #    These are shown as error messages in the server tab.
 #    %S is the channel name.
 error.noChannel=No hi és el canal: %S.
 error.tooManyChannels=No podeu unir-vos a %S; us heu unit a massa canals.
 #    %1$S is your new nick, %2$S is the kill message from the server.
 error.nickCollision=El sobrenom ja és en ús. Es canvia el sobrenom a %1$S [%2$S].
@@ -132,28 +139,30 @@ error.mode.wrongUser=No podeu canviar el
 #    %S is the nickname or channel name that isn't available.
 error.noSuchNick=%S No està connectat.
 error.wasNoSuchNick=No existeix el sobrenom: %S
 error.noSuchChannel=No existeix el canal: %S.
 #    %S is the channel name.
 error.cannotSendToChannel=No podeu enviar cap missatge a %S.
 error.nonUniqueTarget=%S no és un usuari únic usuari@servidor o sobrenom, o bé heu accedit a diversos canals alhora.
 error.notChannelOp=No sou un operador del canal %S.
+error.wrongKey=No podeu unir-vos a %S, contrasenya de canal no vàlida.
 
 # LOCALIZATION NOTE (tooltip.*):
 #    These are the descriptions given in a tooltip with information received
 #    from a whois response.
 #    The human readable ("realname") description of the user.
 tooltip.realname=Nom
 tooltip.server=Connectat a
 #    The username and hostname that the user connects from (usually based on the
 #    reverse DNS of the user's IP, but often mangled by the server to
 #    protect users).
 tooltip.connectedFrom=Connectat des de
 tooltip.registered=Registrat
+tooltip.registeredAs=Registrat com
 tooltip.secure=Utilitzant una connexió segura
 # The away message of the user
 tooltip.away=Absent
 tooltip.ircOp=Operador IRC
 tooltip.idleTime=Inactiu per
 tooltip.channels=Actualment en
 
 #    %1$S is the server name, %2$S is some generic server information (usually a
--- a/chat/twitter.properties
+++ b/chat/twitter.properties
@@ -8,16 +8,19 @@ error.tooLong=L'estat té més de 140 caràcters.
 # LOCALIZATION NOTE (error.general, error.retweet, error.delete):
 #   %1$S will be either the error string returned by the twitter server,
 #   in English, inside parenthesis, or the empty string if we have no specific
 #   message for the error.
 #   %2$S is the message that caused the error.
 error.general=S'ha produït un error %1$S en enviar: %2$S
 error.retweet=S'ha produït un error %1$S en repiular: %2$S
 error.delete=S'ha produït un error %1$S en suprimir: %2$S
+# LOCALIZATION NOTE (error.descriptionTooLong)
+#   %S is the truncated string that was sent to the server.
+error.descriptionTooLong=La descripció supera la longitud màxima (160 caracters), ha estat truncada automàticament a: %S.
 
 # LOCALIZATION NOTE (timeline):
 #   This is the title of the conversation tab, %S will be replaced by
 #   @<username>.
 timeline=Línia temporal %S
 
 # LOCALIZATION NOTE (action.*):
 #  This will be an action in the context menu of displayed tweets.
@@ -86,16 +89,17 @@ tooltip.lang=Llengua
 tooltip.time_zone=Fus horari
 tooltip.url=Pàgina d'inici
 # LOCALIZATION NOTE (tooltip.protected):
 #  whether the user's tweets are publicly visible.
 tooltip.protected=Piulades protegides
 # LOCALIZATION NOTE (tooltip.following):
 #  whether you are subscribed to the user's tweets.
 tooltip.following=Seguint actualment
+tooltip.name=Nom
 tooltip.description=Descripció
 # LOCALIZATION NOTE (tooltip.*_count):
 #  Please see the right side of the official Twitter website UI.
 tooltip.friends_count=Seguint
 tooltip.statuses_count=Piulades
 tooltip.followers_count=Seguidors
 tooltip.listed_count=Llistat
 
--- a/chat/xmpp.properties
+++ b/chat/xmpp.properties
@@ -12,16 +12,17 @@ connection.initializingStream=S'està inicialitzant el flux
 connection.initializingEncryption=S'està inicialitzant el xifratge
 connection.authenticating=S'està autenticant
 connection.gettingResource=S'està obtenint el recurs
 connection.downloadingRoster=S'està baixant la llista de contactes
 
 # LOCALIZATION NOTE (connection.error.*)
 #   These will show in the account manager if an error occurs during the
 #   connection attempt.
+connection.error.invalidUsername=Usuari no vàlid (el seu nom d'usuari ha d'incloure un caràcter '@')
 connection.error.failedToCreateASocket=No s'ha pogut creat el sòcol (esteu en línia?)
 connection.error.serverClosedConnection=El servidor ha tancat la connexió
 connection.error.resetByPeer=Connexió reiniciada per una part
 connection.error.timedOut=La connexió ha esgotat el temps d'espera
 connection.error.receivedUnexpectedData=S'han rebut dades no esperades
 connection.error.incorrectResponse=S'ha rebut una resposta incorrecta
 connection.error.startTLSRequired=El servidor requereix xifratge, però l'heu inhabilitat
 connection.error.startTLSNotSupported=El servidor no funciona amb xifratge, però la vostra configuració ho requereix
@@ -57,16 +58,17 @@ chatRoomField.password=Con_trasenya
 #  Buddies that aren't in any group on the server will appear in this group.
 #  Try to use the same translation as for defaultGroup in instantbird.properties
 defaultGroup=Contactes
 
 # LOCALIZATION NOTE (options.*):
 #   These are the protocol specific options shown in the account manager and
 #   account wizard windows.
 options.resource=Recurs
+options.priority=Pioritat
 options.connectionSecurity=Seguretat de la connexió
 options.connectionSecurity.requireEncryption=Requereix xifratge
 options.connectionSecurity.opportunisticTLS=Utilitza el xifratge si és disponible
 options.connectionSecurity.allowUnencryptedAuth=Permet enviar la contrasenya sense xifrar
 options.connectServer=Servidor
 options.connectPort=Port
 
 # LOCALIZATION NOTE (gtalk.usernameHint):
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -100,16 +100,17 @@ FullScreenDeniedLostWindow=S'ha denegat la sol·licitud de pantalla completa perquè ja no hi ha cap finestra.
 FullScreenDeniedSubDocFullScreen=S'ha denegat la sol·licitud de pantalla completa perquè un subdocument del document que ho ha sol·licitat ja està a pantalla completa.
 FullScreenDeniedNotDescendant=S'ha denegat la sol·licitud de pantalla completa perquè l'element que ho ha sol·licitat no és un descendent de l'element que actualment està en pantalla completa.
 FullScreenDeniedNotFocusedTab=S'ha denegat la sol·licitud de pantalla completa perquè l'element que ho ha sol·licitat no està en la pestanya que actualment té el focus.
 RemovedFullScreenElement=S'ha sortit de la pantalla completa perquè l'element en pantalla completa s'ha mogut del document.
 FocusedWindowedPluginWhileFullScreen=S'ha sortit de la pantalla completa perquè ara el focus el té un connector amb finestra.
 HTMLMultipartXHRWarning=No es permet l'anàlisi d'HTML amb la funció XMLHttpRequest quan s'utilitzen respostes multipart.
 HTMLSyncXHRWarning=No es permet l'anàlisi d'HTML amb la funció XMLHttpRequest en mode síncron.
 InvalidRedirectChannelWarning=No s'ha pogut redireccionar a %S perquè el canal no implementa nsIWritablePropertyBag2.
+ReportOnlyCSPIgnored=S'ignorarà la política CSP de només-informe perquè s'están aplicant altres polítiques de no-només-informe.
 ResponseTypeSyncXHRWarning=Ja no es permet l'ús de l'atribut responseType de XMLHttpRequest quan el context de la finestra està en mode síncron.
 WithCredentialsSyncXHRWarning=Ja no es permet l'ús de l'atribut withCredentials de XMLHttpRequest quan el context de la finestra està en mode síncron.
 TimeoutSyncXHRWarning=Ja no es permet utilitzar l'atribut timeout de XMLHttpRequest quan s'està en el context del window en mode síncron.
 JSONCharsetWarning=S'ha provat de declarar un caràcter codificat amb una codificació no UTF-8 utilitzant JSON amb XMLHttpRequest. El JSON només permet decodificar caràcters UTF-8.
 MediaLoadExhaustedCandidates=Ha fallat la càrrega des de tots els recursos possibles. S'ha aturat la càrrega.
 MediaLoadSourceMissingSrc=L'element <source> no té l'atribut «src». No s'ha pogut carregar el suport.
 # LOCALIZATION NOTE: %1$S is the Http error code the server returned (e.g. 404, 500, etc), %2$S is the URL of the media resource which failed to load.
 MediaLoadHttpError=Ha fallat la carrega del recurs %2$S perquè la petició HTTP ha fallat. El codi de l'estat és %1$S.
@@ -118,18 +119,18 @@ MediaLoadInvalidURI=Ha fallat la carrega del recurs %S perquè l'URI no és correcte.
 # LOCALIZATION NOTE: %1$S is the media resource's format/codec type (basically equivalent to the file type, e.g. MP4,AVI,WMV,MOV etc), %2$S is the URL of the media resource which failed to load.
 MediaLoadUnsupportedTypeAttribute=Ha fallat la càrrega del recurs %2$S perquè l'atribut especificat per a "%1$S" no està suportat.
 # LOCALIZATION NOTE: %1$S is the "media" attribute value of the <source> element. It is a media query. %2$S is the URL of the media resource which failed to load.
 MediaLoadSourceMediaNotMatched=Ha fallat la càrrega del recurs %2$S perquè l'atribut especificat per a "%1$S" no es correspon.
 # LOCALIZATION NOTE: %1$S is the MIME type HTTP header being sent by the web server, %2$S is the URL of the media resource which failed to load.
 MediaLoadUnsupportedMimeType=Ha fallat la carrega del recurs %2$S perquè no es permeten respostes HTTP on el «Content-Type» sigui «%1$S»
 # LOCALIZATION NOTE: %S is the URL of the media resource which failed to load because of error in decoding.
 MediaLoadDecodeError=No s'ha pogut descodificar el recurs %S 
-# LOCALIZATION NOTE: Do not translate "MozBlobBuilder" and "Blob"
-MozBlobBuilderWarning=El MozBlobBuilder és en desús. Utilitzeu millor el constructor Blob.
 # LOCALIZATION NOTE: Do not translate "DOMException", "code" and "name"
 DOMExceptionCodeWarning=L'atribut de codi DOMException és en desús. Utilitzeu millor name.
 # LOCALIZATION NOTE: Do not translate "__exposedProps__"
 NoExposedPropsWarning=L'exposició del contingut dels objectes del chrome JS sense __exposedProps__ és insegur i obsolet. Veieu https://developer.mozilla.org/en/XPConnect_wrappers per a més informació.
 # LOCALIZATION NOTE: Do not translate "Mutation Event" and "MutationObserver"
 MutationEventWarning=L'ús de «Mutation Events» és obsolet. Millor feu servir «MutationObserver».
 # LOCALIZATION NOTE: Do not translate "Blob", "mozSlice", or "slice"
 MozSliceWarning=L'ús de «mozSlice» a l'objecte blob és obsolet.  Millor feu servir «MutationObserver».
+# LOCALIZATION NOTE: Do not translate "Components"
+ComponentsWarning=L'objecte Components està en desús. Aviat s'eliminarà.
--- a/dom/chrome/security/csp.properties
+++ b/dom/chrome/security/csp.properties
@@ -40,16 +40,18 @@ notSamePort = no es pot utilitzar l'URI 
 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ó
+# LOCALIZATION NOTE (allowDirectiveDeprecated):
+allowDirectiveDeprecated = la directiva allow està en desús, utilitzeu la directiva equivalent default-source en el seu lloc
 
 # 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):
@@ -99,8 +101,11 @@ notIntersectPort = No s'ha pogut realitzar una intersecció de %1$S amb %2$S per problemes de ports.
 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
+# LOCALIZATION NOTE (duplicateDirective):
+# %1$S is the name of the duplicate directive
+duplicateDirective = S'han detectat %1$S directives duplicades. S'ignoraran totes excepte la primera.
--- a/editor/ui/chrome/composer/editorOverlay.dtd
+++ b/editor/ui/chrome/composer/editorOverlay.dtd
@@ -66,20 +66,22 @@
 <!ENTITY fontCourier.label "Courier">
 <!ENTITY fontCourier.accesskey "C">
 <!-- Font Size SubMenu -->
 
 <!ENTITY FontSizeSelect.tooltip "Trieu una mida de lletra">
 <!ENTITY decreaseFontSize.label "Més petita">
 <!ENTITY decreaseFontSize.accesskey "p">
 <!ENTITY decreaseFontSize.key "-">
+<!-- < is above this key on many keyboards -->
+<!ENTITY decreaseFontSize.key2 ","> 
 <!ENTITY increaseFontSize.label "Més gran">
 <!ENTITY increaseFontSize.accesskey "g">
 <!ENTITY increaseFontSize.key "+">
-<!-- + is above this key on many keyboards -->
+<!-- > is above this key on many keyboards -->
 <!ENTITY increaseFontSize.key2 "="> 
 
 <!ENTITY fontSizeMenu.label "Mida">
 <!ENTITY fontSizeMenu.accesskey "M">
 <!ENTITY size-xx-smallCmd.label "xx-petit">
 <!ENTITY size-xx-smallCmd.accesskey "t">
 <!ENTITY size-x-smallCmd.label "x-petit">
 <!ENTITY size-x-smallCmd.accesskey "e">
--- a/extensions/irc/chrome/about.dtd
+++ b/extensions/irc/chrome/about.dtd
@@ -1,11 +1,43 @@
-<!-- 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/. -->
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is ChatZilla.
+   -
+   - The Initial Developer of the Original Code is James Ross.
+   - Portions created by the Initial Developer are Copyright (C) 2008
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   James Ross <silver@warwickcompsoc.co.uk>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY window.title  "Quant a ChatZilla">
 
 <!ENTITY chatzilla.label       "ChatZilla">
 <!ENTITY version.unknown.label "Versió desconeguda">
 <!ENTITY version.known.label   "Versió &#37;S">
 <!ENTITY description.label     "Un client de xat IRC net, fàcil d'utilitzar i altament extensible.">
 
--- a/extensions/irc/chrome/browserOverlay.dtd
+++ b/extensions/irc/chrome/browserOverlay.dtd
@@ -1,8 +1,40 @@
-<!-- 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/. -->
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is ChatZilla.
+   -
+   - The Initial Developer of the Original Code is James Ross.
+   - Portions created by the Initial Developer are Copyright (C) 2004
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   James Ross <silver@warwickcompsoc.co.uk>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY czButton.label   "ChatZilla">
   
 <!ENTITY czMenu.label     "ChatZilla">
 <!ENTITY czMenu.accesskey "Z">
--- a/extensions/irc/chrome/ceip.dtd
+++ b/extensions/irc/chrome/ceip.dtd
@@ -1,12 +1,8 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 <!ENTITY window.title  "Programa de millora de l'experiència d'usuari del ChatZilla">
 <!ENTITY window.size   "width: 45em;">
 
 <!ENTITY intro.label "El programa de millora de l'experiència d'usuari del ChatZilla recull informació de com empreu el ChatZilla, sense interrompre-us. Això ajuda als desenvolupadors a identificar quines característiques millorar. No s'utilitza cap informació per a identificar-vos o contactar-vos.">
 
 <!ENTITY groupSend.label   "Envia les dades següents:">
 <!ENTITY sendClient.label  "Quan el ChatZilla és obert i tancat">
 <!ENTITY sendClient.accesskey    "o">
--- a/extensions/irc/chrome/channels.dtd
+++ b/extensions/irc/chrome/channels.dtd
@@ -1,11 +1,43 @@
-<!-- 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/. -->
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is ChatZilla.
+   -
+   - The Initial Developer of the Original Code is James Ross.
+   - Portions created by the Initial Developer are Copyright (C) 2004
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   James Ross <silver@warwickcompsoc.co.uk>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY window.title "Uneix-me al canal">
 
 <!ENTITY qsearch.label "Cerca ràpida:">
 <!ENTITY qsearch.accesskey "C">
 
 <!ENTITY topics.label "Cerca els temes com també els noms dels canals">
 <!ENTITY topics.accesskey "t">
--- a/extensions/irc/chrome/chatzilla.dtd
+++ b/extensions/irc/chrome/chatzilla.dtd
@@ -1,12 +1,8 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 <!ENTITY Menubar.tooltip "Menú principal">
 <!ENTITY Toolbar.tooltip "Barra principal">
 
 <!ENTITY multiline-expand.tooltip "Commuta a entrada de línia múltiple (Ctrl+Up)">
 <!ENTITY multiline-contract.tooltip "Commuta a entrada d'una sola línia (Ctrl+Avall)">
 <!ENTITY multiline-send.tooltip "Envia aquest text (Ctrl+tecla de retorn)">
 <!ENTITY server-nick.tooltip        "Canvia el sobrenom i posa en estat d'absent. Per a moure el focus al quadre d'entrada, premeu la tecla d'escapada.">
 
--- a/extensions/irc/chrome/chatzilla.properties
+++ b/extensions/irc/chrome/chatzilla.properties
@@ -1,11 +1,46 @@
-# 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/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is ChatZilla i18n strings, english
+#
+# The Initial Developer of the Original Code is
+# Chiaki Koufugata.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Chiaki Koufugata, original author
+#   Robert Ginda, rginda@netscape.com, owner/maintainer
+#   James Ross, twpol@aol.com, pref pages code
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 ### Notes for localizers ###
 #
 # The following version number is the "localisation version number", and MUST
 # match the locale.version in the original locale this is based on. In other
 # words, if the locale.version in two files is the same, both files MUST have
 # exactly the same list of locale strings.
 #
--- a/extensions/irc/chrome/chatzillaOverlay.dtd
+++ b/extensions/irc/chrome/chatzillaOverlay.dtd
@@ -1,7 +1,3 @@
-<!-- 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 ircCmd.label "Xat IRC">
 <!ENTITY ircCmd.accesskey "x">
 <!ENTITY ircCmd.commandkey "6">
--- a/extensions/irc/chrome/config.dtd
+++ b/extensions/irc/chrome/config.dtd
@@ -1,11 +1,43 @@
-<!-- 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/. -->
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is ChatZilla.
+   -
+   - The Initial Developer of the Original Code is James Ross.
+   - Portions created by the Initial Developer are Copyright (C) 2004
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   James Ross <silver@warwickcompsoc.co.uk>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY window.title "Les preferències del ChatZilla">
 
 <!ENTITY loading.label "S'està carregant…">
 
 <!ENTITY homepage.url "http://www.softcatala.org/wiki/ChatZilla">
 <!ENTITY homepage.label "La pàgina d'inici del ChatZilla en català">
 
--- a/extensions/irc/chrome/install-plugin.dtd
+++ b/extensions/irc/chrome/install-plugin.dtd
@@ -1,12 +1,8 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 <!ENTITY windowtitle                    "Instal·la el connector…">
 
 <!ENTITY name.label                     "Nom:">
 <!ENTITY name.accesskey                 "N">
 
 <!ENTITY name.autopick.label            "Escull un nom automàticament per mi">
 <!ENTITY name.autopick.accesskey        "A">
 
--- a/extensions/irc/chrome/pref-irc.dtd
+++ b/extensions/irc/chrome/pref-irc.dtd
@@ -1,12 +1,8 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 <!ENTITY pref-irc.window.title "Chatzilla">
 
 <!ENTITY pref-irc.open.title "Les preferències del Chatzilla">
 <!ENTITY pref-irc.open.desc "Les preferències del Chatzilla són massa extenses per a poder ajustar-se a aquesta finestra. En comptes, podeu obrir la finestra de preferències des d'aquí.">
 <!ENTITY pref-irc.open.label "Obre les preferències del Chatzilla">
 <!ENTITY pref-irc.open.accesskey "O">
 <!ENTITY startup.chat.label "ChatZilla">
 <!ENTITY startup.chat.accesskey "Z">
--- a/extensions/venkman/chrome/venkman-output-locale.css
+++ b/extensions/venkman/chrome/venkman-output-locale.css
@@ -1,13 +1,46 @@
 /* -*- 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/. */
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is The JavaScript Debugger.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Robert Ginda, <rginda@netscape.com>, original author
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
 
 /*
  * Note to translators: Only localize the text after "content:", don't touch
  * the [msg-type="FOO"] selectors.
  */
 
 .msg-data[msg-type="HELP"]:before {
     content: "Ajuda:";
--- a/extensions/venkman/chrome/venkman-overlay.dtd
+++ b/extensions/venkman/chrome/venkman-overlay.dtd
@@ -1,13 +1,46 @@
 <!--
    -
-   - 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/. -->
+   - ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is The JavaScript Debugger.
+   -
+   - The Initial Developer of the Original Code is
+   - Netscape Communications Corporation.
+   - Portions created by the Initial Developer are Copyright (C) 1998
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Robert Ginda, <rginda@netscape.com>, original author
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the GPL or the LGPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY venkmanCmd.label				        "Depurador de JavaScript">
 <!ENTITY venkmanCmd.accesskey "D">
 
 <!ENTITY vnkButton.label   "Depurador de JavaScript">
   
 <!ENTITY vnkMenu.label     "Depurador de JavaScript">
 <!ENTITY vnkMenu.accesskey "J">
--- a/extensions/venkman/chrome/venkman.dtd
+++ b/extensions/venkman/chrome/venkman.dtd
@@ -1,11 +1,43 @@
-<!-- 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 contents of this file are subject to the Mozilla Public License
+   - Version 1.1 (the "License"); you may not use this file except in
+   - compliance with the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/ 
+   - 
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License. 
+   -
+   - The Original Code is The JavaScript Debugger
+   - 
+   - The Initial Developer of the Original Code is
+   - Netscape Communications Corporation
+   - Portions created by Netscape are
+   - Copyright (C) 1998 Netscape Communications Corporation.
+   - All Rights Reserved.
+   -
+   - Alternatively, the contents of this file may be used under the
+   - terms of the GNU Public License (the "GPL"), in which case the
+   - provisions of the GPL are applicable instead of those above.
+   - If you wish to allow use of your version of this file only
+   - under the terms of the GPL and not to allow others to use your
+   - version of this file under the MPL, indicate your decision by
+   - deleting the provisions above and replace them with the notice
+   - and other provisions required by the GPL.  If you do not delete
+   - the provisions above, a recipient may use your version of this
+   - file under either the MPL or the GPL.
+   -
+   - Contributor(s):
+   -  Robert Ginda, <rginda@netscape.com>, original author
+   -
+   -->
 
 <!ENTITY MainWindow.title "Depurador de JavaScript">
 
 <!-- floating views -->
 <!ENTITY ViewFloat.tooltip      "Cliqueu aquí per fer aquesta vista flotable/no flotable">
 <!ENTITY ViewGrippy.tooltip     "Arrossegueu la barra de títol per a moure aquesta vista">
 <!ENTITY ViewClose.tooltip      "Cliqueu aquí per tancar aquesta vista">
 
--- a/extensions/venkman/chrome/venkman.properties
+++ b/extensions/venkman/chrome/venkman.properties
@@ -1,12 +1,45 @@
 #
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is The JavaScript Debugger.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Robert Ginda, <rginda@netscape.com>, original author
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 # NOTE ON LEADING/TRAILING SPACES AND QUOTES…
 # Strings in this file are stripped of leading and trailing quotes, if they are
 # present.  This allows you to express leading and trailing whitespace, which
 # would otherwise be trimmed by the stringbundle code.  In order to express
 # a leading or trailing quote, use two of them.
 #
 # For example…
--- a/mail/all-l10n.js
+++ b/mail/all-l10n.js
@@ -1,7 +1,39 @@
-# 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/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Firefox browser.
+#
+# The Initial Developer of the Original Code is
+# Benjamin Smedberg <bsmedberg@covad.net>
+# Portions created by the Initial Developer are Copyright (C) 2004
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 #filter substitution
 
 pref("general.useragent.locale", "@AB_CD@");
--- a/mail/chrome/messenger/aboutDialog.dtd
+++ b/mail/chrome/messenger/aboutDialog.dtd
@@ -13,17 +13,17 @@
 <!ENTITY contribute.getInvolvedLink "Col·laboreu-hi!">
 <!ENTITY contribute.end             "">
 <!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
 
 <!ENTITY bottomLinks.license        "Informació de la llicència">
 <!-- LOCALIZATION NOTE (bottomLinks.rights): This is a link title that links to about:rights. -->
 
 <!ENTITY bottomLinks.rights         "Drets dels usuaris finals">
-<!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to http://www.mozilla.com/legal/privacy/. -->
+<!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to https://www.mozilla.org/legal/privacy/. -->
 
 <!ENTITY bottomLinks.privacy        "Política de privadesa">
 <!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
 
 <!ENTITY update.checkingForUpdates  "Comprovació de les actualitzacions…">
 <!-- LOCALIZATION NOTE (update.checkingAddonCompat): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.checkingAddonCompat "Compatibilitat dels complements…">
 <!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
--- a/mail/chrome/messenger/aboutRights.dtd
+++ b/mail/chrome/messenger/aboutRights.dtd
@@ -1,8 +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/. -->
 <!-- rights.locale-direction instead of the usual local.dir entity, so RTL can skip translating page. -->
 <!ENTITY rights.locale-direction "ltr">
 <!ENTITY rights.title            "Quant als vostres drets">
 <!ENTITY rights.intro-header     "Quant als vostres drets">
 <!ENTITY rights.intro "El &brandFullName; és un programa de codi lliure desenvolupat per una comunitat de milers de persones d'arreu del món. En aquest sentit, hi ha unes quantes coses que cal que conegueu:">
 <!-- Note on pointa / pointb / pointc form:
      These points each have an embedded link in the HTML, so each point is
      split into chunks for text before the link, the link text, and the text
--- a/mail/chrome/messenger/accountCreation.properties
+++ b/mail/chrome/messenger/accountCreation.properties
@@ -1,8 +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/.
 # accountCreation.properties
 
 # LOCALIZATION NOTE(cleartext_warning): %1$S will be the hostname of the server the user was trying to connect to.
 cleartext_warning=%1$S no utilitza encriptació.
 # LOCALIZATION NOTE(selfsigned_warning): %1$S will be the hostname of the server the user was trying to connect to.
 selfsigned_warning=%1$S no utilitza un certificat comprovable.
 selfsigned_details=Normalment, un servidor de correu que sigui segur tindrà un certificat autentificat per demostrar que realment és el servidor que diu que és. S'encriptarà la connexió amb el servidor de correu però no es podrà validar que sigui el servidor correcte.
 cleartext_details=Els servidors de correu insegurs no utilitzen connexions encriptades per protegir la vostra contrasenya i la vostra informació privada. Si us connecteu a aquest servidor estareu exposant aquesta informació.
--- a/mail/chrome/messenger/am-addressing.dtd
+++ b/mail/chrome/messenger/am-addressing.dtd
@@ -14,17 +14,17 @@
 <!ENTITY editDirectories.accesskey "E">
 <!-- LOCALIZATION NOTE (directories.label) : do not translate "LDAP" in below line -->
 <!ENTITY directories.label         "Utilitza un altre servidor LDAP:">
 <!ENTITY directories.accesskey     "D">
 <!ENTITY directoriesNone.label     "Cap">
 <!-- am-addressing.xul -->
 
 
-<!ENTITY compositionGroupTitle.label "Redacció">
+<!ENTITY compositionGroupTitle.label          "Redacció">
 <!-- LOCALIZATION NOTE (useHtml.label) : do not translate "html" in below line -->
 <!ENTITY useHtml.label                        "Redacta els missatges en format HTML">
 <!ENTITY useHtml.accesskey                    "H">
 <!ENTITY autoQuote.label                      "Cita automàticament el missatge original en respondre">
 <!ENTITY autoQuote.accesskey                  "a">
 <!-- LOCALIZATION NOTE (then.label): This will concatenate with the 4 strings that follow. -->
 <!ENTITY then.label                           "Llavors,">
 <!ENTITY then.accesskey                       "L">
@@ -34,8 +34,14 @@
 <!ENTITY place.label                          "i posa la meva signatura">
 <!ENTITY place.accesskey                      "p">
 <!ENTITY belowText.label                      "sota el text citat (recomanat)">
 <!ENTITY aboveText.label                      "sota la resposta (abans del text citat)">
 <!ENTITY includeSigOnReply.label              "Inclou la signatura a les respostes">
 <!ENTITY includeSigOnReply.accesskey          "r">
 <!ENTITY includeSigOnForward.label            "Inclou la signatura als reenviaments">
 <!ENTITY includeSigOnForward.accesskey        "r">
+
+<!ENTITY globalComposingPrefs.label           "Preferències globals de redacció...">
+<!ENTITY globalComposingPrefs.accesskey       "G">
+
+<!ENTITY globalAddressingPrefs.label          "Preferències globals d'adreçament...">
+<!ENTITY globalAddressingPrefs.accesskey      "P">
--- a/mail/chrome/messenger/am-identities-list.dtd
+++ b/mail/chrome/messenger/am-identities-list.dtd
@@ -1,13 +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/. -->
 
-<!ENTITY identitiesListDesc.label "Suport per a múltiples identitats">
+<!ENTITY identitiesListManageDesc.label "Gestioneu les identitats d'aquest compte. S'utilitza la primera identitat per defecte.">
 <!ENTITY identitiesListAdd.label  "Afegeix…">
 <!ENTITY identitiesListAdd.accesskey  "A">
 <!ENTITY identitiesListEdit.label "Edita…">
 <!ENTITY identitiesListEdit.accesskey "E">
+<!ENTITY identitiesListDefault.label "Defineix com a per defecte">
+<!ENTITY identitiesListDefault.accesskey "D">
 <!ENTITY identitiesListDelete.label "Suprimeix">
 <!ENTITY identitiesListDelete.accesskey "S">
 <!ENTITY identitiesListClose.label "Tanca">
 <!ENTITY identitiesListClose.accesskey "c">
--- a/mail/chrome/messenger/am-junk.dtd
+++ b/mail/chrome/messenger/am-junk.dtd
@@ -21,8 +21,11 @@
 <!ENTITY whitelistHeader.accesskey "D">
 
 <!ENTITY ispHeadersWarning.label "Si està habilitat, &brandShortName; considerarà automàticament els missatges marcats per aquest classificador extern com a correu brossa.">
 <!ENTITY ispHeaders.label "Confia en les capçaleres de missatge brossa definides per: ">
 <!ENTITY ispHeaders.accesskey "f">
 
 <!ENTITY junkClassification.label "Selecció">
 <!ENTITY junkActions.label "Destinació i retenció">
+
+<!ENTITY globalJunkPrefs.label "Preferències globals del correu brossa...">
+<!ENTITY globalJunkPrefs.accesskey "G">
--- a/mail/chrome/messenger/am-mdn.dtd
+++ b/mail/chrome/messenger/am-mdn.dtd
@@ -1,17 +1,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY pane.title                   "Confirmacions de recepció">
 <!ENTITY useGlobalPrefs.label         "Utilitza les preferències globals de confirmació de recepció en aquest compte">
 <!ENTITY useGlobalPrefs.accesskey     "U">
 <!ENTITY globalReceipts.label         "Preferències globals…">
-<!ENTITY globalReceipts.accesskey     "G">
+<!ENTITY globalReceipts.accesskey     "g">
 <!ENTITY useCustomPrefs.label         "Personalitza les confirmacions de recepció per a aquest compte">
 <!ENTITY useCustomPrefs.accesskey     "P">
 <!ENTITY requestReceipt.label         "Quan s'estan enviant missatges, sempre sol·licita una confirmació de recepció">
 <!ENTITY requestReceipt.accesskey     "Q">
 <!ENTITY receiptArrive.label          "Quan arribi una confirmació de recepció:">
 <!ENTITY leaveIt.label                "Deixa-la a la safata d'entrada">
 <!ENTITY leaveIt.accesskey            "i">
 <!-- LOCALIZATION NOTE moveToSent.label Translate: 'Sent' according to Netscape glossary -->
--- a/mail/chrome/messenger/filter.properties
+++ b/mail/chrome/messenger/filter.properties
@@ -18,17 +18,21 @@ invalidCustomHeader=Un dels vostres filtres utilitza una capçalera personalitzada que conté un caràcter no vàlid, , com ara «:», un caràcter no imprimible, un caràcter que no pertany a l'ASCII o un caràcter ASCII de vuit bits. Editeu el fitxer msgFilterRules.dat, que conté els vostres filtres, per treure els caràcters no vàlids de les capçaleres personalitzades.
 continueFilterExecution=No s'ha pogut aplicar el filtre %S. Voleu seguir aplicant filtres?
 promptTitle=Filtres en execució
 promptMsg=Actualment us trobeu en el procés de filtratge de missatges. Voleu seguir aplicant filtres?
 stopButtonLabel=Atura
 continueButtonLabel=Continua
 cannotEnableFilter=Probablement, aquest filtre es va crear amb una versió més recent de Mozilla/Netscape. No podeu habilitar aquest filtre perquè es desconeix com aplicar-lo.
 dontWarnAboutDeleteCheckbox=No m'ho tornis a demanar
 searchTermsInvalidTitle=Els criteris de cerca no són vàlids
-searchTermsInvalidMessage=Aquest filtre no es pot desar perquè alguns criteris de cerca no són vàlids en el context actual.
+# LOCALIZATION NOTE(searchTermsInvalidRule)
+# %1$S=search attribute name from the invalid rule
+# %2$S=search operator from the bad rule
+searchTermsInvalidRule=Aquest filtre no es pot desar perquè el terme de cerca «%1$S %2$S» no es vàlid en el context actual.
+
 filterCountVisibleOfTotal=%1$S de %2$S
 ## LOCALIZATION NOTE(filterCountItems): Semi-colon list of plural forms.
 ## See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 ## #1 is the count of items in the list.# filterCountItems is a pluralForm - see 
 filterCountItems=#1 element; #1 elements
 # for junk mail logging / mail filter logging
 # LOCALIZATION NOTE(junkLogDetectStr)
 # %1$S=author, %2$S=subject, %3$S=date
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -246,44 +246,16 @@
 <!ENTITY viewFeedWebPage.accesskey "w">
 <!ENTITY viewFeedSummary.label "Resum">
 <!ENTITY viewFeedSummary.accesskey "R">
 <!ENTITY viewFeedSummaryFeedPropsPref.label "Format per defecte">
 <!ENTITY viewFeedSummaryFeedPropsPref.accesskey "d">
 
 <!ENTITY viewAttachmentsInlineCmd.label "Visualitza les adjuncions en línia">
 <!ENTITY viewAttachmentsInlineCmd.accesskey "V">
-<!-- LOCALIZATION NOTE :
-fullZoomEnlargeCmd.commandkey3, fullZoomReduceCmd.commandkey2 and
-fullZoomResetCmd.commandkey2 are alternative acceleration keys for zoom.
-If shift key is needed with your locale popular keyboard for them,
-you can use these alternative items. Otherwise, their values should be empty.  -->
-
-
-<!ENTITY fullZoomEnlargeCmd.label       "Augmenta">
-<!ENTITY fullZoomEnlargeCmd.accesskey   "g">
-<!ENTITY fullZoomEnlargeCmd.commandkey  "+">
-<!-- + is above this key on many keyboards -->
-<!ENTITY fullZoomEnlargeCmd.commandkey2 "="> 
-<!ENTITY fullZoomEnlargeCmd.commandkey3 "">
-
-<!ENTITY fullZoomReduceCmd.label        "Redueix">
-<!ENTITY fullZoomReduceCmd.accesskey    "d">
-<!ENTITY fullZoomReduceCmd.commandkey   "-">
-<!ENTITY fullZoomReduceCmd.commandkey2  "">
-
-<!ENTITY fullZoomResetCmd.label         "Restableix">
-<!ENTITY fullZoomResetCmd.accesskey     "R">
-<!ENTITY fullZoomResetCmd.commandkey    "0">
-<!ENTITY fullZoomResetCmd.commandkey2   "">
-
-<!ENTITY fullZoomToggleCmd.label        "Fes zoom només del text">
-<!ENTITY fullZoomToggleCmd.accesskey    "t">
-<!ENTITY fullZoom.label                 "Zoom">
-<!ENTITY fullZoom.accesskey             "Z">
 
 <!ENTITY pageSourceCmd.label "Codi font del missatge">
 <!ENTITY pageSourceCmd.accesskey "o">
 <!ENTITY pageSourceCmd.key "u">
 <!ENTITY getNewMessagesCmd.key "y">
 <!ENTITY getAllNewMessagesCmd.key "Y">
 <!-- Search Menu -->
 
@@ -504,17 +476,17 @@ you can use these alternative items. Oth
 <!ENTITY deleteJunk.label "Suprimeix la brossa de la carpeta">
 <!ENTITY deleteJunk.accesskey "x">
 <!ENTITY importCmd.label "Importa…">
 <!ENTITY importCmd.accesskey "I">
 <!ENTITY errorConsoleCmd.label "Consola d'errors">
 <!ENTITY errorConsoleCmd.accesskey "C">
 <!ENTITY errorConsoleCmd.commandkey "j">
 <!ENTITY clearRecentHistory.label "Neteja l'historial recent…">
-<!ENTITY clearRecentHistory.accesskey "H">
+<!ENTITY clearRecentHistory.accesskey "h">
 <!ENTITY accountManagerCmd.label "Paràmetres dels comptes…">
 <!ENTITY accountManagerCmd.accesskey "P">
 <!-- LOCALIZATION NOTE (accountManagerCmdUnix.accesskey): belongs to accountManagerCmd.label,
         which is placed under the Edit menu on Unix systems -->
 <!ENTITY accountManagerCmdUnix.accesskey "a">
 <!-- Mail Toolbar -->
 
 <!ENTITY getMsgButton.label "Recupera">
@@ -546,17 +518,17 @@ you can use these alternative items. Oth
 <!ENTITY addressBookButton.label "Llibreta d'adreces">
 <!ENTITY chatButton.label "Xat">
 <!ENTITY glodaSearch.title "Cerca global">
 <!ENTITY searchItem.title "Cerca ràpida">
 <!ENTITY mailViewsToolbarItem.title "Vistes de la missatgeria">
 <!ENTITY folderLocationToolbarItem.title "Ubicació de la carpeta">
 <!ENTITY tagButton.label "Etiqueta">
 <!ENTITY compactButton.label "Compacta">
-<!ENTITY appmenuButton.label "Menú App">
+<!ENTITY appmenuButton.label "Menú d'aplicacions">
 <!-- Mail Toolbar Tooltips-->
 
 <!ENTITY advancedButton.tooltip "Cerca avançada de missatges">
 <!ENTITY getMsgButton.tooltip "Recupera els missatges nous">
 <!ENTITY getAllNewMsgCmd.label "Recupera tots els missatges nous">
 <!ENTITY getAllNewMsgCmd.accesskey "p">
 <!ENTITY newMsgButton.tooltip "Crea un nou missatge">
 <!ENTITY replyButton.tooltip "Respon el missatge">
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -465,17 +465,17 @@ copyToFolderAgainAccessKey=T
 alwaysLoadRemoteContentForSender2= Carrega 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 des de %2$S) ha sol·licitat ser notificat quan llegiu aquest missatge.
 
 # Strings for growl notifications on Mac OS X
-growlNotification=Correu nou
+growlNotification=Missatges nous
 
 # 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ó
 emptyTrashMessage=Esteu segur que voleu suprimir permanentment tots els missatges i subcarpetes de la paperera?
 emptyTrashDontAsk=No m'ho tornis a demanar.
--- a/mail/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/chrome/messenger/messengercompose/composeMsgs.properties
@@ -433,8 +433,13 @@ cloudAttachmentCountHeader=He enllaçat #1 fitxer al missatge:;He enllaçat #1 fitxers al missatge:
 cloudAttachmentListFooter=El %1$S facilita compartir fitxers grans amb el correu electrònic.
 
 ## LOCALIZATION NOTE(cloudAttachmentListItem): A line of text describing a cloud
 ## attachment, to be inserted into the message body. Do not translate the words
 ## %1$S, %2$S, %3$S, or %4$S. %1$S is the attachment name, %2$S is its size,
 ## %3$S is the name of the cloud storage service, and %4$S is the link to the
 ## attachment.
 cloudAttachmentListItem=* %1$S (%2$S) hostatjat a %3$S: %4$S
+
+## LOCALIZATION NOTE(stopShowingUploadingNotification): This string is used in the Filelink
+## upload notification bar to allow the user to dismiss the notification permanently.
+stopShowingUploadingNotification.accesskey=N
+stopShowingUploadingNotification.label=No tornis a mostrar-ho
--- a/mail/chrome/messenger/messengercompose/messengercompose.dtd
+++ b/mail/chrome/messenger/messengercompose/messengercompose.dtd
@@ -1,17 +1,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!--LOCALIZATION NOTE messengercompose.dtd Main UI for message composition -->
 
 <!ENTITY msgComposeWindow.title "Redacta: (sense assumpte)">
 <!-- File Menu -->
 
-<!ENTITY fileMenu.label "Fitxer"> 
+<!ENTITY fileMenu.label "Fitxer">
 <!ENTITY fileMenu.accesskey "F">
 <!ENTITY newMenu.label "Nou">
 <!ENTITY newMenu.accesskey "N">
 <!ENTITY newMessage.label "Missatge">
 <!ENTITY newMessage.key "M">
 <!ENTITY newMessageCmd2.key "N">
 <!ENTITY newMessage.accesskey "M">
 <!ENTITY newContact.label "Contacte de la llibreta d'adreces…">
@@ -50,75 +50,75 @@
 <!ENTITY sendLaterCmd.accesskey "l">
 <!ENTITY printSetupCmd.label "Configuració de la pàgina…">
 <!ENTITY printSetupCmd.accesskey "g">
 <!ENTITY printCmd.label "Imprimeix…">
 <!ENTITY printCmd.key "P">
 <!ENTITY printCmd.accesskey "p">
 <!-- Edit Menu -->
 
-<!ENTITY editMenu.label "Edita"> 
+<!ENTITY editMenu.label "Edita">
 <!ENTITY editMenu.accesskey "E">
 <!ENTITY undoCmd.label "Desfés">
 <!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "D"> 
+<!ENTITY undoCmd.accesskey "D">
 <!ENTITY redoCmd.label "Refés">
 <!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R"> 
+<!ENTITY redoCmd.accesskey "R">
 <!ENTITY cutCmd.label "Retalla">
 <!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t"> 
+<!ENTITY cutCmd.accesskey "t">
 <!ENTITY copyCmd.label "Copia">
 <!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C"> 
+<!ENTITY copyCmd.accesskey "C">
 <!ENTITY pasteCmd.label "Enganxa">
 <!ENTITY pasteCmd.key "V">
 <!ENTITY pasteCmd.accesskey "x">
 <!ENTITY pasteNoFormattingCmd.key "V">
 <!ENTITY pasteAsQuotationCmd.key "o">
 <!ENTITY editRewrapCmd.accesskey "j">
 <!ENTITY deleteCmd.label "Suprimeix">
 <!ENTITY deleteCmd.accesskey "u">
 <!ENTITY editRewrapCmd.label "Torna a ajustar">
 <!ENTITY editRewrapCmd.key "R">
 <!ENTITY renameAttachmentCmd.label "Canvia el nom del fitxer adjunt...">
 <!ENTITY renameAttachmentCmd.accesskey "e">
 <!ENTITY selectAllCmd.label "Selecciona-ho tot">
 <!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "a"> 
+<!ENTITY selectAllCmd.accesskey "a">
 <!ENTITY findCmd.label "Cerca i reemplaça…">
 <!ENTITY findCmd.key "F">
 <!ENTITY findCmd.accesskey "m">
 <!ENTITY findAgainCmd.label "Torna a cercar">
 <!ENTITY findAgainCmd.key "G">
 <!ENTITY findAgainCmd.accesskey "o">
 <!ENTITY findAgainCmd.key2 "VK_F3">
 <!ENTITY findPrevCmd.label "Cerca l'anterior">
 <!ENTITY findPrevCmd.key "G">
 <!ENTITY findPrevCmd.key2 "VK_F3">
-<!ENTITY findPrevCmd.accesskey "n"> 
+<!ENTITY findPrevCmd.accesskey "n">
 <!-- View Menu -->
 
-<!ENTITY viewMenu.label "Visualitza"> 
+<!ENTITY viewMenu.label "Visualitza">
 <!ENTITY viewMenu.accesskey "V">
-<!ENTITY viewToolbarsMenuNew.label "Barres d'eines"> 
-<!ENTITY viewToolbarsMenuNew.accesskey "B"> 
+<!ENTITY viewToolbarsMenuNew.label "Barres d'eines">
+<!ENTITY viewToolbarsMenuNew.accesskey "B">
 <!ENTITY menubarCmd.label "Barra de menú">
 <!ENTITY menubarCmd.accesskey "m">
 <!ENTITY showCompositionToolbarCmd.label "Barra de redacció">
 <!ENTITY showCompositionToolbarCmd.accesskey "d">
 <!ENTITY showFormattingBarCmd.label "Barra de format">
 <!ENTITY showFormattingBarCmd.accesskey "f">
 <!ENTITY showTaskbarCmd.label "Barra d'estat">
 <!ENTITY showTaskbarCmd.accesskey "s">
 <!ENTITY customizeToolbar.label "Personalitza…">
 <!ENTITY customizeToolbar.accesskey "P">
 
-<!ENTITY addressSidebar.label "Barra lateral de contactes"> 
-<!ENTITY addressSidebar.accesskey "o"> 
+<!ENTITY addressSidebar.label "Barra lateral de contactes">
+<!ENTITY addressSidebar.accesskey "o">
 <!-- Format Menu -->
 
 <!ENTITY formatMenu.label "Format">
 <!ENTITY formatMenu.accesskey "o">
 <!-- Options Menu -->
 
 <!ENTITY optionsMenu.label "Opcions">
 <!ENTITY optionsMenu.accesskey "p">
@@ -176,57 +176,57 @@
 <!ENTITY addressBookCmd.accesskey "a">
 <!ENTITY addressBookCmd.key "B">
 <!ENTITY accountManagerCmd.label "Paràmetres dels comptes…">
 <!ENTITY accountManagerCmd.accesskey "P">
 <!ENTITY accountManagerCmdUnix.accesskey "s">
 <!ENTITY preferencesCmd.label "Opcions…">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label       "Preferències">
-<!ENTITY preferencesCmdUnix.accesskey   "n"> 
+<!ENTITY preferencesCmdUnix.accesskey   "n">
 <!--  Mac OS X Window Menu -->
 
 <!ENTITY minimizeWindow.key "m">
 <!ENTITY minimizeWindow.label "Minimitza la finestra">
 <!ENTITY bringAllToFront.label "Porta-ho tot al davant">
-<!ENTITY zoomWindow.label "Finestra del zoom"> 
+<!ENTITY zoomWindow.label "Finestra del zoom">
 <!ENTITY windowMenu.label "Finestra">
 <!-- Mail Toolbar -->
 
 <!ENTITY sendButton.label "Envia">
 <!ENTITY quoteButton.label "Cita">
 <!ENTITY addressButton.label "Adreça">
 <!ENTITY attachButton.label "Adjunta">
 <!ENTITY spellingButton.label "Ortografia">
 <!ENTITY saveButton.label "Desa">
 <!-- Mail Toolbar Tooltips -->
 
-<!ENTITY sendButton.tooltip "Envia ara aquest missatge"> 
-<!ENTITY sendlaterButton.tooltip "Envia aquest missatge més tard"> 
-<!ENTITY quoteButton.tooltip "Cita el missatge anterior"> 
-<!ENTITY addressButton.tooltip "Seleccioneu un destinatari d'una Llibreta d'adreces"> 
-<!ENTITY attachButton.tooltip "Adjunta un fitxer a aquest missatge"> 
+<!ENTITY sendButton.tooltip "Envia ara aquest missatge">
+<!ENTITY sendlaterButton.tooltip "Envia aquest missatge més tard">
+<!ENTITY quoteButton.tooltip "Cita el missatge anterior">
+<!ENTITY addressButton.tooltip "Seleccioneu un destinatari d'una Llibreta d'adreces">
+<!ENTITY attachButton.tooltip "Adjunta un fitxer a aquest missatge">
 <!ENTITY spellingButton.tooltip "Comprova l'ortografia de la selecció o del missatge sencer">
-<!ENTITY saveButton.tooltip "Desa aquest missatge"> 
+<!ENTITY saveButton.tooltip "Desa aquest missatge">
 <!ENTITY cutButton.tooltip              "Retalla">
 <!ENTITY copyButton.tooltip             "Copia">
 <!ENTITY pasteButton.tooltip            "Enganxa">
 <!-- Headers -->
 <!--LOCALIZATION NOTE headersSpace.style is for aligning  the From:, To: and
     Subject: rows. It should be larger than the largest Header label  -->
 
 <!ENTITY headersSpace.style "width: 9em;">
 <!ENTITY fromAddr.label "De:">
 <!ENTITY fromAddr.accesskey "D">
-<!ENTITY toAddr.label "A:"> 
-<!ENTITY ccAddr.label "Cc:"> 
-<!ENTITY bccAddr.label "Cco:"> 
-<!ENTITY replyAddr.label "Respon-A:"> 
-<!ENTITY newsgroupsAddr.label "Grup de discussió:"> 
-<!ENTITY followupAddr.label "Seguiment-A:"> 
+<!ENTITY toAddr.label "A:">
+<!ENTITY ccAddr.label "Cc:">
+<!ENTITY bccAddr.label "Cco:">
+<!ENTITY replyAddr.label "Respon-A:">
+<!ENTITY newsgroupsAddr.label "Grup de discussió:">
+<!ENTITY followupAddr.label "Seguiment-A:">
 <!ENTITY subject.label "Assumpte:">
 <!ENTITY subject.accesskey "s">
 <!-- LOCALIZATION NOTE attachments.accesskey This access key should correspond
      to the strings in attachmentCount in composeMsgs.properties -->
 <!ENTITY attachments.accesskey "j">
 <!-- Format Toolbar, imported from editorAppShell.xul -->
 
 <!ENTITY SmileButton.tooltip "Insereix una cara somrient">
--- a/mail/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/chrome/messenger/msgHdrViewOverlay.dtd
@@ -65,17 +65,17 @@
 <!ENTITY saveAsMenuItem1.accesskey "A">
 <!ENTITY viewSourceMenuItem1.label "Codi font">
 <!ENTITY viewSourceMenuItem1.accesskey "C">
 <!ENTITY otherActionsPrint1.label "Imprimeix...">
 <!ENTITY otherActionsPrint1.accesskey "I">
 <!-- Attachment bar context menu items -->
 
 <!ENTITY startExpandedCmd.label    "Inicialment mostra la subfinestra d'adjuncions">
-<!ENTITY startExpandedCmd.accesskey    "S">
+<!ENTITY startExpandedCmd.accesskey    "s">
 <!-- Attachment context menu items -->
 
 <!ENTITY openAttachmentCmd.label    "Obre">
 <!ENTITY openAttachmentCmd.accesskey    "O">
 <!ENTITY saveAsAttachmentCmd.label    "Anomena i desa…">
 <!ENTITY saveAsAttachmentCmd.accesskey    "A">
 <!ENTITY detachAttachmentCmd.label    "Separa…">
 <!ENTITY detachAttachmentCmd.accesskey    "p">
--- a/mail/chrome/messenger/preferences/preferences.properties
+++ b/mail/chrome/messenger/preferences/preferences.properties
@@ -54,20 +54,17 @@ typeDetailsWithTypeOrExt=(%1$S)
 
 # LOCALIZATION NOTE (typeDetailsWithTypeAndExt):
 # %1$S = type (for example "application/pdf")
 # %2$S = extensions (for example ".pdf, .pdfx")
 typeDetailsWithTypeAndExt=(%1$S: %2$S)
 
 #### Sound Notifications
 soundFilePickerTitle=Trieu un so
-
-#### Shell Service
-alreadyDefaultClientTitle=Client per defecte
-alreadyDefault=El %S ja és el vostre client de correu per defecte.
+soundFilesDescription=Fitxers de So
 
 #### Attachment Reminder
 attachmentReminderAddDialogTitle=Afegeix una paraula clau
 attachmentReminderAddText=Paraula clau:
 attachmentReminderEditDialogTitle=Edita la paraula clau
 attachmentReminderEditText=Paraula clau:
 
 #### Cookies
--- a/mail/chrome/messenger/prefs.properties
+++ b/mail/chrome/messenger/prefs.properties
@@ -10,16 +10,17 @@ modifiedAccountExists=Ja existeix un compte amb aquests noms d'usuari i de servidor. Introduïu un altre nom d'usuari i/o de servidor.
 userNameChanged=S'ha actualitzat el vostre nom d'usuari. Potser també us caldrà actualitzar l'adreça electrònica i/o el nom d'usuari associats amb aquest compte.
 serverNameChanged=El paràmetre del nom del servidor ha canviat. Comproveu que totes les carpetes utilitzades pels filtres són al nou servidor.
 # LOCALIZATION NOTE (junkSettingsBroken): %1$S is the account name
 junkSettingsBroken=El registre de dades d'entrenament del correu brossa indica un possible problema al compte «%1$S». Voleu revisar la configuració abans de desar els canvis?
 # LOCALIZATION NOTE (localDirectoryChanged): %1$S is program name (&brandShortName;)
 localDirectoryChanged=Cal reiniciar el %1$S per aplicar el canvi de configuració de directori local.
 localDirectoryRestart=Reinicia
 serverNameEmpty=Els camps del nom d'usuari i servidor són obligatoris.
+localDirectoryInvalid=El directori indicat en el paràmetre de Directori Local no és vàlid. Trieu un directori diferent.
 # if the user chooses to cancel the wizard when no accounts are there throw a message
 # LOCALIZATION NOTE (cancelWizard)
 # do not localize "\n\n"
 cancelWizard=Esteu segur que voleu cancel·lar l'auxiliar de comptes?\n\nSi no configureu cap compte no podreu enviar ni rebre missatges.
 accountWizard=Auxiliar de comptes
 WizardExit=Surt
 WizardContinue=Cancel·la
 # when the wizard already has a domain (Should we say something different?)
@@ -29,17 +30,19 @@ failedRemoveAccount=No s'ha pogut elimin
 confirmRemoveAccount=Esteu segur que voleu eliminar el compte %S?
 confirmRemoveAccountTitle=Suprimeix el compte
 #LOCALIZATION NOTE: accountName: %1$S is server name, %2$S is user name
 accountName=%1$S - %2$S
 
 confirmDeferAccount=Si emmagatzemeu el nou correu d'aquest compte en una safata d'entrada d'un altre compte, no podreu tornar a accedir als missatges baixats per a aquest compte. Si teniu missatges en aquest compte, copieu-lo a un altre compte primer. Si teniu filtres que filtren aquest correu a aquest compte, hauríeu d'inhabilitar-los o canviar la carpeta de destinació. Si qualsevol compte té carpetes especials en aquest compte (Enviat, Esborranys, Plantilles), hauríeu de canviar-les a un altre compte. Voleu encara emmagatzemar el correu d'aquest compte en un altre?
 confirmDeferAccountTitle=Voleu deferir el compte?
 
-directoryUsedByOtherAccount=Aquest directori ja l'utilitza el compte %S. Trieu un directori diferent.
+directoryAlreadyUsedByOtherAccount=El directori indicat en el paràmetre Directori Local ja ha estat utilitzat pel compte «%S». Trieu un directori diferent.
+directoryParentUsedByOtherAccount=Un directori pare del directori indicat en el paràmetre Directori Local ja ha estat utilitzat pel compte «%S». Trieu un directori diferent.
+directoryChildUsedByOtherAccount=Un subdirectori del directori indicat com a paràmetre al Directori Local ja ha estat utilitzat per el compte "%S". Si us plau trieu un directori diferent.
 #Provide default example values for sample email address
 exampleEmailUserName=usuari
 exampleEmailDomain=exemple.net
 emailFieldText=Adreça electrònica:
 #LOCALIZATION NOTE: defaultEmailText: %1$S is user name, %2$S is domain
 defaultEmailText=Introduïu la vostra adreça electrònica, que és l'adreça que els altres utilitzaran per enviar-vos correu (per exemple, «%1$S@%2$S»). 
 #LOCALIZATION NOTE: customizedEmailText: %1$S is provider, %2$S is email username, %3$S is sample email, %4$S is sample username
 customizedEmailText=Introduïu el vostre %1$S %2$S (per exemple, si la vostra adreça electrònica %1$S és «%3$S», el vostre %2$S és «%4$S»). 
--- a/mobile/android/base/android_strings.dtd
+++ b/mobile/android/base/android_strings.dtd
@@ -7,17 +7,16 @@
 <!ENTITY  splash_bookmarks_history "S\'estan actualitzant les adreces d\'interès i l\'historial; això pot trigar una estona.">
 
 <!ENTITY  no_space_to_start_error "No hi ha prou espai disponible per al &brandShortName; per iniciar-se.">
 <!ENTITY  error_loading_file "S\'ha produït un error quan es provava de carregar fitxers necessaris per executar el &brandShortName;">
 
 <!ENTITY  awesomebar_all_pages_title "Habituals">
 <!ENTITY  awesomebar_bookmarks_title "D\'interès">
 <!ENTITY  awesomebar_history_title "Historial">
-<!ENTITY  awesomebar_search_engine "Cerca \&quot;&#037;s\&quot;">
 
 <!ENTITY  crash_reporter_title "Informe de fallades del &brandShortName;">
 <!ENTITY  crash_message "El &brandShortName; ha fallat. Les vostres pestanyes haurien de sortir llistades a la pàgina d\'inici del &brandShortName; en reiniciar.">
 <!ENTITY  crash_help_message "Ajudeu-nos a solucionar aquest problema!">
 <!ENTITY  crash_send_report_message "Envia un informe de fallada a Mozilla">
 <!ENTITY  crash_include_url "Inclou l\'adreça de la pàgina">
 <!ENTITY  crash_close_label "Tanca">
 <!ENTITY  crash_restart_label "Reinicia el &brandShortName;">
@@ -77,34 +76,36 @@
 <!ENTITY pref_char_encoding_on "Mostra el menú">
 <!ENTITY pref_char_encoding_off "No mostris el menú">
 <!ENTITY pref_clear_private_data "Neteja les dades privades">
 <!ENTITY pref_plugins "Connectors">
 <!ENTITY pref_plugins_enabled "Habilitat">
 <!ENTITY pref_plugins_tap_to_play "Toqueu per engegar">
 <!ENTITY pref_plugins_disabled "Inhabilitat">
 <!ENTITY pref_text_size "Mida de la lletra">
+<!ENTITY pref_reflow_on_zoom "Habilita el reflux de zoom">
 <!ENTITY pref_font_size_tiny "Molt petita">
 <!ENTITY pref_font_size_small "Petita">
 <!ENTITY pref_font_size_medium "Mitjana">
 <!ENTITY pref_font_size_large "Grossa">
 <!ENTITY pref_font_size_xlarge "Molt grossa">
 <!ENTITY pref_font_size_set "Defineix">
 <!-- Localization note (pref_font_size_adjust_char): A button with a small version of this character
 (or combination of characters) is used to decrease the preview font size; a larger version of the
 same character/combination is used to increase the preview font size. It should be a concise
 representation of the language it is used in that will help show the text in the preview will change
 size. -->
 <!ENTITY pref_font_size_adjust_char "A">
 <!-- Localization note (pref_font_size_preview_text): This paragraph is used as an example to
     demonstrate the font size setting.  It is meant to be whimsical and fun. -->
 
-<!ENTITY pref_font_size_preview_text "La ràpida guineu taronja salta per sobre de les vostres expectatives amb més velocitat, més flexibilitat i més seguretat. Com a organització sense ànim de lucre, som lliures d\'innovar en el vostre nom sense cap tipus de pressió a l\'hora de comprometre\'ns. Això vol dir que us podem oferir una millor experiència i un futur més brillant per al Web.">
+<!ENTITY pref_font_size_preview_text "La ràpida guineu taronja salta per sobre de les vostres expectatives, amb més velocitat, més flexibilitat i més seguretat. Com a organització sense ànim de lucre, som lliures d'innovar en el vostre nom sense cap tipus de pressió a l'hora de comprometre'ns. Això vol dir que us podem oferir una millor experiència i un futur més brillant per al Web.">
 
 <!ENTITY pref_use_master_password "Contrasenya mestra">
+<!ENTITY pref_show_product_announcements "Mostra notícies de producte">
 <!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_cookies2 "Galetes i sessions actives">
 <!ENTITY pref_private_data_passwords "Contrasenyes desades">
 <!ENTITY pref_private_data_cache "Memòria cau">
@@ -119,25 +120,27 @@ size. -->
 <!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">
+<!ENTITY tools "Eines">
 <!-- 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">
 
 <!ENTITY contextmenu_open_new_tab "Obre en una pestanya nova">
+<!ENTITY contextmenu_open_in_reader "Obre en el Lector">
 <!ENTITY contextmenu_remove_history "Suprimeix">
 <!ENTITY contextmenu_remove_bookmark "Suprimeix">
 <!ENTITY contextmenu_add_to_launcher "Afegeix-ho a la pantalla inicial">
 <!ENTITY contextmenu_share "Comparteix">
 <!ENTITY contextmenu_pasteandgo "Enganxa-ho i vés-hi">
 <!ENTITY contextmenu_paste "Enganxa">
 <!ENTITY contextmenu_copyurl "Copia l\'adreça">
 <!ENTITY contextmenu_edit_bookmark "Edita">
@@ -155,46 +158,50 @@ size. -->
 <!ENTITY site_settings_cancel       "Cancel·la">
 <!ENTITY site_settings_clear        "Neteja">
 <!ENTITY site_settings_no_settings  "No hi ha cap opció per netejar.">
 
 <!ENTITY reading_list "Llista de lectura">
 <!ENTITY reading_list_added "S\'ha afegit a la vostra pàgina de lectura">
 <!ENTITY reading_list_removed "S\'ha suprimit de la vostra pàgina de lectura">
 <!ENTITY reading_list_failed "No s\'ha pogut afegir la pàgina a la vostra llista de lectura">
-<!ENTITY reader_mode "mode lector">
+<!ENTITY reader "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">
 <!ENTITY button_cancel "Cancel·la">
+<!ENTITY button_yes "Sí">
+<!ENTITY button_no "No">
 <!ENTITY button_clear_data "Neteja les dades">
+<!ENTITY button_set "Defineix">
+<!ENTITY button_clear "Neteja">
 
 <!ENTITY abouthome_addons_title "Els complements del &brandShortName;">
 <!ENTITY abouthome_addons_browse "Mostra tots els complements del &brandShortName;">
 <!ENTITY abouthome_last_tabs_title "Les pestanyes de l\'última vegada">
 <!ENTITY abouthome_last_tabs_open "Obre totes les pestanyes de l\'última vegada">
 <!ENTITY abouthome_top_sites_title "Els vostres llocs">
 <!ENTITY abouthome_top_sites_browse "Mostra\'m els meus llocs més habituals">
 <!-- Localization note (abouthome_about_sync3, abouthome_about_apps2): The
      chevron (ex: "»"; unicode= U+00BB) is used as an arrow to show that
      clicking this text in the promotions box will perform some action. Note
      that a non-breaking space (unicode= U+00A0) should be used between this
      character and the remainder of the string to prevent word wrap. -->
 <!ENTITY abouthome_about_sync3 "Configureu el Firefox Sync per accedir a les adreces d\'interès, l\'historial i les pestanyes dels vostres altres dispositius&#x00A0;»">
-<!ENTITY abouthome_about_apps2 "Obtingueu aplicacions al Mozilla Marketplace i descobriu el millor que us pot oferir el Web&#x00A0;»">
+<!ENTITY abouthome_about_apps3 "Aconseguiu aplicacions al Marketplace del Firefox i descobriu el millor que el Web us pot oferir&#x00A0;»">
 <!-- Localization note (abouthome_sync_bold_name, abouthome_apps_bold_name):
      These strings are accentuated as bold text in the "abouthome_about_..."
      strings above. These strings should be a subset of the strings above and
      generally be the name of the product the string describes. -->
 <!ENTITY abouthome_sync_bold_name "Firefox Sync">
-<!ENTITY abouthome_apps_bold_name "Mozilla Marketplace">
+<!ENTITY abouthome_apps_bold_name2 "Firefox Marketplace">
 
 <!ENTITY filepicker_title "Trieu un fitxer">
 <!ENTITY filepicker_audio_title "Trieu o enregistreu un so">
 <!ENTITY filepicker_image_title "Trieu o feu una foto">
 <!ENTITY filepicker_video_title "Trieu o enregistreu un vídeo">
 <!-- Site identity popup -->
 
 <!ENTITY identity_connected_to "Esteu connectat a">
@@ -217,27 +224,29 @@ just addresses the organization to follo
 <!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…">
+<!-- Localization note (suggestions_prompt): The placeholder (&#037;s) should
+     be kept in the string; this will be replaced with the name of the search
+     engine. -->
+
+<!ENTITY suggestions_prompt "Voleu activar els suggeriments de cerca a &#037;s?">
 
 <!ENTITY webapp_generic_name "Aplicacions">
 
-<!-- Updater notifications -->
-<!ENTITY updater_start_title "&brandShortName;">
-<!ENTITY updater_start_ticker "Actualització del &brandShortName; disponible&#8230;">
-<!ENTITY updater_start_select "Select to download update.">
+<!ENTITY searchable_description "Adreces d'interès i historial">
+<!-- Updater notifications --> 
 
-<!ENTITY updater_downloading_title "S\'està baixant el &brandShortName;">
-<!ENTITY updater_downloading_ticker "S\'està baixant l\'actualització del &brandShortName;&#8230;">
-<!ENTITY updater_downloading_ticker_failed "No s\'ha pogut baixar l\'actualització del &brandShortName;#8230;">
-<!ENTITY updater_downloading_select "Selecciona per aplicar l\'actualització quan acabi.">
-<!ENTITY updater_downloading_retry "Selecciona per tornar a baixar l\'actualització.">
-<!ENTITY updater_downloading_willapply "S\'està esperant que acabi l\'actualització.">
-
-<!ENTITY updater_apply_title "&brandShortName;">
-<!ENTITY updater_apply_ticker "Actualització del &brandShortName; disponible&#8230;">
-<!ENTITY updater_apply_select "Selecciona per aplicar l\'actualització baixada.">
-
+<!ENTITY updater_start_title2 "Actualització disponible per al &brandShortName;">
+<!ENTITY updater_start_select2 "Toqueu per baixar">
+ 
+<!ENTITY updater_downloading_title2 "S'està baixant el &brandShortName;">
+<!ENTITY updater_downloading_title_failed2 "Ha fallat la baixada">
+<!ENTITY updater_downloading_select2 "Toqueu per aplicar l'actualització un cop baixada">
+<!ENTITY updater_downloading_retry2 "Toqueu per reintentar-ho">
+ 
+<!ENTITY updater_apply_title2 "Actualització disponible per al &brandShortName;">
+<!ENTITY updater_apply_select2 "Toqueu per actualitzar">
--- a/mobile/android/base/sync_strings.dtd
+++ b/mobile/android/base/sync_strings.dtd
@@ -10,18 +10,18 @@
 
 <!ENTITY sync.app.name.label "&syncBrand.fullName.label;">
 <!ENTITY sync.title.connect.label "Connecta\'t al &syncBrand.shortName.label;">
 <!ENTITY sync.title.adddevice.label "Afegeix un compte de &syncBrand.fullName.label;">
 <!ENTITY sync.title.pair.label "Vincula un dispositiu">
 <!-- J-PAKE Key Screen -->
 
 <!ENTITY sync.subtitle.connect.label "Per activar un nou dispositiu, seleccioneu «Configura el &syncBrand.shortName.label;» a l\'altre dispositiu">
-<!ENTITY sync.subtitle.header.label "Introduïu aquest codi a l\'altre ordinador">
-<!ENTITY sync.subtitle.connectlocation.label "Seleccioneu «&sync.title.pair.label;» a la secció &syncBrand.shortName.label; de les opcions del vostre Firefox d\'escriptori">
+<!ENTITY sync.subtitle.header2.label "Introduïu aquest codi a l'altre dispositiu">
+<!ENTITY sync.subtitle.connectlocation2.label "Seleccioneu «&sync.title.pair.label;» a la secció &syncBrand.shortName.label; de les opcions del Firefox de l'altre dispositiu.">
 <!ENTITY sync.subtitle.pair.label "Per activar-lo, seleccioneu «Vincula un dispositiu»a l\'altre dispositiu. ">
 <!ENTITY sync.pin.default.label "...\n...\n...\n">
 <!ENTITY sync.pin.oneline.label "...">
 <!ENTITY sync.link.show.label "Mostra\'m com.">
 <!ENTITY sync.link.advancedsetup.label "Configuració avançada...">
 <!ENTITY sync.link.nodevice.label "No tinc el dispositiu aquí...">
 <!-- J-PAKE Waiting Screen -->
 
@@ -63,32 +63,32 @@
 <!ENTITY sync.button.connect.label "Connecta">
 <!ENTITY sync.button.ok.label "D\'acord">
 <!-- Account strings -->
   
 <!ENTITY sync.account.label.label "&syncBrand.fullName.label;">
 <!-- Bookmark folder strings -->
   
 <!ENTITY bookmarks.folder.menu.label "Menú de les adreces d\'interès">
-<!ENTITY bookmarks.folder.places.label "">
+<!ENTITY bookmarks.folder.places.label ''>
 <!ENTITY bookmarks.folder.tags.label "Etiquetes">
 <!ENTITY bookmarks.folder.toolbar.label "Barra d\'eines de les adreces">
 <!ENTITY bookmarks.folder.unfiled.label "Adreces desordenades">
 <!ENTITY bookmarks.folder.desktop.label "Adreces d\'escriptori">
 <!ENTITY bookmarks.folder.mobile.label "Adreces del mòbil">
 <!ENTITY bookmarks.folder.readinglist.label "Llista de lectura">
 <!-- Notification strings -->
 
 <!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.">
+<!ENTITY sync.new.recoverykey.status.incorrect "Clau de recuperació incorrecta. Torneu-ho a provar.">
 <!-- 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/about.dtd
+++ b/mobile/android/chrome/about.dtd
@@ -1,8 +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 aboutPage.title                        "Quant al &brandShortName;">
 <!ENTITY aboutPage.warningVersion               "&brandShortName; és experimental i podria ser inestable.">
 <!ENTITY aboutPage.telemetryStart               " envia automàticament informació del rendiment, maquinari, ús i personalització a ">
 <!ENTITY aboutPage.telemetryMozillaLink         "&vendorShortName;">
 <!ENTITY aboutPage.telemetryEnd                 " ajudeu a millorar &brandShortName;.">
 <!ENTITY aboutPage.checkForUpdates.link         "Cerca actualitzacions »">
 <!ENTITY aboutPage.checkForUpdates.checking     "S'està mirant si hi ha actualitzacions…">
 <!ENTITY aboutPage.checkForUpdates.none         "No hi ha cap actualització">
--- a/mobile/android/chrome/aboutApps.dtd
+++ b/mobile/android/chrome/aboutApps.dtd
@@ -4,10 +4,10 @@
 
 <!ENTITY aboutApps.title2                          "Aplicacions">
 <!ENTITY aboutApps.header                          "Les vostres aplicacions">
 <!-- LOCALIZATION NOTE (aboutApps.noApps.pre): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (aboutApps.noApps.middle): avoid leading/trailing spaces, this text is a link -->
 <!-- LOCALIZATION NOTE (aboutApps.noApps.post): include a starting space as needed -->
 
 <!ENTITY aboutApps.noApps.pre "No s'ha instal·lat cap aplicació web. Aconseguiu-ne de ">
-<!ENTITY aboutApps.noApps.middle2 "Mercat Mozilla">
+<!ENTITY aboutApps.noApps.middle3 "Firefox Marketplace">
 <!ENTITY aboutApps.noApps.post ".">
--- a/mobile/android/chrome/aboutDownloads.properties
+++ b/mobile/android/chrome/aboutDownloads.properties
@@ -1,14 +1,21 @@
 # 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/.
 
 downloadAction.open=Obre
 downloadAction.remove=Suprimeix
+downloadAction.deleteAll=Suprimeix-les totes
+
+# LOCALIZATION NOTE (downloadMessage.deleteAll):
+# Semi-colon list of plural forms. See:
+# http://developer.mozilla.org/en/docs/Localization_and_Plurals
+downloadMessage.deleteAll=Se suprimeix la baixada?;Se suprimeixen les #1 baixades?
+
 downloadAction.pause=Pausa
 downloadAction.resume=Continua
 downloadAction.cancel=Cancel·la
 downloadAction.retry=Torna a provar
 downloadState.downloading=S'està descarregant...
 downloadState.canceled=Cancel·lat
 downloadState.failed=Ha fallat
 downloadState.paused=Pausat
--- a/mobile/android/chrome/browser.properties
+++ b/mobile/android/chrome/browser.properties
@@ -50,16 +50,19 @@ notificationRestart.button=Reinicia
 
 # Popup Blocker
 popupWarning=El %S ha evitat que aquest lloc obri una finestra emergent.
 popupWarningMultiple=El %S ha evitat que aquest lloc obri %S finestres emergents.
 popupButtonAllowOnce=Mostra-la
 popupButtonAlwaysAllow2=Mostra-les sempre
 popupButtonNeverWarn2=No les mostris mai
 
+# SafeBrowsing
+safeBrowsingDoorhanger=S'ha detectat programari maliciós o l'intent de suplantació d'identitat en aquest lloc web. Aneu amb compte.
+
 # LOCALIZATION NOTE (blockPopups.label): Label that will be used in
 # site settings dialog.
 blockPopups.label=Bloca les finestres emergents
 
 # Telemetry
 # %1$S = server owner (Mozilla); %2$S = product name (Firefox)
 telemetry.optin.message2=Voleu enviar un informe a %1$S per millorar el %2$S?
 telemetry.optin.learnMore=Més informació
@@ -213,29 +216,41 @@ contextmenu.copyLink=Copia l'enllaç
 contextmenu.shareLink=Comparteix un enllaç
 contextmenu.bookmarkLink=Afegeix a les adreces d'interès
 contextmenu.copyEmailAddress=Copia l'adreça electrònica
 contextmenu.shareEmailAddress=Comparteix l'adreça electrònica
 contextmenu.copyPhoneNumber=Copia el número de telèfon
 contextmenu.sharePhoneNumber=Comparteix el número de telèfon
 contextmenu.changeInputMethod=Selecciona el mètode d'entrada
 contextmenu.fullScreen=Pantalla completa
+contextmenu.copyImageLocation=Copia la ubicació de la imatge
 contextmenu.shareImage=Comparteix la imatge
 contextmenu.saveImage=Desa la imatge
 contextmenu.addSearchEngine=Afegeix un motor de cerca
 
 contextmenu.copy=Copia
 contextmenu.copyAll=Copia-ho tot
 contextmenu.selectWord=Selecciona la paraula
 contextmenu.selectAll=Selecciona-ho tot
 contextmenu.paste=Enganxa
 
 # Select UI
 selectHelper.closeMultipleSelectDialog=Fet
 
+#Input widgets UI
+inputWidgetHelper.date=Trieu una data
+inputWidgetHelper.datetime=Trieu una data i una hora
+inputWidgetHelper.datetime-local=Trieu una data i una hora
+inputWidgetHelper.time=Trieu una hora
+inputWidgetHelper.week=Trieu una setmana
+inputWidgetHelper.month=Trieu un mes
+inputWidgetHelper.cancel=Cancel·la
+inputWidgetHelper.set=Configura
+inputWidgetHelper.clear=Neteja
+
 # Web Console API
 stacktrace.anonymousFunction=<anònim>
 stacktrace.outputMessage=Traces de la pila de %S, funció %S, línia %S
 timer.start=%S: s'ha iniciat el temporitzador
 
 # LOCALIZATION NOTE (timer.end):
 # This string is used to display the result of the console.timeEnd() call.
 # %1$S=name of timer, %2$S=number of milliseconds
@@ -280,8 +295,10 @@ remoteIncomingPromptMessage=S'ha detectat una sol·licitud entrant per permetre una connexió de depuració remota. Un client remot pot obtenir el control total del vostre navegador! Voleu permetre la connexió?
 remoteIncomingPromptDisable=Desactiva
 
 # Helper apps
 helperapps.open=Obre
 helperapps.ignore=Ignora
 helperapps.dontAskAgain=No ho tornis a demanar per a aquest lloc
 helperapps.openWithApp2=Obre amb l'aplicació %S
 helperapps.openWithList2=Obre amb una aplicació
+helperapps.always=Sempre
+helperapps.never=Mai
--- a/mobile/android/defines.inc
+++ b/mobile/android/defines.inc
@@ -1,8 +1,8 @@
-#filter emptyLines
+# 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/.#filter emptyLines
 #define MOZ_LANGPACK_CREATOR Mozilla.org / Softcatalà
 
 # If non-English locales wish to credit multiple contributors, uncomment this
 # variable definition and use the format specified.
 #define MOZ_LANGPACK_CONTRIBUTORS <em:contributor>Softcatalà</em:contributor>
 
 #unfilter emptyLines
\ No newline at end of file
--- a/mobile/android/mobile-l10n.js
+++ b/mobile/android/mobile-l10n.js
@@ -1,7 +1,39 @@
-# 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/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Firefox browser.
+#
+# The Initial Developer of the Original Code is
+# Benjamin Smedberg <bsmedberg@covad.net>
+# Portions created by the Initial Developer are Copyright (C) 2004
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 #filter substitution
 
 pref("general.useragent.locale", "@AB_CD@");
--- a/mobile/profile/bookmarks.inc
+++ b/mobile/profile/bookmarks.inc
@@ -1,9 +1,9 @@
-#filter emptyLines
+# 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/.#filter emptyLines
 # LOCALIZATION NOTE: The 'en-US' strings in the URLs will be replaced with
 # your locale code, and link to your translated pages as soon as they're 
 # live.
 
 # LOCALIZATION NOTE: Some of these URLs are currently 404s, but should be coming
 
 # online shortly.
 
--- a/mobile/xul/chrome/about.dtd
+++ b/mobile/xul/chrome/about.dtd
@@ -1,8 +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 aboutPage.title                        "Quant al &brandShortName;">
 <!ENTITY aboutPage.warningVersion               "&brandShortName; és experimental i pot ser inestable.">
 <!ENTITY aboutPage.telemetryStart               " Envia automàticament informació sobre el rendiment, maquinari, ús i personalització a">
 <!ENTITY aboutPage.telemetryMozillaLink         "&vendorShortName;">
 <!ENTITY aboutPage.telemetryEnd                 " ajudeu a millorar &brandShortName;.">
 <!ENTITY aboutPage.faq.label                    "PMF">
 <!ENTITY aboutPage.support.label                "Assistència">
 <!ENTITY aboutPage.privacyPolicy.label          "Política de privadesa">
--- a/mobile/xul/defines.inc
+++ b/mobile/xul/defines.inc
@@ -1,8 +1,8 @@
-#filter emptyLines
+# 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/.#filter emptyLines
 #define MOZ_LANGPACK_CREATOR Mozilla.org / Softcatalà
 
 # If non-English locales wish to credit multiple contributors, uncomment this
 # variable definition and use the format specified.
 #define MOZ_LANGPACK_CONTRIBUTORS <em:contributor>Softcatalà</em:contributor>
 
 #unfilter emptyLines
\ No newline at end of file
--- a/mobile/xul/mobile-l10n.js
+++ b/mobile/xul/mobile-l10n.js
@@ -1,7 +1,39 @@
-# 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/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Firefox browser.
+#
+# The Initial Developer of the Original Code is
+# Benjamin Smedberg <bsmedberg@covad.net>
+# Portions created by the Initial Developer are Copyright (C) 2004
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 #filter substitution
 
 pref("general.useragent.locale", "@AB_CD@");
--- a/other-licenses/branding/sunbird/brand.dtd
+++ b/other-licenses/branding/sunbird/brand.dtd
@@ -1,6 +1,2 @@
-<!-- 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  brandShortName        "Sunbird">
 <!ENTITY  brandFullName         "Mozilla Sunbird">
--- a/other-licenses/branding/sunbird/brand.properties
+++ b/other-licenses/branding/sunbird/brand.properties
@@ -1,12 +1,8 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 brandShortName=Sunbird
 brandFullName=Mozilla Sunbird
 vendorShortName=Mozilla
 
 # LOCALIZATION NOTE (releaseNotesURL):
 #   For nightly builds, direct the user to an appropriate, yet non-version
 #   specific project site.
 #
--- a/other-licenses/branding/thunderbird/brand.dtd
+++ b/other-licenses/branding/thunderbird/brand.dtd
@@ -1,9 +1,8 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 <!ENTITY  brandShortName        "Thunderbird">
 <!ENTITY  brandFullName         "Mozilla Thunderbird">
 <!ENTITY  vendorShortName       "Mozilla">
 <!ENTITY  trademarkInfo.part1   "El Mozilla Thunderbird i logotips del Thunderbird 
 són marques registrades de la Mozilla Foundation.">
--- a/other-licenses/branding/thunderbird/brand.properties
+++ b/other-licenses/branding/thunderbird/brand.properties
@@ -1,7 +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/.
-
 brandShortName=Thunderbird
 brandFullName=Mozilla Thunderbird 
 vendorShortName=Mozilla
--- a/security/manager/chrome/pipnss/pipnss.properties
+++ b/security/manager/chrome/pipnss/pipnss.properties
@@ -314,16 +314,17 @@ 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>.
+certErrorMismatchSinglePlain=El certificat només es vàlid per %S
 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.
 
 # LOCALIZATION NOTE (certErrorExpiredNow): Do not translate %1$S (date+time of expired certificate) or %2$S (current date+time)
 certErrorExpiredNow=El certificat ha vençut el %1$S. L'hora actual és %2$S.
 # LOCALIZATION NOTE (certErrorNotYetValidNow): Do not translate %1$S (date+time certificate will become valid) or %2$S (current date+time)
 certErrorNotYetValidNow=El certificat no serà vàlid fins al %1$S. L'hora actual és %2$S.
 
--- a/services/sync/sync.properties
+++ b/services/sync/sync.properties
@@ -6,17 +6,17 @@
 client.name2 = El %2$S de %1$S — %3$S
 
 # %S is the date and time at which the last sync successfully completed
 lastSync2.label = Darrera sincronització: %S
 
 mobile.label = Adreces d'interès del mòbil
 
 remote.pending.label = Les pestanyes remotes s'estan sincronitzant…
-remote.missing.label = Sincronitzeu els altres ordinadors una altra vegada per accedir a les seves pestanyes
+remote.missing2.label = Sincronitzeu novament els vostres altres dispositius per accedir a les seves pestanyes
 remote.opened.label = Ja estan obertes totes les pestanyes remotes
 remote.notification.label = Les pestanyes recents de l'ordinador d'escriptori estaran disponibles en sincronitzar-se
 
 error.login.title = S'ha produït un error en iniciar la sessió
 error.login.description = El Sync ha trobat un error en connectar: %1$S. Torneu-ho a provar.
 error.login.prefs.label = Preferències…
 error.login.prefs.accesskey = P
 # should decide if we're going to show this
--- a/suite/chrome/branding/aboutRights.dtd
+++ b/suite/chrome/branding/aboutRights.dtd
@@ -1,8 +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/. -->
 <!-- LOCALIZATION NOTE This file is very similar to the one in Firefox from browser/locales/en-US/chrome/browser/aboutRights.dtd so you can use that file as a starting point -->
 <!-- rights.locale-direction instead of the usual local.dir entity, so RTL can skip translating page. -->
 <!ENTITY rights.locale-direction "ltr">
 <!ENTITY rights.pagetitle       "about:rights">
 <!ENTITY rights.intro-header    "Conegueu els vostres drets">
 <!ENTITY rights.intro "El &brandFullName; és un programa de codi lliure desenvolupat per una comunitat de milers de persones d'arreu del món. En aquest sentit, hi ha unes quantes coses que cal que conegueu:">
 <!-- Note on pointa / pointb / pointc form:
      These points each have an embedded link in the HTML, so each point is
--- a/suite/chrome/common/consoleOverlay.dtd
+++ b/suite/chrome/common/consoleOverlay.dtd
@@ -13,8 +13,9 @@
 <!ENTITY toolbarEval.accesskey "J">
 
 <!ENTITY all.accesskey         "A">
 <!ENTITY errors.accesskey      "r">
 <!ENTITY warnings.accesskey    "n">
 <!ENTITY messages.accesskey    "M">
 <!ENTITY clear.accesskey       "l">
 <!ENTITY evaluate.accesskey    "u">
+<!ENTITY filter.accesskey      "k">
--- a/suite/chrome/common/help/certs_help.xhtml
+++ b/suite/chrome/common/help/certs_help.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/certs_prefs_help.xhtml
+++ b/suite/chrome/common/help/certs_prefs_help.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" [
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/cs_priv_prefs_popup.xhtml
+++ b/suite/chrome/common/help/cs_priv_prefs_popup.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/customize_help.xhtml
+++ b/suite/chrome/common/help/customize_help.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/developer_tools.xhtml
+++ b/suite/chrome/common/help/developer_tools.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/forieusers.xhtml
+++ b/suite/chrome/common/help/forieusers.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/glossary.xhtml
+++ b/suite/chrome/common/help/glossary.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/help-glossary.rdf
+++ b/suite/chrome/common/help/help-glossary.rdf
@@ -1,13 +1,9 @@
 <?xml version="1.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/. -->
-
 
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns:nc="http://home.netscape.com/NC-rdf#">
 
 <!--  HELP Glossary SECTION -->
   <rdf:Description about="urn:root">
     <nc:subheadings>
       <rdf:Seq>
--- a/suite/chrome/common/help/help-index1.rdf
+++ b/suite/chrome/common/help/help-index1.rdf
@@ -1,13 +1,9 @@
 <?xml version="1.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/. -->
-
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns:nc="http://home.netscape.com/NC-rdf#">
  
 <rdf:Description about="help-indexAZ.rdf#a">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="Account_Settings"
          nc:name="Account Settings"
--- a/suite/chrome/common/help/help-indexAZ.rdf
+++ b/suite/chrome/common/help/help-indexAZ.rdf
@@ -1,13 +1,9 @@
 <?xml version="1.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/. -->
-
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns:nc="http://home.netscape.com/NC-rdf#">
 
   <rdf:Description about="urn:root">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li> <rdf:Description ID="a" nc:name="A"/> </rdf:li>
         <rdf:li> <rdf:Description ID="b" nc:name="B"/> </rdf:li>
--- a/suite/chrome/common/help/help-win.rdf
+++ b/suite/chrome/common/help/help-win.rdf
@@ -1,13 +1,9 @@
 <?xml version="1.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/. -->
-
 
 <!DOCTYPE rdf:RDF SYSTEM "chrome://branding/locale/brand.dtd" >
 
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns:nc="http://home.netscape.com/NC-rdf#">
 
 <rdf:Description about="suite-toc.rdf#ieusers"
   nc:name="For Internet Explorer Users"
--- a/suite/chrome/common/help/helpFileLayout.css
+++ b/suite/chrome/common/help/helpFileLayout.css
@@ -1,11 +1,43 @@
-/* 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/. */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Help.
+ *
+ * The Initial Developer of the Original Code is
+ * R.J. Keller
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
 @import url("chrome://help/content/platformClasses.css");
 
 body {
 	margin: 2ex;
 	font-family: sans-serif;
 	font-size: 0.75em;
 	max-width: 120ex;
 }
--- a/suite/chrome/common/help/help_help.xhtml
+++ b/suite/chrome/common/help/help_help.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/mailnews_account_settings.xhtml
+++ b/suite/chrome/common/help/mailnews_account_settings.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/mailnews_addressbooks.xhtml
+++ b/suite/chrome/common/help/mailnews_addressbooks.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/mailnews_blogs_and_feeds.xhtml
+++ b/suite/chrome/common/help/mailnews_blogs_and_feeds.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/mailnews_getting_started.xhtml
+++ b/suite/chrome/common/help/mailnews_getting_started.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/mailnews_newsgroups.xhtml
+++ b/suite/chrome/common/help/mailnews_newsgroups.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/mailnews_offline.xhtml
+++ b/suite/chrome/common/help/mailnews_offline.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/mailnews_organizing.xhtml
+++ b/suite/chrome/common/help/mailnews_organizing.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/mailnews_preferences.xhtml
+++ b/suite/chrome/common/help/mailnews_preferences.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/mailnews_security.xhtml
+++ b/suite/chrome/common/help/mailnews_security.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/mailnews_using_mail.xhtml
+++ b/suite/chrome/common/help/mailnews_using_mail.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/nav_help.xhtml
+++ b/suite/chrome/common/help/nav_help.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/passwords_help.xhtml
+++ b/suite/chrome/common/help/passwords_help.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/privacy_help.xhtml
+++ b/suite/chrome/common/help/privacy_help.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/privsec_help.xhtml
+++ b/suite/chrome/common/help/privsec_help.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" [
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/profiles_help.xhtml
+++ b/suite/chrome/common/help/profiles_help.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" [
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/shortcuts.xhtml
+++ b/suite/chrome/common/help/shortcuts.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/shortcuts_composer.xhtml
+++ b/suite/chrome/common/help/shortcuts_composer.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" [
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/shortcuts_mailnews.xhtml
+++ b/suite/chrome/common/help/shortcuts_mailnews.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" [
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/shortcuts_navigator.xhtml
+++ b/suite/chrome/common/help/shortcuts_navigator.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" [
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/ssl_help.xhtml
+++ b/suite/chrome/common/help/ssl_help.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/suite-toc.rdf
+++ b/suite/chrome/common/help/suite-toc.rdf
@@ -1,13 +1,9 @@
 <?xml version="1.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/. -->
-
 
 <!DOCTYPE rdf:RDF SYSTEM "chrome://branding/locale/brand.dtd" >
 
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns:nc="http://home.netscape.com/NC-rdf#">
 
   <rdf:Description about="urn:root">
     <nc:subheadings>
--- a/suite/chrome/common/help/suitehelp.rdf
+++ b/suite/chrome/common/help/suitehelp.rdf
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE window [
     <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
     %brandDTD;
 ]>
 
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
--- a/suite/chrome/common/help/using_priv_help.xhtml
+++ b/suite/chrome/common/help/using_priv_help.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/validation_help.xhtml
+++ b/suite/chrome/common/help/validation_help.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/help/welcome_help.xhtml
+++ b/suite/chrome/common/help/welcome_help.xhtml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"[
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %brandDTD;
 ]>
    
 <html xmlns="http://www.w3.org/1999/xhtml">
--- a/suite/chrome/common/pref/pref-fonts.dtd
+++ b/suite/chrome/common/pref/pref-fonts.dtd
@@ -34,17 +34,17 @@
 <!ENTITY  font.langGroup.trad-chinese             "Xinès tradicional">
 <!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/suite/chrome/common/pref/pref-mousewheel.dtd
+++ b/suite/chrome/common/pref/pref-mousewheel.dtd
@@ -1,30 +1,30 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<!-- LOCALIZATION NOTE : FILE Mouse-wheel management prefs, for those lucky OSes that support mouse wheels -->
 
-<!-- LOCALIZATION NOTE : FILE Mouse-wheel management prefs, for those lucky OSes that support mouse wheels -->
 
 <!ENTITY pref.mouseWheel.title           "Rodeta del ratolí">
 <!ENTITY mouseWheelPanel.label           "Indiqueu el comportament de la roda del ratolí en utilitzar-lo amb aquesta tecla: ">
 <!ENTITY usingJustTheWheel.label         "Sense tecla modificadora">
 <!ENTITY usingWheelAndAlt.label          "&altKey.label;">
 <!ENTITY usingWheelAndCtrl.label         "&ctrlKey.label;">
 <!ENTITY usingWheelAndShft.label         "&shiftKey.label;">
-<!ENTITY mouseWheelAction.label          "Acció de la roda del ratolí">
-<!ENTITY doNothing.label                 "Cap">
-<!ENTITY doNothing.accesskey             "C">
-<!ENTITY scrollDocument.label            "Desplaça el document">
+<!ENTITY mouseWheelAction.label          "Acció de roda del ratolí">
+<!ENTITY doNothing.label                 "No fer res">
+<!ENTITY doNothing.accesskey             "f">
+<!ENTITY scrollDocument.label            "Desplaceu-vos pel document">
 <!ENTITY scrollDocument.accesskey        "S">
-<!ENTITY mouseWheelSpeed.label           "Velocitat de la roda del ratolí">
 <!ENTITY history.label                   "Mou enrere o endavant en l'historial de navegació">
 <!ENTITY history.accesskey               "h">
 <!ENTITY zoom.label                      "Augmenta o redueix la pàgina">
 <!ENTITY zoom.accesskey                  "t">
+<!ENTITY mouseWheelSpeed.label           "Velocitat de la roda del ratolí">
 <!ENTITY verticalSpeed.label             "Vertical:">
 <!ENTITY verticalSpeed.accesskey         "V">
 <!ENTITY verticalReverse.label           "Direcció inversa">
-<!ENTITY verticalReverse.accesskey       "i">
+<!ENTITY verticalReverse.accesskey       "R">
 <!ENTITY horizontalSpeed.label           "Horitzontal:">
 <!ENTITY horizontalSpeed.accesskey       "o">
 <!ENTITY horizontalReverse.label         "Direcció inversa">
 <!ENTITY horizontalReverse.accesskey     "e">
--- a/suite/chrome/common/pref/pref-navigator.dtd
+++ b/suite/chrome/common/pref/pref-navigator.dtd
@@ -41,9 +41,10 @@
 <!ENTITY useDefault.label               "Valor per defecte">
 <!ENTITY useDefault.accesskey           "V">
 
 <!ENTITY defaultBrowserGroup.label      "Navegador per defecte">
 <!ENTITY defaultBrowserButton.label     "Defineix com a navegador per defecte">
 <!ENTITY defaultBrowserButton.accesskey "D">
 <!ENTITY alreadyDefaultText             "El &brandShortName; ja és el vostre navegador per defecte.">
 <!ENTITY defaultPendingText             "Es definirà el &brandShortName; com a navegador per defecte quan feu clic a D'acord.">
+<!ENTITY wasMadeDefaultText             "&brandShortName; s'ha definit com a navegador per defecte.">
 <!ENTITY makeDefaultText                "Defineix el &brandShortName; com el vostre navegador per defecte.">
--- a/suite/chrome/common/pref/pref-offlineapps.dtd
+++ b/suite/chrome/common/pref/pref-offlineapps.dtd
@@ -1,12 +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/. -->
-
 <!-- 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">
--- a/suite/chrome/common/sync/syncSetup.properties
+++ b/suite/chrome/common/sync/syncSetup.properties
@@ -27,16 +27,19 @@ bookmarksCount.label        = #1 adreça d'interès;#1 adreces d'interès
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of days (was %S for a short while, use #1 instead, even if both work)
 historyDaysCount.label      = #1 dia d'historial;#1 dies d'historial
 # LOCALIZATION NOTE (passwordsCount.label):
 # Semi-colon list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of passwords (was %S for a short while, use #1 instead, even if both work)
 passwordsCount.label        = #1 contrasenya;#1 contrasenyes
+# LOCALIZATION NOTE (addonsCount.label):
+# #1 is the number of add-ons, see the link above for forms
+addonsCount.label           = #1 complement;#1 complements
 
 save.recoverykey.title = Desa la clau de recuperació
 save.recoverykey.defaultfilename = SeaMonkey Recovery Key.xhtml
 
 newAccount.action.label = S'ha configurat el Firefox Sync automàticament perquè sincronitzi totes les dades del navegador.
 newAccount.change.label = Podeu triar què voleu sincronitzar exactament seleccionant les opcions de sincronització a continuació.
 resetClient.change.label = El Firefox Sync fusionarà totes les dades del navegador d'aquest ordinador en el vostre compte Sync.
 wipeClient.change.label = El Firefox Sync reemplaçarà totes les dades del navegador d'aquest ordinador amb les del vostre compte Sync.
--- a/suite/chrome/mailnews/filter.properties
+++ b/suite/chrome/mailnews/filter.properties
@@ -17,17 +17,20 @@ filterCustomHeaderOverflow=Els vostres filtres han ultrapassat el límit de 50 capçaleres personalitzades. Editeu el fitxer msgFilterRules.dat, que conté els vostres filtres, per utilitzar menys capçaleres personalitzades.
 invalidCustomHeader=Un dels vostres filtres utilitza una capçalera personalitzada que conté un caràcter no vàlid, , com ara «:», un caràcter no imprimible, un caràcter que no pertany a l'ASCII o un caràcter ASCII de vuit bits. Editeu el fitxer msgFilterRules.dat, que conté els vostres filtres, per treure els caràcters no vàlids de les capçaleres personalitzades. 
 continueFilterExecution=No s'ha pogut aplicar el filtre %S. Voleu seguir aplicant filtres?
 promptTitle=Filtres en execució
 promptMsg=Actualment us trobeu en el procés de filtratge de missatges. Voleu seguir aplicant filtres?
 stopButtonLabel=Atura
 continueButtonLabel=Continua
 cannotEnableFilter=Probablement, aquest filtre es va crear amb una versió més recent de Mozilla/Netscape. No podeu habilitar aquest filtre perquè es desconeix com aplicar-lo.
 searchTermsInvalidTitle=Els criteris de cerca no són vàlids
-searchTermsInvalidMessage=Aquest filtre no es pot desar perquè alguns criteris de cerca no són correctes en el context actual.
+# LOCALIZATION NOTE(searchTermsInvalidRule)
+# %1$S=search attribute name from the invalid rule
+# %2$S=search operator from the bad rule
+searchTermsInvalidRule=Aquest filtre no es pot desar perquè el terme de cerca «%1$S %2$S» no es vàlid en el context actual.
 
 # for junk mail logging / mail filter logging
 # LOCALIZATION NOTE(junkLogDetectStr)
 # %1$S=author, %2$S=subject, %3$S=date
 junkLogDetectStr=S'ha detectat un missatge brossa de %1$S - %2$S a %3$S
 # LOCALIZATION NOTE(logMoveStr)
 # %1$S=message id, %2$S=folder URI
 logMoveStr=s'ha mogut el missatge d'id = %1$S a %2$S
--- a/suite/chrome/mailnews/messenger.properties
+++ b/suite/chrome/mailnews/messenger.properties
@@ -379,19 +379,16 @@ 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ó
 emptyTrashMessage=Esteu segur que voleu suprimir permanentment tots els missatges i subcarpetes de la paperera?
 emptyTrashDontAsk=No m'ho tornis a demanar.
 
--- a/suite/chrome/mailnews/pref/am-addressing.dtd
+++ b/suite/chrome/mailnews/pref/am-addressing.dtd
@@ -16,17 +16,17 @@
 <!ENTITY editDirectories.accesskey "E">
 <!-- LOCALIZATION NOTE (directories.label) : do not translate "LDAP" in below line -->
 <!ENTITY directories.label         "Utilitza un altre servidor LDAP:">
 <!ENTITY directories.accesskey     "D">
 <!ENTITY directoriesNone.label     "Cap">
 <!-- am-addressing.xul -->
 
 
-<!ENTITY compositionGroupTitle.label "Redacció">
+<!ENTITY compositionGroupTitle.label          "Redacció">
 <!-- LOCALIZATION NOTE (useHtml.label) : do not translate "html" in below line -->
 <!ENTITY useHtml.label                        "Redacta els missatges en format HTML">
 <!ENTITY useHtml.accesskey                    "H">
 <!ENTITY autoQuote.label                      "Cita automàticament el missatge original en respondre">
 <!ENTITY autoQuote.accesskey                  "a">
 <!-- LOCALIZATION NOTE (then.label): This will concatenate with the 4 strings that follow. -->
 <!ENTITY then.label                           "Llavors,">
 <!ENTITY then.accesskey                       "L">
@@ -36,8 +36,14 @@
 <!ENTITY place.label                          "i posa la meva signatura">
 <!ENTITY place.accesskey                      "p">
 <!ENTITY belowText.label                      "sota el text citat (recomanat)">
 <!ENTITY aboveText.label                      "sota la resposta (abans del text citat)">
 <!ENTITY includeSigOnReply.label              "Inclou la signatura a les respostes">
 <!ENTITY includeSigOnReply.accesskey          "r">
 <!ENTITY includeSigOnForward.label            "Inclou la signatura als reenviaments">
 <!ENTITY includeSigOnForward.accesskey        "r">
+
+<!ENTITY globalComposingPrefs.label           "Preferències globals de redacció...">
+<!ENTITY globalComposingPrefs.accesskey       "G">
+
+<!ENTITY globalAddressingPrefs.label          "Preferències globals d'adreçament...">
+<!ENTITY globalAddressingPrefs.accesskey      "P">
--- a/suite/chrome/mailnews/pref/am-identities-list.dtd
+++ b/suite/chrome/mailnews/pref/am-identities-list.dtd
@@ -1,13 +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/. -->
 
-<!ENTITY identitiesListDesc.label "Suport per a múltiples identitats">
+<!ENTITY identitiesListManageDesc.label "Gestiona les identitats d'aquest compte. S'utilitza la primera identitat per defecte.">
 <!ENTITY identitiesListAdd.label  "Afegeix...">
 <!ENTITY identitiesListAdd.accesskey  "A">
 <!ENTITY identitiesListEdit.label "Edita...">
 <!ENTITY identitiesListEdit.accesskey "E">
+<!ENTITY identitiesListDefault.label "Defineix per defecte">
+<!ENTITY identitiesListDefault.accesskey "d">
 <!ENTITY identitiesListDelete.label "Suprimeix">
 <!ENTITY identitiesListDelete.accesskey "S">
 <!ENTITY identitiesListClose.label "Tanca">
 <!ENTITY identitiesListClose.accesskey "c">
--- a/suite/chrome/mailnews/pref/am-junk.dtd
+++ b/suite/chrome/mailnews/pref/am-junk.dtd
@@ -21,8 +21,11 @@
 <!ENTITY whitelistHeader.accesskey "N">
 
 <!ENTITY ispHeadersWarning.label "Si ho activeu, el &brandShortName; marcarà com a brossa els missatges marcats per aquest classificador extern.">
 <!ENTITY ispHeaders.label "Confia en les capçaleres de missatge brossa definides per: ">
 <!ENTITY ispHeaders.accesskey "f">
 
 <!ENTITY junkClassification.label "Selecció">
 <!ENTITY junkActions.label "Destinació i retenció.">
+
+<!ENTITY globalJunkPrefs.label "Preferències globals del correu brossa…">
+<!ENTITY globalJunkPrefs.accesskey "G">
--- a/suite/chrome/mailnews/pref/am-mdn.dtd
+++ b/suite/chrome/mailnews/pref/am-mdn.dtd
@@ -1,17 +1,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY pane.title                   "Confirmacions de recepció">
 <!ENTITY useGlobalPrefs.label         "Utilitza les preferències globals de confirmació de recepció en aquest compte">
 <!ENTITY useGlobalPrefs.accesskey     "U">
 <!ENTITY globalReceipts.label         "Preferències globals...">
-<!ENTITY globalReceipts.accesskey     "G">
+<!ENTITY globalReceipts.accesskey     "g">
 <!ENTITY useCustomPrefs.label         "Personalitza les confirmacions de recepció per a aquest compte">
 <!ENTITY useCustomPrefs.accesskey     "P">
 <!ENTITY requestReceipt.label         "Quan s'estan enviant missatges, sempre sol·licita una confirmació de recepció">
 <!ENTITY requestReceipt.accesskey     "Q">
 <!ENTITY receiptArrive.label          "Quan arribi una confirmació de recepció:">
 <!ENTITY leaveIt.label                "Deixa-la a la safata d'entrada">
 <!ENTITY leaveIt.accesskey            "i">
 <!-- LOCALIZATION NOTE moveToSent.label Translate: 'Sent' according to Netscape glossary -->
--- a/suite/chrome/mailnews/pref/prefs.properties
+++ b/suite/chrome/mailnews/pref/prefs.properties
@@ -11,16 +11,17 @@ modifiedAccountExists=Ja existeix un compte amb aquests noms d'usuari i de servidor. Introduïu un altre nom d'usuari i/o de servidor.
 userNameChanged=S'ha actualitzat el vostre nom d'usuari. Potser també us caldrà actualitzar l'adreça electrònica i/o el nom d'usuari associats amb aquest compte.
 serverNameChanged=El paràmetre del nom del servidor ha canviat. Comproveu que totes les carpetes utilitzades pels filtres són al nou servidor.
 # LOCALIZATION NOTE (junkSettingsBroken): %1$S is the account name
 junkSettingsBroken=Els paràmetres de brossa del compte «%1$S» tenen un problema possiblement. Voldríeu revisar-los abans de desar els paràmetres del compte?
 # LOCALIZATION NOTE (localDirectoryChanged): %1$S is program name (&brandShortName;)
 localDirectoryChanged=Cal reiniciar el %1$S per aplicar el canvi de configuració de directori local.
 localDirectoryRestart=Reinicia
 serverNameEmpty=Els camps del nom d'usuari i servidor són obligatoris.
+localDirectoryInvalid=El directori especificat al paràmetre de Directori Local no es vàlid. Trieu un directori diferent.
 # if the user chooses to cancel the wizard when no accounts are there throw a message
 # LOCALIZATION NOTE (cancelWizard)
 # do not localize "\n\n"
 cancelWizard=Esteu segur que voleu cancel·lar l'auxiliar de comptes? Si no configureu cap compte no podreu enviar ni rebre missatges.
 accountWizard=Auxiliar de comptes
 WizardExit=Surt
 WizardContinue=Cancel·la
 # when the wizard already has a domain (Should we say something different?)
@@ -30,17 +31,19 @@ failedRemoveAccount=No s'ha pogut elimin
 confirmRemoveAccount=Esteu segur que voleu eliminar el compte %S?
 confirmRemoveAccountTitle=Suprimeix el compte
 #LOCALIZATION NOTE: accountName: %1$S is server name, %2$S is user name
 accountName=%1$S - %2$S
 
 confirmDeferAccount=Si emmagatzemeu el nou correu d'aquest compte en una safata d'entrada d'un altre compte, no podreu tornar a accedir als missatges baixats per a aquest compte. Si teniu missatges en aquest compte, copieu-lo a un altre compte primer. Si teniu filtres que filtren aquest correu a aquest compte, hauríeu d'inhabilitar-los o canviar la carpeta de destinació. Si qualsevol compte té carpetes especials en aquest compte (Enviat, Esborranys, Plantilles), hauríeu de canviar-les a un altre compte. Voleu encara emmagatzemar el correu d'aquest compte en un altre?
 confirmDeferAccountTitle=Voleu deferir el compte?
 
-directoryUsedByOtherAccount=Aquest directori ja l'utilitza el compte %S. Trieu un directori diferent.
+directoryAlreadyUsedByOtherAccount=El directori especificat al paràmetre de Directori Local ja ha estat utilitzar pel compte «%S». Trieu un directori diferent.
+directoryParentUsedByOtherAccount=Un directori pare del directori especificat al paràmetre del Directori Local ja ha estat utilitzat pel compte «%S». Trieu un directori diferent.
+directoryChildUsedByOtherAccount=Un subdirectori del directori indicat als paràmetres del Directori Local ja ha estat utilitzat per el compte "%S". Si us plau trieu un directori diferent.
 #Provide default example values for sample email address
 exampleEmailUserName=usuari
 exampleEmailDomain=exemple.net
 emailFieldText=Adreça electrònica:
 #LOCALIZATION NOTE: defaultEmailText: %1$S is user name, %2$S is domain
 defaultEmailText=Introduïu la vostra adreça electrònica, que és l'adreça que els altres utilitzaran per enviar-vos correu (per exemple, «%1$S@%2$S»). 
 #LOCALIZATION NOTE: customizedEmailText: %1$S is provider, %2$S is email username, %3$S is sample email, %4$S is sample username
 customizedEmailText=Introduïu el vostre %1$S %2$S (per exemple, si la vostra adreça electrònica %1$S és «%3$S», el vostre %2$S és «%4$S»). 
--- a/suite/chrome/mailnews/start.dtd
+++ b/suite/chrome/mailnews/start.dtd
@@ -8,17 +8,17 @@
 <!ENTITY description.label "La Missatgeria del &brandShortName; és un potent client de correu i grups de discussió lliure. S'hi implementa una avançada detecció del correu brossa i altres característiques pioneres.">
 <!ENTITY features.title "Característiques">
 <!ENTITY feat_multiacc.label "Múltiples comptes">
 <!ENTITY feat_junk.label "Detecció de correu brossa">
 <!ENTITY feat_feeds.label "Lector de canals">
 <!ENTITY feat_filters.label "Filtres de missatge">
 <!ENTITY feat_htmlmsg.label "Missatges HTML">
 <!ENTITY feat_abook.label "Llibreta d'adreces">
-<!ENTITY feat_labels.label "Etiquetes i vistes de missatge personalitzables">
+<!ENTITY feat_tags.label "Etiquetes Personalitzables i Vistes de Correu">
 <!ENTITY feat_integration.label "Estreta integració amb el conjunt d'aplicacions del &brandShortName;">
 <!ENTITY dict.title "Diccionaris">
 <!ENTITY dict_intro.label "Els diccionaris serveixen per comprovar l'ortografia dels vostres missatges.">
 <!--# LOCALIZATION NOTE (dict_info.label): the URL for <a id="dictURL"> is fetched from brand.properties -->
 <!ENTITY dict_info.label 'Es poden instal·lar llengües addicionals de la secció de 
 <a id="dictURL" href="">diccionaris</a> del 
 <a href="https://addons.mozilla.org/seamonkey/">Mozilla Add-ons</a>.'>
 <!ENTITY info.title "Més informació">
--- a/suite/extra-jar.mn
+++ b/suite/extra-jar.mn
@@ -1,8 +1,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 is an empty file
 # locales can ship "extra" files from here, to ship a custom set
 # of files for the help system
 # do not put any blank lines in this file
--- a/suite/profile/chrome/userChrome-example.css
+++ b/suite/profile/chrome/userChrome-example.css
@@ -1,12 +1,8 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
 /*
  * Edit this file and copy it as userChrome.css into your
  * profile-directory/chrome/
  */
 
 /*
  * This file can be used to customize the look of Mozilla's user interface
  * You should consider using !important on rules which you want to
--- a/suite/profile/chrome/userContent-example.css
+++ b/suite/profile/chrome/userContent-example.css
@@ -1,12 +1,8 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
 /*
  * Edit this file and copy it as userContent.css into your
  * profile-directory/chrome/
  */
 
 /*
  * This file can be used to apply a style to all web pages you view
  * Rules without !important are overruled by author rules if the
--- a/suite/suite-l10n.js
+++ b/suite/suite-l10n.js
@@ -1,7 +1,39 @@
-# 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/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the SeaMonkey code.
+#
+# The Initial Developer of the Original Code is
+# The SeaMonkey project at mozilla.org.
+# Portions created by the Initial Developer are Copyright (C) 2007
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 #filter substitution
 
 pref("general.useragent.locale", "@AB_CD@");
--- a/toolkit/chrome/global-platform/mac/platformKeys.properties
+++ b/toolkit/chrome/global-platform/mac/platformKeys.properties
@@ -17,9 +17,9 @@ VK_WIN=win
 
 #the option/alt key - splitting tracks symbol (ctrl-g)
 VK_ALT=⌥
 
 #the control key. hat symbol (ctrl-f)
 VK_CONTROL=⌃
 
 #the separator character used between modifiers (none on Mac OS)
-MODIFIER_SEPARATOR= 
+MODIFIER_SEPARATOR=
--- a/toolkit/chrome/global/about.dtd
+++ b/toolkit/chrome/global/about.dtd
@@ -1,8 +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 about.version                "versió">
 <!-- LOCALIZATION NOTE (about.credits.beforeLink): note that there is no space between this phrase and the linked about.credits.linkTitle phrase, so if your locale needs a space between words, add it at the end of this entity. -->
 
 <!ENTITY about.credits.beforeLink     "Vegeu una llista de ">
 <!ENTITY about.credits.linkTitle      "col·laboradors">
 <!-- LOCALIZATION NOTE (about.credits.afterLink): note that there is no space between the linked about.credits.linkTitle phrase and this phrase, so if your locale needs a space between words, add it at the start of this entity. -->
 <!ENTITY about.credits.afterLink      " del projecte Mozilla.">
 <!-- LOCALIZATION NOTE (about.license.beforeTheLink): note that there is no space between this phrase and the linked about.license.linkTitle phrase, so if your locale needs a space between words, add it at the end of this entity. -->
--- a/toolkit/chrome/global/aboutRights.dtd
+++ b/toolkit/chrome/global/aboutRights.dtd
@@ -1,8 +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/. -->
 <!-- rights.locale-direction instead of the usual local.dir entity, so RTL can skip translating page. -->
 <!ENTITY rights.locale-direction "ltr">
 <!ENTITY rights.pagetitle       "about:rights">
 <!ENTITY rights.intro-header    "Conegueu els vostres drets">
 <!ENTITY rights.intro "El &brandFullName; és programari lliure i de codi obert, creat per una comunitat de milers de desenvolupadors d'arreu del món. Hi ha certs punts que caldria que coneguéssiu:">
 <!-- Note on pointa / pointb / pointc form:
      These points each have an embedded link in the HTML, so each point is
      split into chunks for text before the link, the link text, and the text
--- a/toolkit/chrome/global/aboutSupport.dtd
+++ b/toolkit/chrome/global/aboutSupport.dtd
@@ -52,9 +52,10 @@ variant of aboutSupport.showDir.label. -
 <!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">
+<!ENTITY aboutSupport.copyTextToClipboard.label "Copia el text al porta-retalls">
+<!ENTITY aboutSupport.copyRawDataToClipboard.label "Copia les dades sense processar al porta-retalls">
--- a/toolkit/chrome/global/aboutSupport.properties
+++ b/toolkit/chrome/global/aboutSupport.properties
@@ -7,16 +7,24 @@
 # there are no good translations, these are only used in about:support
 
 # LOCALIZATION NOTE: This can be localized with a more generic term, like
 # "Graphics-accelerated Windows". It describes a number of windows, e.g.:
 # "GPU Accelerated Windows: 2/2 (Direct3D 9)"
 # "GPU Accelerated Windows: 0/2"
 acceleratedWindows = Finestres accelerades amb GPU
 
+# LOCALIZATION NOTE (rawDataCopied) Text displayed in a mobile "Toast" to user when the
+# raw data is successfully copied to the clipboard via button press.
+rawDataCopied=Les dades sense processar s'han copiat al porta-retalls
+
+# LOCALIZATION NOTE (textCopied) Text displayed in a mobile "Toast" to user when the
+# text is successfully copied to the clipboard via button press.
+textCopied=Text copiat al porta-retalls
+
 # LOCALIZATION NOTE The verb "blocked" here refers to a graphics feature such as "Direct2D" or "OpenGL layers".
 blockedDriver = Blocat per la versió del controlador gràfic.
 
 # LOCALIZATION NOTE The %S here is a placeholder, leave unchanged, it will get replaced by the driver version string.
 tryNewerDriver = Blocat pel controlador gràfic. Proveu d'actualitzar-lo a la versió %S o posterior.
 
 # LOCALIZATION NOTE The verb "blocked" here refers to a graphics feature such as "Direct2D" or "OpenGL layers".
 blockedGfxCard = Blocat per la targeta gràfica a causa de problemes no resolts del controlador.
--- 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/intl.css
+++ b/toolkit/chrome/global/intl.css
@@ -1,11 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
 /*
  * Aquest fitxer conté tots els paràmetres localitzables 
  * de l'aparença com ara el tipus de lletra, capes i geometria.
  */
 window { 
   font: 3mm tahoma,arial,helvetica,sans-serif;
 }
--- a/toolkit/chrome/global/intl.properties
+++ b/toolkit/chrome/global/intl.properties
@@ -45,24 +45,24 @@ font.language.group=x-western
 # 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.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 (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.alwaysappendaccesskeys= 
 intl.menuitems.insertseparatorbeforeaccesskeys=true
--- a/toolkit/chrome/global/languageNames.properties
+++ b/toolkit/chrome/global/languageNames.properties
@@ -26,21 +26,23 @@ bo = Tibetà
 br = Bretó
 bs = Bosnià
 ca = Català
 ce = Txetxè
 ch = Chamorro
 co = Cors
 cr = Cree
 cs = Txec
+csb = Caixubi
 cu = Església eslava
 cv = Txuvaix
 cy = Gal·lès
 da = Danès
 de = Alemany
+dsb = Baix sòrab
 dv = Divehi
 dz = Dzongkha
 ee = Ewe
 el = Grec
 en = Anglès
 eo = Esperanto
 es = Espanyol
 et = Estonià
@@ -55,18 +57,20 @@ fur = Friülès
 fy = Frisó
 ga = Irlandès
 gd = Gaèlic escocès
 gl = Gallec
 gn = Guaraní
 gu = Gujarati
 gv = Manx
 ha = Haussa
+haw = Hawaià
 he = Hebreu
 hi = Hindi
+hil = Hiligaynon
 ho = Hiri Motu
 hr = Croat
 hsb = Alt sòrab
 ht = Haitià
 hu = Hongarès
 hy = Armeni
 hz = Herero
 ia = Interlingua
--- a/toolkit/chrome/global/notification.dtd
+++ b/toolkit/chrome/global/notification.dtd
@@ -1,9 +1,9 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY closeNotification.tooltip "Tanca aquest missatge">
 
 <!ENTITY closeNotificationItem.label "Ara no">
 
-<!ENTITY checkForUpdates "Comprova si hi ha una nova versió…">
+<!ENTITY checkForUpdates "Cerca actualitzacions...">
--- a/toolkit/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/chrome/mozapps/extensions/extensions.dtd
@@ -1,12 +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 addons.windowTitle                   "Gestor de complements">
 
 <!ENTITY search.placeholder                   "Cerca tots els complements">
 <!-- LOCALIZATION NOTE (search.commandKey):
      The search command key should match findOnCmd.commandkey from browser.dtd -->
 <!ENTITY search.commandkey                    "f">
 
 <!ENTITY loading.label                        "S'està carregant…">
--- a/toolkit/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/chrome/mozapps/extensions/extensions.properties
@@ -25,16 +25,22 @@ notification.incompatible=%1$S no és compatible amb el %2$S %3$S.
 notification.blocked=S'ha inhabilitat %1$S per motius de seguretat o estabilitat.
 notification.blocked.link=Més informació
 #LOCALIZATION NOTE (notification.softblocked) %1$S is the add-on name
 notification.softblocked=Es coneix que %1$S pot causar problemes de seguretat o estabilitat.
 notification.softblocked.link=Més informació
 #LOCALIZATION NOTE (notification.outdated) %1$S is the add-on name
 notification.outdated=Hi ha una actualització important per a %1$S.
 notification.outdated.link=Actualitza ara
+#LOCALIZATION NOTE (notification.vulnerableUpdatable) %1$S is the add-on name
+notification.vulnerableUpdatable=%1$S és una aplicació amb risc i s'ha d'actualitzar.
+notification.vulnerableUpdatable.link=Actualitza ara
+#LOCALIZATION NOTE (notification.vulnerableNoUpdate) %1$S is the add-on name
+notification.vulnerableNoUpdate=%1$S és una aplicació amb risc. Utilitzeu-la amb precaució.
+notification.vulnerableNoUpdate.link=Més Informació
 #LOCALIZATION NOTE (notification.enable) %1$S is the add-on name, %2$S is brand name
 notification.enable=S'habilitarà %1$S quan reinicieu el %2$S.
 #LOCALIZATION NOTE (notification.disable) %1$S is the add-on name, %2$S is brand name
 notification.disable=S'inhabilitarà %1$S quan reinicieu el %2$S.
 #LOCALIZATION NOTE (notification.install) %1$S is the add-on name, %2$S is brand name
 notification.install=S'instal·larà %1$S després que reinicieu el %2$S.
 #LOCALIZATION NOTE (notification.uninstall) %1$S is the add-on name, %2$S is brand name
 notification.uninstall=Es desinstal·larà %1$S després que reinicieu el %2$S.
@@ -68,16 +74,22 @@ details.notification.incompatible=%1$S no és compatible amb el %2$S %3$S.
 details.notification.blocked=S'ha inhabilitat %1$S per motius de seguretat o d'estabilitat.
 details.notification.blocked.link=Més informació
 #LOCALIZATION NOTE (details.notification.softblocked) %1$S is the add-on name
 details.notification.softblocked=Se sap que %1$S provoca problemes de seguretat o d'estabilitat.
 details.notification.softblocked.link=Més informació
 #LOCALIZATION NOTE (details.notification.outdated) %1$S is the add-on name
 details.notification.outdated=Hi ha una actualització important per a %1$S.
 details.notification.outdated.link=Actualitza ara
+#LOCALIZATION NOTE (details.notification.vulnerableUpdatable) %1$S is the add-on name
+details.notification.vulnerableUpdatable=%1$S és una aplicació amb risc i s'ha d'actualitzar.
+details.notification.vulnerableUpdatable.link=Actualitza ara
+#LOCALIZATION NOTE (details.notification.vulnerableNoUpdate) %1$S is the add-on name
+details.notification.vulnerableNoUpdate=%1$S és una aplicació amb risc. Utilitzeu-la amb precaució.
+details.notification.vulnerableNoUpdate.link=Més Informació
 #LOCALIZATION NOTE (details.notification.enable) %1$S is the add-on name, %2$S is brand name
 details.notification.enable=S'habilitarà %1$S quan reinicieu el %2$S.
 #LOCALIZATION NOTE (details.notification.disable) %1$S is the add-on name, %2$S is brand name
 details.notification.disable=S'inhabilitarà %1$S quan reinicieu el %2$S.
 #LOCALIZATION NOTE (details.notification.install) %1$S is the add-on name, %2$S is brand name
 details.notification.install=S'instal·larà %1$S quan reinicieu el %2$S.
 #LOCALIZATION NOTE (details.notification.uninstall) %1$S is the add-on name, %2$S is brand name
 details.notification.uninstall=Es desinstal·larà %1$S quan reinicieu el %2$S.
--- a/toolkit/chrome/mozapps/help/help-toc.rdf
+++ b/toolkit/chrome/mozapps/help/help-toc.rdf
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns:nc="http://home.netscape.com/NC-rdf#">
 
   <rdf:Description about="urn:root">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li> <rdf:Description ID="use-help" nc:name="Com utilitzar l'ajuda"
                   nc:link="chrome://help/locale/welcome.xhtml"/> </rdf:li>
--- a/toolkit/chrome/mozapps/plugins/plugins.dtd
+++ b/toolkit/chrome/mozapps/plugins/plugins.dtd
@@ -1,8 +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 pluginWizard.title                                  "Servei de cerca de connectors">
 <!ENTITY pluginWizard.firstPage.title                        "Sou al &pluginWizard.title;">
 
 <!ENTITY pluginWizard.checkingForPlugins.description.label   "El &brandShortName; està comprovant els connectors disponibles…">
 
 <!ENTITY pluginWizard.availablePluginsPage.title             "Baixades de connectors disponibles">
 <!ENTITY pluginWizard.availablePluginsPage.description.label "Els següents connectors estan disponibles:">
 <!ENTITY pluginWizard.availablePluginsPage.continueMsg.label "Premeu Següent per instal·lar aquests connectors.">
--- a/toolkit/chrome/mozapps/plugins/plugins.properties
+++ b/toolkit/chrome/mozapps/plugins/plugins.properties
@@ -1,8 +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/.
+
 pluginLicenseAgreement.label=Per instal·lar %S, cal que estigueu d'acord amb el següent:
 
 pluginInstallation.download.start=S'està baixant %S…
 pluginInstallation.download.finish=S'ha acabat de baixar %S.
 
 pluginInstallation.install.start=S'està instal·lant %S…
 pluginInstallation.install.finish=%S s'ha instal·lat amb èxit.
 pluginInstallation.install.error=La instal·lació de %S (%S) ha fallat.
--- a/toolkit/chrome/mozapps/update/updates.dtd
+++ b/toolkit/chrome/mozapps/update/updates.dtd
@@ -1,8 +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  updateWizard.title              "Actualització de programari">
 
 <!ENTITY  checking.title                  "Comprovació d'actualitzacions">
 <!ENTITY  updateCheck.label               "S'estan cercant versions més noves del &brandShortName;…">
 
 <!ENTITY  pluginupdatesfound.title        "Cerca actualitzacions dels connectors">
 <!ENTITY  pluginupdatesfound.label        "S'han trobat noves versions d'un o més dels vostres connectors.">
 <!ENTITY  pluginupdateslink.label         "Consulteu com actualitzar els vostres connectors.">
--- a/toolkit/chrome/mozapps/update/updates.properties
+++ b/toolkit/chrome/mozapps/update/updates.properties
@@ -1,8 +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/.
+
 # LOCALIZATION NOTE: The 1st %S is the update name and the 2nd %S is the build
 # identifier from the local updates.xml for displaying update history
 # example: MyApplication (20081022033543)
 updateFullName=%S (%S)
 
 # LOCALIZATION NOTE: The 1st %S is brandShortName and 2nd %S is update version
 # where update version from the update xml
 # example: MyApplication 10.0.5