actualitza cadenes
authorToni Hermoso Pulido <toniher@softcatala.org>
Sat, 05 May 2012 21:30:49 +0200
changeset 954 e884255dd60b2c1becd4340a2f4feee273695878
parent 953 fe69642338a004758d037809355fcee3b4560594
child 955 27f24173e071b54eef048833e7a77afa880e175b
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:43:21 +0000
actualitza cadenes
browser/chrome/browser/aboutDialog.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/inspector.properties
browser/chrome/browser/devtools/scratchpad.dtd
browser/chrome/browser/devtools/sourceeditor.properties
browser/chrome/browser/devtools/styleinspector.properties
browser/chrome/browser/migration/migration.dtd
browser/chrome/browser/migration/migration.properties
browser/chrome/browser/pageInfo.dtd
browser/chrome/browser/preferences/aboutPermissions.dtd
browser/chrome/browser/syncQuota.properties
chat/facebook.properties
chat/irc.properties
chat/status.properties
chat/twitter.properties
chat/xmpp.properties
editor/ui/chrome/composer/editorOverlay.dtd
mail/chrome/messenger-newsblog/am-newsblog.dtd
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/FilterListDialog.dtd
mail/chrome/messenger/SearchDialog.dtd
mail/chrome/messenger/accountCreation.dtd
mail/chrome/messenger/accountCreation.properties
mail/chrome/messenger/addbuddy.dtd
mail/chrome/messenger/addressbook/abMainWindow.dtd
mail/chrome/messenger/addressbook/addressBook.properties
mail/chrome/messenger/am-identities-list.dtd
mail/chrome/messenger/am-im.dtd
mail/chrome/messenger/am-server-advanced.dtd
mail/chrome/messenger/am-server-top.dtd
mail/chrome/messenger/am-serverwithnoidentities.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/folderpane.dtd
mail/chrome/messenger/glodaComplete.properties
mail/chrome/messenger/imAccountWizard.dtd
mail/chrome/messenger/imAccounts.dtd
mail/chrome/messenger/imAccounts.properties
mail/chrome/messenger/imapMsgs.properties
mail/chrome/messenger/joinChat.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/addressingWidgetOverlay.dtd
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/messengercompose/messengercompose.dtd
mail/chrome/messenger/messengercompose/sendProgress.dtd
mail/chrome/messenger/mime.properties
mail/chrome/messenger/msgAccountCentral.dtd
mail/chrome/messenger/msgHdrViewOverlay.dtd
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/junkLog.dtd
mail/chrome/messenger/preferences/preferences.dtd
mail/chrome/messenger/preferences/security.dtd
mail/chrome/messenger/prefs.properties
mobile/android/base/android_strings.dtd
mobile/android/chrome/aboutApps.dtd
mobile/android/chrome/browser.properties
mobile/android/chrome/phishing.dtd
mobile/xul/chrome/about.dtd
mobile/xul/chrome/phishing.dtd
suite/chrome/common/dataman/dataman.dtd
suite/chrome/common/dataman/dataman.properties
suite/chrome/common/notification.properties
suite/chrome/common/pref/pref-navigator.dtd
suite/chrome/mailnews/compose/messengercompose.dtd
suite/chrome/mailnews/imapMsgs.properties
suite/chrome/mailnews/messenger.dtd
suite/chrome/mailnews/messenger.properties
suite/chrome/mailnews/newsblog/am-newsblog.dtd
suite/chrome/mailnews/newsblog/feed-subscriptions.dtd
suite/chrome/mailnews/newsblog/newsblog.properties
suite/chrome/mailnews/pref/am-server-top.dtd
suite/chrome/mailnews/pref/am-serverwithnoidentities.dtd
suite/chrome/mailnews/pref/prefs.properties
toolkit/chrome/global/commonDialog.dtd
toolkit/chrome/global/config.dtd
toolkit/chrome/global/console.dtd
toolkit/chrome/global/printPreviewProgress.dtd
toolkit/chrome/global/printProgress.dtd
toolkit/chrome/global/viewSource.dtd
toolkit/chrome/mozapps/downloads/downloads.dtd
toolkit/chrome/mozapps/help/help.dtd
--- a/browser/chrome/browser/aboutDialog.dtd
+++ b/browser/chrome/browser/aboutDialog.dtd
@@ -1,14 +1,14 @@
 <!ENTITY aboutDialog.title          "Quant al &brandFullName;">
 <!-- LOCALIZATION NOTE (warningDesc.version): This is a warning about the experimental nature of Nightly and Aurora builds. It is only shown in those versions. -->
 
 <!ENTITY warningDesc.version        "El &brandShortName; is experimental i pot ser poc estable.">
-<!-- LOCALIZATION NOTE (warningDesc.telemetry): This is a notification that Nightly/Aurora builds automatically send Telemetry data back to Mozilla. It is only shown in those versions. "It" refers to brandShortName. -->
-<!ENTITY warningDesc.telemetry      "Enviarà informació de les proves automàticament a &vendorShortName; per ajudar a millorar el &brandShortName;.">
+<!-- LOCALIZATION NOTE (warningDesc.telemetryDesc): This is a notification that Nightly/Aurora builds automatically send Telemetry data back to Mozilla. It is only shown in those versions. "It" refers to brandShortName. -->
+<!ENTITY warningDesc.telemetryDesc  "It automatically sends information about performance, hardware, usage and customizations back to &vendorShortName; to help make &brandShortName; better.">
 <!-- LOCALIZATION NOTE (community.exp.*) This paragraph is shown in "experimental" builds, i.e. Nightly and Aurora builds, instead of the other "community.*" strings below. -->
 
 <!ENTITY community.exp.start        "">
 <!-- LOCALIZATION NOTE (community.exp.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
 <!ENTITY community.exp.mozillaLink  "&vendorShortName;">
 <!ENTITY community.exp.middle       " és una ">
 <!-- LOCALIZATION NOTE (community.exp.creditslink): This is a link title that links to about:credits. -->
 <!ENTITY community.exp.creditsLink  "comunitat global">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -211,23 +211,23 @@ can reach it easily. -->
 <!ENTITY scratchpad.label             "Bloc de proves">
 <!ENTITY scratchpad.accesskey         "s">
 <!ENTITY scratchpad.keycode           "VK_F4">
 <!ENTITY scratchpad.keytext           "F4">
 
 <!ENTITY inspectCloseButton.tooltiptext "Tanca l'Inspector">
 
 <!ENTITY inspectorHTMLCopyInner.label       "Copia l'HTML interior">
-<!ENTITY inspectorHTMLCopyInner.accesskey   "I">
+<!ENTITY inspectorHTMLCopyInner.accesskey   "i">
 
 <!ENTITY inspectorHTMLCopyOuter.label       "Copia l'HTML exterior">
-<!ENTITY inspectorHTMLCopyOuter.accesskey   "O">
+<!ENTITY inspectorHTMLCopyOuter.accesskey   "o">
 
 <!ENTITY inspectorHTMLDelete.label          "Suprimeix el node ">
-<!ENTITY inspectorHTMLDelete.accesskey      "D">
+<!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">
@@ -274,17 +274,17 @@ can reach it easily. -->
 <!ENTITY selectAllCmd.accesskey       "a"> 
 <!ENTITY preferencesCmd2.label       "Opcions">
 <!ENTITY preferencesCmd2.accesskey     "O">
 <!ENTITY preferencesCmdUnix.label       "Preferències">
 <!ENTITY preferencesCmdUnix.accesskey     "n"> 
 
 <!ENTITY clearRecentHistory.label               "Neteja l'historial recent…">
 <!ENTITY clearRecentHistory.accesskey           "h">
-<!-- LOCALIZATION NOTE : These two strings can share an access key beause they never appear together on the menu -->
+<!-- LOCALIZATION NOTE : These two strings can share an access key because they never appear together on the menu -->
 
 <!ENTITY privateBrowsingCmd.start.label         "Inicia la navegació privada">
 <!ENTITY privateBrowsingCmd.start.accesskey     "n">
 <!ENTITY privateBrowsingCmd.stop.label          "Atura la navegació privada">
 <!ENTITY privateBrowsingCmd.stop.accesskey      "n">
 <!ENTITY privateBrowsingCmd.commandkey          "P">
 
 <!ENTITY viewMenu.label         "Visualitza"> 
@@ -601,20 +601,17 @@ 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. -->
+<!-- LOCALIZATION NOTE (markupButton.arialabel): The markup button is the button
+located in front of the breadcrumbs display in the inspector toolbar. The button
+doesn't display any label, but exposes a label to screen-readers with "aria-label".
+-->
 
-<!ENTITY 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
+<!ENTITY markupButton.arialabel          "Markup">
+<!-- LOCALIZATION NOTE (markupButton.accesskey): The key bound to the Markup panel's
 toolbar button -->
-
-<!ENTITY htmlPanel.accesskey          "H">
+<!ENTITY markupButton.accesskey          "M">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -110,16 +110,23 @@ crashedpluginsMessage.title=El connector
 crashedpluginsMessage.reloadButton.label=Torna a carregar la pàgina
 crashedpluginsMessage.reloadButton.accesskey=r
 crashedpluginsMessage.submitButton.label=Envia un informe de fallada
 crashedpluginsMessage.submitButton.accesskey=f
 crashedpluginsMessage.learnMore=Més informació…
 carbonFailurePluginsMessage.message=La pàgina demana utilitzar un connector que només pot executar-se en mode 32 bits
 carbonFailurePluginsMessage.restartButton.label=Reinicia en mode 32 bits
 carbonFailurePluginsMessage.restartButton.accesskey=R
+activatePluginsMessage.message=Would you like to activate the plugins on this page?
+activatePluginsMessage.label=Activate plugins
+activatePluginsMessage.accesskey=A
+activatePluginsMessage.always=Always activate plugins for this site
+activatePluginsMessage.always.accesskey=c
+activatePluginsMessage.never=Never activate plugins for this site
+activatePluginsMessage.never.accesskey=N
 
 # Sanitize
 # LOCALIZATION NOTE (sanitizeDialog2.everything.title): When "Time range to
 # clear" is set to "Everything", the Clear Recent History dialog's title is
 # changed to this.  See UI mockup and comment 11 at bug 480169 -->
 sanitizeDialog2.everything.title=Neteja tot l'historial
 sanitizeButtonOK=Neteja-ho ara
 # LOCALIZATION NOTE (sanitizeEverythingWarning2): Warning that appears when
@@ -320,19 +327,20 @@ browser.menu.showCharacterEncoding=false
 syncPromoNotification.bookmarks.description=Podeu accedir a totes les adreces d'interès de tots els vostres dispositius amb el %S. 
 # LOCALIZATION NOTE (syncPromoNotification.passwords.label): This appears in
 # the remember password panel.  %S will be replaced by syncBrandShortName.
 # The final space separates this text from the Learn More link.
 syncPromoNotification.passwords.description=Podeu accedir a les contrasenyes de tots els vostres dispositius amb el %S. 
 syncPromoNotification.learnMoreLinkText=Més informació
 
 # Telemetry prompt
-# 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?
+# LOCALIZATION NOTE (telemetryOptInPrompt): %1$S will be replaced by
+# brandFullName, and %2$S by the value of the toolkit.telemetry.server_owner
+# preference.
+telemetryOptInPrompt = Will you help improve %1$S by sending information about performance, hardware, usage, and customizations to %2$S?
 telemetryLinkLabel = Més informació
 telemetryYesButtonLabel2 = Sí, vull ajudar
 telemetryYesButtonAccessKey = S
 telemetryNoButtonLabel = No
 telemetryNoButtonAccessKey = N
 
 # Webapps notification popup
 webapps.install = Instal·la
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -13,16 +13,28 @@
 <!-- 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.stepOverButton): This is the label for the
+  -  button that steps over a function call. -->
+
+<!ENTITY debuggerUI.stepOverButton   "Step Over">
+<!-- LOCALIZATION NOTE (debuggerUI.stepInButton): This is the label for the
+  -  button that steps into a function call. -->
+
+<!ENTITY debuggerUI.stepInButton     "Step In">
+<!-- LOCALIZATION NOTE (debuggerUI.stepOutButton): This is the label for the
+  -  button that steps out of a function call. -->
+
+<!ENTITY debuggerUI.stepOutButton    "Step Out">
 <!-- 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. -->
 
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -25,17 +25,17 @@ 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
+# LOCALIZATION NOTE (withScope): 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
--- a/browser/chrome/browser/devtools/inspector.properties
+++ b/browser/chrome/browser/devtools/inspector.properties
@@ -15,20 +15,28 @@ 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 (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).
+# if it's pressed users can select an element with the mouse.
+# %S is the keyboard shortcut.
 inspectButton.tooltiptext=Selecciona l'element amb el ratolí (%S)
+
+# LOCALIZATION NOTE (markupButton.*):
+# This button is the button located at the beginning of the breadcrumbs
+# in the inspector toolbar. Its tooltip is built dynamically.
+# markupButton.tooltip is used on Mac.
+# On Windows and Linux, we use markupButton.tooltipWithAccesskey, where we append
+# the keyboard shortcut.
+markupButton.tooltip=Markup Panel
+markupButton.tooltipWithAccesskey=Markup Panel (%S)
+
+
+# LOCALIZATION NOTE (nodeMenu.tooltiptext)
+# This menu appears in the Infobar (on top of the highlighted node) once
+# the node is selected.
+nodeMenu.tooltiptext=Node operations
--- a/browser/chrome/browser/devtools/scratchpad.dtd
+++ b/browser/chrome/browser/devtools/scratchpad.dtd
@@ -81,17 +81,17 @@
   -->
 
 <!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">
+<!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">
 
--- a/browser/chrome/browser/devtools/sourceeditor.properties
+++ b/browser/chrome/browser/devtools/sourceeditor.properties
@@ -33,8 +33,14 @@ gotoLineCmd.promptMessage=Salta al número de línia:
 # 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
+
+# LOCALIZATION NOTE  (annotation.debugLocation.title): This is the text shown in
+# a tooltip displayed in any of the editor gutters when the user hovers the
+# current debugger location. The debugger can pause the JavaScript execution at
+# user-defined lines.
+annotation.debugLocation.title=Current step: %S
--- a/browser/chrome/browser/devtools/styleinspector.properties
+++ b/browser/chrome/browser/devtools/styleinspector.properties
@@ -116,8 +116,18 @@ rule.contextmenu.copyproperty.accesskey=
 
 # 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
+
+# LOCALIZATION NOTE (ruleView.*): Button label, accesskey and tooltip text
+# associated with the Highlighter's CSS Rule View in the Style Sidebar.
+ruleView.label=Rules
+ruleView.accesskey=R
+ruleView.tooltiptext=View and Edit CSS
+
+# LOCALIZATION NOTE (ruleView.empty): Text displayed when the highlighter is
+# first opened and there's no node selected in the rule view.
+rule.empty=No element selected.
--- a/browser/chrome/browser/migration/migration.dtd
+++ b/browser/chrome/browser/migration/migration.dtd
@@ -10,18 +10,16 @@
 <!ENTITY importFromNothing.label        "No importis res">
 <!ENTITY importFromNothing.accesskey    "r">
 <!ENTITY importFromSafari.label         "Safari">
 <!ENTITY importFromSafari.accesskey     "S">
 <!ENTITY importFromChrome.label         "Chrome">
 <!ENTITY importFromChrome.accesskey     "C">
 <!ENTITY importFromFirefox.label        "Firefox">
 <!ENTITY importFromFirefox.accesskey    "x">
-<!ENTITY importFromHTMLFile.label       "Des d'un fitxer HTML">
-<!ENTITY importFromHTMLFile.accesskey   "f">
 
 <!ENTITY noMigrationSources.label       "No s'ha trobat cap programa que contingui adreces d'interès, o dades d'historial o contrasenyes.">
 
 <!ENTITY importSource.title             "Importació de la configuració i les dades">
 <!ENTITY importItems.title              "Elements per importar">
 <!ENTITY importItems.label              "Seleccioneu quins elements voleu importar:">
 
 <!ENTITY migrating.title                "S'està important…">
--- a/browser/chrome/browser/migration/migration.properties
+++ b/browser/chrome/browser/migration/migration.properties
@@ -2,36 +2,33 @@ profileName_format=%S %S
 
 # Browser Specific
 sourceNameIE=Internet Explorer
 sourceNameSafari=Safari
 sourceNameChrome=Google Chrome
 sourceNameFirefox=Mozilla Firefox
 
 importedBookmarksFolder=De %S
-importedSearchURLsFolder=Cerques amb paraula clau (des de %S)
-importedSearchURLsTitle=Cerca a %S
-importedSearchUrlDesc=Teclegeu «%S <consulta de cerca>» a la barra d'ubicació per realitzar una cerca a %S.
 
-importedSafariBookmarks=Del Safari
+importedSafariReadingList=Reading List (From Safari)
 
 # Import Sources
 1_ie=Opcions d'Internet
 1_safari=Preferències
 1_chrome=Preferències
 
 2_ie=Galetes
 2_safari=Galetes
 2_chrome=Galetes
 2_firefox=Galetes
 
 4_ie=Historial de navegació
 4_safari=Historial de navegació
 4_chrome=Historial de navegació
-4_firefox=Historial de navegació
+4_firefox_history_and_bookmarks=Browsing History and Bookmarks
 
 8_ie=Historial dels formularis desats
 8_safari=Historial dels formularis desats
 8_chrome=Historial dels formularis desats
 8_firefox=Historial dels formularis desats
 
 16_ie=Contrasenyes desades
 16_safari=Contrasenyes desades
@@ -41,9 +38,9 @@ 16_firefox=Contrasenyes desades
 32_ie=Preferits
 32_safari=Adreces d'interès
 32_chrome=Adreces d'interès
 32_firefox=Adreces d'interès
 
 64_ie=Altres dades
 64_safari=Altres dades
 64_chrome=Altres dades
-
+64_firefox=Bookmarks Backups
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -93,16 +93,17 @@
 <!ENTITY  permAllowSession      "Permet per sessió">
 <!ENTITY  permBlock             "Bloca">
 <!ENTITY  permissionsFor        "Permisos per:">
 <!ENTITY  permImage             "Carregar imatges">
 <!ENTITY  permPopup             "Obrir finestres emergents">
 <!ENTITY  permCookie            "Definir galetes">
 <!ENTITY  permInstall           "Instal·lar extensions o temes">
 <!ENTITY  permGeo               "Compartir la ubicació">
+<!ENTITY  permPlugins           "Activate Plugins">
 
 <!ENTITY  permIndexedDB              "Mantenir l'emmagatzematge fora de línia">
 <!ENTITY  permClearStorage           "Neteja l'emmagatzematge">
 <!ENTITY  permClearStorage.accesskey "j">
 
 <!ENTITY  securityTab           "Seguretat">
 <!ENTITY  securityTab.accesskey "S">
 <!ENTITY  securityHeader        "Informació de seguretat de la pàgina">
--- a/browser/chrome/browser/preferences/aboutPermissions.dtd
+++ b/browser/chrome/browser/preferences/aboutPermissions.dtd
@@ -22,14 +22,16 @@
 <!ENTITY password.manage                 "Gestiona les contrasenyes…">
 
 <!ENTITY cookie.label                    "Defineix les galetes">
 <!ENTITY cookie.remove                   "Suprimeix les galetes">
 <!ENTITY cookie.manage                   "Gestiona les galetes…">
 <!ENTITY cookie.removeAll                "Suprimeix totes les galetes">
 
 <!ENTITY geo.label                       "Comparteix la ubicació">
+
+<!ENTITY plugins.label                   "Plugins">
 <!-- LOCALIZATION NOTE (indexedDB.label): This is describing indexedDB storage
      using the same language used for the permIndexedDB string in browser/pageInfo.dtd -->
 
 <!ENTITY indexedDB.label                 "Mantén emmagatzematge fora de línia">
 
 <!ENTITY popup.label                     "Obre finestres emergents">
--- a/browser/chrome/browser/syncQuota.properties
+++ b/browser/chrome/browser/syncQuota.properties
@@ -1,8 +1,9 @@
+collection.addons.label    = Add-ons
 collection.bookmarks.label = Adreces d'interès
 collection.history.label   = Historial
 collection.passwords.label = Contrasenyes
 collection.prefs.label     = Preferències
 collection.tabs.label      = Pestanyes
 
 # LOCALIZATION NOTE (quota.usageNoQuota.label): %1$S and %2$S are numeric value
 # and unit (as defined in the download manager) of the amount of space occupied
--- a/chat/facebook.properties
+++ b/chat/facebook.properties
@@ -1,1 +1,1 @@
-connection.error.useUsernameNotEmailAddress=Utilitzeu el vostre compte del Facebook, no una adreça de correu electrònic
+connection.error.useUsernameNotEmailAddress=Utilitzeu el vostre compte de Facebook, no una adreça de correu electrònic
--- a/chat/irc.properties
+++ b/chat/irc.properties
@@ -37,111 +37,111 @@ 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;sobrenom1&gt;[,&lt;sobrenom2&gt;]*: Suprimeix l'estat d'operador del canal d'algú. Heu de ser operador del canal per fer-ho.
-command.devoice=%S &lt;sobrenom1&gt;[,&lt;sobrenom2&gt;]*: Suprimeix l'estat de veu d'algú, evitant que pugui parlar si el canal és moderat (+m). Heu ser operador de canal per fer-ho.
-command.invite=%S &lt;sobrenom&gt; [&lt;sala&gt;]: Convida algú a unir-se al canal especificat, o al canal actual.
-command.join=%S &lt;sala1&gt;[,&lt;sala2&gt;]* [&lt;clau1&gt;[,&lt;clau2&gt;]*]: Introduïu un o més canals, proporcionant opcionalment una clau de canal per cada un si cal.
-command.kick=%S &lt;sobrenom&gt; [&lt;missatge&gt;]: Suprimeix algú d'un canal. Heu de ser operador del canal per fer-ho.
-command.list=%S: Mostra la llista de sales de xat a la xarxa. Avís: alguns servidors poden desconnectar-vos quan proveu de fer-ho.
-command.memoserv=%S &lt;ordre&gt;: Envia una ordre al MemoServ.
-command.mode=%S (&lt;sobrenom&gt;|&lt;canal&gt;) (+|-)&lt;mode nou&gt;: Configura o desconfigura un canal o mode d'usuari.
-command.msg=%S &lt;sobrenom&gt; &lt;missatge&gt;: Envia un missatge privat a un usuari (en comptes de fer-ho a un canal).
-command.nick=%S &lt;nou sobrenom&gt;: Canvia el vostre sobrenom.
-command.nickserv=%S &lt;ordre&gt;: Envia una ordre al NickServ.
-command.notice=%S &lt;objectiu&gt; &lt;missatge&gt;: Envia un avís a l'usuari o al canal.
-command.op=%S &lt;sobrenom1&gt;[,&lt;sobrenom2&gt;]*: Dóna l'estat d'operador de canal a algú. Heu de ser operador de canal per poder fer-ho.
-command.operserv=%S &lt;ordre&gt;: Envia una ordre a l'OperServ.
-command.part=%S [missatge]: Deixa el canal actual amb un missatge opcional.
-command.ping=%S [&lt;sobrenom&gt;]: Demana quant temps de retard té un usuari (o el servidor, si no s'especifica cap usuari).
-command.quit=%S &lt;missatge&gt;: Desconnecta del servidor, amb un missatge opcional.
-command.quote=%S &lt;ordre&gt;: Envia una ordre en brut al servidor.
-command.time=%S: Mostra l'hora local actual al servidor IRC.
-command.topic=%S [&lt;tema nou&gt;]: Mostra o canvia el tema del canal.
-command.umode=%S (+|-)&lt;mode nou&gt;: Configura o desconfigura un mode d'usuari.
-command.version=%S &lt;sobrenom&gt;: Sol·licita la versió del client d'un usuari.
-command.voice=%S &lt;sobrenom1&gt;[,&lt;sobrenom2&gt;]*: Dóna l'estat de veu del canal a algú. Heu de ser un operador del canal per fer-ho.
-command.wallops=%S &lt;missatge&gt;: Si no sabeu què és això, probablement no el podeu fer servir (envia una ordre a tots els connectats amb el senyal +w i tots els operadors en el servidor).
-command.whowas=%S &lt;sobrenom&gt;: Envia informació d'un usuari que ha finalitzat la sessió.
+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] ha entrat a la sala.
+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=Heu estat expulsat per %1$S%2$S.
+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 ha estat expulsat per %2$S%3$S.
+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) per %3$S.
+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 es coneix ara com a %2$S.
+message.nick=%1$S is now known as %2$S.
 #    %S is your new nick.
-message.nick.you=Sou conegut ara com a %S.
+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=Heu deixat la sala (Part%1$S).
+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 ha deixat la sala (Part%2$S).
+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 ha deixat la sala (Quit%2$S).
+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 va ser convidat amb èxit a %2$S.
+message.invited=%1$S was successfully invited to %2$S.
 #    %S is the nickname of the user who was summoned.
-message.summoned=%S va ser convocat.
+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=No podeu unir-vos a %S; us heu unit a massa canals.
+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=El sobrenom ja és en ús. Es canvia el sobrenom a %1$S [%2$S].
-error.banned=Esteu bandejat en aquest servidor.
-error.bannedSoon=Aviat estareu bandejat en aquest servidor.
-error.mode.wrongUser=No podeu canviar els modes d'altres usuaris.
+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=Nom
+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=Connectat des de
+tooltip.connectedFrom=Connected from
 # The away message of the user
-tooltip.away=Absent
-tooltip.ircOp=Operador IRC
-tooltip.channels=Actualment en
-tooltip.server=Connectat a
+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=Inactiu per
+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=i servidor
+usernameHint=and server
--- a/chat/status.properties
+++ b/chat/status.properties
@@ -1,14 +1,14 @@
-availableStatusType=Disponible
-awayStatusType=Absent
-unavailableStatusType=No disponible
-offlineStatusType=Fora de línia
+availableStatusType=Available
+awayStatusType=Away
+unavailableStatusType=Unavailable
+offlineStatusType=Offline
 invisibleStatusType=Invisible
-idleStatusType=Inactiu
-mobileStatusType=Mòbil
+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=Desconegut
+unknownStatusType=Unknown
 
 # LOCALIZATION NOTE (messenger.status.defaultIdleAwayMessage):
 #  This will be the away message put automatically when the user is idle.
-messenger.status.defaultIdleAwayMessage=Ara mateix sóc lluny de l'ordinador.
+messenger.status.defaultIdleAwayMessage=I am currently away from the computer.
--- a/chat/twitter.properties
+++ b/chat/twitter.properties
@@ -1,101 +1,101 @@
 # LOCALIZATION NOTE (error.*):
 #   These are errors that will be shown to the user in conversation.
-error.tooLong=L'estat té més de 140 caràcters.
+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=S'ha produït un error %1$S en enviar: %2$S
-error.retweet=S'ha produït un error %1$S en repiular: %2$S
-error.delete=S'ha produït un error %1$S en suprimir: %2$S
+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=Línia temporal %S
+timeline=%S timeline
 
 # LOCALIZATION NOTE (action.*):
 #  This will be an action in the context menu of displayed tweets.
-action.copyLink=Copia l'enllaç per piular
-action.retweet=Repiula
-action.reply=Respon
-action.delete=Suprimeix
+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=Segueix %S
-action.stopFollowing=Deixa de seguir %S
+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=Ara esteu seguint %S.
-event.unfollow=Ja no esteu seguint %S.
+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=Responent a: %S
+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=S'està iniciant el procés d'autenticació
-connection.requestAuth=S'està esperant la vostra autorització
-connection.requestAccess=S'està finalitzant l'autenticació
-connection.requestTimelines=S'està sol·licitant les línies temporals de l'usuari
+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=El nom d'usuari no coincideix.
-connection.error.failedToken=No s'ha pogut obtenir el testimoni de sol·licitud.
-connection.error.authCancelled=Heu cancel·lat el procés d'autorització.
-connection.error.authFailed=No s'ha pogut obtenir l'autorització.
-connection.error.noNetwork=No hi ha connexió a la xarxa disponible.
+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=Dóna permís per utilitzar el vostre compte de Twitter
+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=Paraules claus seguides
+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=Usuari des de
-tooltip.location=Ubicació
-tooltip.lang=Llengua
-tooltip.time_zone=Fus horari
-tooltip.url=Pàgina d'inici
+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=Piulades protegides
+tooltip.protected=Protects Tweets
 # LOCALIZATION NOTE (tooltip.following):
 #  whether you are subscribed to the user's tweets.
-tooltip.following=Seguint actualment
-tooltip.description=Descripció
+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=Seguint
-tooltip.statuses_count=Piulades
-tooltip.followers_count=Seguidors
-tooltip.listed_count=Llistat
+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=Sí
+yes=Yes
 no=No
--- a/chat/xmpp.properties
+++ b/chat/xmpp.properties
@@ -1,72 +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=S'està inicialitzant el flux
-connection.initializingEncryption=S'està inicialitzant el xifratge
-connection.authenticating=S'està autenticant
-connection.gettingResource=S'està obtenint el recurs
-connection.downloadingRoster=S'està baixant la llista de contactes
+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=No s'ha pogut creat el sòcol (esteu en línia?)
-connection.error.serverClosedConnection=El servidor ha tancat la connexió
-connection.error.resetByPeer=Connexió reiniciada per una part
-connection.error.timedOut=La connexió ha esgotat el temps d'espera
-connection.error.receivedUnexpectedData=S'han rebut dades no esperades
-connection.error.incorrectResponse=S'ha rebut una resposta incorrecta
-connection.error.startTLSRequired=El servidor requereix xifratge, però l'heu inhabilitat
-connection.error.startTLSNotSupported=El servidor no funciona amb xifratge, però la vostra configuració ho requereix
-connection.error.failedToStartTLS=No s'ha pogut iniciar el xifratge
-connection.error.noAuthMec=No hi ha mecanismes d'autenticació oferts pel servidor
-connection.error.noCompatibleAuthMec=Cap dels mecanismes d'autenticació oferts pel servidor són compatibles
-connection.error.notSendingPasswordInClear=El servidor només permet autenticació enviant la contrasenya en text net
-connection.error.authenticationFailure=Ha fallat l'autenticació
-connection.error.notAuthorized=No autoritzat (heu introduït una contrasenya incorrecta?)
-connection.error.failedToGetAResource=No s'ha pogut obtenir un recurs
+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=Estat (%S)
-tooltip.statusNoResource=Estat
-tooltip.subscription=Subscripció
+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=Sa_la
-chatRoomField.server=_Servidor
-chatRoomField.nick=Sobre_nom
-chatRoomField.password=Con_trasenya
+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=Contactes
+defaultGroup=Contacts
 
 # LOCALIZATION NOTE (options.*):
 #   These are the protocol specific options shown in the account manager and
 #   account wizard windows.
-options.resource=Recurs
-options.connectionSecurity=Seguretat de la connexió
-options.connectionSecurity.requireEncryption=Requereix xifratge
-options.connectionSecurity.opportunisticTLS=Utilitza el xifratge si és disponible
-options.connectionSecurity.allowUnencryptedAuth=Permet enviar la contrasenya sense xifrar
-options.connectServer=Servidor
+options.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=adreça electrònica
+gtalk.usernameHint=email address
--- a/editor/ui/chrome/composer/editorOverlay.dtd
+++ b/editor/ui/chrome/composer/editorOverlay.dtd
@@ -78,21 +78,16 @@
 <!ENTITY insertHTMLCmd.label "HTML…">
 <!ENTITY insertHTMLCmd.accesskey "H">
 <!ENTITY insertCharsCmd.label "Caràcters i símbols…">
 <!ENTITY insertCharsCmd.accesskey "C">
 <!ENTITY insertBreakAllCmd.label "Salt sota les imatges">
 <!ENTITY insertBreakAllCmd.accesskey "g">
 <!-- Used just in context popup. -->
 
-<!ENTITY spellCheckNoSuggestions.label "(No s'ha trobat cap suggeriment)">
-<!ENTITY spellCheckIgnoreWord.label "Ignora el mot">
-<!ENTITY spellCheckIgnoreWord.accesskey "I">
-<!ENTITY spellCheckAddToDictionary.label "Afegeix al diccionari">
-<!ENTITY spellCheckAddToDictionary.accesskey "n">
 <!ENTITY createLinkCmd.label "Crea un enllaç…">
 <!ENTITY createLinkCmd.accesskey "l">
 <!ENTITY editLinkCmd.label "Edita l'enllaç en una pàgina del redactor">
 <!ENTITY editLinkCmd.accesskey "i">
 <!-- Font Face SubMenu -->
 
 <!ENTITY FontFaceSelect.tooltip "Trieu un tipus de lletra">
 <!ENTITY fontfaceMenu.label "Tipus de lletra">
--- a/mail/chrome/messenger-newsblog/am-newsblog.dtd
+++ b/mail/chrome/messenger-newsblog/am-newsblog.dtd
@@ -1,20 +1,18 @@
-<!ENTITY accountTitle.label "Paràmetres del compte RSS">
-
 <!ENTITY biffStart.label "Comprova si hi ha nous articles cada ">
 <!ENTITY biffStart.accesskey "a">
 <!ENTITY biffEnd.label "minuts">
 
-<!ENTITY loginAtStartup.label "En iniciar, comprova si hi ha nous articles">
+<!ENTITY loginAtStartup.label "En iniciar, comprova si hi ha nous articles"> 
 <!ENTITY loginAtStartup.accesskey "i">
 
-<!ENTITY useQuickMode.label "Per defecte, mostra el resum de l'article en comptes de carregar la pàgina web">
+<!ENTITY useQuickMode.label "Per defecte, mostra el resum de l'article en comptes de carregar la pàgina web"> 
 <!ENTITY useQuickMode.accesskey "f">
 
-<!ENTITY manageSubscriptions.label "Gestiona les subscripcions…">
+<!ENTITY manageSubscriptions.label "Gestiona les subscripcions…"> 
 <!ENTITY manageSubscriptions.accesskey "G">
 <!-- entities from rss.rdf -->
 
 <!ENTITY feeds.accountName "Blocs i canals de notícies">
 <!ENTITY feeds.wizardShortName "Canals">
 <!ENTITY feeds.wizardLongName "Blocs i canals de notícies">
 <!ENTITY feeds.wizardLongName.accesskey "B">
--- a/mail/chrome/messenger-newsblog/feed-subscriptions.dtd
+++ b/mail/chrome/messenger-newsblog/feed-subscriptions.dtd
@@ -10,16 +10,17 @@
 <!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 quickMode.label             "Mostra el resum de l'article en comptes de carregar la pàgina web">
 <!ENTITY quickMode.accesskey         "M">
 
+<!ENTITY locationValidate.label      "Valida">
 <!ENTITY validateText.label          "Comprova la validació i recupera un URL vàlid.">
 
 <!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">
--- a/mail/chrome/messenger-newsblog/newsblog.properties
+++ b/mail/chrome/messenger-newsblog/newsblog.properties
@@ -1,38 +1,40 @@
 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-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-feedCopied=S'ha copiat 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-loading=S'està carregant...
 
 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-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.
+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=S'ha importat #1 canal nou al qual nou esteu ja subscrit;S'han importat #1 canals nous als quals no esteu ja subscrit
+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=(s'ha trobat d'#1 entrada);(s'han trobat d'un total de #1 entrades)
+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
 
--- a/mail/chrome/messenger/AccountManager.dtd
+++ b/mail/chrome/messenger/AccountManager.dtd
@@ -1,18 +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 "Afegeix un compte de xat…">
-<!ENTITY addIMAccountButton.accesskey "x">
+<!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
@@ -29,53 +29,53 @@
 <!ENTITY fullnameLabel.label "El vostre nom:">
 <!ENTITY fullnameLabel.accesskey "n">
 
 <!ENTITY emailLabel.label "Adreça electrònica:">
 <!ENTITY emailLabel.accesskey "t">
 <!-- Entities for Incoming Server page -->
 
 
-<!ENTITY incomingTitle.label "Informació del servidor d'entrada">
+<!ENTITY incomingTitle.label "Incoming Server Information">
 <!ENTITY incomingServerTypeDesc.label "Seleccioneu el tipus de servidor d'entrada que utilitzeu.">
 <!-- 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 "Introduïu el nom del servidor d'entrada (per exemple, «mail.example.net»).">
-<!ENTITY incomingServer.label "Servidor d'entrada:">
+<!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 "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">
+<!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 "Informació del servidor de sortida">
+<!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 "Introduïu el nom del servidor de sortida (SMTP) (per exemple, «smtp.example.net»).">
-<!ENTITY outgoingServer.label "Servidor de sortida:">
+<!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 "Introduïu el nom d'usuari de sortida que us ha proporcionat el vostre proveïdor de correu (normalment és el mateix que el nom d'usuari d'entrada).">
-<!ENTITY outgoingUsername.label "Nom d'usuari del servidor de sortida:">
-<!ENTITY outgoingUsername.accesskey "u">
+<!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.
--- a/mail/chrome/messenger/FilterListDialog.dtd
+++ b/mail/chrome/messenger/FilterListDialog.dtd
@@ -21,9 +21,9 @@
 <!ENTITY stopFilters.label "Atura">
 <!ENTITY stopFilters.accesskey "u">
 <!ENTITY folderPickerPrefix.label "Executa manualment els filtres seleccionats a la carpeta:">
 <!ENTITY folderPickerPrefix.accesskey "i">
 <!ENTITY choosethis.label "tria aquesta carpeta">
 <!ENTITY choosethisnewsserver.label "tria aquest servidor de grups de discussió">
 <!ENTITY helpButton.label "Ajuda">
 <!ENTITY helpButton.accesskey "j">
-<!ENTITY closeCmd.key "W">
+<!ENTITY closeCmd.key "W"> 
--- a/mail/chrome/messenger/SearchDialog.dtd
+++ b/mail/chrome/messenger/SearchDialog.dtd
@@ -12,17 +12,17 @@
 <!ENTITY deleteButton.label          "Suprimeix">
 <!ENTITY deleteButton.accesskey      "u">
 <!ENTITY searchDialogTitle.label     "Cerca missatges">
 <!ENTITY results.label               "Resultats">
 <!ENTITY fileHereMenu.label          "Arxiva'l aquí">
 <!ENTITY fileHereMenu.accesskey      "A">
 <!ENTITY fileButton.label            "Arxiva">
 <!ENTITY fileButton.accesskey        "A">
-<!ENTITY closeCmd.key                "W">
+<!ENTITY closeCmd.key                "W"> 
 <!ENTITY openInFolder.label          "Obre a la carpeta">
 <!ENTITY openInFolder.accesskey      "r">
 <!ENTITY saveAsVFButton.label        "Desa com una carpeta de cerca">
 <!ENTITY saveAsVFButton.accesskey    "D">
 <!-- for ABSearchDialog.xul -->
 
 <!ENTITY abSearchHeading.label       "Cerca a:">
 <!ENTITY abSearchHeading.accesskey   "e">
@@ -49,17 +49,17 @@
 <!ENTITY readColumn.label "Llegit">
 <!ENTITY receivedColumn.label "Recepció">
 <!ENTITY starredColumn.label "Destaca">
 <!ENTITY locationColumn.label "Ubicació">
 <!ENTITY idColumn.label "Ordre de recepció">
 <!-- Thread Pane Tooltips -->
 
 <!ENTITY columnChooser.tooltip "Feu un clic per seleccionar les columnes a visualitzar">
-<!ENTITY threadColumn.tooltip "Feu un clic per visualitzar les cadenes de missatges">
+<!ENTITY threadColumn.tooltip "Feu un clic per visualitzar les cadenes de missatges"> 
 <!ENTITY fromColumn.tooltip "Feu un clic per ordenar per remitent">
 <!ENTITY recipientColumn.tooltip "Feu un clic per ordenar per destinatari">
 <!ENTITY subjectColumn.tooltip "Feu un clic per ordenar per assumpte">
 <!ENTITY dateColumn.tooltip "Feu un clic per ordenar per data">
 <!ENTITY priorityColumn.tooltip "Feu un clic per ordenar per prioritat">
 <!ENTITY tagsColumn.tooltip "Feu un clic per ordenar per etiquetes">
 <!ENTITY accountColumn.tooltip "Feu un clic per ordenar per compte">
 <!ENTITY statusColumn.tooltip "Feu un clic per ordenar per estat">
--- a/mail/chrome/messenger/accountCreation.dtd
+++ b/mail/chrome/messenger/accountCreation.dtd
@@ -57,21 +57,21 @@
 <!ENTITY incomingSettings.label          "Opcions de recepció:">
 <!ENTITY outgoingSettings.label          "Opcions d'enviament:">
 <!ENTITY technicaldetails.label          "Detalls tècnics">
 <!-- LOCALIZATION NOTE (confirmWarning.label): If there is a security
      warning on the outgoing server, then the user will need to check a
      checkbox beside this text before continuing. -->
 <!ENTITY confirmWarning.label            "Comprenc els riscs.">
 <!ENTITY confirmWarning.accesskey        "r">
-<!-- LOCALIZATION NOTE (createAccount.label): If there is a security warning
+<!-- LOCALIZATION NOTE (doneAccount.label): If there is a security warning
      on the incoming or outgoing servers, then the page that pops up will
      have this text in a button to continue by creating the account. -->
-<!ENTITY createAccount.label             "Crea el compte">
-<!ENTITY createAccount.accesskey         "C">
+<!ENTITY doneAccount.label               "Fet">
+<!ENTITY doneAccount.accesskey           "D">
 <!-- LOCALIZATION NOTE (changeSettings.label): If there is a security warning on
      the incoming or outgoing servers, then the page that pops up will have
      this text in a button to take you back to the previous page to change
      the settings and try again. -->
 <!ENTITY changeSettings.label            "Modifica les opcions">
 <!ENTITY changeSettings.accesskey        "M">
 
 <!ENTITY contactYourProvider.description "El &brandShortName; us podrà donar accés al vostre correu amb les opcions que heu configurat. Tot i així, hauríeu de comentar a l'administrador o al proveïdor de correu que les connexions no estan bé així. Per a més informació consulteu les PMF del Thunderbird.">
--- a/mail/chrome/messenger/accountCreation.properties
+++ b/mail/chrome/messenger/accountCreation.properties
@@ -88,11 +88,11 @@ resultIMAP=IMAP
 resultPOP3=POP3
 resultSMTP=SMTP
 # LOCALIZATION NOTE(resultNoEncryption): Neither SSL/TLS nor STARTTLS. Transmission of emails in cleartext over the Internet.
 resultNoEncryption=Sense encriptació
 resultSSL=SSL
 resultSTARTTLS=STARTTLS
 # LOCALIZATION NOTE(resultSSLCertWeak): \u0020 is just a space
 resultSSLCertWeak=(Atenció: no s'ha pogut verificar el servidor)
-resultSSLCertOK=
+resultSSLCertOK= 
 resultUsernameBoth=%1$S
 resultUsernameDifferent=Entrada: %1$S, Sortida: %2$S
--- a/mail/chrome/messenger/addbuddy.dtd
+++ b/mail/chrome/messenger/addbuddy.dtd
@@ -1,3 +1,3 @@
-<!ENTITY addBuddyWindow.title           "Afegeix un contacte">
-<!ENTITY name.label                     "Nom d'usuari">
-<!ENTITY account.label                  "Compte">
+<!ENTITY addBuddyWindow.title           "Add contact">
+<!ENTITY name.label                     "Username">
+<!ENTITY account.label                  "Account">
--- a/mail/chrome/messenger/addressbook/abMainWindow.dtd
+++ b/mail/chrome/messenger/addressbook/abMainWindow.dtd
@@ -73,37 +73,37 @@
 <!ENTITY propertiesCmd.label                            "Propietats…">
 <!ENTITY propertiesCmd.accesskey                        "i">
 <!ENTITY propertiesCmd.key                              "i">
 <!-- View Menu -->
 
 <!ENTITY viewMenu.label                                 "Visualitza">
 <!ENTITY viewMenu.accesskey                             "V">
 <!ENTITY viewToolbarsMenu.label                         "Barres d'eines">
-<!ENTITY viewToolbarsMenu.accesskey                     "i">
+<!ENTITY viewToolbarsMenu.accesskey                     "i"> 
 <!ENTITY menubarCmd.label                               "Barra de menú">
 <!ENTITY menubarCmd.accesskey                           "m">
 <!ENTITY showAbToolbarCmd.label                         "Barra d'eines de la llibreta d'adreces">
 <!ENTITY showAbToolbarCmd.accesskey                     "r">
 <!ENTITY showTaskbarCmd.label                           "Barra d'estat">
 <!ENTITY showTaskbarCmd.accesskey                       "s">
 <!ENTITY customizeToolbar.label                         "Personalitza…">
 <!ENTITY customizeToolbar.accesskey                     "P">
 <!ENTITY layoutMenu.label                               "Disposició">
 <!ENTITY layoutMenu.accesskey                           "D">
 <!ENTITY showDirectoryPane.label                        "Directori">
 <!ENTITY showDirectoryPane.accesskey                    "D">
 <!ENTITY showContactPane2.label                         "Contactes">
 <!ENTITY showContactPane2.accesskey                     "C">
 <!ENTITY menu_ShowNameAs.label                          "Mostra el nom com a">
-<!ENTITY menu_ShowNameAs.accesskey                      "n">
+<!ENTITY menu_ShowNameAs.accesskey                      "n"> 
 <!-- LOCALIZATION NOTE (firstLastCmd2.label): We're not including a comma here
 because displayed names don't have the comma in between. -->
 <!ENTITY firstLastCmd2.label                            "Nom i cognoms">
-<!ENTITY firstLastCmd2.accesskey                        "N">
+<!ENTITY firstLastCmd2.accesskey                        "N"> 
 <!ENTITY lastFirstCmd.label                             "Cognoms, Nom">
 <!ENTITY lastFirstCmd.accesskey                         "C">
 <!ENTITY displayNameCmd.label                           "Nom a mostrar">
 <!ENTITY displayNameCmd.accesskey                       "m">
 <!ENTITY sortMenu.label                                 "Ordena">
 <!ENTITY sortMenu.accesskey                             "d">
 <!-- Tools Menu -->
 
--- a/mail/chrome/messenger/addressbook/addressBook.properties
+++ b/mail/chrome/messenger/addressbook/addressBook.properties
@@ -105,17 +105,17 @@ dateformat=%e %B
 cityAndStateAndZip=%1$S, %2$S %3$S
 ## LOCALIZATION NOTE (cityAndStateNoZip): 
 ## %1$S is city, %2$S is state
 cityAndStateNoZip=%1$S, %2$S
 ## LOCALIZATION NOTE (cityOrStateAndZip): 
 ## %1$S is city or state, %2$S is zip
 cityOrStateAndZip=%1$S %2$S
 
-stateZipSeparator=
+stateZipSeparator= 
 
 prefixTo=A
 prefixCc=Cc
 prefixBcc=Cco
 addressBook=Llibreta d'adreces
 
 browsePhoto=Fotografia del contacte
 
--- a/mail/chrome/messenger/am-identities-list.dtd
+++ b/mail/chrome/messenger/am-identities-list.dtd
@@ -1,9 +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">
+<!ENTITY identitiesListClose.label "Close">
+<!ENTITY identitiesListClose.accesskey "C">
--- a/mail/chrome/messenger/am-im.dtd
+++ b/mail/chrome/messenger/am-im.dtd
@@ -1,12 +1,12 @@
-<!ENTITY accountWindow.title           "Propietats del compte">
+<!ENTITY accountWindow.title           "Account properties">
 <!ENTITY accountWindow.width           "300">
 <!ENTITY account.general               "General">
-<!ENTITY account.advanced              "Opcions avançades">
-<!ENTITY account.name                  "Nom d'usuari:">
-<!ENTITY account.password              "Contrasenya:">
-<!ENTITY account.alias                 "Àlies:">
-<!ENTITY account.newMailNotification   "Notifica el correu nou">
-<!ENTITY account.autojoin              "Canals d'unió automàticament:">
-<!ENTITY account.proxySettings.caption "Paràmetres del servidor intermediari:">
-<!ENTITY account.proxySettings.change.label     "Canvia…">
+<!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">
--- a/mail/chrome/messenger/am-server-advanced.dtd
+++ b/mail/chrome/messenger/am-server-advanced.dtd
@@ -15,17 +15,17 @@
 <!ENTITY personalNamespace.label "Espai de noms personals:">
 <!ENTITY personalNamespace.accesskey "p">
 <!ENTITY publicNamespace.label "Públic (compartit):">
 <!ENTITY publicNamespace.accesskey "b">
 <!ENTITY otherUsersNamespace.label "Altres usuaris:">
 <!ENTITY otherUsersNamespace.accesskey "u">
 <!ENTITY overrideNamespaces.label "Permet que el servidor substitueixi aquests espais de noms">
 <!ENTITY overrideNamespaces.accesskey "a">
-<!ENTITY pop3Desc.label "Quan es baixi el correu POP d'aquest servidor, utilitza la carpeta següent per al correu nou:">
+<!ENTITY pop3Desc.label "Quan es baixi el correu POP d'aquest servidor, utilitza la carpeta següent per al correu nou:" >
 <!ENTITY globalInbox.label "Safata d'entrada global (compte de les carpetes locals)">
 <!ENTITY globalInbox.accesskey "g">
 <!ENTITY accountDirectory.label "Safata d'entrada per al compte d'aquest servidor">
 <!ENTITY accountDirectory.accesskey "S">
 <!ENTITY deferToServer.label "Una safata d'entrada per cada compte diferent">
 <!ENTITY deferToServer.accesskey "f">
 <!ENTITY deferGetNewMail.label "Inclou aquest servidor en comprovar si hi ha correu nou">
 <!ENTITY deferGetNewMail.accesskey "I">
--- a/mail/chrome/messenger/am-server-top.dtd
+++ b/mail/chrome/messenger/am-server-top.dtd
@@ -1,10 +1,11 @@
 <!-- extracted from am-server-top.xul -->
 
+<!ENTITY messageStorage.label "Missatge d'emmagatzematge">
 <!ENTITY securitySettings.label "Paràmetres de seguretat">
 <!ENTITY serverSettings.label "Paràmetres del servidor">
 <!ENTITY serverType.label "Tipus de servidor:">
 <!ENTITY serverName.label "Nom del servidor:">
 <!ENTITY serverName.accesskey "s">
 <!ENTITY userName.label "Nom d'usuari:">
 <!ENTITY userName.accesskey "u">
 <!ENTITY port.label "Port:">
@@ -58,21 +59,24 @@
 -->
 <!ENTITY maxMessagesStart.label "Demana-m'ho abans de baixar més de">
 <!ENTITY maxMessagesStart.accesskey "m">
 <!-- LOCALIZATION NOTE (maxMessagesEnd.label) : see note for maxMessagesStart.label -->
 <!ENTITY maxMessagesEnd.label "missatges">
 <!ENTITY alwaysAuthenticate.label "Sol·licita sempre autenticació en connectar amb aquest servidor">
 <!ENTITY alwaysAuthenticate.accesskey "l">
 <!ENTITY newsrcFilePath.label "Fitxer newsrc:">
-<!ENTITY localPath.label "Directori local:">
+<!ENTITY newsrcPicker.label "Selecciona el fitxer newsrc">
 <!ENTITY abbreviate.label "Mostra els noms dels grups de discussió a la subfinestra de la carpeta de la Missatgeria com a:">
 <!ENTITY abbreviateOn.label "Noms sencers (per exemple, «netscape.public.mozilla.mail-news»)">
 <!ENTITY abbreviateOff.label "Noms abreujats (per exemple, «n.p.m.mail-news»)">
 <!ENTITY advancedButton.label "Avançat…">
 <!ENTITY advancedButton.accesskey "v">
 <!ENTITY serverDefaultCharset.label "Codificació de caràcters per defecte:">
+<!ENTITY localPath.label "Directori local:">
 <!ENTITY localFolderPicker.label "Seleccioneu el directori local">
 <!ENTITY browseFolder.label "Navega…">
 <!ENTITY browseFolder.accesskey "N">
-<!ENTITY newsrcPicker.label "Selecciona el fitxer newsrc">
 <!ENTITY browseNewsrc.label "Navega…">
 <!ENTITY browseNewsrc.accesskey "e">
+
+<!ENTITY accountTitle.label "Opcions del compte">
+<!ENTITY accountSettingsDesc.label "The following is a special account.  There are no identities associated with it.">
--- a/mail/chrome/messenger/am-serverwithnoidentities.dtd
+++ b/mail/chrome/messenger/am-serverwithnoidentities.dtd
@@ -1,11 +1,2 @@
-<!ENTITY accountTitle.label "Paràmetres del compte">
-<!ENTITY accountSettingsDesc.label "El compte següent és especial; no hi ha cap identitat que hi estigui associada.">
 <!ENTITY accountName.label "Nom del compte:">
 <!ENTITY accountName.accesskey "N">
-<!ENTITY messageStorage.label "Emmagatzematge dels missatges">
-<!ENTITY emptyTrashOnExit.label "Buida la paperera en sortir">
-<!ENTITY emptyTrashOnExit.accesskey "B">
-<!ENTITY localPath.label "Directori local:">
-<!ENTITY localFolderPicker.label "Ubicació de les carpetes locals:">
-<!ENTITY browseFolder.label "Navega…">
-<!ENTITY browseFolder.accesskey "v">
--- a/mail/chrome/messenger/chat.dtd
+++ b/mail/chrome/messenger/chat.dtd
@@ -1,51 +1,51 @@
-<!ENTITY onlineContactsHeader.label    "Contactes en línia">
-<!ENTITY offlineContactsHeader.label   "Contactes fora de línia">
-<!ENTITY conversationsHeader.label     "Converses">
-<!ENTITY searchResultConversation.label "Resultat de la cerca">
-<!ENTITY chat.noConv.title             "Aquí es mostraran les converses.">
-<!ENTITY chat.noConv.description       "Utilitzeu la llista de contactes del tauler esquerra per iniciar una conversa.">
-<!ENTITY chat.noPreviousConv.description       "El &brandShortName; no té cap conversa anterior emmagatzemada per al contacte.">
-<!ENTITY chat.noAccount.title             "No heu configurat cap compte de xat encara.">
-<!ENTITY chat.noAccount.description       "Permet al &brandShortName; guiar-vos a través del procés de configurar un compte de xat.">
-<!ENTITY chat.accountWizard.button       "Primers passos">
-<!ENTITY chat.noConnectedAccount.title             "Els vostres comptes de xat no estan connectats.">
-<!ENTITY chat.noConnectedAccount.description       "Els podeu connectar des del diàleg d'«estat del xat»:">
-<!ENTITY chat.showAccountManager.button       "Mostra l'estat del xat">
+<!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    "Converses anteriors:">
-<!ENTITY chat.ongoingConversation      "Converses en curs">
+<!ENTITY chat.previousConversations    "Previous Conversations:">
+<!ENTITY chat.ongoingConversation      "Ongoing conversation">
 
-<!ENTITY openConversationCmd.label     "Inicia una conversa">
-<!ENTITY openConversationCmd.accesskey "c">
-<!ENTITY closeConversationCmd.label    "Tanca una conversa">
-<!ENTITY closeConversationCmd.accesskey "c">
-<!ENTITY aliasCmd.label                "Reanomena">
+<!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               "Suprimeix el contacte">
-<!ENTITY deleteCmd.accesskey           "u">
+<!ENTITY deleteCmd.label               "Remove Contact">
+<!ENTITY deleteCmd.accesskey           "v">
 
-<!ENTITY openConversationButton.tooltip  "Inicia una conversa">
-<!ENTITY closeConversationButton.tooltip "Tanca la conversa">
+<!ENTITY openConversationButton.tooltip  "Start a conversation">
+<!ENTITY closeConversationButton.tooltip "Close conversation">
 
-<!ENTITY addBuddyButton.label          "Afegeix un contacte">
-<!ENTITY joinChatButton.label          "Uneix al xat">
-<!ENTITY chatAccountsButton.label      "Mostra els comptes">
+<!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 "Cerca totes les converses… #1">
+<!ENTITY searchAllChatMessages.label.base "Search all conversations… #1">
 
-<!ENTITY status.available          "Disponible">
-<!ENTITY status.unavailable        "No disponible">
-<!ENTITY status.offline            "Fora de línia">
+<!ENTITY status.available          "Available">
+<!ENTITY status.unavailable        "Unavailable">
+<!ENTITY status.offline            "Offline">
 
-<!ENTITY openLinkCmd.label            "Obre l'enllaç…">
+<!ENTITY openLinkCmd.label            "Open Link…">
 <!ENTITY openLinkCmd.accesskey        "O">
--- a/mail/chrome/messenger/chat.properties
+++ b/mail/chrome/messenger/chat.properties
@@ -1,86 +1,86 @@
-chatTabTitle=Xat
-goBackToCurrentConversation.button=Torna a la conversa actual
+chatTabTitle=Chat
+goBackToCurrentConversation.button=Back to current conversation
 # LOCALIZATION NOTE (startAConversationWith.button):
 #  %S is replaced with the display name of a contact.
-startAConversationWith.button=Inicia una conversa amb %S
+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=Contactes
+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 vol fer un xat
-buddy.authRequest.allow.label=Permet
-buddy.authRequest.allow.accesskey=P
-buddy.authRequest.deny.label=Rebutja
-buddy.authRequest.deny.accesskey=b
+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=Voleu suprimir %S?
+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=Si continueu s'eliminarà %1$S de la vostra llistat d'amics de %2$S.
+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=Su&primeix
+buddy.deletePrompt.button=&Delete
 
-displayNameEmptyText=Nom per mostrar
-userIconFilePickerTitle=Seleccioneu una icona nova…
+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=està teclejant…
-chat.hasStoppedTyping=ha deixat de teclejar.
+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 està teclejant.
-chat.contactHasStoppedTyping=%S ha deixat de teclejar.
+chat.contactIsTyping=%S is typing.
+chat.contactHasStoppedTyping=%S has stopped typing.
 
-noTopic=No hi ha cap missatge de tema en la sala.
+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 no és una ordre reconeguda. Escriviu /help per veure una llista d'ordre.
+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=Nom d'usuari
-buddytooltip.account=Compte
+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=Avui %S
-yesterday=Ahir %S
+today=Today %S
+yesterday=Yesterday %S
 # LOCALIZATION NOTE (dateTime):
 # %1$S is the date, %2$S is the date.
 dateTime=%1$S %2$S
--- a/mail/chrome/messenger/cloudfile/Dropbox/management.dtd
+++ b/mail/chrome/messenger/cloudfile/Dropbox/management.dtd
@@ -1,4 +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 "Mostra els meus paràmetres de compte a dropbox.com">
+<!ENTITY dropboxMgmt.viewSettings "View my account settings on dropbox.com">
--- a/mail/chrome/messenger/cloudfile/YouSendIt/management.dtd
+++ b/mail/chrome/messenger/cloudfile/YouSendIt/management.dtd
@@ -1,4 +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 "Mostra els meus paràmetres de compte a yousendit.com">
+<!ENTITY youSendItMgmt.viewSettings "View my account settings on yousendit.com">
--- a/mail/chrome/messenger/cloudfile/YouSendIt/settings.dtd
+++ b/mail/chrome/messenger/cloudfile/YouSendIt/settings.dtd
@@ -1,5 +1,6 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this file,
    - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
-<!ENTITY youSendItSettings.username "Nom d'usuari:">
-<!ENTITY youSendItSettings.needAnAccount "Us cal un compte?">
+<!ENTITY youSendItSettings.username "Username:">
+<!ENTITY youSendItSettings.needAnAccount "Need an account?">
+<!ENTITY youSendItSettings.learnMore "Learn more…">
--- a/mail/chrome/messenger/cloudfile/addAccountDialog.dtd
+++ b/mail/chrome/messenger/cloudfile/addAccountDialog.dtd
@@ -1,12 +1,13 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this file,
    - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
-<!ENTITY addAccountDialog.title   "Configura el Filelink">
-<!ENTITY addAccountDialog.menuTitle "Seleccioneu un servei d'emmagatzemament en línia">
-<!ENTITY addAccountDialog.style "width: 55em; min-height: 20em;">
-<!ENTITY addAccountDialog.accountName.label "Nom del compte:">
-<!ENTITY addAccountDialog.noAccountText "La versió actual del &brandShortName; només permet un compte per cada servei d'emmagatzemament en línia.">
-<!ENTITY addAccountDialog.createAccountText "Aquesta característica us permet enviar adjuncions més grans fent servir un dels diferents serveis d'emmagatzemament en línia. Us podeu connectar a un compte que ja existeixi o registrar-hi un compte nou.">
-<!ENTITY addAccountDialog.authorizing "S'està comprovant l'autorització…">
-<!ENTITY addAccountDialog.error "S'ha produït un error mentre es configurava el compte!">
-<!ENTITY addAccountDialog.acceptButton.label "Configura un compte">
+<!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.createAccountText2 "You can send large attachments using one of several online storage services. Please either set up 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">
+<!ENTITY addAccountDialog.learnMore "Learn more…">
--- a/mail/chrome/messenger/cloudfile/management.dtd
+++ b/mail/chrome/messenger/cloudfile/management.dtd
@@ -1,8 +1,8 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this file,
    - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
-<!ENTITY cloudfileMgmt.privacyPolicy "Política de privadesa">
-<!ENTITY cloudfileMgmt.termsOfService "Termes del servei">
-<!ENTITY cloudfileMgmt.usedSpace "Espai utilitzat:">
-<!ENTITY cloudfileMgmt.unusedSpace "Espai no utilitzat:">
-<!ENTITY cloudfileMgmt.upgradeOffer "Aconseguiu més espai">
+<!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/folderpane.dtd
+++ b/mail/chrome/messenger/folderpane.dtd
@@ -29,12 +29,12 @@
  under the terms of either the GPL or the LGPL, and not to allow others to
  use your version of this file under the terms of the MPL, indicate your
  decision by deleting the provisions above and replace them with the notice
  and other provisions required by the GPL or the LGPL. If you do not delete
  the provisions above, a recipient may use your version of this file under
  the terms of any one of the MPL, the GPL or the LGPL.
 
  ***** END LICENSE BLOCK ***** -->
-<!ENTITY nameColumn.label   "Nom">
-<!ENTITY unreadColumn.label "Per llegir">
-<!ENTITY totalColumn.label "Total">
-<!ENTITY folderSizeColumn.label "Mida">
+<!ENTITY nameColumn.label   "Nom"> 
+<!ENTITY unreadColumn.label "Per llegir"> 
+<!ENTITY totalColumn.label "Total"> 
+<!ENTITY folderSizeColumn.label "Mida"> 
--- a/mail/chrome/messenger/glodaComplete.properties
+++ b/mail/chrome/messenger/glodaComplete.properties
@@ -50,15 +50,15 @@ glodaComplete.messagesMentioning.label=Missatges que fan referència a: #1
 #  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.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 search provider to use. #2 is
 #  the string to search for, truncated to 15 characters.
-glodaComplete.webSearch1.label=Cerca a #1: #2
+glodaComplete.webSearch1.label=Search #1 for: #2
 
 # 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 search provider to use. #2 is
 #  the string to search for, truncated to 15 characters.
-glodaComplete.webSearch1.label.truncated=Cerca a #1: #2…
+glodaComplete.webSearch1.label.truncated=Search #1 for: #2…
--- a/mail/chrome/messenger/imAccountWizard.dtd
+++ b/mail/chrome/messenger/imAccountWizard.dtd
@@ -1,28 +1,28 @@
-<!ENTITY windowTitle.label            "Auxiliar de compte de xat">
+<!ENTITY windowTitle.label            "Chat Account Wizard">
 
-<!ENTITY accountProtocolTitle.label   "Xarxa de xat">
-<!ENTITY accountProtocolInfo.label    "Trieu la xarxa del vostre compte de xat.">
-<!ENTITY accountProtocolField.label   "Xarxa:">
-<!ENTITY accountProtocolGetMore.label "Aconseguiu-ne més…">
+<!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   "Nom d'usuari">
-<!ENTITY accountUsernameDuplicate.label "El compte ja està configurat!">
+<!ENTITY accountUsernameTitle.label   "Username">
+<!ENTITY accountUsernameDuplicate.label "This account is already configured!">
 
-<!ENTITY accountPasswordTitle.label   "Contrasenya">
-<!ENTITY accountPasswordInfo.label    "Introduïu la contrasenya en el quadre a continuació.">
-<!ENTITY accountPasswordField.label   "Contrasenya:">
-<!ENTITY accountPasswordManager.label "La contrasenya que s'ha introduït s'emmagatzemarà en el gestor de contrasenya. Deixeu el quadre en blanc si voleu que se us demani la contrasenya cada vegada que es connecti amb aquest compte.">
+<!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   "Opcions avançades">
-<!ENTITY accountAdvancedInfo.label    "Sentiu-vos lliure de saltar aquest pas si ho preferiu.">
-<!ENTITY accountAdvanced.newMailNotification.label   "Notifica amb el correu nou">
-<!ENTITY accountAliasGroupbox.caption "Àlies local">
-<!ENTITY accountAliasField.label      "Àlies:">
-<!ENTITY accountAliasInfo.label       "Només es mostrarà en les vostres converses quan sigueu el que parleu. Els contactes remots no ho veuran.">
-<!ENTITY accountProxySettings.caption "Paràmetres del servidor intermediari">
-<!ENTITY accountProxySettings.change.label     "Canvia…">
+<!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   "Resum">
-<!ENTITY accountSummaryInfo.label    "Un resum de la informació que heu introduït es mostra a continuació. Comproveu-la abans de crear el compte.">
-<!ENTITY accountSummary.connectNow.label "Connecteu-vos al compte ara mateix.">
+<!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.">
--- a/mail/chrome/messenger/imAccounts.dtd
+++ b/mail/chrome/messenger/imAccounts.dtd
@@ -1,26 +1,26 @@
-<!ENTITY accountsWindow.title                "Estat de missatgeria instantània">
-<!ENTITY accountsWindow.style                "width: 38em; height: 19em;">
-<!ENTITY accountManager.newAccount.label     "Compte nou">
-<!ENTITY accountManager.newAccount.accesskey "n">
-<!ENTITY accountManager.close.label          "Tanca">
-<!ENTITY accountManager.close.accesskey      "T">
+<!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 s'ha configurat el compte encara">
-<!ENTITY accountManager.noAccount.description "Feu clic al botó &accountManager.newAccount.label; per permetre al &brandShortName; guiar-vos a través del procés de configurar-ne un.">
-<!ENTITY account.autoSignOn.label     "Inicia la sessió a l'inici">
-<!ENTITY account.autoSignOn.accesskey "I">
-<!ENTITY account.connect.label        "Connecta">
+<!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     "Desconnecta">
-<!ENTITY account.disconnect.accesskey "e">
-<!ENTITY account.edit.label           "Propietats">
+<!ENTITY account.disconnect.label     "Disconnect">
+<!ENTITY account.disconnect.accesskey "i">
+<!ENTITY account.edit.label           "Properties">
 <!ENTITY account.edit.accesskey       "P">
-<!ENTITY account.moveup.label         "Vés amunt">
-<!ENTITY account.movedown.label       "Vés avall">
-<!ENTITY account.cancelReconnection.label         "Cancel·la la reconnexió">
+<!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           "S'està connectant…">
-<!ENTITY account.disconnecting        "S'està desconnectant…">
-<!ENTITY account.disconnected         "No connectat">
+<!ENTITY account.connecting           "Connecting…">
+<!ENTITY account.disconnecting        "Disconnecting…">
+<!ENTITY account.disconnected         "Not Connected">
--- a/mail/chrome/messenger/imAccounts.properties
+++ b/mail/chrome/messenger/imAccounts.properties
@@ -1,59 +1,59 @@
 # LOCALIZATION NOTE (protoOptions):
 # %S is replaced by the name of a protocol
-protoOptions=Opcions de %S
-accountUsername=Nom d'usuari:
+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=Introduïu el nom d'usuari del compte de %S.
+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=Introduïu el nom d'usuari (%1$S) del vostre compte de %2$S.
+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 un connector de protocol '%S'
-account.connection.errorEnteringPasswordRequired=És necessari introduir una contrasenya per a connectar-se al compte.
-account.connection.errorCrashedAccount=S'ha produït un error en connectar-se al compte.
+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=S'està connectant: %S…
-account.connecting=S'està connectant…
-account.connectedForSeconds=S'ha connectat uns segons.
+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=Connectat per %1$S %2$S i %3$S %4$S.
-account.connectedForSingle=Connectat al voltant de %1$S %2$S.
-account.reconnectInDouble=Reconnexió en %1$S %2$S i %3$S %4$S.
-account.reconnectInSingle=Reconnexió en %1$S %2$S.
+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=Sol·licitud d'autorització
+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=&Permet
-requestAuthorizeDeny=Re&butja
+requestAuthorizeAllow=&Allow
+requestAuthorizeDeny=&Deny
 # LOCALIZATION NOTE (requestAuthorizeText):
 # %S is a contact username.
-requestAuthorizeText=%S us ha afegit a la seva llista de contactes. Voleu permetre que us vegi?
+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=Connecta ara
-accountsManager.notification.userDisabled.label=Heu inhabilitat les connexions automàtiques.
-accountsManager.notification.safeMode.label=S'han ignorat els paràmetres de connexió automàtica perquè l'aplicació s'està executant actualment en mode segur.
-accountsManager.notification.startOffline.label=S'han ignorat els paràmetres de connexió automàtica perquè l'aplicació es va iniciar en mode fora de línia.
-accountsManager.notification.crash.label=La darrera execució ha acabat de forma inesperada mentre es connectava. S'han inhabilitat les connexions automàtiques per tal que pugueu editar els paràmetres.
+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=Una execució anterior ha acabat de forma inesperada mentre es connectava a un compte nou o que s'ha editat. No s'hi ha connectat per tal que pugueu editar els seus paràmetres.; Una execució anterior ha acabat de forma inesperada mentre es connectava a #1 comptes nous o que s'han editat. No s'hi ha connectat per tal que pugueu editar els seus paràmetres.; 
-accountsManager.notification.other.label=S'ha inhabilitat la connexió automàtica.
+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.
--- a/mail/chrome/messenger/imapMsgs.properties
+++ b/mail/chrome/messenger/imapMsgs.properties
@@ -221,17 +221,17 @@ 5047=Introduïu la contrasenya per a %S:
 5048=El servidor de correu %S no és IMAP4.
 
 ## @name IMAP_SERVER_SAID
 ## @loc None
 5049=L'ordre en curs no ha tingut èxit. El servidor de correu ha respost:
 
 ## @name IMAP_DONE
 ## @loc None
-5050=
+5050= 
 
 ## @name IMAP_ENTER_PASSWORD_PROMPT_TITLE
 ## @loc None
 5051=Cal una contrasenya per al servidor de correu
 
 ## @name IMAP_UNKNOWN_HOST_ERROR
 ## @loc None
 5052=No s'ha pogut connectar amb el servidor %S.
--- a/mail/chrome/messenger/joinChat.dtd
+++ b/mail/chrome/messenger/joinChat.dtd
@@ -1,6 +1,6 @@
-<!ENTITY joinChatWindow.title           "Uneix al xat">
-<!ENTITY name.label                     "Sala">
-<!ENTITY optional.label                 "(opcional)">
-<!ENTITY account.label                  "Compte">
-<!ENTITY autojoin.label                 "Uneix-automàticament a la sala de xat">
-<!ENTITY autojoin.accesskey             "a">
+<!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,18 +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 "Compte de xat…">
-<!ENTITY newIMAccountCmd.accesskey "x">
+<!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">
@@ -251,17 +251,17 @@ fullZoomResetCmd.commandkey2 are alterna
 If shift key is needed with your locale popular keyboard for them,
 you can use these alternative items. Otherwise, their values should be empty.  -->
 
 
 <!ENTITY fullZoomEnlargeCmd.label       "Augmenta">
 <!ENTITY fullZoomEnlargeCmd.accesskey   "g">
 <!ENTITY fullZoomEnlargeCmd.commandkey  "+">
 <!-- + is above this key on many keyboards -->
-<!ENTITY fullZoomEnlargeCmd.commandkey2 "=">
+<!ENTITY fullZoomEnlargeCmd.commandkey2 "="> 
 <!ENTITY fullZoomEnlargeCmd.commandkey3 "">
 
 <!ENTITY fullZoomReduceCmd.label        "Redueix">
 <!ENTITY fullZoomReduceCmd.accesskey    "d">
 <!ENTITY fullZoomReduceCmd.commandkey   "-">
 <!ENTITY fullZoomReduceCmd.commandkey2  "">
 
 <!ENTITY fullZoomResetCmd.label         "Restableix">
@@ -323,19 +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 "Xat">
-<!ENTITY goChatCmd.accesskey "x">
-<!ENTITY goChatCmd.commandKey "X">
+<!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">
@@ -354,18 +354,18 @@ you can use these alternative items. Oth
 <!ENTITY archiveMsgCmd.key  "a">
 <!ENTITY cancelNewsMsgCmd.label "Cancel·la el missatge">
 <!ENTITY cancelNewsMsgCmd.accesskey "n">
 <!ENTITY replyMsgCmd.label "Respon">
 <!ENTITY replyMsgCmd.accesskey "R">
 <!ENTITY replyMsgCmd.key  "r">
 <!ENTITY replySenderCmd.label "Respon només al remitent">
 <!ENTITY replySenderCmd.accesskey "R">
-<!ENTITY replyNewsgroupCmd.label "Respon al grup de discussió">
-<!ENTITY replyNewsgroupCmd.accesskey  "g">
+<!ENTITY replyNewsgroupCmd2.label "Followup to Newsgroup">
+<!ENTITY replyNewsgroupCmd2.accesskey  "u">
 <!ENTITY replyToAllMsgCmd.label "Respon a tots">
 <!ENTITY replyToAllMsgCmd.accesskey  "p">
 <!ENTITY replyToAllMsgCmd.key  "r">
 <!ENTITY replyToListMsgCmd.label "Respon a la llista">
 <!ENTITY replyToListMsgCmd.accesskey  "l">
 <!ENTITY replyToListMsgCmd.key  "l">
 <!ENTITY forwardMsgCmd.label "Reenvia">
 <!ENTITY forwardMsgCmd.accesskey "v">
@@ -469,22 +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 "Estat del xat">
-<!ENTITY imAccountsStatus.accesskey "x">
-<!ENTITY imStatus.available          "Disponible">
-<!ENTITY imStatus.unavailable        "No disponible">
-<!ENTITY imStatus.offline            "Fora de línia">
-<!ENTITY imStatus.showAccounts       "Mostra els comptes…">
+<!ENTITY 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">
@@ -494,51 +494,52 @@ you can use these alternative items. Oth
 <!ENTITY runJunkControls.label "Executa els controls de brossa a la carpeta">
 <!ENTITY runJunkControls.accesskey "u">
 <!ENTITY deleteJunk.label "Suprimeix la brossa de la carpeta">
 <!ENTITY deleteJunk.accesskey "x">
 <!ENTITY importCmd.label "Importa…">
 <!ENTITY importCmd.accesskey "I">
 <!ENTITY errorConsoleCmd.label "Consola d'errors">
 <!ENTITY errorConsoleCmd.accesskey "C">
+<!ENTITY errorConsoleCmd.commandkey "j">
 <!ENTITY accountManagerCmd.label "Paràmetres dels comptes…">
 <!ENTITY accountManagerCmd.accesskey "P">
 <!-- LOCALIZATION NOTE (accountManagerCmdUnix.accesskey): belongs to accountManagerCmd.label,
         which is placed under the Edit menu on Unix systems -->
 <!ENTITY accountManagerCmdUnix.accesskey "a">
 <!-- Mail Toolbar -->
 
 <!ENTITY getMsgButton.label "Recupera">
 <!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 "Per llegir següent">
-<!ENTITY nextMsgButton.label "Següent">
+<!ENTITY nextButtonToolbarItem.label "Next Unread">
+<!ENTITY nextMsgButton.label "Next">
 <!ENTITY previousButton.label "Anterior">
-<!ENTITY previousButtonToolbarItem.label "Per llegir anterior">
-<!ENTITY previousMsgButton.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 "Xat">
+<!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-->
 
@@ -549,30 +550,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 "Vés al missatge següent">
+<!ENTITY nextMsgButton.tooltip "Move to the next message">
 <!ENTITY previousButton.tooltip "Vés a l'anterior missatge per llegir">
-<!ENTITY previousMsgButton.tooltip "Vés al missatge anterior">
+<!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 "Mostra la pestanya de xat">
+<!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 -->
 
@@ -688,18 +689,18 @@ you can use these alternative items. Oth
 <!ENTITY contextOpenConversation.label "Obre el missatge en la conversa">
 <!ENTITY contextOpenConversation.accesskey "n">
 <!ENTITY contextEditAsNew.label "Edita'l com si fos nou…">
 <!ENTITY contextEditAsNew.accesskey "E">
 <!ENTITY contextArchive.label "Arxiva">
 <!ENTITY contextArchive.accesskey "x">
 <!ENTITY contextReplySender.label "Respon només al remitent">
 <!ENTITY contextReplySender.accesskey "R">
-<!ENTITY contextReplyNewsgroup.label "Respon al grup de discussió">
-<!ENTITY contextReplyNewsgroup.accesskey "g">
+<!ENTITY contextReplyNewsgroup2.label "Followup to Newsgroup">
+<!ENTITY contextReplyNewsgroup2.accesskey "u">
 <!ENTITY contextReplyAll.label "Respon a tots">
 <!ENTITY contextReplyAll.accesskey "p">
 <!ENTITY contextReplyList.label "Respon a la llista">
 <!ENTITY contextReplyList.accesskey "l">
 <!ENTITY contextForward.label "Reenvia">
 <!ENTITY contextForward.accesskey "v">
 <!ENTITY contextForwardAsAttachment.label "Reenvia com a adjuncions">
 <!ENTITY contextForwardAsAttachment.accesskey "e">
@@ -804,17 +805,17 @@ you can use these alternative items. Oth
      This is the base of the empty text for the global search box.  We replace
      #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 search.label.base "Cerca… #1">
+<!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 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
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -158,17 +158,17 @@ serverType-none=Emmagatzematge local del
 serverType-movemail=Unix Movemail
 
 sizeColumnTooltip=Feu un clic per ordenar per mida
 sizeColumnHeader=Mida
 linesColumnTooltip=Feu clic per ordenar per línies
 linesColumnHeader=Línies
 
 # status feedback stuff
-documentDone=
+documentDone= 
 documentLoading=S'està carregant el document…
 
 # LOCALIZATION NOTE (autosyncProgress): Do not translate the word "%1$S" or "%2$S" below.
 # Place the word %1$S in your translation where the name of the comma separated folders should appear.
 # Place the word %2$S in your translation where the name of the comma separated accounts should appear.
 autosyncProgress=Se sincronitzen els missatges a %1$S de %2$S…
 
 unreadMsgStatus=Per llegir: %S
@@ -294,29 +294,30 @@ mail.addr_book.show_phonetic_fields=fals
 # 6: dd/yyyy/mm
 #
 # 0: auto-detect the current locale format
 #    a separator has to be either '/', '-', '.' and the year in Chistian year
 #    otherwise mm/dd/yyyy (option 3) is used
 #
 mailnews.search_date_format=0
 # separator for search date (e.g. "/", "-"), or empty when search_date_format is zero
-mailnews.search_date_separator=
+mailnews.search_date_separator=/
 # leading zeros for day and month values, not used if mailnews.search_date_format is not zero
 mailnews.search_date_leading_zeros=true
 
 # offline msg 
 nocachedbodybody=El cos d'aquest missatge no s'ha baixat del servidor per a la seva\nlectura fora de línia. Per poder llegir-lo, torneu-vos a connectar\na la xarxa i seleccioneu Desconnexió / Treballa en línia del menú\nFitxer.\nD'ara endavant podeu seleccionar quins missatges o carpetes voleu\nllegir fora de línia. Per fer-ho, seleccioneu Fora de línia / \nSincronitza del menú Fitxer; podeu ajustar la preferència Espai de\ndisc per evitar la baixada de missatges grans.\n
 
 # accountCentral
 mailnews.account_central_page.url=chrome://messenger/content/msgAccountCentral.xul
 # LOCALIZATION NOTE(acctCentralTitleFormat): %1$S is brand, %2$S is account type, %3$S is account name
 acctCentralTitleFormat=%1$S %2$S - %3$S
 mailAcctType=Correu
 newsAcctType=Grups de discussió
+feedsAcctType=Canals
 
 # LOCALIZATION NOTE(nocachedbodytitle): Do not translate "<TITLE>" or "</TITLE>" in the line below
 nocachedbodytitle=<TITLE>Connecteu-vos per veure aquest missatge</TITLE>\n
 
 # mailWindowOverlay.js
 confirmUnsubscribeTitle=Confirmeu la cancel·lació de la subscripció
 confirmUnsubscribeText=Esteu segur que voleu cancel·lar la subscripció de %S?
 confirmUnsubscribeManyText=Segur que voleu cancel·lar la subscripció d'aquests grups de discussió?
--- a/mail/chrome/messenger/messengercompose/addressingWidgetOverlay.dtd
+++ b/mail/chrome/messenger/messengercompose/addressingWidgetOverlay.dtd
@@ -1,9 +1,9 @@
 <!-- address labels -->
 <!--LOCALIZATION NOTE addressingWidgetOverlay.dtd The basic mail/news composition headers as they are seen in UI -->
-<!ENTITY toAddr.label   "A:">
-<!ENTITY ccAddr.label   "Cc:">
-<!ENTITY bccAddr.label  "Cco:">
-<!ENTITY replyAddr.label   "Respon-A:">
-<!ENTITY newsgroupsAddr.label   "Grup de discussió:">
-<!ENTITY followupAddr.label   "Seguiment-A:">
+<!ENTITY toAddr.label   "A:"> 
+<!ENTITY ccAddr.label   "Cc:"> 
+<!ENTITY bccAddr.label  "Cco:"> 
+<!ENTITY replyAddr.label   "Respon-A:"> 
+<!ENTITY newsgroupsAddr.label   "Grup de discussió:"> 
+<!ENTITY followupAddr.label   "Seguiment-A:"> 
 
--- a/mail/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/chrome/messenger/messengercompose/composeMsgs.properties
@@ -269,17 +269,17 @@ 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=Adjunta uns fitxers amb %1$S
+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
@@ -363,43 +363,46 @@ 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
 
+# Strings used by the Filelink offer notification bar.
+learnMore.label=Learn More…
+learnMore.accesskey=m
 # 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=És un fitxer gran. Podria ser millor que empréssiu el Filelink.;Són fitxers grans. Podria ser millor que empréssiu el Filelink.
-bigFileShare.label=Enllaça
+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=Ignora
+bigFileAttach.label=Ignore
 bigFileAttach.accesskey=i
 
-bigFileChooseAccount.title=Trieu un compte
-bigFileChooseAccount.text=Trieu un compte al núvol per pujar-hi l'adjunció
+bigFileChooseAccount.title=Choose Account
+bigFileChooseAccount.text=Choose a cloud account to upload the attachment to
 
-bigFileHideNotification.title=No pugis els meus fitxers
-bigFileHideNotification.text=No se us notificarà si adjunteu més fitxers grans a aquest missatge.
-bigFileHideNotification.check=No em tornis a notificar més sobre això.
+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=S'està pujant a %S…
+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=S'ha pujat a %S
-cloudFileUploadingNotification=S'està enllaçant el fitxer. Apareixerà en el cos del missatge quan s'hagi fet.;S'estan enllaçant els fitxers. Apareixeran en el cos del missatge quan s'hagin fet.
-cloudFileUploadingCancel.label=Cancel·la
-cloudFileUploadingCancel.accesskey=C
+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:
@@ -408,57 +411,56 @@ smtpEnterPasswordPromptTitle=Contrasenya
 # 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=Error d'autenticació
+errorCloudFileAuth.title=Authentication Error
 ## LOCALIZATION NOTE(errorCloudFileAuth.message):
 ## %1$S is the name of the online storage service that authentication failed against.
-errorCloudFileAuth.message=No s'ha pogut autenticar amb %1$S.
-errorCloudFileUpload.title=Error de pujada
+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=No s'ha pogut pujar %2$S a %1$S.
-errorCloudFileQuota.title=Error de quota
+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=En pujar %2$S a %1$S s'excediria la vostra quota d'espai.
-errorCloudFileLimit.title=Error de mida del fitxer
+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 excedeix la mida màxima de %1$S.
-errorCloudFileOther.title=Error desconegut
+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=S'ha produït un error desconegut en comunicar amb %1$S.
-errorCloudFileDeletion.title=Error de supressió
+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=S'ha produït un problema en suprimir %2$S de %1$S.
+errorCloudFileDeletion.message=There was a problem deleting %2$S from %1$S.
 
-errorCloudFileUpgrade.label=Actualitza
+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=He enllaçat #1 fitxer al missatge:;He enllaçat #1 fitxers al missatge:
+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=El %1$S facilita compartir fitxers grans amb el correu electrònic.
+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) hostatjat a %3$S: %4$S
-
+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
@@ -1,13 +1,13 @@
 <!--LOCALIZATION NOTE messengercompose.dtd Main UI for message composition -->
 <!ENTITY msgComposeWindow.title "Redacta: (sense assumpte)">
 <!-- File Menu -->
 
-<!ENTITY fileMenu.label "Fitxer">
+<!ENTITY fileMenu.label "Fitxer"> 
 <!ENTITY fileMenu.accesskey "F">
 <!ENTITY newMenu.label "Nou">
 <!ENTITY newMenu.accesskey "N">
 <!ENTITY newMessage.label "Missatge">
 <!ENTITY newMessage.key "M">
 <!ENTITY newMessageCmd2.key "N">
 <!ENTITY newMessage.accesskey "M">
 <!ENTITY newContact.label "Contacte de la llibreta d'adreces…">
@@ -46,75 +46,75 @@
 <!ENTITY sendLaterCmd.accesskey "l">
 <!ENTITY printSetupCmd.label "Configuració de la pàgina…">
 <!ENTITY printSetupCmd.accesskey "g">
 <!ENTITY printCmd.label "Imprimeix…">
 <!ENTITY printCmd.key "P">
 <!ENTITY printCmd.accesskey "p">
 <!-- Edit Menu -->
 
-<!ENTITY editMenu.label "Edita">
+<!ENTITY editMenu.label "Edita"> 
 <!ENTITY editMenu.accesskey "E">
 <!ENTITY undoCmd.label "Desfés">
 <!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "D">
+<!ENTITY undoCmd.accesskey "D"> 
 <!ENTITY redoCmd.label "Refés">
 <!ENTITY redoCmd.key "Y">
-<!ENTITY redoCmd.accesskey "R">
+<!ENTITY redoCmd.accesskey "R"> 
 <!ENTITY cutCmd.label "Retalla">
 <!ENTITY cutCmd.key "X">
-<!ENTITY cutCmd.accesskey "t">
+<!ENTITY cutCmd.accesskey "t"> 
 <!ENTITY copyCmd.label "Copia">
 <!ENTITY copyCmd.key "C">
-<!ENTITY copyCmd.accesskey "C">
+<!ENTITY copyCmd.accesskey "C"> 
 <!ENTITY pasteCmd.label "Enganxa">
 <!ENTITY pasteCmd.key "V">
 <!ENTITY pasteCmd.accesskey "x">
 <!ENTITY pasteNoFormattingCmd.key "V">
 <!ENTITY pasteAsQuotationCmd.key "o">
 <!ENTITY editRewrapCmd.accesskey "j">
 <!ENTITY deleteCmd.label "Suprimeix">
 <!ENTITY deleteCmd.accesskey "u">
 <!ENTITY editRewrapCmd.label "Torna a ajustar">
 <!ENTITY editRewrapCmd.key "R">
 <!ENTITY renameAttachmentCmd.label "Canvia el nom del fitxer adjunt...">
 <!ENTITY renameAttachmentCmd.accesskey "e">
 <!ENTITY selectAllCmd.label "Selecciona-ho tot">
 <!ENTITY selectAllCmd.key "A">
-<!ENTITY selectAllCmd.accesskey "a">
+<!ENTITY selectAllCmd.accesskey "a"> 
 <!ENTITY findCmd.label "Cerca i reemplaça…">
 <!ENTITY findCmd.key "F">
 <!ENTITY findCmd.accesskey "m">
 <!ENTITY findAgainCmd.label "Torna a cercar">
 <!ENTITY findAgainCmd.key "G">
 <!ENTITY findAgainCmd.accesskey "o">
 <!ENTITY findAgainCmd.key2 "VK_F3">
 <!ENTITY findPrevCmd.label "Cerca l'anterior">
 <!ENTITY findPrevCmd.key "G">
 <!ENTITY findPrevCmd.key2 "VK_F3">
-<!ENTITY findPrevCmd.accesskey "n">
+<!ENTITY findPrevCmd.accesskey "n"> 
 <!-- View Menu -->
 
-<!ENTITY viewMenu.label "Visualitza">
+<!ENTITY viewMenu.label "Visualitza"> 
 <!ENTITY viewMenu.accesskey "V">
-<!ENTITY viewToolbarsMenuNew.label "Barres d'eines">
-<!ENTITY viewToolbarsMenuNew.accesskey "B">
+<!ENTITY viewToolbarsMenuNew.label "Barres d'eines"> 
+<!ENTITY viewToolbarsMenuNew.accesskey "B"> 
 <!ENTITY menubarCmd.label "Barra de menú">
 <!ENTITY menubarCmd.accesskey "m">
 <!ENTITY showCompositionToolbarCmd.label "Barra de redacció">
 <!ENTITY showCompositionToolbarCmd.accesskey "d">
 <!ENTITY showFormattingBarCmd.label "Barra de format">
 <!ENTITY showFormattingBarCmd.accesskey "f">
 <!ENTITY showTaskbarCmd.label "Barra d'estat">
 <!ENTITY showTaskbarCmd.accesskey "s">
 <!ENTITY customizeToolbar.label "Personalitza…">
 <!ENTITY customizeToolbar.accesskey "P">
 
-<!ENTITY addressSidebar.label "Barra lateral de contactes">
-<!ENTITY addressSidebar.accesskey "o">
+<!ENTITY addressSidebar.label "Barra lateral de contactes"> 
+<!ENTITY addressSidebar.accesskey "o"> 
 <!-- Format Menu -->
 
 <!ENTITY formatMenu.label "Format">
 <!ENTITY formatMenu.accesskey "o">
 <!-- Options Menu -->
 
 <!ENTITY optionsMenu.label "Opcions">
 <!ENTITY optionsMenu.accesskey "p">
@@ -172,57 +172,57 @@
 <!ENTITY addressBookCmd.accesskey "a">
 <!ENTITY addressBookCmd.key "B">
 <!ENTITY accountManagerCmd.label "Paràmetres dels comptes">
 <!ENTITY accountManagerCmd.accesskey "P">
 <!ENTITY accountManagerCmdUnix.accesskey "s">
 <!ENTITY preferencesCmd.label "Opcions…">
 <!ENTITY preferencesCmd.accesskey "O">
 <!ENTITY preferencesCmdUnix.label       "Preferències">
-<!ENTITY preferencesCmdUnix.accesskey   "n">
+<!ENTITY preferencesCmdUnix.accesskey   "n"> 
 <!--  Mac OS X Window Menu -->
 
 <!ENTITY minimizeWindow.key "m">
 <!ENTITY minimizeWindow.label "Minimitza la finestra">
 <!ENTITY bringAllToFront.label "Porta-ho tot al davant">
-<!ENTITY zoomWindow.label "Finestra del zoom">
+<!ENTITY zoomWindow.label "Finestra del zoom"> 
 <!ENTITY windowMenu.label "Finestra">
 <!-- Mail Toolbar -->
 
 <!ENTITY sendButton.label "Envia">
 <!ENTITY quoteButton.label "Cita">
 <!ENTITY addressButton.label "Adreça">
 <!ENTITY attachButton.label "Adjunta">
 <!ENTITY spellingButton.label "Ortografia">
 <!ENTITY saveButton.label "Desa">
 <!-- Mail Toolbar Tooltips -->
 
-<!ENTITY sendButton.tooltip "Envia ara aquest missatge">
-<!ENTITY sendlaterButton.tooltip "Envia aquest missatge més tard">
-<!ENTITY quoteButton.tooltip "Cita el missatge anterior">
-<!ENTITY addressButton.tooltip "Seleccioneu un destinatari d'una Llibreta d'adreces">
-<!ENTITY attachButton.tooltip "Adjunta un fitxer a aquest missatge">
+<!ENTITY sendButton.tooltip "Envia ara aquest missatge"> 
+<!ENTITY sendlaterButton.tooltip "Envia aquest missatge més tard"> 
+<!ENTITY quoteButton.tooltip "Cita el missatge anterior"> 
+<!ENTITY addressButton.tooltip "Seleccioneu un destinatari d'una Llibreta d'adreces"> 
+<!ENTITY attachButton.tooltip "Adjunta un fitxer a aquest missatge"> 
 <!ENTITY spellingButton.tooltip "Comprova l'ortografia de la selecció o del missatge sencer">
-<!ENTITY saveButton.tooltip "Desa aquest missatge">
+<!ENTITY saveButton.tooltip "Desa aquest missatge"> 
 <!ENTITY cutButton.tooltip              "Retalla">
 <!ENTITY copyButton.tooltip             "Copia">
 <!ENTITY pasteButton.tooltip            "Enganxa">
 <!-- Headers -->
 <!--LOCALIZATION NOTE headersSpace.style is for aligning  the From:, To: and
     Subject: rows. It should be larger than the largest Header label  -->
 
 <!ENTITY headersSpace.style "width: 9em;">
 <!ENTITY fromAddr.label "De:">
 <!ENTITY fromAddr.accesskey "D">
-<!ENTITY toAddr.label "A:">
-<!ENTITY ccAddr.label "Cc:">
-<!ENTITY bccAddr.label "Cco:">
-<!ENTITY replyAddr.label "Respon-A:">
-<!ENTITY newsgroupsAddr.label "Grup de discussió:">
-<!ENTITY followupAddr.label "Seguiment-A:">
+<!ENTITY toAddr.label "A:"> 
+<!ENTITY ccAddr.label "Cc:"> 
+<!ENTITY bccAddr.label "Cco:"> 
+<!ENTITY replyAddr.label "Respon-A:"> 
+<!ENTITY newsgroupsAddr.label "Grup de discussió:"> 
+<!ENTITY followupAddr.label "Seguiment-A:"> 
 <!ENTITY subject.label "Assumpte:">
 <!ENTITY subject.accesskey "s">
 <!-- LOCALIZATION NOTE attachments.accesskey This access key should correspond
      to the strings in attachmentCount in composeMsgs.properties -->
 <!ENTITY attachments.accesskey "j">
 <!-- Format Toolbar, imported from editorAppShell.xul -->
 
 <!ENTITY SmileButton.tooltip "Insereix una cara somrient">
@@ -269,21 +269,21 @@
 <!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 "Converteix a…">
+<!ENTITY convertCloud.label "Convert to…">
 <!ENTITY convertCloud.accesskey "C">
-<!ENTITY cancelUpload.label "Cancel·la la pujada">
+<!ENTITY cancelUpload.label "Cancel Upload">
 <!ENTITY cancelUpload.accesskey "n">
-<!ENTITY convertRegularAttachment.label "Adjunció regular">
+<!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/messengercompose/sendProgress.dtd
+++ b/mail/chrome/messenger/messengercompose/sendProgress.dtd
@@ -1,4 +1,4 @@
 <!--LOCALIZATION NOTE sendprogress.dtd Main UI for Send Message Progress Dialog -->
-<!ENTITY sendWindow.title "S'estan enviant els missatges">
+<!ENTITY sendWindow.title "S'estan enviant els missatges"> 
 <!ENTITY status.label "Estat:">
 <!ENTITY progress.label "Progrés:">
--- a/mail/chrome/messenger/mime.properties
+++ b/mail/chrome/messenger/mime.properties
@@ -158,29 +158,29 @@ 1040=Part %s
 # default forwarded message prefix
 ## @name MIME_FORWARDED_MESSAGE_HTML_USER_WROTE
 ## @loc 
 1041=-------- Missatge original --------
 
 # Partial Message Truncated
 ## @name MIME_MSG_PARTIAL_TRUNCATED
 ## @loc
-MIME_MSG_PARTIAL_TRUNCATED=Truncat!
+MIME_MSG_PARTIAL_TRUNCATED=Truncated!
 
 # Partial Message Truncated Explanation
 ## @name MIME_MSG_PARTIAL_TRUNCATED_EXPLANATION
 ## @loc
-MIME_MSG_PARTIAL_TRUNCATED_EXPLANATION=El missatge ha excedit la mida màxim de missatge definida als paràmetres de compte i, per tant, només s'han baixat les primeres poques línies del servidor de correu.
+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=No baixat
+MIME_MSG_PARTIAL_NOT_DOWNLOADED=Not Downloaded
 
 # Partial Message Not Downloaded Explanation
 ## @name MIME_MSG_PARTIAL_NOT_DOWNLOADED_EXPLANATION
 ## @loc
-MIME_MSG_PARTIAL_NOT_DOWNLOADED_EXPLANATION=Només s'han baixat les capçaleres del missatge del servidor de correu.
+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=Baixa la resta del missatge.
+MIME_MSG_PARTIAL_CLICK_FOR_REST=Download the rest of the message.
--- a/mail/chrome/messenger/msgAccountCentral.dtd
+++ b/mail/chrome/messenger/msgAccountCentral.dtd
@@ -1,20 +1,20 @@
 <!ENTITY emailSectionHdr.label        "Correu electrònic">
 <!ENTITY readMsgsLink.label           "Llegeix els missatges">
 <!ENTITY composeMsgLink.label         "Redacta un nou missatge">
 
 <!ENTITY newsSectionHdr.label         "Grups de discussió">
 <!ENTITY subscribeNewsLink.label      "Subscriu-me als grups de discussió">
 
+<!ENTITY feedsSectionHdr.label        "Canals">
+<!ENTITY subscribeFeeds.label         "Gestiona les subscripcions">
+
 <!ENTITY accountsSectionHdr.label     "Comptes">
 <!ENTITY subscribeImapFolders.label   "Gestiona les subscripcions de carpeta">
 <!ENTITY settingsLink.label           "Paràmetres d'aquest compte">
 <!ENTITY newAcctLink.label            "Crea un compte nou">
 
 <!ENTITY advFeaturesSectionHdr.label  "Característiques avançades">
 <!ENTITY searchMsgsLink.label         "Cerca missatges">
 <!ENTITY filtersLink.label            "Crea filtres de missatge">
 <!ENTITY junkSettings.label           "Paràmetres del correu brossa…">
 <!ENTITY offlineLink.label            "Paràmetres de fora de línia">
-
-<!ENTITY feedsSectionHdr.label        "Canals">
-<!ENTITY subscribeFeeds.label         "Gestiona les subscripcions">
--- a/mail/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/chrome/messenger/msgHdrViewOverlay.dtd
@@ -60,16 +60,18 @@
 <!ENTITY hdrArchiveButton1.tooltip "Arxiva aquest missatge">
 <!ENTITY hdrSmartReplyButton1.label "Resposta intel·ligent">
 <!ENTITY hdrReplyButton1.label "Respon">
 <!ENTITY hdrReplyButton1.tooltip "Respon a aquest missatge">
 <!ENTITY hdrReplyAllButton1.label "Respon a tots">
 <!ENTITY hdrReplyAllButton1.tooltip "Respon al remitent i a tots els destinataris">
 <!ENTITY hdrReplyListButton1.label "Respon a la llista">
 <!ENTITY hdrReplyListButton1.tooltip "Respon a la llista de correus">
+<!ENTITY hdrFollowupButton1.label "Followup">
+<!ENTITY hdrFollowupButton1.tooltip "Post a followup to this newsgroup">
 <!ENTITY hdrForwardButton1.label "Reenvia">
 <!ENTITY hdrForwardButton1.tooltip "Reenvia aquest missatge">
 <!ENTITY hdrJunkButton1.label "Brossa">
 <!ENTITY hdrJunkButton1.tooltip "Marca aquest missatge com a correu brossa">
 <!ENTITY hdrTrashButton1.label "Suprimeix">
 <!ENTITY hdrTrashButton1.tooltip "Suprimeix aquest missatge">
 
 <!ENTITY hdrViewToolbarShowFull.label "Mostra les icones i el text">
--- a/mail/chrome/messenger/newmailaccount/accountProvisioner.dtd
+++ b/mail/chrome/messenger/newmailaccount/accountProvisioner.dtd
@@ -1,10 +1,10 @@
 <!ENTITY window.title "Benvingut al &brandShortName;">
-<!ENTITY header2.label "Voleu una adreça electrònica nova?">
+<!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,22 +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.
-enterUserPassTitle=Cal el nom d'usuari i la contrasenya del servidor de grups de discussió
+enterUserPassTitle=News Server Username and Password Required
 # LOCALIZATION NOTE (enterUserPassServer): %S is the server being accessed
-enterUserPassServer=Introduïu un nom d'usuari i contrasenya per a %S:
+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=Introduïu un nom d'usuari i contrasenya per a %1$S a %2$S:
+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
@@ -13,22 +13,22 @@
 <!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   "Entrada">
-<!ENTITY attachments.outgoing.label   "Sortida">
+<!ENTITY attachments.incoming.label   "Incoming">
+<!ENTITY attachments.outgoing.label   "Outgoing">
 
-<!ENTITY addCloudFileAccount.label        "Afegeix">
+<!ENTITY addCloudFileAccount.label        "Add">
 <!ENTITY addCloudFileAccount.accesskey    "A">
-<!ENTITY addCloudFileAccount.description  "Afegeix un servei d'emmagatzemament Filelink nou">
-<!ENTITY removeCloudFileAccount.label     "Suprimeix">
-<!ENTITY removeCloudFileAccount.accesskey "r">
-<!ENTITY authRequired.description         "Cal la vostra autorització per veure els paràmetres d'aquest dispositiu d'emmagatzemament.">
-<!ENTITY authRequired.button.label        "Autoritza">
+<!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 "Ofereix compartir fitxer més grans de">
+<!ENTITY enableCloudFileAccountOffer.label "Offer to share for files larger than">
 <!ENTITY enableCloudFileAccountOffer.mb "MB">
--- a/mail/chrome/messenger/preferences/applications.properties
+++ b/mail/chrome/messenger/preferences/applications.properties
@@ -1,3 +1,3 @@
 # LOCALIZATION NOTE (dialog_removeAccount):
 # %S will be replaced with the user-defined name of a storage account.
-dialog_removeAccount=Esteu segur que voleu suprimir el compte «%S»?
+dialog_removeAccount=Are you sure you want to remove the account "%S"?
--- a/mail/chrome/messenger/preferences/chat.dtd
+++ b/mail/chrome/messenger/preferences/chat.dtd
@@ -1,20 +1,20 @@
-<!ENTITY  startupAction.label         "En iniciar el &brandShortName;:">
+<!ENTITY  startupAction.label         "When &brandShortName; starts:">
 <!ENTITY  startupAction.accesskey     "s">
-<!ENTITY  startupOffline.label        "Mantén el meus comptes de xat fora de línia">
-<!ENTITY  startupConnectAuto.label    "Connecta als meus comptes de xat automàticament">
+<!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         "Fes saber als meus contactes que estic absent després de">
-<!ENTITY  reportIdleAfter.accesskey     "b">
-<!ENTITY  idleTime                      "minuts d'inactivitat">
+<!ENTITY  reportIdleAfter.label         "Let my contacts know that I am Idle after">
+<!ENTITY  reportIdleAfter.accesskey     "I">
+<!ENTITY  idleTime                      "minutes of inactivity">
 
-<!ENTITY  andSetStatusToAway.label      "i posa el meu estat com a no disponibles amb el missatge d'estat:">
-<!ENTITY  andSetStatusToAway.accesskey  "n">
+<!ENTITY  andSetStatusToAway.label      "and set my status to Away with this status message:">
+<!ENTITY  andSetStatusToAway.accesskey  "A">
 
-<!ENTITY  sendTyping.label              "Envia notificacions de tecleig en les converses">
+<!ENTITY  sendTyping.label              "Send typing notifications in conversations">
 <!ENTITY  sendTyping.accesskey          "t">
--- a/mail/chrome/messenger/preferences/junkLog.dtd
+++ b/mail/chrome/messenger/preferences/junkLog.dtd
@@ -1,6 +1,6 @@
-<!ENTITY junkLog.title "Registre de correu brossa">
-<!ENTITY junkLogInfo.label "Registre del control d'activitat del correu brossa">
+<!ENTITY adaptiveJunkLog.title "Adaptive Junk Mail Log">
+<!ENTITY adaptiveJunkLogInfo.label "Log of adaptive junk mail control activity.">
 <!ENTITY clearLog.label "Buida el registre">
 <!ENTITY clearLog.accesskey "B">
 <!ENTITY closeLog.label "Tanca">
 <!ENTITY closeLog.accesskey "c">
--- a/mail/chrome/messenger/preferences/preferences.dtd
+++ b/mail/chrome/messenger/preferences/preferences.dtd
@@ -2,12 +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           "Xat">
+<!ENTITY paneChat.title           "Chat">
 <!ENTITY paneAttachments.title    "Adjuncions">
 <!ENTITY paneSecurity.title       "Seguretat">
 <!ENTITY paneAdvanced.title       "Avançat">
--- a/mail/chrome/messenger/preferences/security.dtd
+++ b/mail/chrome/messenger/preferences/security.dtd
@@ -9,18 +9,18 @@
 <!ENTITY manualMark.label "Quan marqui els missatges com a correu brossa:">
 <!ENTITY manualMark.accesskey "Q">
 <!ENTITY manualMarkModeMove.label "Passa'ls a la carpeta &quot;Correu brossa&quot; ">
 <!ENTITY manualMarkModeMove.accesskey "o">
 <!ENTITY manualMarkModeDelete.label "Suprimeix-los">
 <!ENTITY manualMarkModeDelete.accesskey "x">
 <!ENTITY markAsReadOnSpam.label "Marca els missatges determinats com a brossa com a llegits">
 <!ENTITY markAsReadOnSpam.accesskey "c">
-<!ENTITY enableJunkLogging.label "Habilita el registre del correu brossa">
-<!ENTITY enableJunkLogging.accesskey "g">
+<!ENTITY enableAdaptiveJunkLogging.label "Enable adaptive junk filter logging">
+<!ENTITY enableAdaptiveJunkLogging.accesskey "E">
 <!ENTITY openJunkLog.label "Mostra el registre">
 <!ENTITY openJunkLog.accesskey "t">
 <!ENTITY resetTrainingData.label "Reinicia les dades d'entrenament">
 <!ENTITY resetTrainingData.accesskey "d">
 <!-- Phishing Detector -->
 
 <!ENTITY phishingDetector1.intro  "El &brandShortName; pot analitzar els missatges sospitosos de ser fraudulents tenint en compte les tècniques més comunes d'engany.">
 <!ENTITY enablePhishingDetector1.label    "Digues-me si el missatge que estic llegint és sospitós de ser fraudulent">
--- a/mail/chrome/messenger/prefs.properties
+++ b/mail/chrome/messenger/prefs.properties
@@ -1,24 +1,30 @@
 # The following are used by the Account Wizard
 #
 enterValidEmail=Introduïu una adreça electrònica vàlida.
 accountExists=Ja existeix un compte de correu o de grups de discussió amb el mateix nom d'usuari i de servidor. Feu clic a Enrere i introduïu un altre nom de servidor o feu clic a Cancel·la.
 modifiedAccountExists=Ja existeix un compte amb aquests noms d'usuari i de servidor. Introduïu un altre nom d'usuari i/o de servidor.
 userNameChanged=S'ha actualitzat el vostre nom d'usuari. Potser també us caldrà actualitzar l'adreça electrònica i/o el nom d'usuari associats amb aquest compte.
 serverNameChanged=El paràmetre del nom del servidor ha canviat. Comproveu que totes les carpetes utilitzades pels filtres són al nou servidor.
+# LOCALIZATION NOTE (junkSettingsBroken): %1$S is the account name
+junkSettingsBroken=The Junk settings on account "%1$S" have a possible problem. Would you like to review them before saving Account Settings?
+# LOCALIZATION NOTE (localDirectoryChanged): %1$S is program name (&brandShortName;)
+localDirectoryChanged=%1$S needs to restart now to apply the change to the Local directory setting.
+localDirectoryRestart=Reinicia
+serverNameEmpty=Neither the server name nor the user name can be empty.
 # if the user chooses to cancel the wizard when no accounts are there throw a message
-# LOCALIZATION NOTE (cancelWizard) 
+# 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?)
-enterValidServerName=Introduïu un nom de servidor 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
@@ -16,62 +16,62 @@
 <!ENTITY  crash_send_report_message "Envia un informe de fallada a Mozilla">
 <!ENTITY  crash_include_url "Inclou l\'adreça de la pàgina">
 <!ENTITY  crash_close_label "Tanca">
 <!ENTITY  crash_restart_label "Reinicia el &brandShortName;">
 <!ENTITY  sending_crash_report "S\'està enviant un informe de fallada\u2026">
 <!ENTITY  exit_label "Surt">
 <!ENTITY  continue_label "Continua">
 
-<!ENTITY  launcher_shortcuts_title "&brandShortName; Aplicacions web">
+<!ENTITY  launcher_shortcuts_title "Aplicacions web del &brandShortName;">
 <!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 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">
 
 <!ENTITY new_tab "Pestanya nova">
 <!ENTITY new_tab_opened "S\'ha obert una pestanya nova">
 
 <!ENTITY settings "Opcions">
 <!ENTITY settings_title "Opcions">
 <!ENTITY pref_category_general "General">
-<!ENTITY pref_category_privacy "Privacitat i seguretat">
+<!ENTITY pref_category_privacy "Privadesa i seguretat">
 <!ENTITY pref_category_content "Contingut">
 <!ENTITY pref_about_firefox "Quant al &brandShortName;">
 <!ENTITY pref_do_not_track "Indica que no em segueixin">
 <!ENTITY pref_telemetry "Envia dades del rendiment">
 <!ENTITY pref_remember_signons "Recorda les contrasenyes">
 <!ENTITY pref_cookies "Habilita les galetes">
 <!ENTITY pref_char_encoding "Mostra la codificació">
 <!ENTITY pref_char_encoding_on "Mostra el menú">
 <!ENTITY pref_char_encoding_off "No mostris el menú">
 <!ENTITY pref_clear_history "Neteja l\'historial">
 <!ENTITY pref_clear_history_confirm "Es suprimirà l\'historial de navegació">
 <!ENTITY pref_clear_private_data "Neteja les dades privades">
 <!ENTITY pref_clear_private_data_confirm "Es suprimiran les opcions de navegació incloses les contrasenyes i les galetes.">
 <!ENTITY pref_plugins "Connectors">
 <!ENTITY pref_plugins_enabled "Habilitat">
-<!ENTITY pref_plugins_tap_to_play "Toqueu-ho per engegar">
+<!ENTITY pref_plugins_tap_to_play "Toqueu per engegar">
 <!ENTITY pref_plugins_disabled "Inhabilitat">
 <!ENTITY pref_text_size "Mida de la lletra">
 <!ENTITY pref_font_size_tiny "Molt petita">
 <!ENTITY pref_font_size_small "Petita">
 <!ENTITY pref_font_size_medium "Mitjana">
 <!ENTITY pref_font_size_large "Grossa">
 <!ENTITY pref_font_size_xlarge "Molt grossa">
 <!ENTITY pref_use_master_password "Contrasenya mestra">
@@ -88,17 +88,17 @@
 <!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_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.">
--- a/mobile/android/chrome/aboutApps.dtd
+++ b/mobile/android/chrome/aboutApps.dtd
@@ -1,8 +1,8 @@
-<!ENTITY aboutApps.title "Your Apps">
+<!ENTITY aboutApps.title "Les vostres aplicacions">
 <!-- LOCALIZATION NOTE (aboutApps.noApps.pre): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (aboutApps.noApps.middle): avoid leading/trailing spaces, this text is a link -->
 <!-- LOCALIZATION NOTE (aboutApps.noApps.post): include a starting space as needed -->
 
-<!ENTITY aboutApps.noApps.pre "No web apps installed. Get some from the ">
-<!ENTITY aboutApps.noApps.middle "app store">
+<!ENTITY aboutApps.noApps.pre "No s'ha instal·lat cap aplicació web. Aconseguiu-ne de ">
+<!ENTITY aboutApps.noApps.middle "la botiga d'aplicacions">
 <!ENTITY aboutApps.noApps.post ".">
--- a/mobile/android/chrome/browser.properties
+++ b/mobile/android/chrome/browser.properties
@@ -224,25 +224,25 @@ timer.start=%S: s'ha iniciat el temporit
 # This string is used to display the result of the console.timeEnd() call.
 # %1$S=name of timer, %2$S=number of milliseconds
 timer.end=%1$S: %2$Sms
 
 # Webapps
 webapps.installTitle=Instal·la l'aplicació
 
 # Click to play plugins
-clickToPlayPlugins.message1=%S contains plugin content. Would you like to play it?
+clickToPlayPlugins.message1=%S té contingut per a connectors. Voldríeu reproduir-lo?
 clickToPlayPlugins.yes=Sí
 clickToPlayPlugins.no=No
 # LOCALIZATION NOTE (clickToPlayPlugins.dontAskAgain): This label appears next to a
 # checkbox to indicate whether or not the user wants to make a permanent decision.
 clickToPlayPlugins.dontAskAgain=No tornis a demanar per aquest lloc
 # LOCALIZATION NOTE (clickToPlayPlugins.playPlugins): Label that
 # will be used in site settings dialog.
-clickToPlayPlugins.playPlugins=Play Plugins
+clickToPlayPlugins.playPlugins=Activa els connectors
 
 # Site settings dialog
 # LOCALIZATION NOTE (siteSettings.labelToValue): This string will be used to
 # dislay a list of current permissions settings for a site.
 # Example: "Store Offline Data: Allow"
 siteSettings.labelToValue=%S: %S
 
 masterPassword.incorrect=Contrasenya incorrecta
--- a/mobile/android/chrome/phishing.dtd
+++ b/mobile/android/chrome/phishing.dtd
@@ -6,17 +6,17 @@
 
 <!ENTITY safeb.palm.message.p2.start "Aquests tipus de falsificacions web s'utilitzen en enganys coneguts com atacs de pesca electrònica, en què s'utilitzen pàgines web i adreces electròniques fraudulentes que imiten les fonts en què podeu confiar. Podeu obtenir més informació sobre ">
 <!ENTITY safeb.palm.message.p2.linkText "com el &brandShortName; us protegeix">
 <!ENTITY safeb.palm.message.p2.end " dels atacs de pesca electrònica.">
 
 <!ENTITY safeb.palm.accept.label "Treu-me d'aquí!">
 <!ENTITY safeb.palm.accept.statustext "Navega cap a la meva pàgina d'inici">
 <!ENTITY safeb.palm.decline.label "Ignora aquest avís">
-<!ENTITY safeb.palm.decline.statustext "Tanca aquest avís">
+<!ENTITY safeb.palm.decline.statustext "Tanca aquest avís" >
 <!ENTITY safeb.palm.notforgery.label2 "No és cap falsificació web…">
 <!ENTITY safeb.palm.reportPage.label "Per què s'ha blocat aquest lloc?">
 
 <!ENTITY safeb.blocked.malwarePage.title "S'ha informat que el lloc web és atacant!">
 <!-- Localization note (safeb.blocked.malware.shortDesc) - Please don't translate the contents of the <span id="malware_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
 <!ENTITY safeb.blocked.malwarePage.shortDesc "S'ha informat que el lloc web a <span id='malware_sitename'/> seria atacant, i s'ha blocat d'acord amb les vostres preferències de seguretat.">
 <!ENTITY safeb.blocked.malwarePage.longDesc "<p>Els llocs atacants proven d'instal·lar programari que roba informació privada, utilitzen el vostre ordinador per atacar-ne d'altres, o fan malbé el vostre sistema.</p><p>Alguns llocs atacants distribueixen de forma intencionada programari maligne, tot i que molts estan compromesos sense el coneixement o permís dels propietaris.</p>">
 
--- a/mobile/xul/chrome/about.dtd
+++ b/mobile/xul/chrome/about.dtd
@@ -1,11 +1,11 @@
 <!ENTITY aboutPage.title                        "Quant al &brandShortName;">
 <!ENTITY aboutPage.warningVersion               "&brandShortName; és experimental i pot ser inestable.">
-<!ENTITY aboutPage.telemetryStart               " It automatically sends information about performance, hardware, usage and customizations back to ">
+<!ENTITY aboutPage.telemetryStart               " Envia automàticament informació sobre el rendiment, maquinari, ús i personalització a">
 <!ENTITY aboutPage.telemetryMozillaLink         "&vendorShortName;">
 <!ENTITY aboutPage.telemetryEnd                 " ajudeu a millorar &brandShortName;.">
 <!ENTITY aboutPage.faq.label                    "PMF">
 <!ENTITY aboutPage.support.label                "Assistència">
 <!ENTITY aboutPage.privacyPolicy.label          "Política de privadesa">
 <!ENTITY aboutPage.rights.label                 "Conegueu els vostres drets">
 <!ENTITY aboutPage.relNotes.label               "Notes de la versió">
 <!ENTITY aboutPage.credits.label                "Crèdits">
--- a/mobile/xul/chrome/phishing.dtd
+++ b/mobile/xul/chrome/phishing.dtd
@@ -6,17 +6,17 @@
 
 <!ENTITY safeb.palm.message.p2.start "Aquests tipus de falsificacions web s'utilitzen en enganys coneguts com atacs de pesca electrònica, en què s'utilitzen pàgines web i adreces electròniques fraudulentes que imiten les fonts en què podeu confiar. Podeu obtenir més informació sobre ">
 <!ENTITY safeb.palm.message.p2.linkText "com el &brandShortName; us protegeix">
 <!ENTITY safeb.palm.message.p2.end " dels atacs de pesca electrònica.">
 
 <!ENTITY safeb.palm.accept.label "Treu-me d'aquí!">
 <!ENTITY safeb.palm.accept.statustext "Navega cap a la meva pàgina d'inici">
 <!ENTITY safeb.palm.decline.label "Ignora aquest avís">
-<!ENTITY safeb.palm.decline.statustext "Tanca aquest avís">
+<!ENTITY safeb.palm.decline.statustext "Tanca aquest avís" >
 <!ENTITY safeb.palm.notforgery.label2 "No és cap falsificació web…">
 <!ENTITY safeb.palm.reportPage.label "Per què s'ha blocat aquest lloc?">
 
 <!ENTITY safeb.blocked.malwarePage.title "S'ha informat que el lloc web és atacant!">
 <!-- Localization note (safeb.blocked.malware.shortDesc) - Please don't translate the contents of the <span id="malware_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
 <!ENTITY safeb.blocked.malwarePage.shortDesc "S'ha informat que el lloc web a <span id='malware_sitename'/> seria atacant, i s'ha blocat d'acord amb les vostres preferències de seguretat.">
 <!ENTITY safeb.blocked.malwarePage.longDesc "<p>Els llocs atacants proven d'instal·lar programari que roba informació privada, utilitzen el vostre ordinador per atacar-ne d'altres, o fan malbé el vostre sistema.</p><p>Alguns llocs atacants distribueixen de forma intencionada programari maligne, tot i que molts estan compromesos sense el coneixement o permís dels propietaris.</p>">
 
--- a/suite/chrome/common/dataman/dataman.dtd
+++ b/suite/chrome/common/dataman/dataman.dtd
@@ -92,16 +92,17 @@
 <!ENTITY cookies.blockOnRemove.label "En suprimir, impedeix als llocs web llistats deixar galetes en un futur">
 <!ENTITY cookies.blockOnRemove.accesskey "w">
 <!-- permissions -->
 
 <!ENTITY perm.UseDefault "Utilitza els predeterminats">
 <!ENTITY perm.AskAlways "Demana-m'ho sempre">
 <!ENTITY perm.NeverSave "Mai ho desis">
 <!ENTITY perm.Allow "Permet">
+<!ENTITY perm.AllowSameDomain "Permetre pel mateix domini">
 <!ENTITY perm.AllowSession "Permet per a la sessió">
 <!ENTITY perm.Block "Bloca">
 
 <!ENTITY perm.host.placeholder "Introduïu un nom de servidor central">
 <!ENTITY perm.button.add.label "Afegeix">
 <!ENTITY perm.button.add.accesskey "A">
 <!-- preferences -->
 
--- a/suite/chrome/common/dataman/dataman.properties
+++ b/suite/chrome/common/dataman/dataman.properties
@@ -48,18 +48,22 @@ cookies.deleteSelectedTitle=Suprimeix le
 cookies.deleteSelectedYes=Sup&rimeix
 
 # permissions
 perm.allowXULXBL.label=Utilitza etiquetatge XUL/XBL
 perm.cookie.label=Estableix galetes
 perm.geo.label=Comparteix la ubicació
 perm.image.label=Carrega imatges
 perm.install.label=Instal·la complements
+perm.object.label=Executa els connectors
 perm.password.label=Desa contrasenyes
+perm.plugins.label=Activa els connectors
 perm.popup.label=Obre finestres emergents
+perm.script.label=Executa els scripts
+perm.stylesheet.label=Carrega les etiquetes d'estil
 
 perm.type.default=Seleccioneu un tipus
 
 # passwords
 pwd.hidePasswords=Amaga contrasenyes
 pwd.hidePasswords.accesskey=y
 pwd.showPasswords=Mostra contrasenyes
 pwd.showPasswords.accesskey=c
--- a/suite/chrome/common/notification.properties
+++ b/suite/chrome/common/notification.properties
@@ -23,16 +23,27 @@ blockedpluginsMessage.searchButton.acces
 
 crashedpluginsMessage.title=El connector %S ha fallat.
 crashedpluginsMessage.reloadButton.label=Torna a carregar la pàgina
 crashedpluginsMessage.reloadButton.accesskey=r
 crashedpluginsMessage.submitButton.label=Tramet un informe de fallada
 crashedpluginsMessage.submitButton.accesskey=T
 crashedpluginsMessage.learnMore=Més informació…
 
+activatepluginsMessage.title=Voleu activar els connectors en aquesta pàgina?
+activatepluginsMessage.activate.label=Activa els connectors
+activatepluginsMessage.activate.accesskey=A
+activatepluginsMessage.dismiss.label=No activis
+activatepluginsMessage.dismiss.accesskey=D
+activatepluginsMessage.remember=Recorda per aquest lloc
+activatepluginsMessage.always.label=Activa sempre els connectors per aquest lloc
+activatepluginsMessage.always.accesskey=c
+activatepluginsMessage.never.label=No activis mai els connectors per aquest lloc
+activatepluginsMessage.never.accesskey=N
+
 popupWarning=El %S ha evitat que el lloc web obri una finestra emergent.
 popupWarningMultiple=El %S ha evitat que el lloc web obri %S finestres emergents.
 popupWarningButton=Preferències
 popupWarningButton.accesskey=P
 
 xpinstallHostNotAvailable=servidor central desconegut
 xpinstallPromptWarning=El %S ha evitat que el lloc (%S) us demani instal·lar programari al vostre ordinador.
 xpinstallPromptInstallButton=Instal·la el programari…
--- a/suite/chrome/common/pref/pref-navigator.dtd
+++ b/suite/chrome/common/pref/pref-navigator.dtd
@@ -20,17 +20,17 @@
 <!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 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">
--- a/suite/chrome/mailnews/compose/messengercompose.dtd
+++ b/suite/chrome/mailnews/compose/messengercompose.dtd
@@ -110,22 +110,16 @@
 <!ENTITY sendButton.tooltip "Envia ara aquest missatge"> 
 <!ENTITY sendlaterButton.tooltip "Envia aquest missatge més tard"> 
 <!ENTITY addressButton.tooltip "Seleccioneu un destinatari d'una Llibreta d'adreces"> 
 <!ENTITY attachButton.tooltip "Adjunta un fitxer a aquest missatge"> 
 <!ENTITY saveButton.tooltip "Desa aquest missatge"> 
 <!ENTITY stopButton.tooltip "Atura la transferència actual"> 
 <!-- context menu items -->
 
-<!ENTITY spellCheckNoSuggestions.label "No s'ha trobat cap suggeriment">
-<!ENTITY spellCheckIgnoreWord.label "Ignora la paraula">
-<!ENTITY spellCheckIgnoreWord.accesskey "I">
-<!ENTITY spellCheckAddToDictionary.label "Afegeix al diccionari">
-<!ENTITY spellCheckAddToDictionary.accesskey "n">
-
 <!ENTITY openAttachment.label "Obre">
 <!ENTITY openAttachment.accesskey "O">
 <!ENTITY renameAttachment.label "Reanomena…">
 <!ENTITY renameAttachment.accesskey "R">
 <!ENTITY deleteAttachment.accesskey "u">
 <!ENTITY selectAllAttachments.accesskey "A">
 <!ENTITY attachFile.label "Adjunta un fitxer(s)...">
 <!ENTITY attachFile.accesskey "f">
--- a/suite/chrome/mailnews/imapMsgs.properties
+++ b/suite/chrome/mailnews/imapMsgs.properties
@@ -215,17 +215,17 @@ 5047=Introduïu la contrasenya per a %S:
 
 ## @name IMAP_SERVER_NOT_IMAP4
 ## @loc None
 # LOCALIZATION NOTE (Error 5048): Do not translate the word "IMAP4" below.
 5048=El servidor de correu %S no és IMAP4.
 
 ## @name IMAP_DONE
 ## @loc None
-5050=
+5050= 
 
 ## @name IMAP_ENTER_PASSWORD_PROMPT_TITLE
 ## @loc None
 5051=Cal una contrasenya per al servidor de correu
 
 ## @name IMAP_UNKNOWN_HOST_ERROR
 ## @loc None
 5052=No s'ha pogut connectar amb el servidor %S.
--- a/suite/chrome/mailnews/messenger.dtd
+++ b/suite/chrome/mailnews/messenger.dtd
@@ -148,17 +148,17 @@
 <!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 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/messenger.properties
+++ b/suite/chrome/mailnews/messenger.properties
@@ -160,17 +160,17 @@ serverType-none=Emmagatzematge local del
 serverType-movemail=Unix Movemail
 
 sizeColumnTooltip=Feu un clic per ordenar per mida
 sizeColumnHeader=Mida
 linesColumnTooltip=Feu clic per ordenar per línies
 linesColumnHeader=Línies
 
 # status feedback stuff
-documentDone=
+documentDone= 
 documentLoading=S'està carregant el document…
 
 unreadMsgStatus=Per llegir: %S
 selectedMsgStatus=Seleccionats: %S
 totalMsgStatus=Total: %S
 
 # localized folder names
 
@@ -291,29 +291,30 @@ mail.addr_book.show_phonetic_fields=fals
 # 6: dd/yyyy/mm
 #
 # 0: auto-detect the current locale format
 #    a separator has to be either '/', '-', '.' and the year in Chistian year
 #    otherwise mm/dd/yyyy (option 3) is used
 #
 mailnews.search_date_format=0
 # separator for search date (e.g. "/", "-"), or empty when search_date_format is zero
-mailnews.search_date_separator=
+mailnews.search_date_separator=/
 # leading zeros for day and month values, not used if mailnews.search_date_format is not zero
 mailnews.search_date_leading_zeros=true
 
 # offline msg 
 nocachedbodybody=El cos d'aquest missatge no s'ha baixat del servidor per a la seva\nlectura fora de línia. Per poder llegir-lo, torneu-vos a connectar\na la xarxa i seleccioneu Desconnexió / Treballa en línia del menú\nFitxer.\nD'ara endavant podeu seleccionar quins missatges o carpetes voleu\nllegir fora de línia. Per fer-ho, seleccioneu Fora de línia / \nSincronitza del menú Fitxer; podeu ajustar la preferència Espai de\ndisc per evitar la baixada de missatges grans.\n
 
 # accountCentral
 mailnews.account_central_page.url=chrome://messenger/content/msgAccountCentral.xul
 # LOCALIZATION NOTE(acctCentralTitleFormat): %1$S is brand, %2$S is account type, %3$S is account name
 acctCentralTitleFormat=%1$S %2$S - %3$S
 mailAcctType=Correu
 newsAcctType=Grups de discussió
+feedsAcctType=Notícies
 
 # LOCALIZATION NOTE(nocachedbodytitle): Do not translate "<TITLE>" or "</TITLE>" in the line below
 nocachedbodytitle=<TITLE>Connecteu-vos per veure aquest missatge</TITLE>\n
 
 # mailWindowOverlay.js
 confirmUnsubscribeTitle=Confirmeu la cancel·lació de la subscripció
 confirmUnsubscribeText=Esteu segur que voleu cancel·lar la subscripció de %S?
 
--- a/suite/chrome/mailnews/newsblog/am-newsblog.dtd
+++ b/suite/chrome/mailnews/newsblog/am-newsblog.dtd
@@ -1,10 +1,8 @@
-<!ENTITY accountTitle.label "Paràmetres del compte RSS">
-
 <!ENTITY biffStart.label "Comprova si hi ha nous articles cada ">
 <!ENTITY biffStart.accesskey "a">
 <!ENTITY biffEnd.label "minuts">
 
 <!ENTITY loginAtStartup.label "En iniciar, comprova si hi ha nous articles"> 
 <!ENTITY loginAtStartup.accesskey "i">
 
 <!ENTITY useQuickMode.label "Per defecte, mostra el resum de l'article en comptes de carregar la pàgina web"> 
--- a/suite/chrome/mailnews/newsblog/feed-subscriptions.dtd
+++ b/suite/chrome/mailnews/newsblog/feed-subscriptions.dtd
@@ -10,16 +10,17 @@
 <!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 quickMode.label             "Mostra el resum de l'article en comptes de carregar la pàgina web">
 <!ENTITY quickMode.accesskey         "t">
 
+<!ENTITY locationValidate.label      "Valida">
 <!ENTITY validateText.label          "Comprova la validació i recupera un URL vàlid.">
 
 <!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">
--- a/suite/chrome/mailnews/newsblog/newsblog.properties
+++ b/suite/chrome/mailnews/newsblog/newsblog.properties
@@ -1,19 +1,21 @@
 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-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-feedCopied=S'ha copiat la subscripció de noticies.
 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-loading=S'està carregant...
 
 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.
--- a/suite/chrome/mailnews/pref/am-server-top.dtd
+++ b/suite/chrome/mailnews/pref/am-server-top.dtd
@@ -1,10 +1,11 @@
 <!-- extracted from am-server-top.xul -->
 
+<!ENTITY messageStorage.label "Missatge d'emmagatzematge">
 <!ENTITY securitySettings.label "Paràmetres de seguretat">
 <!ENTITY serverSettings.label "Paràmetres del servidor">
 <!ENTITY serverType.label "Tipus de servidor:">
 <!ENTITY serverName.label "Nom del servidor:">
 <!ENTITY serverName.accesskey "s">
 <!ENTITY userName.label "Nom d'usuari:">
 <!ENTITY userName.accesskey "u">
 <!ENTITY port.label "Port:">
@@ -58,21 +59,24 @@
 -->
 <!ENTITY maxMessagesStart.label "Demana-m'ho abans de baixar més de">
 <!ENTITY maxMessagesStart.accesskey "m">
 <!-- LOCALIZATION NOTE (maxMessagesEnd.label) : see note for maxMessagesStart.label -->
 <!ENTITY maxMessagesEnd.label "missatges">
 <!ENTITY alwaysAuthenticate.label "Sol·licita sempre autenticació en connectar amb aquest servidor">
 <!ENTITY alwaysAuthenticate.accesskey "l">
 <!ENTITY newsrcFilePath.label "Fitxer newsrc:">
-<!ENTITY localPath.label "Directori local:">
+<!ENTITY newsrcPicker.label "Selecciona el fitxer newsrc">
 <!ENTITY abbreviate.label "Mostra els noms dels grups de discussió a la subfinestra de la carpeta de la Missatgeria com a:">
 <!ENTITY abbreviateOn.label "Noms sencers (per exemple, «netscape.public.mozilla.mail-news»)">
 <!ENTITY abbreviateOff.label "Noms abreujats (per exemple, «n.p.m.mail-news»)">
 <!ENTITY advancedButton.label "Avançat…">
 <!ENTITY serverDefaultCharset.label "Codificació de caràcters per defecte:">
 <!ENTITY advancedButton.accesskey "v">
+<!ENTITY localPath.label "Directori local:">
 <!ENTITY localFolderPicker.label "Seleccioneu el directori local">
 <!ENTITY browseFolder.label "Navega…">
 <!ENTITY browseFolder.accesskey "N">
-<!ENTITY newsrcPicker.label "Selecciona el fitxer newsrc">
 <!ENTITY browseNewsrc.label "Navega…">
 <!ENTITY browseNewsrc.accesskey "e">
+
+<!ENTITY accountTitle.label "Opcions del compte">
+<!ENTITY accountSettingsDesc.label "Aquest és un compte especial i no té ha cap identitat associada.">
--- a/suite/chrome/mailnews/pref/am-serverwithnoidentities.dtd
+++ b/suite/chrome/mailnews/pref/am-serverwithnoidentities.dtd
@@ -1,11 +1,2 @@
-<!ENTITY accountTitle.label "Paràmetres del compte">
-<!ENTITY accountSettingsDesc.label "El compte següent és especial; no hi ha cap identitat que hi estigui associada.">
 <!ENTITY accountName.label "Nom del compte:">
 <!ENTITY accountName.accesskey "N">
-<!ENTITY messageStorage.label "Emmagatzematge dels missatges">
-<!ENTITY emptyTrashOnExit.label "Buida la paperera en sortir">
-<!ENTITY emptyTrashOnExit.accesskey "B">
-<!ENTITY localPath.label "Directori local:">
-<!ENTITY localFolderPicker.label "Ubicació de les carpetes locals:">
-<!ENTITY browseFolder.label "Navega...">
-<!ENTITY browseFolder.accesskey "v">
--- a/suite/chrome/mailnews/pref/prefs.properties
+++ b/suite/chrome/mailnews/pref/prefs.properties
@@ -39,18 +39,24 @@
 #
 # The following are used by the Account Wizard
 #
 enterValidEmail=Introduïu una adreça electrònica vàlida.
 accountExists=Ja existeix un compte de correu o de grups de discussió amb el mateix nom d'usuari i de servidor. Feu clic a Enrere i introduïu un altre nom de servidor o feu clic a Cancel·la.
 modifiedAccountExists=Ja existeix un compte amb aquests noms d'usuari i de servidor. Introduïu un altre nom d'usuari i/o de servidor.
 userNameChanged=S'ha actualitzat el vostre nom d'usuari. Potser també us caldrà actualitzar l'adreça electrònica i/o el nom d'usuari associats amb aquest compte.
 serverNameChanged=El paràmetre del nom del servidor ha canviat. Comproveu que totes les carpetes utilitzades pels filtres són al nou servidor.
+# LOCALIZATION NOTE (junkSettingsBroken): %1$S is the account name
+junkSettingsBroken=Els paràmetres de brossa del compte «%1$S» tenen un problema possiblement. Voldríeu revisar-los abans de desar els paràmetres del compte?
+# LOCALIZATION NOTE (localDirectoryChanged): %1$S is program name (&brandShortName;)
+localDirectoryChanged=Cal reiniciar el %S ara per aplicar el canvi al paràmetre de directori local.
+localDirectoryRestart=Reinicia
+serverNameEmpty=Els camps del nom del servidor o de l'usuari son obligatoris.
 # if the user chooses to cancel the wizard when no accounts are there throw a message
-# LOCALIZATION NOTE (cancelWizard) 
+# 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?)
 enterValidServerName=Introduïu un nom de servidor vàlid.
 failedRemoveAccount=No s'ha pogut eliminar aquest compte.
--- a/toolkit/chrome/global/commonDialog.dtd
+++ b/toolkit/chrome/global/commonDialog.dtd
@@ -1,9 +1,9 @@
-<!ENTITY header.label     "Títol breu">
+<!ENTITY header.label     "Títol breu"> 
 <!ENTITY message.label    "Aquí hi van alguns texts de mostra.">
-<!ENTITY editfield0.label "Nom d'usuari:">
-<!ENTITY editfield1.label "Contrasenya:">
+<!ENTITY editfield0.label "Nom d'usuari:"> 
+<!ENTITY editfield1.label "Contrasenya:"> 
 <!ENTITY checkbox.label   "Comprova">
 <!ENTITY copyCmd.label    "Copia">
 <!ENTITY copyCmd.accesskey "C">
 <!ENTITY selectAllCmd.label "Selecciona-ho tot">
 <!ENTITY selectAllCmd.accesskey "a">
--- a/toolkit/chrome/global/config.dtd
+++ b/toolkit/chrome/global/config.dtd
@@ -49,18 +49,18 @@
 <!-- Columns -->
 
 <!ENTITY prefColumn.label "Nom de la preferència">
 <!ENTITY lockColumn.label "Estat">
 <!ENTITY typeColumn.label "Tipus">
 <!ENTITY valueColumn.label "Valor">
 <!-- Tooltips -->
 
-<!ENTITY prefColumnHeader.tooltip "Feu clic per ordenar">
-<!ENTITY columnChooser.tooltip "Feu un clic per seleccionar les columnes a visualitzar">
+<!ENTITY prefColumnHeader.tooltip "Feu clic per ordenar"> 
+<!ENTITY columnChooser.tooltip "Feu un clic per seleccionar les columnes a visualitzar"> 
 <!-- Context Menu -->
 
 <!ENTITY copyPref.key "C">
 <!ENTITY copyPref.label "Copia">
 <!ENTITY copyPref.accesskey "C">
 <!ENTITY copyName.label "Copia el nom">
 <!ENTITY copyName.accesskey "n">
 <!ENTITY copyValue.label "Copia el valor">
--- a/toolkit/chrome/global/console.dtd
+++ b/toolkit/chrome/global/console.dtd
@@ -51,18 +51,18 @@
 <!ENTITY messages.accesskey "M">
 <!ENTITY clear.label        "Esborra">
 <!ENTITY clear.accesskey    "E">
 <!ENTITY codeEval.label     "Codi:">
 <!ENTITY codeEval.accesskey "o">
 <!ENTITY evaluate.label     "Avalua">
 <!ENTITY evaluate.accesskey "v">
 
-<!ENTITY copyCmd.label       "Copia">
-<!ENTITY copyCmd.accesskey   "C">
-<!ENTITY copyCmd.commandkey  "C">
+<!ENTITY copyCmd.label       "Copia">  
+<!ENTITY copyCmd.accesskey   "C"> 
+<!ENTITY copyCmd.commandkey  "C"> 
 <!ENTITY sortFirst.label     "Ordre: del primer a l'últim">
 <!ENTITY sortFirst.accesskey "p">
 <!ENTITY sortLast.label      "Ordre: de l'últim al primer">
 <!ENTITY sortLast.accesskey  "l">
-<!ENTITY closeCmd.commandkey "w">
-<!ENTITY focus1.commandkey   "l">
-<!ENTITY focus2.commandkey   "d">
+<!ENTITY closeCmd.commandkey "w">  
+<!ENTITY focus1.commandkey   "l">  
+<!ENTITY focus2.commandkey   "d">  
--- a/toolkit/chrome/global/printPreviewProgress.dtd
+++ b/toolkit/chrome/global/printPreviewProgress.dtd
@@ -1,5 +1,5 @@
 <!--LOCALIZATION NOTE printPreviewProgress.dtd Main UI for Print Preview Progress Dialog -->
-<!ENTITY printWindow.title "Exemple d'impressió">
-<!ENTITY title   "Títol:">
+<!ENTITY printWindow.title "Exemple d'impressió"> 
+<!ENTITY title   "Títol:"> 
 <!ENTITY preparing "S'està preparant…">
 <!ENTITY progress "Progrés:">
--- a/toolkit/chrome/global/printProgress.dtd
+++ b/toolkit/chrome/global/printProgress.dtd
@@ -1,16 +1,16 @@
 <!--LOCALIZATION NOTE printProgress.dtd Main UI for Print Progress Dialog -->
-<!ENTITY printWindow.title "S'està imprimint">
-<!ENTITY title    "Títol:">
+<!ENTITY printWindow.title "S'està imprimint"> 
+<!ENTITY title    "Títol:"> 
 <!ENTITY progress "Progrés:">
 <!ENTITY preparing "S'està preparant…">
 <!ENTITY printComplete "Ha finalitzat la impressió.">
 
-<!ENTITY dialogCancel.label "Cancel·la">
+<!ENTITY dialogCancel.label "Cancel·la"> 
 <!ENTITY dialogClose.label "Tanca">
 <!-- LOCALIZATION NOTE (percentPrint):
 
     This string is used to format the text to the right of the progress
     meter.
 
     #1 will be replaced by the percentage of the file that has been saved -->
 
--- a/toolkit/chrome/global/viewSource.dtd
+++ b/toolkit/chrome/global/viewSource.dtd
@@ -42,17 +42,17 @@ you can use these alternative items. Oth
 <!ENTITY goToLineCmd.accesskey "l">
 <!ENTITY goToLineCmd.commandkey "l">
 
 <!ENTITY viewMenu.label           "Visualitza">
 <!ENTITY viewMenu.accesskey       "V">
 <!ENTITY reloadCmd.label "Actualitza">
 <!ENTITY reloadCmd.accesskey "z">
 <!ENTITY reloadCmd.commandkey "r">
-<!ENTITY menu_wrapLongLines.title "Ajusta les línies llargues">
+<!ENTITY menu_wrapLongLines.title "Ajusta les línies llargues"> 
 <!ENTITY menu_wrapLongLines.accesskey "r">
 <!ENTITY menu_highlightSyntax.label "Ressaltat de sintaxis">
 <!ENTITY menu_highlightSyntax.accesskey "s">
 <!ENTITY menu_textSize.label "Mida del text">
 <!ENTITY menu_textSize.accesskey "M">
 <!ENTITY menu_textEnlarge.label "Augmenta">
 <!ENTITY menu_textEnlarge.accesskey "g">
 <!ENTITY menu_textReduce.label "Redueix">
--- a/toolkit/chrome/mozapps/downloads/downloads.dtd
+++ b/toolkit/chrome/mozapps/downloads/downloads.dtd
@@ -1,13 +1,13 @@
 <!-- LOCALIZATION NOTE (window.width2, window.height): These values should be
 close to the golden ratio (1.618:1) while making sure it's wide enough for long
 file names and tall enough to hint that there are more downloads in the list -->
 <!ENTITY window.width2                    "500">
-<!ENTITY window.height                    "300">
+<!ENTITY window.height                    "300"> 
 
 <!ENTITY starting.label                   "S'està iniciant…">
 <!ENTITY scanning.label                   "S'està escanejant si hi ha virus…">
 
 <!ENTITY downloads.title                  "Baixades">
 
 <!ENTITY cmd.pause.label                  "Pausa">
 <!ENTITY cmd.pause.accesskey              "a">
--- a/toolkit/chrome/mozapps/help/help.dtd
+++ b/toolkit/chrome/mozapps/help/help.dtd
@@ -32,17 +32,17 @@ fullZoomResetCmd.commandkey2 are alterna
 If shift key is needed with your locale popular keyboard for them,
 you can use these alternative items. Otherwise, their values should be empty.  -->
 
 
 <!ENTITY fullZoomReduceCmd.commandkey   "-">
 <!ENTITY fullZoomReduceCmd.commandkey2  "">
 <!ENTITY fullZoomEnlargeCmd.commandkey  "+">
 <!-- + is above this key on many keyboards -->
-<!ENTITY fullZoomEnlargeCmd.commandkey2 "=">
+<!ENTITY fullZoomEnlargeCmd.commandkey2 "="> 
 <!ENTITY fullZoomEnlargeCmd.commandkey3 "">
 <!ENTITY fullZoomResetCmd.commandkey    "0">
 <!ENTITY fullZoomResetCmd.commandkey2   "">
 
 <!ENTITY helpSearch.commandkey          "k">
 
 <!ENTITY zLevel.label                   "Sempre a dalt">
 <!ENTITY zLevel.accesskey               "t">