mail and calendar update
authorQuim Perez Noguer <noguer@gmail.com>
Sun, 17 Apr 2011 11:43:59 +0200
changeset 1534 717f6b807efa384db2d42af0960b67ea18b0cfc2
parent 433 c3c367121232d235e687093e875898412d63cf6b
child 1535 19864aa35671b611f33a104d4f4d9166776b4b51
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:43:21 +0000
mail and calendar update
calendar/chrome/calendar/calendar-event-dialog.dtd
calendar/chrome/calendar/calendar.dtd
calendar/chrome/calendar/calendar.properties
mail/chrome/messenger/FilterEditor.dtd
mail/chrome/messenger/accountCreation.dtd
mail/chrome/messenger/accountCreation.properties
mail/chrome/messenger/baseMenuOverlay.dtd
mail/chrome/messenger/featureConfigurator.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/messengercompose.dtd
mail/chrome/messenger/msgHdrViewOverlay.dtd
mail/chrome/messenger/preferences/advanced.dtd
mail/chrome/messenger/safeMode.dtd
--- a/calendar/chrome/calendar/calendar-event-dialog.dtd
+++ b/calendar/chrome/calendar/calendar-event-dialog.dtd
@@ -377,16 +377,20 @@
 <!-- Timezone dialog -->
 
 <!ENTITY timezone.title.label            "Especifiqueu el fus horari">
 
 <!-- Read-Only dialog -->
 
 <!ENTITY read.only.general.label         "General">
 <!ENTITY read.only.title.label           "Títol:">
+<!ENTITY read.only.event.start.label     "Data d'inici:">
+<!ENTITY read.only.task.start.label      "Data d'inici:">
+<!ENTITY read.only.event.end.label       "Data de fi:">
+<!ENTITY read.only.task.due.label        "Data de venciment:">
 <!ENTITY read.only.repeat.label          "Repetició:">
 <!ENTITY read.only.location.label        "Ubicació:">
 <!ENTITY read.only.category.label        "Categoria:">
 <!ENTITY read.only.organizer.label       "organitzador/a:">
 <!ENTITY read.only.reply.label           "Respon:">
 <!ENTITY read.only.accept.label          "Hi assistiré">
 <!ENTITY read.only.decline.label         "No hi assistiré">
 <!ENTITY read.only.tentative.label 		 "Potser hi assistiré">
--- a/calendar/chrome/calendar/calendar.dtd
+++ b/calendar/chrome/calendar/calendar.dtd
@@ -171,17 +171,18 @@
 <!ENTITY calendar.task-details.priority.label        "prioritat">
 <!ENTITY calendar.task-details.priority.low.label    "Baixa">
 <!ENTITY calendar.task-details.priority.normal.label "Normal">
 <!ENTITY calendar.task-details.priority.high.label   "Alta">
 <!ENTITY calendar.task-details.status.label          "estat">
 <!ENTITY calendar.task-details.category.label        "categoria">
 <!ENTITY calendar.task-details.repeat.label          "repetició">
 <!ENTITY calendar.task-details.attachments.label     "adjuncions">
-
+<!ENTITY calendar.task-details.start.label           "data d'inici">
+<!ENTITY calendar.task-details.due.label             "data de venciment">
 
 <!ENTITY calendar.task.category.button.tooltip  "Categorització de tasques">
 <!ENTITY calendar.task.complete.button.tooltip  "Marca les tasques seleccionades com a acabades">
 <!ENTITY calendar.task.priority.button.tooltip  "Canvia la prioritat">
 
 <!-- Statusbar -->
 <!ENTITY statusText.label            "Document: Fet">
 
@@ -189,44 +190,32 @@
 <!ENTITY calendar.context.modifyorviewitem.label      "Obre">
 <!ENTITY calendar.context.modifyorviewitem.accesskey  "O">
 <!ENTITY calendar.context.modifyorviewtask.label      "Obre la tasca…">
 <!ENTITY calendar.context.modifyorviewtask.accesskey  "O">
 <!ENTITY calendar.context.newevent.label              "Nova cita…">
 <!ENTITY calendar.context.newevent.accesskey          "N">
 <!ENTITY calendar.context.newtodo.label               "Nova tasca…">
 <!ENTITY calendar.context.newtodo.accesskey           "o">
-<!ENTITY calendar.context.modifytask.label            "Edita la tasca…">
-<!ENTITY calendar.context.modifytask.accesskey        "E">
-<!ENTITY calendar.context.modifyitem.label            "Edita l'entrada">
-<!ENTITY calendar.context.modifyitem.accesskey        "E">
 <!ENTITY calendar.context.deletetask.label            "Suprimeix la tasca">
 <!ENTITY calendar.context.deletetask.accesskey        "S">
-<!ENTITY calendar.context.deleteitem.label            "Suprimeix l'entrada">
-<!ENTITY calendar.context.deleteitem.accesskey        "S">
 <!ENTITY calendar.context.deleteevent.label           "Suprimeix la cita">
 <!ENTITY calendar.context.deleteevent.accesskey       "S">
-<!ENTITY calendar.context.deletethisevent.label       "Aquesta cita">
-<!ENTITY calendar.context.deletethisevent.accesskey   "A">
-<!ENTITY calendar.context.deletecompleteseries.label  "La sèrie completa">
-<!ENTITY calendar.context.deletecompleteseries.accesskey   "s">
-<!ENTITY calendar.context.deletefutureevents.label     "Totes les cites futures">
-<!ENTITY calendar.context.deletefutureevents.accesskey "f">
-<!ENTITY calendar.context.deletefuturetasks.label     "Totes les tasques futures">
-<!ENTITY calendar.context.deletefuturetasks.accesskey "f">
 <!ENTITY calendar.context.cutevent.label              "Retalla">
 <!ENTITY calendar.context.cutevent.accesskey          "t">
 <!ENTITY calendar.context.copyevent.label             "Copia">
 <!ENTITY calendar.context.copyevent.accesskey         "C">
 <!ENTITY calendar.context.pasteevent.label            "Enganxa">
 <!ENTITY calendar.context.pasteevent.accesskey        "x">
-<!ENTITY calendar.context.selectall.label             "Selecciona-ho tot">
-<!ENTITY calendar.context.selectall.accesskey         "o">
 <!ENTITY calendar.context.button.label                "Plafó d'avui" >
 <!ENTITY calendar.context.button.accesskey            "a" >
+<!ENTITY calendar.context.attendance.menu.label       "Participants" >
+<!ENTITY calendar.context.attendance.menu.accesskey   "P" >
+<!ENTITY calendar.context.attendance.occurrence.label "Aquesta occurrència" >
+<!ENTITY calendar.context.attendance.all.label        "Totes les occurrències" >
 
 <!-- Task Context Menu -->
 <!ENTITY calendar.context.progress.label              "En curs">
 <!ENTITY calendar.context.progress.accesskey          "E">
 <!ENTITY calendar.context.priority.label              "Prioritat">
 <!ENTITY calendar.context.priority.accesskey          "r">
 
 <!ENTITY percnt "&#38;#37;" ><!--=percent sign-->
@@ -249,16 +238,22 @@
 <!ENTITY priority.level.none.accesskey    "n">
 <!ENTITY priority.level.low               "Baixa">
 <!ENTITY priority.level.low.accesskey     "B">                
 <!ENTITY priority.level.normal              "Normal">
 <!ENTITY priority.level.normal.accesskey    "N">
 <!ENTITY priority.level.high              "Alta">
 <!ENTITY priority.level.high.accesskey    "A">
                                                  
+<!-- Task View -->
+<!-- Note that the above *.context.* strings are currently used for the other
+     task action buttons -->
+<!ENTITY calendar.taskview.delete.label     "Suprimeix">
+<!ENTITY calendar.taskview.delete.accesskey "S">
+
 <!-- Server Context Menu -->
 <!ENTITY calendar.context.newserver.label              "Nou calendari">
 <!ENTITY calendar.context.newserver.accesskey          "N">
 <!ENTITY calendar.context.findcalendar.label           "Cerca un calendari…" >
 <!ENTITY calendar.context.findcalendar.accesskey       "C" >
 <!ENTITY calendar.context.deleteserver.label           "Suprimeix el calendari">
 <!ENTITY calendar.context.deleteserver.accesskey       "S">
 <!ENTITY calendar.context.reloadserver.label           "Actualitza els calendaris remots">
--- a/calendar/chrome/calendar/calendar.properties
+++ b/calendar/chrome/calendar/calendar.properties
@@ -421,18 +421,16 @@ tooltipCalendarDisabled=El calendari %1$S no està disponible temporalment
 tooltipCalendarReadOnly=El calendari %1$S només és de lectura
 
 taskEditInstructions=Cliqueu aquí per a afegir una nova tasca
 taskEditInstructionsReadonly=Seleccioneu un calendari editable
 taskEditInstructionsCapability=Seleccioneu un calendari que permeti tasques
 
 eventDetailsStartDate=Inici:
 eventDetailsEndDate=Fi:
-taskDetailsStartDate=Data d'inici:
-taskDetailsEndDate=Data de fi:
 datetimeWithTimezone=%1$S, %2$S
 
 # LOCALIZATION NOTE (singleLongCalendarWeek):
 # used for display of calendar weeks in short form like 'Calendar Week 43'
 #    %1$S will be replaced with the index of the week
 singleLongCalendarWeek=Setmana del calendari: %1$S
 
 # LOCALIZATION NOTE (severalLongCalendarWeeks):
--- a/mail/chrome/messenger/FilterEditor.dtd
+++ b/mail/chrome/messenger/FilterEditor.dtd
@@ -1,10 +1,10 @@
 <!ENTITY window.title "Regles de filtratge">
-
+<!ENTITY filterEditorDialog.dimensions "width: 100ch;">
 <!ENTITY filterName.label "Nom del filtre:">
 <!ENTITY filterName.accesskey "i">
 
 <!ENTITY junk.label "Correu brossa">
 <!ENTITY notJunk.label "Correu legítim">
 
 <!ENTITY lowestPriorityCmd.label "Mínima">
 <!ENTITY lowPriorityCmd.label "Baixa">
--- a/mail/chrome/messenger/accountCreation.dtd
+++ b/mail/chrome/messenger/accountCreation.dtd
@@ -5,52 +5,54 @@
 <!ENTITY name.text                       "El vostre nom, com voleu que es vegi">
 <!ENTITY email.label                     "Adreça electrònica:">
 <!ENTITY email.accesskey                 "A">
 <!ENTITY email.placeholder                 "email@exemple.com">
 <!ENTITY password.label                  "Contrasenya:">
 <!ENTITY password.accesskey              "C">
 <!ENTITY password.placeholder              "Contrasenya">
 <!ENTITY password.text                   "Opcional, només es farà servir per a validar el vostre usuari">
+<!ENTITY rememberPassword.label          "recorda la contrasenya">
+<!ENTITY rememberPassword.accesskey      "r">
 
-<!ENTITY accountInformation.label        "Informació del compte">
-<!ENTITY username2.label                 "Usuari:">
+<!ENTITY imapLong.label                  "IMAP (carpetes remotes)">
+<!ENTITY pop3Long.label                  "POP3 (conserva el correu al teu ordinador)">
+
 <!ENTITY incoming.label                  "Entrada:">
 <!ENTITY outgoing.label                  "Sortida:">
+<!ENTITY username.label                  "Nom d'usuari:">
+<!ENTITY hostname.label                  "Servidor">
+<!ENTITY port.label                      "Port">
+<!ENTITY ssl.label                       "SSL">
+<!ENTITY auth.label                      "Autenticatió">
+<!ENTITY imap.label                      "IMAP">
+<!ENTITY pop3.label                       "POP3">
+<!ENTITY smtp.label                      "SMTP">
+<!ENTITY autodetect.label                "Detecta automàticament">
+<!-- LOCALIZATION NOTE(noEncryption.label): Neither SSL/TLS nor STARTTLS.
+     Transmission of emails in cleartext over the Internet. -->
 <!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 advancedSetup.label             "Configuració avançada">
+<!ENTITY advancedSetup.accesskey         "ç">
 <!ENTITY cancel.label                    "Canceŀla">
 <!ENTITY cancel.accesskey                "n">
 <!ENTITY continue.label                  "Continua">
 <!ENTITY continue.accesskey              "C">
-<!ENTITY startOver.label                 "Torna a començar">
-<!ENTITY startOver.accesskey             "o">
 <!ENTITY stop.label                      "Atura">
 <!ENTITY stop.accesskey                  "A">
 <!-- LOCALIZATION NOTE (retest.label): This is the text that is
      displayed on the button which will re-guess the account configuration,
      taking into account the settings the user has changed. -->
-<!ENTITY retest.label                    "Prova la configuració">
-<!ENTITY retest.accesskey                "P">
-<!ENTITY edit.label                      "Edita">
-<!ENTITY edit.accesskey                  "E">
-
-<!ENTITY rememberPassword.label          "Recorda la contrasenya">
-<!ENTITY rememberPassword.accesskey      "R">
+<!ENTITY half-manual-test.label          "Prova-la">
+<!ENTITY half-manual-test.accesskey      "P">
+<!ENTITY manual-edit.label               "Configuració manual">
+<!ENTITY manual-edit.accesskey           "m">
 
 <!ENTITY warning.label                   "Atenció!">
 <!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. -->
--- a/mail/chrome/messenger/accountCreation.properties
+++ b/mail/chrome/messenger/accountCreation.properties
@@ -3,32 +3,38 @@
 # LOCALIZATION NOTE: %1$S will be the hostname of the server the user was trying to connect to.
 cleartext_warning=%1$S no utilitza encriptació.
 selfsigned_warning=%1$S no utilitza un certificat comprovable.
 selfsigned_details=Normalment, un servidor de correu que sigui segur tindrà un certificat autentificat per a demostrar que realment és el servidor que diu que és. S'encriptarà la connexió amb el servidor de correu però no es podrà validar que sigui el servidor correcte.
 cleartext_details=Els servidors de correu insegurs no utilitzen connexions encriptades per a protegir la vostra contrasenya i la vostra informació privada. Si us connecteu a aquest servidor estareu exposant aquesta informació.
 
 # LOCALIZATION NOTE(default_server_tag): Used to indicate the default smtp server in the server dropdown list.
 default_server_tag= (predeterminat)
+# LOCALIZATION NOTE(port_auto): It must be short (4-5 characters max.).
+# Content of server port field (usually a number), used when the user didn't
+# enter anything yet and we'll automatically detect it later.
+port_auto=Auto
 
 # config titles
 # LOCALIZATION NOTE(looking_up_settings_disk): Referring to Thunderbird installation folder on user's harddisk
 looking_up_settings_disk=S'està cercant la configuració: la instaŀlació del %1$S
 looking_up_settings_isp=S'està cercant la configuració: el proveïdor de correu electrònic
 # LOCALIZATION NOTE(looking_up_settings_db): Do not translate or replace Mozilla. It stands for the public project mozilla.org, not Mozilla Messaging. The database is a generic, public domain facility usable by any client.
 looking_up_settings_db=S'està cercant la configuració: la base de dades ISP de Mozilla
 # LOCALIZATION NOTE(looking_up_settings_guess): We are checking common server names like pop., pop3., smtp., mail., without knowing whether they exist or really serve this email account. If a server responds, we try to talk to it via POP/IMAP/SMTP protocols and query its capabilities. If that succeeds, we assume we found a configuration. Of course, it may still be wrong, but it often works.
 looking_up_settings_guess=S'està cercant la configuració: s'estan provant els noms de servidors més típics
+looking_up_settings_halfmanual=S'està cercant la configuració: s'està provant el servidor
 # LOCALIZATION NOTE(found_settings_disk): Referring to Thunderbird installation folder on user's harddisk
 found_settings_disk=S'ha trobat la següent configuració a la instaŀlació del %1$S
 found_settings_isp=S'ha trobat la següent configuració al proveïdor de correu electrònic
 # LOCALIZATION NOTE(found_settings_db): Do not translate or replace Mozilla. It stands for the public project mozilla.org, not Mozilla Messaging. The database is a generic, public domain facility usable by any client.
 found_settings_db=S'ha trobat la següent configuració a la base de dades ISP de Mozilla
 # LOCALIZATION NOTE(found_settings_guess): We tried common mail server names and we found a mail server and talked to it and it responded properly, so we think we found a suitable configuration, but we are only about 80% certain that it is the correct setting for this email address. There's a chance that email address may not actually be served by this server and it won't work, or that there is a better server.
 found_settings_guess=S'ha trobat la següent configuració provant els noms de servidors més típics
+found_settings_halfmanual=S'ha trobat la següent configuració provant el servidor indicat
 # LOCALIZATION NOTE(failed_to_find_settings): %1$S will be the brandShortName.
 manually_edit_config=S'està editant la configuració
 failed_to_find_settings=El %1$S no ha pogut trobar la configuració per al vostre compte de correu.
 
 #kk searching_for_configs=S'està cercant…
 #kk finished_with_success=S'ha finalitzat
 #kk finished_with_error=Error
 
@@ -53,18 +59,42 @@ password_ok=La contrasenya és correcta
 user_pass_invalid=El nom d'usuari o la contrasenya són incorrectes
 check_server_details=S'estan comprovant els detalls del servidor
 check_in_server_details=S'estan comprovant els detalls del servidor d'entrada
 check_out_server_details=S'estan comprovant els detalls del servidor de sortida
 
 error_creating_account=Error en la creació del compte
 incoming_server_exists=El servidor d'entrada ja existeix.
 
-no_encryption=Sense encriptació
-ssl_tls=SSL/TLS
-starttls=STARTTLS
-
 please_enter_name=Introduïu el vostre nom.
 double_check_email=Comproveu que sigui correcta la vostra adreça electrònica
 
-#kk name.error=Introduïu el vostre nom, tal com voleu que el vegin en la vostra correspondència.
-#kk email.error=Torneu a comprovar aquesta adreça de correu
-#kk password.error=No s'ha pogut iniciar una sessió. Comproveu que el nom d'usuari i la contrasenya siguin correctes.
+#config result display
+# LOCALIZATION NOTE(resultUnknown): Displayed instead of resultIncoming,
+# resultOutgoing or resultUsername when we don't have a proper value.
+resultUnknown=Desconegut
+# LOCALIZATION NOTE(resultIncoming):
+# %1$S will be replaced with either resultIMAP, resultPOP3 or resultSMTP.
+# %2$S will be replaced with the server hostname
+#   with possibly a port appended as ":"+port.
+#   The domain part may be made bold.
+# %3$S will be replaced with either resultNoEncryption or resultSSL or
+#    resultSTARTTLS.
+# %4$S will be replaced with either resultSSLCertWeak or resultSSLCertOK
+#    (which should normally be empty)
+# You may adjust the strings to be a real sentence.
+resultIncoming=%1$S, %2$S, %3$S%4$S
+# LOCALIZATION NOTE(resultOutgoing): see resultIncoming
+resultOutgoing=%1$S, %2$S, %3$S%4$S
+resultOutgoingExisting=Use existing outgoing SMTP server
+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=\u0020(atenció: no s'ha pogut verificar el servidor)
+resultSSLCertOK=
+resultUsernameBoth=%1$S
+resultUsernameDifferent=Entrada: %1$S, Sortida: %2$S
+
--- a/mail/chrome/messenger/baseMenuOverlay.dtd
+++ b/mail/chrome/messenger/baseMenuOverlay.dtd
@@ -2,18 +2,20 @@
 <!ENTITY helpMenu.label "Ajuda">
 <!ENTITY helpMenu.accesskey "j">
 <!-- LOCALIZATION NOTE some localizations of Windows use "?"
                        for the help button in the menubar but Gnome does not.   -->
 <!ENTITY helpMenuWin.label        "Ajuda"> 
 <!ENTITY helpMenuWin.accesskey    "j">
 <!ENTITY helpTroubleshootingInfo.label     "Informació de problemes">
 <!ENTITY helpTroubleshootingInfo.accesskey "p">
-<!ENTITY releaseCmd.label "Notes de la versió">
-<!ENTITY releaseCmd.accesskey "r">
+<!ENTITY helpSafeMode.label     "Reinicia amb els complements inhabilitats…">
+<!ENTITY helpSafeMode.accesskey "h">
+<!ENTITY releaseCmd2.label "Notes de la versió">
+<!ENTITY releaseCmd2.accesskey "r">
 <!ENTITY whatsNewCmd.label "Novetats">
 <!ENTITY whatsNewCmd.accesskey "N">
 <!ENTITY featureConfiguratorCmd.label "Auxiliar de migració">
 <!ENTITY featureConfiguratorCmd.accesskey "m">
 <!ENTITY openHelp.label "Continguts de l'ajuda">
 <!ENTITY openHelp.accesskey "C">
 <!ENTITY openHelp.commandkey "VK_F1">
 <!ENTITY openHelpMac.label "Ajuda del &brandShortName;">
--- a/mail/chrome/messenger/featureConfigurator.dtd
+++ b/mail/chrome/messenger/featureConfigurator.dtd
@@ -15,22 +15,28 @@
 <!ENTITY featureConfigurator.toolbar.new.status.explanation "Una barra d'eines buida amb tots els botons per a missatges al vostre abast.">
 
 <!-- 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 "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.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.addOn.downloading): The text to display while downloading the addon. -->
+<!ENTITY featureConfigurator.addOn.downloading "S'està baixant…">
+
 <!-- 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.addOn.failure): The text to display when there is a problem installing the addon. -->
+<!ENTITY featureConfigurator.addOn.failure "S'ha produït un problema quan s'esta instaŀlant aquesta extensió.">
+
 <!-- 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.">
 
 <!-- LOCALIZATION NOTE (featureConfigurator.collapsedHeaders.heading): The heading for the Compact Header page. -->
 <!ENTITY featureConfigurator.collapsedHeaders.heading "Resum de capçaleres">
 
 <!-- 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.">
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -1,19 +1,32 @@
 <!ENTITY messengerWindow.title "Missatgeria">
 <!ENTITY titledefault.label "&brandFullName;">
 <!ENTITY titleSeparator.label " - ">
 
 <!-- File Menu -->
 <!ENTITY newFolderCmd.label "Carpeta…">
 <!ENTITY newFolderCmd.accesskey "C">
-<!ENTITY closeTabCmd.label "Tanca la pestanya">
-<!ENTITY closeTabCmd.accesskey "t">
-<!ENTITY closeOtherTabsCmd.label "Tanca les altres pestanyes">
-<!ENTITY closeOtherTabsCmd.accesskey "a">
+<!ENTITY closeTabCmd2.label "Tanca la pestanya">
+<!ENTITY closeTabCmd2.accesskey "T">
+<!ENTITY closeOtherTabsCmd2.label "Tanca les altres pestanyes">
+<!ENTITY closeOtherTabsCmd2.accesskey "a">
+<!-- LOCALIZATION NOTE (undoCloseTabCmd.label):
+     Menu option to attempt to re-open a recently closed tab.
+     -->
+<!ENTITY recentlyClosedTabsCmd.label "Pestanyes tancades recentment">
+<!ENTITY recentlyClosedTabsCmd.accesskey "r">
+
+<!ENTITY undoCloseTabCmd.commandkey "T">
+<!-- LOCALIZATION NOTE (moveToNewWindow.label):
+     Menu option to cause the current tab to be migrated to a new Thunderbird
+     window.
+     -->
+<!ENTITY moveToNewWindow.label "Mou a una finestra nova">
+<!ENTITY moveToNewWindow.accesskey "v">
 <!ENTITY newVirtualFolderCmd.label "Cerca desada…">
 <!ENTITY newVirtualFolderCmd.accesskey "d">
 <!ENTITY newOtherAccountsCmd.label "Altres comptes…">
 <!ENTITY newOtherAccountsCmd.accesskey "A">
 <!ENTITY newEmailAccountCmd.label "Compte de correu…">
 <!ENTITY newEmailAccountCmd.accesskey "C">
 <!ENTITY openMessageFileCmd.label "Obre el missatge desat…">
 <!ENTITY openMessageFileCmd.accesskey "O">
@@ -314,18 +327,21 @@ you can use these alternative items. Oth
 <!ENTITY goBackCmd.accesskey "r">
 <!ENTITY goBackCmd.commandKey "[">
 <!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 startPageCmd.label "Pàgina d'inici de la Missatgeria">
 <!ENTITY startPageCmd.accesskey "s">
+
+<!-- Message Menu -->
 <!ENTITY msgMenu.label "Missatge">
 <!ENTITY msgMenu.accesskey "M">
 <!ENTITY newMsgCmd.label "Missatge nou">
 <!ENTITY newMsgCmd.accesskey "e">
 <!ENTITY newNewMsgCmd.label "Missatge">
 <!ENTITY newNewMsgCmd.accesskey "M">
 <!ENTITY archiveMsgCmd.label "Arxiu">
 <!ENTITY archiveMsgCmd.accesskey "A">
@@ -390,22 +406,21 @@ you can use these alternative items. Oth
 <!ENTITY tagCmd4.key "4">
 <!ENTITY tagCmd5.key "5">
 <!ENTITY tagCmd6.key "6">
 <!ENTITY tagCmd7.key "7">
 <!ENTITY tagCmd8.key "8">
 <!ENTITY tagCmd9.key "9">
 <!ENTITY markMenu.label "Marca">
 <!ENTITY markMenu.accesskey "M">
+<!ENTITY toggleReadCmd.key "m">
 <!ENTITY markAsReadCmd.label "Com a llegit">
 <!ENTITY markAsReadCmd.accesskey "C">
-<!ENTITY markAsReadCmd.key "m">
 <!ENTITY markAsUnreadCmd.label "Com a no llegit">
 <!ENTITY markAsUnreadCmd.accesskey "n">
-<!ENTITY markAsUnreadCmd.key "m">
 <!ENTITY markThreadAsReadCmd.label "Conversa com a llegida">
 <!ENTITY markThreadAsReadCmd.accesskey "m">
 <!ENTITY markThreadAsReadCmd.key "r">
 <!ENTITY markReadByDateCmd.label "Llegits per data…">
 <!ENTITY markReadByDateCmd.accesskey "d">
 <!ENTITY markReadByDateCmd.key "c">
 <!ENTITY markAllReadCmd.label "Tots llegits">
 <!ENTITY markAllReadCmd.accesskey "g">
@@ -789,29 +804,25 @@ you can use these alternative items. Oth
 <!ENTITY CopyNewsgroupName.accesskey "n">
 <!ENTITY CopyNewsgroupURL.label "Copia l'URL del grup de notícies">
 <!ENTITY CopyNewsgroupURL.accesskey "U">
 <!ENTITY CreateFilterFrom.label "Crea un filtre de…">
 <!ENTITY CreateFilterFrom.accesskey "f">
 <!ENTITY reportPhishingURL.label "Informa d'un missatge fraudulent">
 <!ENTITY reportPhishingURL.accesskey "o">
 
+<!-- Spell checker context menu items -->
+<!ENTITY spellAddDictionaries.label "Afegeix diccionaris…">
+<!ENTITY spellAddDictionaries.accesskey "A">
+
 <!-- Content Pane Context Menu -->
 <!ENTITY saveLinkAsCmd.label "Anomena i desa l'enllaç…">
 <!ENTITY saveLinkAsCmd.accesskey "ç">
 <!ENTITY saveImageAsCmd.label "Anomena i desa la imatge…">
 <!ENTITY saveImageAsCmd.accesskey "i">
-<!ENTITY cutCmd.label "Retalla">
-<!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Copia">
-<!ENTITY copyCmd.accesskey "C">
-<!ENTITY pasteCmd.label "Enganxa">
-<!ENTITY pasteCmd.accesskey "E">
-<!ENTITY selectAllCmd.label "Selecciona-ho tot">
-<!ENTITY selectAllCmd.accesskey "a">
 <!ENTITY copyLinkCmd.label "Copia l'enllaç">
 <!ENTITY copyLinkCmd.accesskey "C">
 <!ENTITY copyImageAllCmd.label "Copia la imatge">
 <!ENTITY copyImageAllCmd.accesskey "o">
 <!ENTITY copyEmailCmd.label "Copia l'adreça electrònica">
 <!ENTITY copyEmailCmd.accesskey "e">
 <!ENTITY stopCmd.label "Atura">
 <!ENTITY stopCmd.accesskey "A">
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -269,30 +269,41 @@ acctCentralTitleFormat=%1$S %2$S - %3$S
 mailAcctType=Correu
 newsAcctType=Grups de discussió
 
 nocachedbodytitle=<TITLE>Connecteu-vos per a veure aquest missatge</TITLE>\n
 
 confirmUnsubscribeTitle=Confirmeu la canceŀlació de la subscripció
 confirmUnsubscribeText=Esteu segur que voleu canceŀlar la subscripció de %S?
 confirmUnsubscribeManyText=Segur que voleu canceŀlar la subscripció d'aquests grups de discussió?
+restoreAllTabs=Restaura totes les pestanyes
 
 openLabel=Obre
 openLabelAccesskey=O
 saveLabel=Anomena i desa…
 saveLabelAccesskey=A
 detachLabel=Separa…
 detachLabelAccesskey=S
 deleteLabel=Suprimeix
 deleteLabelAccesskey=u
 deleteAttachments=Les següents adjuncions se suprimiran permanentment d'aquest missatge: \n%S\nAquesta acció no pot desfer-se. Esteu segur que voleu continuar?
 detachAttachments=Les següents adjuncions s'han desat amb èxit i se suprimiran permanentment d'aquest missatge: \n%S\nAquesta acció no pot desfer-se. Esteu segur que voleu continuar?
 deleteAttachmentFailure=No s'han pogut suprimir les adjuncions seleccionats.
 emptyAttachment=Aquest fitxer adjunt sembla que està buit.\nComproveu la persona que l'ha enviat perquè sovint els tallafocs o els antivirus de les empreses suprimeixen els fitxers adjunts.
 
+# LOCALIZATION NOTE (attachmentCount): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/Localization_and_Plurals
+# #1 number of attachments
+attachmentCount=#1 adjunt;#1 adjunts
+
+# LOCALIZATION NOTE (attachmentCountAndName): This is the format for the
+# attachment header when a message has only one attachment. %1$S is the
+# attachment count, and %2$S is the attachment's filename.
+attachmentCountAndName=%1$S: %2$S
+
 # This is the format for prepending accesskeys to the
 # each of the attachments in the file|attachments menu:
 #   ie: 1 file.txt
 #       2 another file.txt
 attachmentDisplayNameFormat=%S %S
 
 # This is the heading for the attachment summary when printing an email
 attachmentsPrintHeader=Fitxers adjunts:
@@ -565,8 +576,12 @@ 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
 
+# safeModeRestart
+safeModeRestartPromptTitle=Reinicia amb els complements inhabilitats
+safeModeRestartPromptMessage=Segur que voleu inhabilitar tots els complements i reiniciar?
+safeModeRestartButton=Reinicia
--- a/mail/chrome/messenger/messengercompose/messengercompose.dtd
+++ b/mail/chrome/messenger/messengercompose/messengercompose.dtd
@@ -188,16 +188,17 @@
 <!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 spellingButton.tooltip "Revisa l'ortografia de la selecció o de tot el missatge sencer">
 <!ENTITY saveButton.tooltip "Desa aquest missatge">
 <!ENTITY cutButton.tooltip "Retalla">
 <!ENTITY copyButton.tooltip "Copia">
 <!ENTITY pasteButton.tooltip "Enganxa">
 
 <!-- Headers -->
 <!ENTITY fromAddr.label "De:">
 <!ENTITY fromAddr.accesskey "d">
@@ -258,11 +259,15 @@
 <!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 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 -->
 <!ENTITY addressesSidebarTitle.label "Contactes">
 
--- a/mail/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/chrome/messenger/msgHdrViewOverlay.dtd
@@ -102,25 +102,48 @@
 <!ENTITY otherActionsPrint.label "imprimeix…">
 <!ENTITY otherActionsPrint.accesskey "i">
 
 <!ENTITY openAttachmentCmd.label "Obre">
 <!ENTITY openAttachmentCmd.accesskey "O">
 <!ENTITY saveAsAttachmentCmd.label "Anomena i desa…">
 <!ENTITY saveAsAttachmentCmd.accesskey "A">
 <!ENTITY detachAttachmentCmd.label    "Separa…">  
+<!ENTITY detachAttachmentCmd.accesskey    "p">
 <!ENTITY deleteAttachmentCmd.label    "Suprimeix">  
+<!ENTITY deleteAttachmentCmd.accesskey    "S">
 <!ENTITY openAllAttachmentsCmd.label    "Obre-ho tot…">
 <!ENTITY openAllAttachmentsCmd.accesskey    "O">
 <!ENTITY saveAllAttachmentsCmd.label "Desa-ho tot…">
 <!ENTITY saveAllAttachmentsCmd.accesskey "D">
 <!ENTITY detachAllAttachmentsCmd.label    "Separa-ho tot…">  
 <!ENTITY detachAllAttachmentsCmd.accesskey    "S">  
 <!ENTITY deleteAllAttachmentsCmd.label    "Suprimeix-ho tot…">  
 <!ENTITY deleteAllAttachmentsCmd.accesskey    "u">  
 
+
+<!-- Attachment toolbar items -->
+<!ENTITY saveAttachmentButton.label       "desa">
+<!ENTITY saveAttachmentButton.tooltip     "desa el fitxer adjunt">
+<!ENTITY saveAllAttachmentsButton.label   "desa-ho tot">
+<!ENTITY saveAllAttachmentsButton.tooltip "desa tots els fitxers adjunts">
+<!ENTITY openAttachmentMenuItem.label     "obre">
+<!ENTITY openAttachmentMenuItem.accesskey    "o">
+<!ENTITY saveAsAttachmentMenuItem.label    "desa-ho com…">
+<!ENTITY saveAsAttachmentMenuItem.accesskey    "d">
+<!ENTITY detachAttachmentMenuItem.label    "separa…">
+<!ENTITY detachAttachmentMenuItem.accesskey    "p">
+<!ENTITY deleteAttachmentMenuItem.label    "suprimeix">
+<!ENTITY deleteAttachmentMenuItem.accesskey    "s">
+<!ENTITY saveAllAttachmentsMenuItem.label    "desa-ho tot…">
+<!ENTITY saveAllAttachmentsMenuItem.accesskey    "t">
+<!ENTITY detachAllAttachmentsMenuItem.label    "separa-ho tot…">
+<!ENTITY detachAllAttachmentsMenuItem.accesskey    "o">
+<!ENTITY deleteAllAttachmentsMenuItem.label    "suprimeix-ho tot…">
+<!ENTITY deleteAllAttachmentsMenuItem.accesskey    "x">
+
 <!ENTITY copyLinkCmd.label "Copia l'enllaç">
 <!ENTITY copyLinkCmd.accesskey "C">
 
 <!ENTITY CopyMessageId.label "Copia l'ID-missatge">
 <!ENTITY OpenMessageForMsgId.label "Obre el missatge per ID">
 <!ENTITY OpenBrowserWithMsgId.label "Obre el navegador amb l'ID-missatge">
 
--- a/mail/chrome/messenger/preferences/advanced.dtd
+++ b/mail/chrome/messenger/preferences/advanced.dtd
@@ -75,17 +75,17 @@
 <!ENTITY offlineInfo.caption           "Fora de línia">
 <!ENTITY offlineInfo.label             "Configura els paràmetres de fora de línia">
 <!ENTITY showOffline.label             "Fora de línia…">
 <!ENTITY showOffline.accesskey         "o">
 
 <!ENTITY Diskspace "Espai de disc">
 <!ENTITY offlineCompact.label "Compacta les carpetes quan l'estalvi sigui superior a">
 <!ENTITY offlineCompact.accesskey "C">
-<!ENTITY kb.label "kB">
+<!ENTITY mb.label "Mb">
 
 <!-- LOCALIZATION NOTE:
   The entities useCacheBefore.label and useCacheAfter.label appear on a single
   line in preferences as follows:
 
   &useCacheBefore.label  [ textbox for cache size in MB ]   &useCacheAfter.label;
 -->
 <!ENTITY useCacheBefore.label            "Utilitza fins a">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/safeMode.dtd
@@ -0,0 +1,55 @@
+<!-- ***** BEGIN LICENSE BLOCK *****
+#if 0
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is mozilla.org Code.
+   -
+   - The Initial Developer of the Original Code is Mike Connor.
+   - Portions created by the Initial Developer are Copyright (C) 2005
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Mike Connor <mconnor@steelgryphon.com>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+#endif
+   - ***** END LICENSE BLOCK ***** -->
+
+<!ENTITY safeModeDialog.title             "&brandShortName; en Mode segur">
+<!ENTITY window.width                     "37em">
+
+<!ENTITY safeModeDescription.label        "El &brandShortName; s'està executant en Mode segur, que inhabilita temporalment la vostra configuració, els temes i les extensions.">
+<!ENTITY safeModeDescription2.label       "Podeu fer qualsevol dels canvis següents perquè siguin permanents:">
+
+<!ENTITY disableAddons.label              "Inhabilita tots els complements">
+<!ENTITY disableAddons.accesskey          "I">
+
+<!ENTITY resetToolbars.label              "Reinicia les barres d'eines i els controls">
+<!ENTITY resetToolbars.accesskey          "R">
+
+<!ENTITY changeAndRestartButton.label     "Aplica els canvis i reinicia">
+<!ENTITY changeAndRestartButton.accesskey "A">
+
+<!ENTITY continueButton.label             "Continua en Mode segur">
+<!ENTITY continueButton.accesskey         "C">