update 2 aurora
authorToni Hermoso Pulido <toniher@softcatala.org>
Tue, 24 Apr 2012 08:53:44 +0200
changeset 529 eae1dddfe45aa3d209ded7b62377ed0c027c4aac
parent 528 804dd43777c97cc95841477728bae0f8fd79a2e0
child 530 12cb532af3fe526ff175d05081bc05d035edd0ca
child 578 074371dd9597a29dec9fd89a170d2f66af7d7edf
push id89
push usertoniher@softcatala.org
push dateTue, 24 Apr 2012 06:53:56 +0000
update 2 aurora
browser/chrome/browser/aboutHome.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/inspector.properties
browser/chrome/browser/devtools/scratchpad.dtd
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/sourceeditor.dtd
browser/chrome/browser/devtools/sourceeditor.properties
browser/chrome/browser/devtools/styleinspector.properties
browser/chrome/browser/newTab.dtd
browser/chrome/browser/newTab.properties
browser/chrome/browser/pageInfo.properties
browser/chrome/browser/places/places.properties
browser/chrome/browser/preferences/privacy.dtd
browser/chrome/browser/safeMode.dtd
browser/chrome/browser/setDesktopBackground.dtd
browser/chrome/browser/syncSetup.dtd
browser/updater/updater.ini
calendar/chrome/calendar/calendar-event-dialog.dtd
calendar/chrome/calendar/calendar.dtd
calendar/chrome/calendar/calendar.properties
calendar/chrome/lightning/lightning.dtd
chat/accounts.properties
chat/commands.properties
chat/conversations.properties
chat/facebook.properties
chat/irc.properties
chat/status.properties
chat/twitter.properties
chat/xmpp.properties
dom/chrome/dom/dom.properties
editor/ui/chrome/composer/editor.properties
mail/chrome/messenger-newsblog/feed-subscriptions.dtd
mail/chrome/messenger-newsblog/newsblog.properties
mail/chrome/messenger/AccountManager.dtd
mail/chrome/messenger/AccountWizard.dtd
mail/chrome/messenger/addbuddy.dtd
mail/chrome/messenger/am-identities-list.dtd
mail/chrome/messenger/am-im.dtd
mail/chrome/messenger/chat.dtd
mail/chrome/messenger/chat.properties
mail/chrome/messenger/cloudfile/Dropbox/management.dtd
mail/chrome/messenger/cloudfile/YouSendIt/management.dtd
mail/chrome/messenger/cloudfile/YouSendIt/settings.dtd
mail/chrome/messenger/cloudfile/addAccountDialog.dtd
mail/chrome/messenger/cloudfile/management.dtd
mail/chrome/messenger/glodaComplete.properties
mail/chrome/messenger/imAccountWizard.dtd
mail/chrome/messenger/imAccounts.dtd
mail/chrome/messenger/imAccounts.properties
mail/chrome/messenger/joinChat.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/messengercompose/messengercompose.dtd
mail/chrome/messenger/mime.properties
mail/chrome/messenger/newmailaccount/accountProvisioner.dtd
mail/chrome/messenger/news.properties
mail/chrome/messenger/preferences/applications.dtd
mail/chrome/messenger/preferences/applications.properties
mail/chrome/messenger/preferences/chat.dtd
mail/chrome/messenger/preferences/preferences.dtd
mail/chrome/messenger/prefs.properties
mobile/android/base/android_strings.dtd
mobile/android/chrome/browser.properties
mobile/overrides/passwordmgr.properties
mobile/profile/bookmarks.inc
suite/chrome/common/pref/pref-locationbar.dtd
suite/chrome/common/pref/pref-navigator.dtd
suite/chrome/common/pref/pref-ssl.dtd
suite/chrome/mailnews/addressbook/addressBook.properties
suite/chrome/mailnews/messenger.dtd
suite/chrome/mailnews/mime.properties
suite/chrome/mailnews/news.properties
suite/chrome/mailnews/newsblog/feed-subscriptions.dtd
suite/chrome/mailnews/newsblog/newsblog.properties
suite/chrome/mailnews/pref/AccountWizard.dtd
suite/chrome/mailnews/pref/am-identities-list.dtd
suite/chrome/mailnews/pref/pref-composing_messages.dtd
suite/chrome/mailnews/pref/prefs.properties
toolkit/chrome/global-platform/mac/platformKeys.properties
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/global/aboutSupport.properties
toolkit/chrome/global/dialog.properties
toolkit/chrome/global/intl.properties
toolkit/chrome/global/resetProfile.dtd
toolkit/chrome/global/viewSource.dtd
--- a/browser/chrome/browser/aboutHome.dtd
+++ b/browser/chrome/browser/aboutHome.dtd
@@ -1,22 +1,27 @@
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-  %brandDTD;
+%brandDTD;
+<!ENTITY % syncBrandDTD SYSTEM "chrome://browser/locale/syncBrand.dtd">
+%syncBrandDTD;
 <!-- These strings are used in the about:home page -->
 
 
 <!ENTITY abouthome.pageTitle "Pàgina d'inici del &brandFullName;">
 
 <!ENTITY abouthome.searchEngineButton.label "Cerca">
-
-<!ENTITY abouthome.aboutMozilla "Quant a Mozilla">
 <!-- LOCALIZATION NOTE (abouthome.defaultSnippet1.v1):
      text in <a/> will be linked to the Firefox features page on mozilla.com
 -->
 
 <!ENTITY abouthome.defaultSnippet1.v1 "Gràcies per triar el Firefox! Per aconseguir el millor del vostre navegador, informeu-vos sobre les <a>darreres característiques</a>.">
 <!-- LOCALIZATION NOTE (abouthome.defaultSnippet2.v1):
      text in <a/> will be linked to the featured add-ons on addons.mozilla.org
 -->
 <!ENTITY abouthome.defaultSnippet2.v1 "És fàcil personalitzar el vostre Firefox exactament tal com voleu. <a>Teniu milers de complements d'on triar</a>.">
 
-<!ENTITY abouthome.syncSetup.label   "Configura el Sync">
-<!ENTITY abouthome.pairDevice.label  "Vincula un dispositiu">
+<!ENTITY abouthome.bookmarksButton.label "Adreces d'interès">
+<!ENTITY abouthome.historyButton.label   "Historial">
+<!ENTITY abouthome.settingsButton.label  "Preferències">
+<!ENTITY abouthome.addonsButton.label    "Complements">
+<!ENTITY abouthome.appsButton.label      "Mercat">
+<!ENTITY abouthome.downloadsButton.label "Baixades">
+<!ENTITY abouthome.syncButton.label      "&syncBrand.shortName.label;">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -208,20 +208,26 @@ can reach it easily. -->
   -  approximation to it or choose a word (or words) that means
   -  "simple discardable text editor". -->
 
 <!ENTITY scratchpad.label             "Bloc de proves">
 <!ENTITY scratchpad.accesskey         "s">
 <!ENTITY scratchpad.keycode           "VK_F4">
 <!ENTITY scratchpad.keytext           "F4">
 
-<!ENTITY inspectPanelTitle.label        "HTML">
-<!ENTITY inspectButton.label            "Inspecciona">
-<!ENTITY inspectButton.accesskey        "I">
 <!ENTITY inspectCloseButton.tooltiptext "Tanca l'Inspector">
+
+<!ENTITY inspectorHTMLCopyInner.label       "Copia l'HTML interior">
+<!ENTITY inspectorHTMLCopyInner.accesskey   "I">
+
+<!ENTITY inspectorHTMLCopyOuter.label       "Copia l'HTML exterior">
+<!ENTITY inspectorHTMLCopyOuter.accesskey   "O">
+
+<!ENTITY inspectorHTMLDelete.label          "Suprimeix el node ">
+<!ENTITY inspectorHTMLDelete.accesskey      "D">
 <!-- LOCALIZATION NOTE (inspect3DViewButton.label): This button shows an
   -  alternate view for the Inspector, creating a 3D visualization of the
   -  webpage. -->
 
 <!ENTITY inspect3DViewButton.label     "Vista 3D">
 <!ENTITY inspect3DViewButton.accesskey "3">
 
 <!ENTITY inspectStyleButton.label     "Estil">
@@ -595,8 +601,20 @@ just addresses the organization to follo
 <!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ó">
 
 <!ENTITY addonBarCloseButton.tooltip  "Tanca la barra de complements">
 <!ENTITY toggleAddonBarCmd.key        "/">
+<!-- LOCALIZATION NOTE (htmlPanel.label): This is a label for a button that
+activates the Web Developer->Inspect UI's HTML Tree Panel. -->
+
+<!ENTITY htmlPanel.label              "HTML">
+<!-- LOCALIZATION NOTE (htmlPanel.tooltiptext): The text that appears when a user
+hovers over the HTML panel's toolbar button. -->
+
+<!ENTITY htmlPanel.tooltiptext        "Tauler HTML">
+<!-- LOCALIZATION NOTE (htmlPanel.accesskey): The key bound to the HTML panel's
+toolbar button -->
+
+<!ENTITY htmlPanel.accesskey          "H">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -328,8 +328,19 @@ syncPromoNotification.learnMoreLinkText=Més informació
 # LOCALIZATION NOTE (telemetryPrompt): %1$S will be replaced by brandFullName,
 # and %2$S by the value of the toolkit.telemetry.server_owner preference.
 telemetryPrompt = Voleu ajudar a millorar el %1$S enviant-nos informació anònima sobre el rendiment, les característiques del maquinari, l'ús de les funcionalitats i la personalització del navegador a %2$S?
 telemetryLinkLabel = Més informació
 telemetryYesButtonLabel2 = Sí, vull ajudar
 telemetryYesButtonAccessKey = S
 telemetryNoButtonLabel = No
 telemetryNoButtonAccessKey = N
+
+# Webapps notification popup
+webapps.install = Instal·la
+webapps.install.accesskey = I
+#LOCALIZATION NOTE (webapps.requestInstall) %1$S is the web app name, %2$S is the site from which the web app is installed
+webapps.requestInstall = Voleu instal·lar «%1$S» des d'aquest lloc (%2$S)?
+
+# 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.
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -0,0 +1,34 @@
+<!-- LOCALIZATION NOTE : FILE This file contains the Script Debugger strings -->
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
+<!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
+  - keep it in English, or another language commonly spoken among web developers.
+  - You want to make that choice consistent across the developer tools.
+  - A good criteria is the language in which you'd find the best
+  - documentation on web development on the web. -->
+<!-- LOCALIZATION NOTE (debuggerMenu.label): This is the label for the
+  -  application menu item that opens the debugger UI. -->
+
+
+<!ENTITY debuggerMenu.label          "Depurador d'scripts">
+<!-- LOCALIZATION NOTE (debuggerMenu.commandkey): This is the command key that
+  -  launches the debugger UI. Do not translate this one! -->
+
+<!ENTITY debuggerMenu.commandkey     "S">
+<!-- LOCALIZATION NOTE (debuggerUI.closeButton): This is the label for the
+  -  button that closes the debugger UI. -->
+
+<!ENTITY debuggerUI.closeButton      "Tanca">
+<!-- LOCALIZATION NOTE (debuggerUI.stackTitle): This is the label for the
+  -  widget that displays the call stack frames in the debugger. -->
+
+<!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">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -0,0 +1,54 @@
+# LOCALIZATION NOTE These strings are used inside the Script Debugger
+# which is available from the Web Developer sub-menu -> 'Script Debugger'.
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# LOCALIZATION NOTE (pauseLabel): The label that is displayed on the pause
+# button when the debugger is in a running state.
+pauseLabel=Pausa
+
+# LOCALIZATION NOTE (resumeLabel): The label that is displayed on the pause
+# button when the debugger is in a paused state.
+resumeLabel=Reprèn
+
+# LOCALIZATION NOTE (pausedState): The label that is displayed when the
+# debugger is in a paused state.
+pausedState=En pausa
+
+# LOCALIZATION NOTE (runningState): The label that is displayed when the
+# debugger is in a running state.
+runningState=En execució
+
+# LOCALIZATION NOTE (localScope): The label that is displayed in the variables
+# pane as a header on the local scope container.
+localScope=Local
+
+# LOCALIZATION NOTE (globalScope): The label that is displayed in the variables
+# pane as a header on the globel scope container.
+globalScope=Global
+
+# LOCALIZATION NOTE (localScope): The label that is displayed in the variables
+# pane as a header on the container for identifiers in a with block.
+withScope=Amb bloc
+
+# LOCALIZATION NOTE (closureScope): The label that is displayed in the variables
+# pane as a header on container for identifiers in a closure scope.
+closureScope=Clausura
+
+# LOCALIZATION NOTE (emptyText): The text that is displayed in the stack frames
+# list when there are no frames to display.
+emptyText=Buit
+
+# LOCALIZATION NOTE (loadingText): The text that is displayed in the script
+# editor when the laoding process has started but there is no file to display
+# yet.
+loadingText=S'està carregant…
+
+# LOCALIZATION NOTE (loadingError):
+# This is the error message that is displayed on failed attempts to load an
+# external resource file.
+# %1$S=URL, %2$S=status code
+loadingError=S'ha produït un error en carregar %1$S: %2$S
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -51,12 +51,235 @@ inspectManual=Obtén les mides i les propietats dels elements utilitzant un selector CSS per obrir la vista del DOM
 # when the user is using this command.
 inspectNodeDesc=Selector CSS
 
 # LOCALIZATION NOTE (inspectNodeManual) A fuller description of the 'node'
 # parameter to the 'inspect' command, displayed when the user asks for help
 # on what it does.
 inspectNodeManual=Un selector CSS per utilitzar-lo amb el Document.querySelector per identificar un únic element
 
+# LOCALIZATION NOTE (tiltDesc) A very short description of the 'tilt'
+# command. See tiltManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltDesc=Mostra la pàgina web en 3D
+
+# LOCALIZATION NOTE (tiltManual) A fuller description of the 'tilt'
+# command, displayed when the user asks for help on what it does.
+tiltManual=Investiga la relació entre les diferents parts d'una pàgina web i els seus ancestres en un entorn 3D
+
+# LOCALIZATION NOTE (tiltOpenDesc) A very short description of the 'tilt inspect'
+# command. See tiltOpenManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltOpenDesc=Obre l'Inspector en vista 3D
+
+# LOCALIZATION NOTE (tiltOpenManual) A fuller description of the 'tilt translate'
+# command, displayed when the user asks for help on what it does.
+tiltOpenManual=Inicialitza l'inspector en pàgina 3D i ressalta opcionalment un node fent servir un selector CSS
+
+# LOCALIZATION NOTE (tiltTranslateDesc) A very short description of the 'tilt translate'
+# command. See tiltTranslateManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltTranslateDesc=Mou l'entremat de la pàgina web
+
+# LOCALIZATION NOTE (tiltTranslateManual) A fuller description of the 'tilt translate'
+# command, displayed when the user asks for help on what it does.
+tiltTranslateManual=Mou progressivament l'entremat de la pàgina web en una certa direcció
+
+# LOCALIZATION NOTE (tiltTranslateXDesc) A very short string to describe the
+# 'x' parameter to the 'tilt translate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltTranslateXDesc=X (píxels)
+
+# LOCALIZATION NOTE (tiltTranslateXManual) A fuller description of the 'x'
+# parameter to the 'translate' command, displayed when the user asks for help
+# on what it does.
+tiltTranslateXManual=La quantitat en píxels per moure l'entremat d'una pàgina web al llarg de l'eix X
+
+# LOCALIZATION NOTE (tiltTranslateYDesc) A very short string to describe the
+# 'y' parameter to the 'tilt translate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltTranslateYDesc=Y (píxels)
+
+# LOCALIZATION NOTE (tiltTranslateYManual) A fuller description of the 'y'
+# parameter to the 'translate' command, displayed when the user asks for help
+# on what it does.
+tiltTranslateYManual=La quantitat en píxels per moure l'entremat d'una pàgina web al llarg de l'eix Y
+
+# LOCALIZATION NOTE (tiltRotateDesc) A very short description of the 'tilt rotate'
+# command. See tiltRotateManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltRotateDesc=Gira l'entremat de la pàgina web
+
+# LOCALIZATION NOTE (tiltRotateManual) A fuller description of the 'tilt rotate'
+# command, displayed when the user asks for help on what it does.
+tiltRotateManual=Rota progressivament l'entremat d'una pàgina web en una certa direcció
+
+# LOCALIZATION NOTE (tiltRotateXDesc) A very short string to describe the
+# 'x' parameter to the 'tilt rotate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltRotateXDesc=X (graus)
+
+# LOCALIZATION NOTE (tiltRotateXManual) A fuller description of the 'x'
+# parameter to the 'rotate' command, displayed when the user asks for help
+# on what it does.
+tiltRotateXManual=La quantitat en graus per rotar l'entremat d'una pàgina web al llarg de l'eix X
+
+# LOCALIZATION NOTE (tiltRotateYDesc) A very short string to describe the
+# 'y' parameter to the 'tilt rotate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltRotateYDesc=Y (graus)
+
+# LOCALIZATION NOTE (tiltRotateYManual) A fuller description of the 'y'
+# parameter to the 'rotate' command, displayed when the user asks for help
+# on what it does.
+tiltRotateYManual=La quantitat en graus per moure l'entremat d'una pàgina web al llarg de l'eix Y
+
+# LOCALIZATION NOTE (tiltRotateZDesc) A very short string to describe the
+# 'z' parameter to the 'tilt rotate' command, which is displayed in a dialog
+# when the user is using this command.
+tiltRotateZDesc=Z (graus)
+
+# LOCALIZATION NOTE (tiltRotateZManual) A fuller description of the 'z'
+# parameter to the 'rotate' command, displayed when the user asks for help
+# on what it does.
+tiltRotateZManual=La quantitat en píxels per moure l'entremat d'una pàgina web al llarg de l'eix Z
+
+# LOCALIZATION NOTE (tiltZoomDesc) A very short description of the 'tilt zoom'
+# command. See tiltZoomManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltZoomDesc=Mou endins o enfora de l'entremat d'una pàgina web
+
+# LOCALIZATION NOTE (tiltZoomManual) A fuller description of the 'tilt zoom'
+# command, displayed when the user asks for help on what it does.
+tiltZoomManual=Mou progressivament l'entremat d'una certa pàgina web en una certa direcció al llarg de l'eix Z
+
+# LOCALIZATION NOTE (tiltZoomAmountDesc) A very short string to describe the
+# 'zoom' parameter to the 'tilt zoom' command, which is displayed in a dialog
+# when the user is using this command.
+tiltZoomAmountDesc=Zoom (píxels)
+
+# LOCALIZATION NOTE (tiltZoomAmmuntManual) A fuller description of the 'zoom'
+# parameter to the 'zoom' command, displayed when the user asks for help
+# on what it does.
+tiltZoomAmountManual=La quantitat en píxels per moure l'entremat d'una pàgina web al llarg de l'eix Z
+
+# LOCALIZATION NOTE (tiltResetDesc) A very short description of the 'tilt reset'
+# command. See tiltResetManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltResetDesc=Reinicia l'estat de translació, rotació i zoom
+
+# LOCALIZATION NOTE (tiltResetManual) A fuller description of the 'tilt reset'
+# command, displayed when the user asks for help on what it does.
+tiltResetManual=Reinicia totes les transformacions aplicades a la matriu de vista model de l'entremat d'una pàgina web
+
+# LOCALIZATION NOTE (tiltCloseDesc) A very short description of the 'tilt close'
+# command. See tiltCloseManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+tiltCloseDesc=Tanca la visualització si és oberta
+
+# LOCALIZATION NOTE (tiltCloseManual) A fuller description of the 'tilt close'
+# command, displayed when the user asks for help on what it does.
+tiltCloseManual=Tanca la visualització i torna al mode de ressaltat per defecte de l'Inspector
+
+# LOCALIZATION NOTE (breakDesc) A very short string used to describe the
+# function of the break command.
+breakDesc=Gestiona els punts de ruptura
+
+# LOCALIZATION NOTE (breakManual) A longer description describing the
+# set of commands that control breakpoints.
+breakManual=Ordres per llistar, afegir i suprimir punts de ruptura
+
+# LOCALIZATION NOTE (breaklistDesc) A very short string used to describe the
+# function of the 'break list' command.
+breaklistDesc=Mostra els punts de ruptura coneguts
+
+# LOCALIZATION NOTE (breaklistLineEntry) Used in the output of the 'break list'
+# command to display a single line breakpoint.
+# %1$S=script URL, %2$S=line number
+breaklistLineEntry=Punt de ruptura de línia a %1$S:%2$S
+
+# LOCALIZATION NOTE (breaklistNone) Used in the output of the 'break list'
+# command to explain that the list is empty.
+breaklistNone=No s'ha definit cap punt de ruptura
+
+# LOCALIZATION NOTE (breaklistIntro) Used in the output of the 'break list'
+# command to preface the list contents.
+breaklistIntro=S'han definit els punts de ruptura següents:
+
+# LOCALIZATION NOTE (breakaddAdded) Used in the output of the 'break add'
+# command to explain that a breakpoint was added.
+breakaddAdded=S'ha afegit un punt de ruptura
+
+# LOCALIZATION NOTE (breakaddFailed) Used in the output of the 'break add'
+# command to explain that a breakpoint could not be added.
+breakaddFailed=No s'ha pogut definir un punt de ruptura: %S
+
+# LOCALIZATION NOTE (breakaddDesc) A very short string used to describe the
+# function of the 'break add' command.
+breakaddDesc=Afegeix un punt de ruptura
+
+# LOCALIZATION NOTE (breakaddManual) A longer description describing the
+# set of commands that are responsible for adding breakpoints.
+breakaddManual=Tipus de punts de ruptura permesos: línia
+
+# LOCALIZATION NOTE (breakaddDebuggerStopped) Used in the output of the
+# 'break add' command to explain that the debugger must be opened first.
+breakaddDebuggerStopped=Cal obrir el depurador abans de definir punts de ruptura
+
+# LOCALIZATION NOTE (breakaddlineDesc) A very short string used to describe the
+# function of the 'break add line' command.
+breakaddlineDesc=Afegeix un punt de ruptura de línia
+
+# LOCALIZATION NOTE (breakaddlineFileDesc) A very short string used to describe
+# the function of the file parameter in the 'break add line' command.
+breakaddlineFileDesc=URI del fitxer JS
+
+# LOCALIZATION NOTE (breakaddlineLineDesc) A very short string used to describe
+# the function of the line parameter in the 'break add line' command.
+breakaddlineLineDesc=Número de línia
+
+# LOCALIZATION NOTE (breakdelDesc) A very short string used to describe the
+# function of the 'break del' command.
+breakdelDesc=Suprimeix un punt de ruptura
+
+# LOCALIZATION NOTE (breakdelBreakidDesc) A very short string used to describe
+# the function of the index parameter in the 'break del' command.
+breakdelBreakidDesc=Índex del punt de ruptura
+
+# LOCALIZATION NOTE (breakdelRemoved) Used in the output of the 'break del'
+# command to explain that a breakpoint was removed.
+breakdelRemoved=S'ha suprimit el punt de ruptura
+
+# LOCALIZATION NOTE (breakNotFound) Used in the output of the 'break del'
+# command to explain that the breakpoint was not found.
+breakNotFound=No s'ha trobat el punt de ruptura
+
 # LOCALIZATION NOTE (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 (editDesc) A very short description of the 'edit'
+# command. See editManual for a fuller description of what it does. This
+# string is designed to be shown in a menu alongside the command name, which
+# is why it should be as short as possible.
+editDesc=Ajusta un recurs de la pàgina
+
+# LOCALIZATION NOTE (editManual) A fuller description of the 'edit' command,
+# displayed when the user asks for help on what it does.
+editManual=Edita un dels recursos que és part de la pàgina (o potser qualsevol recurs web genèric?)
+
+# LOCALIZATION NOTE (editResourceDesc) A very short string to describe the
+# 'resource' parameter to the 'edit' command, which is displayed in a dialog
+# when the user is using this command.
+editResourceDesc=URL per editar
+
+# LOCALIZATION NOTE (editLineToJumpToDesc) A very short string to describe the
+# 'line' parameter to the 'edit' command, which is displayed in a dialog
+# when the user is using this command.
+editLineToJumpToDesc=Línia on saltar
--- a/browser/chrome/browser/devtools/inspector.properties
+++ b/browser/chrome/browser/devtools/inspector.properties
@@ -15,25 +15,20 @@ confirmNavigationAway.buttonLeave=Surt de la pàgina
 confirmNavigationAway.buttonLeaveAccesskey=S
 confirmNavigationAway.buttonStay=Queda't en la pàgina
 confirmNavigationAway.buttonStayAccesskey=Q
 
 breadcrumbs.siblings=Germans
 # LOCALIZATION NOTE (htmlPanel): Used in the Inspector tool's openInspectorUI
 # method when registering the HTML panel.
 
-# LOCALIZATION NOTE (htmlPanel.label): This is a lable for a button that
-# activates the Web Developer->Inspect UI's HTML Tree Panel.
-htmlPanel.label=HTML
-
-# LOCALIZATION NOTE (htmlPanel.tooltiptext): The text that appears when a user
-# hovers over the HTML panel's toolbar button.
-htmlPanel.tooltiptext=Tauler HTML
-
-# LOCALIZATION NOTE (htmlPanel.accesskey): The key bound to the HTML panel's
-# toolbar button.
-htmlPanel.accesskey=H
-
 # LOCALIZATION NOTE (ruleView.*): Button label, accesskey and tooltip text
 # associated with the Highlighter's CSS Rule View in the Style Sidebar.
 ruleView.label=Regles
 ruleView.accesskey=R
 ruleView.tooltiptext=Mostra i edita el CSS
+
+# LOCALIZATION NOTE (inspectButton.tooltiptext):
+# This button appears in the Inspector Toolbar. inspectButton is stateful,
+# if it's pressed users can select an element with the mouse. Pressing the
+# "Return" key # changes that state. %S is the keyboard shortcut (VK_RETURN in
+# chrome://global/locale/keys.properties).
+inspectButton.tooltiptext=Selecciona l'element amb el ratolí (%S)
--- a/browser/chrome/browser/devtools/scratchpad.dtd
+++ b/browser/chrome/browser/devtools/scratchpad.dtd
@@ -38,60 +38,16 @@
 
 <!ENTITY closeCmd.label               "Tanca">
 <!ENTITY closeCmd.key                 "W">
 <!ENTITY closeCmd.accesskey           "c">
 
 <!ENTITY editMenu.label               "Edita">
 <!ENTITY editMenu.accesskey           "E">
 
-<!ENTITY undoCmd.label                "Desfés">
-<!ENTITY undoCmd.key                  "Z">
-<!ENTITY undoCmd.accesskey            "D">
-
-<!ENTITY redoCmd.label                "Refés">
-<!ENTITY redoCmd.key                  "Y">
-<!ENTITY redoCmd.accesskey            "R">
-
-<!ENTITY cutCmd.label                 "Retalla">
-<!ENTITY cutCmd.key                   "X">
-<!ENTITY cutCmd.accesskey             "t">
-
-<!ENTITY copyCmd.label                "Copia">
-<!ENTITY copyCmd.key                  "C">
-<!ENTITY copyCmd.accesskey            "C">
-
-<!ENTITY pasteCmd.label               "Enganxa">
-<!ENTITY pasteCmd.key                 "V">
-<!ENTITY pasteCmd.accesskey           "x">
-
-<!ENTITY selectAllCmd.label           "Selecciona-ho tot">
-<!ENTITY selectAllCmd.key             "a">
-<!ENTITY selectAllCmd.accesskey       "a">
-
-<!ENTITY findCmd.label                "Cerca...">
-<!ENTITY findCmd.key                  "F">
-<!ENTITY findCmd.accesskey            "C">
-
-<!ENTITY findAgainCmd.label           "Torna a cercar...">
-<!-- LOCALIZATION NOTE (findAgainCmd.key): This key is used only on Macs.
-  -  Windows and Linux builds use the F3 key which is not localizable on purpose.
-  -->
-<!ENTITY findAgainCmd.key             "G">
-<!ENTITY findAgainCmd.accesskey       "T">
-<!-- LOCALIZATION NOTE (findPreviousCmd.key): This key is used only on Macs.
-  -  Windows and Linux builds use the Shift-F3 key which is not localizable on
-  -  purpose.
-  -->
-<!ENTITY findPreviousCmd.key          "G">
-
-<!ENTITY gotoLineCmd.label            "Salta a la línia...">
-<!ENTITY gotoLineCmd.key              "J">
-<!ENTITY gotoLineCmd.accesskey        "S">
-
 <!ENTITY run.label                    "Executa">
 <!ENTITY run.accesskey                "E">
 <!ENTITY run.key                      "e">
 
 <!ENTITY inspect.label                "Inspecciona">
 <!ENTITY inspect.accesskey            "I">
 <!ENTITY inspect.key                  "i">
 
@@ -115,20 +71,32 @@
   -  to select an execution environment for the browser window itself as opposed
   -  to content. This is a feature for browser and addon developers and only
   -  enabled via the devtools.chrome.enabled preference. Formerly, this label
   -  was called "Chrome".
   -->
 
 <!ENTITY browserContext.label         "Navegador">
 <!ENTITY browserContext.accesskey     "v">
+<!-- LOCALIZATION NOTE some localizations of Windows (ex:french, german) use "?"
+  -  for the help button in the menubar but Gnome does not.
+  -->
+
+<!ENTITY helpMenu.label               "Ajuda">
+<!ENTITY helpMenu.accesskey           "j">
+<!ENTITY helpMenuWin.label            "Ajuda">
+<!ENTITY helpMenuWin.accesskey        "j">
+
+<!ENTITY documentationLink.label      "Ajuda del bloc de proves a l'MDN">
+<!ENTITY documentationLink.accesskey  "d">
 <!-- 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 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.
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -49,8 +49,12 @@ confirmClose.title=Canvis sense desar
 # LOCALIZATION NOTE  (scratchpadIntro): This is a multi-line comment explaining
 # how to use the Scratchpad. Note that this should be a valid JavaScript
 # comment inside /* and */.
 scratchpadIntro=/*\n * Això és un bloc de proves de JavaScript.\n *\n * Introduïu-hi codi JavaScript, feu llavors clic amb el botó secundari o trieu del menú d'execució:\n * 1. Executa per avaluar el codi seleccionat,\n * 2. Inspecciona per obrir l'inspector d'objectes per al resultat, o\n * 3. Mostra per inserir el resultat en un comentari després de la selecció.\n */\n\n
 
 # LOCALIZATION NOTE  (notification.browserContext): This is the message displayed
 # over the top of the editor when the user has switched to browser context.
 browserContext.notification=Aquest bloc de proves s'executa en el context del navegador.
+
+# LOCALIZATION NOTE (help.openDocumentationPage): This returns a localized link with
+# documentation for Scratchpad on MDN.
+help.openDocumentationPage=https://developer.mozilla.org/en/Tools/Scratchpad
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/sourceeditor.dtd
@@ -0,0 +1,15 @@
+<!-- LOCALIZATION NOTE : FILE This file contains the Source Editor component
+  - strings. The source editor component is used within the Scratchpad and
+  - Style Editor tools. -->
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
+<!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
+  - keep it in English, or another language commonly spoken among web developers.
+  - You want to make that choice consistent across the developer tools.
+  - A good criteria is the language in which you'd find the best
+  - documentation on web development on the web. -->
+
+
+
+<!ENTITY gotoLineCmd.label         "Salta a la línia…">
+<!ENTITY gotoLineCmd.key           "S">
+<!ENTITY gotoLineCmd.accesskey     "S">
--- a/browser/chrome/browser/devtools/sourceeditor.properties
+++ b/browser/chrome/browser/devtools/sourceeditor.properties
@@ -23,8 +23,18 @@ findCmd.promptMessage=Cerca:
 # when the user wants to jump to a specific line number in the code. You can
 # access this feature by pressing Ctrl-J on Windows/Linux or Cmd-J on Mac.
 gotoLineCmd.promptTitle=Salta a la línia...
 
 # LOCALIZATION NOTE  (gotoLineCmd.promptMessage): This is the message shown when
 # the user wants to jump to a specific line number in the code. You can
 # access this feature by pressing Ctrl-J on Windows/Linux or Cmd-J on Mac.
 gotoLineCmd.promptMessage=Salta al número de línia:
+
+# LOCALIZATION NOTE  (annotation.breakpoint.title): This is the text shown in
+# front of any breakpoint annotation when it is displayed as a tooltip in one of
+# the editor gutters. This feature is used in the JavaScript Debugger.
+annotation.breakpoint.title=Punt de ruptura: %S
+
+# LOCALIZATION NOTE  (annotation.currentLine): This is the text shown in
+# a tooltip displayed in any of the editor gutters when the user hovers the
+# current line.
+annotation.currentLine=Línia actual
--- a/browser/chrome/browser/devtools/styleinspector.properties
+++ b/browser/chrome/browser/devtools/styleinspector.properties
@@ -32,15 +32,92 @@ rule.sourceElement=element
 # e.g "Inherited from body#bodyID (styles.css:20)"
 rule.inheritedSource=Hereta de %S (%S)
 
 # LOCALIZATION NOTE (style.highlighter.button): These strings are used inside
 # sidebar of the Highlighter for the style inspector button.
 # "Computed" refers to the Computed Style of the element.
 style.highlighter.button.label2=Calculat
 style.highlighter.accesskey2=C
-style.highlighter.button.tooltip=Inspecciona els estils de l'element
+style.highlighter.button.tooltip2=Inspecciona els estils calculats de l'element
 
 # LOCALIZATION NOTE (helpLinkTitle): For each style property
 # the user can hover it and get a help link button which allows one to
 # quickly jump to the documentation from the Mozilla Developer Network site.
 # This is the link title shown in the hover tooltip.
 helpLinkTitle=Mostra la documentació d'aquesta propietat
+
+# LOCALIZATION NOTE (rule.warning.title): When an invalid property value is
+# entered into the rule view a warning icon is displayed. This text is used for
+# the title attribute of the warning icon.
+rule.warning.title=El valor de la propietat no és vàlid
+
+# LOCALIZATION NOTE (style.contextmenu.copyselection): The computed view's
+# context menu copy entry.
+style.contextmenu.copyselection=Copia la selecció
+
+# LOCALIZATION NOTE (style.contextmenu.copyselection.accesskey): The computed
+# view's context menu copy entry access key.
+style.contextmenu.copyselection.accesskey=C
+
+# LOCALIZATION NOTE (style.contextmenu.copydeclaration): The style inspector's
+# context menu copy property entry allows a complete CSS property to be copied.
+style.contextmenu.copydeclaration=Copia la línia de declaració
+
+# LOCALIZATION NOTE (style.contextmenu.copydeclaration.accesskey): The style
+# inspector's context menu copy property access key.
+style.contextmenu.copydeclaration.accesskey=d
+
+# LOCALIZATION NOTE (style.contextmenu.copyproperty): The style inspector's
+# context menu copy property name entry allows a CSS property name to be copied.
+style.contextmenu.copyproperty=Copia la propietat
+
+# LOCALIZATION NOTE (style.contextmenu.copyproperty.accesskey): The style
+# inspector's context menu copy property name access key.
+style.contextmenu.copyproperty.accesskey=p
+
+# LOCALIZATION NOTE (style.contextmenu.copypropertyvalue): The style inspector's
+# context menu copy property value entry allows a CSS property name to be copied.
+style.contextmenu.copypropertyvalue=Copia el valor de la propietat
+
+# LOCALIZATION NOTE (style.contextmenu.copypropertyvalue.accesskey): The style
+# inspector's context menu copy property value access key.
+style.contextmenu.copypropertyvalue.accesskey=t
+
+# LOCALIZATION NOTE (rule.contextmenu.copyselection): The rule view's context
+# menu copy entry.
+rule.contextmenu.copyselection=Copia la selecció
+
+# LOCALIZATION NOTE (rule.contextmenu.copyselection.accesskey): The rule view's
+# context menu copy entry access key.
+rule.contextmenu.copyselection.accesskey=C
+
+# LOCALIZATION NOTE (rule.contextmenu.copyrule): The rule view's context menu
+# copy rule entry allows a complete CSS rule to be copied.
+rule.contextmenu.copyrule=Copia la regla
+
+# LOCALIZATION NOTE (rule.contextmenu.copyrule.accesskey): The rule view's
+# context menu copy rule access key.
+rule.contextmenu.copyrule.accesskey=r
+
+# LOCALIZATION NOTE (rule.contextmenu.copydeclaration): The rule view's context
+# menu copy property entry allows a complete CSS property to be copied.
+rule.contextmenu.copydeclaration=Copia la línia de declaració
+
+# LOCALIZATION NOTE (rule.contextmenu.copydeclaration.accesskey): The rule view's
+# context menu copy property access key.
+rule.contextmenu.copydeclaration.accesskey=d
+
+# LOCALIZATION NOTE (rule.contextmenu.copyproperty): The rule view's context
+# menu copy property entry allows a CSS property name to be copied.
+rule.contextmenu.copyproperty=Copia la propietat
+
+# LOCALIZATION NOTE (rule.contextmenu.copyproperty.accesskey): The rule
+# view's context menu copy property name access key.
+rule.contextmenu.copyproperty.accesskey=p
+
+# LOCALIZATION NOTE (rule.contextmenu.copypropertyvalue): The rule view's
+# context menu copy property entry allows a CSS property value to be copied.
+rule.contextmenu.copypropertyvalue=Copia el valor de la propietat
+
+# LOCALIZATION NOTE (rule.contextmenu.copypropertyvalue.accesskey): The rule
+# view's context menu copy property value access key.
+rule.contextmenu.copypropertyvalue.accesskey=t
--- a/browser/chrome/browser/newTab.dtd
+++ b/browser/chrome/browser/newTab.dtd
@@ -1,6 +1,2 @@
 <!-- These strings are used in the about:newtab page -->
 <!ENTITY newtab.pageTitle "Pestanya nova">
-
-<!ENTITY newtab.show "Mostra la pàgina de la pestanya nova">
-<!ENTITY newtab.hide "Oculta la pàgina de la pestanya nova">
-<!ENTITY newtab.reset "Restaura la pàgina de la pestanya nova">
--- a/browser/chrome/browser/newTab.properties
+++ b/browser/chrome/browser/newTab.properties
@@ -1,3 +1,5 @@
 newtab.pin=Clava aquest web aquí
 newtab.unpin=Desclava aquest web
 newtab.block=Suprimeix aquest web
+newtab.show=Mostra la pàgina de la pestanya nova
+newtab.hide=Amaga la pàgina de la nova pestanya
--- a/browser/chrome/browser/pageInfo.properties
+++ b/browser/chrome/browser/pageInfo.properties
@@ -46,16 +46,19 @@ unknown=Desconegut
 notset=No s'ha especificat
 yes=Sí
 no=No
 
 mediaImg=Imatge
 mediaVideo=Vídeo
 mediaAudio=Àudio
 mediaBGImg=Fons
+mediaBorderImg=Contorn
+mediaListImg=Pic
+mediaCursor=Cursor
 mediaObject=Objecte
 mediaEmbed=Incrusta
 mediaLink=Icona
 mediaInput=Entrada
 mediaFileSize=%S kB
 mediaSize=%Spx × %Spx
 mediaSelectFolder=Seleccioneu una carpeta on desar les imatges
 mediaBlockImage=Bloca les imatges de %S
--- a/browser/chrome/browser/places/places.properties
+++ b/browser/chrome/browser/places/places.properties
@@ -70,23 +70,23 @@ recentlyBookmarkedTitle=Afegides més recentment
 recentTagsTitle=Etiquetes recents
 
 OrganizerQueryHistory=Historial
 OrganizerQueryDownloads=Baixades
 OrganizerQueryAllBookmarks=Totes les adreces d'interès
 OrganizerQueryTags=Etiquetes
 
 # LOCALIZATION NOTE (tagResultLabel) :
-# This is what we use to form the label (for screen readers)
-# for url bar autocomplete results of type "tag"
+# Noun used to describe the location bar autocomplete result type
+# to users with screen readers
 # See createResultLabel() in urlbarBindings.xml 
 tagResultLabel=Etiqueta
 # LOCALIZATION NOTE (bookmarkResultLabel) :
-# This is what we use to form the label (for screen readers)
-# for url bar autocomplete results of type "bookmark"
+# Noun used to describe the location bar autocomplete result type
+# to users with screen readers
 # See createResultLabel() in urlbarBindings.xml 
 bookmarkResultLabel=Adreça d'interès
 
 # LOCALIZATION NOTE (lockPrompt.text)
 # %S will be replaced with the application name.
 lockPrompt.title=Error de l'inici del navegador
 lockPrompt.text=Les adreces d'interès i l'historial no seran funcionals perquè un dels fitxers del %S l'utilitza una altra aplicació. Cert programari de seguretat podria estar provocant aquest problema.
 lockPromptInfoButton.label=Més informació
--- a/browser/chrome/browser/preferences/privacy.dtd
+++ b/browser/chrome/browser/preferences/privacy.dtd
@@ -10,17 +10,16 @@
 <!ENTITY  locbar.pre.label              "Quan s'utilitzi la barra d'ubicació, suggereix:">
 <!ENTITY  locbar.pre.accessKey          "l">
 <!ENTITY  locbar.post.label             "">
 <!ENTITY  locbar.both.label             "Historial i adreces d'interès">
 <!ENTITY  locbar.history.label          "Historial">
 <!ENTITY  locbar.bookmarks.label        "Adreces d'interès">
 <!ENTITY  locbar.nothing.label          "Res">
 
-
 <!ENTITY  acceptCookies.label           "Accepta galetes dels llocs web">
 <!ENTITY  acceptCookies.accesskey       "c">
 
 <!ENTITY  acceptThirdParty.label        "Accepta galetes de tercers">
 <!ENTITY  acceptThirdParty.accesskey    "t">
 
 <!ENTITY  keepUntil.label               "Conserva-les fins:">
 <!ENTITY  keepUntil.accesskey           "f">
@@ -59,21 +58,18 @@
 
 <!ENTITY  dontrememberActions.pre.label          "També podeu voler ">
 <!ENTITY  dontrememberActions.clearHistory.label "netejar tot l'historial actual">
 <!ENTITY  dontrememberActions.post.label         ".">
 
 <!ENTITY  privateBrowsingPermanent2.label "Utilitza sempre el mode de navegació privada">
 <!ENTITY  privateBrowsingPermanent2.accesskey "p">
 
-<!ENTITY  rememberHistory.label      "Recorda el meu historial de navegació">
-<!ENTITY  rememberHistory.accesskey  "n">
-
-<!ENTITY  rememberDownload.label         "Recorda l'historial de baixades">
-<!ENTITY  rememberDownload.accesskey     "d">
+<!ENTITY  rememberHistory2.label      "Recorda el meu historial de navegació i baixades">
+<!ENTITY  rememberHistory2.accesskey  "b">
 
 <!ENTITY  rememberSearchForm.label       "Recorda l'historial de cerca i formularis">
 <!ENTITY  rememberSearchForm.accesskey   "f">
 
 <!ENTITY  clearOnClose.label             "Neteja l'historial quan es tanqui el &brandShortName;">
 <!ENTITY  clearOnClose.accesskey         "q">
 
 <!ENTITY  clearOnCloseSettings.label     "Paràmetres…">
--- a/browser/chrome/browser/safeMode.dtd
+++ b/browser/chrome/browser/safeMode.dtd
@@ -34,16 +34,19 @@
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
 #endif
    - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY safeModeDialog.title         "Mode segur del &brandShortName;">
 <!ENTITY window.width                 "45em">
 
+<!ENTITY autoSafeModeIntro.label      "El &brandShortName; s'ha tancat inesperadament mentre s'iniciava">
+<!ENTITY autoSafeModeDescription.label "Lamentem les inconveniències. El &brandShortName; s'està executant ara mateix en mode segur, que inhabilita temporalment els paràmetres personals, els temes i les extensions.">
+
 <!ENTITY safeModeDescription.label    "El &brandShortName; està executant-se en mode segur. Així s'inhabiliten temporalment les vostres preferències, temes i extensions.">
 <!ENTITY safeModeDescription2.label   "Podeu fer alguns o tots els canvis següents de forma permanent:">
 
 <!ENTITY disableAddons.label          "Inhabilita tots els complements">
 <!ENTITY disableAddons.accesskey      "I">
 
 <!ENTITY resetToolbars.label          "Reinicia les barres d'eines i els controls">
 <!ENTITY resetToolbars.accesskey      "R">
--- a/browser/chrome/browser/setDesktopBackground.dtd
+++ b/browser/chrome/browser/setDesktopBackground.dtd
@@ -1,9 +1,11 @@
 <!ENTITY position.label             "Posició:">
 <!ENTITY tile.label                 "Mosaic">
 <!ENTITY center.label               "Centre">
 <!ENTITY stretch.label              "Amplia">
+<!ENTITY fill.label                 "Omple">
+<!ENTITY fit.label                  "Ajusta">
 <!ENTITY preview.label              "Previsualització">
 <!ENTITY color.label                "Color:">
 <!ENTITY setDesktopBackground.title "Defineix com a fons d'escriptori">
 <!ENTITY openDesktopPrefs.label     "Obre les preferències de l'escriptori">
 <!ENTITY closeWindow.key            "w">
--- a/browser/chrome/browser/syncSetup.dtd
+++ b/browser/chrome/browser/syncSetup.dtd
@@ -7,17 +7,17 @@
 <!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">
 <!-- New Account AND Existing Account -->
 
 <!ENTITY server.label               "Servidor">
-<!ENTITY serverType.main.label      "Servidor del &syncBrand.fullName.label;">
+<!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">
 <!ENTITY signIn.password.accesskey  "y">
 <!ENTITY signIn.recoveryKey.label       "Clau de reucperació">
 <!ENTITY signIn.recoveryKey.accesskey   "C">
 <!-- New Account Page 1: Basic Account Info -->
--- a/browser/updater/updater.ini
+++ b/browser/updater/updater.ini
@@ -1,4 +1,6 @@
 ; This file is in the UTF-8 encoding
+; All strings must be less than 600 chars.
 [Strings]
 TitleText=Actualització del %MOZ_APP_DISPLAYNAME%
 InfoText=El %MOZ_APP_DISPLAYNAME% està instal·lant les actualitzacions i s'iniciarà tot seguit.
+MozillaMaintenanceDescription=El servei de manteniment de Mozilla garanteix que teniu la darrera i més segura versió del Mozilla Firefox a l'ordinador. Mantenir el Firefox al dia és molt important per a la seguretat en línia i, per tant, Mozilla recomana que tingueu activat aquest servei.
--- a/calendar/chrome/calendar/calendar-event-dialog.dtd
+++ b/calendar/chrome/calendar/calendar-event-dialog.dtd
@@ -143,18 +143,18 @@
 <!ENTITY  event.menu.options.attendees.label                  "Invita assistents…">
 <!ENTITY  event.menu.options.attendees.accesskey              "I">
 <!ENTITY  event.menu.options.spellcheck.label                 "Comprova l'ortografia…">
 <!ENTITY  event.menu.options.spellcheck.accesskey             "o">
 <!ENTITY  event.menu.options.inline.spellcheck.label          "Comprova l'ortografia mentre s'escriu">
 <!ENTITY  event.menu.options.inline.spellcheck.accesskey      "s">
 <!ENTITY  event.menu.options.link.label                       "Afegeix un enllaç…">
 <!ENTITY  event.menu.options.link.accesskey                   "l">
-<!ENTITY  event.menu.options.timezone.label                   "Fus horari">
-<!ENTITY  event.menu.options.timezone.accesskey               "F">
+<!ENTITY  event.menu.options.timezone2.label                  "Mostra el fus horari">
+<!ENTITY  event.menu.options.timezone2.accesskey              "z">
 <!ENTITY  event.menu.options.priority2.label                  "Prioritat">
 <!ENTITY  event.menu.options.priority2.accesskey              "P">
 <!ENTITY  event.menu.options.priority.notspecified.label      "No especificada">
 <!ENTITY  event.menu.options.priority.notspecified.accesskey  "o">
 <!ENTITY  event.menu.options.priority.low.label               "Baixa">
 <!ENTITY  event.menu.options.priority.low.accesskey           "B">
 <!ENTITY  event.menu.options.priority.normal.label            "Normal">
 <!ENTITY  event.menu.options.priority.normal.accesskey        "N">
@@ -367,16 +367,17 @@
 <!ENTITY event.freebusy.legend.unknown          "Sense informació" >
 <!ENTITY event.attendee.role.required           "Assistent necessari">
 <!ENTITY event.attendee.role.optional           "Assistent opcional">
 <!ENTITY event.attendee.role.chair              "Cap de la reunió">
 <!ENTITY event.attendee.role.nonparticipant     "No participa">
 <!-- Timezone dialog -->
 
 <!ENTITY timezone.title.label            "Especifiqueu el fus horari">
+<!ENTITY event.timezone.custom.label     "Més fusos horaris">
 <!-- Read-Only dialog -->
 
 <!ENTITY read.only.general.label         "General">
 <!ENTITY read.only.title.label           "Títol:">
 <!ENTITY read.only.event.start.label     "Data d'inici:">
 <!ENTITY read.only.task.start.label      "Data d'inici:">
 <!ENTITY read.only.event.end.label       "Data de fi:">
 <!ENTITY read.only.task.due.label        "Data de venciment:">
--- a/calendar/chrome/calendar/calendar.dtd
+++ b/calendar/chrome/calendar/calendar.dtd
@@ -59,17 +59,17 @@
 <!ENTITY calendar.today.button.label       "Avui">
 <!ENTITY calendar.tomorrow.button.label       "Demà">
 <!ENTITY calendar.soon.button.label           "Aviat">
 
 <!ENTITY calendar.events.filter.all.label "Totes les cites">
 <!ENTITY calendar.events.filter.today.label "Cites d'avui">
 <!ENTITY calendar.events.filter.future.label "Totes les cites futures">
 <!ENTITY calendar.events.filter.current.label "Dia seleccionat actualment">
-<!ENTITY calender.events.filter.currentview.label "Cites en la vista actual">
+<!ENTITY calendar.events.filter.currentview.label "Cites a la vista actual">
 <!ENTITY calendar.events.filter.next7Days.label "Cites en els propers 7 dies">
 <!ENTITY calendar.events.filter.next14Days.label "Cites en els propers 14 dies">
 <!ENTITY calendar.events.filter.next31Days.label "Cites en els propers 31 dies">
 <!ENTITY calendar.events.filter.thisCalendarMonth.label "Cites en aquest mes del calendari">
 
 <!ENTITY calendar.unifinder.tree.done.label          "Acabada">
 <!ENTITY calendar.unifinder.tree.priority.label      "Prioritat">
 <!ENTITY calendar.unifinder.tree.title.label         "Títol">
@@ -248,16 +248,19 @@
 <!ENTITY priority.level.high.accesskey      "A">
 
 <!ENTITY calendar.context.postpone.1hour.label      "1 hora">
 <!ENTITY calendar.context.postpone.1hour.accesskey  "h">
 <!ENTITY calendar.context.postpone.1day.label       "1 dia">
 <!ENTITY calendar.context.postpone.1day.accesskey   "d">
 <!ENTITY calendar.context.postpone.1week.label      "1 setmana">
 <!ENTITY calendar.context.postpone.1week.accesskey  "s">
+
+<!ENTITY calendar.copylink.label       "Copia l'enllaç">
+<!ENTITY calendar.copylink.accesskey   "C">
 <!-- Task View -->
 <!-- Note that the above *.context.* strings are currently used for the other
      task action buttons -->
 
 <!ENTITY calendar.taskview.delete.label     "Suprimeix">
 <!ENTITY calendar.taskview.delete.accesskey "u">
 <!-- Server Context Menu -->
 
--- a/calendar/chrome/calendar/calendar.properties
+++ b/calendar/chrome/calendar/calendar.properties
@@ -168,16 +168,18 @@ tooltipLocation=Ubicació:
 # event date, usually an interval, such as
 #  Date: 7:00--8:00 Thu 9 Oct 2011
 #  Date: Thu 9 Oct 2000 -- Fri 10 Oct 2000
 tooltipDate=Data:
 # event calendar name
 tooltipCalName=Nom del calendari:
 # event status: tentative, confirmed, cancelled
 tooltipStatus=Estat:
+# event organizer
+tooltipOrganizer=Organitzador:
 # task/todo fields
 # start date time, due date time, task priority number, completed date time
 tooltipStart=Inici:
 tooltipDue=Fi:
 tooltipPriority=Prioritat:
 tooltipPercent=% fet:
 tooltipCompleted=Finalització:
 
--- a/calendar/chrome/lightning/lightning.dtd
+++ b/calendar/chrome/lightning/lightning.dtd
@@ -70,18 +70,16 @@
 <!ENTITY lightning.menu.view.tasks.label               "Tasques">
 <!ENTITY lightning.menu.view.tasks.accesskey           "T">
 <!-- Events and Tasks menu -->
 
 <!ENTITY lightning.menu.eventtask.label                "Cites i tasques">
 <!ENTITY lightning.menu.eventtask.accesskey            "i">
 <!-- properties dialog, calendar creation wizard -->
 
-<!ENTITY lightning.calendarproperties.showevents.inagenda.label "Mostra les cites en el Plafó d'avui">
-<!ENTITY lightning.calendarproperties.showtasks.label           "Mostra les tasques en el Plafó d'avui en mode Tasques">
 <!ENTITY lightning.calendarproperties.email.label               "Correu electrònic:">
 <!-- iMIP Bar (meeting support) -->
 
 <!ENTITY lightning.imipbar.description "Aquest missatge conté una invitació a una cita.">
 <!-- Lightning specific keybindings -->
 
 <!ENTITY lightning.keys.event.showCalendar.key "C">
 <!ENTITY lightning.keys.event.showTasks.key "D">
new file mode 100644
--- /dev/null
+++ b/chat/accounts.properties
@@ -0,0 +1,5 @@
+# LOCALIZATION NOTE (passwordPromptTitle, passwordPromptText):
+# %S is replaced with the name of the account
+passwordPromptTitle=Contrasenya per a %S
+passwordPromptText=Inseriu la contrasenya per a %S per iniciar la sessió.
+passwordPromptSaveCheckbox=Emmagatzema aquesta contrasenya a l'administrador de contrasenyes.
new file mode 100644
--- /dev/null
+++ b/chat/commands.properties
@@ -0,0 +1,23 @@
+# LOCALIZATION NOTE (commands):
+#  %S is a comma separated list of command names.
+commands=Ordres: %S.\nEmpreu /help &lt;command&gt; per a més informació.
+# LOCALIZATION NOTE (noCommand, noHelp):
+#  %S is the command name the user typed.
+noCommand=No hi ha l'ordre '%S'.
+noHelp=No hi ha un missatge d'ajuda per a l'ordre '%S'!
+
+sayHelpString=say &lt;missatge&gt;: envia un missatge sense ordres de processament.
+rawHelpString=raw &lt;missatge&gt;: envia un missatge sense escapar les entitats HTML.
+helpHelpString=help &lt;nom&gt;: mostra el missatge d'ajuda de l'ordre &lt;nom&gt;, o la llista d'ordres possibles quan s'utilitza sense paràmetre.
+
+# LOCALIZATION NOTE (statusCommand):
+#  %1$S is replaced with a status command name
+#   (one of "back", "away", "busy", "dnd", or "offline").
+#  %2$S is replaced with the localized version of that status type
+#   (one of the 5 strings below).
+statusCommand=%1$S &lt;missatge d'estat&gt;: defineix l'estat de %2$S amb un missatge d'estat opcional.
+back=disponible
+away=absent
+busy=no disponible
+dnd=no disponible
+offline=desconnectat
new file mode 100644
--- /dev/null
+++ b/chat/conversations.properties
@@ -0,0 +1,41 @@
+# LOCALIZATION NOTE (targetChanged):
+#  %1$S is the new conversation title (display name of the new target),
+#  %2$S is the protocol name used for the new target.
+targetChanged=La conversa continuarà amb %1$S, fent servur %2$S.
+
+# LOCALIZATION NOTE (statusChanged):
+#  %1$S is the display name of the contact.
+#  %2$S is the new status type (a value from status.properties).
+statusChanged=%1$S és ara %2$S.
+# LOCALIZATION NOTE (statusChangedWithStatusText):
+#  %1$S is the display name of the contact.
+#  %2$S is the new status type (a value from status.properties).
+#  %3$S is the status text (eg. "I'm currently away from the computer").
+statusChangedWithStatusText=%1$S és ara %2$S: %3$S.
+# LOCALIZATION NOTE (statusChangedFromUnknown[WithStatusText]):
+#  special case of the previous 2 strings for when the status was
+#  previously unknown. These 2 strings should not mislead the user
+#  into thinking the person's status has just changed.
+statusChangedFromUnknown=%1$S és %2$S.
+statusChangedFromUnknownWithStatusText=%1$S és %2$S: %3$S.
+
+# LOCALIZATION NOTE (statusUnknown):
+#  %S is the display name of the contact.
+statusUnknown=El vostre compte s'ha desconnectat (ja no es coneix l'estat de %S).
+accountDisconnected=El vostre compte s'ha desconnectat.
+
+# LOCALIZATION NOTE (autoReply):
+#  %S is replaced by the text of a message that was sent as an automatic reply.
+autoReply=Resposta automàtica - %S
+
+# LOCALIZATION NOTE (messenger.conversations.selections.ellipsis):
+#  ellipsis is used when copying a part of a message to show that the message was cut
+messenger.conversations.selections.ellipsis=[…]
+
+# LOCALIZATION NOTE (messenger.conversations.selections.{system,content,action}MessagesTemplate):
+#  These 3 templates are used to format selected messages before copying them.
+#  Do not translate the texts between % characters, but feel free to adjust
+#  whitespace and separators to make them fit your locale.
+messenger.conversations.selections.systemMessagesTemplate=%time% - %message%
+messenger.conversations.selections.contentMessagesTemplate=%time% - %sender%: %message%
+messenger.conversations.selections.actionMessagesTemplate=%time% * %sender% %message%
new file mode 100644
--- /dev/null
+++ b/chat/facebook.properties
@@ -0,0 +1,1 @@
+connection.error.useUsernameNotEmailAddress=Utilitzeu el vostre compte de Facebook, no una adreça de correu electrònic
new file mode 100644
--- /dev/null
+++ b/chat/irc.properties
@@ -0,0 +1,147 @@
+# 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 tems 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
+#   account wizard windows.
+options.server=Servidor
+options.port=Port
+options.ssl=Utilitza SSL
+options.encoding=Joc de caràcters
+options.quitMessage=Missatge de sortida
+options.partMessage=Part del missatge
+options.showServerTab=Mostra els missatges del servidor
+
+# LOCALIZATION NOTE (ctcp.ping): Semi-colon list of plural forms.
+#  See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+#   %1$S is the nickname of the user who was pinged.
+#   #2 is the delay (in seconds).
+ctcp.ping=Resposta del Ping des de %1$S en #2 segon.;Resposta del Ping des de %1$S en #2 segons.
+# LOCALIZATION NOTE (ctcp.version):
+#   %1$S is the nickname of the user whose version was requested.
+#   %2$S is the version response from the client.
+ctcp.version=%1$S fa servir "%2$S"
+# LOCALIZATION NOTE (ctcp.time):
+#   %1$S is the nickname of the user whose time was requested.
+#   %2$S is the time response.
+ctcp.time=El temps per %1$S és de %2$S.
+
+# LOCALZIATION NOTE (command.*):
+#   These are the help messages for each command, the %S is the command name
+#   Each command first gives the parameter it accepts and then a description of
+#   the command.
+command.action=%S &lt;acció per realitzar&gt;: Realitza una acció.
+command.ctcp=%S &lt;sobrenom&gt; &lt;msg&gt;: Envia un missatge CTCP al sobrenom.
+command.chanserv=%S &lt;ordre&gt;: Envia una ordre al ChanServ.
+command.deop=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Remove channel operator status from someone. You must be a channel operator to do this.
+command.devoice=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this.
+command.invite=%S &lt;nick&gt; [&lt;room&gt;]: Invite someone to join you in the specified channel, or the current channel.
+command.join=%S &lt;room1&gt;[,&lt;room2&gt;]* [&lt;key1&gt;[,&lt;key2&gt;]*]: Enter one or more channels, optionally providing a channel key for each if needed.
+command.kick=%S &lt;nick&gt; [&lt;message&gt;]: Remove someone from a channel. You must be a channel operator to do this.
+command.list=%S: Display a list of chat rooms on the network. Warning, some servers may disconnect you upon doing this.
+command.memoserv=%S &lt;command&gt;: Send a command to MemoServ.
+command.mode=%S (&lt;nick&gt;|&lt;channel&gt;) (+|-)&lt;new mode&gt;: Set or unset a channel or user mode.
+command.msg=%S &lt;nick&gt; &lt;message&gt;: Send a private message to a user (as opposed to a channel).
+command.nick=%S &lt;new nickname&gt;: Change your nickname.
+command.nickserv=%S &lt;command&gt;: Send a command to NickServ.
+command.notice=%S &lt;target&gt; &lt;message&gt;: Send a notice to a user or channel.
+command.op=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Grant channel operator status to someone. You must be a channel operator to do this.
+command.operserv=%S &lt;command&gt;: Send a command to OperServ.
+command.part=%S [message]: Leave the current channel with an optional message.
+command.ping=%S [&lt;nick&gt;]: Asks how much lag a user (or the server if no user specified) has.
+command.quit=%S &lt;message&gt;: Disconnect from the server, with an optional message.
+command.quote=%S &lt;command&gt;: Send a raw command to the server.
+command.time=%S: Displays the current local time at the IRC server.
+command.topic=%S [&lt;new topic&gt;]: View or change the channel topic.
+command.umode=%S (+|-)&lt;new mode&gt;: Set or unset a user mode.
+command.version=%S &lt;nick&gt;: Request the version of a user's client.
+command.voice=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Grant channel voice status to someone. You must be a channel operator to do this.
+command.wallops=%S &lt;message&gt;: If you don't know what this is, you probably can't use it (sends a command to all connected with the +w flag and all operators on the server.
+command.whowas=%S &lt;nick&gt;: Get information on a user that has logged off.
+
+# 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] entered the room.
+#    %1$S is the nick of who kicked you.
+#    %2$S is message.kicked.reason, if a kick message was given.
+message.kicked.you=You have been kicked by %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 has been kicked by %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.
+message.mode=mode (%1$S %2$S) by %3$S.
+#    %1$S is the old nick and %2$S is the new nick.
+message.nick=%1$S is now known as %2$S.
+#    %S is your new nick.
+message.nick.you=You are now known as %S.
+#    The paramter is the message.parted.reason, if a part message is given.
+message.parted.you=You have left the room (Part%1$S).
+#    %1$S is the user's nick, %2$S is message.parted.reason, if a part message is given.
+message.parted=%1$S has left the room (Part%2$S).
+#    %S is the part message supplied by the user.
+message.parted.reason=: %S
+#    %1$S is the user's nick, %2$S is message.quit2 if a quit message is given.
+message.quit=%1$S has left the room (Quit%2$S).
+#    The paramter is the quit message given by the user.
+message.quit2=: %S
+#    %1$S is the user who changed the topic, %2$S is the new topic.
+message.topicChanged=%1$S ha canviat el tema a: %2$S.
+#    %1$S is the user who cleared the topic.
+message.topicCleared=%1$S ha netejat el tema.
+#    %1$S is the conversation name, %2$S is the topic.
+message.topic=El tema de %1$S és: %2$S.
+#    %S is the conversation name.
+message.topicRemoved=S'ha suprimit el tema de %S.
+#    %1$S is the nickname of the invited user, %2$S is the conversation name
+#    they were invited to.
+message.invited=%1$S was successfully invited to %2$S.
+#    %S is the nickname of the user who was summoned.
+message.summoned=%S was summoned.
+
+# LOCALIZATION NOTE (error.*):
+#    These are shown as error messages in the conversation.
+#    %S is the channel name.
+error.noChannel=No hi és el canal: %S.
+error.tooManyChannels=Cannot join %S; you've joined too many channels.
+#    %1$S is your new nick, %2$S is the kill message from the server.
+error.nickCollision=Nick already in use, changing nick to %1$S [%2$S].
+error.banned=You are banned from this server.
+error.bannedSoon=You will soon be banned from this server.
+error.mode.wrongUser=You cannot change modes for other users.
+
+# 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=Name
+#    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=Connected from
+# The away message of the user
+tooltip.away=Away
+tooltip.ircOp=IRC Operator
+tooltip.channels=Currently on
+tooltip.server=Connected to
+#    %1$S is the server name, %2$S is the server location.
+tooltip.serverValue=%1$S (%2$S)
+tooltip.idleTime=Idle for
+
+# LOCALIZATION NOTE (gtalk.usernameHint):
+#  This is displayed inside the accountUsernameInfoWithDescription
+#  string defined in imAccounts.properties when the user is
+#  configuring an IRC account.
+usernameHint=and server
new file mode 100644
--- /dev/null
+++ b/chat/status.properties
@@ -0,0 +1,14 @@
+availableStatusType=Available
+awayStatusType=Away
+unavailableStatusType=Unavailable
+offlineStatusType=Offline
+invisibleStatusType=Invisible
+idleStatusType=Idle
+mobileStatusType=Mobile
+# LOCALIZATION NOTE (unknownStatusType):
+# the status of a buddy is unknown when it's in the list of a disconnected account
+unknownStatusType=Unknown
+
+# LOCALIZATION NOTE (messenger.status.defaultIdleAwayMessage):
+#  This will be the away message put automatically when the user is idle.
+messenger.status.defaultIdleAwayMessage=I am currently away from the computer.
new file mode 100644
--- /dev/null
+++ b/chat/twitter.properties
@@ -0,0 +1,101 @@
+# LOCALIZATION NOTE (error.*):
+#   These are errors that will be shown to the user in conversation.
+error.tooLong=Status is over 140 characters.
+# 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=An error %1$S occurred while sending: %2$S
+error.retweet=An error %1$S occurred while retweeting: %2$S
+error.delete=An error %1$S occurred while deleting: %2$S
+
+# LOCALIZATION NOTE (timeline):
+#   This is the title of the conversation tab, %S will be replaced by
+#   @<username>.
+timeline=%S timeline
+
+# LOCALIZATION NOTE (action.*):
+#  This will be an action in the context menu of displayed tweets.
+action.copyLink=Copy Link to Tweet
+action.retweet=Retweet
+action.reply=Reply
+action.delete=Delete
+# LOCALIZATION NOTE (action.follow, action.stopFollowing):
+#  %S will be replaced by the screen name of a twitter user.
+action.follow=Follow %S
+action.stopFollowing=Stop following %S
+
+# LOCALIZATION NOTE (event.follow, event.unfollow, event.followed):
+#  This will be displayed in system messages inside the timeline conversation.
+#  %S will be replaced by the screen name of a twitter user.
+event.follow=You are now following %S.
+event.unfollow=You are no longer following %S.
+event.followed=%S us està seguint.
+# LOCALIZATION NOTE (event.deleted):
+#  %S will be replaced by the text of the deleted tweet.
+event.deleted=Heu suprimit la piulada: «%S».
+
+# LOCALIZATION NOTE (replyingToStatusText):
+#  This will be visible in the status bar of the conversation window
+#  while the user is typing a reply to a tweet.
+#  %S will be replaced by the text of the tweet the user is replying to.
+replyingToStatusText=Replying to: %S
+
+# LOCALIZATION NOTE (connection.*):
+#   These will be displayed in the account manager in order to show the progress
+#   of the connection.
+#   (These will be displayed in account.connection.progress from
+#    accounts.properties, which adds … at the end, so do not include
+#    periods at the end of these messages.)
+connection.initAuth=Initiating authentication process
+connection.requestAuth=Waiting for your authorization
+connection.requestAccess=Finalizing authentication
+connection.requestTimelines=Requesting user timelines
+# LOCALIZATION NOTE (connection.error.*):
+#   These will show in the account manager if an error occurs during the
+#   connection attempt.
+connection.error.userMismatch=Username mismatch.
+connection.error.failedToken=Failed to get request token.
+connection.error.authCancelled=You cancelled the authorization process.
+connection.error.authFailed=Failed to get authorization.
+connection.error.noNetwork=There is no network connection available.
+
+# LOCALIZATION NOTE (authPrompt):
+#   This is the prompt in the browser window that pops up to authorize us
+#   to use a Twitter account. It is shown in the title bar of the authorization
+#   window.
+authPrompt=Give permission to use your Twitter account
+
+# LOCALIZATION NOTE (options.*):
+#   These are the protocol specific options shown in the account manager and
+#   account wizard windows.
+options.track=Tracked keywords
+
+# LOCALIZATION NOTE (tooltip.*):
+#   These are the Twitter information that will appear in the tooltip
+#   for each participant on the home timeline.
+# LOCALIZATION NOTE (tooltip.created_at): the date the user joined.
+tooltip.created_at=User Since
+tooltip.location=Location
+tooltip.lang=Language
+tooltip.time_zone=Timezone
+tooltip.url=Homepage
+# LOCALIZATION NOTE (tooltip.protected):
+#  whether the user's tweets are publicly visible.
+tooltip.protected=Protects Tweets
+# LOCALIZATION NOTE (tooltip.following):
+#  whether you are subscribed to the user's tweets.
+tooltip.following=Currently Following
+tooltip.description=Description
+# LOCALIZATION NOTE (tooltip.*_count):
+#  Please see the right side of the official Twitter website UI.
+tooltip.friends_count=Following
+tooltip.statuses_count=Tweets
+tooltip.followers_count=Followers
+tooltip.listed_count=Listed
+
+# LOCALIZATION NOTE (yes, no):
+#  These are used to turn true/false values into a yes/no response.
+yes=Yes
+no=No
new file mode 100644
--- /dev/null
+++ b/chat/xmpp.properties
@@ -0,0 +1,72 @@
+# LOCALIZATION NOTE (connection.*)
+#   These will be displayed in the account manager in order to show the progress
+#   of the connection.
+#   (These will be displayed in account.connection.progress from
+#    accounts.properties, which adds … at the end, so do not include
+#    periods at the end of these messages.)
+connection.initializingStream=Initializing stream
+connection.initializingEncryption=Initializing encryption
+connection.authenticating=Authenticating
+connection.gettingResource=Getting resource
+connection.downloadingRoster=Downloading contact list
+
+# LOCALIZATION NOTE (connection.error.*)
+#   These will show in the account manager if an error occurs during the
+#   connection attempt.
+connection.error.failedToCreateASocket=Failed to create a socket (Are you offline?)
+connection.error.serverClosedConnection=The server closed the connection
+connection.error.resetByPeer=Connection reset by peer
+connection.error.timedOut=The connection timed out
+connection.error.receivedUnexpectedData=Received unexpected data
+connection.error.incorrectResponse=Received an incorrect response
+connection.error.startTLSRequired=The server requires encryption but you disabled it
+connection.error.startTLSNotSupported=The server doesn't support encryption but your configuration requires it
+connection.error.failedToStartTLS=Failed to start encryption
+connection.error.noAuthMec=No authentication mechanism offered by the server
+connection.error.noCompatibleAuthMec=None of the authentication mechanisms offered by the server are supported
+connection.error.notSendingPasswordInClear=The server only supports authentication by sending the password in cleartext
+connection.error.authenticationFailure=Authentication failure
+connection.error.notAuthorized=Not authorized (Did you enter the wrong password?)
+connection.error.failedToGetAResource=Failed to get a resource
+
+# LOCALIZATION NOTE (tooltip.*):
+#   These are the titles of lines of information that will appear in
+#   the tooltip showing details about a contact or conversation.
+# LOCALIZATION NOTE (tooltip.status):
+#   %S will be replaced by the XMPP resource identifier
+tooltip.status=Status (%S)
+tooltip.statusNoResource=Status
+tooltip.subscription=Subscription
+
+# LOCALIZATION NOTE (chatRoomField.*):
+#   These are the name of fields displayed in the 'Join Chat' dialog
+#   for XMPP accounts.
+#   The _ character won't be displayed; it indicates the next
+#   character of the string should be used as the access key for this
+#   field.
+chatRoomField.room=_Room
+chatRoomField.server=_Server
+chatRoomField.nick=_Nick
+chatRoomField.password=_Password
+
+# LOCALIZATION NOTE
+#  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=Contacts
+
+# LOCALIZATION NOTE (options.*):
+#   These are the protocol specific options shown in the account manager and
+#   account wizard windows.
+options.resource=Resource
+options.connectionSecurity=Connection security
+options.connectionSecurity.requireEncryption=Require encryption
+options.connectionSecurity.opportunisticTLS=Use encryption if available
+options.connectionSecurity.allowUnencryptedAuth=Allow sending the password unencrypted
+options.connectServer=Server
+options.connectPort=Port
+
+# LOCALIZATION NOTE (gtalk.usernameHint):
+#  This is displayed inside the accountUsernameInfoWithDescription
+#  string defined in imAccounts.properties when the user is
+#  configuring a Google Talk account.
+gtalk.usernameHint=email address
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -109,17 +109,16 @@ IsEqualNodeWarning=isEqualNode() està en desús.
 TextContentWarning=L'atribut textContent està en desús. Utilitzeu millor value.
 EnablePrivilegeWarning=enablePrivilege està en desús.  Utilitzeu millor codi que s'executi amb el sistema principal (per exemple una extensió).
 PositionWarning=L'atribut posició dels esdeveniments de l'XMLHttpRequest està en desús.
 TotalSizeWarning=L'atribut totalSize dels esdeveniments de l'XMLHttpRequest està en desús.
 nsIJSONDecodeDeprecatedWarning=nsIJSON.decode està obsolet.  Utilitzeu JSON.parse.
 nsIJSONEncodeDeprecatedWarning=nsIJSON.encode està obsolet.  Utilitzeu JSON.stringify.
 nsIDOMWindowInternalWarning=L'ús de nsIDOMWindowInternal està obsolet. Utilitzeu nsIDOMWindow.
 InputEncodingWarning=inputEncoding és obsolet.
-GlobalStorageWarning=globalStorage és obsolet. Utilitzeu localStorage.
 # LOCALIZATION NOTE: Do not translate "MozBeforePaint" and "mozRequestAnimationFrame"
 MozBeforePaintWarning=Ja no es permeten els esdeveniments MozBeforePaint.  Cal passar un paràmetre no null com a callback de mozRequestAnimationFrame.
 FullScreenDeniedDisabled=S'ha denegat la sol·licitud de pantalla completa perquè a les preferències de l'usuari s'ha inhabilitat l'API de la pantalla completa.
 FullScreenDeniedFocusedPlugin=S'ha denegat la sol·licitud de pantalla completa perquè el focus està en un connector amb finestra.
 FullScreenDeniedHidden=S'ha denegat la sol·licitud de pantalla completa perquè el document ja no és visible.
 FullScreenDeniedIframeDisallowed=S'ha denegat la sol·licitud de pantalla completa perquè com a mínim un dels iframes del document no té l'atribut «mozallowfullscreen».
 FullScreenDeniedNotInputDriven=S'ha denegat la sol·licitud de pantalla completa perquè la funció Element.mozRequestFullScreen() no s'ha cridat des de d'un gestor d'esdeveniments generats per l'usuari.
 FullScreenDeniedNotInDocument=S'ha denegat la sol·licitud de pantalla completa perquè l'element que l'ha sol·licitat ja no existeix en el document.
--- a/editor/ui/chrome/composer/editor.properties
+++ b/editor/ui/chrome/composer/editor.properties
@@ -107,16 +107,17 @@ Style_A=A, B, C…
 Style_a=a, b, c…
 Pixels=píxels
 Percent=per cent
 PercentOfCell=% de la cel·la
 PercentOfWindow=% de la finestra
 PercentOfTable=% de la taula
 #LOCALIZATION NOTE (untitledTitle): %S is the window #.  No plural handling needed.
 untitledTitle=sense títol - %S
+untitledDefaultFilename=sense títol
 ShowToolbar=Mostra la barra d'eines
 HideToolbar=Amaga la barra d'eines
 ImapError=No es pot carregar la imatge 
 ImapCheck=\nSeleccioneu una ubicació nova (URL) i torneu-ho a provar.
 SaveToUseRelativeUrl=Els URL relatius només es poden utilitzar en pàgines que hagin estat desades
 NoNamedAnchorsOrHeadings=(En aquesta pàgina no hi ha àncores ni encapçalaments amb nom)
 TextColor=Color del text
 HighlightColor=Color de ressaltat
--- a/mail/chrome/messenger-newsblog/feed-subscriptions.dtd
+++ b/mail/chrome/messenger-newsblog/feed-subscriptions.dtd
@@ -1,18 +1,31 @@
 <!-- Subscription Dialog -->
-<!ENTITY feedSubscriptions.label "Subscripcions RSS">
-<!ENTITY subscriptionDesc.label "Nota: Si se suprimeix o canvia la carpeta d'un canal, els articles que s'hagin baixat abans no se'n veuran afectats.">
-<!ENTITY feedTitle.label "Títol:">
-<!ENTITY location.label  "Ubicació:">
+<!ENTITY feedSubscriptions.label     "Subscripcions RSS">
+<!ENTITY subscriptionDesc.label      "Nota: Si se suprimeix o canvia la carpeta d'un canal, els articles que s'hagin baixat abans no se'n veuran afectats.">
+
+<!ENTITY feedTitle.label             "Títol:">
+<!ENTITY feedTitle.accesskey         "T">
+
+<!ENTITY feedLocation.label          "URL del canal:">
+<!ENTITY feedLocation.accesskey      "U">
+<!ENTITY feedLocation.placeholder    "Introduïu un URL de canal vàlid per afegir">
+
+<!ENTITY feedFolder.label            "Emmagatzema els articles en:">
+<!ENTITY feedFolder.accesskey        "g">
 
-<!ENTITY button.addFeed.label       "Afegeix">
-<!ENTITY button.addFeed.accesskey   "A">
-<!ENTITY button.editFeed.label      "Edita">
-<!ENTITY button.editFeed.accesskey  "E">
-<!ENTITY button.removeFeed.label "Suprimeix">
-<!ENTITY button.removeFeed.accesskey   "r">
-<!ENTITY button.importOPML.label "Importa">
-<!ENTITY button.importOPML.accesskey   "I">
-<!ENTITY button.exportOPML.label "Exporta">
-<!ENTITY button.exportOPML.accesskey   "x">
+<!ENTITY quickMode.label             "Mostra el resum de l'article en comptes de carregar la pàgina web">
+<!ENTITY quickMode.accesskey         "M">
+
+<!ENTITY validateText.label          "Comprova la validació i recupera un URL vàlid.">
 
-<!ENTITY cmd.close.commandKey             "w">
+<!ENTITY button.addFeed.label        "Afegeix">
+<!ENTITY button.addFeed.accesskey    "A">
+<!ENTITY button.editFeed.label       "Edita">
+<!ENTITY button.editFeed.accesskey   "E">
+<!ENTITY button.removeFeed.label     "Suprimeix">
+<!ENTITY button.removeFeed.accesskey "r">
+<!ENTITY button.importOPML.label     "Importa">
+<!ENTITY button.importOPML.accesskey "I">
+<!ENTITY button.exportOPML.label     "Exporta">
+<!ENTITY button.exportOPML.accesskey "x">
+
+<!ENTITY cmd.close.commandKey        "w">
--- a/mail/chrome/messenger-newsblog/newsblog.properties
+++ b/mail/chrome/messenger-newsblog/newsblog.properties
@@ -1,44 +1,56 @@
 subscribe-validating-feed=S'està verificant el canal…
 subscribe-cancelSubscription=Esteu segur que voleu cancel·lar la subscripció al canal actual?
 subscribe-cancelSubscriptionTitle=S'està subscrivint a un canal…
-subscribe-noFeedIsSelected=<no hi ha cap canal seleccionat>
 subscribe-feedAlreadySubscribed=Ja esteu subscrit a aquest canal.
 subscribe-errorOpeningFile=No s'ha pogut obrir el fitxer.
+subscribe-feedAdded=S'ha afegit el canal.
+subscribe-feedUpdated=S'ha actualitzat el canal.
+subscribe-feedMoved=S'ha mogut la subscripció del canal.
+subscribe-feedRemoved=S'ha cancel·lat la subscripció del canal.
+subscribe-feedNotValid=L'URL del canal no és un canal vàlid.
+subscribe-networkError=No s'ha trobat l'URL del canal. Comproveu el nom i torneu-ho a provar.
 
 subscribe-OPMLImportTitle=Selecciona un fitxer OPML per importar
 subscribe-OPMLExportTitle=Exporta els canals en un fitxer OPML
 ## LOCALIZATION NOTE(subscribe-OPMLExportFileDialogTitle): %S is the brandShortName
 subscribe-OPMLExportFileDialogTitle=Exportació OPML del %S
 ## LOCALIZATION NOTE(subscribe-OPMLExportDefaultFileName): %S is the brandShortName
 subscribe-OPMLExportDefaultFileName=Canals_%S.opml
 ## LOCALIZATION NOTE(subscribe-OPMLImportInvalidFile): %S is the name of the OPML file the user tried to import.
 subscribe-OPMLImportInvalidFile=El fitxer %S no sembla que sigui un fitxer OPMV correcte.
-## LOCALIZATION NOTE(subscribe-OPMLImportNewFeeds): %S is the count of new imported entries.
-subscribe-OPMLImportNewFeeds=S'han importat %S canals d'informació nous.
-## LOCALIZATION NOTE(subscribe-OPMLImportTotalFeeds):
-## - The first %S is the the count of new imported entries,
-## - The second %S is total number of elements found in the file
-subscribe-OPMLImportTotalFeeds=S'han importat %S canals d'informació nous dels %S que hi havia en total. Només s'han important els canals on no estàveu subscrits ja.
+## LOCALIZATION NOTE(subscribe-OPMLImportFeedCount): Semi-colon list of plural forms.
+## See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+## #1 is the count of new imported entries.
+subscribe-OPMLImportFeedCount=Imported #1 new feed.;Imported #1 new feeds.
+## LOCALIZATION NOTE(subscribe-OPMLImportUniqueFeeds): Semi-colon list of plural forms.
+## #1 is the count of new imported entries
+subscribe-OPMLImportUniqueFeeds=Imported #1 new feed to which you aren't already subscribed;Imported #1 new feeds to which you aren't already subscribed
+## LOCALIZATION NOTE(subscribe-OPMLImportFoundFeeds):
+## #1 is total number of elements found in the file
+subscribe-OPMLImportFoundFeeds=(out of #1 entry found);(out of #1 total entries found)
+## LOCALIZATION NOTE(subscribe-OPMLImportStatus):
+## This is the concatenation of the two strings defined above to compose 1 sentence.
+## %1$S = subscribe-OPMLImportUniqueFeeds
+## %2$S = subscribe-OPMLImportFoundFeeds
+subscribe-OPMLImportStatus=%1$S %2$S.
 
 subscribe-OPMLExportOPMLFilesFilterText=Fitxers OPML
 
 subscribe-confirmFeedDeletionTitle=Suprimeix el canal
 ## LOCALIZATION NOTE(subscribe-confirmFeedDeletion): %S is the name of the feed the user wants to unsubscribe from.
 subscribe-confirmFeedDeletion=Esteu segur que voleu cancel·lar la subscripció al canal: \n %S?
 
 ## LOCALIZATION NOTE(subscribe-gettingFeedItems):
 ##  - The first %S is the number of articles processed so far;
 ##  - The second %S is the total number of items
 subscribe-gettingFeedItems=S'estan baixant els articles del canal (%S of %S)…
 
 newsblog-noNewArticlesForFeed=No hi ha cap article nou per a aquest canal.
-newsblog-networkErrorTitle=Error de la xarxa
 ## LOCALIZATION NOTE(newsblog-networkError): %S is the feed URL
 newsblog-networkError=No s'ha pogut trobar %S. Comproveu el nom i torneu-ho a provar.
-newsblog-feedNotValidTitle=El canal no és vàlid
 ## LOCALIZATION NOTE(newsblog-feedNotValid): %S is the feed URL
 newsblog-feedNotValid=%S no és un canal RSS vàlid.
 newsblog-getNewMsgsCheck=S'està comprovant si hi ha nous elements als canals…
 
 ## LOCALIZATION NOTE(feeds-accountname): This string should be the same as feeds.accountName in am-newsblog.dtd
 feeds-accountname=Blocs i canals de notícies
--- a/mail/chrome/messenger/AccountManager.dtd
+++ b/mail/chrome/messenger/AccountManager.dtd
@@ -1,16 +1,18 @@
 <!-- extracted from AccountManager.xul -->
 
 <!ENTITY accountManagerTitle.label "Paràmetres del compte">
 
 <!ENTITY accountActionsButton.label "Accions del compte">
 <!ENTITY accountActionsButton.accesskey "A">
 <!ENTITY addMailAccountButton.label "Afegeix un compte de correu…">
 <!ENTITY addMailAccountButton.accesskey "A">
+<!ENTITY addIMAccountButton.label "Add Chat Account…">
+<!ENTITY addIMAccountButton.accesskey "C">
 <!ENTITY addOtherAccountButton.label "Afegeix un altre tipus de compte…">
 <!ENTITY addOtherAccountButton.accesskey "t">
 <!ENTITY setDefaultButton.label "Defineix com a predeterminat">
 <!ENTITY setDefaultButton.accesskey "f">
 <!ENTITY removeButton.label "Suprimeix el compte">
 <!ENTITY removeButton.accesskey "i">
 <!-- AccountManager.xul -->
 <!-- LOCALIZATION NOTE : this is part of an inline-style attribute on the account
--- a/mail/chrome/messenger/AccountWizard.dtd
+++ b/mail/chrome/messenger/AccountWizard.dtd
@@ -26,68 +26,67 @@
   2, Use localized full name instead of "John Smith"
 -->
 <!ENTITY fullnameExample.label "(per exemple, &quot;Josep Poquet&quot;).">
 <!ENTITY fullnameLabel.label "El vostre nom:">
 <!ENTITY fullnameLabel.accesskey "n">
 
 <!ENTITY emailLabel.label "Adreça electrònica:">
 <!ENTITY emailLabel.accesskey "t">
-<!-- Entities for Server page -->
+<!-- Entities for Incoming Server page -->
 
 
-<!ENTITY serverTitle.label "Informació del servidor">
+<!ENTITY incomingTitle.label "Incoming Server Information">
 <!ENTITY incomingServerTypeDesc.label "Seleccioneu el tipus de servidor d'entrada que utilitzeu.">
-<!-- LOCALIZATION NOTE (incomingServerNameDesc.label) : Do not translate "&quot;pop.example.net&quot;" in below line -->
-<!ENTITY incomingServerNameDesc.label "Introduïu el nom del servidor d'entrada (per exemple, &quot;pop.exemple.net&quot;).">
-<!ENTITY incomingServerLabel.label "Servidor d'entrada:">
-<!ENTITY incomingServerLabel.accesskey "S">
-<!-- LOCALIZATION NOTE (newsServerNameDesc.label) : Do not translate "NNTP" or the "&quot;" entities in below line -->
-<!ENTITY newsServerNameDesc.label "Introduïu el nom del servidor de grups de discussió (NNTP) (per exemple, &quot;news.exemple.net&quot;).">
-<!-- LOCALIZATION NOTE (smtpServerDesc.label) : Do not translate "SMTP" and "&quot;smtp.example.net&quot;" in below line -->
-<!ENTITY smtpServerDesc.label "Introduïu el nom del vostre servidor de sortida (SMTP) (per exemple, &quot;smtp.exemple.net&quot;).">
-<!ENTITY smtpServerLabel.label "Servidor de sortida:">
-<!ENTITY smtpServerLabel.accesskey "o">
-<!ENTITY newsServerLabel.label "Servidor de grups de discussió:">
-<!ENTITY newsServerLabel.accesskey "S">
 <!-- LOCALIZATION NOTE (imapType.label) : Do not translate "IMAP" in below line -->
 <!ENTITY imapType.label "IMAP">
 <!ENTITY imapType.accesskey "I">
 <!-- LOCALIZATION NOTE (popType.label) : Do not translate "POP" in below line -->
 <!ENTITY popType.label "POP">
 <!ENTITY popType.accesskey "P">
 <!ENTITY leaveMsgsOnSrvr.label "Deixa els missatges al servidor">
 <!ENTITY leaveMsgsOnSrvr.accesskey "l">
 <!ENTITY portNum.label "Port:">
 <!ENTITY portNum.accesskey "o">
 <!ENTITY defaultPortLabel.label "Predeterminat:">
 <!ENTITY defaultPortValue.label "">
+<!-- LOCALIZATION NOTE (incomingServerNameDesc.label) : Do not translate "&quot;pop.example.net&quot;" in below line -->
+<!ENTITY incomingServer.description "Enter the name of your incoming server (for example, &quot;mail.example.net&quot;).">
+<!ENTITY incomingServer.label "Incoming Server:">
+<!ENTITY incomingServer.accesskey "S">
+<!-- LOCALIZATION NOTE (incomingUsername.description) : do not translate "&quot;jsmith&quot;" in below line -->
+<!ENTITY incomingUsername.description "Enter the incoming user name given to you by your email provider (for example, &quot;jsmith&quot;).">
+<!ENTITY incomingUsername.label "User Name:">
+<!ENTITY incomingUsername.accesskey "U">
+<!-- LOCALIZATION NOTE (newsServerNameDesc.label) : Do not translate "NNTP" or the "&quot;" entities in below line -->
+<!ENTITY newsServerNameDesc.label "Introduïu el nom del servidor de grups de discussió (NNTP) (per exemple, &quot;news.exemple.net&quot;).">
+<!ENTITY newsServerLabel.label "Servidor de grups de discussió:">
+<!ENTITY newsServerLabel.accesskey "S">
+<!-- Entities for Outgoing Server page -->
+
+
+<!ENTITY outgoingTitle.label "Outgoing Server Information">
+<!-- LOCALIZATION NOTE (outgoingServer.description) : Do not translate "SMTP" and "&quot;smtp.example.net&quot;" in below line -->
+<!ENTITY outgoingServer.description "Enter the name of your outgoing server (SMTP) (for example, &quot;smtp.example.net&quot;).">
+<!ENTITY outgoingServer.label "Outgoing Server:">
+<!ENTITY outgoingServer.accesskey "S">
+<!ENTITY outgoingUsername.description "Enter the outgoing user name given to you by your email provider (this is typically the same as your incoming user name).">
+<!ENTITY outgoingUsername.label "Outgoing User Name:">
+<!ENTITY outgoingUsername.accesskey "U">
 <!-- LOCALIZATION NOTE (modifyOutgoing.suffix) : This string will be appended after each of
      haveSmtp1.suffix3, haveSmtp2.suffix3, haveSmtp3.suffix3 .
 -->
 
 <!ENTITY modifyOutgoing.suffix "Podeu canviar els servidors de sortida anant a les opcions del compte.">
 <!-- LOCALIZATION NOTE (haveSmtp1.prefix and haveSmtp1.suffix3) : Do not translate "SMTP" and "&quot;" in
      these variables. Also, translate haveSmtp1.prefix and haveSmtp1.suffix3 as a single sentence, inserting
      text after the "&quot;" entity in haveSmtp1.suffix3, if required grammatically.
 -->
 <!ENTITY haveSmtp1.prefix "S'utilitzarà el vostre servidor de sortida (SMTP), &quot;">
 <!ENTITY haveSmtp1.suffix3 "&quot;.">
-<!-- Entities for Login page -->
-
-
-<!ENTITY loginTitle.label "Nom d'usuari">
-<!ENTITY usernameDesc.label "Introduïu el nom d'usuari d'entrada que us ha donat el vostre proveïdor de correu electrònic ">
-<!-- LOCALIZATION NOTE (usernameExample.label) : do not translate "&quot;jsmith&quot;" in below line -->
-<!ENTITY usernameExample.label "(per exemple, &quot;jpoquet&quot;).">
-<!ENTITY usernameLabel.label "Nom d'usuari d'entrada:">
-<!ENTITY usernameLabel.accesskey "u">
-<!ENTITY usernameSmtpDesc.label "Introduïu el nom d'usuari de sortida que us ha donat el vostre proveïdor de correu electrònic (aquest típicament és el mateix que el nom d'usuari d'entrada).">
-<!ENTITY usernameSmtpLabel.label "Nom d'usuari de sortida:">
-<!ENTITY usernameSmtpLabel.accesskey "o">
 <!-- LOCALIZATION NOTE (haveSmtp2.prefix and haveSmtp2.suffix3) : Do not translate "SMTP" and "&quot;" in
      these variables. Also, translate haveSmtp2.prefix and haveSmtp2.suffix3 as a single sentence, inserting
      text after the "&quot;" entity in haveSmtp2.suffix3, if required grammatically.
 -->
 <!ENTITY haveSmtp2.prefix "S'utilitzarà el vostre nom d'usuari de sortida (SMTP), &quot;">
 <!ENTITY haveSmtp2.suffix3 "&quot;.">
 <!-- LOCALIZATION NOTE (haveSmtp3.prefix and haveSmtp3.suffix3) : Do not translate "SMTP" and "&quot;" in
      these variables. Also, translate haveSmtp3.prefix and haveSmtp3.suffix3 as a single sentence, inserting
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/addbuddy.dtd
@@ -0,0 +1,3 @@
+<!ENTITY addBuddyWindow.title           "Add contact">
+<!ENTITY name.label                     "Username">
+<!ENTITY account.label                  "Account">
--- a/mail/chrome/messenger/am-identities-list.dtd
+++ b/mail/chrome/messenger/am-identities-list.dtd
@@ -1,7 +1,9 @@
 <!ENTITY identitiesListDesc.label "Suport per a múltiples identitats">
 <!ENTITY identitiesListAdd.label  "Afegeix…">
 <!ENTITY identitiesListAdd.accesskey  "A">
 <!ENTITY identitiesListEdit.label "Edita…">
 <!ENTITY identitiesListEdit.accesskey "E">
 <!ENTITY identitiesListDelete.label "Suprimeix">
 <!ENTITY identitiesListDelete.accesskey "S">
+<!ENTITY identitiesListClose.label "Close">
+<!ENTITY identitiesListClose.accesskey "C">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/am-im.dtd
@@ -0,0 +1,12 @@
+<!ENTITY accountWindow.title           "Account properties">
+<!ENTITY accountWindow.width           "300">
+<!ENTITY account.general               "General">
+<!ENTITY account.advanced              "Advanced Options">
+<!ENTITY account.name                  "Username:">
+<!ENTITY account.password              "Password:">
+<!ENTITY account.alias                 "Alias:">
+<!ENTITY account.newMailNotification   "Notify on new Mail">
+<!ENTITY account.autojoin              "Auto-Joined Channels:">
+<!ENTITY account.proxySettings.caption "Proxy Settings:">
+<!ENTITY account.proxySettings.change.label     "Change…">
+<!ENTITY account.proxySettings.change.accessKey "C">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/chat.dtd
@@ -0,0 +1,51 @@
+<!ENTITY onlineContactsHeader.label    "Online Contacts">
+<!ENTITY offlineContactsHeader.label   "Offline Contacts">
+<!ENTITY conversationsHeader.label     "Conversations">
+<!ENTITY searchResultConversation.label "Search result">
+<!ENTITY chat.noConv.title             "Conversations will be displayed here.">
+<!ENTITY chat.noConv.description       "Use the contact list in the left panel to start a conversation.">
+<!ENTITY chat.noPreviousConv.description       "&brandShortName; currently doesn't have any previous conversations stored for this contact.">
+<!ENTITY chat.noAccount.title             "You haven't set up a chat account yet.">
+<!ENTITY chat.noAccount.description       "Let &brandShortName; guide you through the process of setting up your chat account.">
+<!ENTITY chat.accountWizard.button       "Get started">
+<!ENTITY chat.noConnectedAccount.title             "Your chat accounts are not connected.">
+<!ENTITY chat.noConnectedAccount.description       "You can connect them from the 'Chat status' dialog:">
+<!ENTITY chat.showAccountManager.button       "Show chat status">
+
+<!ENTITY chat.participants             "Participants:">
+<!ENTITY chat.previousConversations    "Previous Conversations:">
+<!ENTITY chat.ongoingConversation      "Ongoing conversation">
+
+<!ENTITY openConversationCmd.label     "Start a Conversation">
+<!ENTITY openConversationCmd.accesskey "c">
+<!ENTITY closeConversationCmd.label    "Close Conversation">
+<!ENTITY closeConversationCmd.accesskey "C">
+<!ENTITY aliasCmd.label                "Rename">
+<!ENTITY aliasCmd.accesskey            "R">
+<!ENTITY deleteCmd.label               "Remove Contact">
+<!ENTITY deleteCmd.accesskey           "v">
+
+<!ENTITY openConversationButton.tooltip  "Start a conversation">
+<!ENTITY closeConversationButton.tooltip "Close conversation">
+
+<!ENTITY addBuddyButton.label          "Add Contact">
+<!ENTITY joinChatButton.label          "Join Chat">
+<!ENTITY chatAccountsButton.label      "Show Accounts">
+<!-- LOCALIZATION NOTE (searchAllChatMessages.label.base):
+     This is the base of the empty text for the chat search box.  We replace
+     #1 with the contents of the appropriate search.keyLabel.* value for the
+     platform (defined in messenger/messenger.dtd).
+     The goal is to convey to the user that typing in the box will allow them
+     to search for conversations and that there is a hotkey they can press
+     to get to the box faster.  If the global indexer is disabled, the search
+     box will be collapsed and the user will never see this message.
+     -->
+
+<!ENTITY searchAllChatMessages.label.base "Search all conversations… #1">
+
+<!ENTITY status.available          "Available">
+<!ENTITY status.unavailable        "Unavailable">
+<!ENTITY status.offline            "Offline">
+
+<!ENTITY openLinkCmd.label            "Open Link…">
+<!ENTITY openLinkCmd.accesskey        "O">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/chat.properties
@@ -0,0 +1,86 @@
+chatTabTitle=Chat
+goBackToCurrentConversation.button=Back to current conversation
+# LOCALIZATION NOTE (startAConversationWith.button):
+#  %S is replaced with the display name of a contact.
+startAConversationWith.button=Start a conversation with %S
+
+# LOCALIZATION NOTE (defaultGroup):
+#  this is used in the addBuddies dialog if the list of existing groups is empty
+defaultGroup=Contacts
+
+# LOCALIZATION NOTE (buddy.authRequest.label):
+# This string appears in a notification bar at the
+# top of the Contacts window when someone added the user to his/her
+# contact list, to request the permission from the user to share
+# status information with this potential new contact.
+# %S is replaced with the user name of the potential new contact.
+buddy.authRequest.label=%S wants to chat with you
+buddy.authRequest.allow.label=Allow
+buddy.authRequest.allow.accesskey=A
+buddy.authRequest.deny.label=Deny
+buddy.authRequest.deny.accesskey=D
+
+# LOCALIZATION NOTE (buddy.deletePrompt.title):
+# %S here will be replaced by the alias (or username) of a buddy about
+# to be removed from the buddy list.
+buddy.deletePrompt.title=Delete %S?
+
+# LOCALIZATION NOTE (buddy.deletePrompt.message):
+# %1$S will be replaced by the name of a buddy (either the alias
+# followed by the username between parenthesis if an alias is set, or
+# only the username otherwise).
+# %2$S will be the name of the protocol on which this buddy is removed
+# (for example: AIM, MSN, Google Talk).
+#
+# Please find a wording that will keep the username as close as
+# possible to the beginning of the string, because this is the
+# important information that an user should see when looking quickly
+# at this prompt.
+buddy.deletePrompt.message=%1$S will be permanently removed from your %2$S buddy list if you continue.
+
+# LOCALIZATION NOTE (buddy.deletePrompt.displayName):
+# This is used to format the display name inserted in buddy.deletePrompt.message
+# %1$S is the alias, %2$S is the username.
+buddy.deletePrompt.displayName=%1$S (%2$S)
+
+# LOCALIZATION NOTE (buddy.deletePrompt.button):
+# the & symbol indicates the position of the character that should be
+# used as the accesskey for this button.
+buddy.deletePrompt.button=&Delete
+
+displayNameEmptyText=Display Name
+userIconFilePickerTitle=Select the new icon…
+
+# LOCALIZATION NOTE (chat.isTyping, chat.hasStoppedTyping):
+# The contact display name is displayed with a big font on a first
+# line and these two strings are displayed on a second line with a
+# smaller font. Please try to find a wording that make this look
+# almost like a sentence.
+chat.isTyping=is typing…
+chat.hasStoppedTyping=has stopped typing.
+# LOCALIZATION NOTE (chat.contactIsTyping, chat.contactHasStoppedTyping):
+#  These strings are displayed in a tooltip when hovering the status type icon.
+#  %S is replaced with the display name of the contact.
+chat.contactIsTyping=%S is typing.
+chat.contactHasStoppedTyping=%S has stopped typing.
+
+noTopic=No topic message for this room.
+
+# LOCALIZATION NOTE (unknownCommand):
+# This is shown when an unknown command (/foo) is attempted. %S is the command.
+unknownCommand=%S is not a supported command. Type /help to see the list of commands.
+
+# LOCALIZATION NOTE (buddytooltip.username, buddytooltip.account):
+# This is for the tooltip that appears when hovering
+# a contact or a conversation in the left pane.
+buddytooltip.username=Username
+buddytooltip.account=Account
+
+# LOCALIZATION NOTE (today, yesterday):
+# These 3 strings are used to display when previous conversations happened.
+# In 'today' and 'yesterday', %S is replaced with the time.
+today=Today %S
+yesterday=Yesterday %S
+# LOCALIZATION NOTE (dateTime):
+# %1$S is the date, %2$S is the date.
+dateTime=%1$S %2$S
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/Dropbox/management.dtd
@@ -0,0 +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/.  -->
+<!ENTITY dropboxMgmt.viewSettings "View my account settings on dropbox.com">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/YouSendIt/management.dtd
@@ -0,0 +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/.  -->
+<!ENTITY youSendItMgmt.viewSettings "View my account settings on yousendit.com">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/YouSendIt/settings.dtd
@@ -0,0 +1,5 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this file,
+   - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
+<!ENTITY youSendItSettings.username "Username:">
+<!ENTITY youSendItSettings.needAnAccount "Need an account?">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/addAccountDialog.dtd
@@ -0,0 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this file,
+   - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
+<!ENTITY addAccountDialog.title   "Set up Filelink">
+<!ENTITY addAccountDialog.menuTitle "Select an online storage service">
+<!ENTITY addAccountDialog.style "width: 40em; min-height: 20em;">
+<!ENTITY addAccountDialog.accountName.label "Account Name:">
+<!ENTITY addAccountDialog.noAccountText "We're sorry, but the current version of &brandShortName; only allows one account from each online storage service.">
+<!ENTITY addAccountDialog.createAccountText "This feature allows you to send large attachments using one of several online storage services. You can either connect to an existing account, or sign up for a new account.">
+<!ENTITY addAccountDialog.authorizing "Checking authorization...">
+<!ENTITY addAccountDialog.error "An error occurred while setting up the account!">
+<!ENTITY addAccountDialog.acceptButton.label "Set up Account">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/management.dtd
@@ -0,0 +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 cloudfileMgmt.privacyPolicy "Privacy Policy">
+<!ENTITY cloudfileMgmt.termsOfService "Terms of Service">
+<!ENTITY cloudfileMgmt.usedSpace "Used Space:">
+<!ENTITY cloudfileMgmt.unusedSpace "Unused Space:">
+<!ENTITY cloudfileMgmt.upgradeOffer "Get more space">
--- a/mail/chrome/messenger/glodaComplete.properties
+++ b/mail/chrome/messenger/glodaComplete.properties
@@ -46,18 +46,19 @@ glodaComplete.messagesTagged.label=Missa
 glodaComplete.messagesMentioning.label=Missatges que fan referència a: #1
 
 # LOCALIZATION NOTE (glodaComplete.messagesWithMany.label): The label used
 #  in the autocomplete widget to refer to a search for all messages mentioning
 #  a set of words, or a phrase containing multiple words (e.g. "red pepper")
 #  We use the same words in en-US, but maybe that's not always true.
 glodaComplete.messagesMentioningMany.label=Missatges que en fan referència: #1
 
-# LOCALIZATION NOTE (glodaComplete.webSearch.label): The label used in the
+# LOCALIZATION NOTE (glodaComplete.webSearch1.label): The label used in the
 #  autocomplete widget to refer to a search on the web for a short string
-#  containing at most 15 characters. #1 is the string to search for.
-glodaComplete.webSearch.label=Cerca al web: #1
+#  containing at most 15 characters. #1 is the search provider to use. #2 is
+#  the string to search for, truncated to 15 characters.
+glodaComplete.webSearch1.label=Search #1 for: #2
 
-# LOCALIZATION NOTE (glodaComplete.webSearch.label.truncated): The label used in
+# LOCALIZATION NOTE (glodaComplete.webSearch1.label.truncated): The label used in
 #  the autocomplete widget to refer to a search on the web for a short string
-#  containing more than 15 characters. #1 is the string to search for, truncated
-#  to 15 characters.
-glodaComplete.webSearch.label.truncated=Cerca al web: #1...
+#  containing more than 15 characters. #1 is the search provider to use. #2 is
+#  the string to search for, truncated to 15 characters.
+glodaComplete.webSearch1.label.truncated=Search #1 for: #2…
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/imAccountWizard.dtd
@@ -0,0 +1,28 @@
+<!ENTITY windowTitle.label            "Chat Account Wizard">
+
+<!ENTITY accountProtocolTitle.label   "Chat network">
+<!ENTITY accountProtocolInfo.label    "Please choose the network of your chat account.">
+<!ENTITY accountProtocolField.label   "Network:">
+<!ENTITY accountProtocolGetMore.label "Get more…">
+
+<!ENTITY accountUsernameTitle.label   "Username">
+<!ENTITY accountUsernameDuplicate.label "This account is already configured!">
+
+<!ENTITY accountPasswordTitle.label   "Password">
+<!ENTITY accountPasswordInfo.label    "Please enter your password in the box below.">
+<!ENTITY accountPasswordField.label   "Password:">
+<!ENTITY accountPasswordManager.label "The password entered here will be stored in the Password Manager. Leave this box empty if you want to be prompted for your password each time this account is connected.">
+
+<!ENTITY accountAdvancedTitle.label   "Advanced Options">
+<!ENTITY accountAdvancedInfo.label    "Feel free to skip this step if you want to.">
+<!ENTITY accountAdvanced.newMailNotification.label   "Notify on new Mail">
+<!ENTITY accountAliasGroupbox.caption "Local Alias">
+<!ENTITY accountAliasField.label      "Alias:">
+<!ENTITY accountAliasInfo.label       "This will only be displayed in your conversations when you talk, remote contacts won't see it.">
+<!ENTITY accountProxySettings.caption "Proxy Settings">
+<!ENTITY accountProxySettings.change.label     "Change…">
+<!ENTITY accountProxySettings.change.accessKey "C">
+
+<!ENTITY accountSummaryTitle.label   "Summary">
+<!ENTITY accountSummaryInfo.label    "A summary of the information you entered is displayed below. Please check it before the account is created.">
+<!ENTITY accountSummary.connectNow.label "Connect this account now.">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/imAccounts.dtd
@@ -0,0 +1,26 @@
+<!ENTITY accountsWindow.title                "Instant messaging status">
+<!ENTITY accountsWindow.style                "width: 28em; height: 19em;">
+<!ENTITY accountManager.newAccount.label     "New Account">
+<!ENTITY accountManager.newAccount.accesskey "N">
+<!ENTITY accountManager.close.label          "Close">
+<!ENTITY accountManager.close.accesskey      "l">
+<!-- This should match account.commandkey in instantbird.dtd -->
+<!ENTITY accountManager.close.commandkey     "a">
+<!-- This title must be short, displayed with a big font size -->
+<!ENTITY accountManager.noAccount.title      "No account configured yet">
+<!ENTITY accountManager.noAccount.description "Click on the &accountManager.newAccount.label; button to let &brandShortName; guide you through the process of configuring one.">
+<!ENTITY account.autoSignOn.label     "Sign-on at startup">
+<!ENTITY account.autoSignOn.accesskey "S">
+<!ENTITY account.connect.label        "Connect">
+<!ENTITY account.connect.accesskey    "o">
+<!ENTITY account.disconnect.label     "Disconnect">
+<!ENTITY account.disconnect.accesskey "i">
+<!ENTITY account.edit.label           "Properties">
+<!ENTITY account.edit.accesskey       "P">
+<!ENTITY account.moveup.label         "Move up">
+<!ENTITY account.movedown.label       "Move down">
+<!ENTITY account.cancelReconnection.label         "Cancel reconnection">
+<!ENTITY account.cancelReconnection.accesskey     "a">
+<!ENTITY account.connecting           "Connecting…">
+<!ENTITY account.disconnecting        "Disconnecting…">
+<!ENTITY account.disconnected         "Not Connected">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/imAccounts.properties
@@ -0,0 +1,59 @@
+# LOCALIZATION NOTE (protoOptions):
+# %S is replaced by the name of a protocol
+protoOptions=%S Options
+accountUsername=Username:
+# LOCALIZATION NOTE (accountColon):
+# This string is used to append a colon after the label of each
+# option. It's localizable so that the typography can be adapted.
+accountColon=%S:
+# LOCALIZATION NOTE (accountUsernameInfo):
+# %S is replaced by the name of a protocol
+accountUsernameInfo=Please enter the username for your %S account.
+# LOCALIZATION NOTE (accountUsernameInfoWithDescription):
+# %1$S is a hint for the expected format of the username
+# %2$S is the name of a protocol
+accountUsernameInfoWithDescription=Please enter the username (%1$S) for your %2$S account.
+
+# LOCALIZATION NOTE (account.connection.error):
+# %S is the error message.
+account.connection.error=Error: %S
+# LOCALIZATION NOTE (account.connection.errorUnknownPrpl)
+# %S is the id (not very user friendly; hence the quotes) of the missing plugin.
+account.connection.errorUnknownPrpl=No '%S' protocol plugin.
+account.connection.errorEnteringPasswordRequired=Entering a password is required to connect this account.
+account.connection.errorCrashedAccount=A crash occurred while connecting this account.
+# LOCALIZATION NOTE (account.connection.progress):
+# %S is a message indicating progress of the connection process
+account.connection.progress=Connecting: %S…
+account.connecting=Connecting…
+account.connectedForSeconds=Connected for a few seconds.
+# LOCALIZATION NOTE (account.connectedFor{Double,Single},
+#                    account.reconnectIn{Double,Single}):
+# Each pair of %S is a number followed by a unit. The units are
+# already localized in a downloads.properties file of the toolkit.
+account.connectedForDouble=Connected for %1$S %2$S and %3$S %4$S.
+account.connectedForSingle=Connected for about %1$S %2$S.
+account.reconnectInDouble=Reconnection in %1$S %2$S and %3$S %4$S.
+account.reconnectInSingle=Reconnection in %1$S %2$S.
+
+requestAuthorizeTitle=Authorization request
+# LOCALIZATION NOTE (requestAuthorizeAllow, requestAuthorizeDeny):
+# the & symbol indicates the position of the character that should be
+# used as the accesskey for this button.
+requestAuthorizeAllow=&Allow
+requestAuthorizeDeny=&Deny
+# LOCALIZATION NOTE (requestAuthorizeText):
+# %S is a contact username.
+requestAuthorizeText=%S added you to his/her buddy list, do you want to allow him/her to see you?
+
+accountsManager.notification.button.accessKey=C
+accountsManager.notification.button.label=Connect Now
+accountsManager.notification.userDisabled.label=You have disabled automatic connections.
+accountsManager.notification.safeMode.label=Automatic Connection Settings have been ignored because the application is currently running in Safe-Mode.
+accountsManager.notification.startOffline.label=Automatic Connection Settings have been ignored because the application was started in Offline Mode.
+accountsManager.notification.crash.label=The last run exited unexpectedly while connecting. Automatic Connections have been disabled to give you an opportunity to Edit your Settings.
+# LOCALIZATION NOTE (accountsManager.notification.singleCrash.label): Semi-colon list of plural forms.
+#  See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+#  #1 is the number of accounts that are suspected to have caused a crash.
+accountsManager.notification.singleCrash.label=A previous run exited unexpectedly while connecting a new or edited account. It has not been connected so that you can Edit its Settings.;A previous run exited unexpectedly while connecting #1 new or edited accounts. They have not been connected so that you can Edit their Settings.
+accountsManager.notification.other.label=Automatic connection has been disabled.
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/joinChat.dtd
@@ -0,0 +1,6 @@
+<!ENTITY joinChatWindow.title           "Join chat">
+<!ENTITY name.label                     "Room">
+<!ENTITY optional.label                 "(optional)">
+<!ENTITY account.label                  "Account">
+<!ENTITY autojoin.label                 "Auto-join this Chat Room">
+<!ENTITY autojoin.accesskey             "A">
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -21,16 +21,18 @@
 <!ENTITY newVirtualFolderCmd.label "Cerca desada…">
 <!ENTITY newVirtualFolderCmd.accesskey "d">
 <!ENTITY newOtherAccountsCmd.label "Altres comptes…">
 <!ENTITY newOtherAccountsCmd.accesskey "A">
 <!ENTITY newCreateEmailAccountCmd.label "Obtén un compte nou de correu...">
 <!ENTITY newCreateEmailAccountCmd.accesskey "O">
 <!ENTITY newExistingEmailAccountCmd.label "Compte de correu existent...">
 <!ENTITY newExistingEmailAccountCmd.accesskey "e">
+<!ENTITY newIMAccountCmd.label "Chat Account…">
+<!ENTITY newIMAccountCmd.accesskey "C">
 <!ENTITY openMessageFileCmd.label "Obre un missatge desat…">
 <!ENTITY openMessageFileCmd.accesskey "O">
 <!ENTITY openAttachmentCmd.label "Adjuncions">
 <!ENTITY openAttachmentCmd.accesskey "A">
 <!ENTITY saveAsMenu.label "Anomena i desa">
 <!ENTITY saveAsMenu.accesskey "s">
 <!ENTITY saveAsFileCmd.label "Fitxer">
 <!ENTITY saveAsFileCmd.accesskey "F">
@@ -321,16 +323,19 @@ you can use these alternative items. Oth
 <!ENTITY prevUnreadMsgCmd.accesskey "p">
 <!ENTITY prevUnreadMsgCmd.key "p">
 <!ENTITY goForwardCmd.label "Endavant">
 <!ENTITY goForwardCmd.accesskey "d">
 <!ENTITY goForwardCmd.commandKey "]">
 <!ENTITY goBackCmd.label "Enrere">
 <!ENTITY goBackCmd.accesskey "r">
 <!ENTITY goBackCmd.commandKey "[">
+<!ENTITY goChatCmd.label "Chat">
+<!ENTITY goChatCmd.accesskey "c">
+<!ENTITY goChatCmd.commandKey "C">
 <!ENTITY prevStarredMsgCmd.label "Missatge destacat">
 <!ENTITY prevStarredMsgCmd.accesskey "s">
 <!ENTITY folderMenu.label "Carpeta">
 <!ENTITY folderMenu.accesskey "C">
 <!ENTITY thisFolder.label "Aquesta carpeta">
 <!ENTITY thisFolder.accesskey "A">
 <!ENTITY goRecentlyClosedTabs.label "Pestanyes tancades recentment">
 <!ENTITY goRecentlyClosedTabs.accesskey "r">
@@ -464,16 +469,22 @@ you can use these alternative items. Oth
 <!ENTITY messengerCmd.accesskey "M">
 <!ENTITY addressBookCmd.label "Llibreta d'adreces">
 <!ENTITY addressBookCmd.accesskey "a">
 <!ENTITY addressBookCmd.key "B">
 <!ENTITY addons.label "Complements">
 <!ENTITY addons.accesskey "m">
 <!ENTITY activitymanager.label "Gestor d'activitat">
 <!ENTITY activitymanager.accesskey "a">
+<!ENTITY imAccountsStatus.label "Chat status">
+<!ENTITY imAccountsStatus.accesskey "C">
+<!ENTITY imStatus.available          "Available">
+<!ENTITY imStatus.unavailable        "Unavailable">
+<!ENTITY imStatus.offline            "Offline">
+<!ENTITY imStatus.showAccounts       "Show Accounts…">
 <!ENTITY savedFiles.label "Fitxers desats">
 <!ENTITY savedFiles.accesskey "d">
 <!ENTITY savedFiles.key "j">
 <!ENTITY filtersCmd.label "Filtres de missatge…">
 <!ENTITY filtersCmd.accesskey "F">
 <!ENTITY filtersApply.label "Executa els filtres en la carpeta">
 <!ENTITY filtersApply.accesskey "r">
 <!ENTITY filtersApplyToSelection.label "Executa els filtres en els missatges seleccionats">
@@ -499,30 +510,35 @@ you can use these alternative items. Oth
 <!ENTITY newMsgButton.label "Redacta">
 <!ENTITY replyButton.label "Respon">
 <!ENTITY replyAllButton.label "Respon a tots">
 <!ENTITY replyListButton.label "Respon a la llista">
 <!ENTITY forwardButton.label "Reenvia">
 <!ENTITY fileButton.label "Mou">
 <!ENTITY archiveButton.label "Arxiva">
 <!ENTITY nextButton.label "Següent">
+<!ENTITY nextButtonToolbarItem.label "Next Unread">
+<!ENTITY nextMsgButton.label "Next">
 <!ENTITY previousButton.label "Anterior">
+<!ENTITY previousButtonToolbarItem.label "Previous Unread">
+<!ENTITY previousMsgButton.label "Previous">
 <!ENTITY backButton1.label "Enrere">
 <!ENTITY goForwardButton1.label "Endavant">
 <!ENTITY deleteItem.title "Suprimeix">
 <!ENTITY deleteButton.label "Suprimeix">
 <!ENTITY undeleteButton.label "Dessuprimeix">
 <!ENTITY markButton.label "Marca">
 <!ENTITY printButton.label "Imprimeix">
 <!ENTITY stopButton.label "Atura">
 <!ENTITY throbberItem.title "Indicador d'activitat">
 <!ENTITY junkItem.title "Brossa">
 <!ENTITY junkButton.label "Correu brossa">
 <!ENTITY notJunkButton.label "És correu legítim">
 <!ENTITY addressBookButton.label "Llibreta d'adreces">
+<!ENTITY chatButton.label "Chat">
 <!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">
 <!-- Mail Toolbar Tooltips-->
 
@@ -533,27 +549,30 @@ you can use these alternative items. Oth
 <!ENTITY newMsgButton.tooltip "Crea un nou missatge">
 <!ENTITY replyButton.tooltip "Respon el missatge">
 <!ENTITY replyAllButton.tooltip "Respon al remitent i a tots els destinataris">
 <!ENTITY replyListButton.tooltip "Respon a una llista de correu">
 <!ENTITY forwardButton.tooltip "Reenvia el missatge seleccionat">
 <!ENTITY fileButton.tooltip "Mou el missatge seleccionat">
 <!ENTITY archiveButton.tooltip "Arxiva els missatges seleccionats">
 <!ENTITY nextButton.tooltip "Vés al següent missatge per llegir">
+<!ENTITY nextMsgButton.tooltip "Move to the next message">
 <!ENTITY previousButton.tooltip "Vés a l'anterior missatge per llegir">
+<!ENTITY previousMsgButton.tooltip "Move to the previous message">
 <!ENTITY goForwardButton.tooltip "Vés endavant un missatge">
 <!ENTITY goBackButton.tooltip "Vés enrere un missatge">
 <!ENTITY deleteButton.tooltip "Suprimeix el missatge o carpeta seleccionada">
 <!ENTITY undeleteButton.tooltip "Dessuprimeix el missatge seleccionat">
 <!ENTITY markButton.tooltip "Marca els missatges">
 <!ENTITY printButton.tooltip "Imprimeix aquest missatge">
 <!ENTITY stopButton.tooltip "Atura la transferència actual">
 <!ENTITY junkButton.tooltip "Marca els missatges seleccionats com a brossa">
 <!ENTITY notJunkButton.tooltip "Marca els missatges seleccionats com a legítims">
 <!ENTITY addressBookButton.tooltip "Vés a la llibreta d'adreces">
+<!ENTITY chatButton.tooltip "Show the Chat tab">
 <!ENTITY tagButton.tooltip "Etiqueta els missatges">
 <!ENTITY compactButton.tooltip "Treu els missatges suprimits de la carpeta seleccionada">
 <!-- Tags Menu Popup -->
 
 <!ENTITY addNewTag.label "Afegeix una etiqueta…">
 <!ENTITY addNewTag.accesskey "n">
 <!-- Folder Pane -->
 
@@ -776,38 +795,38 @@ you can use these alternative items. Oth
 <!ENTITY mdnBarSendButton2.accesskey "E">
 <!-- Quick Search Bar -->
 <!-- LOCALIZATION NOTE (quickSearchCmd.key):
      This is actually the key used for the global message search box; we have
      not changed 
      -->
 
 <!ENTITY quickSearchCmd.key "k">
-<!-- LOCALIZATION NOTE (searchAllMessages.label.base):
+<!-- LOCALIZATION NOTE (search.label.base):
      This is the base of the empty text for the global search box.  We replace
-     #1 with the contents of the appropriate
-     searchAllMessages.keyLabel2.* value for the platform.
+     #1 with the contents of the appropriate search.keyLabel.* value for the
+     platform.
      The goal is to convey to the user that typing in the box will allow them
      to search for messages globally and that there is a hotkey they can press
      to get to the box faster.  If the global indexer is disabled, the search
      box will be collapsed and the user will never see this message.
      -->
-<!ENTITY searchAllMessages.label.base "Cerca tots els missatges… #1">
-<!-- LOCALIZATION NOTE (searchAllMessages.keyLabel.nonmac):
+<!ENTITY search.label.base "Search… #1">
+<!-- LOCALIZATION NOTE (search.keyLabel.nonmac):
      The description of the key-binding to get into the global search box on
      windows and linux (which use the control key).  We use the key defined in
      the quickSearchCmd.key entity defined above, the letter should match it.
      -->
-<!ENTITY searchAllMessages.keyLabel2.nonmac "&lt;Ctrl+K&gt;">
-<!-- LOCALIZATION NOTE (searchAllMessages.keyLabel.mac):
+<!ENTITY search.keyLabel.nonmac "&lt;Ctrl+K&gt;">
+<!-- LOCALIZATION NOTE (search.keyLabel.mac):
      The description of the key-binding to get into the global search box on mac
      systems.  We use the key defined in the quickSearchCmd.key entity defined
      above, the letter should match it.
      -->
-<!ENTITY searchAllMessages.keyLabel2.mac "&lt;&#x2318;K&gt;">
+<!ENTITY search.keyLabel.mac "&lt;&#x2318;K&gt;">
 <!-- Message Header Context Menu -->
 
 <!ENTITY AddToAddressBook.label "Afegeix a la llibreta d'adreces…">
 <!ENTITY AddToAddressBook.accesskey "d">
 <!ENTITY AddDirectlyToAddressBook.label "Afegeix a la llibreta d'adreces">
 <!ENTITY AddDirectlyToAddressBook.accesskey "b">
 <!ENTITY EditContact.label "Edita el contacte…">
 <!ENTITY EditContact.accesskey "E">
--- a/mail/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/chrome/messenger/messengercompose/composeMsgs.properties
@@ -267,16 +267,20 @@ 12600=No s'ha pogut autenticar al servidor SMTP %S. No admet el mètode d'autenticació (SMTP-AUTH) però heu triat utilitzar aquest mètode d'autenticació. Canvieu el mètode d'autenticació a «Cap» a «Opcions del compte | Servidor de sortida (SMTP)» o bé contacteu al vostre proveïdor de correu i demaneu que us doni instruccions.
 ## Strings use for the save message dialog shown when the user close a message compose window
 saveDlogTitle=Desa el missatge
 saveDlogMessage=El missatge no s'ha enviat. Voleu desar-lo a la carpeta Esborranys?
 
 ## generics string
 defaultSubject=(sense assumpte)
 chooseFileToAttach=Introduïu el fitxer a adjuntar
 
+# LOCALIZATION NOTE (chooseFileToAttachViaCloud): %1$S is the cloud
+# provider to save the file to.
+chooseFileToAttachViaCloud=Attach File(s) via %1$S
+
 ##
 windowTitlePrefix=Redacta:
 
 ## Strings used by the empty subject dialog
 subjectEmptyTitle=Falta l'assumpte
 subjectEmptyMessage=Falta el camp Assumpte del vostre missatge.
 sendWithEmptySubjectButton=&Envia sense cap assumpte
 cancelSendingButton=&Cancel·la l'enviament
@@ -359,24 +363,102 @@ attachmentReminderMsg=Heu oblidat d'afeg
 # LOCALIZATION NOTE (attachmentReminderKeywordsMsgs): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
 # #1 number of keywords
 attachmentReminderKeywordsMsgs=S'ha trobat una paraula clau d'adjunció:;S'ha trobat #1 paraules clau d'adjunció:
 attachmentReminderOptionsMsg=Les paraules clau per recordar que adjuntar algun fitxer les podeu configurar en les preferències
 attachmentReminderYesIForgot=Sí i tant!
 attachmentReminderFalseAlarm=No, envia'l ara
 
+# LOCALIZATION NOTE (bigFileDescription): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/Localization_and_Plurals
+# #1 number of big attached files
+bigFileDescription=This is a large file. It might be better to use Filelink instead.;These are large files. It might be better to use Filelink instead.
+bigFileShare.label=Link
+bigFileShare.accesskey=l
+bigFileAttach.label=Ignore
+bigFileAttach.accesskey=i
+
+bigFileChooseAccount.title=Choose Account
+bigFileChooseAccount.text=Choose a cloud account to upload the attachment to
+
+bigFileHideNotification.title=Don't Upload My Files
+bigFileHideNotification.text=You won't be notified if you attach more big files to this message.
+bigFileHideNotification.check=Never notify me of this again.
+
+# LOCALIZATION NOTE(cloudFileUploadingTooltip): Do not translate the string
+# %S. %S is the display name for the cloud account the attachment is being
+# uploaded to.
+cloudFileUploadingTooltip=Uploading to %S…
+# LOCALIZATION NOTE(cloudFileUploadedTooltip): Do not translate the string
+# %S. %S is the display name for the cloud account the attachment was uploaded
+# to.
+cloudFileUploadedTooltip=Uploaded to %S
+cloudFileUploadingNotification=Your file is being linked. It will appear in the body of the message when it's done.;Your files are being linked. They will appear in the body of the message when they're done.
+cloudFileUploadingCancel.label=Cancel
+cloudFileUploadingCancel.accesskey=c
+
 ## LOCALIZATION NOTE(smtpEnterPasswordPrompt): Do not translate the
 ## word $S. Place the word $S where the host name should appear.
 smtpEnterPasswordPrompt=Introduïu la vostra contrasenya per %S:
 ## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the
 ## words %1$S and %2$S. Place the word %1$S where the host name should appear,
 ## and %2$S where the user name should appear.
 smtpEnterPasswordPromptWithUsername=Introduïu la vostra contrasenya per %2$S al servidor %1$S:
 smtpEnterPasswordPromptTitle=Contrasenya del servidor SMTP
 
 # LOCALIZATION NOTE (removeAttachmentMsgs): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
 removeAttachmentMsgs=Suprimeix el fitxer adjunt;Suprimeix els fitxers adjunts
 
 ## LOCALIZATION NOTE(errorSavingMsg): Do not translate the word %S. It
 ## will be replaced with the name of the folder the message is being saved to.
 errorSavingMsg=S'ha produït un error mentre es desava el missatge a la carpeta %S. Voleu tornar-ho a provar?
+
+errorCloudFileAuth.title=Authentication Error
+## LOCALIZATION NOTE(errorCloudFileAuth.message):
+## %1$S is the name of the online storage service that authentication failed against.
+errorCloudFileAuth.message=Unable to authenticate to %1$S.
+errorCloudFileUpload.title=Upload Error
+## LOCALIZATION NOTE(errorCloudFileUpload.message):
+## %1$S is the name of the online storage service that uploading failed against.
+## %2$S is the name of the file that failed to upload.
+errorCloudFileUpload.message=Unable to upload %2$S to %1$S.
+errorCloudFileQuota.title=Quota Error
+## LOCALIZATION NOTE(errorCloudFileQuota.message):
+## %1$S is the name of the online storage service being uploaded to.
+## %2$S is the name of the file that could not be uploaded due to exceeding the storage limit.
+errorCloudFileQuota.message=Uploading %2$S to %1$S would exceed your space quota.
+errorCloudFileLimit.title=File Size Error
+## LOCALIZATION NOTE(errorCloudFileLimit.message):
+## %1$S is the name of the online storage service being uploaded to.
+## %2$S is the name of the file that could not be uploaded due to size restrictions.
+errorCloudFileLimit.message=%2$S exceeds the maximum size for %1$S.
+errorCloudFileOther.title=Unknown Error
+## LOCALIZATION NOTE(errorCloudFileOther.message):
+## %1$S is the name of the online storage service that cannot be communicated with.
+errorCloudFileOther.message=An unknown error occurred when communicating with %1$S.
+errorCloudFileDeletion.title=Deletion Error
+## LOCALIZATION NOTE(errorCloudFileDeletion.message):
+## %1$S is the name of the online storage service that the file is to be deleted from.
+## %2$S is the name of the file that failed to be deleted.
+errorCloudFileDeletion.message=There was a problem deleting %2$S from %1$S.
+
+errorCloudFileUpgrade.label=Upgrade
+
+## LOCALIZATION NOTE(cloudAttachmentCountHeader): A line of text describing how
+## many uploaded files have been appended to this message.  Emphasis should be
+## on sharing as opposed to attaching. This item is used as a header to a list,
+## hence the colon.  This header is only displayed in HTML emails.
+## Using PluralForm (so don't replace the #1).
+cloudAttachmentCountHeader=I've linked #1 file to this email:;I've linked #1 files to this email:
+
+## LOCALIZATION NOTE(cloudAttachmentListFooter): %1$S is a link, whose text
+## contents are the brandFullName of this application.
+cloudAttachmentListFooter=%1$S makes it easy to share large files over email.
+
+## 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) hosted on %3$S: %4$S
+
--- a/mail/chrome/messenger/messengercompose/messengercompose.dtd
+++ b/mail/chrome/messenger/messengercompose/messengercompose.dtd
@@ -12,16 +12,18 @@
 <!ENTITY newMessage.accesskey "M">
 <!ENTITY newContact.label "Contacte de la llibreta d'adreces…">
 <!ENTITY newContact.accesskey "C">
 <!ENTITY attachMenu.label "Adjunta">
 <!ENTITY attachMenu.accesskey "t">
 <!ENTITY attachFileCmd.label "Adjunta un fitxer…">
 <!ENTITY attachFileCmd.accesskey "j">
 <!ENTITY attachFileCmd.key "A">
+<!ENTITY attachCloudCmd.label "Filelink">
+<!ENTITY attachCloudCmd.accesskey "i">
 <!ENTITY attachPageCmd.label "Adjunta una pàgina web…">
 <!ENTITY attachPageCmd.accesskey "w">
 <!--LOCALIZATION NOTE attachVCardCmd.label Don't translate the term 'vCard' -->
 <!ENTITY attachVCardCmd.label "Inclou la targeta personal (vCard)">
 <!ENTITY attachVCardCmd.accesskey "p">
 <!ENTITY closeCmd.label "Tanca">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "c">
@@ -265,16 +267,24 @@
 <!ENTITY removeAttachment.label "Suprimeix l'adjunció">
 <!ENTITY removeAttachment.accesskey "m">
 <!ENTITY renameAttachment.label "Reanomena…">
 <!ENTITY renameAttachment.accesskey "R">
 <!ENTITY selectAll.label "Selecciona-ho tot">
 <!ENTITY selectAll.accesskey "a">
 <!ENTITY attachFile.label "Adjunta un fitxer…">
 <!ENTITY attachFile.accesskey "f">
+<!ENTITY attachCloud.label "Filelink…">
+<!ENTITY attachCloud.accesskey "i">
+<!ENTITY convertCloud.label "Convert to…">
+<!ENTITY convertCloud.accesskey "C">
+<!ENTITY cancelUpload.label "Cancel Upload">
+<!ENTITY cancelUpload.accesskey "n">
+<!ENTITY convertRegularAttachment.label "Regular Attachment">
+<!ENTITY convertRegularAttachment.accesskey "A">
 <!ENTITY attachPage.label "Adjunta una pàgina web…">
 <!ENTITY attachPage.accesskey "w">
 <!-- Spell checker context menu items -->
 
 <!ENTITY spellAddDictionaries.label "Afegeix diccionaris…">
 <!ENTITY spellAddDictionaries.accesskey "A">
 <!-- Title for the address picker panel -->
 
--- a/mail/chrome/messenger/mime.properties
+++ b/mail/chrome/messenger/mime.properties
@@ -143,61 +143,44 @@ 1026=Enllaça al document
 ## @loc 
 1027=<B>Informació del document:</B>
 
 # Msg Attachment
 ## @name MIME_MSG_ATTACHMENT
 ## @loc 
 1028=Adjunció
 
-# Partial Message Format 1
-## @name MIME_MSG_PARTIAL_FMT_1
-## @loc
-# LOCALIZATION NOTE (1037): In the following line, translate only the word, "Truncated!".
-1037=<P><CENTER><TABLE BORDER CELLSPACING=5 CELLPADDING=10 WIDTH="80%%"><TR><TD ALIGN=CENTER><FONT SIZE="+1"><B>Truncat!</B></FONT><HR>
-
-# Partial Message Format 2
-## @name MIME_MSG_PARTIAL_FMT_2
-## @loc
-# LOCALIZATION NOTE (1038): Translate the following two lines as a single sentence. In the middle of the two sections
-# there will be a URL. You may translate the text in any order you wish, but the html tags must stay in the same locations.
-# In particular, the "<B>" tag must begin the first section, which must end with the "<A HREF=" tag. Do not translate the html tag,"<P>"
-1038=<B>Aquest missatge supera la mida màxima del missatge definida a Preferències, i per tant només se n'han baixat les primeres línies del servidor de correu.<P>Feu clic <A HREF="
-
-# Partial Message Format 3
-## @name MIME_MSG_PARTIAL_FMT_3
-## @loc
-# LOCALIZATION NOTE (1039): This section must begin with the ">" sign and end with the tags,"</B></TD></TR></TABLE></CENTER>"
-# Do not translate "</A>" tag.
-1039=">aquí</A> per baixar-ne la resta.</B></TD></TR></TABLE></CENTER>
-
 # default attachment name
 ## @name MIME_MSG_DEFAULT_ATTACHMENT_NAME
 ## @loc 
 # LOCALIZATION NOTE (1040): Do not translate "%s" below.
 # Place the %s where you wish the part number of the attachment to appear
 1040=Part %s
 
 # default forwarded message prefix
 ## @name MIME_FORWARDED_MESSAGE_HTML_USER_WROTE
 ## @loc 
 1041=-------- Missatge original --------
 
-# Partial Message Format2 1
-## @name MIME_MSG_PARTIAL_FMT2_1
+# Partial Message Truncated
+## @name MIME_MSG_PARTIAL_TRUNCATED
 ## @loc
-# LOCALIZATION NOTE (1042): In the following line, translate only the words, "Not Downloaded".
-1042=<P><CENTER><TABLE BORDER CELLSPACING=5 CELLPADDING=10 WIDTH="80%%"><TR><TD ALIGN=CENTER><FONT SIZE="+1"><B>No baixat</B></FONT><HR>
+MIME_MSG_PARTIAL_TRUNCATED=Truncated!
 
-# Partial Message Format2 2
-## @name MIME_MSG_PARTIAL_FMT2_2
+# Partial Message Truncated Explanation
+## @name MIME_MSG_PARTIAL_TRUNCATED_EXPLANATION
 ## @loc
-# LOCALIZATION NOTE (1043): Translate the following two lines as a single sentence. In the middle of the two sections
-# there will be a URL. You may translate the text in any order you wish, but the html tags must stay in the same locations.
-# In particular, the "<B>" tag must begin the first section, which must end with the "<A HREF=" tag. Do not translate the html tag,"<P>"
-1043=<B>Només s'han baixat les capçaleres d'aquest missatge del servidor de correu.<P>Feu clic <A HREF="
+MIME_MSG_PARTIAL_TRUNCATED_EXPLANATION=This message exceeded the Maximum Message Size set in Account Settings, so we have only downloaded the first few lines from the mail server.
+
+# Partial Message Not Downloaded
+## @name MIME_MSG_PARTIAL_NOT_DOWNLOADED
+## @loc
+MIME_MSG_PARTIAL_NOT_DOWNLOADED=Not Downloaded
 
-# Partial Message Format2 3
-## @name MIME_MSG_PARTIAL_FMT2_3
+# Partial Message Not Downloaded Explanation
+## @name MIME_MSG_PARTIAL_NOT_DOWNLOADED_EXPLANATION
 ## @loc
-# LOCALIZATION NOTE (1044): This section must begin with the ">" sign and end with the tags,"</B></TD></TR></TABLE></CENTER>"
-# Do not translate "</A>" tag.
-1044=">aquí</A> per baixar-ne la resta.</B></TD></TR></TABLE></CENTER>
+MIME_MSG_PARTIAL_NOT_DOWNLOADED_EXPLANATION=Only the headers for this message were downloaded from the mail server.
+
+# MIME_MSG_PARTIAL_CLICK_FOR_REST
+## @name MIME_MSG_PARTIAL_CLICK_FOR_REST
+## @loc
+MIME_MSG_PARTIAL_CLICK_FOR_REST=Download the rest of the message.
--- a/mail/chrome/messenger/newmailaccount/accountProvisioner.dtd
+++ b/mail/chrome/messenger/newmailaccount/accountProvisioner.dtd
@@ -1,10 +1,10 @@
 <!ENTITY window.title "Benvingut al &brandShortName;">
-<!ENTITY header.label "Voleu una adreça electrònica nova pel &brandShortName;?">
+<!ENTITY header2.label "Would you like a new email address?">
 <!ENTITY other.languages "Només s'estan mostrant els proveïdors que ofereixen adreces a la vostra regió.  Feu clic aquí per mostrar tots els proveïdors.">
 <!ENTITY error.line1 "No s'ha pogut suggerir cap adreça electrònica.">
 <!ENTITY error.line2 "Podeu provar de cercar noms o pseudònims per trobar més adreces electròniques">
 <!-- LOCALIZATION NOTE(error.suggest.before, error.suggest.middle, error.suggest.after):
      error.suggest.before, error.suggest.middle, and error.suggest.after all go into
      one line with error.suggest.middle that links to a site which provides download
      of free account alternatives. -->
 
--- a/mail/chrome/messenger/news.properties
+++ b/mail/chrome/messenger/news.properties
@@ -41,21 +41,22 @@ htmlNewsErrorTitle=Error!
 # LOCALIZATION NOTE ( htmlNewsError ): In the following item, translate only "Error!" and "newsgroup server responded:"
 htmlNewsError=<H1>Error!</H1>El servidor de grups de discussió ha respost:
 # LOCALIZATION NOTE ( articleExpired ): In the following item, translate only "Perhaps the article has expired"
 articleExpired=<B><P>És possible que l'article hagi vençut</P></B>
 removeExpiredArtLinkText=Feu clic aquí per eliminar tots els articles que han vençut
 cancelDisallowed=No sembla que aquest missatge sigui vostre. Només podeu cancel·lar els vostres propis missatges, no els que han enviat els altres.
 cancelConfirm=Esteu segur que voleu cancel·lar aquest missatge?
 messageCancelled=S'ha cancel·lat el missatge.
-enterUsername=Introduïu un nom d'usuari per a l'accés al servidor de grups de discussió:
-enterUsernameTitle=Nom d'usuari del servidor de grups de discussió
-saveUsername=Utilitza el gestor de contrasenyes per recordar-la.
-enterPassword=Introduïu una contrasenya per a l'accés al servidor de grups de discussió:
-enterPasswordTitle=Cal una contrasenya per al servidor de grups de discussió
+enterUserPassTitle=News Server Username and Password Required
+# LOCALIZATION NOTE (enterUserPassServer): %S is the server being accessed
+enterUserPassServer=Please enter a username and password for %S:
+# LOCALIZATION NOTE (enterUserPassGroup): %1$S is a specific newsgroup to set
+# the password for; %2$S is the server from which the newsgroup is accessed
+enterUserPassGroup=Please enter a username and password for %1$S on %2$S:
 okButtonText=Baixa
 
 noNewMessages=No hi ha missatges nous al servidor.
 # LOCALIZATION NOTE (newNewsgroupHeaders): %1$S is the number of the current
 # header being downloaded, %2$S is the number of headers to be downloaded, and
 #  %3$S is the newsgroup whose headers are being downloaded.
 newNewsgroupHeaders=S'estan baixant les capçaleres %1$S de %2$S de %3$S
 # LOCALIZATION NOTE (newNewsgroupFilteringHeaders): %1$S is the name of the MIME
--- a/mail/chrome/messenger/preferences/applications.dtd
+++ b/mail/chrome/messenger/preferences/applications.dtd
@@ -12,8 +12,23 @@
 <!ENTITY saveTo.label                 "Desa els fitxers a">
 <!ENTITY saveTo.accesskey             "s">
 <!ENTITY alwaysAsk.label              "Demana'm sempre on desar els fitxers">
 <!ENTITY alwaysAsk.accesskey          "a">
 <!ENTITY chooseFolderWin.label        "Navega…">
 <!ENTITY chooseFolderWin.accesskey    "v">
 <!ENTITY chooseFolderMac.label        "Tria…">
 <!ENTITY chooseFolderMac.accesskey    "T">
+
+<!ENTITY attachments.incoming.label   "Incoming">
+<!ENTITY attachments.outgoing.label   "Outgoing">
+
+<!ENTITY addCloudFileAccount.label        "Add">
+<!ENTITY addCloudFileAccount.accesskey    "A">
+<!ENTITY addCloudFileAccount.description  "Add a new Filelink storage service">
+<!ENTITY removeCloudFileAccount.label     "Remove">
+<!ENTITY removeCloudFileAccount.accesskey "R">
+<!ENTITY authRequired.description         "Your authorization is required in order to see the settings for this storage service.">
+<!ENTITY authRequired.button.label        "Authorize">
+<!ENTITY authRequired.button.accesskey    "U">
+
+<!ENTITY enableCloudFileAccountOffer.label "Offer to share for files larger than">
+<!ENTITY enableCloudFileAccountOffer.mb "MB">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/preferences/applications.properties
@@ -0,0 +1,3 @@
+# LOCALIZATION NOTE (dialog_removeAccount):
+# %S will be replaced with the user-defined name of a storage account.
+dialog_removeAccount=Are you sure you want to remove the account "%S"?
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/preferences/chat.dtd
@@ -0,0 +1,20 @@
+<!ENTITY  startupAction.label         "When &brandShortName; starts:">
+<!ENTITY  startupAction.accesskey     "s">
+<!ENTITY  startupOffline.label        "Keep my Chat Accounts offline">
+<!ENTITY  startupConnectAuto.label    "Connect my chat accounts automatically">
+<!-- LOCALIZATION NOTE: reportIdleAfter.label is displayed first, then
+there's a field where the user can enter a number, and itemTime is
+displayed at the end of the line. The translations of the
+reportIdleAfter.label and idleTime parts don't have to mean the exact
+same thing as in English; please try instead to translate the whole
+sentence. -->
+
+<!ENTITY  reportIdleAfter.label         "Let my contacts know that I am Idle after">
+<!ENTITY  reportIdleAfter.accesskey     "I">
+<!ENTITY  idleTime                      "minutes of inactivity">
+
+<!ENTITY  andSetStatusToAway.label      "and set my status to Away with this status message:">
+<!ENTITY  andSetStatusToAway.accesskey  "A">
+
+<!ENTITY  sendTyping.label              "Send typing notifications in conversations">
+<!ENTITY  sendTyping.accesskey          "t">
--- a/mail/chrome/messenger/preferences/preferences.dtd
+++ b/mail/chrome/messenger/preferences/preferences.dtd
@@ -2,11 +2,12 @@
 <!ENTITY  prefWindow.titleGNOME   "Preferències del &brandShortName;">
 <!ENTITY  prefWindow.styleWindows "width: 50em; min-height: 38.5em;">
 <!ENTITY  prefWindow.styleMac     "width: 52em;">
 <!ENTITY  prefWindow.styleGNOME   "width: 47em; min-height: 43em;">
 
 <!ENTITY paneGeneral.title        "General">
 <!ENTITY paneDisplay.title        "Visualització">
 <!ENTITY paneComposition.title    "Redacció">
+<!ENTITY paneChat.title           "Chat">
 <!ENTITY paneAttachments.title    "Adjuncions">
 <!ENTITY paneSecurity.title       "Seguretat">
 <!ENTITY paneAdvanced.title       "Avançat">
--- a/mail/chrome/messenger/prefs.properties
+++ b/mail/chrome/messenger/prefs.properties
@@ -8,17 +8,17 @@ serverNameChanged=El paràmetre del nom del servidor ha canviat. Comproveu que totes les carpetes utilitzades pels filtres són al nou servidor.
 # 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?)
-enterValidHostname=Introduïu un nom d'ordinador central vàlid.
+enterValidServerName=Please enter a valid server name.
 failedRemoveAccount=No s'ha pogut eliminar aquest compte.
 #LOCALIZATION NOTE: confirmRemoveAccount: %S is the account pretty name
 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?
--- a/mobile/android/base/android_strings.dtd
+++ b/mobile/android/base/android_strings.dtd
@@ -1,10 +1,11 @@
 
-<!ENTITY  splash_firstrun "S\'està configurant el &brandShortName;\u2026">
+<!ENTITY  splash_settingup "S\'està configurant el vostre &brandShortName;">
+<!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;">
@@ -22,19 +23,23 @@
 
 <!ENTITY  launcher_shortcuts_title "&brandShortName; Aplicacions web">
 <!ENTITY  launcher_shortcuts_empty "No s\'ha trobat cap aplicació Web">
 
 <!ENTITY choose_file "Trieu un fitxer">
 
 <!ENTITY awesomebar_default_text "Escriviu una cerca o una adreça">
 
+<!ENTITY remote_tabs "Pestanyes sincronitzades">
+<!ENTITY remote_tabs_show_all "Mostra totes les pestanyes">
+
 <!ENTITY bookmark "Adreça d\'interès">
 <!ENTITY bookmark_added "S\'ha afegit l\'adreça d\'interès">
 <!ENTITY bookmark_removed "S\'ha suprimit l\'adreça d\'interès">
+<!ENTITY bookmark_updated "S\'ha actualitzat l\'adreça d\'interès">
 
 <!ENTITY history_today_section "Avui">
 <!ENTITY history_yesterday_section "Ahir">
 <!ENTITY history_week_section "Fa 7 dies">
 <!ENTITY history_older_section "Fa més de 7 dies">
 
 <!ENTITY reload "Actualitza">
 <!ENTITY forward "Endavant">
@@ -74,22 +79,29 @@
 
 <!ENTITY quit "Surt">
 
 <!ENTITY addons "Complements">
 <!ENTITY downloads "Baixades">
 <!ENTITY char_encoding "Codificació dels caràcters">
 
 <!ENTITY share "Comparteix">
+<!ENTITY share_title "Comparteix mitjançant">
 <!ENTITY save_as_pdf "Desa com a PDF">
 
 <!ENTITY contextmenu_open_new_tab "Obre en una pestanya nova">
 <!ENTITY contextmenu_remove_bookmark "Suprimeix">
 <!ENTITY contextmenu_add_to_launcher "Afegeix-ho a la pantalla inicial">
 <!ENTITY contextmenu_share "Comparteix">
+<!ENTITY contextmenu_edit_bookmark "Edita">
+
+<!ENTITY bookmark_edit_title "Edita l\'adreça d\'interès">
+<!ENTITY bookmark_edit_name "Nom">
+<!ENTITY bookmark_edit_location "Ubicació">
+<!ENTITY bookmark_edit_keyword "Paraula clau">
 
 <!ENTITY site_settings_title        "Neteja les opcions del lloc">
 <!ENTITY site_settings_cancel       "Cancel·la">
 <!ENTITY site_settings_clear        "Neteja">
 <!ENTITY site_settings_no_settings  "No hi ha cap opció per netejar.">
 
 <!ENTITY masterpassword_create_title "Crea una contrasenya mestra">
 <!ENTITY masterpassword_remove_title "Suprimeix la contrasenya mestra">
@@ -103,8 +115,13 @@
 <!ENTITY abouthome_addons_browse "Mostra tots els complements del &brandShortName;">
 <!ENTITY abouthome_last_tabs_title "Les pestanyes de l\'última vegada">
 <!ENTITY abouthome_last_tabs_open "Obre totes les pestanyes de l\'última vegada">
 <!ENTITY abouthome_top_sites_title "Els vostres llocs">
 <!ENTITY abouthome_top_sites_browse "Mostra\'m els meus llocs més habituals">
 <!ENTITY abouthome_no_top_sites "Encara no teniu cap lloc seleccionat. Toqueu la barra del títol per seleccionar-lo.">
 <!ENTITY abouthome_about_sync "Configureu el Firefox Sync per accedir a les adreces d\'interès, l\'historial i les pestanyes dels altres dispositius que teniu">
 <!ENTITY abouthome_sync_bold_name "Firefox Sync">
+
+<!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">
--- a/mobile/android/chrome/browser.properties
+++ b/mobile/android/chrome/browser.properties
@@ -17,16 +17,32 @@ alertDownloadsSize=La baixada és massa gran
 alertDownloadsNoSpace=No hi ha prou espai d'emmagatzematge
 alertDownloadsToast=S'ha inicia la baixada...
 
 alertFullScreenToast=Premeu el botó Enrere per sortir de la pantalla completa
 
 downloadCancelPromptTitle=Cancel·la la baixada
 downloadCancelPromptMessage=Esteu segur que voleu cancel·lar-la?
 
+# LOCALIZATION NOTE (addonError-1, addonError-2, addonError-3, addonError-4):
+# #1 is the add-on name, #2 is the add-on host, #3 is the application name
+addonError-1=No s'ha pogut descarregar l'extensió perquè ha fallat la connexió amb #2.
+addonError-2=No s'ha pogut instal·lar l'extensió des de #2 perquè no coincideix amb #3.
+addonError-3=No s'ha pogut instal·lar l'extensió des de #2; el fitxer està corrupte.
+addonError-4=No s'ha pogut instal·lar #1 perquè #3 no pot modificar els fitxers necessaris.
+
+# LOCALIZATION NOTE (addonLocalError-1, addonLocalError-2, addonLocalError-3, addonLocalError-4, addonErrorIncompatible, addonErrorBlocklisted):
+# #1 is the add-on name, #3 is the application name, #4 is the application version
+addonLocalError-1=Aquest complement no es pot instal·lar perquè podria deixar el sistema inestable.
+addonLocalError-2=Aquest complement no es pot instal·lar perquè no coincideix amb #3.
+addonLocalError-3=No s'ha pogut instal·lar el complement; el fitxer està corrupte.
+addonLocalError-4=No s'ha pogut instal·lar #1 perquè #3 no pot modificar els fitxers necessaris.
+addonErrorIncompatible=No s'ha pogut instal·lar #1 perquè no és compatible amb #3 #4.
+addonErrorBlocklisted=Aquest complement no es pot instal·lar pel risc a deixar el sistema inestable o exposat a problemes de seguretat.
+
 # Notifications
 notificationRestart.normal=Reinicieu per completar els canvis.
 notificationRestart.update=S'han actualitzat els complements. Reinicieu per completar els canvis.
 notificationRestart.blocked=S'han instal·lat complements insegurs. Reinicieu per inhabilitar-los.
 notificationRestart.button=Reinicia
 
 # Popup Blocker
 popupWarning=El %S ha evitat que aquest lloc obri una finestra emergent.
@@ -35,17 +51,19 @@ popupButtonAllowOnce=Mostra-la
 popupButtonAlwaysAllow2=Mostra-les sempre
 popupButtonNeverWarn2=No les mostris mai
 
 # LOCALIZATION NOTE (blockPopups.label): Label that will be used in
 # site settings dialog.
 blockPopups.label=Bloca les finestres emergents
 
 # Telemetry
-telemetry.optin.message=Voleu ajudar a millorar el %S enviant-nos a Mozilla informació anònima sobre el seu funcionament?
+# %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ó
 telemetry.optin.yes=Sí
 telemetry.optin.no=No
 
 # XPInstall
 xpinstallPromptWarning2=El %S ha evitat que aquest lloc (%S) us demani instal·lar programari al dispositiu.
 xpinstallPromptAllowButton=Permet-ho
 xpinstallDisabledMessageLocked=El vostre administrador de sistemes ha inhabilitat la instal·lació de programari.
 xpinstallDisabledMessage2=La instal·lació de programari ara està inhabilitada. Feu clic a Habilita-la i torneu-ho a provar.
@@ -177,19 +195,22 @@ intl.charsetmenu.browser.static=iso-8859
 # Application Menu
 appMenu.more=Més
 
 # Text Selection
 selectionHelper.textCopied=Text copiat al porta-retalls
 
 # Context menu
 contextmenu.openInNewTab=Obre l'enllaç en una pestanya nova
+contextmenu.shareLink=Comparteix un enllaç
+contextmenu.bookmarkLink=Afegeix a les adreces d'interès
 contextmenu.changeInputMethod=Selecciona el mètode d'entrada
 contextmenu.fullScreen=Pantalla completa
 contextmenu.saveImage=Desa la imatge
+contextmenu.addSearchEngine=Afegeix un motor de cerca
 
 contextmenu.copy=Copia
 contextmenu.copyAll=Copia-ho tot
 contextmenu.selectAll=Selecciona-ho tot
 contextmenu.paste=Enganxa
 
 # Select UI
 selectHelper.closeMultipleSelectDialog=Fet
--- a/mobile/overrides/passwordmgr.properties
+++ b/mobile/overrides/passwordmgr.properties
@@ -41,20 +41,20 @@ rememberPassword = Utilitza el gestor de
 savePasswordTitle = Confirmació
 # 1st string is product name, 2nd is the username for the login, 3rd is the
 #   login's hostname. Note that long usernames may be truncated.
 saveLoginText = Voleu que el %1$S recordi la contrasenya de «%2$S» a %3$S?
 # 1st string is product name, 2nd is the login's hostname
 saveLoginTextNoUsername = Voleu que el %1$S recordi la contrasenya a %2$S?
 promptNotNowButtonText = Ara no
 notifyBarNotNowButtonText = Ara no 
-notifyBarNotNowButtonAccessKey =
+notifyBarNotNowButtonAccessKey = 
 promptNeverForSiteButtonText = Mai
 notifyBarNeverForSiteButtonText = Mai
-notifyBarNeverForSiteButtonAccessKey =
+notifyBarNeverForSiteButtonAccessKey = 
 promptRememberButtonText = Recorda-la
 notifyBarRememberButtonText = Recorda-la
 notifyBarRememberButtonAccessKey =
 passwordChangeTitle = Confirmeu el canvi de contrasenya
 passwordChangeText = Voleu canviar la contrasenya emmagatzemada per %S?
 passwordChangeTextNoUser = Voleu canviar la contrasenya emmagatzemada per a aquest inici de sessió?
 notifyBarChangeButtonText = Canvia-la
 notifyBarChangeButtonAccessKey =
--- a/mobile/profile/bookmarks.inc
+++ b/mobile/profile/bookmarks.inc
@@ -36,17 +36,17 @@
 
 #define bookmarks_addons Firefox: Personalització amb complements
 
 
 
 # LOCALIZATION NOTE (bookmarks_support):
 
 
-# link title for https://support.mozilla.com/mobile
+# link title for https://support.mozilla.org/mobile
 
 
 #define bookmarks_support Firefox: Assistència
 
 
 
 # LOCALIZATION NOTE (bookmarks_aboutHome):
 
--- a/suite/chrome/common/pref/pref-locationbar.dtd
+++ b/suite/chrome/common/pref/pref-locationbar.dtd
@@ -18,16 +18,20 @@
 -->
 <!ENTITY autoCompleteMatch.label               "Troba">
 <!ENTITY autoCompleteMatch.accesskey           "T">
 <!ENTITY autoCompleteMatchAnywhere             "A qualsevol lloc de l'adreça o el títol">
 <!ENTITY autoCompleteMatchWordsFirst           "A qualsevol lloc però preferiblement paraules senceres">
 <!ENTITY autoCompleteMatchWords                "Només paraules senceres">
 <!ENTITY autoCompleteMatchStart                "Només al principi de l'adreça o el títol">
 
+<!ENTITY formatting.label                      "Formatació">
+<!ENTITY domainFormatting.label                "Ressalta l'adreça dels llocs web i dels servidors FTP.">
+<!ENTITY domainFormatting.accesskey            "d">
+
 <!ENTITY searchEngine.label                    "Motor de cerca d'Internet">
 <!ENTITY showSearchEngine.label                "Mostra el motor de cerca per defecte">
 <!ENTITY showSearchEngine.accesskey            "e">
 
 <!ENTITY unknownLocations.label                "Ubicacions desconegudes">
 <!ENTITY domainGuessing.label                  "Afegeix &quot;www.&quot; i &quot;.com&quot; a la ubicació si no es troba la pàgina web">
 <!ENTITY domainGuessing.accesskey              "f">
 <!ENTITY keywords.label                        "Realitza una cerca web quan el text introduït no sigui una ubicació web">
--- a/suite/chrome/common/pref/pref-navigator.dtd
+++ b/suite/chrome/common/pref/pref-navigator.dtd
@@ -10,17 +10,28 @@
 <!ENTITY blankPageRadio.accesskey       "n">
 <!ENTITY homePageRadio.label            "Pàgina d'inici">
 <!ENTITY homePageRadio.accesskey        "g">
 <!ENTITY lastPageRadio.label            "Darrera pàgina visitada">
 <!ENTITY lastPageRadio.accesskey        "D">
 <!ENTITY restoreSessionRadio.label      "Recupera la sessió anterior">
 <!ENTITY restoreSessionRadio.accesskey  "p">
 
-<!ENTITY header2.label                  "Pàgina d'inici">
+<!ENTITY restoreSessionIntro.label      "En restaurar sessions i finestres">
+<!ENTITY restoreImmediately.label       "Restaura totes les pestanyes ara mateix">
+<!ENTITY restoreImmediately.accesskey   "e">
+<!-- LOCALIZATION NOTE (restoreTabs.label): This will concatenate to
+     "Restore [___] tab(s) at a time",
+     using (restoreTabs.label) and a number (restoreTabsAtATime.label). -->
+<!ENTITY restoreTabs.label              "Restaura">
+<!ENTITY restoreTabs.accesskey          "s">
+<!ENTITY restoreTabsAtATime.label       "pestanyes al mateix temps">
+<!ENTITY restoreDeferred.label          "Restaura les pestanyes només quan siguin seleccionades">
+<!ENTITY restoreDeferred.accesskey      "O">
+
 <!ENTITY homePageIntro.label            "En prémer el botó Inici, anireu a aquest grup de pàgines:">
 <!ENTITY useCurrent.label               "Utilitza la pàgina actual">
 <!ENTITY useCurrent.accesskey           "U">
 <!ENTITY useCurrentGroup.label          "Utilitza el grup actual">
 <!ENTITY useCurrentGroup.accesskey      "t">
 <!ENTITY browseFile.label               "Trieu un fitxer...">
 <!ENTITY browseFile.accesskey           "T">
 <!ENTITY useDefault.label               "Valor per defecte">
--- a/suite/chrome/common/pref/pref-ssl.dtd
+++ b/suite/chrome/common/pref/pref-ssl.dtd
@@ -36,20 +36,20 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY  SSLProtocolVersions.caption       "Versions del protocol SSL">
 <!ENTITY  SSLWarnings.caption               "Avisos SSL">
 <!ENTITY  SSLClientAuthMethod.caption       "Selecció de certificats de client">
 
 <!ENTITY pref.ssl.title                     "Capa de sòcols segurs (SSL)">
-<!ENTITY enable.ssl3                        "Habilita la versió 3 de l'SSL">
-<!ENTITY enable.ssl3.accesskey              "3">
-<!ENTITY enable.tls                         "Habilita el TLS">
-<!ENTITY enable.tls.accesskey               "T">
+<!ENTITY enable.ssl30.label                 "Habilita SSL 3.0">
+<!ENTITY enable.ssl30.accesskey             "3">
+<!ENTITY enable.tls10.label                 "Habilita TLS 1.0">
+<!ENTITY enable.tls10.accesskey             "T">
 
 <!ENTITY warn.description                   "El &brandShortName; pot avisar-vos de l'estat de seguretat de la pàgina web que estigueu visitant. Pot fer-se que el &brandShortName; mostri un avís i demani permís abans de:">
 <!ENTITY warn.enteringsecure                "Carregar una pàgina xifrada">
 <!ENTITY warn.enteringsecure.accesskey      "C">
 <!ENTITY warn.enteringweak                  "Carregar una pàgina d'un xifratge feble">
 <!ENTITY warn.enteringweak.accesskey        "b">
 <!ENTITY warn.insecurepost                  "Enviar dades de formulari d'una pàgina sense xifrar a una altra que tampoc ho estigui">
 <!ENTITY warn.insecurepost.accesskey        "s">
--- a/suite/chrome/mailnews/addressbook/addressBook.properties
+++ b/suite/chrome/mailnews/addressbook/addressBook.properties
@@ -103,17 +103,17 @@ dateformat=%e %B
 cityAndStateAndZip=%1$S, %2$S %3$S
 ## LOCALIZATION NOTE (cityAndStateNoZip): 
 ## %1$S is city, %2$S is state
 cityAndStateNoZip=%1$S, %2$S
 ## LOCALIZATION NOTE (cityOrStateAndZip): 
 ## %1$S is city or state, %2$S is zip
 cityOrStateAndZip=%1$S %2$S
 
-stateZipSeparator=
+stateZipSeparator= 
 
 prefixTo=A
 prefixCc=Cc
 prefixBcc=Cco
 emptyEmailAddCard=No podeu afegir un contacte que no tingui una adreça de correu primària
 emptyEmailAddCardTitle=No es pot afegir el contacte
 addressBook=Llibreta d'adreces
 
--- a/suite/chrome/mailnews/messenger.dtd
+++ b/suite/chrome/mailnews/messenger.dtd
@@ -147,16 +147,18 @@
 <!ENTITY undoDefaultCmd.label "Desfés">
 <!ENTITY redoDefaultCmd.label "Refés">
 <!-- View Menu -->
 
 <!ENTITY showMessengerToolbarCmd.label "Barra d'eines de la Missatgeria">
 <!ENTITY showMessengerToolbarCmd.accesskey "r">
 <!ENTITY showSearchToolbarCmd.label "Barra de cerca">
 <!ENTITY showSearchToolbarCmd.accesskey "e">
+<!ENTITY showTabsToolbarCmd.label "Barra de tasques de les pestanyes">
+<!ENTITY showTabsToolbarCmd.accesskey "T">
 
 <!ENTITY messagePaneLayoutStyle.label "Format">
 <!ENTITY messagePaneLayoutStyle.accesskey "F">
 <!ENTITY messagePaneClassic.label "Aspecte clàssic">
 <!ENTITY messagePaneClassic.accesskey "c">
 <!ENTITY messagePaneWide.label "Aspecte horitzontal">
 <!ENTITY messagePaneWide.accesskey "h">
 <!ENTITY messagePaneVertical.label "Aspecte vertical">
--- a/suite/chrome/mailnews/mime.properties
+++ b/suite/chrome/mailnews/mime.properties
@@ -145,61 +145,44 @@ 1026=Enllaça al document
 ## @loc 
 1027=<B>Informació del document:</B>
 
 # Msg Attachment
 ## @name MIME_MSG_ATTACHMENT
 ## @loc 
 1028=Adjunció
 
-# Partial Message Format 1
-## @name MIME_MSG_PARTIAL_FMT_1
-## @loc
-# LOCALIZATION NOTE (1037): In the following line, translate only the word, "Truncated!".
-1037=<P><CENTER><TABLE BORDER CELLSPACING=5 CELLPADDING=10 WIDTH="80%%"><TR><TD ALIGN=CENTER><FONT SIZE="+1"><B>Truncat!</B></FONT><HR>
-
-# Partial Message Format 2
-## @name MIME_MSG_PARTIAL_FMT_2
-## @loc
-# LOCALIZATION NOTE (1038): Translate the following two lines as a single sentence. In the middle of the two sections
-# there will be a URL. You may translate the text in any order you wish, but the html tags must stay in the same locations.
-# In particular, the "<B>" tag must begin the first section, which must end with the "<A HREF=" tag. Do not translate the html tag,"<P>"
-1038=<B>Aquest missatge supera la mida màxima del missatge definida a Preferències, i per tant només se n'han baixat les primeres línies del servidor de correu.<P>Feu clic <A HREF="
-
-# Partial Message Format 3
-## @name MIME_MSG_PARTIAL_FMT_3
-## @loc
-# LOCALIZATION NOTE (1039): This section must begin with the ">" sign and end with the tags,"</B></TD></TR></TABLE></CENTER>"
-# Do not translate "</A>" tag.
-1039=">aquí</A> per baixar-ne la resta.</B></TD></TR></TABLE></CENTER>
-
 # default attachment name
 ## @name MIME_MSG_DEFAULT_ATTACHMENT_NAME
 ## @loc 
 # LOCALIZATION NOTE (1040): Do not translate "%s" below.
 # Place the %s where you wish the part number of the attachment to appear
 1040=Part %s
 
 # default forwarded message prefix
 ## @name MIME_FORWARDED_MESSAGE_HTML_USER_WROTE
 ## @loc 
 1041=-------- Missatge original --------
 
-# Partial Message Format2 1
-## @name MIME_MSG_PARTIAL_FMT2_1
+# Partial Message Truncated
+## @name MIME_MSG_PARTIAL_TRUNCATED
 ## @loc
-# LOCALIZATION NOTE (1042): In the following line, translate only the words, "Not Downloaded".
-1042=<P><CENTER><TABLE BORDER CELLSPACING=5 CELLPADDING=10 WIDTH="80%%"><TR><TD ALIGN=CENTER><FONT SIZE="+1"><B>No baixat</B></FONT><HR>
+MIME_MSG_PARTIAL_TRUNCATED=Truncat!
 
-# Partial Message Format2 2
-## @name MIME_MSG_PARTIAL_FMT2_2
+# Partial Message Truncated Explanation
+## @name MIME_MSG_PARTIAL_TRUNCATED_EXPLANATION
 ## @loc
-# LOCALIZATION NOTE (1043): Translate the following two lines as a single sentence. In the middle of the two sections
-# there will be a URL. You may translate the text in any order you wish, but the html tags must stay in the same locations.
-# In particular, the "<B>" tag must begin the first section, which must end with the "<A HREF=" tag. Do not translate the html tag,"<P>"
-1043=<B>Només s'han baixat les capçaleres d'aquest missatge del servidor de correu.<P>Feu clic <A HREF="
+MIME_MSG_PARTIAL_TRUNCATED_EXPLANATION=El missatge ha excedit la mida de missatge màxima definida als paràmetres del compte. Per això, només s'han baixat les primeres línies del servidor de correu.
+
+# Partial Message Not Downloaded
+## @name MIME_MSG_PARTIAL_NOT_DOWNLOADED
+## @loc
+MIME_MSG_PARTIAL_NOT_DOWNLOADED=No baixat
 
-# Partial Message Format2 3
-## @name MIME_MSG_PARTIAL_FMT2_3
+# Partial Message Not Downloaded Explanation
+## @name MIME_MSG_PARTIAL_NOT_DOWNLOADED_EXPLANATION
 ## @loc
-# LOCALIZATION NOTE (1044): This section must begin with the ">" sign and end with the tags,"</B></TD></TR></TABLE></CENTER>"
-# Do not translate "</A>" tag.
-1044=">aquí</A> per baixar-ne la resta.</B></TD></TR></TABLE></CENTER>
+MIME_MSG_PARTIAL_NOT_DOWNLOADED_EXPLANATION=Només s'han baixat les capçaleres del missatge del servidor de correu.
+
+# MIME_MSG_PARTIAL_CLICK_FOR_REST
+## @name MIME_MSG_PARTIAL_CLICK_FOR_REST
+## @loc
+MIME_MSG_PARTIAL_CLICK_FOR_REST=Baixa la resta del missatge.
--- a/suite/chrome/mailnews/news.properties
+++ b/suite/chrome/mailnews/news.properties
@@ -41,21 +41,22 @@ htmlNewsErrorTitle=Error!
 # LOCALIZATION NOTE ( htmlNewsError ): In the following item, translate only "Error!" and "newsgroup server responded:"
 htmlNewsError=<H1>Error!</H1>El servidor de grups de discussió ha respost:
 # LOCALIZATION NOTE ( articleExpired ): In the following item, translate only "Perhaps the article has expired"
 articleExpired=<B><P>És possible que l'article hagi vençut</P></B>
 removeExpiredArtLinkText=Feu clic aquí per eliminar tots els articles que han vençut
 cancelDisallowed=No sembla que aquest missatge sigui vostre. Només podeu cancel·lar els vostres propis missatges, no els que han enviat els altres.
 cancelConfirm=Esteu segur que voleu cancel·lar aquest missatge?
 messageCancelled=S'ha cancel·lat el missatge.
-enterUsername=Introduïu un nom d'usuari per a l'accés al servidor de grups de discussió:
-enterUsernameTitle=Cal el nom d'usuari del servidor de grups de discussió
-saveUsername=Utilitza el gestor de contrasenyes per recordar-la.
-enterPassword=Introduïu una contrasenya per accedir al servidor de grups de discussió:
-enterPasswordTitle=Cal una contrasenya per al servidor de grups de discussió
+enterUserPassTitle=Cal nom d'usuari i contrasenya per al servidor de grups de discussió
+# LOCALIZATION NOTE (enterUserPassServer): %S is the server being accessed
+enterUserPassServer=Introduïu un nom d'usuari i contrasenya per a %S:
+# LOCALIZATION NOTE (enterUserPassGroup): %1$S is a specific newsgroup to set
+# the password for; %2$S is the server from which the newsgroup is accessed
+enterUserPassGroup=Introduïu un nom d'usuari i contrasenya per a %1$S a %2$S:
 okButtonText=Baixa
 
 noNewMessages=No hi ha missatges nous al servidor.
 # LOCALIZATION NOTE (newNewsgroupHeaders): %1$S is the number of the current
 # header being downloaded, %2$S is the number of headers to be downloaded, and
 # %3$S is the newsgroup whose headers are being downloaded.
 newNewsgroupHeaders=S'estan baixant la capçalera %1$S de %2$S de %3$S
 # LOCALIZATION NOTE (newNewsgroupFilteringHeaders): %1$S is the name of the MIME
--- a/suite/chrome/mailnews/newsblog/feed-subscriptions.dtd
+++ b/suite/chrome/mailnews/newsblog/feed-subscriptions.dtd
@@ -1,18 +1,31 @@
 <!-- Subscription Dialog -->
-<!ENTITY feedSubscriptions.label "Subscripcions RSS">
-<!ENTITY subscriptionDesc.label "Nota: Si se suprimeix o canvia la carpeta d'un canal, els articles que s'hagin baixat abans no se'n veuran afectats.">
-<!ENTITY feedTitle.label "Títol:">
-<!ENTITY location.label  "Ubicació:">
+<!ENTITY feedSubscriptions.label     "Subscripcions RSS">
+<!ENTITY subscriptionDesc.label      "Nota: Si se suprimeix o canvia la carpeta d'un canal, els articles que s'hagin baixat abans no se'n veuran afectats.">
+
+<!ENTITY feedTitle.label             "Títol:">
+<!ENTITY feedTitle.accesskey         "T">
+
+<!ENTITY feedLocation.label          "URL del canal:">
+<!ENTITY feedLocation.accesskey      "U">
+<!ENTITY feedLocation.placeholder    "Introduïu un URL de cànal vàlid per afegir">
+
+<!ENTITY feedFolder.label            "Emmagatzema els articles en:">
+<!ENTITY feedFolder.accesskey        "g">
 
-<!ENTITY button.addFeed.label       "Afegeix">
-<!ENTITY button.addFeed.accesskey   "A">
-<!ENTITY button.editFeed.label      "Edita">
-<!ENTITY button.editFeed.accesskey  "E">
-<!ENTITY button.removeFeed.label "Suprimeix">
-<!ENTITY button.removeFeed.accesskey   "r">
-<!ENTITY button.importOPML.label "Importa">
-<!ENTITY button.importOPML.accesskey   "I">
-<!ENTITY button.exportOPML.label "Exporta">
-<!ENTITY button.exportOPML.accesskey   "x">
+<!ENTITY quickMode.label             "Mostra el resum de l'article en comptes de carregar la pàgina web">
+<!ENTITY quickMode.accesskey         "t">
+
+<!ENTITY validateText.label          "Comprova la validació i recupera un URL vàlid.">
 
-<!ENTITY cmd.close.commandKey             "w">
+<!ENTITY button.addFeed.label        "Afegeix">
+<!ENTITY button.addFeed.accesskey    "A">
+<!ENTITY button.editFeed.label       "Edita">
+<!ENTITY button.editFeed.accesskey   "E">
+<!ENTITY button.removeFeed.label     "Suprimeix">
+<!ENTITY button.removeFeed.accesskey "r">
+<!ENTITY button.importOPML.label     "Importa">
+<!ENTITY button.importOPML.accesskey "I">
+<!ENTITY button.exportOPML.label     "Exporta">
+<!ENTITY button.exportOPML.accesskey "x">
+
+<!ENTITY cmd.close.commandKey        "w">
--- a/suite/chrome/mailnews/newsblog/newsblog.properties
+++ b/suite/chrome/mailnews/newsblog/newsblog.properties
@@ -1,44 +1,56 @@
 subscribe-validating-feed=S'està verificant el canal…
 subscribe-cancelSubscription=Esteu segur que voleu cancel·lar la subscripció al canal actual?
 subscribe-cancelSubscriptionTitle=S'està subscrivint a un canal…
-subscribe-noFeedIsSelected=<no hi ha cap canal seleccionat>
 subscribe-feedAlreadySubscribed=Ja esteu subscrit a aquest canal.
 subscribe-errorOpeningFile=No s'ha pogut obrir el fitxer.
+subscribe-feedAdded=S'ha afegit el canal.
+subscribe-feedUpdated=S'ha actualitzat el canal.
+subscribe-feedMoved=S'ha mogut la subscripció del canal.
+subscribe-feedRemoved=S'ha cancel·lat la subscripció del canal.
+subscribe-feedNotValid=L'URL del canal no és un canal vàlid.
+subscribe-networkError=No s'ha pogut trobar l'URL del canal. Comproveu el nom i torneu-ho a provar.
 
 subscribe-OPMLImportTitle=Selecciona un fitxer OPML per importar
 subscribe-OPMLExportTitle=Exporta els canals en un fitxer OPML
 ## LOCALIZATION NOTE(subscribe-OPMLExportFileDialogTitle): %S is the brandShortName
 subscribe-OPMLExportFileDialogTitle=Exportació OPML del %S
 ## LOCALIZATION NOTE(subscribe-OPMLExportDefaultFileName): %S is the brandShortName
 subscribe-OPMLExportDefaultFileName=Canals_%S.opml
 ## LOCALIZATION NOTE(subscribe-OPMLImportInvalidFile): %S is the name of the OPML file the user tried to import.
 subscribe-OPMLImportInvalidFile=Aquest fitxer %S no sembla un fitxer OPML vàlid.
-## LOCALIZATION NOTE(subscribe-OPMLImportNewFeeds): %S is the count of new imported entries.
-subscribe-OPMLImportNewFeeds=S'han importat %S nous canals d'informació.
-## LOCALIZATION NOTE(subscribe-OPMLImportTotalFeeds):
-## - The first %S is the the count of new imported entries,
-## - The second %S is total number of elements found in the file
-subscribe-OPMLImportTotalFeeds=S'han importat %S canals d'informació nous dels %S que hi havia en total. Només s'han important els canals on no estàveu subscrits ja.
+## LOCALIZATION NOTE(subscribe-OPMLImportFeedCount): Semi-colon list of plural forms.
+## See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+## #1 is the count of new imported entries.
+subscribe-OPMLImportFeedCount=S'ha importat #1 canal nou.;S'han importat #1 canals nous.
+## LOCALIZATION NOTE(subscribe-OPMLImportUniqueFeeds): Semi-colon list of plural forms.
+## #1 is the count of new imported entries
+subscribe-OPMLImportUniqueFeeds=S'ha importat #1 canal nou al qual nou esteu ja subscrit;S'han importat #1 canals nous als quals no esteu ja subscrit
+## LOCALIZATION NOTE(subscribe-OPMLImportFoundFeeds):
+## #1 is total number of elements found in the file
+subscribe-OPMLImportFoundFeeds=(s'ha trobat d'#1 entrada);(s'han trobat d'un total de #1 entrades)
+## LOCALIZATION NOTE(subscribe-OPMLImportStatus):
+## This is the concatenation of the two strings defined above to compose 1 sentence.
+## %1$S = subscribe-OPMLImportUniqueFeeds
+## %2$S = subscribe-OPMLImportFoundFeeds
+subscribe-OPMLImportStatus=%1$S %2$S.
 
 subscribe-OPMLExportOPMLFilesFilterText=Fitxers OPML
 
 subscribe-confirmFeedDeletionTitle=Suprimeix el canal
 ## LOCALIZATION NOTE(subscribe-confirmFeedDeletion): %S is the name of the feed the user wants to unsubscribe from.
 subscribe-confirmFeedDeletion=Esteu segur que voleu cancel·lar la subscripció al canal: \n %S?
 
 ## LOCALIZATION NOTE(subscribe-gettingFeedItems):
 ##  - The first %S is the number of articles processed so far;
 ##  - The second %S is the total number of items
 subscribe-gettingFeedItems=S'estan baixant els articles del canal (%S of %S)…
 
 newsblog-noNewArticlesForFeed=No hi ha cap article nou per a aquest canal.
-newsblog-networkErrorTitle=Error de la xarxa
 ## LOCALIZATION NOTE(newsblog-networkError): %S is the feed URL
 newsblog-networkError=No s'ha pogut trobar %S. Comproveu el nom i torneu-ho a provar.
-newsblog-feedNotValidTitle=El canal no és vàlid
 ## LOCALIZATION NOTE(newsblog-feedNotValid): %S is the feed URL
 newsblog-feedNotValid=%S no és un canal RSS vàlid.
 newsblog-getNewMsgsCheck=S'està comprovant si hi ha nous elements als canals…
 
 ## LOCALIZATION NOTE(feeds-accountname): This string should be the same as feeds.accountName in am-newsblog.dtd
 feeds-accountname=Blocs i canals de notícies
--- a/suite/chrome/mailnews/pref/AccountWizard.dtd
+++ b/suite/chrome/mailnews/pref/AccountWizard.dtd
@@ -26,68 +26,67 @@
   2, Use localized full name instead of "John Smith"
 -->
 <!ENTITY fullnameExample.label "(per exemple, &quot;Josep Poquet&quot;).">
 <!ENTITY fullnameLabel.label "El vostre nom:">
 <!ENTITY fullnameLabel.accesskey "n">
 
 <!ENTITY emailLabel.label "Adreça electrònica:">
 <!ENTITY emailLabel.accesskey "t">
-<!-- Entities for Server page -->
+<!-- Entities for Incoming Server page -->
 
 
-<!ENTITY serverTitle.label "Informació del servidor">
+<!ENTITY incomingTitle.label "Informació del servidor d'entrada">
 <!ENTITY incomingServerTypeDesc.label "Seleccioneu el tipus de servidor d'entrada que utilitzeu.">
-<!-- LOCALIZATION NOTE (incomingServerNameDesc.label) : Do not translate "&quot;pop.example.net&quot;" in below line -->
-<!ENTITY incomingServerNameDesc.label "Introduïu el nom del servidor d'entrada (per exemple, &quot;pop.exemple.net&quot;).">
-<!ENTITY incomingServerLabel.label "Servidor d'entrada:">
-<!ENTITY incomingServerLabel.accesskey "S">
-<!-- LOCALIZATION NOTE (newsServerNameDesc.label) : Do not translate "NNTP" or the "&quot;" entities in below line -->
-<!ENTITY newsServerNameDesc.label "Introduïu el nom del servidor de grups de discussió (NNTP) (per exemple, &quot;news.exemple.net&quot;).">
-<!-- LOCALIZATION NOTE (smtpServerDesc.label) : Do not translate "SMTP" and "&quot;smtp.example.net&quot;" in below line -->
-<!ENTITY smtpServerDesc.label "Introduïu el nom del vostre servidor de sortida (SMTP) (per exemple, &quot;smtp.exemple.net&quot;).">
-<!ENTITY smtpServerLabel.label "Servidor de sortida:">
-<!ENTITY smtpServerLabel.accesskey "o">
-<!ENTITY newsServerLabel.label "Servidor de grups de discussió:">
-<!ENTITY newsServerLabel.accesskey "S">
 <!-- LOCALIZATION NOTE (imapType.label) : Do not translate "IMAP" in below line -->
 <!ENTITY imapType.label "IMAP">
 <!ENTITY imapType.accesskey "I">
 <!-- LOCALIZATION NOTE (popType.label) : Do not translate "POP" in below line -->
 <!ENTITY popType.label "POP">
 <!ENTITY popType.accesskey "P">
 <!ENTITY portNum.label "Port:">
 <!ENTITY portNum.accesskey "o">
 <!ENTITY defaultPortLabel.label "Predeterminat:">
 <!ENTITY defaultPortValue.label "">
+<!-- LOCALIZATION NOTE (incomingServerNameDesc.label) : Do not translate "&quot;pop.example.net&quot;" in below line -->
+<!ENTITY incomingServer.description "Introduïu el nom del servidor d'entrada (per exemple, «mail.example.net»).">
+<!ENTITY incomingServer.label "Servidor d'entrada:">
+<!ENTITY incomingServer.accesskey "S">
 <!ENTITY leaveMsgsOnSrvr.label "Deixa els missatges al servidor">
 <!ENTITY leaveMsgsOnSrvr.accesskey "l">
+<!-- LOCALIZATION NOTE (incomingUsername.description) : do not translate "&quot;jsmith&quot;" in below line -->
+<!ENTITY incomingUsername.description "Introduïu el nom d'usuari d'entrada proporcionat pel vostre proveïdor de correu (per exemple, «jsmith»).">
+<!ENTITY incomingUsername.label "Nom d'usuari:">
+<!ENTITY incomingUsername.accesskey "u">
+<!-- LOCALIZATION NOTE (newsServerNameDesc.label) : Do not translate "NNTP" or the "&quot;" entities in below line -->
+<!ENTITY newsServerNameDesc.label "Introduïu el nom del servidor de grups de discussió (NNTP) (per exemple, &quot;news.exemple.net&quot;).">
+<!ENTITY newsServerLabel.label "Servidor de grups de discussió:">
+<!ENTITY newsServerLabel.accesskey "S">
+<!-- Entities for Outgoing Server page -->
+
+
+<!ENTITY outgoingTitle.label "Informació del servidor de sortida">
+<!-- LOCALIZATION NOTE (outgoingServer.description) : Do not translate "SMTP" and "&quot;smtp.example.net&quot;" in below line -->
+<!ENTITY outgoingServer.description "Introduïu el nom del servidor de sortida (SMTP) (per exemple, «;smtp.example.net»).">
+<!ENTITY outgoingServer.label "Servidor de sortida:">
+<!ENTITY outgoingServer.accesskey "S">
+<!ENTITY outgoingUsername.description "Introduïu el nom d'usuari de sortida proporcionat pel vostre proveïdor de correu (normalment és el mateix que el nom d'usuari d'entrada).">
+<!ENTITY outgoingUsername.label "Nom d'usuari de sortida:">
+<!ENTITY outgoingUsername.accesskey "u">
 <!-- LOCALIZATION NOTE (modifyOutgoing.suffix) : This string will be appended after each of
      haveSmtp1.suffix3, haveSmtp2.suffix3, haveSmtp3.suffix3 .
 -->
 
 <!ENTITY modifyOutgoing.suffix "Podeu canviar el servidor de sortida anant a les opcions del Correu i dels grups de discussió.">
 <!-- LOCALIZATION NOTE (haveSmtp1.prefix and haveSmtp1.suffix3) : Do not translate "SMTP" and "&quot;" in
      these variables. Also, translate haveSmtp1.prefix and haveSmtp1.suffix3 as a single sentence, inserting
      text after the "&quot;" entity in haveSmtp1.suffix3, if required grammatically.
 -->
 <!ENTITY haveSmtp1.prefix "S'utilitzarà el vostre servidor de sortida (SMTP), &quot;">
 <!ENTITY haveSmtp1.suffix3 "&quot;.">
-<!-- Entities for Login page -->
-
-
-<!ENTITY loginTitle.label "Nom d'usuari">
-<!ENTITY usernameDesc.label "Introduïu el nom d'usuari d'entrada que us ha donat el vostre proveïdor de correu electrònic ">
-<!-- LOCALIZATION NOTE (usernameExample.label) : do not translate "&quot;jsmith&quot;" in below line -->
-<!ENTITY usernameExample.label "(per exemple, &quot;jpoquet&quot;).">
-<!ENTITY usernameLabel.label "Nom d'usuari d'entrada:">
-<!ENTITY usernameLabel.accesskey "u">
-<!ENTITY usernameSmtpDesc.label "Introduïu el nom d'usuari de sortida que us ha donat el vostre proveïdor de correu electrònic (aquest típicament és el mateix que el nom d'usuari d'entrada).">
-<!ENTITY usernameSmtpLabel.label "Nom d'usuari de sortida:">
-<!ENTITY usernameSmtpLabel.accesskey "o">
 <!-- LOCALIZATION NOTE (haveSmtp2.prefix and haveSmtp2.suffix3) : Do not translate "SMTP" and "&quot;" in
      these variables. Also, translate haveSmtp2.prefix and haveSmtp2.suffix3 as a single sentence, inserting
      text after the "&quot;" entity in haveSmtp2.suffix3, if required grammatically.
 -->
 <!ENTITY haveSmtp2.prefix "S'utilitzarà el vostre nom d'usuari de sortida (SMTP), &quot;">
 <!ENTITY haveSmtp2.suffix3 "&quot;">
 <!-- LOCALIZATION NOTE (haveSmtp3.prefix and haveSmtp3.suffix3) : Do not translate "SMTP" and "&quot;" in
      these variables. Also, translate haveSmtp3.prefix and haveSmtp3.suffix3 as a single sentence, inserting
--- a/suite/chrome/mailnews/pref/am-identities-list.dtd
+++ b/suite/chrome/mailnews/pref/am-identities-list.dtd
@@ -1,7 +1,9 @@
 <!ENTITY identitiesListDesc.label "Suport per a múltiples identitats">
 <!ENTITY identitiesListAdd.label  "Afegeix...">
 <!ENTITY identitiesListAdd.accesskey  "A">
 <!ENTITY identitiesListEdit.label "Edita...">
 <!ENTITY identitiesListEdit.accesskey "E">
 <!ENTITY identitiesListDelete.label "Suprimeix">
 <!ENTITY identitiesListDelete.accesskey "S">
+<!ENTITY identitiesListClose.label "Tanca">
+<!ENTITY identitiesListClose.accesskey "c">
--- a/suite/chrome/mailnews/pref/pref-composing_messages.dtd
+++ b/suite/chrome/mailnews/pref/pref-composing_messages.dtd
@@ -62,8 +62,28 @@
 <!ENTITY font.label                           "Tipus de lletra:">
 <!ENTITY font.accesskey                       "T">
 <!ENTITY size.label                           "Mida:">
 <!ENTITY size.accesskey                       "M">
 <!ENTITY fontColor.label                      "Text:">
 <!ENTITY fontColor.accesskey                  "e">
 <!ENTITY bgColor.label                        "Fons:">
 <!ENTITY bgColor.accesskey                    "F">
+
+<!ENTITY selectHeaderType.label               "Seleccioneu el tipus de capçalera de resposta:">
+<!ENTITY selectHeaderType.accesskey           "e">
+<!ENTITY noReplyOption.label                  "Sense capçalera de resposta">
+<!-- LOCALIZATION NOTE (authorWroteOption.label): this is tied to the 
+  mailnews.reply_header_authorwrote preference. [Author] needs to be 
+  translated. -->
+<!ENTITY authorWroteOption.label              "[L'autor/ora] ha escrit:">
+<!-- LOCALIZATION NOTE (onDateAuthorWroteOption.label): this is tied to the 
+  combination of the mailnews.reply_header_ondate(On [date]), 
+  mailnews.reply_header_separator (a comma in this case) and 
+  mailnews.reply_header_authorwrote([Author] wrote) preferences. [date] and 
+  [Author] need to be translated, and the correct  separator put in. -->
+<!ENTITY onDateAuthorWroteOption.label        "En la [data], [l'autor/ora] ha escrit:">
+<!-- LOCALIZATION NOTE (authorWroteOnDateOption.label): this is tied to the 
+  combination of the mailnews.reply_header_authorwrote([Author] wrote), 
+  mailnews.reply_header_separator (a comma in this case), and 
+  mailnews.reply_header_ondate preferences(On [date]). [Author] and [date] 
+  need to be translated, and the correct separator put in. -->
+<!ENTITY authorWroteOnDateOption.label        "[L'autor/ora] ha escrit, en la [data]:">
--- a/suite/chrome/mailnews/pref/prefs.properties
+++ b/suite/chrome/mailnews/pref/prefs.properties
@@ -47,17 +47,17 @@ serverNameChanged=El paràmetre del nom del servidor ha canviat. Comproveu que totes les carpetes utilitzades pels filtres són al nou servidor.
 # 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?)
-enterValidHostname=Introduïu un nom d'ordinador central vàlid.
+enterValidServerName=Introduïu un nom de servidor vàlid.
 failedRemoveAccount=No s'ha pogut eliminar aquest compte.
 #LOCALIZATION NOTE: confirmRemoveAccount: %S is the account pretty name
 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?
--- a/toolkit/chrome/global-platform/mac/platformKeys.properties
+++ b/toolkit/chrome/global-platform/mac/platformKeys.properties
@@ -10,9 +10,9 @@ VK_META=⌘
 
 #the option/alt key - splitting tracks symbol (ctrl-g)
 VK_ALT=⌥
 
 #the control key. hat symbol (ctrl-f)
 VK_CONTROL=⌃
 
 #the separator character used between modifiers (none on Mac OS)
-MODIFIER_SEPARATOR=
+MODIFIER_SEPARATOR= 
--- a/toolkit/chrome/global/aboutSupport.dtd
+++ b/toolkit/chrome/global/aboutSupport.dtd
@@ -8,35 +8,45 @@ del &brandShortName;, visiteu el nostre <a id='supportLink'>lloc web d'assistència</a>.">
 <!ENTITY aboutSupport.extensionName "Nom">
 <!ENTITY aboutSupport.extensionEnabled "Habilitada">
 <!ENTITY aboutSupport.extensionVersion "Versió">
 <!ENTITY aboutSupport.extensionId "ID">
 
 <!ENTITY aboutSupport.appBasicsTitle "Paràmetres bàsics de l'aplicació">
 <!ENTITY aboutSupport.appBasicsName "Nom">
 <!ENTITY aboutSupport.appBasicsVersion "Versió">
+
 <!ENTITY aboutSupport.appBasicsProfileDir "Directori del perfil">
+<!-- LOCALIZATION NOTE (aboutSupport.appBasicsProfileDirWinMac):
+This is the Windows- and Mac-specific variant of aboutSupport.appBasicsProfileDir.
+Windows/Mac use the term "Folder" instead of "Directory" -->
+<!ENTITY aboutSupport.appBasicsProfileDirWinMac "Carpeta del perfil">
+
 <!ENTITY aboutSupport.appBasicsEnabledPlugins "Connectors habilitats">
 <!ENTITY aboutSupport.appBasicsBuildConfig "Configuració de la versió">
 <!ENTITY aboutSupport.appBasicsUserAgent "Agent d'usuari">
 <!ENTITY aboutSupport.appBasicsCrashIDs "Informes d'error">
 <!ENTITY aboutSupport.appBasicsMemoryUse "Utilització de la memòria">
 
 <!ENTITY aboutSupport.showDir.label "Obre el directori">
 <!-- LOCALIZATION NOTE (aboutSupport.showMac.label): This is the Mac-specific
 variant of aboutSupport.showDir.label.  This allows us to use the preferred
 "Finder" terminology on Mac. -->
-
 <!ENTITY aboutSupport.showMac.label "Mostra-ho en el Finder">
 <!-- LOCALIZATION NOTE (aboutSupport.showWin.label): This is the Windows-specific
 variant of aboutSupport.showDir.label. -->
 <!ENTITY aboutSupport.showWin.label "Obre la carpeta">
 
 <!ENTITY aboutSupport.modifiedKeyPrefsTitle "Preferències modificades importants">
 <!ENTITY aboutSupport.modifiedPrefsName "Nom">
 <!ENTITY aboutSupport.modifiedPrefsValue "Valor">
 
 <!ENTITY aboutSupport.graphicsTitle "Gràfics">
 
+<!ENTITY aboutSupport.jsTitle "JavaScript">
+<!ENTITY aboutSupport.jsIncrementalGC "Context Gràfic (GC) incremental">
+
+<!ENTITY aboutSupport.libraryVersionsTitle "Versions de la llibreria">
+
 <!ENTITY aboutSupport.installationHistoryTitle "Historial d'instal·lació">
 <!ENTITY aboutSupport.updateHistoryTitle "Historial d'actualització">
 
 <!ENTITY aboutSupport.copyToClipboard.label "Copia-ho tot al porta-retalls">
--- a/toolkit/chrome/global/aboutSupport.properties
+++ b/toolkit/chrome/global/aboutSupport.properties
@@ -35,8 +35,11 @@ adapterDescription2 = Descripció de l'adapter (GPU #2)
 adapterVendorID2 = Identificació del fabricant (GPU #2) 
 adapterDeviceID2 = Identificació del dispositiu (GPU #2)
 adapterDrivers2 = Controladors de l'adaptador (GPU #2)
 adapterRAM2 = Memòria RAM (GPU #2)
 driverVersion2 = Versió del controlador (GPU #2)
 driverDate2 = Data del controlador (GPU #2)
 isGPU2Active = GPU #2 Actiu
 webglRenderer = Motor WebGL
+
+minLibVersions = S'esperava una versió mínima
+loadedLibVersions = Versió en ús
--- a/toolkit/chrome/global/dialog.properties
+++ b/toolkit/chrome/global/dialog.properties
@@ -1,8 +1,8 @@
 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.properties
+++ b/toolkit/chrome/global/intl.properties
@@ -19,14 +19,14 @@ pluralRule=1
 # browser/components/preferences/fonts.xul
 font.language.group=x-western
 # Localization Note: Add the code for your language at the front of this entry,
 # leaving "en-us, en" for fallback. It's recommended to use the same form, e.g.
 # "ja-jp, ja, en-us, en"
 intl.accept_languages=ca, en-us, en
 intl.charsetmenu.browser.static=ISO-8859-1, UTF-8
 intl.charset.default=ISO-8859-1
-intl.charset.detector=
+intl.charset.detector= 
 intl.charsetmenu.mailedit=ISO-8859-1, ISO-8859-15, ISO-8859-6, armscii-8, geostd8, ISO-8859-13, ISO-8859-14, ISO-8859-2, GB2312, GB18030, Big5, KOI8-R, windows-1251, KOI8-U, ISO-8859-7, ISO-8859-8-I, windows-1255, ISO-2022-JP, EUC-KR, ISO-8859-10, ISO-8859-3, TIS-620, ISO-8859-9, UTF-8, VISCII
 # valid intl.menuitems.appendedacceskeys are: true or false, <empty string> (missing or empty preference equals false)
-intl.menuitems.alwaysappendaccesskeys=
+intl.menuitems.alwaysappendaccesskeys= 
 # valid intl.menuitems.insertseparatorbeforeaccesskeys are: true or false, <empty string> (missing or empty preference equals false)
 intl.menuitems.insertseparatorbeforeaccesskeys=true
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/resetProfile.dtd
@@ -0,0 +1,13 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this file,
+   - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
+
+<!ENTITY resetProfile.dialog.title        "Reinicia &brandShortName;">
+<!ENTITY resetProfile.dialog.description  "Realment voleu reiniciar &brandShortName; a la configuració de fàbrica?">
+<!ENTITY resetProfile.dialog.items.label  "Es conservaran les dades següents:">
+<!ENTITY resetProfile.dialog.footer.label "&brandShortName; es reiniciarà i tot el contingut serà suprimit.">
+<!ENTITY resetProfile.dialog.button.label "Reinicia &brandShortName;">
+
+<!ENTITY resetProfile.title               "Reinicia &brandShortName; a la configuració de fàbrica">
+<!ENTITY resetProfile.description         "Si experimenteu problemes greus que no podeu resoldre, reinicieu amb només la informació essencial.">
+<!ENTITY resetProfile.button.label        "Reinicia &brandShortName;">
--- a/toolkit/chrome/global/viewSource.dtd
+++ b/toolkit/chrome/global/viewSource.dtd
@@ -69,8 +69,13 @@ you can use these alternative items. Oth
 <!ENTITY findAgainCmd.commandkey2 "VK_F3">
 
 <!ENTITY backCmd.label "Enrere">
 <!ENTITY backCmd.accesskey "r">
 <!ENTITY forwardCmd.label "Endavant">
 <!ENTITY forwardCmd.accesskey "d">
 <!ENTITY goBackCmd.commandKey "[">
 <!ENTITY goForwardCmd.commandKey "]">
+
+<!ENTITY copyLinkCmd.label "Copia la ubicació de l'enllaç">
+<!ENTITY copyLinkCmd.accesskey "L">
+<!ENTITY copyEmailCmd.label "Copia l'adreça de correu electrònic">
+<!ENTITY copyEmailCmd.accesskey "E">