mail update with wmImportMsgs.properties and quickFilterBar.dtd
authorQuim Perez Noguer <noguer@gmail.com>
Mon, 26 Apr 2010 16:52:12 +0200
changeset 206 0970cb971cae0142452449a5264df849d43215d0
parent 205 65380500666aaf56d636b32c6db120de24ce295e
child 207 3cd6d34bc7ae211f9ac038a2d99ab1de9dc64346
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:43:21 +0000
mail update with wmImportMsgs.properties and quickFilterBar.dtd
mail/chrome/messenger/accountCreation.dtd
mail/chrome/messenger/accountCreationUtil.properties
mail/chrome/messenger/featureConfigurator.dtd
mail/chrome/messenger/folderProps.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/quickSearch.properties
--- a/mail/chrome/messenger/accountCreation.dtd
+++ b/mail/chrome/messenger/accountCreation.dtd
@@ -17,16 +17,19 @@
 <!ENTITY outgoing.label                  "Entrada:">
 <!ENTITY noEncryption.label              "Cap">
 <!ENTITY starttls.label                  "STARTTLS">
 <!ENTITY sslTls.label                    "SSL/TLS">
 
 <!ENTITY imap.label                      "IMAP">
 <!ENTITY pop.label                       "POP">
 <!ENTITY smtp.label                      "SMTP">
+<!ENTITY imap.description                "IMAP - Accediu a les carpetes i als missatges des de diversos ordinadors">
+<!ENTITY pop.description                 "POP - Baixeu-vos tots els missatges a aquest ordinador, les carpetes només són locals">
+<!ENTITY recommended-appendix.label      "(recomanat)">
 
 <!ENTITY manualSetup.label               "Configuració manual…">
 <!ENTITY manualSetup.accesskey           "m">
 <!ENTITY cancel.label                    "Canceŀla">
 <!ENTITY cancel.accesskey                "n">
 <!ENTITY continue.label                  "Continua">
 <!ENTITY continue.accesskey              "C">
 <!ENTITY startOver.label                 "Torna a començar">
--- a/mail/chrome/messenger/accountCreationUtil.properties
+++ b/mail/chrome/messenger/accountCreationUtil.properties
@@ -13,8 +13,19 @@ boolean.error=No és un camp booleà
 no_number.error=No és un camp numèric
 number_too_large.error=El número és massa gran
 number_too_small.error=El número és massa petit
 
 
 # fetchhttp.js
 cannot_contact_server.error=No s'ha trobat el servidor
 bad_response_content.error=El servidor ha tornat una resposta incorrecta
+
+
+# verifyConfig.js
+# LOCALIZATION NOTE(auth_failed_generic.error): The login failed (server refused to allow the user in), but the server did not give any meaningful error message. This is a common case when the user entered a wrong password or is otherwise not allowed.
+auth_failed_generic.error=La identificació ha fallat. Potser l'usuari, l'adreça de correu o la contrasenya no són correctes?
+# LOCALIZATION NOTE(auth_failed_with_reason.error): The login failed (server refused to allow the user in), and the server gave an error message which we can present to the user. This is a common case when the user entered a wrong password or is otherwise not allowed. %1$S will be the IMAP/POP3/SMTP server hostname. %2$S will be the error message from the server (usually in the local language where the server is or in English).
+auth_failed_with_reason.error=La identificació ha fallat. El servidor %1$S ha respost: %2$S
+# LOCALIZATION NOTE(verification_failed.error): We had some other error, not during authentication with the server, but at earlier points, e.g. locally or we entirely failed to contact the given server, and we unfortunately have no detailed error message.
+verification_failed.error=La verificació de la identitat ha fallat per una causa desconeguda.
+# LOCALIZATION NOTE(verification_failed_with_exception.error): We had some other error, not during authentication with the server, but at earlier points, e.g. locally or we entirely failed to contact the given server, and we have an error message. %1$S will be an error message, possibly in English
+verification_failed_with_exception.error=La verificació de la identitat ha fallat: %1$S
--- a/mail/chrome/messenger/featureConfigurator.dtd
+++ b/mail/chrome/messenger/featureConfigurator.dtd
@@ -1,115 +1,89 @@
-<!-- LOCALIZATION NOTE (featureConfigurator.title): Title for the
-Migration Assistant page. It should match featureConfiguratorCmd.label in
-baseMenuOverlay.dtd -->
+<!-- LOCALIZATION NOTE (featureConfigurator.title): Title for the Migration Assistant page. It should match featureConfiguratorCmd.label in baseMenuOverlay.dtd -->
 <!ENTITY featureConfigurator.title "Assistent de migració">
 
-<!-- LOCALIZATION NOTE (featureConfigurator.heading): Heading for the page -->
-<!ENTITY featureConfigurator.heading "Les millores del Thunderbird 3 que val la pena saber">
+<!-- LOCALIZATION NOTE (featureConfigurator.heading1): Heading for the page -->
+<!ENTITY featureConfigurator.heading1 "Les millores del &brandShortName; que val la pena saber">
 
-<!-- LOCALIZATION NOTE (featureConfigurator.para1): The tone of this paragraph
-is important: we tried for a tone that promotes the new features (which we
-believe are good and worth users learning about), but also emphasizing that we
-think it's important to preserve user choice. -->
-<!ENTITY featureConfigurator.para1 "El Thunderbird 3 inclou novetats potents de les quals n'estem ben orgullosos, i alhora també pensem que seran molt apreciades. Les necessitats i les preferències de la gent varia, per tant, hem fet que el Thunderbird sigui fàcil de controlar i personalitzar.">
+<!-- LOCALIZATION NOTE (featureConfigurator.para.1): The tone of this paragraph is important: we tried for a tone that promotes the new features (which we believe are good and worth users learning about), but also emphasizing that we think it's important to preserve user choice. -->
+<!ENTITY featureConfigurator.para.1 "El nou &brandShortName; inclou novetats potents de les quals n'estem ben orgullosos, i alhora també pensem que seran molt apreciades. Les necessitats i les preferències de la gent varia, per tant, hem fet que el &brandShortName; sigui fàcil de controlar i personalitzar.">
+
+<!-- LOCALIZATION NOTE (featureConfigurator.para.2): This paragraph explains that this page is active (the buttons change the UI), and that they can get back to it if they change their mind later.-->
+<!ENTITY featureConfigurator.para.2 "Utilitzeu aquesta pàgina per a configurar aquestes noves opcions. Podreu tornar a accedir a l'Assistent de migració des del menú Ajuda.">
 
-<!-- LOCALIZATION NOTE (featureConfigurator.para2): This paragraph explains
-that this page is active (the buttons change the UI), and that they can get
-back to it if they change their mind later.-->
-<!ENTITY featureConfigurator.para2 "Utilitzeu aquesta pàgina per a configurar aquestes noves opcions. Podreu tornar a accedir a l'Assistent de migració des del menú Ajuda.">
+<!ENTITY featureConfigurator.toolbar.heading "Barra d'eines per a missatges nova">
+<!ENTITY featureConfigurator.toolbar.new.status "Barra d'eines de botons per a missatges">
+<!ENTITY featureConfigurator.toolbar.new.status.explanation "Una barra d'eines buida amb tots els botons per a missatges al vostre abast.">
 
-<!-- LOCALIZATION NOTE (featureConfigurator.imap.heading): Heading for the
-IMAP synchronization feature. The words should probably echo the word used
-in the per-account dialog.-->
-<!ENTITY featureConfigurator.imap.heading "Sincronitza els missatges IMAP">
+<!-- LOCALIZATION NOTE (featureConfigurator.toolbar.original.status): The word 'original' is chosen deliberately to be neutral, vs. 'old' which in English at least had a negative connotation.-->
+<!ENTITY featureConfigurator.toolbar.original.status "Mantén els botons de la vostra barra d'eines original">
+<!ENTITY featureConfigurator.toolbar.original.status.explanation "Mantén tots els botons personalitzats a més a més dels nous botons per a missatges.">
 
-<!ENTITY featureConfigurator.imap.status.all "Es &quot;sincronitzaran&quot; totes les vostres carpetes IMAP.">
-
-<!ENTITY featureConfigurator.imap.status.none "No es &quot;sincronitzarà&quot; cap de les vostres carpetes IMAP.">
-
-<!ENTITY featureConfigurator.imap.status.some "Es &quot;sincronitzaran&quot; algunes de les vostres carpetes IMAP.">
+<!ENTITY featureConfigurator.toolbarBenefits.para "Les accions com respondre i avançar s'han mogut de la barra d'eines i de la capçalera del missatge. Ara aquestes accions estan dins el missatge mateix, de manera que hi ha més espai buit a la barra d'eines per posar-hi un quadre de cerca avançat o diversos complements.">
 
-<!-- LOCALIZATION NOTE (featureConfigurator.benefits.label): The heading here
-is intended to explain why we've implemented this and picked it as a default.-->
-<!ENTITY featureConfigurator.benefits.label "Beneficis">
+<!-- LOCALIZATION NOTE (featureConfigurator.addOn.installing): The text to display while installing the addon. -->
+<!ENTITY featureConfigurator.addOn.installing "S'està instaŀlant…">
+
+<!-- LOCALIZATION NOTE (featureConfigurator.addOn.installed): The text to display after the user installs the addon from the configurator. -->
+<!ENTITY featureConfigurator.addOn.installed "S'ha instaŀlat">
 
-<!-- LOCALIZATION NOTE (featureConfigurator.alternative.label): The heading here
-is intended to explain why it might not be the right default for some users.-->
-<!ENTITY featureConfigurator.alternative.label "Alternatiu">
+<!-- LOCALIZATION NOTE (featureConfigurator.addOn.alreadyInstalled): The label to display when the addon is already installed. -->
+<!ENTITY featureConfigurator.addOn.alreadyInstalled "Aquesta extensió ja està instaŀlada.">
 
-<!ENTITY featureConfigurator.syncBenefits.para "Us permet llegir el correu quan no esteu connectats a Internet, i us permet trobar els missatges cercant dins del text, a més a més de cercar en l'assumpte i en els contactes.">
-<!ENTITY featureConfigurator.syncAlternative.para "El Thunderbird es baixarà tot el vostre correu a l'ordinador. Desactiveu aquesta opció quan aneu justos d'espai de disc, o hàgiu de pagar depenent de l'ample de banda de la xarxa utilitzat.">
+<!-- LOCALIZATION NOTE (featureConfigurator.collapsedHeaders.heading): The heading for the Compact Header page. -->
+<!ENTITY featureConfigurator.collapsedHeaders.heading "Resum de capçaleres">
 
-<!-- LOCALIZATION NOTE (featureConfigurator.syncAll.button): The choice of
-lower case is intentional, but may be overriden if that doesn't make sense
-because of a specific language context.-->
-<!ENTITY featureConfigurator.syncAll.button "sincronitza-ho tot">
+<!-- LOCALIZATION NOTE (featureConfigurator.collapsedHeaders.para.weak): The paragraph to display if the user hadn't previously used the collapsed headers feature. -->
+<!ENTITY featureConfigurator.collapsedHeaders.para.weak "El resum de capçaleres s'ha mogut a una extensió diferent ja que ara disposa de moltes més opcions.">
+
+<!-- LOCALIZATION NOTE (featureConfigurator.collapsedHeaders.para.strong): The paragraph to display if the user had previously used the collapsed headers feature. -->
+<!ENTITY featureConfigurator.collapsedHeaders.para.strong "Esteu utilitzant el resum de capçaleres. Aquesta funcionalitat s'ha mogut a una extensió diferent. Si voleu continuar utilitzant aquesta funcionalitat instaŀleu-vos l'extensió ara.">
 
-<!-- LOCALIZATION NOTE (featureConfigurator.syncNone.button): The choice of
-lower case is intentional, but may be overriden if that doesn't make sense
-because of a specific language context.-->
-<!ENTITY featureConfigurator.syncNone.button "no sincronitzis res">
+<!-- LOCALIZATION NOTE (featureConfigurator.collapsedHeaders.install): The text for the button that will install the Compact Headers addon. -->
+<!ENTITY featureConfigurator.collapsedHeaders.install "Instaŀla el resum de capçaleres…">
 
-<!ENTITY featureConfigurator.advancedUsers.label "Usuaris avançats:">
-<!ENTITY featureConfigurator.advancedUsers.para "També ho podeu configurar per compte i per carpeta:">
-
-<!ENTITY featureConfigurator.toolbar.heading "Barra d'eines nova">
-<!ENTITY featureConfigurator.toolbar.new.status "Utilitza la nova barra d'eines.">
+<!-- LOCALIZATION NOTE (featureConfigurator.folderColumns.heading): The heading for the Folder Columns page. -->
+<!ENTITY featureConfigurator.folderColumns.heading "Columnes de carpeta avançades">
 
-<!-- LOCALIZATION NOTE (featureConfigurator.toolbar.original.status): The
-word 'original' is chosen deliberately to be neutral, vs. 'old' which in
-English at least had a negative connotation.-->
-<!ENTITY featureConfigurator.toolbar.original.status "Utilitza la barra d'eines original.">
+<!-- LOCALIZATION NOTE (featureConfigurator.folderColumns.para.weak): The paragraph to display if the user hadn't previously used the folder columns feature. -->
+<!ENTITY featureConfigurator.folderColumns.para.weak "L'extensió Columnes extres substitueix el que abans era una opció avançada. Si voleu saber el nombre exacte de missatges de cada carpeta i l'espai de disc que ocupen, us agradarà aquesta extensió.">
 
-<!ENTITY featureConfigurator.toolbarBenefits.para "Una interfície més neta que la vostra predefinida anterior, que us deixa més espai per al camp de cerca, i per a altres complements.">
-<!ENTITY featureConfigurator.toolbarAlternative.para "Si us agradava més la barra d'eines de la configuració anterior, si no la voleu tornar a personalitzar, o bé si no utilitzeu la subfinestra de missatges.">
+<!-- LOCALIZATION NOTE (featureConfigurator.folderColumns.para.strong): The paragraph to display if the user had previously used the folder columns feature. -->
+<!ENTITY featureConfigurator.folderColumns.para.strong "Esteu utilitzant les Columnes de carpeta avançades. Aquesta funcionalitat s'ha mogut a una extensió diferent. Si voleu continuar utilitzant aquesta funcionalitat instaŀleu-vos l'extensió ara.">
 
-<!-- LOCALIZATION NOTE (featureConfigurator.useOriginalToolbar.button): The
-choice of lower case is intentional, but may be overriden if that doesn't make
-sense because of a specific language context.-->
-<!ENTITY featureConfigurator.useOriginalToolbar.button "utilitza la barra d'eines original">
+<!-- LOCALIZATION NOTE (featureConfigurator.folderColumns.install): The text for the button that will install the Extra Folder Columns addon. -->
+<!ENTITY featureConfigurator.folderColumns.install "Instaŀla les Columnes extres…">
 
-<!-- LOCALIZATION NOTE (featureConfigurator.useNewToolbar.button): The
-choice of lower case is intentional, but may be overriden if that doesn't make
-sense because of a specific language context.-->
-<!ENTITY featureConfigurator.useNewToolbar.button "utilitza la nova barra d'eines">
+<!-- LOCALIZATION NOTE (featureConfigurator.autoSync.heading): The heading for the Disk space page. -->
+<!ENTITY featureConfigurator.autoSync.heading "Espai de disc">
 
-<!-- LOCALIZATION NOTE (featureConfigurator.unifiedFolders.heading): The
-words here should echo the name of the mode shown in the folder pane.-->
-<!ENTITY featureConfigurator.unifiedFolders.heading "Mode Carpetes unificades">
+<!-- LOCALIZATION NOTE (featureConfigurator.autoSync.para): The paragraph that explains why the user would want to turn on autosync. -->
+<!ENTITY featureConfigurator.autoSync.para "Aquesta nova versió del &brandShortName; porta una nova funcionalitat de cerca. Per provar aquest nou sistema de cerca cal que sincronitzeu els vostres missatges.">
 
-<!-- LOCALIZATION NOTE (featureConfigurator.unifiedFolders.smart.status): This
-shows that the current mode in the folder pane is the Unified Folders mode.-->
-<!ENTITY featureConfigurator.unifiedFolders.smart.status "S'està utilitzant el mode de &quot;carpetes unificades&quot;.">
+<!-- LOCALIZATION NOTE (featureConfigurator.autoSync.on): The label for the radio button for synchronizing all the accounts. -->
+<!ENTITY featureConfigurator.autoSync.on "Sincronitza">
+<!ENTITY featureConfigurator.autoSync.on.explanation "Notareu que els missatges es carreguen  més ràpidament i les cerques funcionen millor.">
 
-<!-- LOCALIZATION NOTE (featureConfigurator.unifiedFolders.all.status): This
-shows that the current mode in the folder pane is not the Unified Folders mode.-->
-<!ENTITY featureConfigurator.unifiedFolders.all.status "No s'està utilitzant el mode de &quot;carpetes unificades&quot;.">
+<!-- LOCALIZATION NOTE (featureConfigurator.autoSync.off): The label for the radio button that will synchronize none of the accounts. -->
+<!ENTITY featureConfigurator.autoSync.off "No sincronitzis">
+<!ENTITY featureConfigurator.autoSync.off.explanation "Això pot significar que els missatges es carreguin més lentament o que les cerques no siguin exactes.">
 
-<!ENTITY featureConfigurator.unifiedFolderBenefits.para "Per als usuaris amb diversos comptes, això agrupa les carpetes i posa les Safates d'entrada juntes, perquè així obteniu una visió consolidada de tot el vostre correu.">
-<!ENTITY featureConfigurator.unifiedFolderAlternative.para "Si preferiu no barrejar la informació dels vostres comptes aleshores millor que poseu el mode &quot;Totes les carpetes&quot;.">
+<!-- LOCALIZATION NOTE (featureConfigurator.autoSync.some): The label for the radio button that will let you customize the synchronize for each account. -->
+<!ENTITY featureConfigurator.autoSync.some "Sincronització per cada compte">
+<!ENTITY featureConfigurator.autoSync.some.explanation "Personalitzeu la sincronització de cada compte o carpeta segons les vostres necessitats.">
 
-<!-- LOCALIZATION NOTE (featureConfigurator.useUnifiedFolders.button): The
-choice of lower case is intentional, but may be overriden if that doesn't make
-sense because of a specific language context.-->
-<!ENTITY featureConfigurator.useUnifiedFolders.button "utilitza el mode &quot;carpetes unificades&quot;">
+<!-- LOCALIZATION NOTE (featureConfigurator.diskSpace.currentSize): The label for the current amount of disk space your accounts are consuming. -->
+<!ENTITY featureConfigurator.diskSpace.currentSize "Espai total utilitzat pel correu:">
 
-<!-- LOCALIZATION NOTE (featureConfigurator.useAllFolders.button): The
-choice of lower case is intentional, but may be overriden if that doesn't make
-sense because of a specific language context.-->
-<!ENTITY featureConfigurator.useAllFolders.button "utilitza el mode &quot;totes les carpetes&quot;">
+<!-- LOCALIZATION NOTE (featureConfigurator.diskSpace.freeSpace): The label for the current amount of free space available on your hard disk. -->
+<!ENTITY featureConfigurator.diskSpace.freeSpace "Espai lliure:">
 
-<!ENTITY featureConfigurator.collapsedHeaders.heading "Resumeix les capçaleres">
+<!-- LOCALIZATION NOTE (featureConfigurator.diskSpace.requireSpace): The label for the required amount of free space to synchronize all of your IMAP accounts. -->
+<!ENTITY featureConfigurator.diskSpace.requireSpace "Espai necessari:">
 
-<!-- LOCALIZATION NOTE (featureConfigurator.headerParaBeforeLink): The part
-of the paragraph before the beginning of the link to the AMO search page.-->
-<!ENTITY featureConfigurator.headerParaBeforeLink 
-"El Thunderbird 3 ha millorat la visualització del detall de les capçaleres dels missatges, incloent botons per a gestionar el missatge. Però també hi ha disponibles dissenys alternatius com per exemple ">
+<!-- LOCALIZATION NOTE (featureConfigurator.diskSpace.warning): The label shown when your estimated available hard disk space if you chose autosync would be less than 50MB or if we estimate turning on autosync would use more than 50% of your free space. -->
+<!ENTITY featureConfigurator.diskSpace.warning "Teniu poc espai al disc.">
+
 
-<!-- LOCALIZATION NOTE (featureConfigurator.headerParaLinkName): The name of
-the link to the AMO search page.-->
-<!ENTITY featureConfigurator.headerParaLinkName "complements">
-
-<!-- LOCALIZATION NOTE (featureConfigurator.headerParaAfterLink): The part of
-the paragraph after the link to the AMO search page.-->
-<!ENTITY featureConfigurator.headerParaAfterLink ".">
-
+<!ENTITY featureConfigurator.previousButton "Anterior">
+<!ENTITY featureConfigurator.nextButton "Següent">
+<!ENTITY featureConfigurator.closeButton "Tanca">
--- a/mail/chrome/messenger/folderProps.dtd
+++ b/mail/chrome/messenger/folderProps.dtd
@@ -43,23 +43,34 @@
 
 <!ENTITY folderProps.windowtitle.label "Propietats">
 
 <!ENTITY generalInfo.label "Informació general">
 <!ENTITY folderCharsetTab.label "Codificació de caràcters per defecte:">
 <!ENTITY folderCharsetTab.accesskey              "e">
 <!ENTITY folderCharsetOverride.label "Aplica el valor per defecte a tots els missatges (ignora el joc de caràcters indicat a la capçalera MIME)">
 <!ENTITY folderCharsetOverride.accesskey         "A">
+
+<!ENTITY folderRebuildSummaryFileTip2.label      "Reconstrueix l'índex del fitxer resum">
+<!ENTITY folderRebuildSummaryFile2.label         "Repara la carpeta">
+<!ENTITY folderRebuildSummaryFile2.accesskey     "R">
+<!ENTITY folderRebuildSummaryFile.explanation    "De vegades el fitxer de l'índex de la carpeta (.msf) s'espatlla i els missatges sembla que es perdin o bé els missatges esborrats tornen a aparèixer; si es repara la carpeta potser que s'arreglin aquests problemes.">
+<!ENTITY folderIncludeInGlobalSearch.label       "Inclou els missatges d'aquesta carpeta als resultats de la Cerca global">
+<!ENTITY folderIncludeInGlobalSearch.accesskey   "g">
+
+
+<!--
 <!ENTITY folderRebuildSummaryFile.label          "Reconstrueix l'índex">
 <!ENTITY folderRebuildSummaryFile.accesskey      "R">
 <!ENTITY folderRebuildSummaryFileTip.label       "Reconstrueix el fitxer de resum"> 
 
 <!ENTITY folderSynchronizationTab.label          "Sincronització">
 <!ENTITY folderCheckForNewMessages.label "Cerca missatges nous a aquesta carpeta">
 <!ENTITY folderCheckForNewMessages.accesskey     "C">
+-->
 
 <!ENTITY retention.label "Política de retenció">
 <!ENTITY retentionUseAccount.label  "Utilitza les meves opcions del compte">
 <!ENTITY retentionUseAccount.accesskey "U">
 <!ENTITY daysOld.label "dies d'antiguitat">
 <!ENTITY message.label "missatges">
 <!ENTITY retentionCleanup.label "Per a recuperar espai de disc, es poden suprimir permanentment els missatges antics">
 <!ENTITY retentionCleanupImap.label "Per a recuperar espai de disc, es poden suprimir permanentment els missatges antics, tant les còpies locals com els originals del servidor remot.">
@@ -71,16 +82,20 @@
 <!ENTITY retentionKeepRecent.label "Suprimeix-los tots excepte els més nous">
 <!ENTITY retentionKeepRecent.accesskey "x">
 <!-- LOCALIZATION NOTE: Unhide with .keepUnreadOnly { display: -moz-box; } -->
 <!ENTITY retentionKeepUnreadHidden.label "Suprimeix sempre els missatges llegits (sobreescriu les opcions d'antiguitat)">
 
 <!ENTITY retentionApplyToFlagged.label "Conserva sempre els missatges senyalats">
 <!ENTITY retentionApplyToFlagged.accesskey "e">
 
+<!ENTITY folderSynchronizationTab.label          "Sincronització">
+<!ENTITY folderCheckForNewMessages2.label         "Quan miris si hi ha missatges nous per aquest compte, comprova sempre aquesta carpeta">
+<!ENTITY folderCheckForNewMessages2.accesskey     "c">
+
 <!ENTITY offlineFolder.check.label "Selecciona aquesta carpeta per al seu ús fora de línia">
 <!ENTITY offlineFolder.check.accesskey           "S">
 <!ENTITY offlineFolder.button.label "Baixa-ho ara">
 <!ENTITY offlineFolder.button.accesskey          "B">
 
 <!ENTITY selectofflineNewsgroup.check.label "Selecciona aquest grup de discussió per al seu ús fora de línia">
 <!ENTITY selectofflineNewsgroup.check.accesskey  "o">
 <!ENTITY offlineNewsgroup.button.label "Baixa-ho ara">
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -659,16 +659,62 @@ you can use these alternative items. Oth
 <!ENTITY contextCopyMsgMenu.accesskey "C">
 <!ENTITY contextSaveAs.label "Anomena i desa…">
 <!ENTITY contextSaveAs.accesskey "s">
 <!ENTITY contextPrint.label "Imprimeix…">
 <!ENTITY contextPrint.accesskey "I">
 <!ENTITY contextPrintPreview.label "Exemple d'impressió">
 <!ENTITY contextPrintPreview.accesskey "e">
 
+<!-- Thread Pane Column Picker -->
+<!-- LOCALIZATION NOTE (columnPicker.resetToInbox.label):
+   This option in the thread pane column picker causes us to reset the
+   customizations for the thread pane columns in this folder to their default.
+  -->
+<!ENTITY columnPicker.resetToInbox.label "Restaura les columnes per defecte">
+<!-- LOCALIZATION NOTE (columnPicker.applyTo.label):
+   This option in the thread pane column picker pops up a sub-menu containing
+   the "columnPicker.applyToFolder.label" and
+   "columnPicker.applyToFolderAndChildren.label" options.  This item indicates
+   a desire to apply the currently displayed set of columns to some other
+   folder(s).  The sub-menu items indicate whether we want to apply it to just
+   a folder or also its children.
+  -->
+<!ENTITY columnPicker.applyTo.label "Aplica els canvis a…">
+<!-- LOCALIZATION NOTE (columnPicker.applyToFolder.label):
+   This option in the thread pane column picker is found on a sub-menu beneath
+   the "columnPicker.applyTo.label" alongside
+   "columnPicker.applyToFolderAndChildren.label".  It indicates a desire to
+   apply the currently display thread pane column settings to a single folder
+   that the user selects using the same widget as the move to/copy to
+   mechanism (via a series of popups).
+  -->
+<!ENTITY columnPicker.applyToFolder.label "La carpeta…">
+<!-- LOCALIZATION NOTE (columnPicker.applyToFolderAndChildren.label):
+   This option in the thread pane column picker is found on a sub-menu beneath
+   the "columnPicker.applyTo.label" alongside
+   "columnPicker.applyToFolder.label".  It indicates a desire to
+   apply the currently display thread pane column settings to a folder and all
+   of its descendents.  The user selects the folder using the same widget as the
+   move to/copy to mechanism (via a series of popups).
+  -->
+<!ENTITY columnPicker.applyToFolderAndChildren.label "La carpeta i al seu contingut…">
+<!-- LOCALIZATION NOTE (columnPicker.thisFolder.label):
+   This is used in the folder selection widget for the
+   "columnPicker.applyToFolder.label" and
+   "columnPicker.applyToFolderAndChildren.label" menu options.  Whenever
+   a folder has children, it results in a menu popup; the first menu item
+   in that popup is given this label to indicate that that folder should be
+   selected.  For example, if folder "A" has two children, "B" and "C", then
+   when the user hovers over "A", a new popup menu will be displayed whose
+   items are "This folder", "B", and "C".  This is the equivalent of the
+   "File here" option for the move to/copy to widge.t
+  -->
+<!ENTITY columnPicker.thisFolder.label "Aquesta carpeta">
+
 <!-- Media (video/audio) controls -->
 <!ENTITY contextPlay.label "Reprodueix">
 <!ENTITY contextPlay.accesskey "R">
 <!ENTITY contextPause.label "Pausa">
 <!ENTITY contextPause.accesskey "P">
 <!ENTITY contextMute.label "Silenci">
 <!ENTITY contextMute.accesskey "S">
 <!ENTITY contextUnmute.label "So">
@@ -688,23 +734,41 @@ you can use these alternative items. Oth
 <!ENTITY removePhishingBarButton1.label "Ignora l'avís">
 <!ENTITY reportPhishingError1.label "Aquest missatge no sembla ser fraudulent">
 
 <!-- MDN Bar -->
 <!ENTITY mdnBarMessage.label "El remitent d'aquest missatge ha soŀlicitat ser notificat quan llegiu aquest missatge. Voleu notificar el remitent?"> 
 <!ENTITY mdnBarIgnoreButton.label "Ignora la soŀlicitud">
 <!ENTITY mdnBarSendButton.label "Envia la notificació">
 
-
-<!-- Message Header Button Box (to show hidden email addresses) -->
-<!ENTITY more.label "més">
-
 <!-- Quick Search Bar -->
 <!ENTITY quickSearchCmd.key "k">
-<!ENTITY searchAllMessages.label "Cerca tots els missatges">
+
+<!-- LOCALIZATION NOTE (searchAllMessages.label.base):
+     This is the base of the empty text for the global search box.  We replace
+     #1 with the contents of the appropriate
+     searchAllMessages.keyLabel2.* value for the platform.
+     The goal is to convey to the user that typing in the box will allow them
+     to search for messages globally and that there is a hotkey they can press
+     to get to the box faster.  If the global indexer is disabled, the search
+     box will be collapsed and the user will never see this message.
+     -->
+<!ENTITY searchAllMessages.label.base "Cerca tots els missatges… #1">
+<!-- LOCALIZATION NOTE (searchAllMessages.keyLabel.nonmac):
+     The description of the key-binding to get into the global search box on
+     windows and linux (which use the control key).  We use the key defined in
+     the quickSearchCmd.key entity defined above, the letter should match it.
+     -->
+<!ENTITY searchAllMessages.keyLabel2.nonmac "&lt;Ctrl+K&gt;">
+<!-- LOCALIZATION NOTE (searchAllMessages.keyLabel.mac):
+     The description of the key-binding to get into the global search box on mac
+     systems.  We use the key defined in the quickSearchCmd.key entity defined
+     above, the letter should match it.
+     -->
+<!ENTITY searchAllMessages.keyLabel2.mac "&lt;&#x2318;K&gt;">
 
 <!-- Message Header Context Menu -->
 <!ENTITY AddToAddressBook.label "Afegeix a la llibreta d'adreces…">
 <!ENTITY AddToAddressBook.accesskey "d">
 <!ENTITY AddDirectlyToAddressBook.label "Afegeix a la llibreta d'adreces">
 <!ENTITY AddDirectlyToAddressBook.accesskey "b">
 <!ENTITY EditContact.label "Edita el contacte…">
 <!ENTITY EditContact.accesskey "E">
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -414,16 +414,25 @@ processingJunkMessages=S'estan processan
 fileNotFoundTitle = El fitxer no s'ha trobat
 #LOCALIZATION NOTE(fileNotFoundMsg): %S is the filename
 fileNotFoundMsg = El fitxer %S no existeix.
 
 fileEmptyTitle = Fitxer buit
 #LOCALIZATION NOTE(fileEmptyMsg): %S is the filename
 fileEmptyMsg = El fitxer %S està buit.
 
+# LOCALIZATION NOTE (headerMoreAddrs): semicolon separated list of plural
+# forms of the word "more" as used after the number of addresses
+# currently hidden while displaying a header such as "to", "cc", or "bcc"
+# in the message header box.  English has two identical forms here, so it will
+# construct strings that look like (for example) "1 more" or "20 more".
+# <http://developer.mozilla.org/en/docs/Localization_and_Plurals> has details
+# on this mechanism.
+headerMoreAddrs=#1 més;#1 més
+
 # LOCALIZATION NOTE (headertoFieldYou): second person prepositional object
 # pronoun used in the "to" header of the message header pane.  This is also
 # used for the fallback case if a header-specific localization is not
 # available.
 headertoFieldYou=Vós
 
 # LOCALIZATION NOTE (headerfromFieldYou): second person prepositional object
 # pronoun used in the "from" header of the message header pane.
@@ -472,8 +481,55 @@ mailServerLoginFailedTitle=L'inici de sessió ha fallat
 # translation where you wish to display the hostname of the server to which
 # login failed.
 mailServerLoginFailed=L'inici de sessió amb el servidor %S ha fallat.
 mailServerLoginFailedRetryButton=&Reintenta
 mailServerLoginFailedEnterNewPasswordButton=&Introdueix una altra contrasenya
 
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Per defecte
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=El tema per defecte.
+
+# LOCALIZATION NOTE (threadPane.columnPicker.confirmFolder.noChildren.title):
+# When the user selects a folder to apply the currently displayed columns to
+# via the "columnPicker.applyToFolder.label" menu option, this is the title of
+# the confirmation dialog used to verify they selected the correct folder.  This
+# is the case in which we apply the columns only to the folder and not to any of
+# its children.
+threadPane.columnPicker.confirmFolder.noChildren.title=Voleu aplicar els canvis?
+# LOCALIZATION NOTE (threadPane.columnPicker.confirmFolder.noChildren.message):
+# When the user selects a folder to apply the currently displayed columns to
+# via the "columnPicker.applyToFolder.label" menu option, this is the text of
+# the confirmation dialog used to verify they selected the correct folder.  The
+# string '%S' is replaced with the name of the folder the user selected in
+# order to help them confirm they picked what they thought they picked.  This
+# is the case in which we apply the columns only to the folder and not to any of
+# its children.
+threadPane.columnPicker.confirmFolder.noChildren.message=Aplica les columnes de la carpeta a %S?
+
+# LOCALIZATION NOTE (threadPane.columnPicker.confirmFolder.withChildren.title):
+# When the user selects a folder to apply the currently displayed columns to via
+# the "columnPicker.applyToFolderAndChildren.label" menu option, this is the
+# title of the confirmation dialog used to verify they selected the correct
+# folder.  This is the case in which we apply the columns to the folder and all
+# of its children.
+threadPane.columnPicker.confirmFolder.withChildren.title=Voleu aplicar els canvis?
+# LOCALIZATION NOTE (threadPane.columnPicker.confirmFolder.withChildren.message):
+# When the user selects a folder to apply the currently displayed columns to via
+# the "columnPicker.applyToFolderAndChildren.label" menu option, this is the
+# text of the confirmation dialog used to verify they selected the correct
+# folder.  The string '%S' is replaced with the name of the folder the user
+# selected in order to help them confirm they picked what they thought they
+# picked.  This is the case in which we apply the columns to the folder and all
+# of its children.
+threadPane.columnPicker.confirmFolder.withChildren.message=Aplica les columnes de la carpeta a %S i a les carpetes de dins?
+
+# LOCALIZATION NOTE (lwthemeInstallRequest.message): %S will be replaced with
+# the host name of the site.
+lwthemeInstallRequest.message=Aquest web (%S) vol instaŀlar un tema.
+lwthemeInstallRequest.allowButton=Permet
+lwthemeInstallRequest.allowButton.accesskey=P
+
+lwthemePostInstallNotification.message=S'ha instaŀlat un tema nou.
+lwthemePostInstallNotification.undoButton=Desfés
+lwthemePostInstallNotification.undoButton.accesskey=D
+lwthemePostInstallNotification.manageButton=Gestiona els temes…
+lwthemePostInstallNotification.manageButton.accesskey=t
+
deleted file mode 100644
--- a/mail/chrome/messenger/quickSearch.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-searchSubject.label=Filtra pel camp Assumpte
-searchFrom.label=Filtra pel camp De
-searchFromOrSubject.label=Filtra pels camps Assumpte o De
-searchRecipient.label=Filtra pels camps A o Cc
-searchRecipientOrSubject.label=Filtra pels camps Assumpte, A o Cc
-searchMsgBody.label=Filtra pel cos del missatge
-saveAsVirtualFolder.label=Desa la cerca com una carpeta virtual
-searchSubjectFromOrRecipient.label=Filtra pels camps Assumpte, De o A
-searchEntireMessage.label=Filtra el missatge sencer