[evolution] [l10n]Updated Catalan translation

From: Gil Forcada Codinachs <gforcada src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution] [l10n]Updated Catalan translation
Date: Sun, 25 Sep 2011 21:31:41 +0000 (UTC)
commit eba31005f38e0e36f4d91bba470b983f7f64ab61
Author: Gil Forcada <gforcada gnome org>
Date:   Sun Sep 25 23:28:48 2011 +0200

    [l10n]Updated Catalan translation

 po/ca.po |10570 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 5355 insertions(+), 5215 deletions(-)
---
diff --git a/po/ca.po b/po/ca.po
index feb5295..8c9b392 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,22 +8,22 @@
 # Francesc Dorca <f dorca filnet es>, 2004
 # Jordi Mas <jmas softcatala org>, 2004-2007
 # Enric BalletbÃ i Serra <eballetbo km103 com>, 2004
-# Gil Forcada <gilforcada guifi net>, 2006
+# Gil Forcada <gilforcada guifi net>, 2006, 2011.
 # David Planella Molas <david planella gmail com>, 2007, 2008, 2009, 2010, 2011.
 #
-#: ../shell/main.c:627
+#: ../shell/main.c:570
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-03 22:18+0200\n"
-"PO-Revision-Date: 2011-04-03 22:17+0200\n"
-"Last-Translator: David Planella <david planella ubuntu com>\n"
-"Language-Team: Catalan <tradgnome softcatala org>\n"
+"POT-Creation-Date: 2011-09-25 23:27+0200\n"
+"PO-Revision-Date: 2011-09-25 22:49+0200\n"
+"Last-Translator: Gil Forcada <gilforcada guifi net>\n"
+"Language-Team: Cataln <tradgnome softcatala org>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. For Translators: {0} is the name of the address book source
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Â{0}Â Ãs una llibreta d'adreces a la qual no Ãs permÃs escriure-hi. HaurÃeu "
 "de seleccionar una llibreta d'adreces diferent de la barra lateral de la "
-"visualitzaciÃ de Contactes."
+"visualitzaciÃ de contactes."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -45,22 +45,34 @@ msgstr ""
 "mateixa adreÃa?"
 
 #: ../addressbook/addressbook.error.xml.h:4
+msgid ""
+"A contact list named '{0}' is already in this contact list. Would you like "
+"to add it anyway?"
+msgstr ""
+"Ja existeix un contacte a la llista de contactes amb el nom Â{0}Â. Voleu "
+"afegir-l'hi de totes maneres?"
+
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Add with duplicates"
+msgstr "Afegeix amb duplicats"
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Address '{0}' already exists."
 msgstr "Ja existeix l'adreÃa Â{0}Â."
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Cannot add new contact"
 msgstr "No es pot crear un contacte nou"
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:8
 msgid "Cannot move contact."
 msgstr "No es pot moure el contacte."
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Category editor not available."
 msgstr "L'editor de categories no estÃ disponible."
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:10
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
@@ -70,15 +82,15 @@ msgstr ""
 "un mÃtode d'entrada compatible. Recordeu que moltes contrasenyes "
 "distingeixen entre majÃscules i minÃscules."
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Could not get schema information for LDAP server."
 msgstr "No s'ha pogut obtenir la informaciÃ d'esquema per al servidor LDAP."
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Could not remove address book."
 msgstr "No s'ha pogut suprimir la llibreta d'adreces."
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:13
 msgid ""
 "Currently you can only access the GroupWise System Address Book from "
 "Evolution. Please use some other GroupWise mail client once to get your "
@@ -89,55 +101,66 @@ msgstr ""
 "GroupWise una vegada per obtenir els vostres contactes freqÃents de "
 "GroupWise i les carpetes de contactes personals de GroupWise."
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Delete address book '{0}'?"
 msgstr "Voleu suprimir la llibreta d'adreces Â{0}Â?"
 
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:46
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
 msgid "Do _Not Delete"
 msgstr "No ho _suprimeixis"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "Error saving {0} to {1}: {2}"
 msgstr "S'ha produÃt un error en desar {0} a {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Failed to authenticate with LDAP server."
 msgstr "No es pot autenticar amb el servidor LDAP."
 
-#. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
+#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Failed to delete contact"
 msgstr "No s'ha pogut suprimir el contacte"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "GroupWise Address book creation:"
 msgstr "CreaciÃ de la llibreta d'adreces del GroupWise:"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "LDAP server did not respond with valid schema information."
 msgstr "El servidor LDAP no ha respost amb informaciÃ d'esquema vÃlida."
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "List '{0}' is already in this contact list."
+msgstr "La llista Â{0}Â ja Ãs en aquesta llista de contactes."
+
+#: ../addressbook/addressbook.error.xml.h:22
+msgid "Skip duplicates"
+msgstr "Ignora els duplicats"
+
+#: ../addressbook/addressbook.error.xml.h:23
+msgid "Some addresses already exist in this contact list."
+msgstr "Ja existeixen algunes adreces a la llista de contactes."
+
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "Pot ser que algunes caracterÃstiques no funcionin correctament amb el "
 "servidor actual"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "La llibreta d'adreces de l'Evolution ha sortit inesperadament."
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:26
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "La imatge que heu seleccionat Ãs gran. Voleu canviar-li la mida i tornar-la "
 "a emmagatzemar?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:27
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -148,16 +171,16 @@ msgstr ""
 "configurat. Demaneu al vostre administrador quines sÃn les bases de cerca "
 "compatibles."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This address book could not be opened."
 msgstr "No s'ha pogut obrir aquesta llibreta d'adreces."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "This address book server does not have any suggested search bases."
 msgstr ""
 "Aquest servidor de llibreta d'adreces no tÃ cap base de cerca suggerida."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:30
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -165,31 +188,31 @@ msgstr ""
 "O bÃ no es pot contactar amb el servidor de la llibreta d'adreces, o bÃ el "
 "seu nom estÃ mal escrit, o potser no esteu connectat a la xarxa."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "This address book will be removed permanently."
 msgstr "Se suprimirÃ la llibreta d'adreces de manera permanent."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Aquest servidor no Ãs compatible amb la informaciÃ d'esquema LDAPv3."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "Unable to open address book"
 msgstr "No s'ha pogut obrir la llibreta d'adreces"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "Unable to perform search."
 msgstr "No s'ha pogut realitzar la cerca."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Unable to save {0}."
 msgstr "No s'ha pogut desar {0}."
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "Would you like to save your changes?"
 msgstr "Voleu desar els canvis?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:37
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -197,7 +220,7 @@ msgstr ""
 "Esteu intentant moure un contacte d'una llibreta d'adreces a una altra, perÃ "
 "no es pot suprimir de la font. Voleu desar-ne una cÃpia?"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:38
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -208,52 +231,58 @@ msgstr ""
 "els millors resultats el servidor s'hauria d'actualitzar a una versiÃ "
 "compatible"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:39
+msgid ""
+"You are trying to add addresses that are part of this list already. Would "
+"you like to add them anyway?"
+msgstr ""
+"Les adreces que voleu afegir ja estan a la llista. Les voleu afegir de totes "
+"maneres?"
+
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "You do not have permission to delete contacts in this address book."
 msgstr ""
 "No teniu els permisos suficients per suprimir contactes d'aquesta llibreta "
 "d'adreces."
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:41
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "Voleu desar els canvis que heu fet en aquest contacte?"
 
 #. Translators: {0} is replaced with an address book name which will not be available
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:43
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Fins que no torneu a iniciar l'Evolution no estaran disponibles els vostres "
 "contactes per a {0}."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:610
-#: ../plugins/groupwise-features/junk-settings.ui.h:4
-#: ../plugins/groupwise-features/properties.ui.h:9
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:618
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_Afegeix"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:45
 msgid "_Discard"
 msgstr "_Descarta"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "_Do not save"
 msgstr "No els _desis"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:47
 msgid "_Resize"
 msgstr "_Canvia de mida"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:48
 msgid "_Use as it is"
 msgstr "_Utilitza tal com Ãs"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
-#: ../calendar/gui/e-calendar-view.c:2078
+#: ../addressbook/gui/widgets/eab-contact-display.c:715
+#: ../calendar/gui/e-calendar-view.c:2104
 msgid "Anniversary"
 msgstr "CommemoraciÃ"
 
@@ -263,9 +292,9 @@ msgstr "CommemoraciÃ"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
-#: ../calendar/gui/e-calendar-view.c:2077 ../capplet/anjal-settings-main.c:77
-#: ../shell/main.c:134
+#: ../addressbook/gui/widgets/eab-contact-display.c:714
+#: ../calendar/gui/e-calendar-view.c:2103 ../capplet/anjal-settings-main.c:79
+#: ../shell/main.c:140
 msgid "Birthday"
 msgstr "Aniversari"
 
@@ -275,7 +304,7 @@ msgid "Blog:"
 msgstr "Bloc:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegories..."
@@ -285,24 +314,24 @@ msgid "Calendar:"
 msgstr "Calendari:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:950
+#: ../addressbook/importers/evolution-vcard-importer.c:991
 msgid "Contact"
 msgstr "Contacte"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:623
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:643
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2654
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:654
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:676
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2925
 msgid "Contact Editor"
 msgstr "Editor de contactes"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:295
+#: ../addressbook/gui/merging/eab-contact-merging.c:386
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:502
-#: ../addressbook/gui/widgets/eab-contact-display.c:844
-#: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:832
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
+#: ../addressbook/gui/widgets/eab-contact-display.c:1019
+#: ../smime/lib/e-cert.c:837
 msgid "Email"
 msgstr "AdreÃa electrÃnica"
 
@@ -315,8 +344,10 @@ msgid "Full _Name..."
 msgstr "_Nom complet..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
+#: ../addressbook/gui/widgets/eab-contact-display.c:78
+#: ../addressbook/gui/widgets/eab-contact-display.c:1323
+#: ../widgets/misc/e-contact-map.c:295
 msgid "Home"
 msgstr "Particular"
 
@@ -350,18 +381,14 @@ msgid "Nic_kname:"
 msgstr "Sobre_nom:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:260
-#: ../plugins/groupwise-features/camel-gw-listener.c:429
-#: ../plugins/groupwise-features/camel-gw-listener.c:454
-#: ../plugins/groupwise-features/camel-gw-listener.c:570
 msgid "Notes"
 msgstr "Notes"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:69
-#: ../addressbook/gui/widgets/eab-contact-display.c:359
-#: ../calendar/gui/e-calendar-view.c:1783
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
+#: ../addressbook/gui/widgets/eab-contact-display.c:79
+#: ../addressbook/gui/widgets/eab-contact-display.c:409
+#: ../calendar/gui/e-calendar-view.c:1806
 msgid "Other"
 msgstr "Altres"
 
@@ -386,9 +413,11 @@ msgid "Web addresses"
 msgstr "Adreces web"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:67
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/widgets/eab-contact-display.c:77
+#: ../addressbook/gui/widgets/eab-contact-display.c:694
+#: ../addressbook/gui/widgets/eab-contact-display.c:1320
+#: ../widgets/misc/e-contact-map.c:303
 msgid "Work"
 msgstr "Feina"
 
@@ -413,9 +442,9 @@ msgid "_Blog:"
 msgstr "_Bloc:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:881
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../plugins/itip-formatter/itip-view.c:1922
+#: ../calendar/gui/dialogs/event-page.c:710
+#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../plugins/itip-formatter/itip-view.c:1963
 msgid "_Calendar:"
 msgstr "_Calendari:"
 
@@ -493,74 +522,74 @@ msgstr "_On:"
 msgid "_Zip/Postal Code:"
 msgstr "Codi posta_l:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
-#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:661
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:523
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:662
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:381
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:220
+#: ../addressbook/gui/widgets/eab-gui-util.c:469
 msgid "Error adding contact"
 msgstr "S'ha produÃt un error en afegir el contacte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:235
 msgid "Error modifying contact"
 msgstr "S'ha produÃt un error en modificar el contacte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Error removing contact"
 msgstr "S'ha produÃt un error en suprimir el contacte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:638
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2649
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:670
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2919
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contactes - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3070
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3398
 msgid "Please select an image for this contact"
 msgstr "Seleccioneu una imatge per a aquest contacte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3071
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3399
 msgid "_No image"
 msgstr "Cap _imatge"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3352
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3730
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -568,43 +597,43 @@ msgstr ""
 "Les dades del contacte no sÃn vÃlides:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3356
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "Â%sÂ tÃ un format no vÃlid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3363
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3743
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sÂ%sÂ tÃ un format no vÃlid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3378
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3389
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3756
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3770
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sÂ%sÂ Ãs buit"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3404
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3785
 msgid "Invalid contact."
 msgstr "Contacte no vÃlid."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:392
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:437
 msgid "Contact Quick-Add"
 msgstr "Afegeix un contacte rÃpidament"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:395
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:440
 msgid "_Edit Full"
 msgstr "_Edita sencer"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:443
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:488
 msgid "_Full name"
 msgstr "No_m complet"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:499
 msgid "E_mail"
 msgstr "Correu electrÃ_nic"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:465
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:510
 msgid "_Select Address Book"
 msgstr "_Seleccioneu la llibreta d'adreces"
 
@@ -676,7 +705,7 @@ msgid "_Suffix:"
 msgstr "_Sufix:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:652
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:742
 msgid "Contact List Editor"
 msgstr "Editor de la llista de contactes"
 
@@ -693,7 +722,7 @@ msgid "_List name:"
 msgstr "Nom de la _llista:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:163
 msgid "_Select..."
 msgstr "S_elecciona..."
 
@@ -703,27 +732,26 @@ msgstr ""
 "Escriviu una adreÃa electrÃnica o arrossegueu un con_tacte a la llista de "
 "sota:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:746
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:865
 msgid "Contact List Members"
 msgstr "Membres de la llista de contactes"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1316
-msgid "_Members"
-msgstr "_Membres"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1153
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1440
 msgid "Error adding list"
 msgstr "S'ha produÃt un error en afegir la llista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1167
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1455
 msgid "Error modifying list"
 msgstr "S'ha produÃt un error en modificar la llista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1470
 msgid "Error removing list"
 msgstr "S'ha produÃt un error en suprimir la llista"
 
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1601
+msgid "_Members"
+msgstr "_Membres"
+
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Contacte canviat:"
@@ -740,11 +768,11 @@ msgstr "S'ha detectat un contacte duplicat"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
 msgid ""
-"The name or email of this contact already exists in this folder.  Would you "
-"like to add it anyway?"
+"The name or email of this contact already exists in this folder. Would you "
+"like to save the changes anyway?"
 msgstr ""
 "Ja existeix el nom o l'adreÃa electrÃnica d'aquest contacte en aquesta "
-"carpeta. Voleu afegir-l'hi de totes maneres?"
+"carpeta. Voleu desar els canvis igualment?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
@@ -763,60 +791,54 @@ msgstr ""
 "en aquesta carpeta. Voleu afegir-l'hi de totes maneres?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:241
+#: ../addressbook/gui/merging/eab-contact-merging.c:332
 msgid "_Merge"
 msgstr "_Fusiona"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:166
-#: ../calendar/gui/tasktypes.xml.h:7
-#, c-format
-msgid "Cancelled"
-msgstr "S'ha cancelÂlat"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:224
+#: ../addressbook/gui/merging/eab-contact-merging.c:315
 msgid "Merge Contact"
 msgstr "Fusiona el contacte"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
-#: ../modules/calendar/e-cal-shell-view-actions.c:1682
-#: ../modules/calendar/e-memo-shell-view-actions.c:774
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/addressbook/e-book-shell-view-actions.c:1059
+#: ../modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:987
 msgid "Any field contains"
 msgstr "Qualsevol camp contÃ"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
 msgid "Email begins with"
 msgstr "L'adreÃa electrÃnica comenÃa per"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:922
+#: ../modules/addressbook/e-book-shell-view-actions.c:1073
 msgid "Name contains"
 msgstr "El nom contÃ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:145
+#: ../addressbook/gui/widgets/e-addressbook-model.c:157
 msgid "No contacts"
 msgstr "Cap contacte"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:149
+#: ../addressbook/gui/widgets/e-addressbook-model.c:161
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d contacte"
 msgstr[1] "%d contactes"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:342
+#: ../addressbook/gui/widgets/e-addressbook-model.c:357
 msgid "Error getting book view"
 msgstr "S'ha produÃt un error en obtenir la visualitzaciÃ de la llibreta"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:756
+#: ../addressbook/gui/widgets/e-addressbook-model.c:771
 msgid "Search Interrupted"
 msgstr "S'ha interromput la cerca"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:158
 msgid "Error modifying card"
 msgstr "S'ha produÃt un error en modificar la targeta"
 
@@ -833,7 +855,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "Enganxa els contactes del porta-retalls"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:642
-#: ../modules/addressbook/e-book-shell-view-actions.c:738
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
 msgid "Delete selected contacts"
 msgstr "Suprimeix els contactes seleccionats"
 
@@ -841,34 +863,34 @@ msgstr "Suprimeix els contactes seleccionats"
 msgid "Select all visible contacts"
 msgstr "Selecciona tots els contactes visibles"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1326
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Segur que voleu suprimir aquestes llistes de contactes?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Segur que voleu suprimir aquestes llistes de contactes?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1334
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Segur que voleu suprimir aquesta llista de contactes (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1340
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Segur que voleu suprimir aquests contactes?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1344
 msgid "Are you sure you want to delete this contact?"
 msgstr "Segur que voleu suprimir aquest contacte?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1348
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Segur que voleu suprimir aquest contacte (%s)?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1474
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1504
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -883,16 +905,16 @@ msgstr[1] ""
 "En obrir %d contactes tambÃ s'obriran %d finestres noves.\n"
 "Segur que voleu mostrar tots aquests contactes?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1482
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1512
 msgid "_Don't Display"
 msgstr "_No els mostris"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1483
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
 msgid "Display _All Contacts"
 msgstr "_Mostra tots els contactes"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
 msgid "Assistant"
 msgstr "Assistent"
 
@@ -921,7 +943,7 @@ msgid "Car Phone"
 msgstr "TelÃfon del cotxe"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -929,7 +951,7 @@ msgid "Categories"
 msgstr "Categories"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:680
 msgid "Company"
 msgstr "Empresa"
 
@@ -978,22 +1000,22 @@ msgid "Journal"
 msgstr "Diari"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:544
+#: ../addressbook/gui/widgets/eab-contact-display.c:684
 msgid "Manager"
 msgstr "Director"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
+#: ../addressbook/gui/widgets/eab-contact-display.c:712
 msgid "Mobile Phone"
 msgstr "TelÃfon mÃbil"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:509
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Nickname"
 msgstr "Sobrenom"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:739
 msgid "Note"
 msgstr "Nota"
 
@@ -1022,13 +1044,13 @@ msgid "Radio"
 msgstr "RÃdio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:571
+#: ../calendar/gui/e-meeting-list-view.c:610
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rol"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/eab-contact-display.c:716
 msgid "Spouse"
 msgstr "CÃnjuge"
 
@@ -1058,7 +1080,7 @@ msgstr "Unitat"
 msgid "Web Site"
 msgstr "Lloc web"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1068,7 +1090,7 @@ msgstr ""
 "\n"
 "S'estan cercant els contactes..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1082,7 +1104,7 @@ msgstr ""
 "\n"
 "o feu doble clic per crear-ne un de nou."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1096,7 +1118,7 @@ msgstr ""
 "\n"
 "Feu doble clic aquÃ per crear un contacte nou."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:202
 msgid ""
 "\n"
 "\n"
@@ -1106,7 +1128,7 @@ msgstr ""
 "\n"
 "Cerca el contacte."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:195
+#: ../addressbook/gui/widgets/e-minicard-view.c:204
 msgid ""
 "\n"
 "\n"
@@ -1116,136 +1138,137 @@ msgstr ""
 "\n"
 "Aquesta visualitzaciÃ no tÃ cap element per mostrar."
 
-#: ../addressbook/gui/widgets/e-minicard.c:98
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "AdreÃa electrÃnica de la feina"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "AdreÃa electrÃnica particular"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
-#: ../addressbook/gui/widgets/e-minicard.c:805
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:819
 msgid "Other Email"
 msgstr "Una altra adreÃa electrÃnica"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:184
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
+#: ../addressbook/gui/widgets/ea-minicard-view.c:187
 msgid "evolution address book"
 msgstr "llibreta d'adreces de l'Evolution"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:33
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
 msgid "New Contact"
 msgstr "Contacte nou"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:34
+#: ../addressbook/gui/widgets/ea-minicard-view.c:37
 msgid "New Contact List"
 msgstr "Llista de contactes nova"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:167
+#: ../addressbook/gui/widgets/ea-minicard-view.c:170
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "la carpeta de la llibreta d'adreces %s tÃ %d targeta"
 msgstr[1] "la carpeta de la llibreta d'adreces %s tÃ %d targetes"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:31
+#: ../addressbook/gui/widgets/ea-minicard.c:34
 msgid "Open"
 msgstr "Obre"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:153
+#: ../addressbook/gui/widgets/ea-minicard.c:156
 msgid "Contact List: "
 msgstr "Llista de contactes: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:154
+#: ../addressbook/gui/widgets/ea-minicard.c:157
 msgid "Contact: "
 msgstr "Contacte: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:180
+#: ../addressbook/gui/widgets/ea-minicard.c:183
 msgid "evolution minicard"
 msgstr "minitargeta de l'Evolution"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:182
 msgid "Copy _Email Address"
 msgstr "Copia l'adr_eÃa electrÃnica"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174
-#: ../widgets/misc/e-web-view.c:397
+#: ../addressbook/gui/widgets/eab-contact-display.c:184
+#: ../widgets/misc/e-web-view.c:432
 msgid "Copy the email address to the clipboard"
 msgstr "Copia l'adreÃa electrÃnica al porta-retalls"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:179
-#: ../widgets/misc/e-web-view.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:189
+#: ../widgets/misc/e-web-view.c:437
 msgid "_Send New Message To..."
 msgstr "Envia un mi_ssatge nou a..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:404
+#: ../addressbook/gui/widgets/eab-contact-display.c:191
+#: ../widgets/misc/e-web-view.c:439
 msgid "Send a mail message to this address"
 msgstr "Envia un missatge de correu a aquesta adreÃa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:424
-#: ../addressbook/gui/widgets/eab-contact-display.c:811
-msgid "List Members"
-msgstr "Membres de la llista"
+#: ../addressbook/gui/widgets/eab-contact-display.c:215
+msgid "Open map"
+msgstr "Obre el mapa"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
+msgid "List Members:"
+msgstr "Membres de la llista:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/widgets/eab-contact-display.c:681
 msgid "Department"
 msgstr "Departament"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
 msgid "Profession"
 msgstr "ProfessiÃ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:543
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
 msgid "Position"
 msgstr "PosiciÃ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:546
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
 msgid "Video Chat"
 msgstr "Xat de vÃdeo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
-#: ../calendar/gui/dialogs/calendar-setup.c:376
-#: ../modules/calendar/e-cal-shell-view-actions.c:218
-#: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:497
-#: ../plugins/groupwise-features/camel-gw-listener.c:427
-#: ../plugins/groupwise-features/camel-gw-listener.c:452
-#: ../plugins/groupwise-features/camel-gw-listener.c:568
+#: ../addressbook/gui/widgets/eab-contact-display.c:687
+#: ../calendar/gui/dialogs/calendar-setup.c:449
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
+#: ../modules/calendar/e-cal-shell-view.c:513
+#: ../modules/online-accounts/e-online-accounts-google.c:294
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
-#: ../widgets/misc/e-send-options.c:519
+#: ../widgets/misc/e-send-options.c:528
 msgid "Calendar"
 msgstr "Calendari"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:548
+#: ../addressbook/gui/widgets/eab-contact-display.c:688
 #: ../calendar/gui/dialogs/event-editor.c:123
 #: ../calendar/gui/dialogs/event-editor.c:350
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Lliure/ocupat"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:549
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-display.c:689
+#: ../addressbook/gui/widgets/eab-contact-display.c:711
 msgid "Phone"
 msgstr "TelÃfon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
+#: ../addressbook/gui/widgets/eab-contact-display.c:690
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:551
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:691
+#: ../addressbook/gui/widgets/eab-contact-display.c:713
 msgid "Address"
 msgstr "AdreÃa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:567
+#: ../addressbook/gui/widgets/eab-contact-display.c:708
 msgid "Home Page"
 msgstr "PÃgina personal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:568
+#: ../addressbook/gui/widgets/eab-contact-display.c:709
 msgid "Web Log"
 msgstr "Bloc web"
 
@@ -1253,38 +1276,42 @@ msgstr "Bloc web"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-#: ../capplet/settings/mail-capplet-shell.c:345
-#: ../modules/addressbook/e-book-shell-backend.c:112
-#: ../modules/addressbook/e-book-shell-migrate.c:143
-#: ../modules/calendar/e-cal-shell-backend.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:161
-#: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:117
-#: ../modules/calendar/e-task-shell-backend.c:112
-#: ../modules/calendar/e-task-shell-migrate.c:128
+#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../capplet/settings/mail-capplet-shell.c:385
+#: ../modules/addressbook/e-book-shell-backend.c:120
+#: ../modules/addressbook/e-book-shell-migrate.c:144
+#: ../modules/calendar/e-cal-shell-backend.c:138
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-memo-shell-backend.c:122
+#: ../modules/calendar/e-memo-shell-migrate.c:120
+#: ../modules/calendar/e-task-shell-backend.c:122
+#: ../modules/calendar/e-task-shell-migrate.c:132
 msgid "Personal"
 msgstr "Personal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:829
+#: ../addressbook/gui/widgets/eab-contact-display.c:986
+msgid "List Members"
+msgstr "Membres de la llista"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1004
 msgid "Job Title"
 msgstr "CÃrrec"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:866
+#: ../addressbook/gui/widgets/eab-contact-display.c:1041
 msgid "Home page"
 msgstr "PÃgina personal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:875
+#: ../addressbook/gui/widgets/eab-contact-display.c:1050
 msgid "Blog"
 msgstr "Bloc"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1055
-#: ../widgets/misc/e-web-view.c:883
+#: ../addressbook/gui/widgets/eab-contact-display.c:1248
+#: ../widgets/misc/e-web-view.c:980
 #, c-format
 msgid "Click to mail %s"
 msgstr "Feu clic per enviar un correu a en/na %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1295,7 +1322,7 @@ msgstr ""
 "Carregueu la llibreta d'adreces un cop estigueu en lÃnia per poder baixar el "
 "seu contingut."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:104
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1304,7 +1331,7 @@ msgstr ""
 "No s'ha pogut obrir la llibreta d'adreces. Comproveu que existeix el camÃ %s "
 "i que hi teniu permÃs d'accÃs."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1313,7 +1340,7 @@ msgstr ""
 "utilitzar l'Evolution amb l'LDAP haureu d'instalÂlar un paquet de "
 "l'Evolution preparat per treballar amb l'LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:126
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1321,11 +1348,11 @@ msgstr ""
 "No s'ha pogut obrir la llibreta d'adreces perquÃ l'URI introduÃt Ãs "
 "incorrecte o el servidor no estÃ disponible."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:134
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
 msgid "Detailed error message:"
 msgstr "InformaciÃ detallada de l'error:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:209
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1339,7 +1366,7 @@ msgstr ""
 "a les preferÃncies del servidor de directoris d'aquesta llibreta \n"
 "d'adreces."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:216
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1352,7 +1379,7 @@ msgstr ""
 "servidor de directori de la llibreta d'adreces."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:179
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr ""
@@ -1360,7 +1387,7 @@ msgstr ""
 "%s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr ""
@@ -1368,170 +1395,186 @@ msgstr ""
 "%s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
+#: ../addressbook/gui/widgets/eab-gui-util.c:241
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "S'ha produÃt un error en l'execuciÃ d'aquesta consulta. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:214
+#: ../addressbook/gui/widgets/eab-gui-util.c:263
 msgid "card.vcf"
 msgstr "targeta.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:254
+#: ../addressbook/gui/widgets/eab-gui-util.c:308
 msgid "Select Address Book"
 msgstr "Seleccioneu la llibreta d'adreces"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:317
+#: ../addressbook/gui/widgets/eab-gui-util.c:371
 msgid "list"
 msgstr "llista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:455
+#: ../addressbook/gui/widgets/eab-gui-util.c:552
 msgid "Move contact to"
 msgstr "Mou el contacte a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:457
+#: ../addressbook/gui/widgets/eab-gui-util.c:554
 msgid "Copy contact to"
 msgstr "Copia el contacte a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:460
+#: ../addressbook/gui/widgets/eab-gui-util.c:557
 msgid "Move contacts to"
 msgstr "Mou els contactes a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:559
 msgid "Copy contacts to"
 msgstr "Copia els contactes a"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:39
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
 msgid "Card View"
 msgstr "VisualitzaciÃ de targeta"
 
-#: ../addressbook/importers/evolution-csv-importer.c:721
-#: ../addressbook/importers/evolution-ldif-importer.c:519
-#: ../addressbook/importers/evolution-vcard-importer.c:278
-#: ../calendar/importers/icalendar-importer.c:325
-#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:748
+#: ../addressbook/importers/evolution-ldif-importer.c:546
+#: ../addressbook/importers/evolution-vcard-importer.c:280
+#: ../calendar/importers/icalendar-importer.c:413
+#: ../calendar/importers/icalendar-importer.c:902
+#: ../calendar/importers/icalendar-importer.c:941 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "S'estÃ important..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1016
+#: ../addressbook/importers/evolution-csv-importer.c:1072
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV o Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1017
+#: ../addressbook/importers/evolution-csv-importer.c:1073
 msgid "Outlook CSV and Tab Importer"
 msgstr "Importador de l'Outlook CSV i Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1025
+#: ../addressbook/importers/evolution-csv-importer.c:1081
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV o Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1026
+#: ../addressbook/importers/evolution-csv-importer.c:1082
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Importador de CSV i Tab del Mozilla"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1034
+#: ../addressbook/importers/evolution-csv-importer.c:1090
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV o Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1035
+#: ../addressbook/importers/evolution-csv-importer.c:1091
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importador CSV i Tab de l'Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:753
+#: ../addressbook/importers/evolution-ldif-importer.c:796
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Format d'intercanvi de dades LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:754
+#: ../addressbook/importers/evolution-ldif-importer.c:797
 msgid "Evolution LDIF importer"
 msgstr "Importador LDIF de l'Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:639
+#: ../addressbook/importers/evolution-vcard-importer.c:658
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:640
+#: ../addressbook/importers/evolution-vcard-importer.c:659
 msgid "Evolution vCard Importer"
 msgstr "Importador de vCard de l'Evolution"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:741
+#: ../addressbook/printing/e-contact-print.c:719
 #, c-format
 msgid "Page %d"
 msgstr "PÃgina %d"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:654
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
 msgid "Can not open file"
 msgstr "No es pot obrir el fitxer"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
-msgid "Couldn't get list of address books"
-msgstr "No s'ha pogut obtenir la llista de llibretes d'adreces"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#, c-format
+msgid "Couldn't get list of address books: %s"
+msgstr "No s'ha pogut obtenir la llista de llibretes d'adreces: %s"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#: ../calendar/gui/dialogs/event-page.c:2923
+#: ../calendar/gui/dialogs/memo-page.c:938
+#: ../calendar/gui/dialogs/task-page.c:1759 ../em-format/em-format.c:2324
+#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:658
+#: ../plugins/caldav/caldav-browse-server.c:220
+#: ../plugins/caldav/caldav-browse-server.c:1469 ../plugins/face/face.c:174
+#: ../smime/gui/certificate-manager.c:314
+msgid "Unknown error"
+msgstr "Error desconegut"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
-msgid "failed to open book"
-msgstr "no es pot obrir la llibreta"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#, c-format
+msgid "Failed to open client '%s': %s"
+msgstr "No s'ha pogut obrir el client Â%sÂ: %s"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Specify the output file instead of standard output"
 msgstr "Especifiqueu el fitxer de sortida, en comptes de la sortida estÃndard"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "OUTPUTFILE"
 msgstr "FITXERDESORTIDA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "List local address book folders"
 msgstr "Llista les carpetes de llibretes d'adreces locals"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:66
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "Show cards as vcard or csv file"
 msgstr "Mostra les targetes com a fitxers vCard o csv"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:67
+#: ../addressbook/tools/evolution-addressbook-export.c:68
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:70
+#: ../addressbook/tools/evolution-addressbook-export.c:71
 msgid "Export in asynchronous mode"
 msgstr "Exporta en mode asÃncron"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:73
+#: ../addressbook/tools/evolution-addressbook-export.c:74
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr ""
-"El nombre de targetes en un fitxer de sortida en mode asÃncron; la mida "
-"predeterminada Ãs 100."
+"El nombre de targetes en un fitxer de sortida en mode asÃncron; la mida per "
+"defecte Ãs 100."
 
 # FIXME: s'ha de comprovar si aixÃ hauria de ser nombre o nÃmero (dpm)
-#: ../addressbook/tools/evolution-addressbook-export.c:75
+#: ../addressbook/tools/evolution-addressbook-export.c:76
 msgid "NUMBER"
 msgstr "NOMBRE"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:137
+#: ../addressbook/tools/evolution-addressbook-export.c:139
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "S'ha produÃt un error en els arguments de la lÃnia d'ordres. Feu servir "
 "l'opciÃ --help per consultar-ne l'Ãs."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:151
+#: ../addressbook/tools/evolution-addressbook-export.c:153
 msgid "Only support csv or vcard format."
 msgstr "NomÃs sÃn compatibles els formats csv i vCard."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:160
+#: ../addressbook/tools/evolution-addressbook-export.c:162
 msgid "In async mode, output must be file."
 msgstr "La sortida en mode asÃncron ha de ser un fitxer."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:168
+#: ../addressbook/tools/evolution-addressbook-export.c:170
 msgid "In normal mode, there is no need for the size option."
 msgstr "No cal l'opciÃ de la mida en el mode normal."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:199
+#: ../addressbook/tools/evolution-addressbook-export.c:201
 msgid "Unhandled error"
 msgstr "Error no gestionat"
 
@@ -1651,19 +1694,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Segur que voleu suprimir aquesta cita?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:187
+#: ../calendar/gui/dialogs/delete-comp.c:191
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Segur que voleu suprimir aquesta reuniÃ?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:193
+#: ../calendar/gui/dialogs/delete-comp.c:197
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Segur que voleu suprimir aquesta anotaciÃ?"
 
 #: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:190
+#: ../calendar/gui/dialogs/delete-comp.c:194
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Segur que voleu suprimir aquesta tasca?"
@@ -1934,7 +1977,7 @@ msgstr "Fins que no reinicieu l'Evolution no estaran disponibles les tasques."
 msgid "_Discard Changes"
 msgstr "_Descarta els canvis"
 
-#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:313
+#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:317
 msgid "_Save"
 msgstr "_Desa"
 
@@ -1943,7 +1986,7 @@ msgid "_Save Changes"
 msgstr "De_sa els canvis"
 
 #: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:158
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:165
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Envia"
@@ -1953,46 +1996,33 @@ msgstr "_Envia"
 msgid "_Send Notice"
 msgstr "E_nvia l'avÃs"
 
-#: ../calendar/common/authentication.c:53
-#: ../calendar/gui/e-meeting-store.c:1776
-#: ../plugins/caldav/caldav-browse-server.c:921
-#: ../plugins/google-account-setup/google-source.c:439
-#: ../plugins/publish-calendar/publish-calendar.c:332
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "IntroduÃu la contrasenya"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:107
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuts"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:114
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "hores"
 
-#. Translators: This is the last part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:126
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:377
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-msgid "days"
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:133
+#: ../calendar/gui/dialogs/recurrence-page.c:1190
+msgid "day"
 msgid_plural "days"
 msgstr[0] "dia"
 msgstr[1] "dies"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:313
 msgid "Start time"
 msgstr "Hora d'inici"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
 msgid "Appointments"
 msgstr "Cites"
 
@@ -2002,9 +2032,9 @@ msgstr "Descarta-ho _tot"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1632
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1642
-#: ../plugins/itip-formatter/itip-view.c:1044
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1739
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1749
+#: ../plugins/itip-formatter/itip-view.c:1052
 msgid "Location:"
 msgstr "UbicaciÃ:"
 
@@ -2012,7 +2042,7 @@ msgstr "UbicaciÃ:"
 msgid "Snooze _time:"
 msgstr "_Temps de repeticiÃ:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:909
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:919
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "_Descarta"
@@ -2021,11 +2051,21 @@ msgstr "_Descarta"
 msgid "_Snooze"
 msgstr "Mi_gdiada"
 
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:454
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:350
+#: ../plugins/google-account-setup/google-contacts-source.c:387
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+msgid "days"
+msgstr "dies"
+
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:424
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:453
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:376
+#: ../plugins/google-account-setup/google-contacts-source.c:386
 msgid "hours"
 msgstr "hores"
 
@@ -2036,39 +2076,39 @@ msgstr "ubicaciÃ de la cita"
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:452
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:375
+#: ../plugins/google-account-setup/google-contacts-source.c:385
 msgid "minutes"
 msgstr "minuts"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1486
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1613
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1588
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
 msgid "No summary available."
 msgstr "No hi ha cap resum disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1495
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1497
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
 msgid "No description available."
 msgstr "No hi ha cap descripciÃ disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1505
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1607
 msgid "No location information available."
 msgstr "No hi ha cap informaciÃ d'ubicaciÃ disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1549
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
 #, c-format
-msgid "You have %d alarm"
-msgid_plural "You have %d alarms"
-msgstr[0] "Teniu %d alarma"
-msgstr[1] "Teniu %d alarmes"
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
+msgstr[0] "Teniu %d recordatori"
+msgstr[1] "Teniu %d recordatoris"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1741
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1774
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1853
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1888
 msgid "Warning"
 msgstr "AvÃs"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1745
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1857
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2080,7 +2120,7 @@ msgstr ""
 "es va configurar per enviar un correu. En lloc d'aixÃ, \n"
 "l'Evolution mostrarÃ un quadre de diÃleg de recordatori normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1780
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1894
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2097,17 +2137,17 @@ msgstr ""
 "\n"
 "Segur que voleu executar-lo?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1795
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1909
 msgid "Do not ask me about this program again."
 msgstr "No em facis mÃs preguntes sobre aquest programa."
 
-#: ../calendar/gui/alarm-notify/util.c:44
+#: ../calendar/gui/alarm-notify/util.c:45
 msgid "invalid time"
 msgstr "l'hora no Ãs vÃlida"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:393
-#: ../calendar/gui/misc.c:116
+#: ../calendar/gui/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:405
+#: ../calendar/gui/misc.c:118
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -2115,8 +2155,8 @@ msgstr[0] "%d hora"
 msgstr[1] "%d hores"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:399
-#: ../calendar/gui/misc.c:122
+#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:411
+#: ../calendar/gui/misc.c:124
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -2126,31 +2166,27 @@ msgstr[1] "%d minuts"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:405
-#: ../calendar/gui/misc.c:126
+#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/e-alarm-list.c:417
+#: ../calendar/gui/misc.c:128
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segon"
 msgstr[1] "%d segons"
 
-#: ../calendar/gui/cal-editor-utils.c:105
-msgid "Invalid object"
-msgstr "Objecte no vÃlid"
-
-#: ../calendar/gui/calendar-view-factory.c:117
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Day View"
 msgstr "VisualitzaciÃ de dia"
 
-#: ../calendar/gui/calendar-view-factory.c:120
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Work Week View"
 msgstr "VisualitzaciÃ de setmana laborable"
 
-#: ../calendar/gui/calendar-view-factory.c:123
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Week View"
 msgstr "VisualitzaciÃ setmanal"
 
-#: ../calendar/gui/calendar-view-factory.c:126
+#: ../calendar/gui/calendar-view-factory.c:125
 msgid "Month View"
 msgstr "VisualitzaciÃ mensual"
 
@@ -2179,16 +2215,16 @@ msgstr "Categoria"
 msgid "Classification"
 msgstr "ClassificaciÃ"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:494
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:243
+#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-task-table.c:504
 #: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Confidencial"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../widgets/misc/e-attachment-tree-view.c:522
+#: ../modules/plugin-manager/evolution-plugin-manager.c:71
+#: ../widgets/misc/e-attachment-tree-view.c:526
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "DescripciÃ"
@@ -2210,9 +2246,9 @@ msgstr "Existeix"
 
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:835
+#: ../plugins/publish-calendar/publish-calendar.c:863
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:397
 msgid "Location"
 msgstr "UbicaciÃ"
 
@@ -2221,15 +2257,15 @@ msgstr "UbicaciÃ"
 msgid "Organizer"
 msgstr "Organitzador"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:770 ../calendar/gui/e-task-table.c:493
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:503
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privat"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:761 ../calendar/gui/e-cal-model.c:768
-#: ../calendar/gui/e-task-table.c:492 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:763 ../calendar/gui/e-cal-model.c:770
+#: ../calendar/gui/e-task-table.c:502 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "PÃblic"
 
@@ -2245,7 +2281,7 @@ msgstr "Periodicitat"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Summary"
 msgstr "Resum"
 
@@ -2274,55 +2310,55 @@ msgstr "Ãs"
 msgid "is not"
 msgstr "no Ãs"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:626
-msgid "Edit Alarm"
-msgstr "Edita l'alarma"
+#: ../calendar/gui/dialogs/alarm-dialog.c:636
+msgid "Edit Reminder"
+msgstr "Edita el recordatori"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:817
-#: ../calendar/gui/e-alarm-list.c:435
+#: ../calendar/gui/dialogs/alarm-dialog.c:827
+#: ../calendar/gui/e-alarm-list.c:447
 msgid "Pop up an alert"
 msgstr "Mostra una alerta emergent"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:818
-#: ../calendar/gui/e-alarm-list.c:431
+#: ../calendar/gui/dialogs/alarm-dialog.c:828
+#: ../calendar/gui/e-alarm-list.c:443
 msgid "Play a sound"
 msgstr "Reprodueix un so"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:819
-#: ../calendar/gui/e-alarm-list.c:443
+#: ../calendar/gui/dialogs/alarm-dialog.c:829
+#: ../calendar/gui/e-alarm-list.c:455
 msgid "Run a program"
 msgstr "Executa un programa"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:820
-#: ../calendar/gui/e-alarm-list.c:439
+#: ../calendar/gui/dialogs/alarm-dialog.c:830
+#: ../calendar/gui/e-alarm-list.c:451
 msgid "Send an email"
 msgstr "Envia un correu electrÃnic"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "Add Alarm"
-msgstr "Afegeix una alarma"
+msgid "Add Reminder"
+msgstr "Afegeix un recordatori"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
-msgid "Alarm"
-msgstr "Alarma"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "_Missatge personalitzat"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Custom alarm sound"
-msgstr "So d'alarma personalitzat"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
+msgid "Custom reminder sound"
+msgstr "So del recordatori personalitzat"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Mes_sage:"
 msgstr "Mi_ssatge:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:72
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
 msgid "Options"
 msgstr "Opcions"
 
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../calendar/gui/dialogs/event-editor.c:360
+msgid "Reminder"
+msgstr "Recordatori"
+
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
 msgid "Repeat"
 msgstr "RepeticiÃ"
@@ -2344,8 +2380,8 @@ msgid "_Program:"
 msgstr "_Programa:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the alarm"
-msgstr "_Repeteix l'alarma"
+msgid "_Repeat the reminder"
+msgstr "_Repeteix el recordatori"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
@@ -2367,7 +2403,7 @@ msgstr "dies"
 msgid "end of appointment"
 msgstr "final de la cita"
 
-#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "temps extra per cada"
@@ -2384,7 +2420,7 @@ msgstr "minuts"
 msgid "start of appointment"
 msgstr "inici de la cita"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:245
 msgid "Action/Trigger"
 msgstr "AcciÃ/activador"
 
@@ -2393,404 +2429,414 @@ msgid "A_dd"
 msgstr "A_fegeix"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Alarms"
-msgstr "Alarmes"
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:23
+msgid "Reminders"
+msgstr "Recordatoris"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:159
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "Type:"
 msgstr "Tipus:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:175
-#: ../modules/addressbook/addressbook-config.c:509
+#: ../calendar/gui/dialogs/calendar-setup.c:185
+#: ../modules/addressbook/addressbook-config.c:530
 msgid "_Type:"
 msgstr "_Tipus:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:152
+#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:155
 #: ../modules/addressbook/ldap-config.ui.h:26
-#: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:280
+#: ../widgets/misc/e-signature-script-dialog.c:284
 msgid "_Name:"
 msgstr "_Nom:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:300
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
 "Copi_a el contingut dels calendaris localment per treballar fora de lÃnia"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:278
+#: ../calendar/gui/dialogs/calendar-setup.c:302
 msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 "Cop_ia localment el contingut de la llista de tasques per treballar fora de "
 "lÃnia"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:280
+#: ../calendar/gui/dialogs/calendar-setup.c:304
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 "Cop_ia localment el contingut de la llista d'anotacions per treballar fora "
 "de lÃnia"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:352
+#: ../calendar/gui/dialogs/calendar-setup.c:350
+msgid "Sh_ow reminder notifications"
+msgstr "_Mostra les notificacions de recordatoris"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:425
 msgid "Colo_r:"
 msgstr "C_olor:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:375
-#: ../calendar/gui/dialogs/calendar-setup.c:386
-#: ../calendar/gui/dialogs/calendar-setup.c:397
-#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:51
-#: ../modules/addressbook/addressbook-config.c:1010
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
-#: ../plugins/itip-formatter/itip-formatter.c:2818
+#: ../calendar/gui/dialogs/calendar-setup.c:448
+#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:471
+#: ../mail/em-folder-properties.c:235 ../mail/mail-config.ui.h:52
+#: ../modules/addressbook/addressbook-config.c:1080
+#: ../modules/addressbook/autocompletion-config.c:228
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
+#: ../plugins/itip-formatter/itip-formatter.c:3045
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "General"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:387
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 #: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Task List"
 msgstr "Llista de tasques"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:398
+#: ../calendar/gui/dialogs/calendar-setup.c:472
 msgid "Memo List"
 msgstr "Llista d'anotacions"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:564
 msgid "Calendar Properties"
 msgstr "Propietats del calendari"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:564
 msgid "New Calendar"
 msgstr "Calendari nou"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "Task List Properties"
 msgstr "Propietats de la llista de tasques"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "New Task List"
 msgstr "Llista de tasques nova"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:684
 msgid "Memo List Properties"
 msgstr "Propietats de la llista d'anotacions"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:684
 msgid "New Memo List"
 msgstr "Llista d'anotacions nova"
 
-#: ../calendar/gui/dialogs/changed-comp.c:59
+#: ../calendar/gui/dialogs/changed-comp.c:62
 msgid "This event has been deleted."
 msgstr "S'ha suprimit l'esdeveniment."
 
-#: ../calendar/gui/dialogs/changed-comp.c:63
+#: ../calendar/gui/dialogs/changed-comp.c:66
 msgid "This task has been deleted."
 msgstr "S'ha suprimit la tasca."
 
-#: ../calendar/gui/dialogs/changed-comp.c:67
+#: ../calendar/gui/dialogs/changed-comp.c:70
 msgid "This memo has been deleted."
 msgstr "S'ha suprimit l'anotaciÃ."
 
-#: ../calendar/gui/dialogs/changed-comp.c:76
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Heu realitzat canvis. Voleu desfer els canvis i tancar l'editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:78
+#: ../calendar/gui/dialogs/changed-comp.c:81
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  No heu realitzat cap canvi, voleu tancar l'editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:83
+#: ../calendar/gui/dialogs/changed-comp.c:86
 msgid "This event has been changed."
 msgstr "S'ha modificat l'esdeveniment."
 
-#: ../calendar/gui/dialogs/changed-comp.c:87
+#: ../calendar/gui/dialogs/changed-comp.c:90
 msgid "This task has been changed."
 msgstr "S'ha modificat la tasca."
 
-#: ../calendar/gui/dialogs/changed-comp.c:91
+#: ../calendar/gui/dialogs/changed-comp.c:94
 msgid "This memo has been changed."
 msgstr "S'ha modificat l'anotaciÃ."
 
-#: ../calendar/gui/dialogs/changed-comp.c:100
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Heu realitzat canvis. Voleu desfer els canvis i actualitzar l'editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:102
+#: ../calendar/gui/dialogs/changed-comp.c:105
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  No heu realitzat cap canvi, voleu actualitzar l'editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:445
+#: ../calendar/gui/dialogs/comp-editor-page.c:461
 #, c-format
 msgid "Validation error: %s"
 msgstr "S'ha produÃt un error de validaciÃ: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:260
+#: ../calendar/gui/dialogs/comp-editor.c:273
 msgid "Could not save attachments"
 msgstr "No s'han pogut desar els fitxers adjunts"
 
-#: ../calendar/gui/dialogs/comp-editor.c:535
+#: ../calendar/gui/dialogs/comp-editor.c:613
 msgid "Could not update object"
 msgstr "No s'ha pogut actualitzar l'objecte"
 
-#: ../calendar/gui/dialogs/comp-editor.c:650
+#: ../calendar/gui/dialogs/comp-editor.c:741
 msgid "Edit Appointment"
 msgstr "Edita la cita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:657
+#: ../calendar/gui/dialogs/comp-editor.c:748
 #, c-format
 msgid "Meeting - %s"
 msgstr "ReuniÃ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
+#: ../calendar/gui/dialogs/comp-editor.c:750
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:665
+#: ../calendar/gui/dialogs/comp-editor.c:756
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tasca assignada - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:667
+#: ../calendar/gui/dialogs/comp-editor.c:758
 #, c-format
 msgid "Task - %s"
 msgstr "Tasca - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:672
+#: ../calendar/gui/dialogs/comp-editor.c:763
 #, c-format
 msgid "Memo - %s"
 msgstr "AnotaciÃ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:688
+#: ../calendar/gui/dialogs/comp-editor.c:779
 msgid "No Summary"
 msgstr "Sense resum"
 
-#: ../calendar/gui/dialogs/comp-editor.c:809
+#: ../calendar/gui/dialogs/comp-editor.c:900
 msgid "Keep original item?"
 msgstr "Voleu mantenir l'element original?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1005
-msgid "Click here to close the current window"
-msgstr "Feu clic per tancar la finestra actual"
+#: ../calendar/gui/dialogs/comp-editor.c:1101
+msgid "Close the current window"
+msgstr "Tanca la finestra actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1012 ../mail/e-mail-browser.c:132
-#: ../shell/e-shell-window-actions.c:1433
-#: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:552
-#: ../widgets/misc/e-web-view.c:414 ../widgets/misc/e-web-view.c:1093
+#: ../calendar/gui/dialogs/comp-editor.c:1108 ../mail/e-mail-browser.c:141
+#: ../shell/e-shell-window-actions.c:1455
+#: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
 msgid "Copy the selection"
 msgstr "Copia la selecciÃ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1019 ../mail/e-mail-browser.c:139
-#: ../shell/e-shell-window-actions.c:1440
-#: ../widgets/misc/e-focus-tracker.c:107 ../widgets/misc/e-focus-tracker.c:547
-#: ../widgets/misc/e-web-view.c:1087
+#: ../calendar/gui/dialogs/comp-editor.c:1115 ../mail/e-mail-browser.c:148
+#: ../shell/e-shell-window-actions.c:1462
+#: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:1300
 msgid "Cut the selection"
 msgstr "Retalla la selecciÃ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1026
-#: ../shell/e-shell-window-actions.c:1447
-#: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:562
+#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../shell/e-shell-window-actions.c:1469
+#: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "Suprimeix la selecciÃ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1033
-msgid "Click here to view help available"
-msgstr "Feu clic per veure l'ajuda disponible"
+#: ../calendar/gui/dialogs/comp-editor.c:1129
+msgid "View help"
+msgstr "Visualitza l'ajuda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1040 ../mail/e-mail-browser.c:146
-#: ../shell/e-shell-window-actions.c:1482
-#: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:557
-#: ../widgets/misc/e-web-view.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1136 ../mail/e-mail-browser.c:155
+#: ../shell/e-shell-window-actions.c:1497
+#: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
+#: ../widgets/misc/e-web-view.c:1312
 msgid "Paste the clipboard"
 msgstr "Enganxa el porta-retalls"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1061
-msgid "Click here to save the current window"
-msgstr "Feu clic per desar la finestra actual"
+#: ../calendar/gui/dialogs/comp-editor.c:1157
+msgid "Save current changes"
+msgstr "Desa els canvis actuals"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1068 ../mail/e-mail-browser.c:153
-#: ../shell/e-shell-window-actions.c:1552
-#: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:567
+#: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:162
+#: ../shell/e-shell-window-actions.c:1574
+#: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "Selecciona tot el text"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1075
+#: ../calendar/gui/dialogs/comp-editor.c:1171
 msgid "_Classification"
 msgstr "_ClassificaciÃ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1082
+#: ../calendar/gui/dialogs/comp-editor.c:1178
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:167
+#: ../mail/e-mail-browser.c:176
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1580
+#: ../shell/e-shell-window-actions.c:1602
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Edita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1089 ../mail/e-mail-browser.c:160
-#: ../shell/e-shell-window-actions.c:1587
-#: ../widgets/misc/e-signature-editor.c:217
+#: ../calendar/gui/dialogs/comp-editor.c:1185 ../mail/e-mail-browser.c:169
+#: ../shell/e-shell-window-actions.c:1609
+#: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "_Fitxer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1096
-#: ../shell/e-shell-window-actions.c:1594
+#: ../calendar/gui/dialogs/comp-editor.c:1192
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Help"
 msgstr "A_juda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1199
 msgid "_Insert"
 msgstr "_Insereix"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1110
-#: ../composer/e-composer-actions.c:336
+#: ../calendar/gui/dialogs/comp-editor.c:1206
+#: ../composer/e-composer-actions.c:340
 msgid "_Options"
 msgstr "_Opcions"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117 ../mail/e-mail-browser.c:174
-#: ../shell/e-shell-window-actions.c:1629 ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1213 ../mail/e-mail-browser.c:183
+#: ../shell/e-shell-window-actions.c:1651 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "_Visualitza"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
-#: ../composer/e-composer-actions.c:285
+#: ../calendar/gui/dialogs/comp-editor.c:1223
+#: ../composer/e-composer-actions.c:289
 msgid "_Attachment..."
 msgstr "Fitxer _adjunt..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-msgid "Click here to attach a file"
-msgstr "Feu clic per adjuntar un fitxer"
+#: ../calendar/gui/dialogs/comp-editor.c:1225
+#: ../composer/e-composer-actions.c:291
+#: ../widgets/misc/e-attachment-view.c:439
+msgid "Attach a file"
+msgstr "Adjunta un fitxer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1137
+#: ../calendar/gui/dialogs/comp-editor.c:1233
 msgid "_Categories"
 msgstr "_Categories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139
+#: ../calendar/gui/dialogs/comp-editor.c:1235
 msgid "Toggles whether to display categories"
 msgstr "Commuta la visualitzaciÃ de categories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1241
 msgid "Time _Zone"
 msgstr "Fus h_orari"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1147
+#: ../calendar/gui/dialogs/comp-editor.c:1243
 msgid "Toggles whether the time zone is displayed"
 msgstr "Commuta la visualitzaciÃ del fus horari"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1156
+#: ../calendar/gui/dialogs/comp-editor.c:1252
 msgid "Pu_blic"
 msgstr "PÃ_blic"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1158
+#: ../calendar/gui/dialogs/comp-editor.c:1254
 msgid "Classify as public"
 msgstr "Classifica com a pÃblic"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../calendar/gui/dialogs/comp-editor.c:1259
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1165
+#: ../calendar/gui/dialogs/comp-editor.c:1261
 msgid "Classify as private"
 msgstr "Classifica com a privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1170
+#: ../calendar/gui/dialogs/comp-editor.c:1266
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1172
+#: ../calendar/gui/dialogs/comp-editor.c:1268
 msgid "Classify as confidential"
 msgstr "Classifica com a confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1180
+#: ../calendar/gui/dialogs/comp-editor.c:1276
 msgid "R_ole Field"
 msgstr "Camp del r_ol"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1182
+#: ../calendar/gui/dialogs/comp-editor.c:1278
 msgid "Toggles whether the Role field is displayed"
 msgstr "Commuta la visualitzaciÃ del camp del rol"
 
 # ProvÃ de ÂRÃpondez s'il-vous-plaÃtÂ (dpm)
-#: ../calendar/gui/dialogs/comp-editor.c:1188
+#: ../calendar/gui/dialogs/comp-editor.c:1284
 msgid "_RSVP"
 msgstr "Esperem la vostra _resposta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1190
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Commuta si s'ha de mostrar el camp RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1196
+#: ../calendar/gui/dialogs/comp-editor.c:1292
 msgid "_Status Field"
 msgstr "Camp d'e_stat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1198
+#: ../calendar/gui/dialogs/comp-editor.c:1294
 msgid "Toggles whether the Status field is displayed"
 msgstr "Commuta la visualitzaciÃ del camp d'estat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1204
+#: ../calendar/gui/dialogs/comp-editor.c:1300
 msgid "_Type Field"
 msgstr "Camp de _tipus"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1206
+#: ../calendar/gui/dialogs/comp-editor.c:1302
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Commuta la visualitzaciÃ del camp del tipus d'assistent"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1230
-#: ../composer/e-composer-private.c:73
+#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../composer/e-composer-private.c:77
 msgid "Recent _Documents"
 msgstr "Documents _recents"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1936
-#: ../composer/e-composer-actions.c:504
+#: ../calendar/gui/dialogs/comp-editor.c:2059
+#: ../composer/e-composer-actions.c:508
 msgid "Attach"
 msgstr "Adjunta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2269
-#: ../calendar/gui/dialogs/comp-editor.c:2432
-#: ../calendar/gui/dialogs/comp-editor.c:3407
+#: ../calendar/gui/dialogs/comp-editor.c:2397
+#: ../calendar/gui/dialogs/comp-editor.c:2560
+#: ../calendar/gui/dialogs/comp-editor.c:3549
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Els canvis realitzats en aquest element es descartaran en produir-se una "
 "actualitzaciÃ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3371
-#: ../plugins/prefer-plain/prefer-plain.c:64
+#: ../calendar/gui/dialogs/comp-editor.c:3513
+#: ../plugins/prefer-plain/prefer-plain.c:67
 msgid "attachment"
 msgstr "adjunciÃ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3439
+#: ../calendar/gui/dialogs/comp-editor.c:3581
 msgid "Unable to use current version!"
 msgstr "No s'ha pogut utilitzar la versiÃ actual"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:92
-msgid "Could not open source"
-msgstr "No s'ha pogut obrir la font"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:100
+#: ../calendar/gui/dialogs/copy-source-dialog.c:114
 msgid "Could not open destination"
 msgstr "No s'ha pogut obrir la destinaciÃ"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:109
+#: ../calendar/gui/dialogs/copy-source-dialog.c:130
 msgid "Destination is read only"
 msgstr "La destinaciÃ Ãs de nomÃs lectura"
 
-#: ../calendar/gui/dialogs/delete-comp.c:210
+#: ../calendar/gui/dialogs/copy-source-dialog.c:164
+msgid "Cannot create object"
+msgstr "No es pot crear l'objecte"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:193
+msgid "Could not open source"
+msgstr "No s'ha pogut obrir la font"
+
+#: ../calendar/gui/dialogs/delete-comp.c:214
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "Voleu suprimir aquest element _de totes les bÃsties dels altres destinataris?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:213
+#: ../calendar/gui/dialogs/delete-comp.c:217
 msgid "_Retract comment"
 msgstr "_Retira el missatge"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:56
+#: ../calendar/gui/dialogs/delete-error.c:57
 #, c-format
 msgid "The event could not be deleted due to a dbus error: %s"
 msgstr ""
@@ -2798,62 +2844,62 @@ msgstr ""
 "Bus: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:61
 #, c-format
 msgid "The task could not be deleted due to a dbus error: %s"
 msgstr ""
 "No s'ha pogut suprimir la tasca perquÃ s'ha produÃt un error del D-Bus: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:64
+#: ../calendar/gui/dialogs/delete-error.c:65
 #, c-format
 msgid "The memo could not be deleted due to a dbus error: %s"
 msgstr ""
 "No s'ha pogut suprimir l'anotaciÃ perquÃ s'ha produÃt un error del D-Bus: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:68
+#: ../calendar/gui/dialogs/delete-error.c:69
 #, c-format
 msgid "The item could not be deleted due to a dbus error: %s"
 msgstr ""
 "No s'ha pogut suprimir l'element perquÃ s'ha produÃt un error del D-Bus: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:75
+#: ../calendar/gui/dialogs/delete-error.c:76
 msgid "The event could not be deleted because permission was denied"
 msgstr "No s'ha pogut suprimir l'esdeveniment perquÃ no en teniu permÃs"
 
-#: ../calendar/gui/dialogs/delete-error.c:78
+#: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The task could not be deleted because permission was denied"
 msgstr "No s'ha pogut suprimir la tasca perquÃ no en teniu permÃs"
 
-#: ../calendar/gui/dialogs/delete-error.c:81
+#: ../calendar/gui/dialogs/delete-error.c:82
 msgid "The memo could not be deleted because permission was denied"
 msgstr "No s'ha pogut suprimir l'anotaciÃ perquÃ no en teniu permÃs"
 
-#: ../calendar/gui/dialogs/delete-error.c:84
+#: ../calendar/gui/dialogs/delete-error.c:85
 msgid "The item could not be deleted because permission was denied"
 msgstr "No s'ha pogut suprimir l'element perquÃ no en teniu permÃs"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:93
 #, c-format
 msgid "The event could not be deleted due to an error: %s"
 msgstr "No s'ha pogut suprimir l'esdeveniment perquÃ s'ha produÃt un error: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:96
+#: ../calendar/gui/dialogs/delete-error.c:97
 #, c-format
 msgid "The task could not be deleted due to an error: %s"
 msgstr "No s'ha pogut suprimir la tasca perquÃ s'ha produÃt un error: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:100
+#: ../calendar/gui/dialogs/delete-error.c:101
 #, c-format
 msgid "The memo could not be deleted due to an error: %s"
 msgstr "No s'ha pogut suprimir l'anotaciÃ perquÃ s'ha produÃt un error: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:104
+#: ../calendar/gui/dialogs/delete-error.c:105
 #, c-format
 msgid "The item could not be deleted due to an error: %s"
 msgstr "No s'ha pogut suprimir l'element perquÃ s'ha produÃt un error: %s"
@@ -2871,14 +2917,12 @@ msgid "Enter Delegate"
 msgstr "IntroduÃu el delegat"
 
 #: ../calendar/gui/dialogs/event-editor.c:212
-msgid "_Alarms"
-msgstr "_Alarmes"
+msgid "_Reminders"
+msgstr "_Recordatoris"
 
 #: ../calendar/gui/dialogs/event-editor.c:214
-msgid "Click here to set or unset alarms for this event"
-msgstr ""
-"Feu clic aquÃ per seleccionar o desfer la selecciÃ d'alarmes per a "
-"l'esdeveniment"
+msgid "Set or unset reminders for this event"
+msgstr "Habilita o inhabilita els recordatoris per aquest esdeveniment"
 
 #: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Show Time as _Busy"
@@ -2897,14 +2941,12 @@ msgid "Make this a recurring event"
 msgstr "Fes-lo un esdeveniment periÃdic"
 
 #: ../calendar/gui/dialogs/event-editor.c:240
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "Opcions d'enviament"
 
 #: ../calendar/gui/dialogs/event-editor.c:242
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/task-editor.c:128
 msgid "Insert advanced send options"
 msgstr "Insereix opcions avanÃades d'enviament"
 
@@ -2924,13 +2966,13 @@ msgstr "_Lliure/ocupat"
 msgid "Query free / busy information for the attendees"
 msgstr "SolÂlicita la informaciÃ de lliure/ocupat dels assistents"
 
-#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3172
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3310
 msgid "Appointment"
 msgstr "Cita"
 
 #: ../calendar/gui/dialogs/event-editor.c:384
-#: ../calendar/gui/dialogs/event-page.ui.h:3
-#: ../calendar/gui/e-meeting-list-view.c:148
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/e-meeting-list-view.c:161
 msgid "Attendees"
 msgstr "Assistents"
 
@@ -2938,168 +2980,162 @@ msgstr "Assistents"
 msgid "Print this event"
 msgstr "Imprimeix aquest esdeveniment"
 
-#: ../calendar/gui/dialogs/event-page.c:765
+#: ../calendar/gui/dialogs/event-page.c:558
 msgid "Event's start time is in the past"
 msgstr "La data d'inici de l'esdeveniment es troba en el passat"
 
-#: ../calendar/gui/dialogs/event-page.c:806
+#: ../calendar/gui/dialogs/event-page.c:635
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr ""
 "No es pot editar l'esdeveniment perquÃ el calendari seleccionat Ãs de nomÃs "
 "lectura"
 
-#: ../calendar/gui/dialogs/event-page.c:810
+#: ../calendar/gui/dialogs/event-page.c:639
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr ""
 "No es pot editar l'esdeveniment completament perquÃ no en sou l'organitzador"
 
-#: ../calendar/gui/dialogs/event-page.c:822
-#: ../calendar/gui/dialogs/event-page.c:2780
-msgid "This event has alarms"
-msgstr "Aquest esdeveniment tÃ alarmes"
+#: ../calendar/gui/dialogs/event-page.c:651
+#: ../calendar/gui/dialogs/event-page.c:3080
+msgid "This event has reminders"
+msgstr "Aquest esdeveniment tÃ recordatoris"
 
-#: ../calendar/gui/dialogs/event-page.c:889
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.c:718
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganitzador:"
 
-# FIXME: [l10n-bug] (dpm)
-#: ../calendar/gui/dialogs/event-page.c:936
-msgid "_Delegatees"
-msgstr "De_legats"
-
-#: ../calendar/gui/dialogs/event-page.c:938
-msgid "Atte_ndees"
-msgstr "Assist_ents"
-
-#: ../calendar/gui/dialogs/event-page.c:1155
+#: ../calendar/gui/dialogs/event-page.c:1263
 msgid "Event with no start date"
 msgstr "L'esdeveniment no tÃ data d'inici"
 
-#: ../calendar/gui/dialogs/event-page.c:1158
+#: ../calendar/gui/dialogs/event-page.c:1266
 msgid "Event with no end date"
 msgstr "L'esdeveniment no tÃ data de finalitzaciÃ"
 
-#: ../calendar/gui/dialogs/event-page.c:1329
-#: ../calendar/gui/dialogs/memo-page.c:671
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/event-page.c:1439
+#: ../calendar/gui/dialogs/memo-page.c:708
+#: ../calendar/gui/dialogs/task-page.c:819
 msgid "Start date is wrong"
 msgstr "La data d'inici Ãs errÃnia"
 
-#: ../calendar/gui/dialogs/event-page.c:1339
+#: ../calendar/gui/dialogs/event-page.c:1449
 msgid "End date is wrong"
 msgstr "La data de finalitzaciÃ Ãs errÃnia"
 
-#: ../calendar/gui/dialogs/event-page.c:1362
+#: ../calendar/gui/dialogs/event-page.c:1472
 msgid "Start time is wrong"
 msgstr "L'hora d'inici Ãs errÃnia"
 
-#: ../calendar/gui/dialogs/event-page.c:1369
+#: ../calendar/gui/dialogs/event-page.c:1479
 msgid "End time is wrong"
 msgstr "L'hora de finalitzaciÃ Ãs errÃnia"
 
-#: ../calendar/gui/dialogs/event-page.c:1533
-#: ../calendar/gui/dialogs/memo-page.c:712
-#: ../calendar/gui/dialogs/task-page.c:967
-msgid "The organizer selected no longer has an account."
-msgstr "L'organitzador seleccionat ja no tÃ cap compte."
-
-#: ../calendar/gui/dialogs/event-page.c:1539
-#: ../calendar/gui/dialogs/memo-page.c:718
-#: ../calendar/gui/dialogs/task-page.c:973
+#: ../calendar/gui/dialogs/event-page.c:1644
+#: ../calendar/gui/dialogs/memo-page.c:749
+#: ../calendar/gui/dialogs/task-page.c:873
 msgid "An organizer is required."
 msgstr "Cal un organitzador."
 
-#: ../calendar/gui/dialogs/event-page.c:1564
-#: ../calendar/gui/dialogs/task-page.c:997
+#: ../calendar/gui/dialogs/event-page.c:1678
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "At least one attendee is required."
 msgstr "Cal un assistent com a mÃnim."
 
-#: ../calendar/gui/dialogs/event-page.c:2654
+# FIXME: [l10n-bug] (dpm)
+#: ../calendar/gui/dialogs/event-page.c:1885
+msgid "_Delegatees"
+msgstr "De_legats"
+
+#: ../calendar/gui/dialogs/event-page.c:1887
+msgid "Atte_ndees"
+msgstr "Assist_ents"
+
+#: ../calendar/gui/dialogs/event-page.c:2921
 #, c-format
-msgid "Unable to open the calendar '%s'."
-msgstr "No s'ha pogut obrir el calendari Â%sÂ."
+msgid "Unable to open the calendar '%s': %s"
+msgstr "No s'ha pogut obrir el calendari Â%sÂ: %s"
 
 #. Translators: This string is used when we are creating an Event
-#. (meeting or appointment)  on behalf of some other user
+#. * (meeting or appointment)  on behalf of some other user
 #. Translators: This string is used when we are creating a Memo
-#. on behalf of some other user
+#. * on behalf of some other user
 #. Translators: This string is used when we are creating a Task
-#. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2698
-#: ../calendar/gui/dialogs/memo-page.c:931
-#: ../calendar/gui/dialogs/task-page.c:1787
+#. * on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:2998
+#: ../calendar/gui/dialogs/memo-page.c:1012
+#: ../calendar/gui/dialogs/task-page.c:1838
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Esteu actuant en representaciÃ de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3009
+#: ../calendar/gui/dialogs/event-page.c:3325
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dia abans de la cita"
 msgstr[1] "%d dies abans de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3015
+#: ../calendar/gui/dialogs/event-page.c:3331
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora abans de la cita"
 msgstr[1] "%d hores abans de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3021
+#: ../calendar/gui/dialogs/event-page.c:3337
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minut abans de la cita"
 msgstr[1] "%d minuts abans de la cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3040
+#: ../calendar/gui/dialogs/event-page.c:3356
 msgid "Customize"
 msgstr "Personalitza"
 
-#. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3046
-msgctxt "cal-alarms"
+#. Translators: "None" for "No reminder set"
+#: ../calendar/gui/dialogs/event-page.c:3362
+msgctxt "cal-reminders"
 msgid "None"
 msgstr "Cap"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 #: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:564
 msgid "Atte_ndees..."
 msgstr "Ass_istents..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "Custom Alarm:"
-msgstr "Alarma personalitzada:"
+#: ../calendar/gui/dialogs/event-page.ui.h:5
+msgid "Custom Reminder:"
+msgstr "Recordatori personalitzat:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "Event Description"
 msgstr "DescripciÃ de l'esdeveniment"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Time _zone:"
 msgstr "Fu_s horari:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgid "_Alarm"
-msgstr "_Alarma"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:343
+#: ../widgets/misc/e-attachment-dialog.c:347
 msgid "_Description:"
 msgstr "_DescripciÃ:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
-#: ../plugins/calendar-weather/calendar-weather.c:362
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../plugins/calendar-weather/calendar-weather.c:381
 msgid "_Location:"
 msgstr "_UbicaciÃ:"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+msgid "_Reminder"
+msgstr "_Recordatori"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Summary:"
 msgstr "_Resum:"
@@ -3108,19 +3144,19 @@ msgstr "_Resum:"
 msgid "_Time:"
 msgstr "_Temps:"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:17
 msgctxt "eventpage"
 msgid "1 day before appointment"
 msgstr "1 dia abans de la cita"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:19
 msgctxt "eventpage"
 msgid "1 hour before appointment"
 msgstr "1 hora abans de la cita"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
 msgctxt "eventpage"
 msgid "15 minutes before appointment"
@@ -3138,7 +3174,64 @@ msgctxt "eventpage"
 msgid "until"
 msgstr "fins"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3176
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:1
+msgid "April"
+msgstr "abril"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:2
+msgid "August"
+msgstr "agost"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:3
+msgid "December"
+msgstr "desembre"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:4
+msgid "February"
+msgstr "febrer"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:5
+msgid "January"
+msgstr "gener"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:6
+msgid "July"
+msgstr "juliol"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
+msgid "June"
+msgstr "juny"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:8
+msgid "March"
+msgstr "marÃ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:9
+msgid "May"
+msgstr "maig"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:10
+msgid "November"
+msgstr "novembre"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
+msgid "October"
+msgstr "octubre"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:12
+msgid "Select Date"
+msgstr "Seleccioneu una data"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+msgid "Select _Today"
+msgstr "Selecciona av_ui"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
+msgid "September"
+msgstr "setembre"
+
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3314
 msgid "Memo"
 msgstr "AnotaciÃ"
 
@@ -3146,30 +3239,30 @@ msgstr "AnotaciÃ"
 msgid "Print this memo"
 msgstr "Imprimeix aquesta anotaciÃ"
 
-#: ../calendar/gui/dialogs/memo-page.c:337
+#: ../calendar/gui/dialogs/memo-page.c:405
 msgid "Memo's start date is in the past"
 msgstr "La data d'inici de l'anotaciÃ es troba en el passat"
 
-#: ../calendar/gui/dialogs/memo-page.c:375
+#: ../calendar/gui/dialogs/memo-page.c:442
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr ""
 "No es pot editar l'anotaciÃ perquÃ la llista d'anotacions seleccionada Ãs de "
 "nomÃs lectura"
 
-#: ../calendar/gui/dialogs/memo-page.c:379
+#: ../calendar/gui/dialogs/memo-page.c:446
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr ""
 "No es pot editar l'anotaciÃ completament perquÃ no en sou l'organitzador"
 
-#: ../calendar/gui/dialogs/memo-page.c:892
+#: ../calendar/gui/dialogs/memo-page.c:936
 #, c-format
-msgid "Unable to open memos in '%s'."
-msgstr "No s'han pogut obrir les anotacions a Â%sÂ."
+msgid "Unable to open memos in '%s': %s"
+msgstr "No s'han pogut obrir les anotacions a Â%sÂ: %s"
 
-#: ../calendar/gui/dialogs/memo-page.c:1063 ../em-format/em-format-quote.c:283
-#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2396
-#: ../mail/em-format-html.c:2461 ../mail/em-format-html.c:2485
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:72
+#: ../calendar/gui/dialogs/memo-page.c:1144 ../em-format/em-format-quote.c:319
+#: ../em-format/em-format.c:1062 ../mail/em-format-html.c:2592
+#: ../mail/em-format-html.c:2657 ../mail/em-format-html.c:2681
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "Per a"
 
@@ -3188,56 +3281,56 @@ msgid "T_o:"
 msgstr "_A:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:422
+#: ../calendar/gui/dialogs/task-page.c:333
 #: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_Group:"
-msgstr "_Grup:"
+msgid "_List:"
+msgstr "_Llista:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Esteu modificant un esdeveniment periÃdic. QuÃ voleu modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:57
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Esteu delegant un esdeveniment periÃdic. QuÃ voleu delegar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:61
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Esteu modificant una tasca periÃdica. QuÃ voleu modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:64
+#: ../calendar/gui/dialogs/recur-comp.c:65
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Esteu modificant una anotaciÃ periÃdica. QuÃ voleu modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:90
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This Instance Only"
 msgstr "NomÃs aquest cas"
 
-#: ../calendar/gui/dialogs/recur-comp.c:94
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Prior Instances"
 msgstr "Aquests casos i els anteriors"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:101
 msgid "This and Future Instances"
 msgstr "Aquests casos i els futurs"
 
-#: ../calendar/gui/dialogs/recur-comp.c:105
+#: ../calendar/gui/dialogs/recur-comp.c:106
 msgid "All Instances"
 msgstr "Tots els casos"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:563
+#: ../calendar/gui/dialogs/recurrence-page.c:575
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Aquesta cita contÃ periodicitats que l'Evolution no pot editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:895
+#: ../calendar/gui/dialogs/recurrence-page.c:964
 msgid "Recurrence date is invalid"
 msgstr "La data de periodicitat no Ãs vÃlida"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:935
+#: ../calendar/gui/dialogs/recurrence-page.c:1004
 msgid "End time of the recurrence was before event's start"
 msgstr ""
 "L'hora de finalitzaciÃ de la recurrÃncia era abans de l'inici de "
@@ -3245,7 +3338,7 @@ msgstr ""
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:965
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "on"
 msgstr "el"
 
@@ -3253,7 +3346,7 @@ msgstr "el"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1023
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
 msgid "first"
 msgstr "primer"
 
@@ -3262,7 +3355,7 @@ msgstr "primer"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1103
 msgid "second"
 msgstr "segon"
 
@@ -3270,7 +3363,7 @@ msgstr "segon"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
 msgid "third"
 msgstr "tercer"
 
@@ -3278,7 +3371,7 @@ msgstr "tercer"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 msgid "fourth"
 msgstr "quart"
 
@@ -3286,7 +3379,7 @@ msgstr "quart"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 msgid "fifth"
 msgstr "cinquÃ"
 
@@ -3294,13 +3387,13 @@ msgstr "cinquÃ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
 msgid "last"
 msgstr "Ãltim"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1073
+#: ../calendar/gui/dialogs/recurrence-page.c:1147
 msgid "Other Date"
 msgstr "Una altra data"
 
@@ -3308,7 +3401,7 @@ msgstr "Una altra data"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1079
+#: ../calendar/gui/dialogs/recurrence-page.c:1153
 msgid "1st to 10th"
 msgstr "de l'1 al 10"
 
@@ -3316,7 +3409,7 @@ msgstr "de l'1 al 10"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1159
 msgid "11th to 20th"
 msgstr "de l'11 al 20"
 
@@ -3324,49 +3417,42 @@ msgstr "de l'11 al 20"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
+#: ../calendar/gui/dialogs/recurrence-page.c:1165
 msgid "21st to 31st"
 msgstr "del 21 al 31"
 
-#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-#. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
-#. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-msgid "day"
-msgstr "dia"
-
 # Apareix al mig d'una frase, per aixÃ ha d'anar en minÃscula (dpm)
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1191
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Monday"
 msgstr "dilluns"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1192
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
 msgid "Tuesday"
 msgstr "Dimarts"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1193
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1194
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Thursday"
 msgstr "Dijous"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
 msgid "Friday"
 msgstr "divendres"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/dialogs/recurrence-page.c:1196
 #: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1123
+#: ../calendar/gui/dialogs/recurrence-page.c:1197
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Sunday"
 msgstr "Diumenge"
@@ -3374,31 +3460,31 @@ msgstr "Diumenge"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1245
+#: ../calendar/gui/dialogs/recurrence-page.c:1321
 msgid "on the"
 msgstr "al"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1419
+#: ../calendar/gui/dialogs/recurrence-page.c:1496
 msgid "occurrences"
 msgstr "aparicions"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2123
+#: ../calendar/gui/dialogs/recurrence-page.c:2214
 msgid "Add exception"
 msgstr "Afegeix una excepciÃ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2164
+#: ../calendar/gui/dialogs/recurrence-page.c:2255
 msgid "Could not get a selection to modify."
 msgstr "No s'ha pogut obtenir una selecciÃ per modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2170
+#: ../calendar/gui/dialogs/recurrence-page.c:2261
 msgid "Modify exception"
 msgstr "Modifica l'excepciÃ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2214
+#: ../calendar/gui/dialogs/recurrence-page.c:2305
 msgid "Could not get a selection to delete."
 msgstr "No s'ha pogut obtenir una selecciÃ per suprimir."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2348
+#: ../calendar/gui/dialogs/recurrence-page.c:2439
 msgid "Date/Time"
 msgstr "Data/hora"
 
@@ -3410,7 +3496,7 @@ msgstr "Cada"
 msgid "Exceptions"
 msgstr "Excepcions"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:79
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:82
 msgid "Preview"
 msgstr "PrevisualitzaciÃ"
 
@@ -3460,30 +3546,30 @@ msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "anys"
 
-#: ../calendar/gui/dialogs/send-comp.c:192
-msgid "Send my alarms with this event"
-msgstr "Envia les meves alarmes amb aquest esdeveniment"
+#: ../calendar/gui/dialogs/send-comp.c:198
+msgid "Send my reminders with this event"
+msgstr "Envia els meus recordatoris amb aquest esdeveniment"
 
-#: ../calendar/gui/dialogs/send-comp.c:194
+#: ../calendar/gui/dialogs/send-comp.c:200
 msgid "Notify new attendees _only"
 msgstr "Notifica n_omÃs els assistents nous"
 
-#: ../calendar/gui/dialogs/task-details-page.c:352
-#: ../calendar/gui/dialogs/task-details-page.c:374
+#: ../calendar/gui/dialogs/task-details-page.c:351
+#: ../calendar/gui/dialogs/task-details-page.c:373
 msgid "Completed date is wrong"
 msgstr "La data de finalitzaciÃ Ãs errÃnia"
 
-#: ../calendar/gui/dialogs/task-details-page.c:486
+#: ../calendar/gui/dialogs/task-details-page.c:488
 msgid "Web Page"
 msgstr "PÃgina web"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:294
-#: ../calendar/gui/e-cal-model-tasks.c:439
-#: ../calendar/gui/e-cal-model-tasks.c:713 ../calendar/gui/e-task-table.c:210
-#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:596
-#: ../calendar/gui/print.c:3262 ../mail/em-sync-stream.c:152
+#: ../calendar/gui/e-cal-component-preview.c:300
+#: ../calendar/gui/e-cal-model-tasks.c:440
+#: ../calendar/gui/e-cal-model-tasks.c:725 ../calendar/gui/e-task-table.c:219
+#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:606
+#: ../calendar/gui/print.c:3400 ../mail/em-sync-stream.c:152
 #: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
@@ -3491,59 +3577,59 @@ msgstr "S'ha cancelÂlat"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:291
-#: ../calendar/gui/e-cal-model-tasks.c:437
-#: ../calendar/gui/e-cal-model-tasks.c:711
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
-#: ../calendar/gui/e-task-table.c:208 ../calendar/gui/e-task-table.c:223
-#: ../calendar/gui/e-task-table.c:595 ../calendar/gui/print.c:3259
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:367
+#: ../calendar/gui/e-cal-component-preview.c:297
+#: ../calendar/gui/e-cal-model-tasks.c:438
+#: ../calendar/gui/e-cal-model-tasks.c:723
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
+#: ../calendar/gui/e-task-table.c:217 ../calendar/gui/e-task-table.c:232
+#: ../calendar/gui/e-task-table.c:605 ../calendar/gui/print.c:3397
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:387
 msgid "Completed"
 msgstr "Completada"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:313
-#: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1227 ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1274 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "Alta"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:288
-#: ../calendar/gui/e-cal-model-tasks.c:435
-#: ../calendar/gui/e-cal-model-tasks.c:709
-#: ../calendar/gui/e-cal-model-tasks.c:786 ../calendar/gui/e-task-table.c:206
-#: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:594
-#: ../calendar/gui/print.c:3256
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-model-tasks.c:436
+#: ../calendar/gui/e-cal-model-tasks.c:721
+#: ../calendar/gui/e-cal-model-tasks.c:799 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:604
+#: ../calendar/gui/print.c:3394
 msgid "In Progress"
 msgstr "En procÃs"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:317
-#: ../calendar/gui/e-task-table.c:518 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1225 ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-task-table.c:528 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1272 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "Baixa"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:315
-#: ../calendar/gui/e-cal-model.c:1521 ../calendar/gui/e-task-table.c:517
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1226
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-model.c:1578 ../calendar/gui/e-task-table.c:527
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1273
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "Normal"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:298
-#: ../calendar/gui/e-cal-model-tasks.c:433
-#: ../calendar/gui/e-cal-model-tasks.c:707 ../calendar/gui/e-task-table.c:204
-#: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:593
-#: ../calendar/gui/print.c:3253 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-component-preview.c:304
+#: ../calendar/gui/e-cal-model-tasks.c:434
+#: ../calendar/gui/e-cal-model-tasks.c:719 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:603
+#: ../calendar/gui/print.c:3391 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "No s'ha iniciat"
 
@@ -3556,11 +3642,11 @@ msgid "Stat_us:"
 msgstr "_Estat:"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. Status: Accepted: X   Declined: Y   ...
+#. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1831
-#: ../calendar/gui/e-meeting-list-view.c:596
+#: ../calendar/gui/e-calendar-view.c:1854
+#: ../calendar/gui/e-meeting-list-view.c:635
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
@@ -3569,7 +3655,7 @@ msgstr "Estat"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:519 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:529 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "No s'ha definit"
@@ -3587,63 +3673,62 @@ msgstr "_Prioritat:"
 msgid "_Web Page:"
 msgstr "PÃgina _web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:116
 msgid "_Status Details"
 msgstr "Detalls de l'e_stat"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:118
 msgid "Click to change or view the status details of the task"
 msgstr "Feu clic per canviar o visualitzar els detalls de l'estat de la tasca"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
-#: ../plugins/groupwise-features/mail-send-options.c:200
+#: ../calendar/gui/dialogs/task-editor.c:126
 msgid "_Send Options"
 msgstr "_Opcions d'enviament"
 
-#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:3174
-#: ../widgets/misc/e-send-options.c:526
+#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3312
+#: ../widgets/misc/e-send-options.c:535
 msgid "Task"
 msgstr "Tasca"
 
-#: ../calendar/gui/dialogs/task-editor.c:331
+#: ../calendar/gui/dialogs/task-editor.c:324
 msgid "Task Details"
 msgstr "Detalls de la tasca"
 
-#: ../calendar/gui/dialogs/task-editor.c:373
+#: ../calendar/gui/dialogs/task-editor.c:366
 msgid "Print this task"
 msgstr "Imprimeix aquesta tasca"
 
-#: ../calendar/gui/dialogs/task-page.c:339
+#: ../calendar/gui/dialogs/task-page.c:251
 msgid "Task's start date is in the past"
 msgstr "La data d'inici de la tasca es troba en el passat"
 
-#: ../calendar/gui/dialogs/task-page.c:340
+#: ../calendar/gui/dialogs/task-page.c:252
 msgid "Task's due date is in the past"
 msgstr "La data de venciment de la tasca es troba en el passat"
 
-#: ../calendar/gui/dialogs/task-page.c:375
+#: ../calendar/gui/dialogs/task-page.c:286
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr ""
 "No es pot editar la tasca perquÃ la llista de tasques seleccionada Ãs de "
 "nomÃs lectura"
 
-#: ../calendar/gui/dialogs/task-page.c:379
+#: ../calendar/gui/dialogs/task-page.c:290
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "No es pot editar la tasca completament perquÃ no en sou l'organitzador"
 
-#: ../calendar/gui/dialogs/task-page.c:430
+#: ../calendar/gui/dialogs/task-page.c:341
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organit_zador:"
 
-#: ../calendar/gui/dialogs/task-page.c:878
+#: ../calendar/gui/dialogs/task-page.c:801
 msgid "Due date is wrong"
 msgstr "La data de venciment Ãs errÃnia"
 
-#: ../calendar/gui/dialogs/task-page.c:1744
+#: ../calendar/gui/dialogs/task-page.c:1757
 #, c-format
-msgid "Unable to open tasks in '%s'."
-msgstr "No s'han pogut obrir les tasques a Â%sÂ."
+msgid "Unable to open tasks in '%s': %s"
+msgstr "No s'han pogut obrir les tasques a Â%sÂ: %s"
 
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
@@ -3658,7 +3743,7 @@ msgid "Time zone:"
 msgstr "Fus horari:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:381
+#: ../calendar/gui/e-alarm-list.c:393
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3666,116 +3751,116 @@ msgstr[0] "%d dia"
 msgstr[1] "%d dies"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:387
+#: ../calendar/gui/e-alarm-list.c:399
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d setmana"
 msgstr[1] "%d setmanes"
 
-#: ../calendar/gui/e-alarm-list.c:449
+#: ../calendar/gui/e-alarm-list.c:461
 msgid "Unknown action to be performed"
 msgstr "Es desconeix l'acciÃ a realitzar"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:463
+#: ../calendar/gui/e-alarm-list.c:475
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s abans de comenÃar la cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:468
+#: ../calendar/gui/e-alarm-list.c:480
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s desprÃs de comenÃar la cita"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:475
+#: ../calendar/gui/e-alarm-list.c:487
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s en comenÃar la cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:486
+#: ../calendar/gui/e-alarm-list.c:498
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s abans de finalitzar la cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:491
+#: ../calendar/gui/e-alarm-list.c:503
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s desprÃs de la cita"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:498
+#: ../calendar/gui/e-alarm-list.c:510
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s en finalitzar la cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:522
+#: ../calendar/gui/e-alarm-list.c:534
 #, c-format
 msgid "%s at %s"
 msgstr "%s a %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:530
+#: ../calendar/gui/e-alarm-list.c:542
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s per a un tipus d'activador desconegut"
 
-#: ../calendar/gui/e-cal-component-preview.c:188 ../filter/e-filter-rule.c:667
+#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:671
 msgid "Untitled"
 msgstr "Sense tÃtol"
 
-#: ../calendar/gui/e-cal-component-preview.c:194
+#: ../calendar/gui/e-cal-component-preview.c:200
 msgid "Categories:"
 msgstr "Categories:"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Summary:"
 msgstr "Resum:"
 
-#: ../calendar/gui/e-cal-component-preview.c:243
-#: ../calendar/gui/e-cal-component-preview.c:257
+#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:263
 msgid "Start Date:"
 msgstr "Data d'inici:"
 
-#: ../calendar/gui/e-cal-component-preview.c:271
+#: ../calendar/gui/e-cal-component-preview.c:277
 msgid "Due Date:"
 msgstr "Data de venciment:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:284
-#: ../plugins/itip-formatter/itip-view.c:1075
+#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../plugins/itip-formatter/itip-view.c:1083
 msgid "Status:"
 msgstr "Estat:"
 
-#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-component-preview.c:317
 msgid "Priority:"
 msgstr "Prioritat:"
 
-#: ../calendar/gui/e-cal-component-preview.c:336 ../mail/mail-config.ui.h:36
+#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "DescripciÃ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:367
+#: ../calendar/gui/e-cal-component-preview.c:373
 msgid "Web Page:"
 msgstr "PÃgina web:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:388
 msgid "Created"
 msgstr "Creat"
 
@@ -3794,17 +3879,17 @@ msgstr "Darrera modificaciÃ"
 msgid "Start Date"
 msgstr "Data d'inici"
 
-#: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:570
+#: ../calendar/gui/e-cal-model-calendar.c:188
+#: ../calendar/gui/e-task-table.c:580
 msgid "Free"
 msgstr "Lliure"
 
-#: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:546 ../calendar/gui/e-task-table.c:571
+#: ../calendar/gui/e-cal-model-calendar.c:191
+#: ../calendar/gui/e-meeting-time-sel.c:547 ../calendar/gui/e-task-table.c:581
 msgid "Busy"
 msgstr "Ocupat"
 
-#: ../calendar/gui/e-cal-model-tasks.c:655
+#: ../calendar/gui/e-cal-model-tasks.c:665
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3815,44 +3900,44 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:705
+#: ../calendar/gui/e-cal-model-tasks.c:717
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Cap"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1527
-#: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
-#: ../calendar/gui/e-meeting-store.c:1027
+#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1584
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
+#: ../calendar/gui/e-meeting-store.c:1053
 msgid "Yes"
 msgstr "SÃ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1527
-#: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:189
+#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1584
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "No"
 
-#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:1109 ../e-util/e-charset.c:52
-#: ../modules/plugin-manager/evolution-plugin-manager.c:98
-#: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2485
+#: ../calendar/gui/e-cal-model.c:776 ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
+#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1151
+#: ../calendar/gui/print.c:1168 ../e-util/e-charset.c:52
+#: ../modules/plugin-manager/evolution-plugin-manager.c:102
+#: ../plugins/itip-formatter/itip-formatter.c:469
+#: ../plugins/itip-formatter/itip-formatter.c:2697
 msgid "Unknown"
 msgstr "Es desconeix"
 
-#: ../calendar/gui/e-cal-model.c:1523
+#: ../calendar/gui/e-cal-model.c:1580
 msgid "Recurring"
 msgstr "PeriÃdic"
 
-#: ../calendar/gui/e-cal-model.c:1525
+#: ../calendar/gui/e-cal-model.c:1582
 msgid "Assigned"
 msgstr "Assignat"
 
-#: ../calendar/gui/e-cal-model.c:2643
+#: ../calendar/gui/e-cal-model.c:2937
 #, c-format
 msgid "Opening %s"
 msgstr "S'estÃ obrint %s"
@@ -3880,7 +3965,7 @@ msgstr "Data de venciment"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:394
 msgid "Priority"
 msgstr "Prioritat"
 
@@ -3889,95 +3974,97 @@ msgid "Start date"
 msgstr "Data d'inici"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:559
+#: ../calendar/gui/e-meeting-list-view.c:598
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:580
+#: ../widgets/misc/e-attachment-tree-view.c:584
 msgid "Type"
 msgstr "Tipus"
 
-#: ../calendar/gui/e-calendar-view.c:422
+#: ../calendar/gui/e-calendar-view.c:420
 msgid "Cut selected events to the clipboard"
 msgstr "Retalla els esdeveniments seleccionats al porta-retalls"
 
-#: ../calendar/gui/e-calendar-view.c:428
+#: ../calendar/gui/e-calendar-view.c:426
 msgid "Copy selected events to the clipboard"
 msgstr "Copia els esdeveniments seleccionats al porta-retalls"
 
-#: ../calendar/gui/e-calendar-view.c:434
+#: ../calendar/gui/e-calendar-view.c:432
 msgid "Paste events from the clipboard"
 msgstr "Enganxa els esdeveniments del porta-retalls"
 
-#: ../calendar/gui/e-calendar-view.c:440
+#: ../calendar/gui/e-calendar-view.c:438
 msgid "Delete selected events"
 msgstr "Suprimeix els esdeveniments seleccionats"
 
-#: ../calendar/gui/e-calendar-view.c:459 ../calendar/gui/e-memo-table.c:183
-#: ../calendar/gui/e-task-table.c:261
+#: ../calendar/gui/e-calendar-view.c:457 ../calendar/gui/e-memo-table.c:182
+#: ../calendar/gui/e-task-table.c:269
 msgid "Deleting selected objects"
 msgstr "S'estan suprimint els objectes seleccionats"
 
-#: ../calendar/gui/e-calendar-view.c:653 ../calendar/gui/e-memo-table.c:855
-#: ../calendar/gui/e-task-table.c:1084
+#: ../calendar/gui/e-calendar-view.c:650 ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-task-table.c:1104
 msgid "Updating objects"
 msgstr "S'estan actualitzant els objectes"
 
-#: ../calendar/gui/e-calendar-view.c:1778
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
-#: ../plugins/itip-formatter/itip-formatter.c:2473
+#: ../calendar/gui/e-calendar-view.c:1801
+#: ../calendar/gui/e-meeting-list-view.c:214
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../plugins/itip-formatter/itip-formatter.c:2685
 msgid "Accepted"
 msgstr "Acceptat"
 
-#: ../calendar/gui/e-calendar-view.c:1779
-#: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../plugins/itip-formatter/itip-formatter.c:2479
+#: ../calendar/gui/e-calendar-view.c:1802
+#: ../calendar/gui/e-meeting-list-view.c:215
+#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
+#: ../plugins/itip-formatter/itip-formatter.c:2691
 msgid "Declined"
 msgstr "Declinat"
 
-#: ../calendar/gui/e-calendar-view.c:1780
-#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-calendar-view.c:1803
+#: ../calendar/gui/e-meeting-list-view.c:216
+#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
+#: ../calendar/gui/e-meeting-time-sel.c:546
 msgid "Tentative"
 msgstr "Provisionalment"
 
-#: ../calendar/gui/e-calendar-view.c:1781
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../plugins/itip-formatter/itip-formatter.c:2482
+#: ../calendar/gui/e-calendar-view.c:1804
+#: ../calendar/gui/e-meeting-list-view.c:217
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../plugins/itip-formatter/itip-formatter.c:2694
 msgid "Delegated"
 msgstr "Delegat"
 
-#: ../calendar/gui/e-calendar-view.c:1782
+#: ../calendar/gui/e-calendar-view.c:1805
 msgid "Needs action"
 msgstr "Necessita una acciÃ"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1926 ../calendar/gui/e-memo-table.c:538
-#: ../calendar/gui/e-task-table.c:759
+#. To Translators: It will display
+#. * "Organizer: NameOfTheUser <email ofuser com>"
+#: ../calendar/gui/e-calendar-view.c:1949 ../calendar/gui/e-memo-table.c:539
+#: ../calendar/gui/e-task-table.c:770
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organitzador: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1930 ../calendar/gui/e-memo-table.c:543
-#: ../calendar/gui/e-task-table.c:762
+#. With SunOne accounts, there may be no ':' in
+#. * organizer.value.
+#: ../calendar/gui/e-calendar-view.c:1953 ../calendar/gui/e-memo-table.c:544
+#: ../calendar/gui/e-task-table.c:774
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organitzador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3208
+#: ../calendar/gui/e-calendar-view.c:1969 ../calendar/gui/print.c:3346
 #, c-format
 msgid "Location: %s"
 msgstr "UbicaciÃ: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1977
+#: ../calendar/gui/e-calendar-view.c:2000
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -4006,82 +4093,82 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:745
+#: ../calendar/gui/e-day-view-time-item.c:809
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i divisions de minut"
 
-#: ../calendar/gui/e-day-view-time-item.c:766
+#: ../calendar/gui/e-day-view-time-item.c:830
 msgid "Show the second time zone"
 msgstr "Mostra el segon fus horari"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:783
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
-#: ../modules/calendar/e-calendar-preferences.c:175
-#: ../modules/calendar/e-calendar-preferences.c:224
+#: ../calendar/gui/e-day-view-time-item.c:847
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.c:179
+#: ../modules/calendar/e-calendar-preferences.c:231
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Cap"
 
-#: ../calendar/gui/e-day-view-time-item.c:810
-#: ../calendar/gui/e-timezone-entry.c:316
-#: ../modules/calendar/e-calendar-preferences.c:251
+#: ../calendar/gui/e-day-view-time-item.c:879
+#: ../calendar/gui/e-timezone-entry.c:319
+#: ../modules/calendar/e-calendar-preferences.c:258
 msgid "Select..."
 msgstr "Seleccioneu..."
 
 #. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
+#. * %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
-#: ../calendar/gui/e-day-view-top-item.c:841 ../calendar/gui/e-day-view.c:1793
-#: ../calendar/gui/e-week-view-main-item.c:208 ../calendar/gui/print.c:1866
+#. * month, %B = full month name. You can change the
+#. * order but don't change the specifiers or add
+#. * anything.
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1819
+#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1968
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
+#. * %b = abbreviated month name. Don't use any other specifiers.
 #. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:845 ../calendar/gui/e-day-view.c:1810
-#: ../calendar/gui/e-week-view-main-item.c:217
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:1005
+#. * %d = day of month, %b = abbreviated month name.
+#. * You can change the order but don't change the
+#. * specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1836
+#: ../calendar/gui/e-week-view-main-item.c:224
+#: ../calendar/gui/ea-gnome-calendar.c:204
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
+#. * Don't use any other specifiers.
 #. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:849 ../calendar/gui/e-day-view.c:1826
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:1041
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1852
+#: ../calendar/gui/e-week-view-main-item.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:234
+#: ../modules/calendar/e-cal-shell-view-private.c:1090
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1002 ../calendar/gui/e-week-view.c:757
-#: ../calendar/gui/print.c:920 ../calendar/gui/print.c:939
-#: ../calendar/gui/print.c:2363 ../calendar/gui/print.c:2383
+#: ../calendar/gui/e-day-view.c:1019 ../calendar/gui/e-week-view.c:757
+#: ../calendar/gui/print.c:977 ../calendar/gui/print.c:996
+#: ../calendar/gui/print.c:2484 ../calendar/gui/print.c:2504
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:760
-#: ../calendar/gui/print.c:925 ../calendar/gui/print.c:941
-#: ../calendar/gui/print.c:2368 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-day-view.c:1022 ../calendar/gui/e-week-view.c:760
+#: ../calendar/gui/print.c:982 ../calendar/gui/print.c:998
+#: ../calendar/gui/print.c:2489 ../calendar/gui/print.c:2506
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2606
+#: ../calendar/gui/e-day-view.c:2636
 #, c-format
 msgid "Week %d"
 msgstr "Setmana %d"
@@ -4102,167 +4189,175 @@ msgstr "Participants opcionals"
 msgid "Resources"
 msgstr "Recursos"
 
-#: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
-#: ../calendar/gui/e-meeting-store.c:1021 ../calendar/gui/print.c:1088
+#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
+#: ../calendar/gui/e-meeting-store.c:1047 ../calendar/gui/print.c:1147
 msgid "Individual"
 msgstr "Individual"
 
-#: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
-#: ../calendar/gui/print.c:1089 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
+#: ../calendar/gui/print.c:1148 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Grup"
 
-#: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/print.c:1090
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
+#: ../calendar/gui/print.c:1149
 msgid "Resource"
 msgstr "Recurs"
 
-#: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1091
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
+#: ../calendar/gui/print.c:1150
 msgid "Room"
 msgstr "HabitaciÃ"
 
-#: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/print.c:1105
+#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/print.c:1164
 msgid "Chair"
 msgstr "President"
 
-#: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
-#: ../calendar/gui/e-meeting-store.c:1024 ../calendar/gui/print.c:1106
+#: ../calendar/gui/e-meeting-list-view.c:189
+#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-meeting-store.c:1050 ../calendar/gui/print.c:1165
 msgid "Required Participant"
 msgstr "Participant obligatori"
 
-#: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/print.c:1107
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
+#: ../calendar/gui/print.c:1166
 msgid "Optional Participant"
 msgstr "Participant opcional"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/print.c:1108
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/print.c:1167
 msgid "Non-Participant"
 msgstr "No hi participa"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../calendar/gui/e-meeting-store.c:1034
+#: ../calendar/gui/e-meeting-list-view.c:213
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:1060
 msgid "Needs Action"
 msgstr "Necessita una acciÃ"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:539
+#: ../calendar/gui/e-meeting-list-view.c:578
 msgid "Attendee                          "
 msgstr "Assistent                         "
 
 # ProvÃ de ÂRÃpondez s'il-vous-plaÃtÂ (dpm)
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:584
+#: ../calendar/gui/e-meeting-list-view.c:623
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Esperem la vostra resposta"
 
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
 msgid "In Process"
 msgstr "En curs"
 
-#: ../calendar/gui/e-meeting-store.c:1763
+#: ../calendar/gui/e-meeting-store.c:1876
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "IntroduÃu la contrasenya de l'usuari %s al servidor %s per accedir a la "
 "informaciÃ de lliure/ocupat"
 
-#: ../calendar/gui/e-meeting-store.c:1772
+#: ../calendar/gui/e-meeting-store.c:1886
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Motiu de la fallada: %s"
 
+#: ../calendar/gui/e-meeting-store.c:1891
+#: ../plugins/caldav/caldav-browse-server.c:957
+#: ../plugins/google-account-setup/google-source.c:460
+#: ../plugins/publish-calendar/publish-calendar.c:345
+#: ../smime/gui/component.c:53
+msgid "Enter password"
+msgstr "IntroduÃu la contrasenya"
+
 #. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:431
-#: ../calendar/gui/e-meeting-time-sel.c:2380
+#. * %B = full month name, %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:2379
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
+#. * name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:435
-#: ../calendar/gui/e-meeting-time-sel.c:2411
+#. * %m = month number, %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:449
+#: ../calendar/gui/e-meeting-time-sel.c:2410
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:439
+#. * %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:453
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:547
+#: ../calendar/gui/e-meeting-time-sel.c:548
 msgid "Out of Office"
 msgstr "Fora de l'oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:548
+#: ../calendar/gui/e-meeting-time-sel.c:549
 msgid "No Information"
 msgstr "Cap informaciÃ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:584
+#: ../calendar/gui/e-meeting-time-sel.c:585
 msgid "O_ptions"
 msgstr "O_pcions"
 
-#: ../calendar/gui/e-meeting-time-sel.c:602
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _only working hours"
 msgstr "M_ostra nomÃs les hores de treball"
 
-#: ../calendar/gui/e-meeting-time-sel.c:613
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "Show _zoomed out"
 msgstr "Reduei_x l'ampliaciÃ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:629
+#: ../calendar/gui/e-meeting-time-sel.c:630
 msgid "_Update free/busy"
 msgstr "Act_ualitza lliure/ocupat"
 
-#: ../calendar/gui/e-meeting-time-sel.c:644
+#: ../calendar/gui/e-meeting-time-sel.c:645
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:662
+#: ../calendar/gui/e-meeting-time-sel.c:663
 msgid "_Autopick"
 msgstr "Tria _automÃtica"
 
-#: ../calendar/gui/e-meeting-time-sel.c:677
+#: ../calendar/gui/e-meeting-time-sel.c:678
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:695
+#: ../calendar/gui/e-meeting-time-sel.c:696
 msgid "_All people and resources"
 msgstr "Tot_es les persones i recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:705
+#: ../calendar/gui/e-meeting-time-sel.c:706
 msgid "All _people and one resource"
 msgstr "Totes les _persones i un recurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:715
+#: ../calendar/gui/e-meeting-time-sel.c:716
 msgid "_Required people"
 msgstr "Pe_rsones necessÃries"
 
-#: ../calendar/gui/e-meeting-time-sel.c:724
+#: ../calendar/gui/e-meeting-time-sel.c:725
 msgid "Required people and _one resource"
 msgstr "Pers_ones necessÃries i un recurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:773
+#: ../calendar/gui/e-meeting-time-sel.c:774
 msgid "_Start time:"
 msgstr "Hora d'_inici:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:813
+#: ../calendar/gui/e-meeting-time-sel.c:814
 msgid "_End time:"
 msgstr "Hora d_e finalitzaciÃ:"
 
@@ -4290,47 +4385,47 @@ msgstr "Idioma"
 msgid "Member"
 msgstr "Membre"
 
-#: ../calendar/gui/e-memo-table.c:419
-#: ../modules/calendar/e-cal-shell-content.c:469
-#: ../modules/calendar/e-memo-shell-view-actions.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
-#: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:438
+#: ../calendar/gui/e-memo-table.c:420
+#: ../modules/calendar/e-cal-shell-content.c:473
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
+#: ../modules/calendar/e-memo-shell-view.c:293
+#: ../plugins/caldav/caldav-browse-server.c:458
 msgid "Memos"
 msgstr "Anotacions"
 
-#: ../calendar/gui/e-memo-table.c:500 ../calendar/gui/e-task-table.c:723
+#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:733
 msgid "* No Summary *"
 msgstr "* Sense resum *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:585 ../calendar/gui/e-task-table.c:803
+#: ../calendar/gui/e-memo-table.c:588 ../calendar/gui/e-task-table.c:817
 msgid "Start: "
 msgstr "Inici: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:604 ../calendar/gui/e-task-table.c:821
+#: ../calendar/gui/e-memo-table.c:607 ../calendar/gui/e-task-table.c:835
 msgid "Due: "
 msgstr "Venciment: "
 
-#: ../calendar/gui/e-memo-table.c:720
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Cut selected memos to the clipboard"
 msgstr "Retalla les anotacions seleccionades al porta-retalls"
 
-#: ../calendar/gui/e-memo-table.c:726
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Copy selected memos to the clipboard"
 msgstr "Copia les anotacions seleccionades al porta-retalls"
 
-#: ../calendar/gui/e-memo-table.c:732
+#: ../calendar/gui/e-memo-table.c:738
 msgid "Paste memos from the clipboard"
 msgstr "Enganxa les anotacions del porta-retalls"
 
-#: ../calendar/gui/e-memo-table.c:738
-#: ../modules/calendar/e-memo-shell-view-actions.c:572
+#: ../calendar/gui/e-memo-table.c:744
+#: ../modules/calendar/e-memo-shell-view-actions.c:586
 msgid "Delete selected memos"
 msgstr "Suprimeix les anotacions seleccionades"
 
-#: ../calendar/gui/e-memo-table.c:744
+#: ../calendar/gui/e-memo-table.c:750
 msgid "Select all visible memos"
 msgstr "Selecciona totes les anotacions visibles"
 
@@ -4339,115 +4434,113 @@ msgid "Click to add a memo"
 msgstr "Feu clic per afegir una anotaciÃ"
 
 #. Translators: "%d%%" is the percentage of a task done.
-#. %d is the actual value, %% is replaced with a percent sign.
-#. Result values will be 0%, 10%, 20%, ... 100%
+#. * %d is the actual value, %% is replaced with a percent sign.
+#. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:545
+#: ../calendar/gui/e-task-table.c:555
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:642 ../calendar/gui/print.c:2159
-#: ../calendar/importers/icalendar-importer.c:81
-#: ../calendar/importers/icalendar-importer.c:828
-#: ../modules/calendar/e-cal-shell-content.c:430
-#: ../modules/calendar/e-task-shell-view-actions.c:241
-#: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view.c:444
-#: ../plugins/caldav/caldav-browse-server.c:436
-#: ../plugins/groupwise-features/camel-gw-listener.c:428
-#: ../plugins/groupwise-features/camel-gw-listener.c:569
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
+#: ../calendar/gui/e-task-table.c:652 ../calendar/gui/print.c:2273
+#: ../calendar/importers/icalendar-importer.c:85
+#: ../calendar/importers/icalendar-importer.c:1043
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-cal-shell-content.c:434
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
+#: ../modules/calendar/e-task-shell-view.c:448
+#: ../plugins/caldav/caldav-browse-server.c:456
 msgid "Tasks"
 msgstr "Tasques"
 
-#: ../calendar/gui/e-task-table.c:949
+#: ../calendar/gui/e-task-table.c:968
 msgid "Cut selected tasks to the clipboard"
 msgstr "Retalla les tasques seleccionades al porta-retalls"
 
-#: ../calendar/gui/e-task-table.c:955
+#: ../calendar/gui/e-task-table.c:974
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copia les tasques seleccionades al porta-retalls"
 
-#: ../calendar/gui/e-task-table.c:961
+#: ../calendar/gui/e-task-table.c:980
 msgid "Paste tasks from the clipboard"
 msgstr "Enganxa les tasques del porta-retalls"
 
-#: ../calendar/gui/e-task-table.c:967
-#: ../modules/calendar/e-task-shell-view-actions.c:696
+#: ../calendar/gui/e-task-table.c:986
+#: ../modules/calendar/e-task-shell-view-actions.c:710
 msgid "Delete selected tasks"
 msgstr "Suprimeix la tasca seleccionada"
 
-#: ../calendar/gui/e-task-table.c:973
+#: ../calendar/gui/e-task-table.c:992
 msgid "Select all visible tasks"
 msgstr "Selecciona totes les tasques visibles"
 
-#: ../calendar/gui/e-timezone-entry.c:327
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "Seleccioneu un fus horari"
 
 #. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:225 ../calendar/gui/print.c:1847
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../calendar/gui/e-week-view-main-item.c:232 ../calendar/gui/print.c:1949
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:286
-msgid "It has alarms."
-msgstr "TÃ alarmes."
+#: ../calendar/gui/ea-cal-view-event.c:290
+msgid "It has reminders."
+msgstr "TÃ recordatoris."
 
-#: ../calendar/gui/ea-cal-view-event.c:289
+#: ../calendar/gui/ea-cal-view-event.c:293
 msgid "It has recurrences."
 msgstr "TÃ recurrÃncies."
 
-#: ../calendar/gui/ea-cal-view-event.c:292
+#: ../calendar/gui/ea-cal-view-event.c:296
 msgid "It is a meeting."
 msgstr "Ãs una reuniÃ."
 
-#: ../calendar/gui/ea-cal-view-event.c:298
+#: ../calendar/gui/ea-cal-view-event.c:303
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Esdeveniment del calendari: el resum Ãs %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:300
+#: ../calendar/gui/ea-cal-view-event.c:306
 msgid "Calendar Event: It has no summary."
 msgstr "Esdeveniment de calendari: no tÃ resum."
 
-#: ../calendar/gui/ea-cal-view-event.c:322
+#: ../calendar/gui/ea-cal-view-event.c:328
 msgid "calendar view event"
 msgstr "visualitzaciÃ del calendari per a un esdeveniment"
 
-#: ../calendar/gui/ea-cal-view-event.c:551
+#: ../calendar/gui/ea-cal-view-event.c:557
 msgid "Grab Focus"
 msgstr "Captura el focus"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:315
 msgid "New Appointment"
 msgstr "Cita nova"
 
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:316
 msgid "New All Day Event"
 msgstr "Esdeveniment de tot el dia nou"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:317
 msgid "New Meeting"
 msgstr "ReuniÃ nova"
 
-#: ../calendar/gui/ea-cal-view.c:305
+#: ../calendar/gui/ea-cal-view.c:318
 msgid "Go to Today"
 msgstr "VÃs a avui"
 
-#: ../calendar/gui/ea-cal-view.c:306
+#: ../calendar/gui/ea-cal-view.c:319
 msgid "Go to Date"
 msgstr "VÃs a una data"
 
-#: ../calendar/gui/ea-day-view-main-item.c:308
-#: ../calendar/gui/ea-week-view-main-item.c:340
+#: ../calendar/gui/ea-day-view-main-item.c:318
+#: ../calendar/gui/ea-week-view-main-item.c:344
 msgid "a table to view and select the current time range"
 msgstr "una taula per visualitzar i seleccionar l'interval de temps actual"
 
-#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:147
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -4456,14 +4549,14 @@ msgstr[1] "TÃ %d esdeveniments."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:154
 msgid "It has no events."
 msgstr "No tÃ esdeveniments."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:160
+#: ../calendar/gui/ea-day-view.c:163
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "VisualitzaciÃ de setmana laboral: %s. %s"
@@ -4471,163 +4564,106 @@ msgstr "VisualitzaciÃ de setmana laboral: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:166
+#: ../calendar/gui/ea-day-view.c:169
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "VisualitzaciÃ de dia: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:200
+#: ../calendar/gui/ea-day-view.c:203
 msgid "calendar view for a work week"
 msgstr "visualitzaciÃ del calendari per a una setmana laboral"
 
-#: ../calendar/gui/ea-day-view.c:202
+#: ../calendar/gui/ea-day-view.c:205
 msgid "calendar view for one or more days"
 msgstr "visualitzaciÃ de calendari per a un o mÃs dies"
 
-#: ../calendar/gui/ea-gnome-calendar.c:46
-#: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:860
+#: ../calendar/gui/ea-gnome-calendar.c:50
+#: ../calendar/gui/ea-gnome-calendar.c:58
+#: ../calendar/importers/icalendar-importer.c:1077
 msgid "Gnome Calendar"
 msgstr "Calendari del GNOME"
 
-#: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:1001
+#: ../calendar/gui/ea-gnome-calendar.c:201
+#: ../modules/calendar/e-cal-shell-view-private.c:1050
 msgid "%A %d %b %Y"
 msgstr "%A, %d de %B del %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../calendar/gui/ea-gnome-calendar.c:207
-#: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:1008
-#: ../modules/calendar/e-cal-shell-view-private.c:1014
-#: ../modules/calendar/e-cal-shell-view-private.c:1017
+#: ../calendar/gui/ea-gnome-calendar.c:206
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../calendar/gui/ea-gnome-calendar.c:213
+#: ../modules/calendar/e-cal-shell-view-private.c:1057
+#: ../modules/calendar/e-cal-shell-view-private.c:1063
+#: ../modules/calendar/e-cal-shell-view-private.c:1066
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:226
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../calendar/gui/ea-gnome-calendar.c:238
-#: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:1034
-#: ../modules/calendar/e-cal-shell-view-private.c:1045
-#: ../modules/calendar/e-cal-shell-view-private.c:1052
-#: ../modules/calendar/e-cal-shell-view-private.c:1055
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../calendar/gui/ea-gnome-calendar.c:236
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../calendar/gui/ea-gnome-calendar.c:244
+#: ../modules/calendar/e-cal-shell-view-private.c:1083
+#: ../modules/calendar/e-cal-shell-view-private.c:1094
+#: ../modules/calendar/e-cal-shell-view-private.c:1101
+#: ../modules/calendar/e-cal-shell-view-private.c:1104
 msgid "%d %b %Y"
 msgstr "%d de %B del %Y"
 
-#: ../calendar/gui/ea-jump-button.c:147
+#: ../calendar/gui/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "BotÃ per saltar"
 
-#: ../calendar/gui/ea-jump-button.c:156
+#: ../calendar/gui/ea-jump-button.c:159
 msgid "Click here, you can find more events."
 msgstr "Feu clic aquÃ per veure mÃs esdeveniments."
 
-#: ../calendar/gui/ea-week-view.c:155
+#: ../calendar/gui/ea-week-view.c:159
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "VisualitzaciÃ mensual: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:159
+#: ../calendar/gui/ea-week-view.c:163
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "VisualitzaciÃ setmanal: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:193
+#: ../calendar/gui/ea-week-view.c:197
 msgid "calendar view for a month"
 msgstr "visualitzaciÃ del calendari per a un mes"
 
-#: ../calendar/gui/ea-week-view.c:195
+#: ../calendar/gui/ea-week-view.c:199
 msgid "calendar view for one or more weeks"
 msgstr "visualitzaciÃ del calendari per a una o mÃs setmanes"
 
-#: ../calendar/gui/gnome-cal.c:2198
+#: ../calendar/gui/gnome-cal.c:2250
 msgid "Purging"
 msgstr "S'estÃ buidant"
 
-#: ../calendar/gui/goto-dialog.ui.h:1
-msgid "April"
-msgstr "abril"
-
-#: ../calendar/gui/goto-dialog.ui.h:2
-msgid "August"
-msgstr "agost"
-
-#: ../calendar/gui/goto-dialog.ui.h:3
-msgid "December"
-msgstr "desembre"
-
-#: ../calendar/gui/goto-dialog.ui.h:4
-msgid "February"
-msgstr "febrer"
-
-#: ../calendar/gui/goto-dialog.ui.h:5
-msgid "January"
-msgstr "gener"
-
-#: ../calendar/gui/goto-dialog.ui.h:6
-msgid "July"
-msgstr "juliol"
-
-#: ../calendar/gui/goto-dialog.ui.h:7
-msgid "June"
-msgstr "juny"
-
-#: ../calendar/gui/goto-dialog.ui.h:8
-msgid "March"
-msgstr "marÃ"
-
-#: ../calendar/gui/goto-dialog.ui.h:9
-msgid "May"
-msgstr "maig"
-
-#: ../calendar/gui/goto-dialog.ui.h:10
-msgid "November"
-msgstr "novembre"
-
-#: ../calendar/gui/goto-dialog.ui.h:11
-msgid "October"
-msgstr "octubre"
-
-#: ../calendar/gui/goto-dialog.ui.h:12
-msgid "Select Date"
-msgstr "Seleccioneu una data"
-
-#: ../calendar/gui/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1318
-msgid "Select _Today"
-msgstr "Selecciona av_ui"
-
-#: ../calendar/gui/goto-dialog.ui.h:14
-msgid "September"
-msgstr "setembre"
-
-#: ../calendar/gui/itip-utils.c:422 ../calendar/gui/itip-utils.c:477
-#: ../calendar/gui/itip-utils.c:573
+#: ../calendar/gui/itip-utils.c:511 ../calendar/gui/itip-utils.c:566
+#: ../calendar/gui/itip-utils.c:669
 msgid "An organizer must be set."
 msgstr "S'ha d'especificar un organitzador."
 
-#: ../calendar/gui/itip-utils.c:469
+#: ../calendar/gui/itip-utils.c:558
 msgid "At least one attendee is necessary"
 msgstr "Cal un assistent com a mÃnim"
 
-#: ../calendar/gui/itip-utils.c:657 ../calendar/gui/itip-utils.c:811
+#: ../calendar/gui/itip-utils.c:755 ../calendar/gui/itip-utils.c:916
 msgid "Event information"
 msgstr "InformaciÃ de l'esdeveniment"
 
-#: ../calendar/gui/itip-utils.c:660 ../calendar/gui/itip-utils.c:814
+#: ../calendar/gui/itip-utils.c:758 ../calendar/gui/itip-utils.c:919
 msgid "Task information"
 msgstr "InformaciÃ de la tasca"
 
-#: ../calendar/gui/itip-utils.c:663 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:761 ../calendar/gui/itip-utils.c:922
 msgid "Memo information"
 msgstr "InformaciÃ de l'anotaciÃ"
 
-#: ../calendar/gui/itip-utils.c:666 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:764 ../calendar/gui/itip-utils.c:940
 msgid "Free/Busy information"
 msgstr "InformaciÃ lliure/ocupat"
 
-#: ../calendar/gui/itip-utils.c:669
+#: ../calendar/gui/itip-utils.c:767
 msgid "Calendar information"
 msgstr "InformaciÃ del calendari"
 
@@ -4635,7 +4671,7 @@ msgstr "InformaciÃ del calendari"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:706
+#: ../calendar/gui/itip-utils.c:804
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Acceptada"
@@ -4644,7 +4680,7 @@ msgstr "Acceptada"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:811
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Acceptada provisionalment"
@@ -4656,7 +4692,7 @@ msgstr "Acceptada provisionalment"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720 ../calendar/gui/itip-utils.c:768
+#: ../calendar/gui/itip-utils.c:818 ../calendar/gui/itip-utils.c:866
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Declinada"
@@ -4665,7 +4701,7 @@ msgstr "Declinada"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:825
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegada"
@@ -4673,7 +4709,7 @@ msgstr "Delegada"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:740
+#: ../calendar/gui/itip-utils.c:838
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Actualitzada"
@@ -4681,7 +4717,7 @@ msgstr "Actualitzada"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:845
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "CancelÂlada"
@@ -4689,7 +4725,7 @@ msgstr "CancelÂlada"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:754
+#: ../calendar/gui/itip-utils.c:852
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Actualitzada"
@@ -4697,240 +4733,253 @@ msgstr "Actualitzada"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:761
+#: ../calendar/gui/itip-utils.c:859
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contraproposta"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:937
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "InformaciÃ lliure/ocupat (%s a %s)"
 
-#: ../calendar/gui/itip-utils.c:840
+#: ../calendar/gui/itip-utils.c:945
 msgid "iCalendar information"
 msgstr "InformaciÃ de l'iCalendar"
 
-#: ../calendar/gui/itip-utils.c:865
+#: ../calendar/gui/itip-utils.c:970
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "No s'ha pogut reservar un recurs, l'esdeveniment nou coincideix amb un altre."
 
-#: ../calendar/gui/itip-utils.c:869
+#: ../calendar/gui/itip-utils.c:974
 msgid "Unable to book a resource, error: "
 msgstr "No s'ha pogut reservar un recurs. L'error fou: "
 
-#: ../calendar/gui/itip-utils.c:1032
+#: ../calendar/gui/itip-utils.c:1137
 msgid "You must be an attendee of the event."
 msgstr "Heu de ser un assistent de l'esdeveniment."
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:581
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:581
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:581
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:581
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:581
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:582
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:582
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:582
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:582
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:582
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:583
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:583
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:583
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:583
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:583
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:584
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:584
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:584
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:584
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:584
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:585
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:585
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:585
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:585
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:585
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:586
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:586
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:586
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:586
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:586
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:555
+#: ../calendar/gui/print.c:587
 msgid "31st"
 msgstr "31"
 
-#: ../calendar/gui/print.c:612
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:644
 msgid "Su"
 msgstr "dg"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:644
 msgid "Mo"
 msgstr "dl"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:644
 msgid "Tu"
 msgstr "dm"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:644
 msgid "We"
 msgstr "dc"
 
-#: ../calendar/gui/print.c:613
+#: ../calendar/gui/print.c:645
 msgid "Th"
 msgstr "dj"
 
-#: ../calendar/gui/print.c:613
+#: ../calendar/gui/print.c:645
 msgid "Fr"
 msgstr "dv"
 
-#: ../calendar/gui/print.c:613
+#: ../calendar/gui/print.c:645
 msgid "Sa"
 msgstr "ds"
 
-#: ../calendar/gui/print.c:3001
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:3139
 msgid " to "
 msgstr " a "
 
-#: ../calendar/gui/print.c:3011
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:3149
 msgid " (Completed "
 msgstr " (Completada "
 
-#: ../calendar/gui/print.c:3017
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:3155
 msgid "Completed "
 msgstr "Completada "
 
-#: ../calendar/gui/print.c:3027
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:3165
 msgid " (Due "
 msgstr " (Venciment "
 
-#: ../calendar/gui/print.c:3034
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:3172
 msgid "Due "
 msgstr "Venciment "
 
-#: ../calendar/gui/print.c:3199
+#: ../calendar/gui/print.c:3337
 #, c-format
 msgid "Summary: %s"
 msgstr "Resum: %s"
 
-#: ../calendar/gui/print.c:3226
+#: ../calendar/gui/print.c:3364
 msgid "Attendees: "
 msgstr "Assistents: "
 
-#: ../calendar/gui/print.c:3269
+#: ../calendar/gui/print.c:3407
 #, c-format
 msgid "Status: %s"
 msgstr "Estat: %s"
 
-#: ../calendar/gui/print.c:3284
+#: ../calendar/gui/print.c:3422
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritat: %s"
 
-#: ../calendar/gui/print.c:3302
+#: ../calendar/gui/print.c:3440
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percentatge completat: %i"
 
-#: ../calendar/gui/print.c:3313
+#: ../calendar/gui/print.c:3451
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3326
+#: ../calendar/gui/print.c:3464
 #, c-format
 msgid "Categories: %s"
 msgstr "Categories: %s"
 
-#: ../calendar/gui/print.c:3337
+#: ../calendar/gui/print.c:3475
 msgid "Contacts: "
 msgstr "Contactes: "
 
@@ -4939,6 +4988,10 @@ msgstr "Contactes: "
 msgid "% Completed"
 msgstr "% acabat"
 
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Cancelled"
+msgstr "S'ha cancelÂlat"
+
 #: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "En procÃs"
@@ -4951,185 +5004,185 @@ msgstr "Ãs mÃs gran que"
 msgid "is less than"
 msgstr "Ãs mÃs petita que"
 
-#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:84
 msgid "Appointments and Meetings"
 msgstr "Cites i reunions"
 
-#: ../calendar/importers/icalendar-importer.c:350
-#: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1958
+#: ../calendar/importers/icalendar-importer.c:435
+#: ../calendar/importers/icalendar-importer.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:2170
 msgid "Opening calendar"
 msgstr "Calendari d'obertura"
 
-#: ../calendar/importers/icalendar-importer.c:493
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "iCalendar files (.ics)"
 msgstr "Fitxers de l'iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:494
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution iCalendar importer"
 msgstr "Importador de l'iCalendar de l'Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:674
 msgid "Reminder!"
 msgstr "Recordatori"
 
-#: ../calendar/importers/icalendar-importer.c:662
+#: ../calendar/importers/icalendar-importer.c:758
 msgid "vCalendar files (.vcs)"
 msgstr "Fitxers del vCalendar (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:663
+#: ../calendar/importers/icalendar-importer.c:759
 msgid "Evolution vCalendar importer"
 msgstr "Importador del vCalendar de l'Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:823
+#: ../calendar/importers/icalendar-importer.c:1038
 msgid "Calendar Events"
 msgstr "Esdeveniments del calendari"
 
-#: ../calendar/importers/icalendar-importer.c:861
+#: ../calendar/importers/icalendar-importer.c:1078
 msgid "Evolution Calendar intelligent importer"
 msgstr "Importador intelÂligent del calendari de l'Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1146
+#: ../calendar/importers/icalendar-importer.c:1464
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "ReuniÃ"
 
-#: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1146
+#: ../calendar/importers/icalendar-importer.c:1464
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Esdeveniment"
 
-#: ../calendar/importers/icalendar-importer.c:929
-#: ../calendar/importers/icalendar-importer.c:1244
+#: ../calendar/importers/icalendar-importer.c:1149
+#: ../calendar/importers/icalendar-importer.c:1465
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Tasca"
 
-#: ../calendar/importers/icalendar-importer.c:932
-#: ../calendar/importers/icalendar-importer.c:1245
+#: ../calendar/importers/icalendar-importer.c:1152
+#: ../calendar/importers/icalendar-importer.c:1466
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "AnotaciÃ"
 
-#: ../calendar/importers/icalendar-importer.c:941
+#: ../calendar/importers/icalendar-importer.c:1161
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "tÃ recurrÃncies"
 
-#: ../calendar/importers/icalendar-importer.c:946
+#: ../calendar/importers/icalendar-importer.c:1166
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "Ãs una ocurrÃncia"
 
-#: ../calendar/importers/icalendar-importer.c:951
+#: ../calendar/importers/icalendar-importer.c:1171
 msgctxt "iCalImp"
-msgid "has alarms"
-msgstr "tÃ alarmes"
+msgid "has reminders"
+msgstr "tÃ recordatoris"
 
-#: ../calendar/importers/icalendar-importer.c:956
+#: ../calendar/importers/icalendar-importer.c:1176
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "tÃ adjuncions"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:969
+#: ../calendar/importers/icalendar-importer.c:1189
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "PÃblic"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:972
+#: ../calendar/importers/icalendar-importer.c:1192
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Privat"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:975
+#: ../calendar/importers/icalendar-importer.c:1195
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Confidencial"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:979
+#: ../calendar/importers/icalendar-importer.c:1199
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "ClassificaciÃ"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:984
-#: ../calendar/importers/icalendar-importer.c:1284
+#: ../calendar/importers/icalendar-importer.c:1204
+#: ../calendar/importers/icalendar-importer.c:1505
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Resum"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:990
+#: ../calendar/importers/icalendar-importer.c:1210
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "UbicaciÃ"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:998
-#: ../calendar/importers/icalendar-importer.c:1280
+#: ../calendar/importers/icalendar-importer.c:1218
+#: ../calendar/importers/icalendar-importer.c:1501
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Inici"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1009
+#: ../calendar/importers/icalendar-importer.c:1229
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Venciment"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1021
+#: ../calendar/importers/icalendar-importer.c:1241
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Final"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1031
+#: ../calendar/importers/icalendar-importer.c:1251
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Categories"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1055
+#: ../calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Completada"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1063
+#: ../calendar/importers/icalendar-importer.c:1283
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1074
-#: ../calendar/importers/icalendar-importer.c:1077
+#: ../calendar/importers/icalendar-importer.c:1294
+#: ../calendar/importers/icalendar-importer.c:1297
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organitzador"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1097
-#: ../calendar/importers/icalendar-importer.c:1100
+#: ../calendar/importers/icalendar-importer.c:1317
+#: ../calendar/importers/icalendar-importer.c:1320
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Assistents"
 
-#: ../calendar/importers/icalendar-importer.c:1114
+#: ../calendar/importers/icalendar-importer.c:1334
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "DescripciÃ"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1276
+#: ../calendar/importers/icalendar-importer.c:1497
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Tipus"
@@ -6683,171 +6736,166 @@ msgstr "PacÃfic/Wallis"
 msgid "Pacific/Yap"
 msgstr "PacÃfic/Yap"
 
-#: ../composer/e-composer-actions.c:204
+#: ../composer/e-composer-actions.c:208
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
-#: ../composer/e-composer-actions.c:287
-#: ../widgets/misc/e-attachment-view.c:377
-msgid "Attach a file"
-msgstr "Adjunta un fitxer"
-
-#: ../composer/e-composer-actions.c:292
-#: ../widgets/misc/e-signature-editor.c:203
+#: ../composer/e-composer-actions.c:296
+#: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
 msgstr "Tan_ca"
 
-#: ../composer/e-composer-actions.c:294
+#: ../composer/e-composer-actions.c:298
 msgid "Close the current file"
 msgstr "Tanca el fitxer actual"
 
-#: ../composer/e-composer-actions.c:299
+#: ../composer/e-composer-actions.c:303
 msgid "New _Message"
 msgstr "_Missatge nou"
 
-#: ../composer/e-composer-actions.c:301
+#: ../composer/e-composer-actions.c:305
 msgid "Open New Message window"
 msgstr "Obre una finestra de missatge nou"
 
-#: ../composer/e-composer-actions.c:308 ../shell/e-shell-window-actions.c:1489
+#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1511
 msgid "Configure Evolution"
 msgstr "Configura l'Evolution"
 
-#: ../composer/e-composer-actions.c:315
+#: ../composer/e-composer-actions.c:319
 msgid "Save the current file"
 msgstr "Desa el fitxer actual"
 
-#: ../composer/e-composer-actions.c:320
+#: ../composer/e-composer-actions.c:324
 msgid "Save _As..."
 msgstr "_Anomena i desa..."
 
-#: ../composer/e-composer-actions.c:322
+#: ../composer/e-composer-actions.c:326
 msgid "Save the current file with a different name"
 msgstr "Desa el fitxer actual amb un nom diferent"
 
-#: ../composer/e-composer-actions.c:329
+#: ../composer/e-composer-actions.c:333
 msgid "Character _Encoding"
 msgstr "_CodificaciÃ dels carÃcters"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:350
 msgid "_Print..."
 msgstr "Im_primeix..."
 
-#: ../composer/e-composer-actions.c:353
+#: ../composer/e-composer-actions.c:357
 msgid "Print Pre_view"
 msgstr "Pre_visualitzaciÃ d'impressiÃ"
 
-#: ../composer/e-composer-actions.c:360
+#: ../composer/e-composer-actions.c:364
 msgid "Save as _Draft"
 msgstr "Desa com a _esborrany"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:366
 msgid "Save as draft"
 msgstr "Desa com a esborrany"
 
-#: ../composer/e-composer-actions.c:367 ../composer/e-composer-private.c:347
+#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:352
 msgid "S_end"
 msgstr "E_nvia"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:373
 msgid "Send this message"
 msgstr "Envia aquest missatge"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:381
 msgid "PGP _Encrypt"
 msgstr "_Xifra amb PGP"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:383
 msgid "Encrypt this message with PGP"
 msgstr "Xifra aquest missatge amb el PGP"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:389
 msgid "PGP _Sign"
 msgstr "_Signa amb PGP"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:391
 msgid "Sign this message with your PGP key"
 msgstr "Signa aquest missatge amb la vostra clau PGP"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:397
 msgid "_Picture Gallery"
 msgstr "Galeria d'_imatges"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:399
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr ""
 "Mostra una coÅlecciÃ d'imatges que podreu arrossegar i deixar anar en un "
 "missatge"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:405
 msgid "_Prioritize Message"
 msgstr "_Prioritza el missatge"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:407
 msgid "Set the message priority to high"
 msgstr "Estableix el missatge a prioritat alta"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:413
 msgid "Re_quest Read Receipt"
 msgstr "SolÂlicita la confirmaciÃ de l_ectura"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:415
 msgid "Get delivery notification when your message is read"
 msgstr "Obteniu una notificaciÃ d'entrega quan es llegeixi el missatge"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:421
 msgid "S/MIME En_crypt"
 msgstr "Xi_fra amb S/MIME"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:423
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Xifra aquest missatge amb el vostre certificat de xifratge S/MIME"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:429
 msgid "S/MIME Sig_n"
 msgstr "Si_gna amb S/MIME"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:431
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Signa aquest missatge amb el vostre certificat de signatures S/MIME"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:437
 msgid "_Bcc Field"
 msgstr "Camp _CCO"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:439
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Commuta la visualitzaciÃ del camp ÂCCOÂ"
 
-#: ../composer/e-composer-actions.c:441
+#: ../composer/e-composer-actions.c:445
 msgid "_Cc Field"
 msgstr "Camp _CC"
 
-#: ../composer/e-composer-actions.c:443
+#: ../composer/e-composer-actions.c:447
 msgid "Toggles whether the CC field is displayed"
 msgstr "Commuta la visualitzaciÃ del camp ÂCCÂ"
 
-#: ../composer/e-composer-actions.c:449
+#: ../composer/e-composer-actions.c:453
 msgid "_Reply-To Field"
 msgstr "Camp _Respon-a"
 
-#: ../composer/e-composer-actions.c:451
+#: ../composer/e-composer-actions.c:455
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Commuta la visualitzaciÃ del camp ÂRespon-aÂ"
 
-#: ../composer/e-composer-actions.c:510
+#: ../composer/e-composer-actions.c:514
 msgid "Save Draft"
 msgstr "Desa l'esborrany"
 
-#: ../composer/e-composer-header-table.c:36
+#: ../composer/e-composer-header-table.c:40
 msgid "Enter the recipients of the message"
 msgstr "IntroduÃu els destinataris del missatge"
 
-#: ../composer/e-composer-header-table.c:38
+#: ../composer/e-composer-header-table.c:42
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "IntroduÃu les adreces que rebran una cÃpia del missatge"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:45
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -6855,67 +6903,67 @@ msgstr ""
 "IntroduÃu les adreces que rebran una cÃpia del missatge sense aparÃixer a la "
 "llista de destinataris del missatge"
 
-#: ../composer/e-composer-header-table.c:1004
+#: ../composer/e-composer-header-table.c:1021
 msgid "Fr_om:"
 msgstr "D_e:"
 
-#: ../composer/e-composer-header-table.c:1013
+#: ../composer/e-composer-header-table.c:1030
 msgid "_Reply-To:"
 msgstr "_Respon a:"
 
-#: ../composer/e-composer-header-table.c:1017
+#: ../composer/e-composer-header-table.c:1034
 msgid "_To:"
 msgstr "_Per a:"
 
-#: ../composer/e-composer-header-table.c:1022
+#: ../composer/e-composer-header-table.c:1039
 msgid "_Cc:"
 msgstr "_CC:"
 
-#: ../composer/e-composer-header-table.c:1027
+#: ../composer/e-composer-header-table.c:1044
 msgid "_Bcc:"
 msgstr "CC_O:"
 
-#: ../composer/e-composer-header-table.c:1032
+#: ../composer/e-composer-header-table.c:1049
 msgid "_Post To:"
 msgstr "_Envia a:"
 
-#: ../composer/e-composer-header-table.c:1036
+#: ../composer/e-composer-header-table.c:1053
 msgid "S_ubject:"
 msgstr "Ass_umpte:"
 
-#: ../composer/e-composer-header-table.c:1045
+#: ../composer/e-composer-header-table.c:1062
 msgid "Si_gnature:"
 msgstr "Si_gnatura:"
 
-#: ../composer/e-composer-name-header.c:137
+#: ../composer/e-composer-name-header.c:141
 msgid "Click here for the address book"
 msgstr "Feu clic aquÃ per anar a la llibreta d'adreces"
 
-#: ../composer/e-composer-post-header.c:127
+#: ../composer/e-composer-post-header.c:131
 msgid "Click here to select folders to post to"
 msgstr "Feu clic per seleccionar les carpetes on enviar"
 
-#: ../composer/e-composer-private.c:245
+#: ../composer/e-composer-private.c:249
 msgid "Undo the last action"
 msgstr "DesfÃs l'Ãltima acciÃ"
 
-#: ../composer/e-composer-private.c:249
+#: ../composer/e-composer-private.c:253
 msgid "Redo the last undone action"
 msgstr "RefÃs l'Ãltima acciÃ desfeta"
 
-#: ../composer/e-composer-private.c:253
+#: ../composer/e-composer-private.c:257
 msgid "Search for text"
 msgstr "Cerca text"
 
-#: ../composer/e-composer-private.c:257
+#: ../composer/e-composer-private.c:261
 msgid "Search for and replace text"
 msgstr "Cerca i reemplaÃa text"
 
-#: ../composer/e-composer-private.c:367
+#: ../composer/e-composer-private.c:372
 msgid "Save draft"
 msgstr "Desa l'esborrany"
 
-#: ../composer/e-msg-composer.c:784
+#: ../composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -6923,7 +6971,7 @@ msgstr ""
 "No s'ha pogut signar el missatge de sortida: no s'ha definit cap certificat "
 "de signatura per a aquest compte"
 
-#: ../composer/e-msg-composer.c:793
+#: ../composer/e-msg-composer.c:821
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -6932,17 +6980,17 @@ msgstr ""
 "No s'ha pogut xifrar el missatge de sortida: no s'ha definit cap certificat "
 "de xifratge per a aquest compte"
 
-#: ../composer/e-msg-composer.c:1675 ../composer/e-msg-composer.c:2058
+#: ../composer/e-msg-composer.c:1699 ../composer/e-msg-composer.c:2083
 msgid "Compose Message"
 msgstr "Redacta un missatge"
 
-#: ../composer/e-msg-composer.c:4116
+#: ../composer/e-msg-composer.c:4228
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "El redactor contÃ un cos de missatge que no estÃ format per text i no es pot "
 "editar."
 
-#: ../composer/e-msg-composer.c:4821
+#: ../composer/e-msg-composer.c:4933
 msgid "Untitled Message"
 msgstr "Missatges sense tÃtol"
 
@@ -7052,7 +7100,7 @@ msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 "El fitxer Â{0}Â no Ãs un fitxer normal i no es pot enviar en un missatge."
 
-#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:117
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:124
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "L'error fou &quot;{0}&quot;."
 
@@ -7105,11 +7153,11 @@ msgid "_Try Again"
 msgstr "_Torna-ho a intentar"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:151
+#: ../capplet/anjal-settings-main.c:154
 msgid "ID of the socket to embed in"
 msgstr "Identificador del sÃcol on incrustar-se"
 
-#: ../capplet/anjal-settings-main.c:152
+#: ../capplet/anjal-settings-main.c:155
 msgid "socket"
 msgstr "sÃcol"
 
@@ -7130,65 +7178,67 @@ msgid "Please enter your password."
 msgstr "IntroduÃu la vostra contrasenya."
 
 #: ../capplet/settings/mail-account-view.c:259
-#: ../plugins/caldav/caldav-source.c:66
+#: ../plugins/caldav/caldav-source.c:67
 msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../capplet/settings/mail-account-view.c:361
 #: ../capplet/settings/mail-account-view.c:413
-#: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:81
+#: ../modules/online-accounts/e-online-accounts-google.c:287
+#: ../modules/online-accounts/e-online-accounts-google.c:359
+#: ../plugins/google-account-setup/google-contacts-source.c:55
+#: ../plugins/google-account-setup/google-source.c:87
 msgid "Google"
 msgstr "Google"
 
-#: ../capplet/settings/mail-account-view.c:463
+#: ../capplet/settings/mail-account-view.c:480
 msgid "Personal details:"
 msgstr "Dades personals:"
 
-#: ../capplet/settings/mail-account-view.c:470
+#: ../capplet/settings/mail-account-view.c:487
 msgid "Name:"
 msgstr "Nom:"
 
-#: ../capplet/settings/mail-account-view.c:479
+#: ../capplet/settings/mail-account-view.c:496
 msgid "Email address:"
 msgstr "AdreÃa electrÃnica:"
 
-#: ../capplet/settings/mail-account-view.c:489
+#: ../capplet/settings/mail-account-view.c:506
 msgid "Details:"
 msgstr "Detalls:"
 
-#: ../capplet/settings/mail-account-view.c:497
+#: ../capplet/settings/mail-account-view.c:514
 msgid "Receiving"
 msgstr "RecepciÃ"
 
-#: ../capplet/settings/mail-account-view.c:504
+#: ../capplet/settings/mail-account-view.c:521
 msgid "Server type:"
 msgstr "Tipus de servidor:"
 
-#: ../capplet/settings/mail-account-view.c:513
+#: ../capplet/settings/mail-account-view.c:530
 msgid "Server address:"
 msgstr "AdreÃa del servidor:"
 
-#: ../capplet/settings/mail-account-view.c:522
+#: ../capplet/settings/mail-account-view.c:539
 msgid "Username:"
 msgstr "Nom d'usuari:"
 
-#: ../capplet/settings/mail-account-view.c:531
+#: ../capplet/settings/mail-account-view.c:548
 msgid "Use encryption:"
 msgstr "Utilitza l'encriptaciÃ:"
 
-#: ../capplet/settings/mail-account-view.c:536
-#: ../capplet/settings/mail-account-view.c:571
+#: ../capplet/settings/mail-account-view.c:553
+#: ../capplet/settings/mail-account-view.c:588
 msgid "never"
 msgstr "mai"
 
 # gal/e-table/e-table-config.glade.h:3
 # gal/e-table/e-table-config-no-group.glade.h:3
-#: ../capplet/settings/mail-account-view.c:548
+#: ../capplet/settings/mail-account-view.c:565
 msgid "Sending"
 msgstr "Enviament"
 
-#: ../capplet/settings/mail-account-view.c:590
+#: ../capplet/settings/mail-account-view.c:607
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
@@ -7199,7 +7249,7 @@ msgstr ""
 "automÃticament tots els parÃmetres. En cas que no es pugui fer, haureu "
 "d'introduir els detalls del servidor."
 
-#: ../capplet/settings/mail-account-view.c:592
+#: ../capplet/settings/mail-account-view.c:609
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
@@ -7210,11 +7260,11 @@ msgstr ""
 "comenÃar amb els detalls que ja heu introduÃt, perÃ pot ser que els hÃgiu de "
 "canviar."
 
-#: ../capplet/settings/mail-account-view.c:594
+#: ../capplet/settings/mail-account-view.c:611
 msgid "You can specify more options to configure the account."
 msgstr "Podeu especificar mÃs opcions per configurar el compte."
 
-#: ../capplet/settings/mail-account-view.c:596
+#: ../capplet/settings/mail-account-view.c:613
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
@@ -7223,11 +7273,11 @@ msgstr ""
 "S'han intentat detectar-los automÃticament, perÃ els haurÃeu de comprovar "
 "per estar-ne segur."
 
-#: ../capplet/settings/mail-account-view.c:597
+#: ../capplet/settings/mail-account-view.c:614
 msgid "You can specify your default settings for your account."
-msgstr "Podeu especificar les opcions predeterminades del vostre compte."
+msgstr "Podeu especificar les opcions per defecte del vostre compte."
 
-#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:615
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -7235,102 +7285,102 @@ msgstr ""
 "Ara teniu l'ocasiÃ de comprovar els parÃmetres abans d'intentar connectar "
 "amb el servidor i recollir el correu."
 
-#: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2143 ../mail/em-account-editor.c:2264
+#: ../capplet/settings/mail-account-view.c:630
+#: ../mail/em-account-editor.c:2289 ../mail/em-account-editor.c:2425
 msgid "Identity"
 msgstr "Identitat"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:630
 msgid "Next - Receiving mail"
 msgstr "SegÃent - RecepciÃ de correu"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Receiving mail"
 msgstr "RecepciÃ de correu"
 
-#: ../capplet/settings/mail-account-view.c:614
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:632
 msgid "Next - Sending mail"
 msgstr "SegÃent - Enviament de correu"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Back - Identity"
 msgstr "Enrere - Identitat"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Next - Receiving options"
 msgstr "SegÃent - Opcions de recepciÃ"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:632
 msgid "Receiving options"
 msgstr "Opcions de recepciÃ"
 
-#: ../capplet/settings/mail-account-view.c:615
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:632
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Receiving mail"
 msgstr "Enrere - RecepciÃ de correu"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Sending mail"
 msgstr "Enviament de correu"
 
-#: ../capplet/settings/mail-account-view.c:617
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Next - Review account"
 msgstr "SegÃent - RevisiÃ del compte"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Next - Defaults"
-msgstr "SegÃent - Valors predeterminats"
+msgstr "SegÃent - Valors per defecte"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Receiving options"
 msgstr "Enrere - Opcions de recepciÃ"
 
-#: ../capplet/settings/mail-account-view.c:618
-#: ../mail/em-account-editor.c:3095
+#: ../capplet/settings/mail-account-view.c:635
+#: ../mail/em-account-editor.c:3377
 msgid "Defaults"
-msgstr "Opcions predeterminades"
+msgstr "Opcions per defecte"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Back - Sending mail"
 msgstr "Enrere - Enviament de correu"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Review account"
 msgstr "RevisiÃ del compte"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Finish"
 msgstr "Finalitza"
 
 # gal/e-table/e-table-config.glade.h:3
 # gal/e-table/e-table-config-no-group.glade.h:3
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Back - Sending"
 msgstr "Enrere - Enviament"
 
-#: ../capplet/settings/mail-account-view.c:740
+#: ../capplet/settings/mail-account-view.c:760
 msgid "Setup Google contacts with Evolution"
 msgstr "Configureu els contactes del Google a l'Evolution"
 
-#: ../capplet/settings/mail-account-view.c:741
+#: ../capplet/settings/mail-account-view.c:761
 msgid "Setup Google calendar with Evolution"
 msgstr "Configureu els calendaris del Google a l'Evolution"
 
-#: ../capplet/settings/mail-account-view.c:746
+#: ../capplet/settings/mail-account-view.c:766
 msgid "You may need to enable IMAP access."
 msgstr "Pot ser que hÃgiu d'habilitar l'accÃs per IMAP."
 
-#: ../capplet/settings/mail-account-view.c:754
+#: ../capplet/settings/mail-account-view.c:774
 msgid "Google account settings:"
 msgstr "ParÃmetres del compte del Google:"
 
-#: ../capplet/settings/mail-account-view.c:780
+#: ../capplet/settings/mail-account-view.c:800
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "Configureu els calendaris del Yahoo a l'Evolution"
 
-#: ../capplet/settings/mail-account-view.c:784
+#: ../capplet/settings/mail-account-view.c:804
 msgid ""
 "Yahoo calendars are named as firstname_lastname. We have tried to form the "
 "calendar name. So please confirm and re-enter the calendar name if it is not "
@@ -7340,63 +7390,62 @@ msgstr ""
 "del calendari, per la qual cosa haurÃeu de confirmar i tornar a introduir el "
 "nom del calendari si no Ãs correcte."
 
-#: ../capplet/settings/mail-account-view.c:793
+#: ../capplet/settings/mail-account-view.c:813
 msgid "Yahoo account settings:"
 msgstr "ParÃmetres del compte de Yahoo:"
 
-#: ../capplet/settings/mail-account-view.c:807
+#: ../capplet/settings/mail-account-view.c:827
 msgid "Yahoo Calendar name:"
 msgstr "Nom del calendari del Yahoo:"
 
-#: ../capplet/settings/mail-account-view.c:1079
+#: ../capplet/settings/mail-account-view.c:1098
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../capplet/settings/mail-account-view.c:1130
-#: ../capplet/settings/mail-settings-view.c:248
+#: ../capplet/settings/mail-account-view.c:1150
+#: ../capplet/settings/mail-settings-view.c:254
 msgid "Close Tab"
 msgstr "Tanca la pestanya"
 
-#: ../capplet/settings/mail-account-view.c:1140
+#: ../capplet/settings/mail-account-view.c:1160
 msgid "Account Wizard"
 msgstr "Auxiliar per als comptes"
 
-#: ../capplet/settings/mail-capplet-shell.c:208
+#: ../capplet/settings/mail-capplet-shell.c:215
 msgid "Evolution account assistant"
 msgstr "Auxiliar de comptes de l'Evolution"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:337 ../mail/e-mail-migrate.c:680
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:146
-#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
-#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:161
-#: ../mail/em-folder-tree-model.c:163 ../mail/mail-vfolder.c:218
-#: ../mail/message-list.c:1720
-#: ../modules/addressbook/e-book-shell-backend.c:92
-#: ../modules/addressbook/e-book-shell-migrate.c:135
-#: ../modules/calendar/e-cal-shell-backend.c:103
-#: ../modules/calendar/e-cal-shell-migrate.c:150
-#: ../modules/calendar/e-memo-shell-backend.c:92
-#: ../modules/calendar/e-memo-shell-migrate.c:106
-#: ../modules/calendar/e-task-shell-backend.c:92
-#: ../modules/calendar/e-task-shell-migrate.c:117
+#: ../capplet/settings/mail-capplet-shell.c:377 ../mail/e-mail-local.c:81
+#: ../mail/e-mail-migrate.c:750 ../mail/em-folder-tree-model.c:153
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:159
+#: ../mail/em-folder-tree-model.c:161 ../mail/em-folder-tree-model.c:168
+#: ../mail/em-folder-tree-model.c:170
+#: ../modules/addressbook/e-book-shell-backend.c:100
+#: ../modules/addressbook/e-book-shell-migrate.c:136
+#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../modules/calendar/e-cal-shell-migrate.c:154
+#: ../modules/calendar/e-memo-shell-backend.c:102
+#: ../modules/calendar/e-memo-shell-migrate.c:109
+#: ../modules/calendar/e-task-shell-backend.c:102
+#: ../modules/calendar/e-task-shell-migrate.c:121
 msgid "On This Computer"
 msgstr "En aquest ordinador"
 
-#: ../capplet/settings/mail-settings-view.c:145
+#: ../capplet/settings/mail-settings-view.c:150
 #, c-format
 msgid "Modify %s..."
 msgstr "Modifica %s..."
 
-#: ../capplet/settings/mail-settings-view.c:147
+#: ../capplet/settings/mail-settings-view.c:152
 msgid "Add a new account"
 msgstr "Afegeix un compte nou"
 
-#: ../capplet/settings/mail-settings-view.c:183
+#: ../capplet/settings/mail-settings-view.c:188
 msgid "Account management"
 msgstr "GestiÃ de comptes"
 
-#: ../capplet/settings/mail-settings-view.c:258
+#: ../capplet/settings/mail-settings-view.c:264
 msgid "Settings"
 msgstr "ParÃmetres"
 
@@ -7408,9 +7457,9 @@ msgstr "Notificacions d'esdeveniments del calendari"
 msgid "Evolution Alarm Notify"
 msgstr "Notificador d'alarmes de l'Evolution"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:952
-#: ../modules/mailto-handler/evolution-mailto-handler.c:212
-#: ../shell/e-shell-window-private.c:253
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:999
+#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../shell/e-shell-window-private.c:257
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7418,7 +7467,7 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Correu i calendari de l'Evolution"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:652
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "Aplicacions de treball en grup"
 
@@ -7435,36 +7484,36 @@ msgid "Email Settings"
 msgstr "ParÃmetres del correu electrÃnic"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:223
+#: ../e-util/e-activity.c:227
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (s'ha cancelÂlat)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:226
+#: ../e-util/e-activity.c:230
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (s'ha completat)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:229
+#: ../e-util/e-activity.c:233
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (en espera)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:233
+#: ../e-util/e-activity.c:237
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (es cancelÂlarÃ)"
 
-#: ../e-util/e-activity.c:235
+#: ../e-util/e-activity.c:239
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:240
+#: ../e-util/e-activity.c:244
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completat)"
@@ -7547,125 +7596,125 @@ msgid "Visual"
 msgstr "Visual"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1811
+#: ../e-util/e-datetime-format.c:206
+#: ../modules/calendar/e-cal-shell-view-actions.c:1856
 #: ../plugins/itip-formatter/itip-view.c:191
-#: ../widgets/table/e-cell-date-edit.c:308
+#: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
 msgstr "Avui"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:207 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "DemÃ"
 
-#: ../e-util/e-datetime-format.c:209
+#: ../e-util/e-datetime-format.c:219
 msgid "Yesterday"
 msgstr "Ahir"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:217
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:227
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "SegÃent %a"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:223
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:233
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "SegÃent %a"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:229
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:239
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "SegÃent %a"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:235
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:245
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "SegÃent %a"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:241
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:251
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "SegÃent %a"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:247
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:257
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "SegÃent %a"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:253
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:263
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "SegÃent %a"
 
-#: ../e-util/e-datetime-format.c:335 ../e-util/e-datetime-format.c:345
-#: ../e-util/e-datetime-format.c:354
+#: ../e-util/e-datetime-format.c:350 ../e-util/e-datetime-format.c:360
+#: ../e-util/e-datetime-format.c:369
 msgid "Use locale default"
-msgstr "Utilitza els valors predeterminats de la localitzaciÃ"
+msgstr "Utilitza els valors per defecte de la localitzaciÃ"
 
-#: ../e-util/e-datetime-format.c:551
+#: ../e-util/e-datetime-format.c:574
 msgid "Format:"
 msgstr "Format:"
 
-#: ../e-util/e-file-utils.c:152
+#: ../e-util/e-file-utils.c:151
 msgid "(Unknown Filename)"
 msgstr "(nom de fitxer desconegut)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:156
+#: ../e-util/e-file-utils.c:155
 #, c-format
 msgid "Writing \"%s\""
 msgstr "S'estÃ escrivint Â%sÂ"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:161
+#: ../e-util/e-file-utils.c:160
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "S'estÃ escrivint Â%sÂ a Â%sÂ"
 
-#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:378
+#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:388
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "setmanes"
 
-#: ../e-util/e-print.c:157
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "S'ha produÃt un error mentre s'estava imprimint"
 
-#: ../e-util/e-print.c:164
+#: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
 msgstr "El sistema d'impressiÃ ha llistat els detalls segÃents sobre l'error:"
 
-#: ../e-util/e-print.c:170
+#: ../e-util/e-print.c:174
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr ""
 "El sistema d'impressiÃ no ha llistat cap detall addicional sobre l'error."
 
-#: ../e-util/e-signature.c:707
+#: ../e-util/e-signature.c:708
 msgid "Autogenerated"
 msgstr "Generada automÃticament"
 
@@ -7689,132 +7738,124 @@ msgstr "El voleu sobreescriure?"
 msgid "File exists \"{0}\"."
 msgstr "Ja existeix el fitxer Â{0}Â."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:157
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:164
 msgid "_Overwrite"
 msgstr "S_obreescriu"
 
-#: ../e-util/e-util.c:141
+#: ../e-util/e-util.c:117
 msgid "Could not open the link."
 msgstr "No s'ha pogut obrir l'enllaÃ."
 
-#: ../e-util/e-util.c:188
+#: ../e-util/e-util.c:164
 msgid "Could not display help for Evolution."
 msgstr "No s'ha pogut mostrar l'ajuda de l'Evolution."
 
-#: ../e-util/gconf-bridge.c:1281
+#: ../e-util/gconf-bridge.c:1332
 #, c-format
 msgid "GConf error: %s"
 msgstr "S'ha produÃt un error del GConf: %s"
 
-#: ../e-util/gconf-bridge.c:1292
+#: ../e-util/gconf-bridge.c:1343
 msgid "All further errors shown only on terminal."
 msgstr "La resta d'errors es mostraran nomÃs al terminal."
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1050
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1060
 #: ../mail/e-mail-tag-editor.c:325 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "From"
 msgstr "De"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1051
-#: ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1061
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "Respon"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1053
-#: ../mail/em-format-html.c:2397 ../mail/em-format-html.c:2465
-#: ../mail/em-format-html.c:2488 ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1063
+#: ../mail/em-format-html.c:2593 ../mail/em-format-html.c:2661
+#: ../mail/em-format-html.c:2684 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "CC"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1054
-#: ../mail/em-format-html.c:2398 ../mail/em-format-html.c:2469
-#: ../mail/em-format-html.c:2491 ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1064
+#: ../mail/em-format-html.c:2594 ../mail/em-format-html.c:2665
+#: ../mail/em-format-html.c:2687 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "CCO"
 
-#: ../em-format/em-format-quote.c:427 ../em-format/em-format.c:1055
+#: ../em-format/em-format-quote.c:464 ../em-format/em-format.c:1065
 #: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:75
-#: ../plugins/groupwise-features/notification.ui.h:2
-#: ../plugins/groupwise-features/properties.ui.h:5 ../smime/lib/e-cert.c:1140
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
+#: ../smime/lib/e-cert.c:1151
 msgid "Subject"
 msgstr "Assumpte"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:438 ../mail/em-format-html.c:2585
-#: ../modules/mail/em-mailer-prefs.c:1119
+#: ../em-format/em-format-quote.c:475 ../mail/em-format-html.c:2786
+#: ../modules/mail/em-mailer-prefs.c:1028
 msgid "Mailer"
 msgstr "Generador del correu"
 
-#: ../em-format/em-format-quote.c:519 ../mail/em-composer-utils.c:1179
+#: ../em-format/em-format-quote.c:565 ../mail/em-composer-utils.c:1203
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Missatge reenviat --------"
 
-#: ../em-format/em-format.c:1056 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:523
+#: ../em-format/em-format.c:1066 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:523
 #: ../widgets/misc/e-dateedit.c:545
 msgid "Date"
 msgstr "Data"
 
-#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format.c:1067 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
 msgstr "Grups de notÃcies"
 
-#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format.c:1068 ../modules/mail/em-mailer-prefs.c:80
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Cares"
 
-#: ../em-format/em-format.c:1455
+#: ../em-format/em-format.c:1472
 #, c-format
 msgid "%s attachment"
 msgstr "fitxer adjunt %s"
 
-#: ../em-format/em-format.c:1566
+#: ../em-format/em-format.c:1583
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S'ha produÃt un error desconegut en analitzar el missatge S/MIME"
 
-#: ../em-format/em-format.c:1748 ../em-format/em-format.c:1942
+#: ../em-format/em-format.c:1777 ../em-format/em-format.c:2005
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No s'ha pogut analitzar el missatge MIME. Es mostrarÃ com a codi font."
 
-#: ../em-format/em-format.c:1758
+#: ../em-format/em-format.c:1788
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "El tipus de xifratge per a multipart/encrypted no estÃ implementat"
 
-#: ../em-format/em-format.c:1778
+#: ../em-format/em-format.c:1808
 msgid "Could not parse PGP/MIME message"
 msgstr "No s'ha pogut analitzar el missatge PGP/MIME"
 
-#: ../em-format/em-format.c:1779
+#: ../em-format/em-format.c:1809
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "No s'ha pogut analitzar el missatge PGP/MIME: error desconegut"
 
-#: ../em-format/em-format.c:1967
+#: ../em-format/em-format.c:2030
 msgid "Unsupported signature format"
 msgstr "El format de la signatura no estÃ implementat"
 
-#: ../em-format/em-format.c:1980 ../em-format/em-format.c:2159
+#: ../em-format/em-format.c:2043 ../em-format/em-format.c:2225
 msgid "Error verifying signature"
 msgstr "S'ha produÃt un error en verificar la contrasenya"
 
-#: ../em-format/em-format.c:1981 ../em-format/em-format.c:2146
-#: ../em-format/em-format.c:2160
+#: ../em-format/em-format.c:2044 ../em-format/em-format.c:2210
+#: ../em-format/em-format.c:2226
 msgid "Unknown error verifying signature"
 msgstr "S'ha produÃt un error desconegut en verificar la contrasenya"
 
-#: ../em-format/em-format.c:2251
+#: ../em-format/em-format.c:2318
 msgid "Could not parse PGP message: "
 msgstr "No s'ha pogut analitzar el missatge PGP: "
 
-#: ../em-format/em-format.c:2257 ../mail/em-folder-tree.c:656
-#: ../mail/mail-ops.c:624 ../plugins/caldav/caldav-browse-server.c:210
-#: ../plugins/caldav/caldav-browse-server.c:1407 ../plugins/face/face.c:169
-#: ../smime/gui/certificate-manager.c:100
-msgid "Unknown error"
-msgstr "Error desconegut"
-
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
 #: ../filter/e-filter-datespec.c:66
@@ -7929,78 +7970,78 @@ msgstr "ara"
 msgid "%d-%b-%Y"
 msgstr "%d/%b/%Y"
 
-#: ../filter/e-filter-datespec.c:282
+#: ../filter/e-filter-datespec.c:286
 msgid "Select a time to compare against"
 msgstr "Seleccioneu amb quina hora es compararÃ"
 
-#: ../filter/e-filter-file.c:188
+#: ../filter/e-filter-file.c:190
 msgid "Choose a File"
 msgstr "Trieu un fitxer"
 
-#: ../filter/e-filter-rule.c:662
+#: ../filter/e-filter-rule.c:666
 msgid "R_ule name:"
 msgstr "Nom de la _regla:"
 
-#: ../filter/e-filter-rule.c:692
+#: ../filter/e-filter-rule.c:696
 msgid "Find items that meet the following conditions"
 msgstr "Troba els elements que compleixen les condicions segÃents"
 
-#: ../filter/e-filter-rule.c:717
+#: ../filter/e-filter-rule.c:721
 msgid "If all conditions are met"
 msgstr "Si es compleixen totes les condicions"
 
-#: ../filter/e-filter-rule.c:718
+#: ../filter/e-filter-rule.c:722
 msgid "If any conditions are met"
 msgstr "Si es compleix qualsevol condiciÃ"
 
-#: ../filter/e-filter-rule.c:721
+#: ../filter/e-filter-rule.c:725
 msgid "_Find items:"
 msgstr "_Cerca elements:"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:750
+#: ../filter/e-filter-rule.c:754
 msgid "None"
 msgstr "Cap"
 
-#: ../filter/e-filter-rule.c:751
+#: ../filter/e-filter-rule.c:755
 msgid "All related"
 msgstr "Tots els relacionats"
 
-#: ../filter/e-filter-rule.c:752 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:756 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Respostes"
 
-#: ../filter/e-filter-rule.c:753
+#: ../filter/e-filter-rule.c:757
 msgid "Replies and parents"
 msgstr "Respostes i pares"
 
-#: ../filter/e-filter-rule.c:754
+#: ../filter/e-filter-rule.c:758
 msgid "No reply or parent"
 msgstr "Sense resposta o pare"
 
-#: ../filter/e-filter-rule.c:757
-msgid "I_nclude threads"
-msgstr "I_nclou els fils"
+#: ../filter/e-filter-rule.c:761
+msgid "I_nclude threads:"
+msgstr "I_nclou els fils:"
 
-#: ../filter/e-filter-rule.c:782
+#: ../filter/e-filter-rule.c:786
 msgid "A_dd Condition"
 msgstr "Afegeix una _condiciÃ"
 
-#: ../filter/e-filter-rule.c:1130 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:320
+#: ../filter/e-filter-rule.c:1135 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:321
 msgid "Incoming"
 msgstr "Entrada"
 
-#: ../filter/e-filter-rule.c:1130 ../mail/em-utils.c:321
+#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:322
 msgid "Outgoing"
 msgstr "Sortida"
 
-#: ../filter/e-rule-editor.c:263
+#: ../filter/e-rule-editor.c:270
 msgid "Add Rule"
 msgstr "Afegeix una regla"
 
-#: ../filter/e-rule-editor.c:349
+#: ../filter/e-rule-editor.c:359
 msgid "Edit Rule"
 msgstr "Edita la regla"
 
@@ -8024,7 +8065,7 @@ msgstr "Manca la data."
 msgid "Missing file name."
 msgstr "Manca el nom de fitxer."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:83
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:90
 msgid "Missing name."
 msgstr "Manca el nom."
 
@@ -8080,7 +8121,7 @@ msgstr ""
 "La data del missatge es compararÃ amb l'hora\n"
 "actual quan s'hagi de filtrar."
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:193
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:194
 msgid "_Filter Rules"
 msgstr "Regles de _filtratge"
 
@@ -8119,94 +8160,282 @@ msgstr "l'hora que indiqueu"
 msgid "years"
 msgstr "anys"
 
-#: ../mail/e-mail-attachment-bar.c:86 ../mail/e-mail-attachment-bar.c:91
-#: ../mail/em-format-html-display.c:1122 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:124
-#: ../widgets/misc/e-attachment-paned.c:129
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:863 ../widgets/misc/e-signature-combo-box.c:75
+msgctxt "mail-signature"
+msgid "None"
+msgstr "cap"
+
+#: ../mail/em-account-editor.c:946
+msgid "Never"
+msgstr "Mai"
+
+#: ../mail/em-account-editor.c:947
+msgid "Always"
+msgstr "Sempre"
+
+#: ../mail/em-account-editor.c:948
+msgid "Ask for each message"
+msgstr "Pregunta per cada missatge"
+
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1833 ../widgets/misc/e-account-tree-view.c:131
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "Cap"
+
+#: ../mail/em-account-editor.c:2237
+msgid "Fil_e:"
+msgstr "_Fitxer:"
+
+#: ../mail/em-account-editor.c:2237 ../mail/mail-config.ui.h:157
+msgid "_Path:"
+msgstr "_CamÃ:"
+
+#: ../mail/em-account-editor.c:2286
+msgid "Mail Configuration"
+msgstr "ConfiguraciÃ del correu"
+
+#: ../mail/em-account-editor.c:2287
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+"Us donem la benvinguda a l'auxiliar de configuraciÃ del correu de "
+"l'Evolution.\n"
+"\n"
+"Feu clic a ÂContinuaÂ per comenÃar."
+
+#: ../mail/em-account-editor.c:2290
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"IntroduÃu el vostre nom i la vostra adreÃa electrÃnica aquÃ sota. Els camps "
+"ÂopcionalsÂ no sÃn necessaris, a menys que els vulgueu afegir en els correus "
+"que envieu."
+
+#: ../mail/em-account-editor.c:2292 ../mail/em-account-editor.c:2484
+msgid "Receiving Email"
+msgstr "RecepciÃ de correu"
+
+#: ../mail/em-account-editor.c:2293
+msgid "Please configure the following account settings."
+msgstr "Configureu els segÃents parÃmetres del compte."
+
+#: ../mail/em-account-editor.c:2295 ../mail/em-account-editor.c:3081
+msgid "Sending Email"
+msgstr "Enviament de correu"
+
+#: ../mail/em-account-editor.c:2296
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"IntroduÃu informaciÃ sobre com voleu enviar el correu. Si no n'esteu segur, "
+"pregunteu-ho a l'administrador del sistema o al vostre proveÃdor d'Internet."
+
+#: ../mail/em-account-editor.c:2298 ../mail/mail-config.ui.h:1
+msgid "Account Information"
+msgstr "InformaciÃ de compte"
+
+#: ../mail/em-account-editor.c:2299
+msgid ""
+"Please enter a descriptive name for this account below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"IntroduÃu un nom descriptiu per a aquest compte aquÃ sota. \n"
+"Aquest nom nomÃs s'utilitzarÃ per visualitzar-lo."
+
+#: ../mail/em-account-editor.c:2303
+msgid "Done"
+msgstr "Fet"
+
+#: ../mail/em-account-editor.c:2304
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"Enhorabona, s'ha completat la configuraciÃ del vostre correu.\n"
+"\n"
+"Ja podeu rebre i enviar correu amb l'Evolution.\n"
+"\n"
+"Feu clic a ÂAplicaÂ per desar la configuraciÃ."
+
+#: ../mail/em-account-editor.c:2843
+msgid "Check for _new messages every"
+msgstr "Comprova si hi ha correu _nou cada"
+
+#: ../mail/em-account-editor.c:2851
+msgid "minu_tes"
+msgstr "minu_ts"
+
+#: ../mail/em-account-editor.c:3520 ../mail/mail-config.ui.h:101
+msgid "Security"
+msgstr "Seguretat"
+
+#. Most sections for this is auto-generated from the camel config
+#. Most sections for this is auto-generated fromt the camel config
+#: ../mail/em-account-editor.c:3575 ../mail/em-account-editor.c:3658
+msgid "Receiving Options"
+msgstr "Opcions de recepciÃ"
+
+#: ../mail/em-account-editor.c:3576 ../mail/em-account-editor.c:3659
+msgid "Checking for New Messages"
+msgstr "ComprovaciÃ de correu nou"
+
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1416 ../mail/mail-config.ui.h:14
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
+#: ../widgets/misc/e-attachment-paned.c:133
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Fitxer adjunt"
 msgstr[1] "Fitxers adjunts"
 
-#: ../mail/e-mail-attachment-bar.c:604
-#: ../widgets/misc/e-attachment-paned.c:619
+#: ../mail/e-mail-attachment-bar.c:608
+#: ../widgets/misc/e-attachment-paned.c:623
 msgid "Icon View"
 msgstr "Vista d'icones"
 
-#: ../mail/e-mail-attachment-bar.c:606
-#: ../widgets/misc/e-attachment-paned.c:621
+#: ../mail/e-mail-attachment-bar.c:610
+#: ../widgets/misc/e-attachment-paned.c:625
 msgid "List View"
 msgstr "Vista de llista"
 
-#: ../mail/e-mail-browser.c:125 ../shell/e-shell-window-actions.c:1405
-#: ../shell/e-shell-window-actions.c:1412
-#: ../shell/e-shell-window-actions.c:1419
+#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1427
+#: ../shell/e-shell-window-actions.c:1434
+#: ../shell/e-shell-window-actions.c:1441
 msgid "Close this window"
 msgstr "Tanca aquesta finestra"
 
-#: ../mail/e-mail-browser.c:282
+#: ../mail/e-mail-browser.c:293
 msgid "(No Subject)"
 msgstr "(Sense assumpte)"
 
-#: ../mail/e-mail-display.c:62
+#: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
 msgstr "_Afegeix a la llibreta d'adreces..."
 
-#: ../mail/e-mail-display.c:69
+#: ../mail/e-mail-display.c:73
 msgid "_To This Address"
 msgstr "Per a aques_ta adreÃa"
 
-#: ../mail/e-mail-display.c:76
+#: ../mail/e-mail-display.c:80
 msgid "_From This Address"
 msgstr "D'a_questa adreÃa"
 
-#: ../mail/e-mail-display.c:85
+#: ../mail/e-mail-display.c:87
+msgid "Send _Reply To..."
+msgstr "_Respon a..."
+
+#: ../mail/e-mail-display.c:89
+msgid "Send a reply message to this address"
+msgstr "Envia un missatge de resposta a aquesta adreÃa"
+
+#: ../mail/e-mail-display.c:96
 msgid "Create Search _Folder"
 msgstr "Crea una carpeta de _cerca"
 
-#: ../mail/e-mail-folder-utils.c:88
+#: ../mail/e-mail-folder-utils.c:111
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "S'estÃ desant el missatge a la carpeta Â%sÂ"
 
-#: ../mail/e-mail-label-dialog.c:219
-msgid "_Label name:"
-msgstr "_Nom de l'etiqueta:"
+#: ../mail/e-mail-folder-utils.c:274
+msgid "Forwarded messages"
+msgstr "Missatges reenviats"
 
-#: ../mail/e-mail-label-list-store.c:37
-msgid "I_mportant"
-msgstr "Imp_ortant"
+#: ../mail/e-mail-folder-utils.c:391
+msgid "Scanning messages for duplicates"
+msgstr "S'estan escanejant els missatges per si n'hi ha de duplicats"
 
-#. red
-#: ../mail/e-mail-label-list-store.c:38
+#: ../mail/e-mail-folder-utils.c:584
+#, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "S'estÃ recuperant %d missatge"
+msgstr[1] "S'estan recuperant %d missatges"
+
+#: ../mail/e-mail-folder-utils.c:834
+#, c-format
+msgid "Removing folder '%s'"
+msgstr "S'estÃ suprimint la carpeta Â%sÂ"
+
+#: ../mail/e-mail-folder-utils.c:968
+#, c-format
+msgid "File \"%s\" has been removed."
+msgstr "S'ha suprimit el fitxer Â%sÂ."
+
+#: ../mail/e-mail-folder-utils.c:972
+msgid "File has been removed."
+msgstr "S'ha suprimit el fitxer."
+
+#: ../mail/e-mail-folder-utils.c:1031
+msgid "Removing attachments"
+msgstr "S'estan suprimint les adjuncions"
+
+#: ../mail/e-mail-folder-utils.c:1195
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messages"
+msgstr[0] "S'estÃ desant %d missatge"
+msgstr[1] "S'estan desant %d missatges"
+
+#: ../mail/e-mail-folder-utils.c:1539 ../mail/em-folder-utils.c:613
+#, c-format
+msgid "Invalid folder URI '%s'"
+msgstr "L'URI de la carpeta Â%sÂ no Ãs vÃlid"
+
+#. Label + combo box has a 12px left margin so it's
+#. * aligned with the junk mail options above it.
+#: ../mail/e-mail-junk-options.c:252
+msgid "Junk filtering software:"
+msgstr "Programari de filtratge de brossa:"
+
+#: ../mail/e-mail-label-dialog.c:223
+msgid "_Label name:"
+msgstr "_Nom de l'etiqueta:"
+
+#: ../mail/e-mail-label-list-store.c:41
+msgid "I_mportant"
+msgstr "Imp_ortant"
+
+#. red
+#: ../mail/e-mail-label-list-store.c:42
 msgid "_Work"
 msgstr "F_eina"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:39
+#: ../mail/e-mail-label-list-store.c:43
 msgid "_Personal"
 msgstr "P_ersonal"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:40
+#: ../mail/e-mail-label-list-store.c:44
 msgid "_To Do"
 msgstr "P_er fer"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:41
+#: ../mail/e-mail-label-list-store.c:45
 msgid "_Later"
 msgstr "D_esprÃs"
 
-#: ../mail/e-mail-label-manager.c:161
-#: ../modules/mail/e-mail-shell-view-actions.c:627
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:684
 msgid "Add Label"
 msgstr "Afegeix una etiqueta"
 
-#: ../mail/e-mail-label-manager.c:212
+#: ../mail/e-mail-label-manager.c:216
 msgid "Edit Label"
 msgstr "Edita l'etiqueta"
 
-#: ../mail/e-mail-label-manager.c:346
+#: ../mail/e-mail-label-manager.c:350
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -8215,66 +8444,66 @@ msgstr ""
 "l'etiqueta s'utilitza com a \n"
 "identificador mnemÃnic en el menÃ."
 
-#: ../mail/e-mail-label-tree-view.c:84
+#: ../mail/e-mail-label-tree-view.c:88
 msgid "Color"
 msgstr "Color"
 
-#: ../mail/e-mail-label-tree-view.c:94
-#: ../modules/plugin-manager/evolution-plugin-manager.c:66
-#: ../plugins/caldav/caldav-browse-server.c:1296
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../widgets/menus/gal-define-views-dialog.c:334
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../mail/e-mail-label-tree-view.c:98
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../plugins/caldav/caldav-browse-server.c:1358
+#: ../widgets/menus/gal-define-views-dialog.c:347
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
 msgid "Name"
 msgstr "Nom"
 
-#: ../mail/e-mail-local.c:35 ../mail/em-folder-properties.c:285
-#: ../mail/em-folder-tree-model.c:738 ../mail/em-folder-tree.c:3138
-#: ../modules/mail/e-mail-shell-view-private.c:1118
-#: ../modules/mail/e-mail-shell-view-private.c:1129
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:312
+#: ../mail/em-folder-tree-model.c:720
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1077
 msgid "Inbox"
 msgstr "Safata d'entrada"
 
-#: ../mail/e-mail-local.c:36 ../mail/em-folder-tree-model.c:730
-#: ../modules/mail/e-mail-shell-view-private.c:1116
+#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:713
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Drafts"
 msgstr "Esborranys"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:742
-#: ../modules/mail/e-mail-shell-view-private.c:1120
+#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:724
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Outbox"
 msgstr "Safata de sortida"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:744
-#: ../modules/mail/e-mail-shell-view-private.c:1122
+#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:728
+#: ../modules/mail/e-mail-shell-view-private.c:1070
 msgid "Sent"
 msgstr "Enviat"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:733
-#: ../modules/mail/e-mail-shell-view-private.c:1124
+#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:716
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:581
+#: ../plugins/templates/templates.c:1034 ../plugins/templates/templates.c:1312
+#: ../plugins/templates/templates.c:1322
 msgid "Templates"
 msgstr "Plantilles"
 
-#: ../mail/e-mail-migrate.c:131
+#: ../mail/e-mail-migrate.c:134
 msgid "Migrating..."
 msgstr "S'estÃ migrant..."
 
-#: ../mail/e-mail-migrate.c:164
+#: ../mail/e-mail-migrate.c:169
 msgid "Migration"
 msgstr "MigraciÃ"
 
-#: ../mail/e-mail-migrate.c:204
+#: ../mail/e-mail-migrate.c:210
 #, c-format
 msgid "Migrating '%s':"
 msgstr "S'estÃ migrant Â%sÂ:"
 
-#: ../mail/e-mail-migrate.c:660
+#: ../mail/e-mail-migrate.c:728
 msgid "Migrating Folders"
 msgstr "S'estan migrant les carpetes"
 
-#: ../mail/e-mail-migrate.c:661
+#: ../mail/e-mail-migrate.c:729
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -8286,712 +8515,703 @@ msgstr ""
 "\n"
 "Espereu mentre l'Evolution migra les vostres carpetes..."
 
-#: ../mail/e-mail-migrate.c:1126
+#: ../mail/e-mail-migrate.c:1527
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "No s'han pogut crear les carpetes de correu local a Â%sÂ: %s"
 
-#: ../mail/e-mail-notebook-view.c:562
+#: ../mail/e-mail-notebook-view.c:621
 msgid "Please select a folder"
 msgstr "Seleccioneu una carpeta"
 
-#: ../mail/e-mail-reader-utils.c:109
-#: ../modules/calendar/e-task-shell-view-actions.c:576
-msgid "Do not ask me again"
-msgstr "No m'ho tornis a demanar"
-
-#: ../mail/e-mail-reader.c:306 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:308 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copia a carpeta"
 
-#: ../mail/e-mail-reader.c:306 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:487
 msgid "C_opy"
 msgstr "C_opia"
 
-#. Translators: %s is replaced with a folder name
-#. %d with count of duplicate messages.
-#: ../mail/e-mail-reader.c:523
-#, c-format
-msgid ""
-"Folder '%s' contains %d duplicate message. Are you sure you want to delete "
-"it?"
-msgid_plural ""
-"Folder '%s' contains %d duplicate messages. Are you sure you want to delete "
-"them?"
-msgstr[0] ""
-"La carpeta Â%sÂ contÃ %d missatge duplicat. Segur que el voleu suprimir?"
-msgstr[1] ""
-"La carpeta Â%sÂ contÃ %d missatges duplicats. Segur que els voleu suprimir?"
-
-#: ../mail/e-mail-reader.c:987 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:814 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Mou a la carpeta"
 
-#: ../mail/e-mail-reader.c:987 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:814 ../mail/em-folder-utils.c:487
 msgid "_Move"
 msgstr "_Mou"
 
-#: ../mail/e-mail-reader.c:1271 ../mail/e-mail-reader.c:1437
-#: ../mail/e-mail-reader.c:1474
+#: ../mail/e-mail-reader.c:1175 ../mail/e-mail-reader.c:1363
+#: ../mail/e-mail-reader.c:1403
 msgid "_Do not ask me again."
 msgstr "_No m'ho tornis a demanar."
 
-#: ../mail/e-mail-reader.c:1480
+#: ../mail/e-mail-reader.c:1409
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Ignora sempre ÂReply-To:Â (respon a) a les llistes de correu."
 
-#: ../mail/e-mail-reader.c:1596
-msgid "Save Message"
-msgid_plural "Save Messages"
-msgstr[0] "Desa el missatge"
-msgstr[1] "Desa els missatges"
-
-#. Translators: This is a part of a suggested file name
-#. * used when saving a message or multiple messages to an
-#. * mbox format, when the first message doesn't have a
-#. * Subject. The extension ".mbox" is appended to this
-#. * string, thus it will be something like "Message.mbox"
-#. * at the end.
-#: ../mail/e-mail-reader.c:1617
-#: ../plugins/groupwise-features/notification.ui.h:1
-#: ../plugins/groupwise-features/properties.ui.h:3
-msgid "Message"
-msgid_plural "Messages"
-msgstr[0] "Missatge"
-msgstr[1] "Missatges"
-
-#: ../mail/e-mail-reader.c:1891
+#: ../mail/e-mail-reader.c:1775
 msgid "A_dd Sender to Address Book"
 msgstr "Afegeix el remitent a la llibreta d'a_dreces"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:1777
 msgid "Add sender to address book"
 msgstr "Afegeix el remitent a la llibreta d'adreces"
 
-#: ../mail/e-mail-reader.c:1898
+#: ../mail/e-mail-reader.c:1782
 msgid "Check for _Junk"
 msgstr "Comprova si hi ha _brossa"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:1784
 msgid "Filter the selected messages for junk status"
 msgstr "Filtra els missatges seleccionats per l'estat de brossa"
 
-#: ../mail/e-mail-reader.c:1905
+#: ../mail/e-mail-reader.c:1789
 msgid "_Copy to Folder..."
 msgstr "_Copia a la carpeta..."
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:1791
 msgid "Copy selected messages to another folder"
 msgstr "Copia els missatges seleccionats a una altra carpeta"
 
-#: ../mail/e-mail-reader.c:1912
+#: ../mail/e-mail-reader.c:1796
 msgid "_Delete Message"
 msgstr "Suprimeix el _missatge"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:1798
 msgid "Mark the selected messages for deletion"
 msgstr "Marca els missatges seleccionats per suprimir-los"
 
-#: ../mail/e-mail-reader.c:1919
+#: ../mail/e-mail-reader.c:1803
 msgid "Filter on Mailing _List..."
 msgstr "Fi_ltra per la llista de correu..."
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:1805
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 "Crea una regla per filtrar els missatges per a aquesta llista de correu"
 
-#: ../mail/e-mail-reader.c:1926
+#: ../mail/e-mail-reader.c:1810
 msgid "Filter on _Recipients..."
 msgstr "Filt_ra pels destinataris..."
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:1812
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Crea una regla per filtrar els missatges per a aquests destinataris"
 
-#: ../mail/e-mail-reader.c:1933
+#: ../mail/e-mail-reader.c:1817
 msgid "Filter on Se_nder..."
 msgstr "Filtra pels remite_nts..."
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:1819
 msgid "Create a rule to filter messages from this sender"
 msgstr "Crea una regla per filtrar els missatges d'aquest remitent"
 
-#: ../mail/e-mail-reader.c:1940
+#: ../mail/e-mail-reader.c:1824
 msgid "Filter on _Subject..."
 msgstr "Filtra per l'a_ssumpte..."
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:1826
 msgid "Create a rule to filter messages with this subject"
 msgstr "Crea una regla per filtrar els missatges amb aquest assumpte"
 
-#: ../mail/e-mail-reader.c:1947
+#: ../mail/e-mail-reader.c:1831
 msgid "A_pply Filters"
 msgstr "A_plica els filtres"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:1833
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplica les regles de filtratge als missatges seleccionats"
 
-#: ../mail/e-mail-reader.c:1954
+#: ../mail/e-mail-reader.c:1838
 msgid "_Find in Message..."
 msgstr "_Cerca en el missatge..."
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:1840
 msgid "Search for text in the body of the displayed message"
 msgstr "Cerca un text en el cos del missatge visualitzat"
 
-#: ../mail/e-mail-reader.c:1961
+#: ../mail/e-mail-reader.c:1845
 msgid "_Clear Flag"
 msgstr "Nete_ja el senyalador"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:1847
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Suprimeix el senyalador de seguiment dels missatges seleccionats"
 
-#: ../mail/e-mail-reader.c:1968
+#: ../mail/e-mail-reader.c:1852
 msgid "_Flag Completed"
 msgstr "Sen_yalador completat"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1854
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr ""
 "Estableix el senyalador de seguiment com a completat en els missatges "
 "seleccionats"
 
-#: ../mail/e-mail-reader.c:1975
+#: ../mail/e-mail-reader.c:1859
 msgid "Follow _Up..."
 msgstr "Res_pon..."
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:1861
 msgid "Flag the selected messages for follow-up"
 msgstr "Senyala els missatges seleccionats per fer-ne un seguiment"
 
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:1866
 msgid "_Attached"
 msgstr "_Adjuntat"
 
-#: ../mail/e-mail-reader.c:1984 ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:1868 ../mail/e-mail-reader.c:1875
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 "Reenvia el missatge seleccionat a una altra persona com a fitxer adjunt"
 
-#: ../mail/e-mail-reader.c:1989
+#: ../mail/e-mail-reader.c:1873
 msgid "Forward As _Attached"
 msgstr "Reenvia com a _adjunciÃ"
 
-#: ../mail/e-mail-reader.c:1996
+#: ../mail/e-mail-reader.c:1880
 msgid "_Inline"
 msgstr "_Inserit"
 
-#: ../mail/e-mail-reader.c:1998 ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1889
 msgid "Forward the selected message in the body of a new message"
 msgstr "Reenvia el missatge seleccionat al cos d'un missatge nou"
 
-#: ../mail/e-mail-reader.c:2003
+#: ../mail/e-mail-reader.c:1887
 msgid "Forward As _Inline"
 msgstr "Reenvia _inserit"
 
-#: ../mail/e-mail-reader.c:2010
+#: ../mail/e-mail-reader.c:1894
 msgid "_Quoted"
 msgstr "_Citat"
 
-#: ../mail/e-mail-reader.c:2012 ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:1896 ../mail/e-mail-reader.c:1903
 msgid "Forward the selected message quoted like a reply"
 msgstr "Reenvia el missatge seleccionat citat com una resposta"
 
-#: ../mail/e-mail-reader.c:2017
+#: ../mail/e-mail-reader.c:1901
 msgid "Forward As _Quoted"
 msgstr "Reenvia com a _citat"
 
-#: ../mail/e-mail-reader.c:2024
+#: ../mail/e-mail-reader.c:1908
 msgid "_Load Images"
 msgstr "Carrega i_matges"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:1910
 msgid "Force images in HTML mail to be loaded"
 msgstr "ForÃa la cÃrrega d'imatges en els correus HTML"
 
-#: ../mail/e-mail-reader.c:2031
+#: ../mail/e-mail-reader.c:1915
 msgid "_Important"
 msgstr "_Important"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:1917
 msgid "Mark the selected messages as important"
 msgstr "Marca els missatges seleccionats com a importants"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:1922
 msgid "_Junk"
 msgstr "_Brossa"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:1924
 msgid "Mark the selected messages as junk"
 msgstr "Marca els missatges seleccionats com a brossa"
 
-#: ../mail/e-mail-reader.c:2045
+#: ../mail/e-mail-reader.c:1929
 msgid "_Not Junk"
 msgstr "_No Ãs brossa"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:1931
 msgid "Mark the selected messages as not being junk"
 msgstr "Marca els missatges seleccionats com a no brossa"
 
-#: ../mail/e-mail-reader.c:2052
+#: ../mail/e-mail-reader.c:1936
 msgid "_Read"
 msgstr "_Llegit"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:1938
 msgid "Mark the selected messages as having been read"
 msgstr "Marca els missatges seleccionats com a llegits"
 
-#: ../mail/e-mail-reader.c:2059
+#: ../mail/e-mail-reader.c:1943
 msgid "Uni_mportant"
 msgstr "Poc i_mportant"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:1945
 msgid "Mark the selected messages as unimportant"
 msgstr "Marca els missatges seleccionats com a no importants"
 
-#: ../mail/e-mail-reader.c:2066
+#: ../mail/e-mail-reader.c:1950
 msgid "_Unread"
 msgstr "No ll_egit"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:1952
 msgid "Mark the selected messages as not having been read"
 msgstr "Marca els missatges seleccionats com a no llegits"
 
-#: ../mail/e-mail-reader.c:2073
+#: ../mail/e-mail-reader.c:1957
 msgid "_Edit as New Message..."
 msgstr "_Edita com a missatge nou..."
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:1959
 msgid "Open the selected messages in the composer for editing"
 msgstr "Obre els missatges seleccionats en el redactor per editar-los"
 
-#: ../mail/e-mail-reader.c:2080
+#: ../mail/e-mail-reader.c:1964
 msgid "Compose _New Message"
 msgstr "Redacta u_n missatge nou"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:1966
 msgid "Open a window for composing a mail message"
 msgstr "Obre una finestra per redactar un missatge de correu"
 
-#: ../mail/e-mail-reader.c:2087
+#: ../mail/e-mail-reader.c:1971
 msgid "_Open in New Window"
 msgstr "_Obre en una finestra nova"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:1973
 msgid "Open the selected messages in a new window"
 msgstr "Obre els missatges seleccionats en una finestra nova"
 
-#: ../mail/e-mail-reader.c:2094
+#: ../mail/e-mail-reader.c:1978
 msgid "_Move to Folder..."
 msgstr "_Mou a la carpeta..."
 
-#: ../mail/e-mail-reader.c:2096
+#: ../mail/e-mail-reader.c:1980
 msgid "Move selected messages to another folder"
 msgstr "Mou els missatges seleccionats a una altra carpeta"
 
-#: ../mail/e-mail-reader.c:2101
+#: ../mail/e-mail-reader.c:1985
 msgid "_Switch to Folder"
 msgstr "C_ommuta a la carpeta"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:1987
 msgid "Display the parent folder"
 msgstr "Mostra la carpeta mare"
 
-#: ../mail/e-mail-reader.c:2108
+#: ../mail/e-mail-reader.c:1992
 msgid "Switch to _next tab"
 msgstr "Commuta a la pestanya _segÃent"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:1994
 msgid "Switch to the next tab"
 msgstr "Commuta a la pestanya segÃent"
 
-#: ../mail/e-mail-reader.c:2115
+#: ../mail/e-mail-reader.c:1999
 msgid "Switch to _previous tab"
 msgstr "Commuta a la pestanya an_terior"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2001
 msgid "Switch to the previous tab"
 msgstr "Commuta a la pestanya anterior"
 
-#: ../mail/e-mail-reader.c:2122
+#: ../mail/e-mail-reader.c:2006
 msgid "Cl_ose current tab"
 msgstr "Tan_ca la pestanya actual"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2008
 msgid "Close current tab"
 msgstr "Tanca la pestanya actual"
 
-#: ../mail/e-mail-reader.c:2129
+#: ../mail/e-mail-reader.c:2013
 msgid "_Next Message"
 msgstr "Missatge segÃe_nt"
 
-#: ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2015
 msgid "Display the next message"
 msgstr "Mostra el missatge segÃent"
 
-#: ../mail/e-mail-reader.c:2136
+#: ../mail/e-mail-reader.c:2020
 msgid "Next _Important Message"
 msgstr "M_issatge important segÃent"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2022
 msgid "Display the next important message"
 msgstr "Mostra el missatge important segÃent"
 
-#: ../mail/e-mail-reader.c:2143
+#: ../mail/e-mail-reader.c:2027
 msgid "Next _Thread"
 msgstr "Fil segÃen_t"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2029
 msgid "Display the next thread"
 msgstr "Mostra el segÃent fil"
 
-#: ../mail/e-mail-reader.c:2150
+#: ../mail/e-mail-reader.c:2034
 msgid "Next _Unread Message"
 msgstr "Missa_tge sense llegir segÃent"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2036
 msgid "Display the next unread message"
 msgstr "Mostra el missatge sense llegir segÃent"
 
-#: ../mail/e-mail-reader.c:2157
+#: ../mail/e-mail-reader.c:2041
 msgid "_Previous Message"
 msgstr "Missa_tge anterior"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2043
 msgid "Display the previous message"
 msgstr "Mostra el missatge anterior"
 
-#: ../mail/e-mail-reader.c:2164
+#: ../mail/e-mail-reader.c:2048
 msgid "Pr_evious Important Message"
 msgstr "Missatge important ant_erior"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2050
 msgid "Display the previous important message"
 msgstr "Mostra el missatge important anterior"
 
-#: ../mail/e-mail-reader.c:2171
+#: ../mail/e-mail-reader.c:2055
 msgid "Previous T_hread"
 msgstr "_Fil anterior"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2057
 msgid "Display the previous thread"
 msgstr "Mostra el fil anterior"
 
-#: ../mail/e-mail-reader.c:2178
+#: ../mail/e-mail-reader.c:2062
 msgid "P_revious Unread Message"
 msgstr "Missatge sense llegir ante_rior"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2064
 msgid "Display the previous unread message"
 msgstr "Mostra el missatge sense llegir anterior"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2071
 msgid "Print this message"
 msgstr "Imprimeix aquest missatge"
 
-#: ../mail/e-mail-reader.c:2194
+#: ../mail/e-mail-reader.c:2078
 msgid "Preview the message to be printed"
 msgstr "Previsualitza el missatge que s'imprimirÃ"
 
-#: ../mail/e-mail-reader.c:2199
+#: ../mail/e-mail-reader.c:2083
 msgid "Re_direct"
 msgstr "Re_direcciona"
 
-#: ../mail/e-mail-reader.c:2201
+#: ../mail/e-mail-reader.c:2085
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Reexpedeix el missatge seleccionat a una altra persona"
 
-#: ../mail/e-mail-reader.c:2206
+#: ../mail/e-mail-reader.c:2090
 msgid "Remo_ve Attachments"
 msgstr "Su_primeix les adjuncions"
 
-#: ../mail/e-mail-reader.c:2208
+#: ../mail/e-mail-reader.c:2092
 msgid "Remove attachments"
 msgstr "Suprimeix les adjuncions"
 
-#: ../mail/e-mail-reader.c:2213
+#: ../mail/e-mail-reader.c:2097
 msgid "Remove Du_plicate Messages"
 msgstr "Suprimeix els missatges _duplicats"
 
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2099
 msgid "Checks selected messages for duplicates"
 msgstr "Comprova si hi ha duplicats en els missatges seleccionats"
 
-#: ../mail/e-mail-reader.c:2220 ../mail/mail.error.xml.h:102
-#: ../modules/calendar/e-cal-shell-view-actions.c:1465
-#: ../modules/mail/e-mail-attachment-handler.c:179
+#: ../mail/e-mail-reader.c:2104 ../mail/mail.error.xml.h:109
+#: ../modules/calendar/e-cal-shell-view-actions.c:1510
+#: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "Respon a _tots"
 
-#: ../mail/e-mail-reader.c:2222
+#: ../mail/e-mail-reader.c:2106
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr ""
 "Redacta una resposta per a tots els destinataris del missatge seleccionat"
 
-#: ../mail/e-mail-reader.c:2227 ../mail/mail.error.xml.h:103
+#: ../mail/e-mail-reader.c:2111 ../mail/mail.error.xml.h:110
 msgid "Reply to _List"
 msgstr "Respon a _la llista"
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2113
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 "Redacta una resposta per a la llista de correu del missatge seleccionat"
 
-#: ../mail/e-mail-reader.c:2234
-#: ../modules/mail/e-mail-attachment-handler.c:186
+#: ../mail/e-mail-reader.c:2118
+#: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "_Respon al remitent"
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2120
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Redacta una resposta per al remitent del missatge seleccionat"
 
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2125
 msgid "_Save as mbox..."
 msgstr "_Anomena i desa com a fitxer mbox..."
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2127
 msgid "Save selected messages as an mbox file"
 msgstr "Desa els missatges com a fitxer mbox"
 
-#: ../mail/e-mail-reader.c:2248
-msgid "Search Folder from Mailing _List..."
-msgstr "Carpeta de cerca a partir de _la llista de correu..."
-
-#: ../mail/e-mail-reader.c:2250
-msgid "Create a search folder for this mailing list"
-msgstr "Crea una carpeta de cerca per a aquesta llista de correu"
-
-#: ../mail/e-mail-reader.c:2255
-msgid "Search Folder from Recipien_ts..."
-msgstr "Carpeta de cerca a partir dels destinata_ris..."
-
-#: ../mail/e-mail-reader.c:2257
-msgid "Create a search folder for these recipients"
-msgstr "Crea una carpeta de cerca per a aquests destinataris"
-
-#: ../mail/e-mail-reader.c:2262
-msgid "Search Folder from Sen_der..."
-msgstr "Carpeta de cerca a partir del remite_nt..."
-
-#: ../mail/e-mail-reader.c:2264
-msgid "Create a search folder for this sender"
-msgstr "Crea una carpeta de cerca per a aquest remitent"
-
-#: ../mail/e-mail-reader.c:2269
-msgid "Search Folder from S_ubject..."
-msgstr "Carpeta de cerca a partir de l'ass_umpte..."
-
-#: ../mail/e-mail-reader.c:2271
-msgid "Create a search folder for this subject"
-msgstr "Crea una carpeta de cerca per a aquest assumpte"
-
-#: ../mail/e-mail-reader.c:2276
+#: ../mail/e-mail-reader.c:2132
 msgid "_Message Source"
 msgstr "Font del _missatge"
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2134
 msgid "Show the raw email source of the message"
 msgstr "Mostra el codi del missatge de correu"
 
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2146
 msgid "_Undelete Message"
 msgstr "DesfÃs la s_upressiÃ del missatge"
 
-#: ../mail/e-mail-reader.c:2292
+#: ../mail/e-mail-reader.c:2148
 msgid "Undelete the selected messages"
 msgstr "DesfÃs la supressiÃ dels missatges seleccionats"
 
-#: ../mail/e-mail-reader.c:2297
+#: ../mail/e-mail-reader.c:2153
 msgid "_Normal Size"
 msgstr "Mida _normal"
 
-#: ../mail/e-mail-reader.c:2299
+#: ../mail/e-mail-reader.c:2155
 msgid "Reset the text to its original size"
 msgstr "Torna el text a la seva mida original"
 
-#: ../mail/e-mail-reader.c:2304
+#: ../mail/e-mail-reader.c:2160
 msgid "_Zoom In"
 msgstr "A_propa"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2162
 msgid "Increase the text size"
 msgstr "Incrementa la mida del text"
 
-#: ../mail/e-mail-reader.c:2311
+#: ../mail/e-mail-reader.c:2167
 msgid "Zoom _Out"
 msgstr "A_llunya"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2169
 msgid "Decrease the text size"
 msgstr "Redueix la mida del text"
 
-#: ../mail/e-mail-reader.c:2320
+#: ../mail/e-mail-reader.c:2176
 msgid "Create R_ule"
 msgstr "Crea _una regla"
 
-#: ../mail/e-mail-reader.c:2327
+#: ../mail/e-mail-reader.c:2183
 msgid "Ch_aracter Encoding"
 msgstr "CodificaciÃ dels c_arÃcters"
 
-#: ../mail/e-mail-reader.c:2334
+#: ../mail/e-mail-reader.c:2190
 msgid "F_orward As"
 msgstr "Reenvia c_om a"
 
-#: ../mail/e-mail-reader.c:2341
+#: ../mail/e-mail-reader.c:2197
 msgid "_Group Reply"
 msgstr "_Respon al grup"
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2204
 msgid "_Go To"
 msgstr "_VÃs a"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2211
 msgid "Mar_k As"
 msgstr "Mar_ca com a"
 
-#: ../mail/e-mail-reader.c:2362
+#: ../mail/e-mail-reader.c:2218
 msgid "_Message"
 msgstr "_Missatges"
 
-#: ../mail/e-mail-reader.c:2369
+#: ../mail/e-mail-reader.c:2225
 msgid "_Zoom"
 msgstr "A_propa"
 
-#: ../mail/e-mail-reader.c:2394
+#: ../mail/e-mail-reader.c:2235
+msgid "Search Folder from Mailing _List..."
+msgstr "Carpeta de cerca a partir de _la llista de correu..."
+
+#: ../mail/e-mail-reader.c:2237
+msgid "Create a search folder for this mailing list"
+msgstr "Crea una carpeta de cerca per a aquesta llista de correu"
+
+#: ../mail/e-mail-reader.c:2242
+msgid "Search Folder from Recipien_ts..."
+msgstr "Carpeta de cerca a partir dels destinata_ris..."
+
+#: ../mail/e-mail-reader.c:2244
+msgid "Create a search folder for these recipients"
+msgstr "Crea una carpeta de cerca per a aquests destinataris"
+
+#: ../mail/e-mail-reader.c:2249
+msgid "Search Folder from Sen_der..."
+msgstr "Carpeta de cerca a partir del remite_nt..."
+
+#: ../mail/e-mail-reader.c:2251
+msgid "Create a search folder for this sender"
+msgstr "Crea una carpeta de cerca per a aquest remitent"
+
+#: ../mail/e-mail-reader.c:2256
+msgid "Search Folder from S_ubject..."
+msgstr "Carpeta de cerca a partir de l'ass_umpte..."
+
+#: ../mail/e-mail-reader.c:2258
+msgid "Create a search folder for this subject"
+msgstr "Crea una carpeta de cerca per a aquest assumpte"
+
+#: ../mail/e-mail-reader.c:2281
 msgid "Mark for Follo_w Up..."
 msgstr "Marca per al se_guiment..."
 
-#: ../mail/e-mail-reader.c:2402
+#: ../mail/e-mail-reader.c:2289
 msgid "Mark as _Important"
 msgstr "Marca'l com a _important"
 
-#: ../mail/e-mail-reader.c:2406
+#: ../mail/e-mail-reader.c:2293
 msgid "Mark as _Junk"
 msgstr "Marca'l com a bro_ssa"
 
-#: ../mail/e-mail-reader.c:2410
+#: ../mail/e-mail-reader.c:2297
 msgid "Mark as _Not Junk"
 msgstr "_No el marquis com a brossa"
 
-#: ../mail/e-mail-reader.c:2414
+#: ../mail/e-mail-reader.c:2301
 msgid "Mar_k as Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: ../mail/e-mail-reader.c:2418
+#: ../mail/e-mail-reader.c:2305
 msgid "Mark as Uni_mportant"
 msgstr "Marca com a no _important"
 
-#: ../mail/e-mail-reader.c:2422
+#: ../mail/e-mail-reader.c:2309
 msgid "Mark as _Unread"
 msgstr "Marca com a _no llegit"
 
-#: ../mail/e-mail-reader.c:2466
+#: ../mail/e-mail-reader.c:2353
 msgid "_Caret Mode"
 msgstr "Mode de _cursor"
 
-#: ../mail/e-mail-reader.c:2468
+#: ../mail/e-mail-reader.c:2355
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Mostra un cursor parpellejant en el cos dels missatges visualitzats"
 
-#: ../mail/e-mail-reader.c:2474
+#: ../mail/e-mail-reader.c:2361
 msgid "All Message _Headers"
 msgstr "Totes les _capÃaleres de missatge"
 
-#: ../mail/e-mail-reader.c:2476
+#: ../mail/e-mail-reader.c:2363
 msgid "Show messages with all email headers"
 msgstr "Mostra els missatges amb totes les capÃaleres"
 
-#: ../mail/e-mail-reader.c:2714
-msgid "Unable to retrieve message"
-msgstr "No s'ha pogut recuperar el missatge"
-
-#: ../mail/e-mail-reader.c:2776 ../mail/mail-ops.c:2068
+#: ../mail/e-mail-reader.c:2659
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "S'estÃ recuperant el missatge Â%sÂ"
 
 #. we changed user, thus reset the chosen calendar combo too, because
-#. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3370 ../mail/mail-config.ui.h:31
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:538
-#: ../plugins/google-account-setup/google-source.c:674
-#: ../widgets/misc/e-account-tree-view.c:249
+#. * other user means other calendars subscribed
+#: ../mail/e-mail-reader.c:3246 ../mail/mail-config.ui.h:32
+#: ../plugins/google-account-setup/google-source.c:316
+#: ../plugins/google-account-setup/google-source.c:565
+#: ../plugins/google-account-setup/google-source.c:704
+#: ../widgets/misc/e-account-tree-view.c:253
 msgid "Default"
-msgstr "Predeterminat"
+msgstr "Per defecte"
 
-#: ../mail/e-mail-reader.c:3545
-#: ../modules/mail/e-mail-attachment-handler.c:172
+#: ../mail/e-mail-reader.c:3415
+#: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "_Reenvia"
 
-#: ../mail/e-mail-reader.c:3546
+#: ../mail/e-mail-reader.c:3416
 msgid "Forward the selected message to someone"
 msgstr "Reenvia el missatge seleccionat a una altra persona"
 
 # gal/e-table/e-table-config.glade.h:19
-#: ../mail/e-mail-reader.c:3565
+#: ../mail/e-mail-reader.c:3435
 msgid "Group Reply"
 msgstr "Respon al grup"
 
-#: ../mail/e-mail-reader.c:3566
+#: ../mail/e-mail-reader.c:3436
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Respon a la llista de correu o a tots els destinataris"
 
-#: ../mail/e-mail-reader.c:3611 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:746
+#: ../mail/e-mail-reader.c:3489 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: ../mail/e-mail-reader.c:3644
-#: ../modules/calendar/e-cal-shell-view-actions.c:1311
-#: ../widgets/misc/e-calendar.c:201
+#: ../mail/e-mail-reader.c:3522
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "SegÃent"
 
-#: ../mail/e-mail-reader.c:3648
-#: ../modules/calendar/e-cal-shell-view-actions.c:1304
-#: ../widgets/misc/e-calendar.c:177
+#: ../mail/e-mail-reader.c:3526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:3657 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3535 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "Respon"
 
-#: ../mail/e-mail-reader.c:4327
+#: ../mail/e-mail-reader.c:4205
 #, c-format
 msgid "Folder '%s'"
 msgstr "Carpeta Â%sÂ"
 
-#: ../mail/e-mail-session.c:643
+#: ../mail/e-mail-reader-utils.c:145
+msgid "Do not warn me again"
+msgstr "No em tornis a avisar"
+
+#. Translators: %s is replaced with a folder
+#. * name %u with count of duplicate messages.
+#: ../mail/e-mail-reader-utils.c:670
+#, c-format
+msgid ""
+"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
+"it?"
+msgid_plural ""
+"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
+"them?"
+msgstr[0] ""
+"La carpeta Â%sÂ contÃ %u missatge duplicat. Segur que el voleu suprimir?"
+msgstr[1] ""
+"La carpeta Â%sÂ contÃ %u missatges duplicats. Segur que els voleu suprimir?"
+
+#: ../mail/e-mail-reader-utils.c:1047
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "Desa el missatge"
+msgstr[1] "Desa els missatges"
+
+#. Translators: This is part of a suggested file name
+#. * used when saving a message or multiple messages to
+#. * mbox format, when the first message doesn't have a
+#. * subject.  The extension ".mbox" is appended to the
+#. * string; for example "Message.mbox".
+#: ../mail/e-mail-reader-utils.c:1068
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "Missatge"
+msgstr[1] "Missatges"
+
+#: ../mail/e-mail-session.c:870
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "IntroduÃu la contrasenya per a %s"
 
-#: ../mail/e-mail-session.c:645
+#: ../mail/e-mail-session.c:874
 msgid "Enter Passphrase"
 msgstr "IntroduÃu la contrasenya"
 
-#: ../mail/e-mail-session.c:648
+#: ../mail/e-mail-session.c:878
 #, c-format
 msgid "Enter Password for %s"
 msgstr "IntroduÃu la contrasenya per a %s"
 
-#: ../mail/e-mail-session.c:650
+#: ../mail/e-mail-session.c:882
 msgid "Enter Password"
 msgstr "IntroduÃu la contrasenya"
 
-#: ../mail/e-mail-session.c:703
+#: ../mail/e-mail-session.c:933
 #, c-format
 msgid "User canceled operation."
 msgstr "L'usuari ha cancelÂlat l'operaciÃ."
 
-#: ../mail/e-mail-session.c:873
+#: ../mail/e-mail-session.c:1046
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
@@ -8999,30 +9219,25 @@ msgstr ""
 "No s'ha especificat cap adreÃa de destinaciÃ, de manera que s'ha cancelÂlat "
 "el reenviament del missatge."
 
-#: ../mail/e-mail-session.c:882
+#: ../mail/e-mail-session.c:1055
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 "No s'ha trobat cap compte a utilitzar, de manera que s'ha cancelÂlat el "
 "reenviament del missatge."
 
-#: ../mail/e-mail-session.c:1286 ../mail/mail-ops.c:1220
-#, c-format
-msgid "Opening folder '%s'"
-msgstr "S'estÃ obrint la carpeta Â%sÂ"
-
-#: ../mail/e-mail-session.c:1302
+#: ../mail/e-mail-session-utils.c:419
 #, c-format
-msgid "Invalid folder: %s"
-msgstr "La carpeta no Ãs vÃlida: Â%sÂ"
+msgid "Cannot get transport for account '%s'"
+msgstr "No es pot obtenir el transport pel compte Â%sÂ"
 
-#: ../mail/e-mail-session-utils.c:490 ../mail/mail-ops.c:605
+#: ../mail/e-mail-session-utils.c:508 ../mail/mail-ops.c:634
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "No s'han pogut aplicar els filtres de sortida: %s"
 
-#: ../mail/e-mail-session-utils.c:514 ../mail/e-mail-session-utils.c:548
-#: ../mail/mail-ops.c:622 ../mail/mail-ops.c:653
+#: ../mail/e-mail-session-utils.c:532 ../mail/e-mail-session-utils.c:566
+#: ../mail/mail-ops.c:653 ../mail/mail-ops.c:687
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -9031,187 +9246,45 @@ msgstr ""
 "No s'ha pogut afegir a %s: %s\n"
 "S'afegirÃ a la carpeta local ÂEnviatÂ en lloc d'aixÃ."
 
-#: ../mail/e-mail-session-utils.c:568 ../mail/mail-ops.c:673
+#: ../mail/e-mail-session-utils.c:586 ../mail/mail-ops.c:707
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "No s'han pogut afegir a la carpeta local ÂEnviatÂ: %s"
 
-#: ../mail/e-mail-session-utils.c:779 ../mail/mail-ops.c:774
-#: ../mail/mail-ops.c:866
+#: ../mail/e-mail-session-utils.c:797 ../mail/mail-ops.c:810
+#: ../mail/mail-ops.c:906
 msgid "Sending message"
 msgstr "S'estÃ enviant el missatge"
 
-#: ../mail/e-mail-session-utils.c:850
+#: ../mail/e-mail-session-utils.c:873
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "S'ha cancelÂlat la subscripciÃ a la carpeta Â%sÂ"
 
-#: ../mail/e-mail-store-utils.c:39
+#: ../mail/e-mail-store-utils.c:168
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "S'estÃ desconnectant de Â%sÂ"
 
-#: ../mail/e-mail-store-utils.c:130
+#: ../mail/e-mail-store-utils.c:259
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "S'estÃ tornant a connectar a Â%sÂ"
 
+#: ../mail/e-mail-store-utils.c:334
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "S'estÃ preparant el compte Â%sÂ per treballar fora de lÃnia"
+
 #: ../mail/e-mail-tag-editor.c:291
 msgid "Flag to Follow Up"
 msgstr "Senyala per respondre"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:567 ../mail/mail-config.ui.h:69
-#: ../modules/addressbook/ldap-config.ui.h:9
-msgid "No encryption"
-msgstr "Sense xifratge"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../mail/em-account-editor.c:571 ../mail/mail-config.ui.h:126
-#: ../modules/addressbook/ldap-config.ui.h:20
-msgid "TLS encryption"
-msgstr "Xifratge TLS"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../mail/em-account-editor.c:575 ../mail/mail-config.ui.h:91
-#: ../modules/addressbook/ldap-config.ui.h:12
-msgid "SSL encryption"
-msgstr "Xifratge SSL"
-
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:838 ../widgets/misc/e-signature-combo-box.c:75
-msgctxt "mail-signature"
-msgid "None"
-msgstr "cap"
-
-#: ../mail/em-account-editor.c:919
-msgid "Never"
-msgstr "Mai"
-
-#: ../mail/em-account-editor.c:920
-msgid "Always"
-msgstr "Sempre"
-
-#: ../mail/em-account-editor.c:921
-msgid "Ask for each message"
-msgstr "Pregunta per cada missatge"
-
-#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1741 ../widgets/misc/e-account-tree-view.c:127
-msgctxt "mail-receiving"
-msgid "None"
-msgstr "Cap"
-
-#: ../mail/em-account-editor.c:2140
-msgid "Mail Configuration"
-msgstr "ConfiguraciÃ del correu"
-
-#: ../mail/em-account-editor.c:2141
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin."
-msgstr ""
-"Us donem la benvinguda a l'auxiliar de configuraciÃ del correu de "
-"l'Evolution.\n"
-"\n"
-"Feu clic a ÂEndavantÂ per comenÃar."
-
-#: ../mail/em-account-editor.c:2144
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"IntroduÃu el vostre nom i la vostra adreÃa electrÃnica aquÃ sota. Els camps "
-"ÂopcionalsÂ no sÃn necessaris, a menys que els vulgueu afegir en els correus "
-"que envieu."
-
-#: ../mail/em-account-editor.c:2146 ../mail/em-account-editor.c:2309
-msgid "Receiving Email"
-msgstr "RecepciÃ de correu"
-
-#: ../mail/em-account-editor.c:2147
-msgid "Please configure the following account settings."
-msgstr "Configureu els segÃents parÃmetres del compte."
-
-#: ../mail/em-account-editor.c:2149 ../mail/em-account-editor.c:2809
-msgid "Sending Email"
-msgstr "Enviament de correu"
-
-#: ../mail/em-account-editor.c:2150
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"IntroduÃu informaciÃ sobre com voleu enviar el correu. Si no n'esteu segur, "
-"pregunteu-ho a l'administrador del sistema o al vostre proveÃdor d'Internet."
-
-#: ../mail/em-account-editor.c:2152 ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "InformaciÃ de compte"
-
-#: ../mail/em-account-editor.c:2153
-msgid ""
-"Please enter a descriptive name for this account below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"IntroduÃu un nom descriptiu per a aquest compte aquÃ sota. \n"
-"Aquest nom nomÃs s'utilitzarÃ per visualitzar-lo."
-
-#: ../mail/em-account-editor.c:2157
-msgid "Done"
-msgstr "Fet"
-
-#: ../mail/em-account-editor.c:2158
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"Enhorabona, s'ha completat la configuraciÃ del vostre correu.\n"
-"\n"
-"Ja podeu rebre i enviar correu amb l'Evolution.\n"
-"\n"
-"Feu clic a ÂAplicaÂ per desar la configuraciÃ."
-
-#: ../mail/em-account-editor.c:2623
-msgid "Check for _new messages every"
-msgstr "Comprova si hi ha correu _nou cada"
-
-#: ../mail/em-account-editor.c:2631
-msgid "minu_tes"
-msgstr "minu_ts"
-
-#: ../mail/em-account-editor.c:2914
-msgid "Please select a folder from the current account."
-msgstr "Seleccioneu una carpeta del compte actual."
-
-#: ../mail/em-account-editor.c:3224 ../mail/mail-config.ui.h:98
-msgid "Security"
-msgstr "Seguretat"
-
-#. Most sections for this is auto-generated from the camel config
-#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3270 ../mail/em-account-editor.c:3338
-msgid "Receiving Options"
-msgstr "Opcions de recepciÃ"
-
-#: ../mail/em-account-editor.c:3271 ../mail/em-account-editor.c:3339
-msgid "Checking for New Messages"
-msgstr "ComprovaciÃ de correu nou"
-
-#. Note to translators: this is the attribution string used when quoting messages.
-#. * each ${Variable} gets replaced with a value. To see a full list of available
-#. * variables, see mail/em-composer-utils.c:attribvars array
-#: ../mail/em-composer-utils.c:1173
+#. Note to translators: this is the attribution string used
+#. * when quoting messages.  Each ${Variable} gets replaced
+#. * with a value.  To see a full list of available variables,
+#. * see mail/em-composer-utils.c:attribvars array.
+#: ../mail/em-composer-utils.c:1197
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -9219,35 +9292,35 @@ msgstr ""
 "El ${AbbrevWeekdayName} ${Day} de ${Month} de ${Year} a les ${24Hour}:"
 "${Minute} ${TimeZone}, en/na ${Sender} va escriure:"
 
-#: ../mail/em-composer-utils.c:1184
+#: ../mail/em-composer-utils.c:1208
 msgid "-----Original Message-----"
 msgstr "-----Missatge original-----"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../mail/em-composer-utils.c:1851
+#: ../mail/em-composer-utils.c:1992
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "S'ha llegit el vostre missatge del %3$s per a %1$s sobre Â%2$sÂ."
 
-#: ../mail/em-composer-utils.c:1905
+#: ../mail/em-composer-utils.c:2052
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "NotificaciÃ d'entrega per a: Â%sÂ"
 
-#: ../mail/em-composer-utils.c:2356
+#: ../mail/em-composer-utils.c:2592
 msgid "an unknown sender"
 msgstr "un remitent anÃnim"
 
-#: ../mail/em-composer-utils.c:2787
+#: ../mail/em-composer-utils.c:2998
 msgid "Posting destination"
 msgstr "DestinaciÃ de l'enviament"
 
-#: ../mail/em-composer-utils.c:2788
+#: ../mail/em-composer-utils.c:2999
 msgid "Choose folders to post the message to."
 msgstr "Trieu a quines carpetes s'enviarÃ el missatge."
 
-#: ../mail/em-filter-folder-element.c:339
+#: ../mail/em-filter-folder-element.c:241
 msgid "Select Folder"
 msgstr "Seleccioneu una carpeta"
 
@@ -9364,7 +9437,7 @@ msgstr "no estÃ definit"
 msgid "is set"
 msgstr "estÃ definit"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:60
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
 msgid "Junk"
 msgstr "Correu brossa"
 
@@ -9413,7 +9486,7 @@ msgid "Play Sound"
 msgstr "Reprodueix un so"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:15
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "Llegit"
 
@@ -9496,147 +9569,225 @@ msgstr "DesfÃs la definiciÃ de l'estat"
 # gal/e-table/e-table-config.glade.h:16
 # gal/e-table/e-table-config-no-group.glade.h:16
 #. and now for the action area
-#: ../mail/em-filter-rule.c:536
+#: ../mail/em-filter-rule.c:561
 msgid "Then"
 msgstr "Llavors"
 
-#: ../mail/em-filter-rule.c:567
+#: ../mail/em-filter-rule.c:592
 msgid "Add Ac_tion"
 msgstr "Afegeix una a_cciÃ"
 
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:124
+#: ../mail/em-folder-properties.c:145
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Missatge sense llegir:"
 msgstr[1] "Missatges sense llegir:"
 
-#. TODO: can this be done in a loop?
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:128
+#: ../mail/em-folder-properties.c:156
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Missatge en total:"
 msgstr[1] "Missatges en total:"
 
 # FIXME (dpm)
-#: ../mail/em-folder-properties.c:146
+#: ../mail/em-folder-properties.c:177
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Quota d'utilitzaciÃ d'espai (%s):"
 
 # FIXME (dpm)
-#: ../mail/em-folder-properties.c:148
+#: ../mail/em-folder-properties.c:179
 #, c-format
 msgid "Quota usage"
 msgstr "Quota d'utilitzaciÃ d'espai"
 
-#: ../mail/em-folder-properties.c:290
+#: ../mail/em-folder-properties.c:317
 msgid "Folder Properties"
 msgstr "Propietats de la carpeta"
 
-#: ../mail/em-folder-selection-button.c:77
+#: ../mail/em-folder-selection-button.c:79
 msgid "<click here to select a folder>"
 msgstr "<feu clic per seleccionar una carpeta>"
 
-#: ../mail/em-folder-selector.c:261
+#: ../mail/em-folder-selector.c:436
 msgid "C_reate"
 msgstr "C_rea"
 
-#: ../mail/em-folder-selector.c:265
+#: ../mail/em-folder-selector.c:442
 msgid "Folder _name:"
 msgstr "_Nom de la carpeta:"
 
-#. load store to mail component
-#: ../mail/em-folder-tree-model.c:147 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
-#: ../mail/em-folder-tree-model.c:165 ../mail/em-folder-tree-model.c:167
-#: ../mail/mail-vfolder.c:1164 ../mail/mail-vfolder.c:1239
-msgid "Search Folders"
-msgstr "Carpetes de cerca"
+#: ../mail/em-folder-tree.c:647
+msgid "Folder names cannot contain '/'"
+msgstr "El nom de la carpeta no pot contenir el carÃcter Â/Â"
 
-#. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
-msgid "UNMATCHED"
-msgstr "Cap concordanÃa"
-
-#: ../mail/em-folder-tree-model.c:808 ../mail/em-folder-tree-model.c:1085
-msgid "Loading..."
-msgstr "S'estÃ carregant..."
-
-#: ../mail/em-folder-tree.c:197
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "S'estan analitzant les carpetes a Â%sÂ"
-
-#: ../mail/em-folder-tree.c:625
-msgid "Folder names cannot contain '/'"
-msgstr "El nom de la carpeta no pot contenir el carÃcter Â/Â"
-
-#: ../mail/em-folder-tree.c:1245
+#: ../mail/em-folder-tree.c:768
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1482
+#: ../mail/em-folder-tree.c:1590
 msgid "Mail Folder Tree"
 msgstr "Arbre de carpetes de correu"
 
-#: ../mail/em-folder-tree.c:1938 ../mail/em-folder-utils.c:90
+#: ../mail/em-folder-tree.c:2069 ../mail/em-folder-utils.c:115
 #, c-format
 msgid "Moving folder %s"
 msgstr "S'estÃ movent la carpeta %s"
 
-#: ../mail/em-folder-tree.c:1942 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:2072 ../mail/em-folder-utils.c:117
 #, c-format
 msgid "Copying folder %s"
 msgstr "S'estÃ copiant la carpeta %s"
 
-#: ../mail/em-folder-tree.c:1951 ../mail/message-list.c:2242
+#: ../mail/em-folder-tree.c:2079 ../mail/message-list.c:2303
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "S'estan movent els missatges a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:1955 ../mail/message-list.c:2244
+#: ../mail/em-folder-tree.c:2083 ../mail/message-list.c:2305
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "S'estan copiant els missatges a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:1974
+#: ../mail/em-folder-tree.c:2102
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "No es poden deixar anar els missatges al magatzem del nivell superior"
 
-#: ../mail/em-folder-utils.c:422
+#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:163 ../mail/em-folder-tree-model.c:165
+#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
+#: ../mail/mail-vfolder.c:1125 ../mail/mail-vfolder.c:1239
+msgid "Search Folders"
+msgstr "Carpetes de cerca"
+
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:179 ../mail/em-folder-tree-model.c:181
+msgid "UNMATCHED"
+msgstr "Cap concordanÃa"
+
+#: ../mail/em-folder-tree-model.c:790 ../mail/em-folder-tree-model.c:1075
+msgid "Loading..."
+msgstr "S'estÃ carregant..."
+
+#: ../mail/em-folder-utils.c:488
 msgid "Move Folder To"
 msgstr "Mou la carpeta a"
 
-#: ../mail/em-folder-utils.c:422
+#: ../mail/em-folder-utils.c:488
 msgid "Copy Folder To"
 msgstr "Copia la carpeta a"
 
-#: ../mail/em-folder-utils.c:571
-#: ../plugins/groupwise-features/share-folder-common.c:138
-#, c-format
-msgid "Creating folder '%s'"
-msgstr "S'estÃ creant la carpeta Â%sÂ"
-
-#: ../mail/em-folder-utils.c:741
+#: ../mail/em-folder-utils.c:590
 msgid "Create Folder"
 msgstr "Crea una carpeta"
 
-#: ../mail/em-folder-utils.c:742
-#: ../plugins/groupwise-features/install-shared.c:178
-#: ../plugins/groupwise-features/share-folder-common.c:353
+#: ../mail/em-folder-utils.c:591
 msgid "Specify where to create the folder:"
 msgstr "Especifiqueu on s'ha de crear la carpeta:"
 
-#: ../mail/em-format-html-display.c:84 ../mail/em-format-html.c:1601
+#: ../mail/em-format-html.c:166
+msgid "Formatting message"
+msgstr "S'estÃ formatant el missatge"
+
+#: ../mail/em-format-html.c:378
+msgid "Formatting Message..."
+msgstr "S'estÃ formatant el missatge..."
+
+#: ../mail/em-format-html.c:1562 ../mail/em-format-html.c:1572
+#, c-format
+msgid "Retrieving '%s'"
+msgstr "S'estÃ obtenint Â%sÂ"
+
+#: ../mail/em-format-html.c:1723 ../mail/em-format-html-display.c:89
 msgid "Unsigned"
 msgstr "Sense signar"
 
-#: ../mail/em-format-html-display.c:84
+#: ../mail/em-format-html.c:1724 ../mail/em-format-html-display.c:90
+msgid "Valid signature"
+msgstr "La signatura Ãs vÃlida"
+
+#: ../mail/em-format-html.c:1725 ../mail/em-format-html-display.c:91
+msgid "Invalid signature"
+msgstr "La signatura no Ãs vÃlida"
+
+#: ../mail/em-format-html.c:1726 ../mail/em-format-html-display.c:92
+msgid "Valid signature, but cannot verify sender"
+msgstr "La signatura Ãs vÃlida perÃ no es pot verificar el remitent"
+
+#: ../mail/em-format-html.c:1727 ../mail/em-format-html-display.c:93
+msgid "Signature exists, but need public key"
+msgstr "La signatura existeix, perÃ es necessita la clau pÃblica"
+
+#: ../mail/em-format-html.c:1733 ../mail/em-format-html-display.c:100
+msgid "Unencrypted"
+msgstr "Sense xifrar"
+
+#: ../mail/em-format-html.c:1734 ../mail/em-format-html-display.c:101
+msgid "Encrypted, weak"
+msgstr "Xifrat, feble"
+
+#: ../mail/em-format-html.c:1735 ../mail/em-format-html-display.c:102
+msgid "Encrypted"
+msgstr "Xifrat"
+
+#: ../mail/em-format-html.c:1736 ../mail/em-format-html-display.c:103
+msgid "Encrypted, strong"
+msgstr "Xifrat, fort"
+
+#: ../mail/em-format-html.c:2136
+msgid "Unknown external-body part."
+msgstr "La part del cos externa Ãs desconeguda."
+
+#: ../mail/em-format-html.c:2146
+msgid "Malformed external-body part."
+msgstr "La part del cos externa estÃ mal formada."
+
+#: ../mail/em-format-html.c:2177
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Punter al lloc FTP (%s)"
+
+#: ../mail/em-format-html.c:2188
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Punter a un fitxer local (%s) vÃlid al lloc Â%sÂ"
+
+#: ../mail/em-format-html.c:2190
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Punter al fitxer local (%s)"
+
+#: ../mail/em-format-html.c:2211
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Punter a dades remotes (%s)"
+
+#: ../mail/em-format-html.c:2226
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Punter a dades externes (tipus Â%sÂ)"
+
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../mail/em-format-html.c:2934
+#: ../plugins/mail-notification/mail-notification.c:402
+#, c-format
+msgid "From: %s"
+msgstr "De: %s"
+
+#: ../mail/em-format-html.c:2956
+msgid "(no subject)"
+msgstr "(sense assumpte)"
+
+#: ../mail/em-format-html.c:3032
+#, c-format
+msgid "This message was sent by %s on behalf of %s"
+msgstr "Aquest missatge fou enviat per %s en nom de %s"
+
+#: ../mail/em-format-html-display.c:89
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -9644,11 +9795,7 @@ msgstr ""
 "Aquest missatge no estÃ signat. No hi ha cap garantia que el remitent del "
 "missatge sigui l'autÃntic."
 
-#: ../mail/em-format-html-display.c:85 ../mail/em-format-html.c:1602
-msgid "Valid signature"
-msgstr "La signatura Ãs vÃlida"
-
-#: ../mail/em-format-html-display.c:85
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -9656,11 +9803,7 @@ msgstr ""
 "Aquest missatge estÃ signat i Ãs vÃlid. Ãs molt probable que el remitent del "
 "missatge sigui l'autÃntic."
 
-#: ../mail/em-format-html-display.c:86 ../mail/em-format-html.c:1603
-msgid "Invalid signature"
-msgstr "La signatura no Ãs vÃlida"
-
-#: ../mail/em-format-html-display.c:86
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -9668,11 +9811,7 @@ msgstr ""
 "No es pot verificar la signatura del missatge. Pot ser que s'hagi alterat "
 "durant la transmissiÃ."
 
-#: ../mail/em-format-html-display.c:87 ../mail/em-format-html.c:1604
-msgid "Valid signature, but cannot verify sender"
-msgstr "La signatura Ãs vÃlida perÃ no es pot verificar el remitent"
-
-#: ../mail/em-format-html-display.c:87
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -9680,11 +9819,7 @@ msgstr ""
 "Aquest missatge estÃ signat amb una signatura vÃlida, perÃ no es pot "
 "verificar el remitent del missatge."
 
-#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1605
-msgid "Signature exists, but need public key"
-msgstr "La signatura existeix, perÃ es necessita la clau pÃblica"
-
-#: ../mail/em-format-html-display.c:88
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -9692,11 +9827,7 @@ msgstr ""
 "Aquest missatge estÃ signat amb una signatura vÃlida, perÃ no se li ha "
 "trobat la clau pÃblica corresponent."
 
-#: ../mail/em-format-html-display.c:95 ../mail/em-format-html.c:1611
-msgid "Unencrypted"
-msgstr "Sense xifrar"
-
-#: ../mail/em-format-html-display.c:95
+#: ../mail/em-format-html-display.c:100
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -9704,11 +9835,7 @@ msgstr ""
 "Aquest missatge no estÃ xifrat. Es podria visualitzar el seu contingut en el "
 "transport per Internet."
 
-#: ../mail/em-format-html-display.c:96 ../mail/em-format-html.c:1612
-msgid "Encrypted, weak"
-msgstr "Xifrat, feble"
-
-#: ../mail/em-format-html-display.c:96
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -9719,11 +9846,7 @@ msgstr ""
 "visualitzar el contingut d'aquest missatge en una quantitat de temps "
 "raonable."
 
-#: ../mail/em-format-html-display.c:97 ../mail/em-format-html.c:1613
-msgid "Encrypted"
-msgstr "Xifrat"
-
-#: ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html-display.c:102
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -9731,11 +9854,7 @@ msgstr ""
 "Aquest missatge estÃ xifrat. Seria molt difÃcil que una persona desconeguda "
 "visualitzÃs el contingut d'aquest missatge."
 
-#: ../mail/em-format-html-display.c:98 ../mail/em-format-html.c:1614
-msgid "Encrypted, strong"
-msgstr "Xifrat, fort"
-
-#: ../mail/em-format-html-display.c:98
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -9745,15 +9864,15 @@ msgstr ""
 "difÃcil que alguna persona desconeguda pugui visualitzar el contingut "
 "d'aquest missatge en una quantitat de temps raonable."
 
-#: ../mail/em-format-html-display.c:236 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:241 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_Visualitza el certificat"
 
-#: ../mail/em-format-html-display.c:249
+#: ../mail/em-format-html-display.c:254
 msgid "This certificate is not viewable"
 msgstr "No es pot visualitzar aquest certificat"
 
-#: ../mail/em-format-html-display.c:538
+#: ../mail/em-format-html-display.c:566
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -9761,28 +9880,39 @@ msgstr ""
 "L'Evolution no pot mostrar correctament aquest correu perquÃ Ãs massa gros. "
 "Podeu veure'l sense formatar, o amb un editor de text extern."
 
+#: ../mail/em-format-html-display.c:756
+msgid "Save Image"
+msgstr "Desa la imatge"
+
 #: ../mail/em-format-html-display.c:804
+msgid "Save _Image..."
+msgstr "Desa la _imatge..."
+
+#: ../mail/em-format-html-display.c:806
+msgid "Save the image to a file"
+msgstr "Desa la imatge a un fitxer"
+
+#: ../mail/em-format-html-display.c:1034
 msgid "Completed on"
 msgstr "Completat el"
 
-#: ../mail/em-format-html-display.c:812
+#: ../mail/em-format-html-display.c:1046
 msgid "Overdue:"
 msgstr "VenÃut:"
 
-#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:816
+#: ../mail/em-format-html-display.c:1054
 msgid "by"
 msgstr "el"
 
-#: ../mail/em-format-html-display.c:1047 ../mail/em-format-html-display.c:1094
+#: ../mail/em-format-html-display.c:1335 ../mail/em-format-html-display.c:1386
 msgid "View _Unformatted"
 msgstr "Mostra'l sense _format"
 
-#: ../mail/em-format-html-display.c:1049
+#: ../mail/em-format-html-display.c:1337
 msgid "Hide _Unformatted"
 msgstr "Amaga'l _sense format"
 
-#: ../mail/em-format-html-display.c:1114
+#: ../mail/em-format-html-display.c:1408
 msgid "O_pen With"
 msgstr "O_bre amb"
 
@@ -9791,120 +9921,67 @@ msgstr "O_bre amb"
 msgid "Page %d of %d"
 msgstr "PÃgina %d de %d"
 
-#: ../mail/em-format-html.c:161
-msgid "Formatting message"
-msgstr "S'estÃ formatant el missatge"
-
-#: ../mail/em-format-html.c:360
-msgid "Formatting Message..."
-msgstr "S'estÃ formatant el missatge..."
-
-#: ../mail/em-format-html.c:1445 ../mail/em-format-html.c:1455
-#, c-format
-msgid "Retrieving '%s'"
-msgstr "S'estÃ obtenint Â%sÂ"
-
-#: ../mail/em-format-html.c:1976
-msgid "Unknown external-body part."
-msgstr "La part del cos externa Ãs desconeguda."
-
-#: ../mail/em-format-html.c:1984
-msgid "Malformed external-body part."
-msgstr "La part del cos externa estÃ mal formada."
-
-#: ../mail/em-format-html.c:2014
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Punter al lloc FTP (%s)"
-
-#: ../mail/em-format-html.c:2025
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Punter a un fitxer local (%s) vÃlid al lloc Â%sÂ"
-
-#: ../mail/em-format-html.c:2027
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Punter al fitxer local (%s)"
-
-#: ../mail/em-format-html.c:2048
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Punter a dades remotes (%s)"
-
-#: ../mail/em-format-html.c:2059
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Punter a dades externes (tipus Â%sÂ)"
-
-#. To translators: This message suggests to the receipients that the sender of the mail is
-#. different from the one listed in From field.
-#: ../mail/em-format-html.c:2763
-#, c-format
-msgid "This message was sent by %s on behalf of %s"
-msgstr "Aquest missatge fou enviat per %s en nom de %s"
-
 #: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
 #: ../mail/em-html-stream.c:122
 #, c-format
 msgid "No HTML stream available"
 msgstr "No hi ha cap flux HTML disponible"
 
-#: ../mail/em-subscription-editor.c:1105
+#: ../mail/em-subscription-editor.c:1162
 msgid "Folder Subscriptions"
 msgstr "SubscripciÃ a carpetes"
 
-#: ../mail/em-subscription-editor.c:1144
+#: ../mail/em-subscription-editor.c:1201
 msgid "_Account:"
 msgstr "_Compte:"
 
-#: ../mail/em-subscription-editor.c:1159
+#: ../mail/em-subscription-editor.c:1216
 msgid "Clear Search"
 msgstr "Neteja la cerca"
 
-#: ../mail/em-subscription-editor.c:1177
+#: ../mail/em-subscription-editor.c:1234
 msgid "Sho_w items that contain:"
 msgstr "_Mostra els elements que continguin:"
 
-#: ../mail/em-subscription-editor.c:1216
+#: ../mail/em-subscription-editor.c:1273
 msgid "Subscribe to the selected folder"
 msgstr "Subscriu-me a la carpeta seleccionada"
 
-#: ../mail/em-subscription-editor.c:1217
+#: ../mail/em-subscription-editor.c:1274
 msgid "Su_bscribe"
 msgstr "Su_bscriu-me"
 
-#: ../mail/em-subscription-editor.c:1228
-#: ../modules/mail/e-mail-shell-view-actions.c:1178
+#: ../mail/em-subscription-editor.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
 msgid "Unsubscribe from the selected folder"
 msgstr "CancelÂla la subscripciÃ a la carpeta seleccionada"
 
-#: ../mail/em-subscription-editor.c:1229
-#: ../modules/mail/e-mail-shell-view-actions.c:1176
+#: ../mail/em-subscription-editor.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
 msgid "_Unsubscribe"
 msgstr "CancelÂla la s_ubscripciÃ"
 
-#: ../mail/em-subscription-editor.c:1240
+#: ../mail/em-subscription-editor.c:1297
 msgid "Collapse all folders"
 msgstr "Contreu totes les carpetes"
 
-#: ../mail/em-subscription-editor.c:1241
+#: ../mail/em-subscription-editor.c:1298
 msgid "C_ollapse All"
 msgstr "Contreu-les _totes"
 
-#: ../mail/em-subscription-editor.c:1251
+#: ../mail/em-subscription-editor.c:1308
 msgid "Expand all folders"
 msgstr "Expandeix totes les carpetes"
 
-#: ../mail/em-subscription-editor.c:1252
+#: ../mail/em-subscription-editor.c:1309
 msgid "E_xpand All"
 msgstr "E_xpandeix-les totes"
 
-#: ../mail/em-subscription-editor.c:1262
+#: ../mail/em-subscription-editor.c:1319
 msgid "Refresh the folder list"
 msgstr "Refresca la llista de carpetes"
 
-#: ../mail/em-subscription-editor.c:1274
+#: ../mail/em-subscription-editor.c:1331
 msgid "Stop the current operation"
 msgstr "CancelÂla l'operaciÃ actual"
 
@@ -9912,23 +9989,23 @@ msgstr "CancelÂla l'operaciÃ actual"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:101
+#: ../mail/em-utils.c:102
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "Voleu obrir %d missatge a la vegada?"
 msgstr[1] "Voleu obrir %d missatges a la vegada?"
 
-#: ../mail/em-utils.c:157
-#: ../modules/mailto-handler/evolution-mailto-handler.c:151
+#: ../mail/em-utils.c:158
+#: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "_No tornis a mostrar aquest missatge."
 
-#: ../mail/em-utils.c:332
+#: ../mail/em-utils.c:333
 msgid "Message Filters"
 msgstr "Filtres de missatge"
 
-#: ../mail/em-utils.c:908
+#: ../mail/em-utils.c:918
 #, c-format
 msgid "Messages from %s"
 msgstr "Missatges de %s"
@@ -9937,7 +10014,7 @@ msgstr "Missatges de %s"
 msgid "Search _Folders"
 msgstr "Car_petes de cerca"
 
-#: ../mail/em-vfolder-rule.c:610
+#: ../mail/em-vfolder-rule.c:618
 msgid "Add Folder"
 msgstr "Afegeix una carpeta"
 
@@ -9994,7 +10071,7 @@ msgid "Always request read receipt"
 msgstr "SolÂlicita sempre una confirmaciÃ de lectura"
 
 #: ../mail/evolution-mail.schemas.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Temps en segons durant el qual es mostrarÃ l'error a la barra d'estat."
 
@@ -10040,11 +10117,11 @@ msgstr "Color de ressaltat de les citacions."
 
 #: ../mail/evolution-mail.schemas.in.h:24
 msgid "Composer Window default height"
-msgstr "AlÃada predeterminada de la finestra del redactor"
+msgstr "AlÃada per defecte de la finestra del redactor"
 
 #: ../mail/evolution-mail.schemas.in.h:25
 msgid "Composer Window default width"
-msgstr "Amplada predeterminada de la finestra del redactor"
+msgstr "Amplada per defecte de la finestra del redactor"
 
 #: ../mail/evolution-mail.schemas.in.h:26
 msgid "Composer load/attach directory"
@@ -10084,39 +10161,39 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default charset in which to compose messages"
-msgstr "Joc de carÃcters predeterminat amb quÃ es visualitzaran els missatges"
+msgstr "Joc de carÃcters per defecte amb quÃ es visualitzaran els missatges"
 
 #: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default charset in which to compose messages."
-msgstr "Joc de carÃcters predeterminat amb quÃ es redactaran els missatges."
+msgstr "Joc de carÃcters per defecte amb quÃ es redactaran els missatges."
 
 #: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default charset in which to display messages"
-msgstr "Joc de carÃcters predeterminat amb quÃ es visualitzaran els missatges"
+msgstr "Joc de carÃcters per defecte amb quÃ es visualitzaran els missatges"
 
 #: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default charset in which to display messages."
-msgstr "Joc de carÃcters predeterminat amb quÃ es visualitzaran els missatges."
+msgstr "Joc de carÃcters per defecte amb quÃ es visualitzaran els missatges."
 
 #: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default forward style"
-msgstr "Estil de reenviament predeterminat"
+msgstr "Estil de reenviament per defecte"
 
 #: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default height of the Composer Window."
-msgstr "AlÃada predeterminada de la finestra del redactor."
+msgstr "AlÃada per defecte de la finestra del redactor."
 
 #: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default height of the mail browser window."
-msgstr "AlÃada predeterminada de la finestra del navegador de correu."
+msgstr "AlÃada per defecte de la finestra del navegador de correu."
 
 #: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default maximized state of the mail browser window."
-msgstr "Amplada predeterminada de la finestra del navegador de correu."
+msgstr "Amplada per defecte de la finestra del navegador de correu."
 
 #: ../mail/evolution-mail.schemas.in.h:40
 msgid "Default reply style"
-msgstr "Estil de resposta predeterminat"
+msgstr "Estil de resposta per defecte"
 
 #: ../mail/evolution-mail.schemas.in.h:41
 msgid "Default value for thread expand state"
@@ -10124,26 +10201,34 @@ msgstr "Valor per defecte de l'estat de l'expansiÃ dels fils"
 
 #: ../mail/evolution-mail.schemas.in.h:42
 msgid "Default width of the Composer Window."
-msgstr "Amplada predeterminada de la finestra del redactor."
+msgstr "Amplada per defecte de la finestra del redactor."
 
 #: ../mail/evolution-mail.schemas.in.h:43
 msgid "Default width of the mail browser window."
-msgstr "Amplada predeterminada de la finestra del navegador de correu."
+msgstr "Amplada per defecte de la finestra del navegador de correu."
 
 #: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
+"Describes whether message headers in paned view should be collapsed or "
+"expanded by default. \"0\" = expanded \"1\" = collapsed"
+msgstr ""
+"Defineix si les capÃaleres del missatge a la visualitzaciÃ de subfinestra "
+"haurien d'estar colÂlapsades (1) o expandides (0) per defecte."
+
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr ""
 "Determina si s'han de cercar nomÃs les adreces de les llibretes d'adreces "
 "locals en comprovar si hi ha correu brossa"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Determina si s'ha de cercar l'adreÃa del remitent a la llibreta d'adreces"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -10156,14 +10241,14 @@ msgstr ""
 "lent en llibretes d'adreces remotes (p. ex. LDAP) marcades per a "
 "l'autocompleciÃ."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Determina si s'han d'utilitzar capÃaleres personalitzades per detectar el "
 "correu brossa"
 
 # FIXME [l10n-bug] (dpm)
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -10173,7 +10258,7 @@ msgstr ""
 "que Ãs correu brossa. Si s'habilita aquesta opciÃ i es mencionen les "
 "capÃaleres, s'incrementarÃ la velocitat de detecciÃ del correu brossa."
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -10182,50 +10267,50 @@ msgstr ""
 "tipus de lletra per a les lÃnies dels camps ÂDeÂ i ÂAssumpteÂ a la columna "
 "dels ÂMissatgesÂ."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Directory for loading/attaching files to composer."
 msgstr "Directori des d'on carregar/adjuntar fitxers al redactor."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Directory for saving mail component files."
 msgstr "Directori on desar fitxers del component de correu."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr ""
 "Habilita o inhabilita l'escurÃament amb punts suspensius dels noms de les "
 "carpetes a la barra lateral"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Display only message texts not exceeding certain size"
 msgstr ""
 "Mostra nomÃs els texts dels missatges que no sobrepassin una mida determinada"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Do not add signature delimiter"
 msgstr "No afegeixis el delimitador de signatura"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Marca els errors ortogrÃfics a les paraules mentre s'escriu."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Empty Junk folders on exit"
 msgstr "Buida les carpetes de correu brossa en sortir"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Empty Trash folders on exit"
 msgstr "Buida les papereres en sortir"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Buida totes les carpetes de correu brossa en sortir de l'Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Buida les carpetes de paperera en sortir de l'Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -10234,33 +10319,33 @@ msgstr ""
 "les troben empipadores i prefereixen utilitzar una imatge estÃtica en lloc "
 "d'elles."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Habilita el mode de cursor, de manera que vegeu un cursor en llegir el "
 "correu."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable or disable magic space bar"
 msgstr "Habilita o inhabilita la tecla d'espai mÃgica"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Habilita/inhabilita la pregunta en marcar mÃltiples missatges."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable or disable type ahead search feature"
 msgstr "Habilita o inhabilita la cerca mentre escriviu"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable search folders"
 msgstr "Habilita les carpetes de cerca"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable search folders on startup."
 msgstr "Habilita les carpetes de cerca a l'inici."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -10268,7 +10353,7 @@ msgstr ""
 "Habilita la funciÃ de cerca de la barra lateral per permetre la cerca "
 "interactiva de noms de carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -10277,7 +10362,7 @@ msgstr ""
 "previsualitzaciÃ dels missatges, en la llista dels missatges i en la de les "
 "carpetes."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
@@ -10285,27 +10370,27 @@ msgstr ""
 "Habilita la visualitzaciÃ dels texts de missatge que no sobrepassin la mida "
 "definida a la clau Âmessage_text_part_limitÂ."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "Habiliteu-ho per utilitzar uns parÃmetres semblants per la visualitzaciÃ de "
 "la llista de missatges per a totes les carpetes"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Habiliteu-ho per utilitzar uns parÃmetres semblants per la visualitzaciÃ de "
 "la llista de missatges per a totes les carpetes."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Enable/disable caret mode"
 msgstr "Habilita/inhabilita el mode de cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:44
+#: ../mail/evolution-mail.schemas.in.h:74 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Codifica els noms de fitxer tal com ho fan l'Outlook i el GMail"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -10317,38 +10402,38 @@ msgstr ""
 "els noms de fitxer amb UTF-8 enviats amb l'Evolution. AixÃ cal fer-ho perquÃ "
 "no segueixen l'RFC 2231, sinÃ que utilitzen l'estÃndard incorrecte RFC 2047."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Flush Outbox after filtering"
 msgstr "Buida la safata de sortida desprÃs de filtrar"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Forward message."
 msgstr "Missatge reenviat."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Group Reply replies to list"
 msgstr "La resposta al grup respon a la llista"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Height of the message-list pane"
 msgstr "AlÃada de la subfinestra de la llista de missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Height of the message-list pane."
 msgstr "AlÃada de la subfinestra de la llista de missatges."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Oculta la previsualitzaciÃ per a cada carpeta i suprimeix la selecciÃ"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr ""
 "Pregunta a l'usuari si de debÃ vol obrir deu o mÃs missatges a la vegada."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -10359,11 +10444,11 @@ msgstr ""
 "visualitzador de components Bonobo de la base de dades MIME del GNOME poden "
 "ser utilitzats per visualitzar-ne el contingut."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Ignore list Reply-To:"
 msgstr "Ignora ÂReply-To:Â (respon a) a les llistes"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
@@ -10371,7 +10456,7 @@ msgstr ""
 "AlÃada inicial de la finestra de l'editor de filtres. S'actualitza a mesura "
 "que l'usuari canvia la mida vertical de la finestra."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial height of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10379,7 +10464,7 @@ msgstr ""
 "AlÃada inicial de la finestra de subscripciÃ a carpetes. S'actualitza a "
 "mesura que l'usuari canvia la mida vertical de la finestra."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10387,7 +10472,7 @@ msgstr ""
 "AlÃada inicial de la finestra de l'editor de carpetes de cerca. S'actualitza "
 "a mesura que l'usuari canvia la mida vertical de la finestra."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10395,7 +10480,7 @@ msgstr ""
 "AlÃada inicial de la finestra ÂEnvia i rep el correuÂ. S'actualitza a mesura "
 "que l'usuari canvia la mida vertical de la finestra."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -10408,7 +10493,7 @@ msgstr ""
 "aquesta finestra no es pot maximitzar. Aquesta clau existeix nomÃs com a "
 "detall d'implementaciÃ."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
 "Initial maximize state of the \"Folder Subscriptions\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10421,7 +10506,7 @@ msgstr ""
 "aquesta finestra no es pot maximitzar. Aquesta clau existeix nomÃs com a "
 "detall d'implementaciÃ."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10434,7 +10519,7 @@ msgstr ""
 "al fet que aquesta finestra no es pot maximitzar. Aquesta clau existeix "
 "nomÃs com a detall d'implementaciÃ."
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10448,7 +10533,7 @@ msgstr ""
 "aquesta finestra no es pot maximitzar. Aquesta clau existeix nomÃs com a "
 "detall d'implementaciÃ."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
@@ -10456,7 +10541,7 @@ msgstr ""
 "Amplada inicial de la finestra de l'editor de filtres. S'actualitza a mesura "
 "que l'usuari canvia la mida horitzontal de la finestra."
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "Initial width of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10464,7 +10549,7 @@ msgstr ""
 "Amplada inicial de la finestra de subscripciÃ a carpetes. S'actualitza a "
 "mesura que l'usuari canvia la mida horitzontal de la finestra."
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10472,7 +10557,7 @@ msgstr ""
 "Amplada inicial de la finestra de l'editor de carpetes de cerca. "
 "S'actualitza a mesura que l'usuari canvia la mida horitzontal de la finestra."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10480,7 +10565,7 @@ msgstr ""
 "Amplada inicial de la finestra ÂEnvia i rep el correuÂ. S'actualitza a "
 "mesura que l'usuari canvia la mida horitzontal de la finestra."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -10492,7 +10577,7 @@ msgstr ""
 "llista de correu a travÃs de la qual heu rebut una cÃpia del missatge al "
 "qual voleu respondre."
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -10503,7 +10588,7 @@ msgstr ""
 "permanent, i que no nomÃs implica la supressiÃ d'aquests en els resultats de "
 "la cerca."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -10512,7 +10597,7 @@ msgstr ""
 "esteu enviant una resposta privada a un missatge que ha arribat a travÃs "
 "d'una llista de correu."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
@@ -10520,7 +10605,7 @@ msgstr ""
 "Habilita o inhabilita la mostra de confirmacions mÃltiples per advertir que "
 "esteu enviant una resposta a diverses persones."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -10531,7 +10616,7 @@ msgstr ""
 "d'una llista de correu, perÃ la llista estableix una capÃalera Respon-a: "
 "(ÂReply-To:Â) que torna a dirigir la vostra resposta a la llista"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -10540,42 +10625,42 @@ msgstr ""
 "esteu intentant enviar un missatge a destinataris que no s'han introduÃt com "
 "a adreces de correu"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Last time Empty Junk was run"
 msgstr "La darrera vegada que es va buidar la paperera de correu brossa"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Last time Empty Trash was run"
 msgstr "La darrera vegada que es va buidar la paperera"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Layout style"
 msgstr "Estil de disposiciÃ"
 
-#: ../mail/evolution-mail.schemas.in.h:105
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:106
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Level beyond which the message should be logged."
 msgstr "Nivell per sobre del qual s'enregistrarÃ el missatge."
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of Labels and their associated colors"
 msgstr "Llista d'etiquetes i els seus colors associats"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr ""
 "Llista de tipus MIME per als quals es cercaran components de visualitzaciÃ "
 "del Bonobo"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "List of accepted licenses"
 msgstr "Llista de llicÃncies acceptades"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "List of accounts"
 msgstr "Llista de comptes"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -10584,17 +10669,17 @@ msgstr ""
 "llista contÃ cadenes referents a subdirectoris relatius a /apps/evolution/"
 "mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "List of custom headers and whether they are enabled."
 msgstr "Llista de capÃaleres personalitzades i si estan habilitades."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 "Llista dels codis de llengua dels diccionaris a utilitzar per a la "
 "verificaciÃ ortogrÃfica."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -10603,15 +10688,15 @@ msgstr ""
 "llista contÃ cadenes de tipus nom:color, on color fa servir la codificaciÃ "
 "hexadecimal HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "List of protocol names whose license has been accepted."
 msgstr "Llista de noms de protocol per als quals s'ha acceptat la llicÃncia."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Load images for HTML messages over HTTP"
 msgstr "Carrega les imatges dels missatges HTML a travÃs de l'HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -10621,93 +10706,93 @@ msgstr ""
 "possibles sÃn: Â0Â - mai carreguis imatges de la xarxa, Â1Â- carrega imatges "
 "dels contactes, Â2Â - carrega sempre les imatges de la xarxa."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Log filter actions"
 msgstr "Registra les accions del filtre"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Log filter actions to the specified log file."
 msgstr "Registra les accions al fitxer de registre especificat."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Logfile to log filter actions"
 msgstr "Fitxer on registrar accions de filtre"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Logfile to log filter actions."
 msgstr "Fitxer on enregistrar accions de filtre."
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mail browser height"
 msgstr "AlÃada del navegador de correu"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mail browser maximized"
 msgstr "Maximitza el navegador de correu"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Mail browser width"
 msgstr "Amplada del navegador de correu"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark as Seen after specified timeout"
 msgstr "Marca com a vist desprÃs del temps d'espera"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark as Seen after specified timeout."
 msgstr "Marca com a vist desprÃs del temps d'espera."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marca les citacions en la ÂPrevisualitzaciÃÂ del missatge"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marca les citacions en la ÂPrevisualitzaciÃÂ del missatge."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Message text limit for display"
 msgstr "LÃmit del text dels missatges per mostrar-los"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Estil de visualitzaciÃ de missatges a normal (ÂnormalÂ), capÃaleres senceres "
 "(Âfull headersÂ), font (ÂsourceÂ)"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 "MÃnim nombre de dies entre buidatges de la paperera de correu brossa en "
 "sortir"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Minimum days between emptying the trash on exit"
 msgstr "MÃnim nombre de dies entre buidatges de la paperera en sortir"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Temps mÃnim entre buidatges de la paperera de correu brossa en sortir, en "
 "dies."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Temps mÃnim entre buidatges de la paperera en sortir, en dies."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Nombre d'adreces a mostrar a Per a/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Original message."
 msgstr "Missatge original."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Path where picture gallery should search for its content"
 msgstr "CamÃ en el qual la galeria d'imatges ha de cercar el contingut"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Possible values are: never - to never close browser window always - to "
 "always close browser window ask - (or any other value) will ask user"
@@ -10717,54 +10802,54 @@ msgstr ""
 "ÂaskÂ (demana-ho) - per demanar-li a l'usuari si vol tancar la finestra de "
 "navegaciÃ"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
 "Demana confirmaciÃ abans d'enviar correus a destinataris que no s'han "
 "introduÃt com a adreÃa de correu"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt on empty subject"
 msgstr "Pregunta quan l'assumpte sigui buit"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Pregunta l'usuari quan intenti buidar una carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Pregunta quan l'usuari intenti enviar un missatge sense assumpte."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when deleting messages in search folder"
 msgstr "Pregunta quan se suprimeixin els missatges d'una carpeta de cerca"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Pregunta quan la llista de correu segresti les respostes privades"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Prompt when replying privately to list messages"
 msgstr "Pregunta en respondre privadament a missatges d'una llista de correu"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Prompt when replying to many recipients"
 msgstr "Pregunta en respondre a diversos destinataris"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user expunges"
 msgstr "Pregunta quan l'usuari buidi"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user only fills Bcc"
 msgstr "Pregunta quan l'usuari nomÃs entri el camp CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Pregunta quan l'usuari intenti obrir deu o mÃs missatges a la vegada"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -10772,66 +10857,66 @@ msgstr ""
 "Pregunta quan l'usuari intenti enviar correu HTML a destinataris que no "
 "volen rebre correu HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Pregunta quan l'usuari intenti enviar un missatge sense destinataris a Per a "
 "o CC."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Pregunta quan l'usuari intenti enviar correu HTML no desitjat"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Prompt while marking multiple messages"
 msgstr "Pregunta en marcar mÃltiples missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Put personalized signatures at the top of replies"
 msgstr "Posa signatures personalitzades a la part superior de les respostes"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Put the cursor at the bottom of replies"
 msgstr "Posa el cursor al final del missatge en respondre"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Recognize emoticons in text and replace them with images."
 msgstr ""
 "Reconeix les emoticones en el text i reemplaÃa-les per les seves imatges."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Recognize links in text and replace them."
 msgstr "Reconeix els enllaÃos en el text i reemplaÃa'ls."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Run junk test on incoming mail."
 msgstr "Executa la prova de brossa per al correu d'entrada."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Save directory"
 msgstr "Directori on desar"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Search for the sender photo in local address books"
 msgstr "Cerca la fotografia del remitent a les llibretes d'adreces locals"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Send HTML mail by default"
 msgstr "Envia els missatges en format HTML per defecte"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Send HTML mail by default."
 msgstr "Envia els missatges en format HTML per defecte."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Sender email-address column in the message list"
 msgstr "Columna del correu del remitent a la llista de missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Server synchronization interval"
 msgstr "Interval de sincronitzaciÃ amb el servidor"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -10839,65 +10924,65 @@ msgstr ""
 "Establiu-ho a ÂTRUEÂ (cert) si en redactar un correu no voleu afegir un "
 "delimitador abans de la signatura."
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Mostra el camp ÂCCOÂ en enviar un missatge de correu"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Mostra el camp ÂCCÂ en enviar un missatge de correu"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Mostra el camp ÂDeÂ en enviar un missatge a un grup de notÃcies"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Mostra el camp ÂRespon aÂ en enviar un missatge a un grup de notÃcies"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Mostra el camp ÂRespon aÂ en enviar un missatge de correu"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show Animations"
 msgstr "Mostra les animacions"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show all message headers"
 msgstr "Mostra totes les capÃaleres de missatge"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show all the headers when viewing a messages."
 msgstr "Mostra totes les capÃaleres en visualitzar un missatge."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show animated images as animations."
 msgstr "Mostra les imatges animades com a animacions."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Mostra els missatges suprimits a la llista de missatges (amb una ratlla a "
 "sobre)."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show deleted messages in the message-list"
 msgstr "Mostra els missatges suprimits a la llista de missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Show image animations"
 msgstr "Mostra les animacions de les imatges"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show original \"Date\" header value."
 msgstr "Mostra el valor de la capÃalera original de ÂDateÂ (data)."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Show photo of the sender"
 msgstr "Mostra la fotografia del remitent"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -10905,7 +10990,7 @@ msgstr ""
 "Mostra el camp ÂCCOÂ en enviar un missatge de correu. Aquest parÃmetre es "
 "controla des del menÃ Visualitza en seleccionar un compte de correu."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -10913,7 +10998,7 @@ msgstr ""
 "Mostra el camp ÂCCÂ en enviar un missatge de correu. Aquest parÃmetre es "
 "controla des del menÃ Visualitza en seleccionar un compte de correu."
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -10922,7 +11007,7 @@ msgstr ""
 "parÃmetre es controla des del menÃ Visualitza en seleccionar un compte de "
 "grup de notÃcies."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -10931,7 +11016,7 @@ msgstr ""
 "Aquest parÃmetre es controla des del menÃ Visualitza en seleccionar un "
 "compte de grup de notÃcies."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -10939,7 +11024,7 @@ msgstr ""
 "Mostra el camp ÂRespon aÂ en enviar un missatge de correu. Aquest parÃmetre "
 "es controla des del menÃ Visualitza en seleccionar un compte de correu."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -10947,7 +11032,7 @@ msgstr ""
 "Mostra el correu del remitent en una columna separada a la llista de "
 "missatges."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -10958,12 +11043,12 @@ msgstr ""
 "de la capÃalera ÂDateÂ en el format preferit de l'usuari i en el fus horari "
 "local."
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Show the photo of the sender in the message reading pane."
 msgstr ""
 "Mostra la fotografia del remitent a la subfinestra de lectura de missatges."
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -10983,41 +11068,46 @@ msgstr ""
 "llista. El funcionament es basa en comparar la capÃalera ÂReply-To:Â amb la "
 "capÃalera ÂList-Post:Â, si Ãs que n'hi ha una."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Spell check inline"
 msgstr "ComprovaciÃ ortogrÃfica mentre s'escriu"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Spell checking color"
 msgstr "Color de la verificaciÃ ortogrÃfica"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Spell checking languages"
 msgstr "LlengÃes per a la verificaciÃ ortogrÃfica"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:192
+msgid "State of message headers in paned view"
+msgstr ""
+"L'estat de les capÃaleres del missatge a la visualitzaciÃ de subfinestra"
+
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Terminal font"
 msgstr "Tipus de lletra de terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "The default plugin for Junk hook"
 msgstr "El connector de correu brossa per defecte"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "La darrera vegada que es va buidar la paperera de correu brossa, en dies des "
 "de l'inici de l'Ãpoca Unix (1 de gener de 1970)."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "La darrera vegada que es va buidar la paperera, en dies des de l'inici de "
 "l'Ãpoca Unix (1 de gener de 1970)."
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -11030,11 +11120,11 @@ msgstr ""
 "Â1Â (visualitzaciÃ vertical) ubica la subfinestra de previsualitzaciÃ al "
 "costat de la llista de missatges."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "The terminal font for mail display."
 msgstr "El tipus de lletra de terminal per visualitzar el correu."
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows."
@@ -11042,7 +11132,7 @@ msgstr ""
 "El text que s'afegirÃ en reenviar un missatge, el qual indica que es mostra "
 "el missatge reenviat a continuaciÃ."
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows."
@@ -11050,7 +11140,7 @@ msgstr ""
 "El text que s'afegirÃ en respondre a un missatge (amb la resposta al "
 "capdamunt), el qual indica que es mostra el missatge original a continuaciÃ."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author."
@@ -11058,11 +11148,11 @@ msgstr ""
 "El text que s'afegirÃ en respondre a un missatge, el qual atribueix el "
 "missatge a l'autor original."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "The variable width font for mail display."
 msgstr "El tipus de lletra de mida variable per visualitzar el correu."
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -11070,17 +11160,17 @@ msgstr ""
 "AixÃ pot tenir tres valors possibles: Â0Â per als errors, Â1Â per als "
 "avisos, i Â2Â per als missatges de depuraciÃ."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid ""
 "This decides the max size of the message text that will be displayed under "
 "Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
 "is used only when 'force_message_limit' key is activated."
 msgstr ""
 "AixÃ decideix la mida mÃxima de la part de text que es mostrarÃ a "
-"l'Evolution. El valor predeterminat Ãs 4096 KB (4 MB), i s'especifica en KB. "
+"l'Evolution. El valor per defecte Ãs 4096 KB (4 MB), i s'especifica en KB. "
 "Aquest valor s'utilitza nomÃs en activar la clau Âforce_message_limitÂ."
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -11090,7 +11180,7 @@ msgstr ""
 "connectors habilitats. Si s'inhabilita aquest connector per defecte, "
 "l'Evolution tampoc recorrerÃ als altres connectors disponibles."
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -11099,7 +11189,7 @@ msgstr ""
 "com a ÂfalseÂ (falsa). AixÃ provoca que es desfaci la selecciÃ dels correus "
 "de la llista i que se suprimeixi la previsualitzaciÃ de la carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -11111,7 +11201,7 @@ msgstr ""
 "l'estructura XML Ãs &lt;capÃalera enabled&gt;. Indiqueu ÂenabledÂ si s'ha de "
 "visualitzar la capÃalera en la visualitzaciÃ del correu."
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -11122,11 +11212,11 @@ msgstr ""
 "locals amb la finalitat d'excloure els correus enviats per contactes "
 "coneguts del filtratge de correu brossa."
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "This option would help in improving the speed of fetching."
 msgstr "Aquesta opciÃ ajudaria a millorar la velocitat de recollida."
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -11134,7 +11224,7 @@ msgstr ""
 "AixÃ estableix el nombre d'adreces per mostrar a la visualitzaciÃ de la "
 "llista de missatges."
 
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Requires a restart to apply."
@@ -11142,7 +11232,7 @@ msgstr ""
 "Aquest parÃmetre especifica si l'estat per defecte dels fils Ãs expandit o "
 "contret. Haureu de reiniciar perquÃ els canvis tinguin efecte."
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -11152,7 +11242,7 @@ msgstr ""
 "missatge de cadascun d'ells, o bÃ segons la data del missatge. Haureu de "
 "reiniciar l'Evolution perquÃ els canvis tinguin efecte."
 
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid ""
 "This value can be an empty string, which means it'll use the system Picture "
 "folder, usually set to ~/Pictures. This folder will be also used when the "
@@ -11163,36 +11253,28 @@ msgstr ""
 "Imatges dins la carpeta de l'usuari). Aquesta carpeta tambÃ s'utilitzarÃ "
 "quan el camÃ establert no correspongui a una carpeta existent."
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid "Thread the message-list based on Subject"
 msgstr "Crea fils basats en l'assumpte en la llista de missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Timeout for marking message as seen"
 msgstr "Temps d'espera per marcar un missatge com a llegit"
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Timeout for marking message as seen."
 msgstr "Temps d'espera per marcar un missatge com a llegit."
 
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "UID string of the default account."
-msgstr "Cadena d'identificaciÃ d'usuari del compte predeterminat."
+msgstr "Cadena d'identificaciÃ d'usuari del compte per defecte."
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 "Color de subratllat per als errors ortogrÃfics quan s'utilitzi la "
 "verificaciÃ ortogrÃfica."
 
-#: ../mail/evolution-mail.schemas.in.h:217
-msgid "Use SpamAssassin daemon and client"
-msgstr "Utilitza el client i el dimoni de l'SpamAssassin"
-
-#: ../mail/evolution-mail.schemas.in.h:218
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "Utilitza el client i el dimoni de l'SpamAssassin (spamc/spamd)."
-
 #: ../mail/evolution-mail.schemas.in.h:219
 msgid "Use custom fonts"
 msgstr "Utilitza tipus de lletra personalitzats"
@@ -11202,14 +11284,6 @@ msgid "Use custom fonts for displaying mail."
 msgstr "Utilitza tipus de lletra personalitzats per visualitzar el correu."
 
 #: ../mail/evolution-mail.schemas.in.h:221
-msgid "Use only local spam tests."
-msgstr "Fes nomÃs proves de correu no desitjat locals."
-
-#: ../mail/evolution-mail.schemas.in.h:222
-msgid "Use only the local spam tests (no DNS)."
-msgstr "Fes nomÃs proves de correu no desitjat locals (no DNS)."
-
-#: ../mail/evolution-mail.schemas.in.h:223
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -11219,7 +11293,7 @@ msgstr ""
 "en respondre a un missatge. Aquest parÃmetre determina si el cursor s'ha de "
 "posicionar a l'inici o al final del missatge."
 
-#: ../mail/evolution-mail.schemas.in.h:224
+#: ../mail/evolution-mail.schemas.in.h:222
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -11229,17 +11303,17 @@ msgstr ""
 "signatura en respondre a un missatge. Aquest parÃmetre determina si la "
 "signatura s'ha de posicionar a l'inici o al final del missatge."
 
-#: ../mail/evolution-mail.schemas.in.h:225
+#: ../mail/evolution-mail.schemas.in.h:223
 msgid "Variable width font"
 msgstr "Tipus de lletra de mida variable"
 
-#: ../mail/evolution-mail.schemas.in.h:226
+#: ../mail/evolution-mail.schemas.in.h:224
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Si s'afegirÃ una solÂlicitud de confirmaciÃ de lectura per a cada missatge "
-"de manera predeterminada."
+"de manera per defecte."
 
-#: ../mail/evolution-mail.schemas.in.h:227
+#: ../mail/evolution-mail.schemas.in.h:225
 msgid ""
 "Whether check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
@@ -11250,7 +11324,7 @@ msgstr ""
 "correu nou cada X minutsÂ. Aquesta opciÃ s'utilitzarÃ nomÃs conjuntament amb "
 "l'opciÃ Âsend_recv_on_startÂ."
 
-#: ../mail/evolution-mail.schemas.in.h:228
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid ""
 "Whether check for new messages when Evolution is started. This includes also "
 "sending messages from Outbox."
@@ -11258,13 +11332,13 @@ msgstr ""
 "Si s'ha de comprovar si hi ha correu nou en iniciar l'Evolution. AixÃ tambÃ "
 "inclou l'enviament de missatges de la safata de sortida."
 
-#: ../mail/evolution-mail.schemas.in.h:229
+#: ../mail/evolution-mail.schemas.in.h:227
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 "Si s'ha d'inhabilitar la funcionalitat d'escurÃar els noms de les carpetes "
 "amb punts suspensius a la barra lateral."
 
-#: ../mail/evolution-mail.schemas.in.h:230
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -11272,11 +11346,11 @@ msgstr ""
 "Si s'ha de provar de crear fils per temes quan els missatges no continguin "
 "les capÃaleres ÂReferencesÂ o ÂIn-Reply-ToÂ."
 
-#: ../mail/evolution-mail.schemas.in.h:231
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Si s'han d'ordenar els fils basant-se en el seu l'Ãltim missatge"
 
-#: ../mail/evolution-mail.schemas.in.h:232
+#: ../mail/evolution-mail.schemas.in.h:230
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
@@ -11287,101 +11361,99 @@ msgstr ""
 "a la carpetaÂ, aproximadament un minut desprÃs de la darrera invocaciÃ de la "
 "darrera acciÃ."
 
-#: ../mail/evolution-mail.schemas.in.h:233
+#: ../mail/evolution-mail.schemas.in.h:231
 msgid "Width of the message-list pane"
 msgstr "Amplada de la subfinestra de la llista de missatges"
 
-#: ../mail/evolution-mail.schemas.in.h:234
+#: ../mail/evolution-mail.schemas.in.h:232
 msgid "Width of the message-list pane."
 msgstr "Amplada de la subfinestra de la llista de missatges."
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:181
 msgid "Importing Elm data"
 msgstr "S'estan important dades de l'Elm"
 
-#: ../mail/importers/elm-importer.c:339 ../mail/importers/pine-importer.c:415
-#: ../modules/mail/e-mail-shell-view.c:1044
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
-#: ../widgets/misc/e-send-options.c:511
+#: ../mail/importers/elm-importer.c:351 ../mail/importers/pine-importer.c:458
+#: ../modules/mail/e-mail-shell-view.c:1051
+#: ../widgets/misc/e-send-options.c:520
 msgid "Mail"
 msgstr "Correu"
 
-#: ../mail/importers/elm-importer.c:380
+#: ../mail/importers/elm-importer.c:396
 msgid "Evolution Elm importer"
 msgstr "Importador Elm de l'Evolution"
 
-#: ../mail/importers/elm-importer.c:381
+#: ../mail/importers/elm-importer.c:397
 msgid "Import mail from Elm."
 msgstr "S'estÃ important correu de l'Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:127
-#: ../plugins/dbx-import/dbx-importer.c:242
+#: ../mail/importers/evolution-mbox-importer.c:138
+#: ../plugins/dbx-import/dbx-importer.c:250
 msgid "_Destination folder:"
 msgstr "Carpeta de _destinaciÃ:"
 
-#: ../mail/importers/evolution-mbox-importer.c:133
-#: ../plugins/dbx-import/dbx-importer.c:252
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../mail/importers/evolution-mbox-importer.c:145
+#: ../plugins/dbx-import/dbx-importer.c:260
+#: ../plugins/pst-import/pst-importer.c:460
 msgid "Select folder"
 msgstr "Seleccioneu una carpeta"
 
-#: ../mail/importers/evolution-mbox-importer.c:134
-#: ../plugins/dbx-import/dbx-importer.c:253
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../mail/importers/evolution-mbox-importer.c:146
+#: ../plugins/dbx-import/dbx-importer.c:261
+#: ../plugins/pst-import/pst-importer.c:461
 msgid "Select folder to import into"
 msgstr "Seleccioneu a quina carpeta s'importarÃ"
 
-#: ../mail/importers/evolution-mbox-importer.c:403
+#: ../mail/importers/evolution-mbox-importer.c:433
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Assumpte"
 
-#: ../mail/importers/evolution-mbox-importer.c:408
+#: ../mail/importers/evolution-mbox-importer.c:438
 msgctxt "mboxImp"
 msgid "From"
 msgstr "De"
 
-#: ../mail/importers/evolution-mbox-importer.c:452
-#: ../shell/e-shell-utils.c:217
+#: ../mail/importers/evolution-mbox-importer.c:482
+#: ../shell/e-shell-utils.c:221
 msgid "Berkeley Mailbox (mbox)"
 msgstr "BÃstia de correu de Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:453
+#: ../mail/importers/evolution-mbox-importer.c:483
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de carpetes de correu de format Berkeley"
 
-#: ../mail/importers/mail-importer.c:65
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "S'estÃ important una bÃstia"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:150
-#: ../plugins/dbx-import/dbx-importer.c:593
-#: ../plugins/pst-import/pst-importer.c:480
-#: ../plugins/pst-import/pst-importer.c:589
+#: ../mail/importers/mail-importer.c:153
+#: ../plugins/dbx-import/dbx-importer.c:610
+#: ../plugins/pst-import/pst-importer.c:648
 #, c-format
 msgid "Importing '%s'"
 msgstr "S'estÃ important Â%sÂ"
 
-#: ../mail/importers/mail-importer.c:308
+#: ../mail/importers/mail-importer.c:316
 #, c-format
 msgid "Scanning %s"
 msgstr "S'estÃ examinant %s"
 
-#: ../mail/importers/pine-importer.c:223
+#: ../mail/importers/pine-importer.c:260
 msgid "Importing Pine data"
 msgstr "S'estan important dades del Pine"
 
-#: ../mail/importers/pine-importer.c:420
-#: ../modules/addressbook/addressbook-config.c:1011
+#: ../mail/importers/pine-importer.c:463
+#: ../modules/addressbook/addressbook-config.c:1081
 msgid "Address Book"
 msgstr "Llibreta d'adreces"
 
-#: ../mail/importers/pine-importer.c:462
+#: ../mail/importers/pine-importer.c:509
 msgid "Evolution Pine importer"
 msgstr "Importador del Pine de l'Evolution"
 
-#: ../mail/importers/pine-importer.c:463
+#: ../mail/importers/pine-importer.c:510
 msgid "Import mail from Pine."
 msgstr "Importa correu del Pine."
 
@@ -11390,22 +11462,22 @@ msgstr "Importa correu del Pine."
 msgid "Mail to %s"
 msgstr "Correu per a %s"
 
-#: ../mail/mail-autofilter.c:238 ../mail/mail-autofilter.c:280
+#: ../mail/mail-autofilter.c:228 ../mail/mail-autofilter.c:271
 #, c-format
 msgid "Mail from %s"
 msgstr "Correu de %s"
 
-#: ../mail/mail-autofilter.c:264
+#: ../mail/mail-autofilter.c:254
 #, c-format
 msgid "Subject is %s"
 msgstr "L'assumpte Ãs %s"
 
-#: ../mail/mail-autofilter.c:303
+#: ../mail/mail-autofilter.c:295
 #, c-format
 msgid "%s mailing list"
 msgstr "Llista de correu %s"
 
-#: ../mail/mail-autofilter.c:394
+#: ../mail/mail-autofilter.c:404
 msgid "Add Filter Rule"
 msgstr "Afegeix una regla de filtre"
 
@@ -11414,7 +11486,7 @@ msgstr "Afegeix una regla de filtre"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:492
+#: ../mail/mail-autofilter.c:507
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -11440,456 +11512,489 @@ msgstr "Afegeix una signatura no_va..."
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Si_gna sempre els missatges de sortida d'aquest compte"
 
+#: ../mail/mail-config.ui.h:4
+msgid ""
+"All new emails with header that matches given content will be automatically "
+"filtered as junk"
+msgstr ""
+"Es filtraran automÃticament com a brossa tots els correus nous que "
+"continguin capÃaleres que coincideixin amb el contingut donat"
+
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr ""
 "Permet que una _llista de correu torni a dirigir la resposta privada a la "
 "llista de correu"
 
 # Âto selfÂ vol dir Âamb la meva clauÂ - dpm
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:7
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Xi_fra tambÃ per a mi quan enviÃ correu xifrat"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Sempre amb cÃpia amb carbÃ (CC) a:"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Sempre amb cÃpia am_b carbÃ oculta (CCO) a:"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Confia sempre en les claus del meu anell de claus en _xifrar"
 
 # Âto myselfÂ vol dir Âamb la meva clauÂ, de manera que el remitent pugui
 # llegir tambÃ els correus xifrats que ell mateix enviÃ - dpm
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Xifra sempre per a _mi quan enviÃ correu xifrat"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "Envia sempre una confirmaciÃ de _lectura"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Apply the same _view settings to all folders"
 msgstr "Aplica els mateixos parÃmetres de _visualitzaciÃ a totes les carpetes"
 
-#: ../mail/mail-config.ui.h:14
-#: ../modules/addressbook/addressbook-config.c:1018
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1088
 msgid "Authentication"
 msgstr "AutenticaciÃ"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "_Insereix emoticones automÃticament"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "_Joc de carÃcters:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "Comprova els tipus _disponibles"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr "Comprova s_i les capÃaleres personalitzades sÃn brossa"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Check for new _messages on start"
 msgstr "Comprova si hi ha correu _nou en iniciar"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Comprova si hi ha correu _nou a tots els comptes actius"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Check incoming _messages for junk"
 msgstr "Comprova s_i el correu d'entrada Ãs brossa"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Check spelling while I _type"
 msgstr "Comprova l'or_tografia mentre escric"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "Netej_a"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Clea_r"
 msgstr "Nete_ja"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Color for _misspelled words:"
 msgstr "Color de les paraules i_ncorrectes:"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:27
 msgid "Composing Messages"
 msgstr "RedacciÃ de missatges"
 
-#: ../mail/mail-config.ui.h:27
-#: ../modules/plugin-manager/evolution-plugin-manager.c:157
+#: ../mail/mail-config.ui.h:28
+#: ../modules/plugin-manager/evolution-plugin-manager.c:161
 msgid "Configuration"
 msgstr "ConfiguraciÃ"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 msgid "Confirm _when expunging a folder"
 msgstr "Demana'm _confirmaciÃ per buidar una carpeta"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 msgid "Confirmations"
 msgstr "Confirmacions"
 
-#: ../mail/mail-config.ui.h:30
-#: ../modules/addressbook/autocompletion-config.c:155
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
+#: ../mail/mail-config.ui.h:31
+#: ../modules/addressbook/autocompletion-config.c:188
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Date/Time Format"
 msgstr "Format de data/hora"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Default Behavior"
-msgstr "Comportament predeterminat"
+msgstr "Comportament per defecte"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Default character e_ncoding:"
 msgstr "Codi_ficaciÃ de carÃcters per defecte:"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid "Delete Mail"
 msgstr "Suprimeix el correu"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid "Delete junk messages on e_xit"
 msgstr "Suprimei_x el correu brossa en sortir"
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:38
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "_Signa digitalment els missatges de sortida (per defecte)"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:39
 msgid "Displayed Message Headers"
 msgstr "CapÃaleres de missatge mostrades"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "No mar_quis els missatges com a brossa si el remitent Ãs a la meva llibreta "
 "d'adreces"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
 msgid "Do not quote"
 msgstr "Sense citacions"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Drafts _Folder:"
 msgstr "Carpeta d'es_borranys:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Email _Address:"
 msgstr "_AdreÃa electrÃnica:"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Empty trash folders on e_xit"
 msgstr "Buida les papereres en sor_tir"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
 msgstr "Certi_ficats de xifratge:"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
 msgstr "Xifra els missat_ges de sortida (per defecte)"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "F_all back to threading messages by subject"
-msgstr "Crea _fils segons l'assumpte dels missatges de manera predeterminada"
+msgstr "Crea _fils segons l'assumpte dels missatges per defecte"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:49
 msgid "Fix_ed Width Font:"
 msgstr "Tipus de lletra d'amplada fi_xa:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Format messages in _HTML"
 msgstr "Missatges en format _HTML"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Full Nam_e:"
 msgstr "Nom compl_et:"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Group Reply goes only to mailing list, if possible"
 msgstr ""
 "La resposta al grup s'enviarÃ nomÃs a la llista de correu, si Ãs possible"
 
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
 msgstr "Missatges HTML"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
 msgstr "Servidor intermediari per a l'H_TTP:"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
+msgid "Header content"
+msgstr "Contingut de la capÃalera"
+
+#: ../mail/mail-config.ui.h:57
+msgid "Header name"
+msgstr "Nom de la capÃalera"
+
+#: ../mail/mail-config.ui.h:58
 msgid "Headers"
 msgstr "CapÃaleres"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:59
 msgid "Highlight _quotations with"
 msgstr "Ressalta el text _citat amb"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:60
 msgid "Ignore Reply-To: for mailing lists"
 msgstr "Ignora ÂReply-To:Â (respon a) a les llistes de correu"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:61
 msgid "Inline"
 msgstr "Inserit"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:62
 msgid "Inline (Outlook style)"
 msgstr "Missatge original inserit (a l'estil de l'Outlook)"
 
-#: ../mail/mail-config.ui.h:61 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etiquetes"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "Taula d'idiomes"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:66
 msgid "Loading Images"
 msgstr "CÃrrega de les imatges"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "Taula de capÃaleres de correu"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "UbicaciÃ de la bÃstia"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:69
 msgid "Message Display"
 msgstr "VisualitzaciÃ dels missatges"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:70
 msgid "Message Receipts"
 msgstr "Confirmacions de lectura"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "No uti_litzis el servidor intermediari per a:"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:72 ../modules/addressbook/ldap-config.ui.h:9
+msgid "No encryption"
+msgstr "Sense xifratge"
+
+#: ../mail/mail-config.ui.h:73
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "S'ignorarÃ aquesta opciÃ si es produeix una concordanÃa amb les capÃaleres "
 "de correu brossa personalitzades."
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:74
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "InformaciÃ opcional"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:76
 msgid "Or_ganization:"
 msgstr "_OrganitzaciÃ:"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:77
 msgid "PGP/GPG _Key ID:"
 msgstr "Id. de _clau PGP/GPG:"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:78
 msgid "Pass_word:"
 msgstr "Contrasen_ya:"
 
-#: ../mail/mail-config.ui.h:76
-#: ../modules/calendar/e-calendar-preferences.ui.h:23
+#: ../mail/mail-config.ui.h:79
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
 msgid "Pick a color"
 msgstr "Seleccioneu un color"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:80
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:81
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Privadesa forÃa bona (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:83
 msgid "Proxy Settings"
 msgstr "ConfiguraciÃ del servidor intermediari"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:84
 msgid "Quoted"
 msgstr "Citat"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:85
 msgid "Re_member password"
 msgstr "_Recorda la contrasenya"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:86
 msgid "Re_ply-To:"
 msgstr "_Respon-A:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:87
 msgid "Remember _password"
 msgstr "Recorda la contrasen_ya"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:88
 msgid "Replies and Forwards"
 msgstr "Respostes i reenviaments"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:89
 msgid "Required Information"
 msgstr "InformaciÃ requerida"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:90
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:91
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:92
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:93
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:94 ../modules/addressbook/ldap-config.ui.h:12
+msgid "SSL encryption"
+msgstr "Xifratge SSL"
+
+#: ../mail/mail-config.ui.h:95
 msgid "SSL is not supported in this build of Evolution"
 msgstr "Aquest muntatge de l'Evolution no funciona amb l'SSL"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:96
 msgid "S_earch for sender photograph only in local address books"
 msgstr ""
 "Ce_rca la fotografia del remitent nomÃs a les llibretes d'adreces locals"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:97
 msgid "S_elect..."
 msgstr "S_elecciona..."
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:98
 msgid "S_end message receipts:"
 msgstr "_Envia confirmacions de lectura:"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:99
 msgid "S_tandard Font:"
 msgstr "_Tipus de lletra estÃndard:"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:100
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME segur (S/MIME)"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
 msgstr "Selecciona el tipus de lletra HTML d'amplada fixa"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML variable width font"
 msgstr "Selecciona el tipus de lletra HTML d'amplada variable"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:104
 msgid "Sender Photograph"
 msgstr "Fotografia del remitent"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:106
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Enviament d'una resposta privada a un missatge de _llista de correu"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:108
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 "Enviament d'un missatge amb _destinataris que no s'han introduÃt com a "
 "adreces de correu"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:110
 msgid "Sending a message with an _empty subject line"
 msgstr "Enviament d'un missatge amb l'assumpte _buit"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:112
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Enviament d'un missatge amb destinataris n_omÃs al camp CCO"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:114
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Enviament d'una resposta a un nombre ele_vat de destinataris"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:115
 msgid "Sent _Messages Folder:"
 msgstr "Carpeta de _missatges enviats:"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:116
 msgid "Ser_ver requires authentication"
 msgstr "El ser_vidor requereix autenticaciÃ"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:117
 msgid "Server Configuration"
 msgstr "ConfiguraciÃ del servidor"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:118
 msgid "Server _Type:"
 msgstr "_Tipus de servidor:"
 
-#: ../mail/mail-config.ui.h:116
+# FIXME: s'ha de mirar si Ãs massa llarg (dpm)
+#: ../mail/mail-config.ui.h:119
+msgid "Set custom junk header"
+msgstr "Estableix una capÃalera de correu brossa personalitzada"
+
+#: ../mail/mail-config.ui.h:120
 msgid "Si_gning algorithm:"
 msgstr "Al_gorisme de signatura:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:121
 msgid "Sig_natures"
 msgstr "Sig_natures"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:122
 msgid "Sig_ning certificate:"
 msgstr "Ce_rtificat de signatura:"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:123
 msgid "Signat_ure:"
 msgstr "Signat_ura:"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:124
 msgid "Signatures"
 msgstr "Signatures"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:125
 msgid "Signing _algorithm:"
 msgstr "Al_gorisme de signatura:"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:126
 msgid "Special Folders"
 msgstr "Carpetes especials"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:127
 msgid "Spell Checking"
 msgstr "VerificaciÃ ortogrÃfica"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:128
 msgid "Start _typing at the bottom on replying"
 msgstr "Inicia la redac_ciÃ al final en respondre"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:129
 msgid "Start up"
 msgstr "Inici"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:130 ../modules/addressbook/ldap-config.ui.h:20
+msgid "TLS encryption"
+msgstr "Xifratge TLS"
+
+#: ../mail/mail-config.ui.h:131
 msgid "T_ype:"
 msgstr "T_ipus:"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:132
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -11897,7 +12002,7 @@ msgstr ""
 "Aquesta llista reflecteix nomÃs els idiomes per als quals teniu instalÂlat "
 "un diccionari."
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:133
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11906,7 +12011,7 @@ msgstr ""
 "La sortida d'aquest script s'utilitzarÃ per a la vostra signatura.\n"
 "El nom que especifiqueu nomÃs s'utilitzarÃ per visualitzar-lo."
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:136
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -11914,7 +12019,7 @@ msgstr ""
 "Per evitar errades en enviar correus i situacions compromeses, demana "
 "confirmaciÃ abans de realitzar les accions marcades a continuaciÃ:"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:137
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -11922,146 +12027,138 @@ msgstr ""
 "Escriviu el nom que vulgueu fer servir per referir-vos a aquest compte.\n"
 "Per exemple: ÂFeinaÂ o ÂPersonalÂ"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:139
 msgid "Us_ername:"
 msgstr "Nom d'_usuari:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:140
 msgid "Use Authe_ntication"
 msgstr "Utilitza au_tenticaciÃ"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:141
 msgid "User _Name:"
 msgstr "Nom d'_usuari:"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:142
 msgid "_Add Signature"
 msgstr "_Afegeix la signatura"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:143
 msgid "_Always load images from the Internet"
 msgstr "C_arrega sempre les imatges d'Internet"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:144
 msgid "_Authentication Type"
 msgstr "Tipus d'_autenticaciÃ"
 
-#: ../mail/mail-config.ui.h:141
-msgid "_Default junk plugin:"
-msgstr "Connector de correu brossa per _defecte:"
-
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:145
 msgid "_Direct connection to the Internet"
 msgstr "ConnexiÃ _directa a Internet"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:146
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "No signis les solÂlicituds _de reuniÃ (compatible amb l'Outlook)"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:147
 msgid "_Forward style:"
 msgstr "Estil de reen_viament:"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:148
 msgid "_Junk Folder:"
 msgstr "Carpeta de correu _brossa:"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:149
 msgid "_Keep signature above the original message on replying"
 msgstr ""
 "MantÃn la _signatura a la part superior del missatge original en respondre"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:150
 msgid "_Languages"
 msgstr "_LlengÃes"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:151
 msgid "_Load images only in messages from contacts"
 msgstr "_Carrega les imatges nomÃs si sÃn en correus dels contactes"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:152
 msgid "_Lookup in local address book only"
 msgstr "_Cerca nomÃs a les llibretes d'adreces locals"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:153
 msgid "_Make this my default account"
 msgstr "Fes-lo el meu compte per _defecte"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:154
 msgid "_Manual proxy configuration:"
 msgstr "ConfiguraciÃ _manual del servidor intermediari:"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:156
 msgid "_Never load images from the Internet"
 msgstr "_No carreguis mai les imatges d'Internet"
 
-#: ../mail/mail-config.ui.h:154
-msgid "_Path:"
-msgstr "_CamÃ:"
-
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:27
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:159
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Pregunta quan s'enviÃn missatges HTML als contactes que no ho vulguin"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:160
 msgid "_Reply style:"
 msgstr "Estil de la _resposta:"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:161
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:162
 msgid "_Secure HTTP Proxy:"
 msgstr "Servidor intermediari per a l'HTTP _segur:"
 
-#: ../mail/mail-config.ui.h:161 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:164 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "_Servidor:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:166
 msgid "_Show animated images"
 msgstr "Mos_tra les imatges animades"
 
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:167
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Mostra la fotografia del remitent en la previsualitzaciÃ del correu"
 
-#: ../mail/mail-config.ui.h:165
+#: ../mail/mail-config.ui.h:168
 msgid "_Trash Folder:"
 msgstr "Carpeta de la _paperera:"
 
-#: ../mail/mail-config.ui.h:166
-msgid "_Use Secure Connection:"
-msgstr "E_mpra una connexiÃ segura:"
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Use secure connection:"
+msgstr "_Utilitza una connexiÃ segura:"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:170
 msgid "_Use system defaults"
 msgstr "Utilitza els parÃmetres p_redeterminats del sistema"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:171
 msgid "_Use the same fonts as other applications"
 msgstr "_Utilitza el mateix tipus de lletra que la resta d'aplicacions"
 
-#: ../mail/mail-config.ui.h:169 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:172 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:170 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:174
 msgid "color"
 msgstr "color"
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:175
 msgid "description"
 msgstr "descripciÃ"
 
@@ -12081,63 +12178,64 @@ msgstr "Totes les carpetes locals"
 msgid "Call"
 msgstr "Crida"
 
-#: ../mail/mail-dialogs.ui.h:5
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "Co_mpletat"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "Signatura digital"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
 msgstr "No ho reenvÃis"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Encryption"
 msgstr "Xifratge"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "Respondre"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "Per a la vostra informaciÃ"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "Reenvia"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "Acord de llicÃncia"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "No Ãs necessÃria cap resposta"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "Respon a tots"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "Ressenya"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Search Folder Sources"
 msgstr "OrÃgens de la carpeta de cerca"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Security Information"
 msgstr "InformaciÃ sobre seguretat"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Specific folders"
 msgstr "Carpetes especÃfiques"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12145,23 +12243,23 @@ msgstr ""
 "Els missatges que heu seleccionat per respondre es llisten a sota.\n"
 "Seleccioneu una acciÃ per respondre-hi al menÃ ÂSenyaladorÂ."
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Accept License"
 msgstr "_Accepteu la llicÃncia"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Due By:"
 msgstr "_Venciment:"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Flag:"
 msgstr "Sen_yalador:"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Tick this to accept the license agreement"
 msgstr "Habili_teu-lo per acceptar l'acord de llicÃncia"
 
-#: ../mail/mail-folder-cache.c:789
+#: ../mail/mail-folder-cache.c:779
 #, c-format
 msgid "Pinging %s"
 msgstr "S'estÃ enviant un ping a %s"
@@ -12170,206 +12268,133 @@ msgstr "S'estÃ enviant un ping a %s"
 msgid "Filtering Selected Messages"
 msgstr "S'estan filtrant els missatges seleccionats"
 
-#: ../mail/mail-ops.c:226
+#: ../mail/mail-ops.c:205
 msgid "Fetching Mail"
 msgstr "S'estÃ recollint el correu electrÃnic"
 
-#: ../mail/mail-ops.c:785
+#: ../mail/mail-ops.c:821
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "S'estÃ enviant el missatge %d de %d"
 
-#: ../mail/mail-ops.c:831
+#: ../mail/mail-ops.c:869
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "No s'han pogut enviar %d de %d missatges"
 
-#: ../mail/mail-ops.c:833 ../mail/mail-send-recv.c:788
+#: ../mail/mail-ops.c:873 ../mail/mail-send-recv.c:837
 msgid "Canceled."
 msgstr "S'ha cancelÂlat."
 
-#: ../mail/mail-ops.c:835 ../mail/mail-send-recv.c:790
+#: ../mail/mail-ops.c:875 ../mail/mail-send-recv.c:839
 msgid "Complete."
 msgstr "Completat."
 
-#: ../mail/mail-ops.c:941
+#: ../mail/mail-ops.c:985
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "S'estan movent els missatges a Â%sÂ"
 
-#: ../mail/mail-ops.c:941
+#: ../mail/mail-ops.c:986
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "S'estan copiant els missatges a Â%sÂ"
 
-#: ../mail/mail-ops.c:1062
-#, c-format
-msgid "Scanning folders in '%s'"
-msgstr "S'estan analitzant les carpetes a Â%sÂ"
-
-#: ../mail/mail-ops.c:1178
-msgid "Forwarded messages"
-msgstr "Missatges reenviats"
-
-# FIXME (dpm)
-#: ../mail/mail-ops.c:1295
-#, c-format
-msgid "Retrieving quota information for folder '%s'"
-msgstr ""
-"S'estÃ recuperant la informaciÃ de la quota d'espai per a la carpeta Â%sÂ"
-
-#: ../mail/mail-ops.c:1370
-#, c-format
-msgid "Opening store '%s'"
-msgstr "S'estÃ obrint el magatzem Â%sÂ"
-
-#: ../mail/mail-ops.c:1446
-#, c-format
-msgid "Removing folder '%s'"
-msgstr "S'estÃ suprimint la carpeta Â%sÂ"
-
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1104
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "S'estÃ emmagatzemant la carpeta Â%sÂ"
 
-#: ../mail/mail-ops.c:1678
+#: ../mail/mail-ops.c:1179
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "S'estÃ buidant i emmagatzemant el compte Â%sÂ"
 
-#: ../mail/mail-ops.c:1679
+#: ../mail/mail-ops.c:1180
 #, c-format
 msgid "Storing account '%s'"
 msgstr "S'estÃ emmagatzemant el compte Â%sÂ"
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1242
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "S'estÃ refrescant la carpeta Â%sÂ"
 
-#: ../mail/mail-ops.c:1901
+#: ../mail/mail-ops.c:1432
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "S'estÃ suprimint la carpeta Â%sÂ"
 
-#: ../mail/mail-ops.c:1973
+#: ../mail/mail-ops.c:1517
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "S'estÃ buidant la paperera a Â%sÂ"
 
-#: ../mail/mail-ops.c:1974
-msgid "Local Folders"
-msgstr "Carpetes locals"
-
-#: ../mail/mail-ops.c:2147
-#, c-format
-msgid "Retrieving %d message"
-msgid_plural "Retrieving %d messages"
-msgstr[0] "S'estÃ recuperant %d missatge"
-msgstr[1] "S'estan recuperant %d missatges"
-
-#: ../mail/mail-ops.c:2240
-#, c-format
-msgid "Saving %d message"
-msgid_plural "Saving %d messages"
-msgstr[0] "S'estÃ desant %d missatge"
-msgstr[1] "S'estan desant %d missatges"
-
-#: ../mail/mail-ops.c:2336
-#, c-format
-msgid "Error saving messages to: %s:\n"
-msgstr "S'ha produÃt un error en desar els missatges a: %s.\n"
-
-#: ../mail/mail-ops.c:2411
-#, c-format
-msgid "Preparing account '%s' for offline"
-msgstr "S'estÃ preparant el compte Â%sÂ per treballar fora de lÃnia"
-
-#: ../mail/mail-ops.c:2502
-msgid "Checking Service"
-msgstr "ComprovaciÃ del servei"
-
-#: ../mail/mail-ops.c:2582
+#: ../mail/mail-ops.c:1619
 #, c-format
 msgid "Disconnecting %s"
 msgstr "S'estÃ desconnectant de %s"
 
-#: ../mail/mail-ops.c:2639
-#, c-format
-msgid "Removing attachments"
-msgstr "S'estan suprimint les adjuncions"
-
-#: ../mail/mail-ops.c:2686
-#, c-format
-msgid "File \"%s\" has been removed."
-msgstr "S'ha suprimit el fitxer Â%sÂ."
-
-#: ../mail/mail-send-recv.c:191
+#: ../mail/mail-send-recv.c:198
 msgid "Canceling..."
 msgstr "S'estÃ cancelÂlant..."
 
-#: ../mail/mail-send-recv.c:436
+#: ../mail/mail-send-recv.c:454
 msgid "Send & Receive Mail"
 msgstr "Envia i rep el correu"
 
-#: ../mail/mail-send-recv.c:452
+#: ../mail/mail-send-recv.c:470
 msgid "Cancel _All"
 msgstr "C_ancelÂla-ho tot"
 
-#: ../mail/mail-send-recv.c:569
+#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:979
 msgid "Updating..."
 msgstr "S'estÃ actualitzant..."
 
-#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:653
+#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:691
 msgid "Waiting..."
 msgstr "S'estÃ esperant..."
 
-#: ../mail/mail-send-recv.c:903
+#: ../mail/mail-send-recv.c:959
 #, c-format
 msgid "Checking for new mail"
 msgstr "ComprovaciÃ de correu nou"
 
-#: ../mail/mail-tools.c:69
+#: ../mail/mail-tools.c:72
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "No s'ha pogut crear el directori de cues Â%sÂ: %s"
 
-#: ../mail/mail-tools.c:102
+#: ../mail/mail-tools.c:106
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "S'estÃ intentant executar el movemail a una font no mbox Â%sÂ"
 
-#: ../mail/mail-tools.c:214
+#: ../mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Missatge reenviat - %s"
 
-#: ../mail/mail-tools.c:216
+#: ../mail/mail-tools.c:217
 msgid "Forwarded message"
 msgstr "Missatge reenviat"
 
-#: ../mail/mail-vfolder.c:86
+#: ../mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "S'estÃ configurant la carpeta de cerca: %s"
 
-#: ../mail/mail-vfolder.c:235
-#, c-format
-msgid "Updating Search Folders for '%s:%s'"
-msgstr "S'estan actualitzant les carpetes de cerca per a Â%s:%sÂ"
-
-#: ../mail/mail-vfolder.c:242
+#: ../mail/mail-vfolder.c:232
 #, c-format
-msgid "Updating Search Folders for '%s'"
-msgstr "S'estan actualitzant les carpetes de cerca per a Â%sÂ"
+msgid "Updating Search Folders for '%s' : %s"
+msgstr "S'estan actualitzant les carpetes de cerca per a Â%sÂ: %s"
 
 #. Translators: The first %s is name of the affected
 #. * search folder(s), the second %s is the URI of the
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:718
+#: ../mail/mail-vfolder.c:678
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -12388,11 +12413,11 @@ msgstr[1] ""
 "Â%sÂ s'han actualitzat, atÃs que l'usuari ha suprimit la carpeta\n"
 "Â%sÂ"
 
-#: ../mail/mail-vfolder.c:1297
+#: ../mail/mail-vfolder.c:1314
 msgid "Edit Search Folder"
 msgstr "Edita les carpetes de cerca"
 
-#: ../mail/mail-vfolder.c:1408
+#: ../mail/mail-vfolder.c:1423
 msgid "New Search Folder"
 msgstr "Carpeta de cerca nova"
 
@@ -12601,24 +12626,20 @@ msgstr "Tanca la finestra de missatges."
 msgid "Could not save signature file."
 msgstr "No s'ha pogut desar el fitxer de signatura."
 
-#: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "Voleu suprimir els missatges de la carpeta de cerca Â{0}Â?"
-
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 msgid "Do _Not Disable"
 msgstr "No ho _inhabilitis"
 
 # Es refereix a enviar un avÃs de cancelÂlaciÃ (dpm)
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:47
 msgid "Do _Not Send"
 msgstr "No l'_enviÃs"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 msgid "Do _Not Synchronize"
 msgstr "N_o sincronitzis"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:49
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -12626,34 +12647,34 @@ msgstr ""
 "Voleu sincronitzar localment les carpetes marcades per treballar fora de "
 "lÃnia?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
 msgstr "Voleu marcar tots els missatges com a llegits?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
 msgstr "Voleu desar els canvis?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "IntroduÃu la contrasenya."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "S'ha produÃt un error en carregar les definicions de filtre."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "S'ha produÃt un error en realitzar l'operaciÃ."
 
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "S'ha produÃt un error en {0}."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:59
 msgid ""
 "Evolution's local mail format has changed from mbox to Maildir. Your local "
 "mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -12672,32 +12693,63 @@ msgstr ""
 "suprimir aquest compte. Assegureu-vos que hi ha prou espai al disc per "
 "realitzar la migraciÃ ara."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:62
 msgid "Evolution's local mail format has changed."
 msgstr "El format del correu local de l'Evolution ha canviat."
 
+#: ../mail/mail.error.xml.h:63
+msgid "Failed to download messages for offline viewing."
+msgstr "No s'han pogut baixar els missatges per poder-los veure fora de lÃnia."
+
 #: ../mail/mail.error.xml.h:64
+msgid "Failed to find duplicate messages."
+msgstr "No s'ha trobat cap missatge duplicat."
+
+#: ../mail/mail.error.xml.h:65
+msgid "Failed to open folder."
+msgstr "No s'ha pogut obrir la carpeta."
+
+#: ../mail/mail.error.xml.h:66
+msgid ""
+"Failed to query server for a list of supported authentication mechanisms."
+msgstr ""
+"No s'ha pogut consultar al servidor els mecanismes d'autenticaciÃ "
+"compatibles."
+
+#: ../mail/mail.error.xml.h:67
+msgid "Failed to remove attachments from messages."
+msgstr "No s'han pogut suprimir les adjuncions dels correus."
+
+#: ../mail/mail.error.xml.h:68
+msgid "Failed to retrieve messages."
+msgstr "No s'han pogut recuperar els missatges."
+
+#: ../mail/mail.error.xml.h:69
+msgid "Failed to save messages to disk."
+msgstr "No s'han pogut desar els missatges al disc."
+
+#: ../mail/mail.error.xml.h:70
 msgid "Failed to unsubscribe from folder."
 msgstr "No s'ha pogut cancelÂlar la subscripciÃ a la carpeta."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:71
 msgid "File exists but cannot overwrite it."
 msgstr "El fitxer existeix perÃ no es pot sobreescriure."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:72
 msgid "File exists but is not a regular file."
 msgstr "El fitxer existeix perÃ no Ãs un fitxer normal."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:74
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "La carpeta Â{0}Â no contÃ cap missatge duplicat."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:75
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Si continueu, no podreu recuperar aquests missatges."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -12705,18 +12757,18 @@ msgstr ""
 "Si suprimiu la carpeta, tots els continguts i els de les seves subcarpetes "
 "se suprimiran permanentment."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr ""
 "Si suprimiu la carpeta, tots els continguts i els de les seves subcarpetes "
 "se suprimiran permanentment."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:78
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Si continueu, els comptes apoderats se suprimiran permanentment."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:79
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -12724,11 +12776,11 @@ msgstr ""
 "Si continueu, la informaciÃ dels comptes i\n"
 "la informaciÃ de l'apoderat se suprimiran permanentment."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:81
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Si continueu, la informaciÃ dels comptes se suprimirÃ permanentment."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -12736,23 +12788,23 @@ msgstr ""
 "Si sortiu, aquests missatges no s'enviaran fins que s'iniciÃ l'Evolution de "
 "nou."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:83
 msgid "Ignore"
 msgstr "Ignora"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:84
 msgid "Invalid authentication"
 msgstr "AutenticaciÃ no vÃlida"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:85
 msgid "Mail Deletion Failed"
 msgstr "Ha fallat la supressiÃ del correu"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:86
 msgid "Mail filters automatically updated."
 msgstr "S'han actualitzat automÃticament els filtres de correu."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:87
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -12765,36 +12817,46 @@ msgstr ""
 "missatges. Per evitar-ho, haurÃeu d'afegir almenys un destinatari ÂPer a:Â o "
 "ÂCC:Â."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:88
+msgid ""
+"Messages shown in Search Folders are not copies. Deleting them from a Search "
+"Folder will delete the actual messages from the folder or folders in which "
+"they physically reside. Do you really want to delete these messages?"
+msgstr ""
+"Els missatges que es mostren a les carpetes de cerca no sÃn cÃpies. Si "
+"suprimiu un missatge d'una carpeta de cerca es suprimirÃ el missatge de la "
+"carpeta o les carpetes en quÃ estÃ fÃsicament. Segur que voleu suprimir-los?"
+
+#: ../mail/mail.error.xml.h:89
 msgid "Missing folder."
 msgstr "Manca la carpeta."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:91
 msgid "N_ever"
 msgstr "Ma_i"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:92
 msgid "No duplicate messages found."
 msgstr "No s'ha trobat cap missatge duplicat."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:93
 msgid "No sources selected."
 msgstr "No s'ha seleccionat cap font."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:94
 msgid "Opening too many messages at once may take a long time."
 msgstr ""
 "Si obriu molts missatges a la vegada pot ser que s'hi trigui molt de temps."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:95
 msgid "Please check your account settings and try again."
 msgstr "Comproveu la configuraciÃ de comptes i torneu-ho a provar."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:96
 msgid "Please enable the account or send using another account."
 msgstr "Habiliteu el compte o bÃ envieu amb un altre compte."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -12803,7 +12865,7 @@ msgstr ""
 "adreces electrÃniques si feu clic en el botÃ Per a: al costat de l'entrada "
 "de text."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -12813,64 +12875,64 @@ msgstr ""
 "format HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:100
 msgid "Please provide an unique name to identify this signature."
 msgstr "IntroduÃu un nom Ãnic per identificar aquesta signatura."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:101
 msgid "Please wait."
 msgstr "Espereu."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:102
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Hi ha hagut un problema en migrar la carpeta de correu antiga Â{0}Â."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:103
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "S'estan consultant els mecanismes d'autenticaciÃ compatibles al servidor."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:104
 msgid "Read receipt requested."
 msgstr "S'ha solÂlicitat una confirmaciÃ de lectura."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:105
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Voleu suprimir la carpeta Â{0}Â i totes les seves subcarpetes?"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:106
 msgid "Really delete folder \"{0}\"?"
 msgstr "Segur que voleu suprimir la carpeta Â{0}Â?"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:107
 msgid "Remove duplicate messages?"
 msgstr "Voleu suprimir els missatges duplicats?"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:108
 msgid "Reply _Privately"
 msgstr "Respon en _privat"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:111
 msgid "Search Folders automatically updated."
 msgstr "S'han actualitzat les carpetes de cerca automÃticament."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:112
 msgid "Send private reply?"
 msgstr "Voleu enviar una resposta en privat?"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:113
 msgid "Send reply to all recipients?"
 msgstr "Voleu enviar una resposta a tots els destinataris?"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:114
 msgid "Signature Already Exists"
 msgstr "La signatura ja existeix"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:115
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Voleu sincronitzar les carpetes localment per treballar fora de lÃnia?"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -12878,7 +12940,7 @@ msgstr ""
 "L'Evolution necessita les carpetes del sistema per funcionar correctament i "
 "no se les pot tornar a anomenar, moure ni suprimir."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -12895,7 +12957,7 @@ msgstr ""
 "tots els missatges. Per evitar-ho, haurÃeu d'afegir almenys un destinatari "
 "ÂPer a:Â o ÂCC:Â."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -12903,7 +12965,7 @@ msgstr ""
 "No s'ha reconegut el destinatari segÃent com a una adreÃa de correu vÃlida:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -12912,11 +12974,15 @@ msgstr ""
 "vÃlides:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:125
 msgid "The script file must exist and be executable."
 msgstr "El fitxer de l'script ha de ser executable."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:126
+msgid "These messages are not copies."
+msgstr "Aquests missatges no sÃn cÃpies."
+
+#: ../mail/mail.error.xml.h:127
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -12925,7 +12991,7 @@ msgstr ""
 "Aneu a l'editor de carpetes de cerca per afegir-la explÃcitament en cas que "
 "sigui necessari."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -12933,13 +12999,13 @@ msgstr ""
 "No es pot enviar el missatge perquÃ el compte que heu triat per enviar no "
 "estÃ habilitat"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:130
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Aquest missatge no es pot enviar perquÃ no se n'ha indicat cap destinatari"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -12947,11 +13013,11 @@ msgstr ""
 "El servidor no funciona amb el tipus d'autenticaciÃ solÂlicitat. Ãs possible "
 "que no permeti cap tipus d'autenticaciÃ."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:132
 msgid "This signature has been changed, but has not been saved."
 msgstr "Aquesta signatura s'ha modificat, perÃ no s'ha desat."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:133
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -12959,16 +13025,16 @@ msgstr ""
 "AixÃ marcarÃ tots els missatges com a llegits en el directori seleccionat i "
 "els seus subdirectoris."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:134
 msgid "This will mark all messages as read in the selected folder."
 msgstr ""
 "AixÃ marcarÃ tots els missatges com a llegits a la carpeta seleccionada."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:135
 msgid "Unable to connect to the GroupWise server."
 msgstr "No es pot connectar al servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:136
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -12976,33 +13042,27 @@ msgstr ""
 "No s'ha pogut obrir la carpeta d'esborranys d'aquest compte. Voleu fer "
 "servir la carpeta d'esborranys del sistema?"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:137
 msgid "Unable to read license file."
 msgstr "No es pot llegir el fitxer de la llicÃncia."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:138
+msgid "Unable to retrieve message."
+msgstr "No s'ha pogut recuperar el missatge."
+
+#: ../mail/mail.error.xml.h:139
 msgid "Use _Default"
 msgstr "Pre_determinat"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:140
 msgid "Use default drafts folder?"
-msgstr "Voleu utilitzar la carpeta d'esborranys predeterminada?"
-
-#: ../mail/mail.error.xml.h:132
-msgid ""
-"Warning: Deleting messages from a Search Folder will delete the actual "
-"message from one of your local or remote folders.\n"
-"Do you really want to do this?"
-msgstr ""
-"AvÃs: en suprimir missatges d'una carpeta de cerca se suprimirÃ tambÃ el "
-"missatge original de la carpeta local o remota.\n"
-"Esteu segur que voleu fer-ho?"
+msgstr "Voleu utilitzar la carpeta d'esborranys per defecte?"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:141
 msgid "Would you like to close the message window?"
 msgstr "Voleu tancar la finestra de missatges?"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:142
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -13012,7 +13072,7 @@ msgstr ""
 "d'una llista de correu, perÃ la llista estÃ intentant tornar a dirigir la "
 "vostra resposta a la llista mateixa. Segur que voleu continuar?"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:143
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -13022,7 +13082,7 @@ msgstr ""
 "correu, perÃ responeu de manera privada al remitent en lloc de fer-ho a la "
 "llista. Segur que voleu continuar?"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:144
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
@@ -13030,31 +13090,31 @@ msgstr ""
 "Esteu responent a un missatge que fou enviat a diversos destinataris. Segur "
 "que voleu respondre'ls a tots?"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:145
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "No teniu els permisos suficients per esborrar aquest correu."
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:146
 msgid "You have not filled in all of the required information."
 msgstr "No heu introduÃt tota la informaciÃ necessÃria."
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:147
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Teniu missatges sense enviar. Voleu sortir de totes maneres?"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:148
 msgid "You may not create two accounts with the same name."
 msgstr "No Ãs possible crear dos comptes amb el mateix nom."
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:149
 msgid "You must name this Search Folder."
 msgstr "Heu d'assignar un nom a aquesta carpeta de cerca."
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:150
 msgid "You must specify a folder."
 msgstr "Heu d'especificar una carpeta."
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:151
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13064,145 +13124,153 @@ msgstr ""
 "Podeu fer-ho seleccionant les carpetes individualment, i/o seleccionant "
 "totes les carpetes locals, totes les remotes, o ambdues."
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:153
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Ha fallat l'entrada al servidor Â{0}Â com a Â{0}Â."
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:154
 msgid "_Always"
 msgstr "Se_mpre"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:155
 msgid "_Append"
 msgstr "_Afegeix"
 
-#: ../mail/mail.error.xml.h:149
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:600
+#: ../mail/mail.error.xml.h:156
+#: ../plugins/publish-calendar/publish-calendar.c:619
 msgid "_Disable"
 msgstr "_Inhabilita"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:157
 msgid "_Discard changes"
 msgstr "_Descarta els canvis"
 
-#: ../mail/mail.error.xml.h:151
-#: ../modules/mail/e-mail-shell-view-actions.c:1071
+#: ../mail/mail.error.xml.h:158
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "_Empty Trash"
 msgstr "Buida la _paperera"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:159
 msgid "_Exit Evolution"
 msgstr "_Surt de l'Evolution"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:160
 msgid "_Expunge"
 msgstr "Bui_da"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:161
 msgid "_Migrate Now"
 msgstr "Inicia la _migraciÃ"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:162
 msgid "_No"
 msgstr "_No"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:163
 msgid "_Open Messages"
 msgstr "_Obre els missatges"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:166
 msgid "_Send Receipt"
 msgstr "Envia la _confirmaciÃ"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:167
 msgid "_Synchronize"
 msgstr "Sincronit_za"
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:168
 msgid "_Yes"
 msgstr "_SÃ"
 
-#: ../mail/message-list.c:1214
+#: ../mail/mail.error.xml.h:169
+msgid "{0}"
+msgstr "{0}"
+
+#: ../mail/message-list.c:1261
 msgid "Unseen"
 msgstr "No vist"
 
-#: ../mail/message-list.c:1215
+#: ../mail/message-list.c:1262
 msgid "Seen"
 msgstr "Vist"
 
-#: ../mail/message-list.c:1216
+#: ../mail/message-list.c:1263
 msgid "Answered"
 msgstr "Respost"
 
-#: ../mail/message-list.c:1217
+#: ../mail/message-list.c:1264
 msgid "Forwarded"
 msgstr "Reenviat"
 
-#: ../mail/message-list.c:1218
+#: ../mail/message-list.c:1265
 msgid "Multiple Unseen Messages"
 msgstr "MÃltiples missatges sense veure"
 
-#: ../mail/message-list.c:1219
+#: ../mail/message-list.c:1266
 msgid "Multiple Messages"
 msgstr "Missatges mÃltiples"
 
-#: ../mail/message-list.c:1223
+#: ../mail/message-list.c:1270
 msgid "Lowest"
 msgstr "La mÃs baixa"
 
-#: ../mail/message-list.c:1224
+#: ../mail/message-list.c:1271
 msgid "Lower"
 msgstr "MÃs baixa"
 
-#: ../mail/message-list.c:1228
+#: ../mail/message-list.c:1275
 msgid "Higher"
 msgstr "MÃs alta"
 
-#: ../mail/message-list.c:1229
+#: ../mail/message-list.c:1276
 msgid "Highest"
 msgstr "La mÃs alta"
 
-#: ../mail/message-list.c:1848 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1909 ../widgets/table/e-cell-date.c:51
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
-#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1855 ../plugins/itip-formatter/itip-view.c:205
+#. * in 12-hour format, without seconds.
+#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Avui a les %k:%M"
 
-#: ../mail/message-list.c:1864
+#: ../mail/message-list.c:1925
 msgid "Yesterday %l:%M %p"
 msgstr "Ahir a les %k:%M"
 
-#: ../mail/message-list.c:1876
+#: ../mail/message-list.c:1937
 msgid "%a %l:%M %p"
 msgstr "%a a les %k:%M"
 
-#: ../mail/message-list.c:1884
+#: ../mail/message-list.c:1945
 msgid "%b %d %l:%M %p"
 msgstr "el %d de %b a les %k:%M"
 
-#: ../mail/message-list.c:1886
+#: ../mail/message-list.c:1947
 msgid "%b %d %Y"
 msgstr "%d de %b del %Y"
 
-#: ../mail/message-list.c:2671
+#: ../mail/message-list.c:2752
 msgid "Select all visible messages"
 msgstr "Selecciona tots els missatges visibles"
 
-#: ../mail/message-list.c:2829 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2912 ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Missatges"
 
+#. default follow-up flag name to use when clicked in the message list column
+#: ../mail/message-list.c:4160
+msgid "Follow-up"
+msgstr "Seguiment"
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4505 ../mail/message-list.c:4919
+#: ../mail/message-list.c:4675 ../mail/message-list.c:5098
 msgid "Generating message list"
 msgstr "S'estÃ generant la llista de missatges"
 
-#: ../mail/message-list.c:4738
+#: ../mail/message-list.c:4912
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -13210,7 +13278,7 @@ msgstr ""
 "No hi ha cap missatge que satisfaci els vostres criteris de cerca. Netegeu "
 "la cerca a travÃs de l'element de menÃ Cerca -> Neteja, o bÃ canvieu-la."
 
-#: ../mail/message-list.c:4740
+#: ../mail/message-list.c:4914
 msgid "There are no messages in this folder."
 msgstr "No hi ha cap missatge en aquesta carpeta."
 
@@ -13239,7 +13307,7 @@ msgid "Sent Messages"
 msgstr "Missatges enviats"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:568
+#: ../widgets/misc/e-attachment-tree-view.c:572
 msgid "Size"
 msgstr "Mida"
 
@@ -13248,27 +13316,27 @@ msgid "Subject - Trimmed"
 msgstr "Assumpte - retallat"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1508
+#: ../modules/mail/e-mail-shell-view-actions.c:1562
 msgid "Body contains"
 msgstr "El cos contÃ"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1515
+#: ../modules/mail/e-mail-shell-view-actions.c:1569
 msgid "Message contains"
 msgstr "El missatge contÃ"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1522
+#: ../modules/mail/e-mail-shell-view-actions.c:1576
 msgid "Recipients contain"
 msgstr "Els destinataris contenen"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1529
+#: ../modules/mail/e-mail-shell-view-actions.c:1583
 msgid "Sender contains"
 msgstr "El remitent contÃ"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1536
+#: ../modules/mail/e-mail-shell-view-actions.c:1590
 msgid "Subject contains"
 msgstr "L'assumpte contÃ"
 
@@ -13276,7 +13344,7 @@ msgstr "L'assumpte contÃ"
 msgid "Subject or Addresses contains"
 msgstr "L'assumpte o les adreces contenen"
 
-#: ../modules/addressbook/addressbook-config.c:205
+#: ../modules/addressbook/addressbook-config.c:207
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -13284,7 +13352,7 @@ msgstr ""
 "Si seleccioneu aquesta opciÃ l'Evolution nomÃs es connectarÃ al servidor "
 "d'LDAP si aquest funciona amb l'SSL."
 
-#: ../modules/addressbook/addressbook-config.c:207
+#: ../modules/addressbook/addressbook-config.c:209
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -13292,7 +13360,7 @@ msgstr ""
 "Si seleccioneu aquesta opciÃ l'Evolution nomÃs es connectarÃ al servidor "
 "d'LDAP si aquest funciona amb el TLS."
 
-#: ../modules/addressbook/addressbook-config.c:209
+#: ../modules/addressbook/addressbook-config.c:211
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -13302,16 +13370,16 @@ msgstr ""
 "l'SSL ni amb el TLS. AixÃ implica que la connexiÃ serÃ insegura i que sereu "
 "vulnerables als atacs de seguretat."
 
-#: ../modules/addressbook/addressbook-config.c:608
+#: ../modules/addressbook/addressbook-config.c:641
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "Utilitza al calendari d'_aniversaris i commemoracions"
 
-#: ../modules/addressbook/addressbook-config.c:644
+#: ../modules/addressbook/addressbook-config.c:683
 msgid "Copy _book content locally for offline operation"
 msgstr ""
 "Copia el contingut de la _llibreta localment per treballar fora de lÃnia"
 
-#: ../modules/addressbook/addressbook-config.c:751
+#: ../modules/addressbook/addressbook-config.c:798
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -13321,7 +13389,7 @@ msgstr ""
 "una llista de ports estÃndard. Pregunteu a l'administrador del sistema quin "
 "port heu d'especificar."
 
-#: ../modules/addressbook/addressbook-config.c:825
+#: ../modules/addressbook/addressbook-config.c:879
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -13330,7 +13398,7 @@ msgstr ""
 "El mÃtode que utilitzarÃ l'Evolution per autenticar-vos. Recordeu que "
 "l'opciÃ ÂAdreÃa electrÃnicaÂ necessita accÃs anÃnim al servidor d'LDAP."
 
-#: ../modules/addressbook/addressbook-config.c:900
+#: ../modules/addressbook/addressbook-config.c:962
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -13342,29 +13410,29 @@ msgstr ""
 "les entrades per sota de la base de la cerca. L'Ãmbit de cerca ÂoneÂ nomÃs "
 "inclourÃÂles entrades un nivell per sota de la vostra base."
 
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../modules/addressbook/addressbook-config.c:1086
 msgid "Server Information"
 msgstr "InformaciÃ del servidor"
 
-#: ../modules/addressbook/addressbook-config.c:1021
+#: ../modules/addressbook/addressbook-config.c:1091
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Detalls"
 
-#: ../modules/addressbook/addressbook-config.c:1022
-#: ../modules/mail/e-mail-shell-view.c:54
+#: ../modules/addressbook/addressbook-config.c:1092
+#: ../modules/mail/e-mail-shell-view.c:58
 msgid "Searching"
 msgstr "Cerca"
 
-#: ../modules/addressbook/addressbook-config.c:1024
+#: ../modules/addressbook/addressbook-config.c:1094
 msgid "Downloading"
 msgstr "Baixada"
 
-#: ../modules/addressbook/addressbook-config.c:1230
+#: ../modules/addressbook/addressbook-config.c:1309
 msgid "Address Book Properties"
 msgstr "Propietats de la llibreta d'adreces"
 
-#: ../modules/addressbook/addressbook-config.c:1232
+#: ../modules/addressbook/addressbook-config.c:1311
 msgid "New Address Book"
 msgstr "Llibreta d'adreces nova"
 
@@ -13415,10 +13483,14 @@ msgid "Show autocompleted name with an address"
 msgstr "Mostra el nom autocompletat amb una adreÃa"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+msgid "Show maps"
+msgstr "Mostra els mapes"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
 msgid "Show preview pane"
 msgstr "Mostra la subfinestra de previsualitzaciÃ"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid ""
 "The UID of the selected (or \"primary\") address book in the sidebar of the "
 "\"Contacts\" view."
@@ -13426,7 +13498,7 @@ msgstr ""
 "L'UID de la llibreta d'adreces seleccionada (o ÂprimaryÂ -primÃria-) a la "
 "barra lateral de la visualitzaciÃ de ÂContactesÂ."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. \"0\" (Classic View) places the preview pane below the "
@@ -13439,7 +13511,7 @@ msgstr ""
 "Â1Â (visualitzaciÃ vertical) ubica la subfinestra de previsualitzaciÃ al "
 "costat de la llista de contactes."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -13447,15 +13519,15 @@ msgstr ""
 "El nombre de carÃcters que s'han d'haver escrit abans que l'Evolution iniciÃ "
 "la compleciÃ automÃtica."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "URI for the folder last used in the select names dialog"
 msgstr "L'URI de l'Ãltima carpeta utilitzada en el diÃleg de selecciÃ de noms"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid "URI for the folder last used in the select names dialog."
 msgstr "L'URI de l'Ãltima carpeta utilitzada en el diÃleg de selecciÃ de noms."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
@@ -13463,334 +13535,360 @@ msgstr ""
 "Si s'ha de forÃar la visualitzaciÃ de l'adreÃa electrÃnica amb el nom del "
 "contacte autocompletat a l'entrada."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+msgid "Whether to show maps in preview pane."
+msgstr "Si s'han de mostrar els mapes en la subfinestra de previsualitzaciÃ."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
 msgid "Whether to show the preview pane."
 msgstr "Si s'ha de mostrar la subfinestra de previsualitzaciÃ."
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:161
-#: ../modules/mail/em-mailer-prefs.c:1140
+#: ../modules/addressbook/autocompletion-config.c:194
+#: ../modules/mail/em-mailer-prefs.c:1049
 msgid "_Table column:"
 msgstr "Columna de la _taula:"
 
-#: ../modules/addressbook/autocompletion-config.c:164
+#: ../modules/addressbook/autocompletion-config.c:197
 msgid "Autocompletion"
 msgstr "CompleciÃ automÃtica"
 
-#: ../modules/addressbook/autocompletion-config.c:167
+#: ../modules/addressbook/autocompletion-config.c:200
 msgid "Always _show address of the autocompleted contact"
 msgstr "M_ostra sempre l'adreÃa del contacte autocompletat"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:94
-#: ../modules/addressbook/e-book-shell-migrate.c:153
+#: ../modules/addressbook/e-book-shell-backend.c:102
+#: ../modules/addressbook/e-book-shell-migrate.c:154
 msgid "On LDAP Servers"
 msgstr "Als servidors d'LDAP"
 
-#: ../modules/addressbook/e-book-shell-backend.c:276
+#: ../modules/addressbook/e-book-shell-backend.c:302
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Contacte"
 
-#: ../modules/addressbook/e-book-shell-backend.c:278
-#: ../modules/addressbook/e-book-shell-view-actions.c:766
+#: ../modules/addressbook/e-book-shell-backend.c:304
+#: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Create a new contact"
 msgstr "Crea un contacte nou"
 
-#: ../modules/addressbook/e-book-shell-backend.c:283
+#: ../modules/addressbook/e-book-shell-backend.c:309
 msgctxt "New"
 msgid "Contact _List"
 msgstr "_Llista de contactes"
 
-#: ../modules/addressbook/e-book-shell-backend.c:285
-#: ../modules/addressbook/e-book-shell-view-actions.c:773
+#: ../modules/addressbook/e-book-shell-backend.c:311
+#: ../modules/addressbook/e-book-shell-view-actions.c:912
 msgid "Create a new contact list"
 msgstr "Crea una llista de contactes nova"
 
-#: ../modules/addressbook/e-book-shell-backend.c:293
+#: ../modules/addressbook/e-book-shell-backend.c:319
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Lli_breta d'adreces"
 
-#: ../modules/addressbook/e-book-shell-backend.c:295
-#: ../modules/addressbook/e-book-shell-view-actions.c:703
+#: ../modules/addressbook/e-book-shell-backend.c:321
+#: ../modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Create a new address book"
 msgstr "Crea una llibreta d'adreces nova"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:312
-#: ../modules/addressbook/e-book-shell-view.c:401
-#: ../modules/calendar/e-cal-shell-backend.c:105
-#: ../modules/calendar/e-cal-shell-migrate.c:59
+#: ../modules/addressbook/e-book-shell-backend.c:338
+#: ../modules/addressbook/e-book-shell-view.c:405
+#: ../modules/calendar/e-cal-shell-backend.c:115
+#: ../modules/calendar/e-cal-shell-migrate.c:63
+#: ../modules/online-accounts/e-online-accounts-google.c:366
 msgid "Contacts"
 msgstr "Contactes"
 
-#: ../modules/addressbook/e-book-shell-backend.c:322
+#: ../modules/addressbook/e-book-shell-backend.c:348
 msgid "Certificates"
 msgstr "Certificats"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:263
-#: ../modules/addressbook/e-book-shell-view-actions.c:549
+#: ../modules/addressbook/e-book-shell-view-actions.c:387
+#: ../modules/addressbook/e-book-shell-view-actions.c:683
 msgid "Save as vCard"
 msgstr "Desa com a vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:680
+#: ../modules/addressbook/e-book-shell-view-actions.c:812
 msgid "Co_py All Contacts To..."
 msgstr "C_opia tots els contactes a..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:682
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Copia els contactes de la llibreta d'adreces seleccionada a una altra"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
 msgid "D_elete Address Book"
 msgstr "Suprim_eix la llibreta d'adreces"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:689
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
 msgid "Delete the selected address book"
 msgstr "Suprimeix la llibreta d'adreces seleccionada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:694
+#: ../modules/addressbook/e-book-shell-view-actions.c:826
 msgid "Mo_ve All Contacts To..."
 msgstr "Mo_u tots els contactes a..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:696
+#: ../modules/addressbook/e-book-shell-view-actions.c:828
 msgid "Move the contacts of the selected address book to another"
 msgstr "Mou els contactes de la llibreta d'adreces seleccionada a una altra"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:701
+#: ../modules/addressbook/e-book-shell-view-actions.c:833
 msgid "_New Address Book"
 msgstr "Llibreta d'adreces _nova"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:708
+#: ../modules/addressbook/e-book-shell-view-actions.c:840
 msgid "Address _Book Properties"
 msgstr "Propieta_ts de la llibreta d'adreces"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:710
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Show properties of the selected address book"
 msgstr "Canvia les propietats de la llibreta d'adreces seleccionada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:715
-#: ../modules/calendar/e-cal-shell-view-actions.c:1360
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
-#: ../modules/calendar/e-task-shell-view-actions.c:750
-#: ../modules/mail/e-mail-shell-view-actions.c:1155
+#: ../modules/addressbook/e-book-shell-view-actions.c:847
+msgid "Address Book _Map"
+msgstr "_Mapa de la llibreta d'adreces"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+msgid "Show map with all contacts from selected address book"
+msgstr ""
+"Mostra un mapa de tots els contactes de la llibreta d'adreces seleccionada"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:854
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-memo-shell-view-actions.c:640
+#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/mail/e-mail-shell-view-actions.c:1199
 msgid "_Rename..."
 msgstr "Can_via el nom..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:717
+#: ../modules/addressbook/e-book-shell-view-actions.c:856
 msgid "Rename the selected address book"
 msgstr "Canvia el nom de la llibreta d'adreces"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:724
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
 msgid "Stop loading"
 msgstr "Atura la cÃrrega"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:729
+#: ../modules/addressbook/e-book-shell-view-actions.c:868
 msgid "_Copy Contact To..."
 msgstr "C_opia el contacte a..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:731
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
 msgid "Copy selected contacts to another address book"
 msgstr "Copia els contactes seleccionats a una altra llibreta d'adreces"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:875
 msgid "_Delete Contact"
 msgstr "_Suprimeix el contacte"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:743
+#: ../modules/addressbook/e-book-shell-view-actions.c:882
 msgid "_Find in Contact..."
 msgstr "_Cerca en un contacte..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:745
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
 msgid "Search for text in the displayed contact"
 msgstr "Cerca un text en el cos del contacte que es mostra"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:750
+#: ../modules/addressbook/e-book-shell-view-actions.c:889
 msgid "_Forward Contact..."
 msgstr "Reen_via un contacte..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:752
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
 msgid "Send selected contacts to another person"
 msgstr "Envia els contactes seleccionats a una altra persona"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:757
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
 msgid "_Move Contact To..."
 msgstr "_Mou el contacte a..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:759
+#: ../modules/addressbook/e-book-shell-view-actions.c:898
 msgid "Move selected contacts to another address book"
 msgstr "Mou els contactes a una altra llibreta d'adreces"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:764
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
 msgid "_New Contact..."
 msgstr "Contacte _nou..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:910
 msgid "New Contact _List..."
 msgstr "_Llista de contactes nova..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:778
+#: ../modules/addressbook/e-book-shell-view-actions.c:917
 msgid "_Open Contact"
 msgstr "Obre el _contacte"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:780
+#: ../modules/addressbook/e-book-shell-view-actions.c:919
 msgid "View the current contact"
 msgstr "Visualitza el contacte actual"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/addressbook/e-book-shell-view-actions.c:924
 msgid "_Send Message to Contact..."
 msgstr "Envia un _missatge al contacte..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:787
+#: ../modules/addressbook/e-book-shell-view-actions.c:926
 msgid "Send a message to the selected contacts"
 msgstr "Envia un missatge als contactes seleccionats"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:794
-#: ../modules/calendar/e-cal-shell-view-actions.c:1495
-#: ../modules/calendar/e-task-shell-view-actions.c:808
+#: ../modules/addressbook/e-book-shell-view-actions.c:933
+#: ../modules/calendar/e-cal-shell-view-actions.c:1540
+#: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Actions"
 msgstr "_Accions"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:801
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
-#: ../modules/calendar/e-task-shell-view-actions.c:815
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
+#: ../modules/calendar/e-memo-shell-view-actions.c:677
+#: ../modules/calendar/e-task-shell-view-actions.c:829
+#: ../modules/mail/e-mail-shell-view-actions.c:1357
 msgid "_Preview"
 msgstr "_PrevisualitzaciÃ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:810
-#: ../modules/calendar/e-cal-shell-view-actions.c:1512
-#: ../modules/calendar/e-memo-shell-view-actions.c:676
-#: ../modules/calendar/e-task-shell-view-actions.c:828
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-memo-shell-view-actions.c:690
+#: ../modules/calendar/e-task-shell-view-actions.c:842
 msgid "_Delete"
 msgstr "_Suprimeix"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "_Properties"
 msgstr "_Propietats"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:846
+#: ../modules/addressbook/e-book-shell-view-actions.c:957
+msgid "Address Book Map"
+msgstr "Mapa de la llibreta d'adreces"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
 msgid "Contact _Preview"
 msgstr "_PrevisualitzaciÃ de contactes"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:848
+#: ../modules/addressbook/e-book-shell-view-actions.c:991
 msgid "Show contact preview window"
 msgstr "Mostra la finestra de previsualitzaciÃ de contactes"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
-#: ../modules/calendar/e-memo-shell-view-actions.c:733
-#: ../modules/calendar/e-task-shell-view-actions.c:897
-#: ../modules/mail/e-mail-shell-view-actions.c:1418
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
+msgid "Show _Maps"
+msgstr "Mostra els _mapes"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:999
+msgid "Show maps in contact preview window"
+msgstr "Mostra els mapes en la finestra de previsualitzaciÃ de contactes"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1018
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:1472
 msgid "_Classic View"
 msgstr "VisualitzaciÃ _clÃssica"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:1020
 msgid "Show contact preview below the contact list"
 msgstr "Mostra la previsualitzaciÃ del contacte sota la llista de contactes"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:874
-#: ../modules/calendar/e-memo-shell-view-actions.c:740
-#: ../modules/calendar/e-task-shell-view-actions.c:904
-#: ../modules/mail/e-mail-shell-view-actions.c:1425
+#: ../modules/addressbook/e-book-shell-view-actions.c:1025
+#: ../modules/calendar/e-memo-shell-view-actions.c:754
+#: ../modules/calendar/e-task-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:1479
 msgid "_Vertical View"
 msgstr "_VisualitzaciÃ vertical"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:876
+#: ../modules/addressbook/e-book-shell-view-actions.c:1027
 msgid "Show contact preview alongside the contact list"
 msgstr ""
 "Mostra la previsualitzaciÃ de contacte al costat de la llista de contactes"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1651
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
-#: ../modules/calendar/e-task-shell-view-actions.c:921
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../modules/calendar/e-cal-shell-view-actions.c:1696
+#: ../modules/calendar/e-memo-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:935
 msgid "Any Category"
 msgstr "Qualsevol categoria"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:891
-#: ../modules/calendar/e-cal-shell-view-actions.c:1665
-#: ../modules/calendar/e-memo-shell-view-actions.c:757
-#: ../modules/calendar/e-task-shell-view-actions.c:956
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:970
 msgid "Unmatched"
 msgstr "Sense coincidÃncia"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1675
-#: ../modules/calendar/e-memo-shell-view-actions.c:767
-#: ../modules/calendar/e-task-shell-view-actions.c:966
-#: ../modules/mail/e-mail-shell-view-actions.c:1501
-#: ../shell/e-shell-content.c:634
+#: ../modules/addressbook/e-book-shell-view-actions.c:1052
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../modules/calendar/e-memo-shell-view-actions.c:781
+#: ../modules/calendar/e-task-shell-view-actions.c:980
+#: ../modules/mail/e-mail-shell-view-actions.c:1555
+#: ../shell/e-shell-content.c:666
 msgid "Advanced Search"
 msgstr "Cerca avanÃada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:1085
 msgid "Print all shown contacts"
 msgstr "Imprimeix tots els contactes que es mostren"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:1092
 msgid "Preview the contacts to be printed"
 msgstr "Previsualitza els contactes que s'han d'imprimir"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:948
+#: ../modules/addressbook/e-book-shell-view-actions.c:1099
 msgid "Print selected contacts"
 msgstr "Imprimeix els contactes seleccionats"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:963
+#: ../modules/addressbook/e-book-shell-view-actions.c:1114
 msgid "S_ave Address Book as vCard"
 msgstr "Des_a la llibreta d'adreces com a vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:965
+#: ../modules/addressbook/e-book-shell-view-actions.c:1116
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Desa els contactes de la llibreta d'adreces seleccionada com a vCard"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:971
-#: ../modules/addressbook/e-book-shell-view-actions.c:981
+#: ../modules/addressbook/e-book-shell-view-actions.c:1122
+#: ../modules/addressbook/e-book-shell-view-actions.c:1132
 msgid "_Save as vCard..."
 msgstr "De_sa com a vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:973
+#: ../modules/addressbook/e-book-shell-view-actions.c:1124
 msgid "Save selected contacts as a vCard"
 msgstr "Desa els contactes seleccionats com a vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:345
+#: ../modules/addressbook/e-book-shell-view.c:349
 msgid "_Forward Contacts"
 msgstr "R_eenvia contactes"
 
-#: ../modules/addressbook/e-book-shell-view.c:347
+#: ../modules/addressbook/e-book-shell-view.c:351
 msgid "_Forward Contact"
 msgstr "_Reenvia el contacte"
 
-#: ../modules/addressbook/e-book-shell-view.c:378
+#: ../modules/addressbook/e-book-shell-view.c:382
 msgid "_Send Message to Contacts"
 msgstr "Envia un _missatge als contactes"
 
-#: ../modules/addressbook/e-book-shell-view.c:380
+#: ../modules/addressbook/e-book-shell-view.c:384
 msgid "_Send Message to List"
 msgstr "En_via un missatge a la llista"
 
-#: ../modules/addressbook/e-book-shell-view.c:382
+#: ../modules/addressbook/e-book-shell-view.c:386
 msgid "_Send Message to Contact"
 msgstr "Envia _un missatge al contacte"
 
-#: ../modules/addressbook/eab-composer-util.c:143
+#: ../modules/addressbook/eab-composer-util.c:149
 msgid "Multiple vCards"
 msgstr "vCard mÃltiples"
 
-#: ../modules/addressbook/eab-composer-util.c:151
+#: ../modules/addressbook/eab-composer-util.c:157
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard per a %s"
 
-#: ../modules/addressbook/eab-composer-util.c:163
-#: ../modules/addressbook/eab-composer-util.c:190
+#: ../modules/addressbook/eab-composer-util.c:169
+#: ../modules/addressbook/eab-composer-util.c:196
 #, c-format
 msgid "Contact information"
 msgstr "InformaciÃ del contacte"
 
-#: ../modules/addressbook/eab-composer-util.c:192
+#: ../modules/addressbook/eab-composer-util.c:198
 #, c-format
 msgid "Contact information for %s"
 msgstr "InformaciÃ de contacte per a %s"
@@ -13881,14 +13979,49 @@ msgstr "Ãmbit de la c_erca:"
 msgid "_Timeout:"
 msgstr "_Temps d'espera:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Use secure connection:"
-msgstr "_Utilitza una connexiÃ segura:"
-
 #: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "targetes"
 
+#: ../modules/bogofilter/evolution-bogofilter.c:146
+#, c-format
+msgid "Failed to spawn Bogofilter (%s): "
+msgstr "No s'ha pogut engendrar el Bogofilter (%s): "
+
+#: ../modules/bogofilter/evolution-bogofilter.c:164
+msgid "Failed to stream mail message content to Bogofilter: "
+msgstr ""
+"No s'ha pogut transmetre el contingut del correu electrÃnic al Bogofilter:"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:213
+msgid "Bogofilter either crashed or failed to process a mail message"
+msgstr ""
+"El Bogofilter o ha fallat, o bÃ, no ha pogut processar el correu electrÃnic"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:312
+msgid "Bogofilter Options"
+msgstr "Opcions del Bogofilter"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:321
+msgid "Convert message text to _Unicode"
+msgstr "Converteix el text del missatge a _Unicode"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:477
+msgid "Bogofilter"
+msgstr "Bogofilter"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "Converteix el text dels correus a Unicode"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+"Converteix el text dels missatges a Unicode (codificaciÃ UTF-8) per unificar "
+"els elements de spam/ham provinents de jocs de carÃcters diferents."
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
@@ -13919,39 +14052,43 @@ msgstr "30 minuts"
 msgid "60 minutes"
 msgstr "60 minuts"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Alerts"
 msgstr "Avisos"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgid "Day _ends:"
 msgstr "_El dia s'acaba a les:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
 msgid "Days"
 msgstr "Dies"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
 msgid "Default Free/Busy Server"
-msgstr "Servidor lliure/ocupat predeterminat"
+msgstr "Servidor lliure/ocupat per defecte"
 
 # Ãs un nom de pestanya, i per tant ha de ser un substantiu (dpm)
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Display"
 msgstr "VisualitzaciÃ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
-msgid "Display alarms in _notification area only"
-msgstr "Mostra les alarmes nomÃs a l'Ãrea de _notificaciÃ"
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
+msgid "Display reminders in _notification area only"
+msgstr "Mostra els recordatoris nomÃs a l'Ãrea de _notificaciÃ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgid "Hours"
 msgstr "Hores"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:21
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
 msgid "Minutes"
 msgstr "Minuts"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+msgid "Publishing Information"
+msgstr "InformaciÃ de publicaciÃ"
+
 #. Sunday
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "S_un"
@@ -13966,8 +14103,8 @@ msgid "Se_cond zone:"
 msgstr "Se_gon fus:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:29
-msgid "Select the calendars for alarm notification"
-msgstr "Seleccioneu els calendaris per a les notificacions d'alarma"
+msgid "Select the calendars for reminder notification"
+msgstr "Seleccioneu els calendaris per a les notificacions de recordatori"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
 #: ../modules/calendar/e-calendar-preferences.ui.h:31
@@ -13998,262 +14135,258 @@ msgstr "T_asques que vencen avui:"
 msgid "T_hu"
 msgstr "d_j"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "Template:"
 msgstr "Plantilla:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
 #: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Hora"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Time format:"
 msgstr "Format de l'hora:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "Utilitza el _fus horari del sistema"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "La s_etmana comenÃa el:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
-#: ../modules/calendar/e-cal-shell-view-actions.c:1634
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
 msgid "Work Week"
 msgstr "Setmana laborable"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "Work days:"
 msgstr "Dies laborables:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 hores (am/pm)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
 msgid "_24 hour"
 msgstr "_24 hores"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "SolÂlicit_a la confirmaciÃ en suprimir elements"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "_Comprimeix els caps de setmana en la visualitzaciÃ mensual"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "_Day begins:"
 msgstr "El _dia comenÃa a les:"
 
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "_Fri"
 msgstr "d_v"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "Amaga les tasqu_es completades desprÃs de"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "_Mon"
 msgstr "d_l"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "Tasq_ues endarrerides:"
 
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "_Sat"
 msgstr "d_s"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr ""
 "Mo_stra les hores de finalitzaciÃ de les cites en visualitzacions setmanals "
 "i mensuals"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "_Time divisions:"
 msgstr "Divisions de _temps:"
 
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "_Tue"
 msgstr "d_m"
 
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "_Wed"
 msgstr "d_c"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "abans de cada commemoraciÃ/aniversari"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "before every appointment"
 msgstr "abans de cada cita"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
-msgid "Alarm programs"
-msgstr "Programes d'alarma"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "SolÂlicita confirmaciÃ en suprimir elements"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "Color de fons de les tasques que vencen avui, en format Â#rrggbbÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Color de fons de les tasques que han venÃut, en format Â#rrggbbÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
 msgid "Birthday and anniversary reminder"
 msgstr "Recordatori d'aniversaris i commemoracions"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
 msgid "Birthday and anniversary reminder units"
 msgstr "Unitats del recordatori d'aniversaris i commemoracions"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
 msgid "Birthday and anniversary reminder value"
 msgstr "Valor del recordatori d'aniversaris i commemoracions"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
-msgid "Calendars to run alarms for"
-msgstr "Calendaris pels quals s'han d'executar les alarmes"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+msgid "Calendars to run reminders for"
+msgstr "Calendaris pels quals s'han d'executar els recordatoris"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Color amb el qual s'ha de dibuixar la lÃnia de Marcus Bains a la barra de "
 "temps (buit per defecte)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr ""
 "Color amb el qual s'ha de dibuixar la lÃnia de Marcus Bains a la "
 "visualitzaciÃ de dia."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
 msgid "Compress weekends in month view"
 msgstr "Comprimeix els caps de setmana en la visualitzaciÃ mensual"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
 msgid "Confirm expunge"
 msgstr "Demana confirmaciÃ en buidar"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr ""
 "Dies en els quals s'ha d'indicar l'inici i el final de les hores laborals."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
-msgstr "Recordatori de cita predeterminat"
+msgstr "Recordatori de cita per defecte"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
-msgstr "Unitats predeterminades pels recordatoris"
+msgstr "Unitats per defecte pels recordatoris"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
-msgstr "Valor predeterminat pels recordatoris"
+msgstr "Valor per defecte pels recordatoris"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
-msgid "Directory for saving alarm audio files"
-msgstr "Directori per desar els fitxers de so d'alarmes"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+msgid "Directory for saving reminder audio files"
+msgstr "Directori per desar els fitxers de so dels recordatoris"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "URL del servidor lliure/ocupat"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "Plantilla URL de lliure/ocupat"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "Oculta les tasques completades"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "Oculta les unitats de la tasca"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "Oculta el valor de la tasca"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "PosiciÃ de la subfinestra horitzontal"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "A quina hora acaba el dia laboral, entre 0 i 23."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "A quina hora comenÃa el dia laboral, entre 0 i 23."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr ""
 "Si Ãs ÂtrueÂ (cert), mostra la subfinestra de previsualitzaciÃ de les "
 "anotacions a la finestra principal."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr ""
 "Si Ãs ÂtrueÂ (cert), mostra la subfinestra de previsualitzaciÃ de les "
 "tasques a la finestra principal."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 "Intervals mostrats en les visualitzacions de dies i setmanes laborals, en "
 "minuts."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
-msgid "Last alarm time"
-msgstr "Ãltima hora de l'alarma"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+msgid "Last reminder time"
+msgstr "Ãltima hora del recordatori"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "List of recently used second time zones in a Day View."
 msgstr ""
 "Llista dels fusos horaris secundaris utilitzats recentment a la "
 "visualitzaciÃ de dia."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
 msgid "List of server URLs for free/busy publishing."
 msgstr ""
 "Llista dels URL dels servidors per a la publicaciÃ de l'estat lliure/ocupat."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line"
 msgstr "LÃnia de Marcus Bains"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Color de la lÃnia de Marcus Bains - VisualitzaciÃ de dia"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Color de la lÃnia de Marcus Bains - Barra de temps"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -14261,59 +14394,59 @@ msgstr ""
 "Nombre mÃxim de fusos horaris utilitzats recentment a recordar en una llista "
 "Âday_second_zonesÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
 msgid "Maximum number of recently used timezones to remember."
 msgstr "Nombre mÃxim de fusos horaris utilitzats recentment a recordar."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
 msgid "Memo layout style"
 msgstr "Estil de la disposiciÃ de les anotacions"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
 msgid "Memo preview pane position (horizontal)"
 msgstr ""
 "PosiciÃ de la subfinestra horitzontal de la vista prÃvia de les anotacions"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
 msgid "Memo preview pane position (vertical)"
 msgstr ""
 "PosiciÃ de la subfinestra vertical de la vista prÃvia de les anotacions"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minut de finalitzaciÃ de la jornada laboral, de 0 a 59."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minut d'inici de la jornada laboral, de 0 a 59."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view horizontal pane position"
 msgstr "PosiciÃ de la subfinestra horitzontal a la visualitzaciÃ mensual"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
 msgid "Month view vertical pane position"
 msgstr "PosiciÃ de la subfinestra vertical a la visualitzaciÃ mensual"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
 msgid "Number of units for determining a birthday or anniversary reminder."
 msgstr ""
 "Nombre d'unitats per determinar un recordatori d'aniversaris o "
 "commemoracions."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
 msgid "Number of units for determining a default reminder."
-msgstr "Nombre d'unitats per determinar un recordatori predeterminat."
+msgstr "Nombre d'unitats per determinar un recordatori per defecte."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
 msgid "Number of units for determining when to hide tasks."
 msgstr "Nombre d'unitats per determinar quan s'han d'amagar les tasques."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
 msgid "Overdue tasks color"
 msgstr "Color de les tasques venÃudes"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -14322,7 +14455,7 @@ msgstr ""
 "dates i la llista de tasques quan no s'estigui a la visualitzaciÃ mensual, "
 "en pÃxels."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14331,25 +14464,25 @@ msgstr ""
 "de navegaciÃ de dates i la llista de tasques en la visualitzaciÃ mensual, en "
 "pÃxels."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr ""
 "PosiciÃ de la subfinestra de previsualitzaciÃ de les anotacions quan "
 "s'orienti verticalment."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr ""
 "PosiciÃ de la subfinestra de previsualitzaciÃ de les tasques quan s'orienti "
 "horitzontalment."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the task preview pane when oriented vertically."
 msgstr ""
 "PosiciÃ de la subfinestra de previsualitzaciÃ de les tasques quan s'orienti "
 "verticalment."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -14357,7 +14490,7 @@ msgstr ""
 "PosiciÃ de la subfinestra vertical, entre les llistes de calendaris i el "
 "calendari de navegaciÃ de les dates."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14366,7 +14499,7 @@ msgstr ""
 "navegaciÃ de dates i la llista de tasques en la visualitzaciÃ mensual, en "
 "pÃxels."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -14375,34 +14508,38 @@ msgstr ""
 "i la llista de tasques quan no s'estigui a la visualitzaciÃ mensual, en "
 "pÃxels."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
 msgid "Primary calendar"
 msgstr "Calendari principal"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Primary memo list"
 msgstr "Llista d'anotacions principal"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary task list"
 msgstr "Llista de tasques principal"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
-msgid "Programs that are allowed to be run by alarms."
-msgstr "Programes que les alarmes poden executar."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+msgid "Programs that are allowed to be run by reminders."
+msgstr "Els programes que es permet que puguin executar els recordatoris."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
 msgid "Recently used second time zones in a Day View"
 msgstr ""
 "Fusos horaris secundaris utilitzats recentment en una visualitzaciÃ de dia"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
 msgid "Recurrent Events in Italic"
 msgstr "Esdeveniments periÃdics en cursiva"
 
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+msgid "Reminder programs"
+msgstr "Programes pels recordatoris"
+
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for alarm audio"
-msgstr "Directori on desar sons per a les alarmes"
+msgid "Save directory for reminder audio"
+msgstr "Directori on desar els sons dels recordatoris"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
@@ -14435,8 +14572,8 @@ msgstr ""
 
 # FIXME: [l10n-bug] (dpm)
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
-msgid "Show display alarms in notification tray"
-msgstr "Mostra les alarmes per visualitzar a l'Ãrea de notificaciÃ"
+msgid "Show display reminders in notification tray"
+msgstr "Mostra els recordatoris per visualitzar a l'Ãrea de notificaciÃ"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
 msgid "Show status field in the event/task/meeting editor"
@@ -14521,16 +14658,16 @@ msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 msgstr ""
-"La plantilla d'URL per utilitzar com a predeterminat de dades de lliure/"
-"ocupat, %u es reemplaÃa amb la part d'usuari de l'adreÃa de correu i %d es "
-"reemplaÃa amb el domini."
+"La plantilla d'URL per utilitzar per defecte de dades de lliure/ocupat, %u "
+"es reemplaÃa amb la part d'usuari de l'adreÃa de correu i %d es reemplaÃa "
+"amb el domini."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
-"El fus horari predeterminat per a les dates i hores del calendari, com a "
+"El fus horari per defecte per a les dates i hores del calendari, com a "
 "ubicaciÃ de base de dades de fus horari no traduÃt d'Olsen, com en ÂEurope/"
 "AndorraÂ."
 
@@ -14575,8 +14712,8 @@ msgid "Time divisions"
 msgstr "Divisions de temps"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Time the last alarm ran, in time_t."
-msgstr "L'Ãltima vegada que es va executar l'alarma, en time_t."
+msgid "Time the last reminder ran, in time_t."
+msgstr "L'Ãltima vegada que es va executar el recordatori, en time_t."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
 msgid "Timezone"
@@ -14597,8 +14734,8 @@ msgstr ""
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
-"Unitats per al recordatori predeterminat, ÂminutesÂ (minuts), "
-"ÂhoursÂ (hores) o ÂdaysÂ (dies)."
+"Unitats per al recordatori per defecte, ÂminutesÂ (minuts), ÂhoursÂ (hores) "
+"o ÂdaysÂ (dies)."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
 msgid ""
@@ -14630,9 +14767,9 @@ msgstr "Dia en quÃ comenÃa la setmana, de diumenge (0) a dissabte (6)."
 
 # FIXME: [l10n-bug] (dpm)
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether or not to use the notification tray for display alarms."
+msgid "Whether or not to use the notification tray for display reminders."
 msgstr ""
-"Si s'ha de fer servir l'Ãrea de notificaciÃ per visualitzar les alarmes."
+"Si s'ha de fer servir l'Ãrea de notificaciÃ per visualitzar els recordatoris."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when deleting an appointment or task."
@@ -14676,7 +14813,7 @@ msgstr ""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to set a default reminder for appointments."
-msgstr "Si s'ha d'establir un recordatori predeterminat per a les cites."
+msgstr "Si s'ha d'establir un recordatori per defecte per a les cites."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to set a reminder for birthdays and anniversaries."
@@ -14748,114 +14885,125 @@ msgstr "Hora d'inici de la jornada laboral"
 msgid "Workday start minute"
 msgstr "Minut d'inici de la jornada laboral"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:267
+#: ../modules/calendar/e-cal-attachment-handler.c:312
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "I_mporta"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:348
+#: ../modules/calendar/e-cal-attachment-handler.c:393
 msgid "Select a Calendar"
 msgstr "Seleccioneu un calendari"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:375
+#: ../modules/calendar/e-cal-attachment-handler.c:420
 msgid "Select a Task List"
 msgstr "Seleccioneu una llista de tasques"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:385
+#: ../modules/calendar/e-cal-attachment-handler.c:430
 msgid "I_mport to Calendar"
 msgstr "I_mporta al calendari"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:392
+#: ../modules/calendar/e-cal-attachment-handler.c:437
 msgid "I_mport to Tasks"
 msgstr "_Importa a les tasques"
 
+#: ../modules/calendar/e-calendar-preferences.c:461
+msgid "Selected Calendars for Reminders"
+msgstr "Seleccioneu els calendaris pels recordatoris"
+
+#: ../modules/calendar/e-calendar-preferences.c:863
+msgid "Ti_me and date:"
+msgstr "Ho_ra i data:"
+
+#: ../modules/calendar/e-calendar-preferences.c:864
+msgid "_Date only:"
+msgstr "NomÃs la _data:"
+
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:107
-#: ../modules/calendar/e-cal-shell-migrate.c:194
-#: ../modules/calendar/e-memo-shell-backend.c:94
-#: ../modules/calendar/e-memo-shell-migrate.c:149
-#: ../modules/calendar/e-task-shell-backend.c:94
-#: ../modules/calendar/e-task-shell-migrate.c:160
+#: ../modules/calendar/e-cal-shell-backend.c:117
+#: ../modules/calendar/e-cal-shell-migrate.c:198
+#: ../modules/calendar/e-memo-shell-backend.c:104
+#: ../modules/calendar/e-memo-shell-migrate.c:152
+#: ../modules/calendar/e-task-shell-backend.c:104
+#: ../modules/calendar/e-task-shell-migrate.c:164
 msgid "On The Web"
 msgstr "A Internet"
 
-#: ../modules/calendar/e-cal-shell-backend.c:109
-#: ../plugins/calendar-weather/calendar-weather.c:121
+#: ../modules/calendar/e-cal-shell-backend.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:127
 msgid "Weather"
 msgstr "Temps"
 
-#: ../modules/calendar/e-cal-shell-backend.c:196
-#: ../modules/calendar/e-cal-shell-migrate.c:62
+#: ../modules/calendar/e-cal-shell-backend.c:206
+#: ../modules/calendar/e-cal-shell-migrate.c:66
 msgid "Birthdays & Anniversaries"
 msgstr "Aniversaris i commemoracions"
 
-#: ../modules/calendar/e-cal-shell-backend.c:421
+#: ../modules/calendar/e-cal-shell-backend.c:439
 msgctxt "New"
 msgid "_Appointment"
 msgstr "Cit_a"
 
-#: ../modules/calendar/e-cal-shell-backend.c:423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1439
+#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Create a new appointment"
 msgstr "Crea una cita nova"
 
-#: ../modules/calendar/e-cal-shell-backend.c:428
+#: ../modules/calendar/e-cal-shell-backend.c:446
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Cita de tot el _dia"
 
-#: ../modules/calendar/e-cal-shell-backend.c:430
+#: ../modules/calendar/e-cal-shell-backend.c:448
 msgid "Create a new all-day appointment"
 msgstr "Crea una cita de tot el dia nova"
 
-#: ../modules/calendar/e-cal-shell-backend.c:435
+#: ../modules/calendar/e-cal-shell-backend.c:453
 msgctxt "New"
 msgid "M_eeting"
 msgstr "R_euniÃ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:437
+#: ../modules/calendar/e-cal-shell-backend.c:455
 msgid "Create a new meeting request"
 msgstr "Crea una solÂlicitud de reuniÃ nova"
 
-#: ../modules/calendar/e-cal-shell-backend.c:445
+#: ../modules/calendar/e-cal-shell-backend.c:463
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndari"
 
-#: ../modules/calendar/e-cal-shell-backend.c:447
-#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Create a new calendar"
 msgstr "Crea un calendari nou"
 
-#: ../modules/calendar/e-cal-shell-backend.c:750
-#: ../plugins/itip-formatter/itip-formatter.c:2809
+#: ../modules/calendar/e-cal-shell-backend.c:788
 msgid "Calendar and Tasks"
 msgstr "Calendari i tasques"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:221
+#: ../modules/calendar/e-cal-shell-sidebar.c:184
 msgid "Loading calendars"
 msgstr "S'estan carregant els calendaris"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:636
+#: ../modules/calendar/e-cal-shell-sidebar.c:755
 msgid "_New Calendar..."
 msgstr "Calendari no_u..."
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:653
+#: ../modules/calendar/e-cal-shell-sidebar.c:772
 msgid "Calendar Selector"
 msgstr "Selector de calendaris"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:998
+#: ../modules/calendar/e-cal-shell-sidebar.c:1123
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "S'estÃ obrint el calendari a %s"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:218
-#: ../modules/calendar/e-cal-shell-view-actions.c:247
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
 msgid "Print"
 msgstr "Imprimeix"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:306
+#: ../modules/calendar/e-cal-shell-view-actions.c:320
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -14866,306 +15014,309 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:323
+#: ../modules/calendar/e-cal-shell-view-actions.c:337
 msgid "Purge events older than"
 msgstr "Buida els esdeveniments anteriors a"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:534
+#: ../modules/calendar/e-cal-shell-view-actions.c:564
 msgid "Copying Items"
 msgstr "CÃpia d'elements"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:804
+#: ../modules/calendar/e-cal-shell-view-actions.c:848
 msgid "Moving Items"
 msgstr "DesplaÃament d'elements"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1131
+#: ../modules/calendar/e-cal-shell-view-actions.c:1175
 msgid "event"
 msgstr "esdeveniment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1133
-#: ../modules/calendar/e-cal-shell-view-memopad.c:216
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:510
-#: ../modules/calendar/e-task-shell-view-actions.c:627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1177
+#: ../modules/calendar/e-cal-shell-view-memopad.c:219
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:286
+#: ../modules/calendar/e-memo-shell-view-actions.c:524
+#: ../modules/calendar/e-task-shell-view-actions.c:641
 msgid "Save as iCalendar"
 msgstr "Desa com a iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1290
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
 msgid "_Copy..."
 msgstr "_Copia..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1297
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "D_elete Calendar"
 msgstr "S_uprimeix el calendari"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
 msgid "Delete the selected calendar"
 msgstr "Suprimeix el calendari seleccionat"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
 msgid "Go Back"
 msgstr "VÃs enrere"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
 msgid "Go Forward"
 msgstr "VÃs endavant"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Select today"
 msgstr "Selecciona avui"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
 msgid "Select _Date"
 msgstr "Selecciona una _data"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Select a specific date"
 msgstr "Selecciona una data concreta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1332
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
 msgid "_New Calendar"
 msgstr "Calendari no_u"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1346
-#: ../modules/calendar/e-task-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-task-shell-view-actions.c:813
 msgid "Purg_e"
 msgstr "Bui_da"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "Purge old appointments and meetings"
 msgstr "Buida les cites i reunions antigues"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1353
-#: ../modules/calendar/e-memo-shell-view-actions.c:619
-#: ../modules/calendar/e-task-shell-view-actions.c:743
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-task-shell-view-actions.c:757
 msgid "Re_fresh"
 msgstr "Re_fresca"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "Refresh the selected calendar"
 msgstr "Refresca el calendari seleccionat"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "Rename the selected calendar"
 msgstr "Canvia el nom del calendari seleccionat"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
 msgid "Show _Only This Calendar"
 msgstr "Mo_stra nomÃs aquest calendari"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Cop_y to Calendar..."
 msgstr "Cop_ia al calendari..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1381
+#: ../modules/calendar/e-cal-shell-view-actions.c:1426
 msgid "_Delegate Meeting..."
 msgstr "_Delega una reuniÃ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1388
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "_Delete Appointment"
 msgstr "Su_primeix la cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
 msgid "Delete selected appointments"
 msgstr "Suprimeix les cites seleccionades"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../modules/calendar/e-cal-shell-view-actions.c:1440
 msgid "Delete This _Occurrence"
 msgstr "Suprimeix aquesta a_pariciÃ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Delete this occurrence"
 msgstr "Suprimeix aquesta apariciÃ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1402
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "Delete All Occ_urrences"
 msgstr "Suprimeix totes les _aparicions"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "Delete all occurrences"
 msgstr "Suprimeix totes les aparicions"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../modules/calendar/e-cal-shell-view-actions.c:1454
 msgid "New All Day _Event..."
 msgstr "_Esdeveniment de tot el dia nou..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1411
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Create a new all day event"
 msgstr "Crea un esdeveniment de tot el dia nou"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1416
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-cal-shell-view-actions.c:1461
+#: ../modules/calendar/e-cal-shell-view-memopad.c:253
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-memo-shell-view-actions.c:598
+#: ../modules/calendar/e-task-shell-view-actions.c:722
 msgid "_Forward as iCalendar..."
 msgstr "R_eenvia com a iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1468
 msgid "New _Meeting..."
 msgstr "Re_uniÃ nova..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
 msgid "Create a new meeting"
 msgstr "Crea una reuniÃ nova"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1430
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_u al calendari..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "New _Appointment..."
 msgstr "Cit_a nova..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1444
+#: ../modules/calendar/e-cal-shell-view-actions.c:1489
 msgid "Make this Occurrence _Movable"
 msgstr "Per_met moure aquesta apariciÃ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
 msgid "_Open Appointment"
 msgstr "_Obre una cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "View the current appointment"
 msgstr "Visualitza la cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1458
+#: ../modules/calendar/e-cal-shell-view-actions.c:1503
 msgid "_Reply"
 msgstr "_Respon"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1472
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
 msgid "_Schedule Meeting..."
 msgstr "Planifica una _reuniÃ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1474
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
 msgid "Converts an appointment to a meeting"
 msgstr "Converteix la cita en una reuniÃ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../modules/calendar/e-cal-shell-view-actions.c:1524
 msgid "Conv_ert to Appointment..."
 msgstr "Con_verteix a cita..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1481
+#: ../modules/calendar/e-cal-shell-view-actions.c:1526
 msgid "Converts a meeting to an appointment"
 msgstr "Converteix una reuniÃ en una cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../modules/calendar/e-cal-shell-view-actions.c:1531
 msgid "Quit"
 msgstr "Surt"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1606
+#: ../modules/calendar/e-cal-shell-view-actions.c:1651
 msgid "Day"
 msgstr "Dia"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1608
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 msgid "Show one day"
 msgstr "Mostra un dia"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1613
+#: ../modules/calendar/e-cal-shell-view-actions.c:1658
 msgid "List"
 msgstr "Llista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1615
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
 msgid "Show as list"
 msgstr "Mostra com a llista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1620
+#: ../modules/calendar/e-cal-shell-view-actions.c:1665
 msgid "Month"
 msgstr "Mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1622
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 msgid "Show one month"
 msgstr "Mostra un mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1672
 msgid "Week"
 msgstr "Setmana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1629
+#: ../modules/calendar/e-cal-shell-view-actions.c:1674
 msgid "Show one week"
 msgstr "Mostra una setmana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1636
+#: ../modules/calendar/e-cal-shell-view-actions.c:1681
 msgid "Show one work week"
 msgstr "Mostra una setmana laborable"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1644
+#: ../modules/calendar/e-cal-shell-view-actions.c:1689
 msgid "Active Appointments"
 msgstr "Cites actives"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1658
+#: ../modules/calendar/e-cal-shell-view-actions.c:1703
 msgid "Next 7 Days' Appointments"
 msgstr "Cites dels propers 7 dies"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1689
-#: ../modules/calendar/e-memo-shell-view-actions.c:781
-#: ../modules/calendar/e-task-shell-view-actions.c:980
+#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-memo-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:994
 msgid "Description contains"
 msgstr "La descripciÃ contÃ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1696
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:987
+#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+#: ../modules/calendar/e-memo-shell-view-actions.c:802
+#: ../modules/calendar/e-task-shell-view-actions.c:1001
 msgid "Summary contains"
 msgstr "El resum contÃ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1708
+#: ../modules/calendar/e-cal-shell-view-actions.c:1753
 msgid "Print this calendar"
 msgstr "Imprimeix aquest calendari"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1715
+#: ../modules/calendar/e-cal-shell-view-actions.c:1760
 msgid "Preview the calendar to be printed"
 msgstr "Previsualitza el calendari que s'ha d'imprimir"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1737
-#: ../modules/calendar/e-cal-shell-view-memopad.c:291
-msgid "Save as iCalendar..."
-msgstr "Anomena i desa com a iCalendar..."
+#: ../modules/calendar/e-cal-shell-view-actions.c:1782
+#: ../modules/calendar/e-cal-shell-view-memopad.c:294
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:381
+#: ../modules/calendar/e-memo-shell-view-actions.c:843
+#: ../modules/calendar/e-task-shell-view-actions.c:1042
+msgid "_Save as iCalendar..."
+msgstr "_Anomena i desa com a iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1814
+#: ../modules/calendar/e-cal-shell-view-actions.c:1859
 msgid "Go To"
 msgstr "VÃs a"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:214
-#: ../modules/calendar/e-memo-shell-view-actions.c:508
+#: ../modules/calendar/e-cal-shell-view-memopad.c:217
+#: ../modules/calendar/e-memo-shell-view-actions.c:522
 msgid "memo"
 msgstr "anotaciÃ"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:640
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
 msgid "New _Memo"
 msgstr "Nova _anotaciÃ"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-backend.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../modules/calendar/e-cal-shell-view-memopad.c:262
+#: ../modules/calendar/e-memo-shell-backend.c:300
+#: ../modules/calendar/e-memo-shell-view-actions.c:656
 msgid "Create a new memo"
 msgstr "Crea una anotaciÃ nova"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-cal-shell-view-memopad.c:267
+#: ../modules/calendar/e-memo-shell-view-actions.c:661
 msgid "_Open Memo"
 msgstr "_Obre l'anotaciÃ"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:266
-#: ../modules/calendar/e-memo-shell-view-actions.c:649
+#: ../modules/calendar/e-cal-shell-view-memopad.c:269
+#: ../modules/calendar/e-memo-shell-view-actions.c:663
 msgid "View the selected memo"
 msgstr "Visualitza l'anotaciÃ seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
-#: ../modules/calendar/e-memo-shell-view-actions.c:654
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-cal-shell-view-memopad.c:274
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-memo-shell-view-actions.c:668
+#: ../modules/calendar/e-task-shell-view-actions.c:806
 msgid "Open _Web Page"
 msgstr "Obre una pÃgina _web"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:814
+#: ../modules/calendar/e-cal-shell-view-memopad.c:286
+#: ../modules/calendar/e-memo-shell-view-actions.c:828
 msgid "Print the selected memo"
 msgstr "Imprimeix l'anotaciÃ seleccionada"
 
@@ -15173,248 +15324,230 @@ msgstr "Imprimeix l'anotaciÃ seleccionada"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:281
-#: ../modules/calendar/e-task-shell-view-actions.c:625
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:284
+#: ../modules/calendar/e-task-shell-view-actions.c:639
 msgid "task"
 msgstr "tasca"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
+#: ../modules/calendar/e-task-shell-view-actions.c:701
 msgid "_Assign Task"
 msgstr "_Assigna una tasca"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:778
 msgid "_Mark as Complete"
 msgstr "_Marca com a acabada"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
-#: ../modules/calendar/e-task-shell-view-actions.c:766
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:335
+#: ../modules/calendar/e-task-shell-view-actions.c:780
 msgid "Mark selected tasks as complete"
 msgstr "Marca la tasca seleccionada com a completa"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
 msgid "_Mark as Incomplete"
 msgstr "_Marca com a incomplet"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
-#: ../modules/calendar/e-task-shell-view-actions.c:773
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:342
+#: ../modules/calendar/e-task-shell-view-actions.c:787
 msgid "Mark selected tasks as incomplete"
 msgstr "Marca les tasques seleccionades com a no completades"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:778
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "New _Task"
 msgstr "_Tasca nova"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-backend.c:282
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:349
+#: ../modules/calendar/e-task-shell-backend.c:299
+#: ../modules/calendar/e-task-shell-view-actions.c:794
 msgid "Create a new task"
 msgstr "Crea una tasca nova"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
+#: ../modules/calendar/e-task-shell-view-actions.c:799
 msgid "_Open Task"
 msgstr "_Obre una tasca"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
+#: ../modules/calendar/e-task-shell-view-actions.c:801
 msgid "View the selected task"
 msgstr "Visualitza la tasca seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:370
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../modules/calendar/e-task-shell-view-actions.c:1027
 msgid "Print the selected task"
 msgstr "Imprimeix la tasca seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:378
-#: ../modules/calendar/e-memo-shell-view-actions.c:829
-#: ../modules/calendar/e-task-shell-view-actions.c:1028
-msgid "_Save as iCalendar..."
-msgstr "_Anomena i desa com a iCalendar..."
-
-#: ../modules/calendar/e-calendar-preferences.c:437
-msgid "Selected Calendars for Alarms"
-msgstr "Seleccioneu els calendaris per a les alarmes"
-
-#: ../modules/calendar/e-calendar-preferences.c:836
-msgid "Ti_me and date:"
-msgstr "Ho_ra i data:"
-
-#: ../modules/calendar/e-calendar-preferences.c:837
-msgid "_Date only:"
-msgstr "NomÃs la _data:"
-
-#: ../modules/calendar/e-memo-shell-backend.c:281
+#: ../modules/calendar/e-memo-shell-backend.c:298
 msgctxt "New"
 msgid "Mem_o"
 msgstr "An_otaciÃ"
 
-#: ../modules/calendar/e-memo-shell-backend.c:288
+#: ../modules/calendar/e-memo-shell-backend.c:305
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "AnotaciÃ _compartida"
 
-#: ../modules/calendar/e-memo-shell-backend.c:290
+#: ../modules/calendar/e-memo-shell-backend.c:307
 msgid "Create a new shared memo"
 msgstr "Crea una anotaciÃ compartida nova"
 
-#: ../modules/calendar/e-memo-shell-backend.c:298
+#: ../modules/calendar/e-memo-shell-backend.c:315
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Lli_sta d'anotacions"
 
-#: ../modules/calendar/e-memo-shell-backend.c:300
-#: ../modules/calendar/e-memo-shell-view-actions.c:607
+#: ../modules/calendar/e-memo-shell-backend.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
 msgid "Create a new memo list"
 msgstr "Crea una llista d'anotacions nova"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:216
+#: ../modules/calendar/e-memo-shell-sidebar.c:179
 msgid "Loading memos"
 msgstr "S'estan carregant les anotacions"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:578
+#: ../modules/calendar/e-memo-shell-sidebar.c:696
 msgid "Memo List Selector"
 msgstr "Selector de llistes d'anotacions"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:885
+#: ../modules/calendar/e-memo-shell-sidebar.c:1009
 #, c-format
 msgid "Opening memos at %s"
 msgstr "S'estan obrint les anotacions a %s"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
 msgid "Print Memos"
 msgstr "Imprimeix anotacions"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:570
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
 msgid "_Delete Memo"
 msgstr "Suprimeix l'_anotaciÃ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:577
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "_Find in Memo..."
 msgstr "_Cerca en l'anotaciÃ..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:579
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
 msgid "Search for text in the displayed memo"
 msgstr "Cerca un text en el cos de l'anotaciÃ que es mostra"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:598
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
 msgid "D_elete Memo List"
 msgstr "Suprimeix la llista d'_anotacions"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:600
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
 msgid "Delete the selected memo list"
 msgstr "Suprimeix la llista d'anotacions seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
 msgid "_New Memo List"
 msgstr "Llista d'anotacions _nova"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
 msgid "Refresh the selected memo list"
 msgstr "Refresca la llista d'anotacions seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:628
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Rename the selected memo list"
 msgstr "Canvia el nom de la llista d'anotacions seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
 msgid "Show _Only This Memo List"
 msgstr "Mo_stra nomÃs aquesta llista d'anotacions"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:712
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
 msgid "Memo _Preview"
 msgstr "_PrevisualitzaciÃ d'anotacions"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:714
+#: ../modules/calendar/e-memo-shell-view-actions.c:728
 msgid "Show memo preview pane"
 msgstr "Mostra la subfinestra de previsualitzaciÃ de les anotacions"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:735
+#: ../modules/calendar/e-memo-shell-view-actions.c:749
 msgid "Show memo preview below the memo list"
 msgstr "Mostra la previsualitzaciÃ de l'anotaciÃ sota la llista d'anotacions"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:742
+#: ../modules/calendar/e-memo-shell-view-actions.c:756
 msgid "Show memo preview alongside the memo list"
 msgstr ""
 "Mostra la previsualitzaciÃ de l'anotaciÃ al costat de la llista d'anotacions"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:800
+#: ../modules/calendar/e-memo-shell-view-actions.c:814
 msgid "Print the list of memos"
 msgstr "Imprimeix la llista d'anotacions"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:807
+#: ../modules/calendar/e-memo-shell-view-actions.c:821
 msgid "Preview the list of memos to be printed"
 msgstr "Previsualitza la llista d'anotacions a imprimir"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:420
+#: ../modules/calendar/e-memo-shell-view.c:227
+msgid "Delete Memos"
+msgstr "Suprimeix les anotacions"
+
+#: ../modules/calendar/e-memo-shell-view.c:229
+msgid "Delete Memo"
+msgstr "Suprimeix l'anotaciÃ"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:424
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d anotaciÃ"
 msgstr[1] "%d anotacions"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:424
-#: ../modules/calendar/e-task-shell-view-private.c:575
+#: ../modules/calendar/e-memo-shell-view-private.c:428
+#: ../modules/calendar/e-task-shell-view-private.c:585
 #, c-format
 msgid "%d selected"
 msgstr "%d seleccionades"
 
-#: ../modules/calendar/e-memo-shell-view.c:223
-msgid "Delete Memos"
-msgstr "Suprimeix les anotacions"
-
-#: ../modules/calendar/e-memo-shell-view.c:225
-msgid "Delete Memo"
-msgstr "Suprimeix l'anotaciÃ"
-
-#: ../modules/calendar/e-task-shell-backend.c:280
+#: ../modules/calendar/e-task-shell-backend.c:297
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tasca"
 
-#: ../modules/calendar/e-task-shell-backend.c:287
+#: ../modules/calendar/e-task-shell-backend.c:304
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tasca assigna_da"
 
-#: ../modules/calendar/e-task-shell-backend.c:289
+#: ../modules/calendar/e-task-shell-backend.c:306
 msgid "Create a new assigned task"
 msgstr "Crea una tasca assignada nova"
 
-#: ../modules/calendar/e-task-shell-backend.c:297
+#: ../modules/calendar/e-task-shell-backend.c:314
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Llista de tas_ques"
 
-#: ../modules/calendar/e-task-shell-backend.c:299
-#: ../modules/calendar/e-task-shell-view-actions.c:731
+#: ../modules/calendar/e-task-shell-backend.c:316
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "Create a new task list"
 msgstr "Crea una llista de tasques nova"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:216
+#: ../modules/calendar/e-task-shell-sidebar.c:179
 msgid "Loading tasks"
 msgstr "S'estan carregant les tasques"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:578
+#: ../modules/calendar/e-task-shell-sidebar.c:696
 msgid "Task List Selector"
 msgstr "Selector de llistes de tasques"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:885
+#: ../modules/calendar/e-task-shell-sidebar.c:1010
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "S'estan obrint les tasques a %s"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:241
-#: ../modules/calendar/e-task-shell-view-actions.c:256
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
 msgid "Print Tasks"
 msgstr "Imprimeix les tasques"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:569
+#: ../modules/calendar/e-task-shell-view-actions.c:583
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15426,640 +15559,604 @@ msgstr ""
 "\n"
 "Segur que voleu suprimir aquestes tasques?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:694
+#: ../modules/calendar/e-task-shell-view-actions.c:590
+msgid "Do not ask me again"
+msgstr "No m'ho tornis a demanar"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:708
 msgid "_Delete Task"
 msgstr "_Suprimeix la tasca"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:701
+#: ../modules/calendar/e-task-shell-view-actions.c:715
 msgid "_Find in Task..."
 msgstr "_Cerca a la tasca..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:703
+#: ../modules/calendar/e-task-shell-view-actions.c:717
 msgid "Search for text in the displayed task"
 msgstr "Cerca un text a la tasca mostrada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:729
 msgid "Copy..."
 msgstr "Copia..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:722
+#: ../modules/calendar/e-task-shell-view-actions.c:736
 msgid "D_elete Task List"
 msgstr "_Suprimeix la llista de tasques"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../modules/calendar/e-task-shell-view-actions.c:738
 msgid "Delete the selected task list"
 msgstr "Suprimeix la llista de tasques seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:743
 msgid "_New Task List"
 msgstr "Llista de tasques _nova"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "Refresh the selected task list"
 msgstr "Refresca la llista de tasques seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:752
+#: ../modules/calendar/e-task-shell-view-actions.c:766
 msgid "Rename the selected task list"
 msgstr "Canvia el nom de llista de tasques seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:771
 msgid "Show _Only This Task List"
 msgstr "Mo_stra nomÃs aquesta llista de tasques"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:785
 msgid "Mar_k as Incomplete"
 msgstr "_Marca com a no completada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/calendar/e-task-shell-view-actions.c:815
 msgid "Delete completed tasks"
 msgstr "Suprimeix les tasques completades"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:876
+#: ../modules/calendar/e-task-shell-view-actions.c:890
 msgid "Task _Preview"
 msgstr "_Previsualitza la tasca"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:878
+#: ../modules/calendar/e-task-shell-view-actions.c:892
 msgid "Show task preview pane"
 msgstr "Mostra la subfinestra de previsualitzaciÃ de tasques"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:899
+#: ../modules/calendar/e-task-shell-view-actions.c:913
 msgid "Show task preview below the task list"
 msgstr "Mostra la previsualitzaciÃ de la tasca sota la llista de tasques"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:906
+#: ../modules/calendar/e-task-shell-view-actions.c:920
 msgid "Show task preview alongside the task list"
 msgstr ""
 "Mostra la previsualitzaciÃ de la tasca al costat de la llista de tasques"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/calendar/e-task-shell-view-actions.c:928
 msgid "Active Tasks"
 msgstr "Tasques actives"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:928
+#: ../modules/calendar/e-task-shell-view-actions.c:942
 msgid "Completed Tasks"
 msgstr "Tasques completades"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:935
+#: ../modules/calendar/e-task-shell-view-actions.c:949
 msgid "Next 7 Days' Tasks"
 msgstr "Tasques dels propers 7 dies"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:942
+#: ../modules/calendar/e-task-shell-view-actions.c:956
 msgid "Overdue Tasks"
 msgstr "Tasques venÃudes"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:949
+#: ../modules/calendar/e-task-shell-view-actions.c:963
 msgid "Tasks with Attachments"
 msgstr "Tasques amb fitxers adjunts"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:999
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
 msgid "Print the list of tasks"
 msgstr "Imprimeix la llista de tasques"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1006
+#: ../modules/calendar/e-task-shell-view-actions.c:1020
 msgid "Preview the list of tasks to be printed"
 msgstr "Previsualitza la llista de tasques a imprimir"
 
-#: ../modules/calendar/e-task-shell-view-private.c:468
+#: ../modules/calendar/e-task-shell-view.c:362
+msgid "Delete Tasks"
+msgstr "Suprimeix les tasques"
+
+#: ../modules/calendar/e-task-shell-view.c:364
+msgid "Delete Task"
+msgstr "Suprimeix la tasca"
+
+#: ../modules/calendar/e-task-shell-view-private.c:472
 msgid "Expunging"
 msgstr "S'estÃ buidant"
 
-#: ../modules/calendar/e-task-shell-view-private.c:571
+#: ../modules/calendar/e-task-shell-view-private.c:581
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tasca"
 msgstr[1] "%d tasques"
 
-#: ../modules/calendar/e-task-shell-view.c:358
-msgid "Delete Tasks"
-msgstr "Suprimeix les tasques"
+#: ../modules/mail/em-account-prefs.c:219
+msgid "Evolution Account Assistant"
+msgstr "Auxiliar per als comptes de l'Evolution"
 
-#: ../modules/calendar/e-task-shell-view.c:360
-msgid "Delete Task"
-msgstr "Suprimeix la tasca"
+#: ../modules/mail/em-account-prefs.c:268
+msgid "Account Editor"
+msgstr "Editor de comptes"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:382
+#: ../modules/mail/e-mail-attachment-handler.c:384
 #, c-format
 msgid "%d attached messages"
 msgstr "%d missatges adjunts"
 
-#. Translators: "None" for a junk hook name,
-#. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
-msgctxt "mail-junk-hook"
-msgid "None"
-msgstr "Cap"
-
-#: ../modules/mail/e-mail-shell-backend.c:184
+#: ../modules/mail/e-mail-shell-backend.c:195
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Missatge de correu"
 
-#: ../modules/mail/e-mail-shell-backend.c:186
+#: ../modules/mail/e-mail-shell-backend.c:197
 msgid "Compose a new mail message"
 msgstr "Redacta un missatge de correu nou"
 
-#: ../modules/mail/e-mail-shell-backend.c:194
+#: ../modules/mail/e-mail-shell-backend.c:205
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Carpeta de correu"
 
-#: ../modules/mail/e-mail-shell-backend.c:196
+#: ../modules/mail/e-mail-shell-backend.c:207
 msgid "Create a new mail folder"
 msgstr "Crea una carpeta de correu nova"
 
-#: ../modules/mail/e-mail-shell-backend.c:495
+#: ../modules/mail/e-mail-shell-backend.c:412
 msgid "Mail Accounts"
 msgstr "Comptes de correu"
 
-#: ../modules/mail/e-mail-shell-backend.c:503
+#: ../modules/mail/e-mail-shell-backend.c:420
 msgid "Mail Preferences"
 msgstr "PreferÃncies del correu"
 
-#: ../modules/mail/e-mail-shell-backend.c:511
+#: ../modules/mail/e-mail-shell-backend.c:428
 msgid "Composer Preferences"
 msgstr "PreferÃncies del redactor"
 
-#: ../modules/mail/e-mail-shell-backend.c:519
+#: ../modules/mail/e-mail-shell-backend.c:436
 msgid "Network Preferences"
 msgstr "PreferÃncies de la xarxa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1064
-#: ../modules/mail/e-mail-shell-view.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:1115
+#: ../modules/mail/e-mail-shell-view.c:960
 msgid "_Disable Account"
 msgstr "_Inhabilita el compte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1066
+#: ../modules/mail/e-mail-shell-view-actions.c:1117
 msgid "Disable this account"
 msgstr "Inhabilita aquest compte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1073
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr ""
 "Suprimeix permanentment tots els missatges suprimits de totes les carpetes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1078
-msgid "C_reate Search Folder From Search..."
-msgstr "C_rea una carpeta de cerca a partir de la cerca..."
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1085
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "_Download Messages for Offline Usage"
 msgstr "_Baixa els missatges per treballar fora de lÃnia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Baixa els missatges dels comptes o carpetes marcats per treballar fora de "
 "lÃnia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1092
+#: ../modules/mail/e-mail-shell-view-actions.c:1136
 msgid "Fl_ush Outbox"
 msgstr "Bui_da la safata de sortida"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1099
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
 msgid "_Copy Folder To..."
 msgstr "_Copia la carpeta a..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1101
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "Copy the selected folder into another folder"
 msgstr "Copia la carpeta seleccionada a una altra carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1108
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
 msgid "Permanently remove this folder"
 msgstr "Suprimeix permanentment la carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1113
+#: ../modules/mail/e-mail-shell-view-actions.c:1157
 msgid "E_xpunge"
 msgstr "Suprimei_x"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1115
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Suprimeix permanentment tots els missatges esborrats d'aquesta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1120
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
 msgid "Mar_k All Messages as Read"
 msgstr "Marca _tots els missatges com a llegits"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1122
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Mark all messages in the folder as read"
 msgstr "Marca tots els missatges d'aquesta carpeta com a llegits"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1127
+#: ../modules/mail/e-mail-shell-view-actions.c:1171
 msgid "_Move Folder To..."
 msgstr "_Mou la carpeta a..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1129
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "Move the selected folder into another folder"
 msgstr "Mou la carpeta seleccionada a una altra carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1134
+#: ../modules/mail/e-mail-shell-view-actions.c:1178
 msgid "_New..."
 msgstr "_Nova..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1136
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
 msgid "Create a new folder for storing mail"
 msgstr "Crea una carpeta nova per emmagatzemar correu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1143
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "Change the properties of this folder"
 msgstr "Canvia les propietats de la carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1150
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 msgid "Refresh the folder"
 msgstr "Refresca la carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1157
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "Change the name of this folder"
 msgstr "Canvia el nom de la carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1162
+#: ../modules/mail/e-mail-shell-view-actions.c:1206
 msgid "Select Message _Thread"
 msgstr "Selecciona el fil del missa_tge"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Selecciona tots els missatges del fil del missatge seleccionat"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1169
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
 msgid "Select Message S_ubthread"
 msgstr "Selecciona el _subfil del missatge"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1171
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
 msgid "Select all replies to the currently selected message"
 msgstr "Selecciona totes les respostes del missatge seleccionat"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1183
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
 msgid "Empty _Trash"
 msgstr "Buida la _paperera"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr ""
 "Suprimeix permanentment tots els missatges suprimits de tots els comptes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1190
+#: ../modules/mail/e-mail-shell-view-actions.c:1234
 msgid "_New Label"
 msgstr "Etiqueta _nova"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1199
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
 msgid "N_one"
 msgstr "Ca_p"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
 msgid "_Manage Subscriptions"
 msgstr "Gestiona les _subscripcions"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Subscriu o cancelÂla la subscripciÃ a una carpeta en servidors remots"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
-#: ../modules/mail/e-mail-shell-view-actions.c:1241
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Send / _Receive"
 msgstr "Envia / _rep"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 msgid "Send queued items and retrieve new items"
 msgstr "Envia els elements enviats a la cua i obtÃ els nous"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "R_eceive All"
 msgstr "R_ep-ho tot"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "Receive new items from all accounts"
 msgstr "Rep els elements nous de tots els comptes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "_Send All"
 msgstr "_Envia-ho tot"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1236
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "Send queued items in all accounts"
 msgstr "Envia els elements enviats a la cua de tots els comptes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1262
-#: ../widgets/misc/e-activity-proxy.c:306
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../widgets/misc/e-activity-proxy.c:310
 msgid "Cancel"
 msgstr "CancelÂla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1308
 msgid "Cancel the current mail operation"
 msgstr "CancelÂla l'operaciÃ de correu actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1269
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
 msgid "Collapse All _Threads"
 msgstr "ColÂlapsa tots els _fils"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "Collapse all message threads"
 msgstr "Contrau tots els fils del missatge"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1276
+#: ../modules/mail/e-mail-shell-view-actions.c:1320
 msgid "E_xpand All Threads"
 msgstr "E_xpandeix tots els fils"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
 msgid "Expand all message threads"
 msgstr "Expandeix tots els fils de missatge"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1283
+#: ../modules/mail/e-mail-shell-view-actions.c:1327
 msgid "_Message Filters"
 msgstr "Filtres de _missatge"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "Create or edit rules for filtering new mail"
 msgstr "Crea o edita les regles per filtrar el correu nou"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1290
-msgid "Search F_olders"
-msgstr "Car_petes de cerca"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
-msgid "Create or edit search folder definitions"
-msgstr "Crea o edita les definicions de carpetes de cerca"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1297
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
 msgid "_Subscriptions..."
 msgstr "_Subscripcions..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "F_older"
 msgstr "C_arpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1313
+#: ../modules/mail/e-mail-shell-view-actions.c:1350
 msgid "_Label"
 msgstr "_Etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1353
+#: ../modules/mail/e-mail-shell-view-actions.c:1367
+msgid "C_reate Search Folder From Search..."
+msgstr "C_rea una carpeta de cerca a partir de la cerca..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1374
+msgid "Search F_olders"
+msgstr "Car_petes de cerca"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1376
+msgid "Create or edit search folder definitions"
+msgstr "Crea o edita les definicions de carpetes de cerca"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1407
 msgid "_New Folder..."
 msgstr "Carpeta _nova..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1381
+#: ../modules/mail/e-mail-shell-view-actions.c:1435
 msgid "Show Message _Preview"
 msgstr "Mostra la _previsualitzaciÃ del missatge"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1383
+#: ../modules/mail/e-mail-shell-view-actions.c:1437
 msgid "Show message preview pane"
 msgstr "Mostra la finestra de previsualitzaciÃ de missatges"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1389
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
 msgid "Show _Deleted Messages"
 msgstr "Mostra els missatges _suprimits"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
 msgid "Show deleted messages with a line through them"
 msgstr "Mostra els missatges suprimits amb una ratlla a sobre."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1397
+#: ../modules/mail/e-mail-shell-view-actions.c:1451
 msgid "_Group By Threads"
 msgstr "Agrupa per _fils"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1399
+#: ../modules/mail/e-mail-shell-view-actions.c:1453
 msgid "Threaded message list"
 msgstr "Llista de missatges amb fils"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1420
+#: ../modules/mail/e-mail-shell-view-actions.c:1474
 msgid "Show message preview below the message list"
 msgstr "Mostra la previsualitzaciÃ del missatge sota la llista de missatges"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1427
+#: ../modules/mail/e-mail-shell-view-actions.c:1481
 msgid "Show message preview alongside the message list"
 msgstr ""
 "Mostra la previsualitzaciÃ del missatge al costat de la llista de missatges"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1435
+#: ../modules/mail/e-mail-shell-view-actions.c:1489
 msgid "All Messages"
 msgstr "Tots els missatges"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1442
+#: ../modules/mail/e-mail-shell-view-actions.c:1496
 msgid "Important Messages"
 msgstr "Missatges importants"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1449
+#: ../modules/mail/e-mail-shell-view-actions.c:1503
 msgid "Last 5 Days' Messages"
 msgstr "Missatges dels darrers 5 dies"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1456
+#: ../modules/mail/e-mail-shell-view-actions.c:1510
 msgid "Messages Not Junk"
 msgstr "Missatges que no sÃn brossa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1463
+#: ../modules/mail/e-mail-shell-view-actions.c:1517
 msgid "Messages with Attachments"
 msgstr "Missatges amb fitxers adjunts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1470
+#: ../modules/mail/e-mail-shell-view-actions.c:1524
 msgid "No Label"
 msgstr "Cap etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1477
+#: ../modules/mail/e-mail-shell-view-actions.c:1531
 msgid "Read Messages"
 msgstr "Missatges llegits"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1484
+#: ../modules/mail/e-mail-shell-view-actions.c:1538
 msgid "Recent Messages"
 msgstr "Missatges recents"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1491
+#: ../modules/mail/e-mail-shell-view-actions.c:1545
 msgid "Unread Messages"
 msgstr "Missatges sense llegir"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1543
+#: ../modules/mail/e-mail-shell-view-actions.c:1597
 msgid "Subject or Addresses contain"
 msgstr "L'assumpte o les adreces contenen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1553
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
 msgid "All Accounts"
 msgstr "Comptes de correu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1560
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Current Account"
 msgstr "Compte actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1567
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 msgid "Current Folder"
 msgstr "Carpeta actual"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1049
+#: ../modules/mail/e-mail-shell-view.c:563
+msgid "All Account Search"
+msgstr "Cerca a tots els comptes"
+
+#: ../modules/mail/e-mail-shell-view.c:736
+msgid "Account Search"
+msgstr "Cerca al compte"
+
+#: ../modules/mail/e-mail-shell-view.c:958
+msgid "Proxy _Logout"
+msgstr "Sortida de_l servidor intermediari"
+
+#: ../modules/mail/e-mail-shell-view-private.c:997
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionat, "
 msgstr[1] "%d seleccionats, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1008
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d suprimit"
 msgstr[1] "%d suprimits"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1066
-#: ../modules/mail/e-mail-shell-view-private.c:1073
+#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1021
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d brossa"
 msgstr[1] "%d brossa"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1079
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d esborrany"
 msgstr[1] "%d esborranys"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1085
+#: ../modules/mail/e-mail-shell-view-private.c:1033
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d sense enviar"
 msgstr[1] "%d sense enviar"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1091
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviat"
 msgstr[1] "%d enviats"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1103
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d sense llegir, "
 msgstr[1] "%d sense llegir, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1106
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d en total"
 msgstr[1] "%d en total"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1126
+#: ../modules/mail/e-mail-shell-view-private.c:1074
 msgid "Trash"
 msgstr "Paperera"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1600
+#: ../modules/mail/e-mail-shell-view-private.c:1542
 msgid "Send / Receive"
 msgstr "Envia / rep"
 
-#: ../modules/mail/e-mail-shell-view.c:563
-msgid "All Account Search"
-msgstr "Cerca a tots els comptes"
-
-#: ../modules/mail/e-mail-shell-view.c:746
-msgid "Account Search"
-msgstr "Cerca al compte"
-
-#: ../modules/mail/e-mail-shell-view.c:951
-msgid "Proxy _Logout"
-msgstr "Sortida de_l servidor intermediari"
-
-#: ../modules/mail/em-account-prefs.c:215
-msgid "Evolution Account Assistant"
-msgstr "Auxiliar per als comptes de l'Evolution"
-
-#: ../modules/mail/em-account-prefs.c:264
-msgid "Account Editor"
-msgstr "Editor de comptes"
-
-#: ../modules/mail/em-composer-prefs.c:502
-#: ../modules/plugin-manager/evolution-plugin-manager.c:356
-#: ../plugins/publish-calendar/publish-calendar.c:831
-#: ../widgets/misc/e-account-tree-view.c:220
+#: ../modules/mail/em-composer-prefs.c:495
+#: ../modules/plugin-manager/evolution-plugin-manager.c:361
+#: ../plugins/publish-calendar/publish-calendar.c:857
+#: ../widgets/misc/e-account-tree-view.c:224
 msgid "Enabled"
 msgstr "Habilitat"
 
-#: ../modules/mail/em-composer-prefs.c:506
+#: ../modules/mail/em-composer-prefs.c:499
 msgid "Language(s)"
 msgstr "Idiomes"
 
 # Apareix enmig d'una frase, i per tant ha d'anar en minÃscula (dpm)
-#: ../modules/mail/em-mailer-prefs.c:89
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Every time"
 msgstr "cada vegada"
 
 # Apareix enmig d'una frase, i per tant ha d'anar en minÃscula (dpm)
-#: ../modules/mail/em-mailer-prefs.c:90
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per day"
 msgstr "una vegada al dia"
 
 # Apareix enmig d'una frase, i per tant ha d'anar en minÃscula (dpm)
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per week"
 msgstr "una vegada a la setmana"
 
 # Apareix enmig d'una frase, i per tant ha d'anar en minÃscula (dpm)
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per month"
 msgstr "una vegada al mes"
 
-# FIXME: s'ha de mirar si Ãs massa llarg (dpm)
-#: ../modules/mail/em-mailer-prefs.c:174
-msgid "Add Custom Junk Header"
-msgstr "Afegeix una capÃalera de correu brossa personalitzada"
-
-#: ../modules/mail/em-mailer-prefs.c:182
-msgid "Header Name:"
-msgstr "Nom de la capÃalera:"
-
-#: ../modules/mail/em-mailer-prefs.c:183
-msgid "Header Value Contains:"
-msgstr "El valor de la capÃalera contÃ:"
-
-#: ../modules/mail/em-mailer-prefs.c:283
+#: ../modules/mail/em-mailer-prefs.c:293
 msgid "Header"
 msgstr "CapÃalera"
 
-#: ../modules/mail/em-mailer-prefs.c:287
+#: ../modules/mail/em-mailer-prefs.c:297
 msgid "Contains Value"
 msgstr "ContÃ el valor"
 
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:693 ../modules/mail/em-mailer-prefs.c:766
-#, c-format
-msgid "%s plugin is available and the binary is installed."
-msgstr "El connector %s estÃ disponible i el fitxer binari estÃ instalÂlat."
-
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:701 ../modules/mail/em-mailer-prefs.c:775
-#, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
-msgstr ""
-"El connector %s no estÃ disponible. Comproveu que el seu paquet estigui "
-"instalÂlat."
-
-#: ../modules/mail/em-mailer-prefs.c:739
-msgid "No junk plugin available"
-msgstr "No hi ha cap connector de correu brossa disponible"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1142
+#: ../modules/mail/em-mailer-prefs.c:1051
 msgid "_Date header:"
 msgstr "CapÃalera de la _data:"
 
-#: ../modules/mail/em-mailer-prefs.c:1143
+#: ../modules/mail/em-mailer-prefs.c:1052
 msgid "Show _original header value"
 msgstr "Mostra el valor _original de la capÃalera"
 
 #: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
-msgstr "Comprova si l'Evolution Ãs el gestor de correu predeterminat"
+msgstr "Comprova si l'Evolution Ãs el gestor de correu per defecte"
 
 #: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
-msgstr ""
-"Comprova si l'Evolution Ãs el gestor de correu predeterminat en iniciar."
+msgstr "Comprova si l'Evolution Ãs el gestor de correu per defecte en iniciar."
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:143
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "Do you want to make Evolution your default email client?"
-msgstr "Voleu que l'Evolution sigui el vostre gestor de correu predeterminat?"
+msgstr "Voleu que l'Evolution sigui el vostre gestor de correu per defecte?"
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
 msgid "Click 'Work Online' to return to online mode."
@@ -16081,35 +16178,63 @@ msgstr ""
 "L'Evolution tornarÃ a estar en mode en lÃnia tant bon punt es restableixi la "
 "connexiÃ de xarxa."
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+#: ../modules/online-accounts/camel-sasl-xoauth.c:374
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an authentication token."
+msgstr ""
+"No es pot trobar el compte corresponent al servei org.gnome.OnlineAccounts "
+"del que obtenir-ne el testimoni d'autenticaciÃ."
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:461
+msgid "OAuth"
+msgstr "OAuth"
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:463
+msgid ""
+"This option will connect to the server by way of the GNOME Online Accounts "
+"service"
+msgstr ""
+"Aquesta opciÃ farÃ que es connecti amb el servidor a travÃs del servei dels "
+"comptes en lÃnia del GNOME"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:70
 msgid "Author(s)"
 msgstr "Autors"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:251
+#: ../modules/plugin-manager/evolution-plugin-manager.c:256
 msgid "Plugin Manager"
 msgstr "Administrador de connectors"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:266
+#: ../modules/plugin-manager/evolution-plugin-manager.c:271
 msgid "Note: Some changes will not take effect until restart"
 msgstr "AvÃs: alguns canvis nomÃs s'aplicaran desprÃs de reiniciar"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:295
+#: ../modules/plugin-manager/evolution-plugin-manager.c:300
 msgid "Overview"
 msgstr "Resum"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:364
-#: ../modules/plugin-manager/evolution-plugin-manager.c:447
+#: ../modules/plugin-manager/evolution-plugin-manager.c:369
+#: ../modules/plugin-manager/evolution-plugin-manager.c:452
 msgid "Plugin"
 msgstr "Connector"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:485
+#: ../modules/plugin-manager/evolution-plugin-manager.c:490
 msgid "_Plugins"
 msgstr "_Connectors"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:486
+#: ../modules/plugin-manager/evolution-plugin-manager.c:491
 msgid "Enable and disable plugins"
 msgstr "Habilita i inhabilita connectors"
 
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Connector de prova del Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Carregador de l'EPlugin del connector de prova del Python."
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Hola Python"
@@ -16118,47 +16243,96 @@ msgstr "Hola Python"
 msgid "Python Plugin Loader tests"
 msgstr "Proves del carregador del connector del Python"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "Connector de prova del Python"
+#: ../modules/spamassassin/evolution-spamassassin.c:191
+#, c-format
+msgid "Failed to spawn SpamAssassin (%s): "
+msgstr "No s'ha pogut engendrar l'SpamAssassin (%s):"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "Carregador de l'EPlugin del connector de prova del Python."
+#: ../modules/spamassassin/evolution-spamassassin.c:214
+msgid "Failed to stream mail message content to SpamAssassin: "
+msgstr ""
+"No s'ha pogut transmetre el contingut del correu electrÃnic a "
+"l'SpamAssassin: "
+
+#: ../modules/spamassassin/evolution-spamassassin.c:233
+#, c-format
+msgid "Failed to write '%s' to SpamAssassin: "
+msgstr "No s'ha pogut escriure Â%sÂ a l'SpamAssassin: "
+
+#: ../modules/spamassassin/evolution-spamassassin.c:261
+msgid "Failed to read output from SpamAssassin: "
+msgstr "No s'ha pogut llegir la sortida de l'SpamAssassin: "
+
+#: ../modules/spamassassin/evolution-spamassassin.c:316
+msgid "SpamAssassin either crashed or failed to process a mail message"
+msgstr ""
+"L'SpamAssassin ha fallat, o bÃ, no ha pogut processar el correu electrÃnic"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:835
+msgid "SpamAssassin Options"
+msgstr "Opcions de l'SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:850
+msgid "I_nclude remote tests"
+msgstr "I_nclou proves remotes"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:864
+msgid "This will make SpamAssassin more reliable, but slower."
+msgstr "AixÃ farÃ que l'SpamAssassin sigui mÃs fiable, perÃ mÃs lent."
+
+#: ../modules/spamassassin/evolution-spamassassin.c:1073
+msgid "SpamAssassin"
+msgstr "SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+msgid "Use SpamAssassin daemon and client"
+msgstr "Utilitza el client i el dimoni de l'SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "Utilitza el client i el dimoni de l'SpamAssassin (spamc/spamd)."
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
+msgid "Use only local spam tests."
+msgstr "Fes nomÃs proves de correu no desitjat locals."
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
+msgid "Use only the local spam tests (no DNS)."
+msgstr "Fes nomÃs proves de correu no desitjat locals (no DNS)."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:277
-#: ../widgets/misc/e-import-assistant.c:392
+#: ../modules/startup-wizard/evolution-startup-wizard.c:280
+#: ../widgets/misc/e-import-assistant.c:396
 msgid "Please select the information that you would like to import:"
 msgstr "Seleccioneu la informaciÃ que voleu importar:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:309
-#: ../widgets/misc/e-import-assistant.c:548
+#: ../modules/startup-wizard/evolution-startup-wizard.c:312
+#: ../widgets/misc/e-import-assistant.c:552
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:320
-#: ../modules/startup-wizard/evolution-startup-wizard.c:417
+#: ../modules/startup-wizard/evolution-startup-wizard.c:323
+#: ../modules/startup-wizard/evolution-startup-wizard.c:421
 msgid "Importing Files"
 msgstr "ImportaciÃ de fitxers"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:395
+#: ../modules/startup-wizard/evolution-startup-wizard.c:399
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr "S'ha cancelÂlat la importaciÃ. Feu clic a ÂEndavantÂ per continuar."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:413
+#: ../modules/startup-wizard/evolution-startup-wizard.c:417
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr "S'ha completat la importaciÃ. Feu clic a ÂEndavantÂ per continuar."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:487
+#: ../modules/startup-wizard/evolution-startup-wizard.c:497
 msgid "Evolution Setup Assistant"
 msgstr "Auxiliar de la configuraciÃ de l'Evolution"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:493
+#: ../modules/startup-wizard/evolution-startup-wizard.c:503
 msgid "Welcome"
 msgstr "Us donem la benvinguda"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:498
+#: ../modules/startup-wizard/evolution-startup-wizard.c:508
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -16171,6 +16345,10 @@ msgstr ""
 "\n"
 "Feu clic a ÂEndavantÂ per continuar."
 
+#: ../modules/startup-wizard/evolution-startup-wizard.c:613
+msgid "Loading accounts..."
+msgstr "S'estan carregant els comptes..."
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
 msgstr "Afegeix llibretes d'adreces locals a l'Evolution."
@@ -16187,12 +16365,12 @@ msgstr ""
 "Llista de pistes que el connector de recordatori d'adjuncions cercarÃ en el "
 "cos del missatge"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "No _tornis a mostrar aquest missatge."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:453
-#: ../plugins/templates/templates.c:411
+#: ../plugins/attachment-reminder/attachment-reminder.c:464
+#: ../plugins/templates/templates.c:462
 msgid "Keywords"
 msgstr "Paraules clau"
 
@@ -16209,7 +16387,6 @@ msgid "Message has no attachments"
 msgstr "El missatge no tÃ cap fitxer adjunt"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
-#, fuzzy
 msgid "_Add Attachment..."
 msgstr "_Afegeix una adjunciÃ..."
 
@@ -16236,25 +16413,25 @@ msgid "Play audio attachments directly in mail messages."
 msgstr ""
 "Reprodueix les adjuncions d'Ãudio directament des dels missatges de correu."
 
-#: ../plugins/backup-restore/backup-restore.c:186
+#: ../plugins/backup-restore/backup-restore.c:192
 msgid "Select name of the Evolution backup file"
 msgstr "Seleccioneu el nom del fitxer de cÃpia de seguretat de l'Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:219
+#: ../plugins/backup-restore/backup-restore.c:225
 msgid "_Restart Evolution after backup"
 msgstr "_Reinicia l'Evolution desprÃs de la cÃpia de seguretat"
 
-#: ../plugins/backup-restore/backup-restore.c:245
+#: ../plugins/backup-restore/backup-restore.c:251
 msgid "Select name of the Evolution backup file to restore"
 msgstr ""
 "Seleccioneu el nom del fitxer de cÃpia de seguretat de l'Evolution a "
 "restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:258
+#: ../plugins/backup-restore/backup-restore.c:264
 msgid "_Restart Evolution after restore"
 msgstr "_Reinicia l'Evolution desprÃs de restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:326
+#: ../plugins/backup-restore/backup-restore.c:337
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -16265,148 +16442,149 @@ msgstr ""
 "anotacions i els contactes. TambÃ permet la restauraciÃ de la vostra "
 "configuraciÃ personal, els filtres de correu, etc."
 
-#: ../plugins/backup-restore/backup-restore.c:333
+#: ../plugins/backup-restore/backup-restore.c:344
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restaura l'Evolution a partir del fitxer de cÃpia de seguretat"
 
-#: ../plugins/backup-restore/backup-restore.c:340
+#: ../plugins/backup-restore/backup-restore.c:351
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Seleccioneu l'arxiu de l'Evolution a restaurar:"
 
-#: ../plugins/backup-restore/backup-restore.c:343
+#: ../plugins/backup-restore/backup-restore.c:354
 msgid "Choose a file to restore"
 msgstr "Trieu un fitxer a restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:351
+#: ../plugins/backup-restore/backup-restore.c:362
 msgid "Restore from backup"
 msgstr "Restaura a partir de la cÃpia de seguretat"
 
-#: ../plugins/backup-restore/backup-restore.c:389
+#: ../plugins/backup-restore/backup-restore.c:402
 msgid "_Back up Evolution Data..."
 msgstr "_Fes una cÃpia de seguretat de les dades de l'Evolution..."
 
-#: ../plugins/backup-restore/backup-restore.c:391
+#: ../plugins/backup-restore/backup-restore.c:404
 msgid "Back up Evolution data and settings to an archive file"
 msgstr ""
 "Fes una cÃpia de seguretat de les dades i la configuraciÃ de l'Evolution en "
 "un fitxer d'arxiu"
 
-#: ../plugins/backup-restore/backup-restore.c:396
+#: ../plugins/backup-restore/backup-restore.c:409
 msgid "R_estore Evolution Data..."
 msgstr "R_estaura una cÃpia de seguretat de les dades de l'Evolution..."
 
-#: ../plugins/backup-restore/backup-restore.c:398
+#: ../plugins/backup-restore/backup-restore.c:411
 msgid "Restore Evolution data and settings from an archive file"
 msgstr ""
 "Copia i restaura les dades i la configuraciÃ de l'Evolution a partir d'un "
 "fitxer d'arxiu"
 
-#: ../plugins/backup-restore/backup.c:79
+#: ../plugins/backup-restore/backup.c:77
 msgid "Back up Evolution directory"
 msgstr "Fes una cÃpia de seguretat del directori de l'Evolution"
 
-#: ../plugins/backup-restore/backup.c:81
+#: ../plugins/backup-restore/backup.c:79
 msgid "Restore Evolution directory"
 msgstr "Restaura el directori de l'Evolution"
 
-#: ../plugins/backup-restore/backup.c:83
+#: ../plugins/backup-restore/backup.c:81
 msgid "Check Evolution Back up"
 msgstr "Comprova la cÃpia de seguretat de l'Evolution"
 
-#: ../plugins/backup-restore/backup.c:85
+#: ../plugins/backup-restore/backup.c:83
 msgid "Restart Evolution"
 msgstr "Reinicia l'Evolution"
 
-#: ../plugins/backup-restore/backup.c:87
+#: ../plugins/backup-restore/backup.c:85
 msgid "With Graphical User Interface"
 msgstr "Amb interfÃcie grÃfica d'usuari"
 
-#: ../plugins/backup-restore/backup.c:289
-#: ../plugins/backup-restore/backup.c:399
+#. FIXME Will the versioned setting always work?
+#: ../plugins/backup-restore/backup.c:299
+#: ../plugins/backup-restore/backup.c:418
 msgid "Shutting down Evolution"
 msgstr "S'estÃ sortint de l'Evolution"
 
-#: ../plugins/backup-restore/backup.c:296
+#: ../plugins/backup-restore/backup.c:308
 msgid "Backing Evolution accounts and settings"
 msgstr ""
 "S'estÃ fent una cÃpia de seguretat dels comptes i la configuraciÃ de "
 "l'Evolution"
 
-#: ../plugins/backup-restore/backup.c:304
+#: ../plugins/backup-restore/backup.c:318
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "S'estÃ fent una cÃpia de seguretat de les dades de l'Evolution (Correu, "
 "Contactes, Calendari, Tasques, Anotacions)"
 
-#: ../plugins/backup-restore/backup.c:317
+#: ../plugins/backup-restore/backup.c:331
 msgid "Back up complete"
 msgstr "S'ha completat la cÃpia de seguretat"
 
-#: ../plugins/backup-restore/backup.c:322
-#: ../plugins/backup-restore/backup.c:496
+#: ../plugins/backup-restore/backup.c:338
+#: ../plugins/backup-restore/backup.c:527
 msgid "Restarting Evolution"
 msgstr "S'estÃ reiniciant l'Evolution"
 
-#: ../plugins/backup-restore/backup.c:403
+#: ../plugins/backup-restore/backup.c:424
 msgid "Back up current Evolution data"
 msgstr "Fes una cÃpia de seguretat de les dades de l'Evolution"
 
-#: ../plugins/backup-restore/backup.c:409
+#: ../plugins/backup-restore/backup.c:432
 msgid "Extracting files from back up"
 msgstr "S'estan extraient els fitxers de la cÃpia de seguretat"
 
-#: ../plugins/backup-restore/backup.c:466
+#: ../plugins/backup-restore/backup.c:491
 msgid "Loading Evolution settings"
 msgstr "S'estÃ carregant la configuraciÃ de l'Evolution"
 
-#: ../plugins/backup-restore/backup.c:481
+#: ../plugins/backup-restore/backup.c:508
 msgid "Removing temporary back up files"
 msgstr "S'estan suprimint els fitxers de cÃpia de seguretat temporals"
 
 # FIXME (dpm)
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:520
 msgid "Ensuring local sources"
 msgstr "ComprovaciÃ de les fonts originals"
 
-#: ../plugins/backup-restore/backup.c:678
+#: ../plugins/backup-restore/backup.c:707
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "S'estÃ fent una cÃpia de seguretat a la carpeta %s"
 
-#: ../plugins/backup-restore/backup.c:683
+#: ../plugins/backup-restore/backup.c:712
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "S'estÃ restaurant la cÃpia de seguretat de la carpeta %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:705
+#: ../plugins/backup-restore/backup.c:736
 msgid "Evolution Back up"
 msgstr "CÃpia de seguretat de l'Evolution"
 
-#: ../plugins/backup-restore/backup.c:705
+#: ../plugins/backup-restore/backup.c:736
 msgid "Evolution Restore"
 msgstr "RestauraciÃ de l'Evolution"
 
-#: ../plugins/backup-restore/backup.c:743
+#: ../plugins/backup-restore/backup.c:774
 msgid "Backing up Evolution Data"
 msgstr "S'estÃ fent una cÃpia de seguretat de les dades de l'Evolution"
 
-#: ../plugins/backup-restore/backup.c:744
+#: ../plugins/backup-restore/backup.c:775
 msgid "Please wait while Evolution is backing up your data."
 msgstr ""
 "Espereu mentre l'Evolution fa una cÃpia de seguretat de les vostres dades."
 
-#: ../plugins/backup-restore/backup.c:746
+#: ../plugins/backup-restore/backup.c:777
 msgid "Restoring Evolution Data"
 msgstr "S'estÃ restaurant la cÃpia de seguretat de les dades de l'Evolution"
 
-#: ../plugins/backup-restore/backup.c:747
+#: ../plugins/backup-restore/backup.c:778
 msgid "Please wait while Evolution is restoring your data."
 msgstr ""
 "Espereu mentre l'Evolution restaura la cÃpia de seguretat de les vostres "
 "dades."
 
-#: ../plugins/backup-restore/backup.c:765
+#: ../plugins/backup-restore/backup.c:796
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Depenent de la quantitat de dades del vostre compte, aixÃ pot trigar una "
@@ -16479,37 +16657,37 @@ msgstr ""
 "suprimirÃ totes les vostres dades i parÃmetres de l'Evolution i les "
 "restaurarÃ a partir de la cÃpia de seguretat."
 
-#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
+#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contactes automÃtics"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:709
+#: ../plugins/bbdb/bbdb.c:710
 msgid "Create _address book entries when sending mails"
 msgstr "Crea _entrades a la llibreta d'adreces en enviar correus"
 
-#: ../plugins/bbdb/bbdb.c:715
+#: ../plugins/bbdb/bbdb.c:716
 msgid "Select Address book for Automatic Contacts"
 msgstr "Seleccioneu la llibreta d'adreces per als contactes automÃtics"
 
-#: ../plugins/bbdb/bbdb.c:730
+#: ../plugins/bbdb/bbdb.c:731
 msgid "Instant Messaging Contacts"
 msgstr "Contactes de la missatgeria instantÃnia"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:745
+#: ../plugins/bbdb/bbdb.c:746
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "Sincronit_za la informaciÃ de contactes i les imatges de la llista d'amics "
 "del Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:751
+#: ../plugins/bbdb/bbdb.c:752
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Seleccioneu la llibreta d'adreces per a la llista d'amics del Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:762
+#: ../plugins/bbdb/bbdb.c:763
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronitza amb la me_va llista d'amics"
 
@@ -16531,74 +16709,15 @@ msgstr ""
 "electrÃniques en respondre als correus. TambÃ omple la informaciÃ de "
 "contactes de missatgeria instantÃnia a partir de la vostra llista d'amics."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:163
-#, c-format
-msgid "Bogofilter is not available. Please install it first."
-msgstr ""
-"El Bogofilter no estÃ disponible, per la qual cosa l'haurÃeu d'instalÂlar "
-"abans."
-
-#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:167
-#, c-format
-msgid "Error occurred while spawning %s: %s."
-msgstr "S'ha produÃt un error en executar %s: %s."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:196
-#, c-format
-msgid "Bogofilter child process does not respond, killing..."
-msgstr "El procÃs fill del Bogofilter no respon; se suprimirÃ..."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:198
-#, c-format
-msgid "Wait for Bogofilter child process interrupted, terminating..."
-msgstr ""
-"S'ha interromput l'espera per al procÃs fill del Bogofilter; es terminarÃ..."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:221
-#, c-format
-msgid "Pipe to Bogofilter failed, error code: %d."
-msgstr ""
-"Ha fallat la creaciÃ d'un conducte cap al Bogofilter; el codi d'error fou: "
-"%d."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:406
-msgid "Convert message text to _Unicode"
-msgstr "Converteix el text del missatge a _Unicode"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
-msgid "Convert mail messages to Unicode"
-msgstr "Converteix el text dels correus a Unicode"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
-msgstr ""
-"Converteix el text dels missatges a Unicode (codificaciÃ UTF-8) per unificar "
-"els elements de spam/ham provinents de jocs de carÃcters diferents."
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Junk Filter"
-msgstr "Filtrador de correu brossa Bogofilter"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter Options"
-msgstr "Opcions del Bogofilter"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filter junk messages using Bogofilter."
-msgstr "Filtra els missatges de correu brossa amb el Bogofilter."
-
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:214
 msgid "Authentication failed. Server requires correct login."
 msgstr "Ha fallat l'autenticaciÃ. El servidor requereix una entrada correcta."
 
-#: ../plugins/caldav/caldav-browse-server.c:206
+#: ../plugins/caldav/caldav-browse-server.c:216
 msgid "Given URL cannot be found."
 msgstr "No es pot trobar l'URL especificat."
 
-#: ../plugins/caldav/caldav-browse-server.c:210
+#: ../plugins/caldav/caldav-browse-server.c:220
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16607,118 +16726,119 @@ msgstr ""
 "El servidor ha retornat dades inesperades.\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:340
-#: ../plugins/caldav/caldav-browse-server.c:664
+#: ../plugins/caldav/caldav-browse-server.c:360
+#: ../plugins/caldav/caldav-browse-server.c:694
 msgid "Failed to parse server response."
 msgstr "No s'ha pogut processar la resposta del servidor."
 
-#: ../plugins/caldav/caldav-browse-server.c:434
+#: ../plugins/caldav/caldav-browse-server.c:454
 msgid "Events"
 msgstr "Esdeveniments"
 
-#: ../plugins/caldav/caldav-browse-server.c:456
+#: ../plugins/caldav/caldav-browse-server.c:476
 msgid "User's calendars"
 msgstr "Calendaris de l'usuari"
 
-#: ../plugins/caldav/caldav-browse-server.c:565
-#: ../plugins/caldav/caldav-browse-server.c:733
+#: ../plugins/caldav/caldav-browse-server.c:588
+#: ../plugins/caldav/caldav-browse-server.c:763
 msgid "Failed to get server URL."
 msgstr "No es pot obtenir l'URL del servidor."
 
-#: ../plugins/caldav/caldav-browse-server.c:731
-#: ../plugins/caldav/caldav-browse-server.c:772
-#: ../plugins/caldav/caldav-browse-server.c:1431
+#: ../plugins/caldav/caldav-browse-server.c:761
+#: ../plugins/caldav/caldav-browse-server.c:802
+#: ../plugins/caldav/caldav-browse-server.c:1493
 msgid "Searching for user's calendars..."
 msgstr "S'estan cercant els calendaris de l'usuari..."
 
-#: ../plugins/caldav/caldav-browse-server.c:770
+#: ../plugins/caldav/caldav-browse-server.c:800
 msgid "Could not find any user calendar."
 msgstr "No s'ha pogut trobat cap calendari d'usuari."
 
-#: ../plugins/caldav/caldav-browse-server.c:902
+#: ../plugins/caldav/caldav-browse-server.c:938
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr "Ha fallat l'intent anterior: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:904
+#: ../plugins/caldav/caldav-browse-server.c:940
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr "Ha fallat l'intent anterior amb el codi: %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:909
+#: ../plugins/caldav/caldav-browse-server.c:945
 #, c-format
 msgid "Enter password for user %s on server %s"
 msgstr "IntroduÃu la contrasenya per a l'usuari %s al servidor %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:968
+#: ../plugins/caldav/caldav-browse-server.c:1008
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "No s'ha pogut crear el missatge ÂsoupÂ per a l'URL Â%sÂ"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1214
+#: ../plugins/caldav/caldav-browse-server.c:1266
 msgid "Searching folder content..."
 msgstr "S'estÃ cercant el contingut de la carpeta..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1263
-#: ../plugins/caldav/caldav-source.c:256
+#: ../plugins/caldav/caldav-browse-server.c:1325
+#: ../plugins/caldav/caldav-source.c:261
 msgid "Server _handles meeting invitations"
 msgstr "El servidor _gestiona invitacions de reuniÃ"
 
-#: ../plugins/caldav/caldav-browse-server.c:1270
+#: ../plugins/caldav/caldav-browse-server.c:1332
 msgid "List of available calendars:"
 msgstr "Llista de calendaris disponibles:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1308
+#: ../plugins/caldav/caldav-browse-server.c:1370
 msgid "Supports"
 msgstr "Admet"
 
-#: ../plugins/caldav/caldav-browse-server.c:1335
-#: ../plugins/caldav/caldav-source.c:254
-msgid "User e-_mail:"
+#: ../plugins/caldav/caldav-browse-server.c:1397
+#: ../plugins/caldav/caldav-source.c:259
+msgid "User e_mail:"
 msgstr "AdreÃa electrÃnica de l'_usuari:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1407
+#: ../plugins/caldav/caldav-browse-server.c:1469
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "No s'ha pogut crear el fil: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1516
+#: ../plugins/caldav/caldav-browse-server.c:1585
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "L'URL del servidor Â%sÂ no Ãs vÃlid"
 
-#: ../plugins/caldav/caldav-browse-server.c:1522
+#: ../plugins/caldav/caldav-browse-server.c:1591
 msgid "Browse for a CalDAV calendar"
 msgstr "Navega per un calendari CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:235
-#: ../plugins/calendar-http/calendar-http.c:100
+#: ../plugins/caldav/caldav-source.c:240
+#: ../plugins/calendar-http/calendar-http.c:107
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:242
-#: ../plugins/google-account-setup/google-contacts-source.c:349
-msgid "Use _SSL"
-msgstr "Utilitza l'_SSL"
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:145
+#: ../plugins/google-account-setup/google-contacts-source.c:359
+msgid "Use _secure connection"
+msgstr "_Utilitza una connexiÃ segura"
 
-#: ../plugins/caldav/caldav-source.c:244
-#: ../plugins/google-account-setup/google-contacts-source.c:327
-#: ../plugins/google-account-setup/google-source.c:638
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:268
+#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/google-account-setup/google-contacts-source.c:337
+#: ../plugins/google-account-setup/google-source.c:669
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:269
 msgid "User_name:"
 msgstr "Nom d'_usuari:"
 
-#: ../plugins/caldav/caldav-source.c:259
+#: ../plugins/caldav/caldav-source.c:264
 msgid "Brows_e server for a calendar"
 msgstr "Nave_ga pel servidor per cercar un calendari"
 
-#: ../plugins/caldav/caldav-source.c:277
-#: ../plugins/calendar-file/calendar-file.c:191
-#: ../plugins/calendar-http/calendar-http.c:119
-#: ../plugins/calendar-weather/calendar-weather.c:399
-#: ../plugins/google-account-setup/google-contacts-source.c:367
-#: ../plugins/google-account-setup/google-source.c:645
+#: ../plugins/caldav/caldav-source.c:282
+#: ../plugins/calendar-file/calendar-file.c:204
+#: ../plugins/calendar-http/calendar-http.c:129
+#: ../plugins/calendar-weather/calendar-weather.c:421
+#: ../plugins/google-account-setup/google-contacts-source.c:377
+#: ../plugins/google-account-setup/google-source.c:675
 msgid "Re_fresh:"
 msgstr "Re_fresca:"
 
@@ -16730,31 +16850,31 @@ msgstr "Afegeix compatibilitat amb el CalDAV a l'Evolution."
 msgid "CalDAV Support"
 msgstr "Compatibilitat CalDAV"
 
-#: ../plugins/calendar-file/calendar-file.c:125
+#: ../plugins/calendar-file/calendar-file.c:134
 msgid "_Customize options"
 msgstr "_Personalitza les opcions"
 
-#: ../plugins/calendar-file/calendar-file.c:144
+#: ../plugins/calendar-file/calendar-file.c:153
 msgid "File _name:"
 msgstr "_Nom del fitxer:"
 
-#: ../plugins/calendar-file/calendar-file.c:148
+#: ../plugins/calendar-file/calendar-file.c:157
 msgid "Choose calendar file"
 msgstr "Trieu un fitxer de calendari"
 
-#: ../plugins/calendar-file/calendar-file.c:196
+#: ../plugins/calendar-file/calendar-file.c:209
 msgid "On open"
 msgstr "En obrir"
 
-#: ../plugins/calendar-file/calendar-file.c:197
+#: ../plugins/calendar-file/calendar-file.c:210
 msgid "On file change"
 msgstr "En produir-se canvis al fitxer"
 
-#: ../plugins/calendar-file/calendar-file.c:198
+#: ../plugins/calendar-file/calendar-file.c:211
 msgid "Periodically"
 msgstr "De manera periÃdica"
 
-#: ../plugins/calendar-file/calendar-file.c:213
+#: ../plugins/calendar-file/calendar-file.c:228
 msgid "Force read _only"
 msgstr "ForÃa la n_omÃs lectura"
 
@@ -16766,11 +16886,7 @@ msgstr "Afegeix calendaris locals a l'Evolution."
 msgid "Local Calendars"
 msgstr "Calendaris locals"
 
-#: ../plugins/calendar-http/calendar-http.c:134
-msgid "_Secure connection"
-msgstr "Utilitza una connexiÃ _segura"
-
-#: ../plugins/calendar-http/calendar-http.c:194
+#: ../plugins/calendar-http/calendar-http.c:207
 msgid "Userna_me:"
 msgstr "Nom d'_usuari:"
 
@@ -16782,62 +16898,62 @@ msgstr "Afegeix calendaris web a l'Evolution."
 msgid "Web Calendars"
 msgstr "Calendaris web"
 
-#: ../plugins/calendar-weather/calendar-weather.c:60
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Fog"
 msgstr "Temps: boira"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Cloudy"
 msgstr "Temps: amb nÃvols"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Cloudy Night"
 msgstr "Temps: nit amb nÃvols"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Overcast"
 msgstr "Temps: cel cobert"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Showers"
 msgstr "Temps: ruixats"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:70
 msgid "Weather: Snow"
 msgstr "Temps: neu"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:71
 msgid "Weather: Sunny"
 msgstr "Temps: sol"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:72
 msgid "Weather: Clear Night"
 msgstr "Temps: nit clara"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:73
 msgid "Weather: Thunderstorms"
 msgstr "Temps: llamps i trons"
 
-#: ../plugins/calendar-weather/calendar-weather.c:226
+#: ../plugins/calendar-weather/calendar-weather.c:239
 msgid "Select a location"
 msgstr "Seleccioneu una ubicaciÃ"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:332
-#: ../plugins/calendar-weather/calendar-weather.c:377
+#: ../plugins/calendar-weather/calendar-weather.c:350
+#: ../plugins/calendar-weather/calendar-weather.c:398
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "Cap"
 
-#: ../plugins/calendar-weather/calendar-weather.c:452
+#: ../plugins/calendar-weather/calendar-weather.c:477
 msgid "_Units:"
 msgstr "_Unitats:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:461
+#: ../plugins/calendar-weather/calendar-weather.c:486
 msgid "Metric (Celsius, cm, etc)"
 msgstr "MÃtriques (Celsius, cm, etc)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:464
+#: ../plugins/calendar-weather/calendar-weather.c:489
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperials (Fahrenheit, polzades, etc)"
 
@@ -16849,25 +16965,7 @@ msgstr "Afegiu calendaris meteorolÃgics a l'Evolution."
 msgid "Weather Calendars"
 msgstr "Calendaris meteorolÃgics"
 
-#: ../plugins/contacts-map/contacts-map.c:55
-#: ../plugins/contacts-map/contacts-map.c:201
-msgid "Contacts map"
-msgstr "Mapa de contactes"
-
-#: ../plugins/contacts-map/contacts-map.c:56
-msgid "Show a map of all the contacts"
-msgstr "Mostra un mapa de tots els contactes"
-
-#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
-msgid "Add a map showing the location of contacts when possible."
-msgstr ""
-"Afegeix un mapa que mostri la ubicaciÃ dels contactes quan sigui possible."
-
-#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
-msgid "Map for contacts"
-msgstr "Mapa dels contactes"
-
-#: ../plugins/dbx-import/dbx-importer.c:273
+#: ../plugins/dbx-import/dbx-importer.c:284
 msgid "Importing Outlook Express data"
 msgstr "S'estan important les dades de l'Outlook Express"
 
@@ -16883,34 +16981,34 @@ msgstr "Importador de DBX de l'Outlook"
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr "Carpetes personals de l'Outlook Express 5/6 (.dbx)"
 
-#: ../plugins/default-source/default-source.c:83
+#: ../plugins/default-source/default-source.c:168
 msgid "Mark as _default address book"
 msgstr "Marca-la com a llibreta d'adreces pre_determinada"
 
-#: ../plugins/default-source/default-source.c:96
+#: ../plugins/default-source/default-source.c:182
 msgid "A_utocomplete with this address book"
 msgstr "Fes la compleciÃ aut_omÃtica amb aquesta llibreta d'adreces"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:191
 msgid "Mark as _default calendar"
 msgstr "Marca'l com a calendari pre_determinat"
 
-#: ../plugins/default-source/default-source.c:106
+#: ../plugins/default-source/default-source.c:192
 msgid "Mark as _default task list"
 msgstr "Marca-la com a llista de tasques pre_determinada"
 
-#: ../plugins/default-source/default-source.c:107
+#: ../plugins/default-source/default-source.c:193
 msgid "Mark as _default memo list"
 msgstr "Marca-la com a llista d'anotacions pre_determinada"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
-msgstr "Fonts predeterminades"
+msgstr "Fonts per defecte"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
 msgid "Mark your preferred address book and calendar as default."
 msgstr ""
-"Marqueu la llibreta d'adreces i el calendari preferits com a predeterminats."
+"Marqueu la llibreta d'adreces i el calendari preferits com a per defecte."
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
 msgid "List of Custom Headers"
@@ -16927,52 +17025,52 @@ msgstr ""
 "valor Ãs: el nom de la capÃalera seguit del signe d'igualtat (Â=Â) i els "
 "valors separats per punts i comes (Â;Â)"
 
-#: ../plugins/email-custom-header/email-custom-header.c:316
+#: ../plugins/email-custom-header/email-custom-header.c:322
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Seguretat:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:320
+#: ../plugins/email-custom-header/email-custom-header.c:326
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Personal"
 
-#: ../plugins/email-custom-header/email-custom-header.c:321
+#: ../plugins/email-custom-header/email-custom-header.c:327
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Sense classificar"
 
-#: ../plugins/email-custom-header/email-custom-header.c:322
+#: ../plugins/email-custom-header/email-custom-header.c:328
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Protegit"
 
-#: ../plugins/email-custom-header/email-custom-header.c:323
+#: ../plugins/email-custom-header/email-custom-header.c:329
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../plugins/email-custom-header/email-custom-header.c:330
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Secret"
 
-#: ../plugins/email-custom-header/email-custom-header.c:325
+#: ../plugins/email-custom-header/email-custom-header.c:331
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Alt secret"
 
-#: ../plugins/email-custom-header/email-custom-header.c:382
+#: ../plugins/email-custom-header/email-custom-header.c:388
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "Cap"
 
-#: ../plugins/email-custom-header/email-custom-header.c:574
+#: ../plugins/email-custom-header/email-custom-header.c:584
 msgid "_Custom Header"
 msgstr "CapÃalera personalit_zada"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:833
+#: ../plugins/email-custom-header/email-custom-header.c:847
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16981,12 +17079,12 @@ msgstr ""
 "personalitzada Ãs:\n"
 "Nom dels valors de clau de capÃalera personalitzada separats per Â;Â."
 
-#: ../plugins/email-custom-header/email-custom-header.c:887
+#: ../plugins/email-custom-header/email-custom-header.c:901
 msgid "Key"
 msgstr "Clau"
 
-#: ../plugins/email-custom-header/email-custom-header.c:903
-#: ../plugins/templates/templates.c:417
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:468
 msgid "Values"
 msgstr "Valors"
 
@@ -17009,23 +17107,23 @@ msgstr ""
 "Inicia automÃticament l'editor en prÃmer una tecla al redactor de correu"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:125
+#: ../plugins/external-editor/external-editor.c:132
 msgid "Automatically launch when a new mail is edited"
 msgstr "Inicia'l automÃticament en editar un correu nou"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 msgid "Default External Editor"
-msgstr "Editor extern predeterminat"
+msgstr "Editor extern per defecte"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
 msgid "The default command that must be used as the editor."
-msgstr "L'ordre predeterminada a utilitzar com a editor."
+msgstr "L'ordre per defecte a utilitzar com a editor."
 
-#: ../plugins/external-editor/external-editor.c:114
+#: ../plugins/external-editor/external-editor.c:121
 msgid "Command to be executed to launch the editor: "
 msgstr "Ordre a executar per iniciar l'editor: "
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:122
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -17033,8 +17131,8 @@ msgstr ""
 "Utilitzeu ÂxemacsÂ per a l'Emacs\n"
 "Utilitzeu Âgvim -fÂ per al VI"
 
-#: ../plugins/external-editor/external-editor.c:381
-#: ../plugins/external-editor/external-editor.c:383
+#: ../plugins/external-editor/external-editor.c:402
+#: ../plugins/external-editor/external-editor.c:404
 msgid "Compose in External Editor"
 msgstr "RedacciÃ en un editor extern"
 
@@ -17084,34 +17182,34 @@ msgstr ""
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
 msgid "Insert Face picture by default"
-msgstr "Afegeix una foto de la cara de manera predeterminada"
+msgstr "Afegeix una foto de la cara per defecte"
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
 msgid ""
 "Whether insert Face picture to outgoing messages by default. The picture "
 "should be set before checking this, otherwise nothing happens."
 msgstr ""
-"Si de manera predeterminada s'ha d'inserir una imatge de cara als missatges "
-"que s'enviÃn. La imatge s'haurÃ d'establir abans de seleccionar aquesta "
-"opciÃ, atÃs que en cas contrari no s'utilitzarÃ."
+"Si per defecte s'ha d'inserir una imatge de cara als missatges que s'enviÃn. "
+"La imatge s'haurÃ d'establir abans de seleccionar aquesta opciÃ, atÃs que en "
+"cas contrari no s'utilitzarÃ."
 
-#: ../plugins/face/face.c:286
+#: ../plugins/face/face.c:292
 msgid "Select a Face Picture"
 msgstr "Seleccioneu un fitxer de cara"
 
-#: ../plugins/face/face.c:296
+#: ../plugins/face/face.c:302
 msgid "Image files"
 msgstr "Fitxers d'imatge"
 
-#: ../plugins/face/face.c:352
+#: ../plugins/face/face.c:359
 msgid "_Insert Face picture by default"
-msgstr "_Afegeix una foto de la cara de manera predeterminada"
+msgstr "_Afegeix una foto de la cara per defecte"
 
-#: ../plugins/face/face.c:363
+#: ../plugins/face/face.c:370
 msgid "Load new _Face picture"
 msgstr "Carrega una nova imatge de _cara"
 
-#: ../plugins/face/face.c:420
+#: ../plugins/face/face.c:429
 msgid "Include _Face"
 msgstr "Inclou la _cara"
 
@@ -17145,501 +17243,48 @@ msgstr ""
 "El fitxer que heu seleccionat no sembla ser una imatge .png vÃlida. Error: "
 "{0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:315
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:244
+#: ../plugins/google-account-setup/google-contacts-source.c:325
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
 msgid "Server"
 msgstr "Servidor"
 
-#: ../plugins/google-account-setup/google-source.c:438
+#: ../plugins/google-account-setup/google-source.c:459
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "IntroduÃu la contrasenya de l'usuari %s per accedir a la llista de "
-"subscripcions a calendaris."
-
-#: ../plugins/google-account-setup/google-source.c:549
-#, c-format
-msgid ""
-"Cannot read data from Google server.\n"
-"%s"
-msgstr ""
-"No es poden llegir les dades del servidor del Google.\n"
-"%s"
-
-#: ../plugins/google-account-setup/google-source.c:549
-#: ../plugins/mail-to-task/mail-to-task.c:737
-#: ../plugins/mail-to-task/mail-to-task.c:956
-msgid "Unknown error."
-msgstr "S'ha produÃt un error desconegut."
-
-#: ../plugins/google-account-setup/google-source.c:649
-msgid "Cal_endar:"
-msgstr "_Calendari:"
-
-#: ../plugins/google-account-setup/google-source.c:684
-msgid "Retrieve _List"
-msgstr "Recupera la _llista"
-
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "Add Google Calendars to Evolution."
-msgstr "Afegiu calendaris del Google a l'Evolution."
-
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Google Calendars"
-msgstr "Calendaris del Google"
-
-#: ../plugins/groupwise-features/camel-gw-listener.c:453
-msgid "Checklist"
-msgstr "Llista de comprovaciÃ"
-
-#. Translators: First %s is the server name, second %s is user name
-#: ../plugins/groupwise-features/camel-gw-listener.c:513
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "IntroduÃu la contrasenya per a %s (usuari %s)"
-
-#: ../plugins/groupwise-features/camel-gw-listener.c:533
-msgid "Failed to authenticate.\n"
-msgstr "S'ha produÃt un error en l'autenticaciÃ.\n"
-
-#: ../plugins/groupwise-features/gw-ui.c:112
-msgid "New _Shared Folder..."
-msgstr "_Carpeta compartida nova..."
-
-#: ../plugins/groupwise-features/gw-ui.c:119
-msgid "_Proxy Login..."
-msgstr "Entrada com a _delegat..."
-
-#: ../plugins/groupwise-features/gw-ui.c:170
-msgid "Junk Mail Settings..."
-msgstr "ConfiguraciÃ del correu brossa..."
-
-#: ../plugins/groupwise-features/gw-ui.c:177
-msgid "Track Message Status..."
-msgstr "Segueix l'estat del missatge..."
-
-#: ../plugins/groupwise-features/gw-ui.c:183
-msgid "Retract Mail"
-msgstr "Retira el correu"
-
-#: ../plugins/groupwise-features/gw-ui.c:331
-msgid "Accept"
-msgstr "Accepta"
-
-#: ../plugins/groupwise-features/gw-ui.c:338
-msgid "Accept Tentatively"
-msgstr "Accepta provisionalment"
-
-#: ../plugins/groupwise-features/gw-ui.c:345
-msgid "Decline"
-msgstr "Declina"
-
-#: ../plugins/groupwise-features/gw-ui.c:352
-msgid "Rese_nd Meeting..."
-msgstr "Tor_na a enviar una reuniÃ..."
-
-#: ../plugins/groupwise-features/install-shared.c:178
-#: ../plugins/groupwise-features/share-folder-common.c:353
-msgid "Create folder"
-msgstr "Crea una carpeta"
-
-#: ../plugins/groupwise-features/install-shared.c:230
-#, c-format
-msgid ""
-"The user '%s' has shared a folder with you\n"
-"\n"
-"Message from '%s'\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"\n"
-"Click 'Apply' to install the shared folder\n"
-"\n"
-msgstr ""
-"L'usuari Â%sÂ comparteix una carpeta amb vÃs\n"
-"\n"
-"El missatge de Â%sÂ\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"\n"
-"Feu clic a ÂAplicaÂ per instalÂlar la carpeta compartida\n"
-
-#: ../plugins/groupwise-features/install-shared.c:242
-msgid "Install the shared folder"
-msgstr "InstalÂla la carpeta compartida"
-
-#: ../plugins/groupwise-features/install-shared.c:246
-msgid "Shared Folder Installation"
-msgstr "InstalÂlaciÃ de la carpeta compartida"
-
-#: ../plugins/groupwise-features/junk-mail-settings.c:82
-msgid "Junk Settings"
-msgstr "ConfiguraciÃ del correu brossa"
-
-#: ../plugins/groupwise-features/junk-mail-settings.c:96
-#: ../plugins/groupwise-features/junk-settings.ui.h:3
-msgid "Junk Mail Settings"
-msgstr "ConfiguraciÃ del correu brossa"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:1
-msgid "Email:"
-msgstr "AdreÃa electrÃnica:"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:2
-msgid "Junk List:"
-msgstr "Llista de correu brossa:"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:6
-msgid "_Enable"
-msgstr "_Habilita"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:7
-msgid "_Junk List"
-msgstr "_Llista de correu brossa"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:8
-#: ../plugins/groupwise-features/properties.ui.h:12
-#: ../widgets/table/e-table-config.ui.h:21
-msgid "_Remove"
-msgstr "Sup_rimeix"
-
-#: ../plugins/groupwise-features/mail-retract.c:81
-msgid "Message Retract"
-msgstr "Retirada de missatges"
-
-#: ../plugins/groupwise-features/mail-retract.c:90
-msgid ""
-"Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this?"
-msgstr ""
-"Si retireu un missatge Ãs probable que se suprimeixi de la bÃstia de correu "
-"del destinatari. Segur que voleu fer-ho?"
-
-#: ../plugins/groupwise-features/mail-retract.c:111
-msgid "Message retracted successfully"
-msgstr "S'ha retirat el correu amb Ãxit"
-
-#: ../plugins/groupwise-features/mail-send-options.c:202
-msgid "Insert Send options"
-msgstr "Insereix opcions d'enviament"
-
-#: ../plugins/groupwise-features/notification.ui.h:3
-#: ../plugins/groupwise-features/properties.ui.h:6
-msgid "The participants will receive the following notification.\n"
-msgstr "Els participants rebran la segÃent notificaciÃ.\n"
-
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to GroupWise messages"
-msgstr "Afegeix opcions d'enviament als missatges del GroupWise"
-
-#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "Fine-tune your GroupWise accounts."
-msgstr "Ajusteu els parÃmetres dels comptes GroupWise."
-
-#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "GroupWise Features"
-msgstr "CaracterÃstiques GroupWise"
-
-#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
-msgid "Message retract failed"
-msgstr "Ha fallat la retirada del correu"
-
-#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
-msgid "The server did not allow the selected message to be retracted."
-msgstr "El servidor no ha permÃs retirar el missatge seleccionat."
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr ""
-"Ja existeix un compte anomenat Â{0}Â. HaurÃeu de comprovar l'arbre de "
-"carpetes."
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
-msgid "Account Already Exists"
-msgstr "Ja existeix el compte"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
-msgid "Invalid user"
-msgstr "L'usuari no Ãs vÃlid"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"No s'ha pogut entrar al servidor intermediari com a Â{0}Â. HaurÃeu de "
-"comprovar l'adreÃa electrÃnica introduÃda i tornar-ho a intentar."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
-msgid "Proxy access cannot be given to user &quot;{0}&quot;"
-msgstr "No es pot atorgar accÃs al servidor intermediari a l'usuari Â{0}Â"
-
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
-msgid "Specify User"
-msgstr "Seleccioneu l'usuari"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
-msgid "You have already given proxy permissions to this user."
-msgstr ""
-"Ja heu atorgat permisos d'accÃs al servidor intermediari a aquest usuari."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
-msgid "You have to specify a valid user name to give proxy rights."
-msgstr ""
-"Heu d'especificar un nom d'usuari vÃlid per atorgar-li permisos de servidor "
-"intermediari."
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
-msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr ""
-"No podeu compartir aquesta carpeta amb l'usuari que heu especificat (Â{0}Â)"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
-msgid "You have to specify a user name which you want to add to the list"
-msgstr ""
-"Heu d'especificar el nom de l'usuari al qual vulgueu afegir a la llista"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
-msgid "Do you want to resend the meeting?"
-msgstr "Voleu tornar a enviar la reuniÃ?"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
-msgid "Do you want to resend the recurring meeting?"
-msgstr "Voleu tornar a enviar la reuniÃ periÃdica?"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
-msgid "Do you want to retract the original item?"
-msgstr "Voleu retirar l'element original?"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
-msgid "The original will be removed from the recipient's mailbox."
-msgstr "Se suprimirÃ l'original de la bÃstia de correu del destinatari."
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
-msgid "This is a recurring meeting"
-msgstr "Aquesta Ãs una reuniÃ periÃdica"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
-msgid "This will create a new meeting using the existing meeting details."
-msgstr ""
-"Aquesta acciÃ crearÃ una reuniÃ nova a partir dels detalls de la reuniÃ "
-"existent."
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
-msgid ""
-"This will create a new meeting with the existing meeting details. The "
-"recurrence rule needs to be re-entered."
-msgstr ""
-"Aquesta acciÃ crearÃ una reuniÃ nova a partir dels detalls de la reuniÃ "
-"existent. Haureu de tornar a introduir la regla de periodicitat."
-
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
-msgid "Would you like to accept it?"
-msgstr "Ho voleu acceptar?"
-
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
-msgid "Would you like to decline it?"
-msgstr "Ho voleu cancelÂlar?"
-
-#: ../plugins/groupwise-features/properties.ui.h:1
-msgid "C_ustomize notification message"
-msgstr "Personalitza el missatge de notifi_caciÃ"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
-msgid "Con_tacts..."
-msgstr "Con_tactes..."
-
-#: ../plugins/groupwise-features/properties.ui.h:4
-msgid "Shared Folder Notification"
-msgstr "NotificaciÃ de carpeta compartida"
-
-#: ../plugins/groupwise-features/properties.ui.h:8
-msgid "Users:"
-msgstr "Usuaris:"
-
-#: ../plugins/groupwise-features/properties.ui.h:11
-msgid "_Not Shared"
-msgstr "No e_s comparteix"
-
-#: ../plugins/groupwise-features/properties.ui.h:13
-msgid "_Shared With..."
-msgstr "E_s comparteix amb..."
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
-msgid "Access Rights"
-msgstr "Drets d'accÃs"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:2
-msgid "Add/Edit"
-msgstr "Afegeix/edita"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:4
-msgid "Con_tacts"
-msgstr "Con_tactes"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:6
-msgid "Modify _folders/options/rules/"
-msgstr "Modi_fica carpetes/opcions/regles"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:8
-msgid "Read items marked _private"
-msgstr "Llegeix elements marcats _privats"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:9
-msgid "Reminder Notes"
-msgstr "Notes del recordatori"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
-msgid "Subscribe to my _alarms"
-msgstr "Subscriu a les meves _alarmes"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
-msgid "Subscribe to my _notifications"
-msgstr "Subscriu a les meves _notificacions"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
-msgid "_Write"
-msgstr "_Escriptura"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:14
-msgid "permission to read|_Read"
-msgstr "_Lectura"
-
-#: ../plugins/groupwise-features/proxy-listing.ui.h:1
-msgid "Proxy"
-msgstr "Servidor intermediari"
-
-#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-#: ../widgets/misc/e-account-tree-view.c:239
-msgid "Account Name"
-msgstr "Nom del compte"
-
-# Vegeu el comentari de sota referent a aquesta mateixa cadena (dpm)
-#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
-msgid "Proxy Login"
-msgstr "Entrada com a delegat"
-
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:251
-#: ../plugins/groupwise-features/proxy.c:494
-#: ../plugins/groupwise-features/send-options.c:84
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s IntroduÃu la contrasenya per a %s (usuari %s)"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
-msgid "The Proxy tab will be available only when the account is online."
-msgstr ""
-"La pestanya del delegat nomÃs estarÃ disponible quan el compte estigui en "
-"lÃnia."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:704
-msgid "The Proxy tab will be available only when the account is enabled."
-msgstr ""
-"La pestanya del delegat nomÃs estarÃ disponible quan el compte estigui "
-"habilitat."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:709
-msgctxt "GW"
-msgid "Proxy"
-msgstr "Servidor intermediari"
-
-#: ../plugins/groupwise-features/proxy.c:935
-#: ../plugins/groupwise-features/share-folder.c:694
-msgid "Add User"
-msgstr "Afegeix un usuari"
-
-#: ../plugins/groupwise-features/send-options.c:214
-msgid "Advanced send options"
-msgstr "Opcions avanÃades d'enviament"
-
-#: ../plugins/groupwise-features/share-folder-common.c:316
-#: ../plugins/groupwise-features/share-folder.c:729
-msgid "Users"
-msgstr "Usuaris"
-
-#: ../plugins/groupwise-features/share-folder-common.c:317
-msgid "Enter the users and set permissions"
-msgstr "IntroduÃu els usuaris i establiu els permisos"
-
-#: ../plugins/groupwise-features/share-folder-common.c:418
-msgid "Sharing"
-msgstr "ComparticiÃ"
-
-#: ../plugins/groupwise-features/share-folder.c:532
-msgid "Custom Notification"
-msgstr "NotificaciÃ personalitzada"
-
-#: ../plugins/groupwise-features/share-folder.c:734
-msgid "Add   "
-msgstr "Afegeix   "
-
-#: ../plugins/groupwise-features/share-folder.c:740
-msgid "Modify"
-msgstr "Modifica"
-
-#: ../plugins/groupwise-features/status-track.c:125
-msgid "Message Status"
-msgstr "Estat del missatge"
-
-#. Subject
-#: ../plugins/groupwise-features/status-track.c:139
-msgid "Subject:"
-msgstr "Assumpte:"
-
-#: ../plugins/groupwise-features/status-track.c:153
-msgid "From:"
-msgstr "De:"
-
-#: ../plugins/groupwise-features/status-track.c:168
-msgid "Creation date:"
-msgstr "Data de creaciÃ:"
-
-#: ../plugins/groupwise-features/status-track.c:208
-msgid "Recipient: "
-msgstr "Destinatari: "
-
-#: ../plugins/groupwise-features/status-track.c:215
-msgid "Delivered: "
-msgstr "Entregat: "
+"subscripcions a calendaris."
 
-#: ../plugins/groupwise-features/status-track.c:221
-msgid "Opened: "
-msgstr "Obert: "
+#: ../plugins/google-account-setup/google-source.c:576
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"No es poden llegir les dades del servidor del Google.\n"
+"%s"
 
-#: ../plugins/groupwise-features/status-track.c:226
-msgid "Accepted: "
-msgstr "Acceptat: "
+#: ../plugins/google-account-setup/google-source.c:576
+#: ../plugins/mail-to-task/mail-to-task.c:813
+#: ../plugins/mail-to-task/mail-to-task.c:1077
+msgid "Unknown error."
+msgstr "S'ha produÃt un error desconegut."
 
-#: ../plugins/groupwise-features/status-track.c:231
-msgid "Deleted: "
-msgstr "Suprimit: "
+#: ../plugins/google-account-setup/google-source.c:679
+msgid "Cal_endar:"
+msgstr "_Calendari:"
 
-#: ../plugins/groupwise-features/status-track.c:236
-msgid "Declined: "
-msgstr "Declinat: "
+#: ../plugins/google-account-setup/google-source.c:714
+msgid "Retrieve _List"
+msgstr "Recupera la _llista"
 
-#: ../plugins/groupwise-features/status-track.c:241
-msgid "Completed: "
-msgstr "Completat: "
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
+msgid "Add Google Calendars to Evolution."
+msgstr "Afegiu calendaris del Google a l'Evolution."
 
-#: ../plugins/groupwise-features/status-track.c:246
-msgid "Undelivered: "
-msgstr "No entregat: "
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+msgid "Google Calendars"
+msgstr "Calendaris del Google"
 
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
@@ -17649,12 +17294,12 @@ msgstr "Imatge inserida"
 msgid "View image attachments directly in mail messages."
 msgstr "Mostra les adjuncions d'imatge directament en els correus."
 
-#: ../plugins/imap-features/imap-headers.c:329
+#: ../plugins/imap-features/imap-headers.c:337
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "CapÃaleres personalitzades"
 
-#: ../plugins/imap-features/imap-headers.c:342
+#: ../plugins/imap-features/imap-headers.c:349
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "CapÃaleres IMAP"
@@ -17683,11 +17328,11 @@ msgstr ""
 
 #: ../plugins/imap-features/imap-headers.ui.h:8
 msgid ""
-"_Basic Headers - (Fastest) \n"
+"_Basic Headers (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
 msgstr ""
-"CapÃaleres _bÃsiques - (el mÃs rÃpid)\n"
-"Useu aixÃ si no teniu filtres basats en llistes de correu"
+"CapÃaleres _bÃsiques (el mÃs rÃpid)\n"
+"Utilitzeu aixÃ si no teniu filtres basats en llistes de correu"
 
 #: ../plugins/imap-features/imap-headers.ui.h:10
 msgid "_Fetch All Headers"
@@ -17702,19 +17347,19 @@ msgid "IMAP Features"
 msgstr "CaracterÃstiques d'IMAP"
 
 #. Translators: The first '%s' is replaced with a calendar name,
-#. the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:485
+#. * the second '%s' with an error message
+#: ../plugins/itip-formatter/itip-formatter.c:499
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "No s'ha pogut carregar el calendari Â%sÂ (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:654
+#: ../plugins/itip-formatter/itip-formatter.c:659
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Un esdeveniment del calendari Â%sÂ coincideix amb aquesta reuniÃ"
 
 # c-format
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:683
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "S'ha trobat l'esdeveniment al calendari Â%sÂ"
@@ -17735,116 +17380,116 @@ msgstr "No s'ha pogut trobar la tasca a la llista de tasques"
 msgid "Unable to find this memo in any memo list"
 msgstr "No s'ha pogut trobar aquesta anotaciÃ a la llista d'anotacions"
 
-#: ../plugins/itip-formatter/itip-formatter.c:880
-msgid "Opening the calendar. Please wait.."
+#: ../plugins/itip-formatter/itip-formatter.c:1082
+msgid "Opening the calendar. Please wait..."
 msgstr "S'estÃ obrint el calendari. Espereu..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:883
+#: ../plugins/itip-formatter/itip-formatter.c:1085
 msgid "Searching for an existing version of this appointment"
 msgstr "S'estÃ cercant una versiÃ existent d'aquesta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1166
+#: ../plugins/itip-formatter/itip-formatter.c:1362
 msgid "Unable to parse item"
 msgstr "No s'ha pogut analitzar l'element"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1255
+#: ../plugins/itip-formatter/itip-formatter.c:1451
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "No s'ha pogut enviar l'element al calendari Â%sÂ. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1267
+#: ../plugins/itip-formatter/itip-formatter.c:1463
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "S'ha enviat al calendari Â%sÂ com a acceptat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1467
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "S'ha enviat al calendari Â%sÂ com a provisional"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1472
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "S'ha enviat al calendari Â%sÂ com a rebutjat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1477
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "S'ha enviat al calendari Â%sÂ com a cancelÂlat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1579
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "L'organitzador ha suprimit el delegat %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1382
+#: ../plugins/itip-formatter/itip-formatter.c:1586
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Envia un avÃs de cancelÂlaciÃ al delegat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "No s'ha pogut enviar un avÃs de cancelÂlaciÃ al delegat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1495
+#: ../plugins/itip-formatter/itip-formatter.c:1700
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "L'estat de l'assistent no s'ha pogut actualitzar perquÃ l'estat no Ãs vÃlid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1524
+#: ../plugins/itip-formatter/itip-formatter.c:1729
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "No s'ha pogut actualitzar l'assistent. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1528
+#: ../plugins/itip-formatter/itip-formatter.c:1733
 msgid "Attendee status updated"
 msgstr "S'ha actualitzat l'estat de l'assistent"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1532
+#: ../plugins/itip-formatter/itip-formatter.c:1737
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "No es pot actualitzar l'estat de l'assistent perquÃ l'element ja no existeix"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1554
+#: ../plugins/itip-formatter/itip-formatter.c:1759
 msgid "Meeting information sent"
 msgstr "S'ha enviat la informaciÃ de la reuniÃ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1557
+#: ../plugins/itip-formatter/itip-formatter.c:1762
 msgid "Task information sent"
 msgstr "S'ha enviat la informaciÃ de la tasca"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1560
+#: ../plugins/itip-formatter/itip-formatter.c:1765
 msgid "Memo information sent"
 msgstr "S'ha enviat la informaciÃ de l'anotaciÃ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1569
+#: ../plugins/itip-formatter/itip-formatter.c:1774
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "No s'ha pogut enviar la informaciÃ de la reuniÃ; la reuniÃ no existeix"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1777
 msgid "Unable to send task information, the task does not exist"
 msgstr "No s'ha pogut enviar la informaciÃ de la tasca; la tasca no existeix"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1575
+#: ../plugins/itip-formatter/itip-formatter.c:1780
 msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 "No s'ha pogut enviar la informaciÃ de l'anotaciÃ; l'anotaciÃ no existeix"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1846
 msgid "calendar.ics"
 msgstr "calendari.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1645
+#: ../plugins/itip-formatter/itip-formatter.c:1851
 msgid "Save Calendar"
 msgstr "Desa el calendari"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1703
-#: ../plugins/itip-formatter/itip-formatter.c:1714
+#: ../plugins/itip-formatter/itip-formatter.c:1914
+#: ../plugins/itip-formatter/itip-formatter.c:1925
 msgid "The calendar attached is not valid"
 msgstr "El calendari adjunt no Ãs vÃlid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1704
-#: ../plugins/itip-formatter/itip-formatter.c:1715
+#: ../plugins/itip-formatter/itip-formatter.c:1915
+#: ../plugins/itip-formatter/itip-formatter.c:1926
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17852,15 +17497,15 @@ msgstr ""
 "El missatge no contÃ un calendari iCalendar vÃlid, tot i que diu contenir-ne "
 "un."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1755
-#: ../plugins/itip-formatter/itip-formatter.c:1783
-#: ../plugins/itip-formatter/itip-formatter.c:1892
+#: ../plugins/itip-formatter/itip-formatter.c:1966
+#: ../plugins/itip-formatter/itip-formatter.c:1994
+#: ../plugins/itip-formatter/itip-formatter.c:2103
 msgid "The item in the calendar is not valid"
 msgstr "L'element en el calendari no Ãs vÃlid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1756
-#: ../plugins/itip-formatter/itip-formatter.c:1784
-#: ../plugins/itip-formatter/itip-formatter.c:1893
+#: ../plugins/itip-formatter/itip-formatter.c:1967
+#: ../plugins/itip-formatter/itip-formatter.c:1995
+#: ../plugins/itip-formatter/itip-formatter.c:2104
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17868,11 +17513,11 @@ msgstr ""
 "El missatge contÃ un calendari, perÃ el calendari no contÃ esdeveniments, "
 "tasques o informaciÃ de lliure/ocupat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1797
+#: ../plugins/itip-formatter/itip-formatter.c:2008
 msgid "The calendar attached contains multiple items"
 msgstr "El calendari adjunt contÃ mÃltiples elements"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1798
+#: ../plugins/itip-formatter/itip-formatter.c:2009
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17880,81 +17525,85 @@ msgstr ""
 "Per processar tots els elements, s'hauria de desar el fitxer i importar el "
 "calendari"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2460
+#: ../plugins/itip-formatter/itip-formatter.c:2672
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Cap"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2476
+#: ../plugins/itip-formatter/itip-formatter.c:2688
 msgid "Tentatively Accepted"
 msgstr "Acceptat provisionalment"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2594
+#: ../plugins/itip-formatter/itip-formatter.c:2806
 msgid "This meeting recurs"
 msgstr "Aquesta reuniÃ Ãs periÃdica"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2597
+#: ../plugins/itip-formatter/itip-formatter.c:2809
 msgid "This task recurs"
 msgstr "Aquesta tasca Ãs periÃdica"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2600
+#: ../plugins/itip-formatter/itip-formatter.c:2812
 msgid "This memo recurs"
 msgstr "Aquesta anotaciÃ Ãs periÃdica"
 
+#: ../plugins/itip-formatter/itip-formatter.c:3036
+msgid "Meeting Invitations"
+msgstr "Invitacions de la reuniÃ"
+
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2834
+#: ../plugins/itip-formatter/itip-formatter.c:3061
 msgid "_Delete message after acting"
 msgstr "Suprimeix el missatge _desprÃs d'actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2844
-#: ../plugins/itip-formatter/itip-formatter.c:2877
+#: ../plugins/itip-formatter/itip-formatter.c:3071
+#: ../plugins/itip-formatter/itip-formatter.c:3104
 msgid "Conflict Search"
 msgstr "Cerca de conflictes"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2859
+#: ../plugins/itip-formatter/itip-formatter.c:3086
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccioneu els calendaris on cercar conflictes entre reunions"
 
 #. strftime format of a time,
-#. in 24-hour format, without seconds.
+#. * in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Avui a les %H:%M"
 
 #. strftime format of a time,
-#. in 24-hour format.
+#. * in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Avui a les %H:%M:%S"
 
 #. strftime format of a time,
-#. in 12-hour format.
+#. * in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Avui a les %l:%M:%S %p"
 
 #. strftime format of a time,
-#. in 24-hour format, without seconds.
+#. * in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "DemÃ a les %H:%M"
 
 #. strftime format of a time,
-#. in 24-hour format.
+#. * in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "DemÃ a les %H:%M:%S"
 
 #. strftime format of a time,
-#. in 12-hour format, without seconds.
+#. * in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "DemÃ a les %l:%M %p"
 
 #. strftime format of a time,
-#. in 12-hour format.
+#. * in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "DemÃ a les %l:%M:%S %p"
@@ -17966,56 +17615,56 @@ msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
-#. time, in 24-hour format, without seconds.
+#. * time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A a les %H:%M"
 
 #. strftime format of a weekday and a
-#. time, in 24-hour format.
+#. * time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A a les %H:%M:%S"
 
 #. strftime format of a weekday and a
-#. time, in 12-hour format, without seconds.
+#. * time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A a les %l:%M %p"
 
 #. strftime format of a weekday and a
-#. time, in 12-hour format.
+#. * time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A a les %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
-#. without a year.
+#. * without a year.
 #: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %e de %B"
 
 #. strftime format of a weekday, a date
-#. without a year and a time,
-#. in 24-hour format, without seconds.
+#. * without a year and a time,
+#. * in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e de %B a les %H:%M"
 
 #. strftime format of a weekday, a date without a year
-#. and a time, in 24-hour format.
+#. * and a time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e de %B a les %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
-#. and a time, in 12-hour format, without seconds.
+#. * and a time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e de %B a les %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
-#. and a time, in 12-hour format.
+#. * and a time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e de %B a les %l:%M:%S %p"
@@ -18026,91 +17675,91 @@ msgid "%A, %B %e, %Y"
 msgstr "%A, %e de %B del %Y"
 
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
+#. * time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e de %B del %Y a les %H:%M"
 
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
+#. * time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e de %B del %Y a les %H:%M:%S"
 
 # consulteu man 3 strftime per comprendre aquest format
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
+#. * time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e de %B del %Y a les %l:%M %p"
 
 # consulteu man 3 strftime per comprendre aquest format
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
+#. * time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e de %B del %Y a les %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:362
-#: ../plugins/itip-formatter/itip-view.c:363
-#: ../plugins/itip-formatter/itip-view.c:450
-#: ../plugins/itip-formatter/itip-view.c:451
-#: ../plugins/itip-formatter/itip-view.c:538
+#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:540
 msgid "An unknown person"
 msgstr "Una persona desconeguda"
 
-#: ../plugins/itip-formatter/itip-view.c:367
-#: ../plugins/itip-formatter/itip-view.c:455
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Responeu en nom de %s"
 
-#: ../plugins/itip-formatter/itip-view.c:369
-#: ../plugins/itip-formatter/itip-view.c:457
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Rebut en nom de %s"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr ""
 "En/na %s, a travÃs de %s, ha publicat la informaciÃ de la reuniÃ segÃent:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "En/na %s ha publicat la informaciÃ de la reuniÃ segÃent:"
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "En/na %s us ha delegat la reuniÃ segÃent:"
 
-#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr ""
 "En/na %s, a travÃs de %s, solÂlicita la vostra presÃncia a la reuniÃ segÃent:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "En/na %s solÂlicita la vostra presÃncia a la reuniÃ segÃent:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "En/na %s, a travÃs de %s, es voldria afegir a una reuniÃ existent:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "En/na %s es voldria afegir a una reuniÃ existent:"
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -18119,87 +17768,87 @@ msgstr ""
 "En/na %s, a travÃs de %s, voldria rebre l'Ãltima informaciÃ sobre la reuniÃ "
 "segÃent:"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "En/na %s voldria rebre l'Ãltima informaciÃ de la reuniÃ segÃent:"
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "En/na %s, a travÃs de %s, ha retornat la resposta de reuniÃ segÃent:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "En/na %s ha retornat la resposta de reuniÃ segÃent:"
 
-#: ../plugins/itip-formatter/itip-view.c:410
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "En/na %s, a travÃs de %s, ha cancelÂlat la reuniÃ segÃent:"
 
-#: ../plugins/itip-formatter/itip-view.c:412
+#: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
 msgid "%s has canceled the following meeting."
 msgstr "En/na %s ha cancelÂlat la reuniÃ segÃent."
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:418
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "En/na %s, a travÃs de %s, ha proposat els segÃents canvis a la reuniÃ."
 
-#: ../plugins/itip-formatter/itip-view.c:418
+#: ../plugins/itip-formatter/itip-view.c:420
 #, c-format
 msgid "%s has proposed the following meeting changes."
 msgstr "En/na %s ha proposat els segÃents canvis a la reuniÃ."
 
-#: ../plugins/itip-formatter/itip-view.c:422
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "En/na %s, a travÃs de %s, ha rebutjat els segÃents canvis a la reuniÃ:"
 
-#: ../plugins/itip-formatter/itip-view.c:424
+#: ../plugins/itip-formatter/itip-view.c:426
 #, c-format
 msgid "%s has declined the following meeting changes."
 msgstr "En/na %s ha rebutjat els segÃents canvis a la reuniÃ."
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "En/na %s, a travÃs de %s, ha publicat la informaciÃ de tasca segÃent:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "%s has published the following task:"
 msgstr "En/na %s ha publicat la tasca segÃent:"
 
-#: ../plugins/itip-formatter/itip-view.c:469
+#: ../plugins/itip-formatter/itip-view.c:471
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "En/na %s solÂlicita assignar la tasca segÃent a %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:472
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "En/na %s, a travÃs de %s, us ha assignat una tasca:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "En/na %s us ha assignat una tasca:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "En/na %s, a travÃs de %s, es voldria afegir a una tasca existent:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "En/na %s es voldria afegir a una tasca existent:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -18208,201 +17857,201 @@ msgstr ""
 "En/na %s, a travÃs de %s, voldria rebre l'Ãltima informaciÃ per a la segÃent "
 "tasca assignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr ""
 "En/na %s voldria rebre l'Ãltima informaciÃ per a la segÃent tasca assignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr ""
 "En/na %s, a travÃs de %s, ha retornat la segÃent resposta de la tasca "
 "assignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "En/na %s ha retornat la segÃent resposta de la tasca assignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:498
+#: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "En/na %s, a travÃs de %s, ha cancelÂlat la segÃent tasca assignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:500
+#: ../plugins/itip-formatter/itip-view.c:502
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "En/na %s ha cancelÂlat la segÃent tasca assignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:504
+#: ../plugins/itip-formatter/itip-view.c:506
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr ""
 "En/na %s, a travÃs de %s, ha proposat els segÃents canvis d'assignaciÃ d'una "
 "tasca:"
 
-#: ../plugins/itip-formatter/itip-view.c:506
+#: ../plugins/itip-formatter/itip-view.c:508
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "En/na %s ha proposat els segÃents canvis d'assignaciÃ d'una tasca:"
 
-#: ../plugins/itip-formatter/itip-view.c:510
+#: ../plugins/itip-formatter/itip-view.c:512
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "En/na %s, a travÃs de %s, ha rebutjat la segÃent tasca assignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:512
+#: ../plugins/itip-formatter/itip-view.c:514
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "En/na %s ha rebutjat la segÃent tasca assignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:549
+#: ../plugins/itip-formatter/itip-view.c:551
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "En/na %s, a travÃs de %s, ha publicat la segÃent anotaciÃ:"
 
-#: ../plugins/itip-formatter/itip-view.c:551
+#: ../plugins/itip-formatter/itip-view.c:553
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "En/na %s ha publicat la segÃent anotaciÃ:"
 
-#: ../plugins/itip-formatter/itip-view.c:556
+#: ../plugins/itip-formatter/itip-view.c:558
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "En/na %s, a travÃs de %s es voldria afegir a una anotaciÃ existent:"
 
-#: ../plugins/itip-formatter/itip-view.c:558
+#: ../plugins/itip-formatter/itip-view.c:560
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "En/na %s es voldria afegir a una anotaciÃ existent:"
 
-#: ../plugins/itip-formatter/itip-view.c:562
+#: ../plugins/itip-formatter/itip-view.c:564
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "En/na %s, a travÃs de %s, ha cancelÂlat l'anotaciÃ compartida segÃent:"
 
-#: ../plugins/itip-formatter/itip-view.c:564
+#: ../plugins/itip-formatter/itip-view.c:566
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "En/na %s ha cancelÂlat l'anotaciÃ compartida segÃent:"
 
-#: ../plugins/itip-formatter/itip-view.c:688
+#: ../plugins/itip-formatter/itip-view.c:690
 msgid "All day:"
 msgstr "Tot el dia:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:700
 msgid "Start day:"
 msgstr "Dia d'inici:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1054
+#: ../plugins/itip-formatter/itip-view.c:700
+#: ../plugins/itip-formatter/itip-view.c:1062
 msgid "Start time:"
 msgstr "Hora d'inici:"
 
-#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:712
 msgid "End day:"
 msgstr "Dia de finalitzaciÃ:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:710
-#: ../plugins/itip-formatter/itip-view.c:1065
+#: ../plugins/itip-formatter/itip-view.c:712
+#: ../plugins/itip-formatter/itip-view.c:1073
 msgid "End time:"
 msgstr "Hora de finalitzaciÃ:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Open Calendar"
 msgstr "Obre el ca_lendari"
 
-#: ../plugins/itip-formatter/itip-view.c:849
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:859
-#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:864
 #: ../plugins/itip-formatter/itip-view.c:881
+#: ../plugins/itip-formatter/itip-view.c:886
 msgid "_Decline"
 msgstr "_Declina"
 
-#: ../plugins/itip-formatter/itip-view.c:850
 #: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:862
-#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:867
 #: ../plugins/itip-formatter/itip-view.c:883
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "A_ccept"
 msgstr "Ac_cepta"
 
-#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Decline all"
 msgstr "_Declina'ls tots"
 
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Tentative all"
 msgstr "_Tots provisionalment"
 
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:860
-#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:865
 #: ../plugins/itip-formatter/itip-view.c:882
+#: ../plugins/itip-formatter/itip-view.c:887
 msgid "_Tentative"
 msgstr "Provisionalmen_t"
 
-#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "A_ccept all"
 msgstr "_Accepta'ls tots"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:866
+#: ../plugins/itip-formatter/itip-view.c:871
 msgid "_Send Information"
 msgstr "InformaciÃ d'en_viament"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:875
 msgid "_Update Attendee Status"
 msgstr "Act_ualitza l'estat de l'assistent"
 
-#: ../plugins/itip-formatter/itip-view.c:873
+#: ../plugins/itip-formatter/itip-view.c:878
 msgid "_Update"
 msgstr "Act_ualitza"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1085
-#: ../plugins/itip-formatter/itip-view.c:1139
+#: ../plugins/itip-formatter/itip-view.c:1093
+#: ../plugins/itip-formatter/itip-view.c:1147
 msgid "Comment:"
 msgstr "Comentari:"
 
-#: ../plugins/itip-formatter/itip-view.c:1124
+#: ../plugins/itip-formatter/itip-view.c:1132
 msgid "Send _reply to sender"
 msgstr "_Respon al remitent"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "Send _updates to attendees"
 msgstr "En_via actualitzacions als assistents"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "_Apply to all instances"
 msgstr "A_plica a totes les instÃncies"
 
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "Show time as _free"
 msgstr "Mostra el temps com a _lliure"
 
-#: ../plugins/itip-formatter/itip-view.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1183
 msgid "_Preserve my reminder"
 msgstr "_Conserva el meu recordatori"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1181
+#: ../plugins/itip-formatter/itip-view.c:1189
 msgid "_Inherit reminder"
 msgstr "_Hereta el recordatori"
 
-#: ../plugins/itip-formatter/itip-view.c:1924
+#: ../plugins/itip-formatter/itip-view.c:1965
 msgid "_Tasks:"
 msgstr "_Tasques:"
 
-#: ../plugins/itip-formatter/itip-view.c:1926
+#: ../plugins/itip-formatter/itip-view.c:1967
 msgid "_Memos:"
 msgstr "A_notacions:"
 
@@ -18434,18 +18083,10 @@ msgid "Beep or play sound file."
 msgstr "Emet un to o reprodueix un fitxer de so."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Enable D-Bus messages."
-msgstr "Habilita els missatges del D-Bus."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "Habilita la icona a l'Ãrea de notificaciÃ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-msgid "Generates a D-Bus message when new mail messages arrive."
-msgstr "Genera un missatge del D-Bus quan arribi correu nou."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
@@ -18453,59 +18094,50 @@ msgstr ""
 "Si es defineix com a ÂtrueÂ (cert), s'emetrÃ un to en rebre correu nou. En "
 "cas contrari, es reproduirÃ un fitxer de so."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Notify new messages for Inbox only."
 msgstr "Notifica nomÃs quan hi hagi correu nou a la safata d'entrada."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid "Play sound when new messages arrive."
 msgstr "Reprodueix un so quan arribi correu nou."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr ""
 "Reprodueix el so de tema quan arribi correu nou (en cas que el mode "
 "d'emissiÃ de to no estigui activat)."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-msgid "Popup message together with the icon."
-msgstr "Mostra un missatge emergent juntament amb la icona."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr ""
 "Mostra la icona de correu nou a l'Ãrea de notificaciÃ en rebre missatges "
 "nous."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Sound file name to be played."
 msgstr "Nom del fitxer de so a reproduir."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr ""
 "Fitxer de so que es reproduirÃ quan arribi correu nou (en cas que el mode "
 "d'emissiÃ de to no estigui activat)."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Use sound theme"
 msgstr "Utilitza el tema de sons"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Whether play sound or beep when new messages arrive."
 msgstr ""
 "Si s'ha de reproduir un fitxer de so o emetre un to quan arribi correu nou."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
-msgid "Whether show message over the icon when new messages arrive."
-msgstr ""
-"Si s'ha de mostrar un missatge sobre la icona quan arribin correus nous."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Si s'ha de notificar nomÃs per al correu nou a la safata d'entrada."
 
-#: ../plugins/mail-notification/mail-notification.c:398
+#: ../plugins/mail-notification/mail-notification.c:391
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18516,68 +18148,60 @@ msgid_plural ""
 msgstr[0] "Heu rebut %d missatge nou a %s."
 msgstr[1] "Heu rebut %d missatges nous a %s."
 
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:410
-#, c-format
-msgid "From: %s"
-msgstr "De: %s"
-
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:423
+#: ../plugins/mail-notification/mail-notification.c:416
 #, c-format
 msgid "Subject: %s"
 msgstr "Assumpte: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:433
+#: ../plugins/mail-notification/mail-notification.c:427
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Heu rebut %d missatge nou."
 msgstr[1] "Heu rebut %d missatges nous."
 
-#: ../plugins/mail-notification/mail-notification.c:446
-#: ../plugins/mail-notification/mail-notification.c:454
-#: ../plugins/mail-notification/mail-notification.c:457
+#: ../plugins/mail-notification/mail-notification.c:436
+#: ../plugins/mail-notification/mail-notification.c:444
+#: ../plugins/mail-notification/mail-notification.c:447
 msgid "New email"
 msgstr "Correu nou"
 
-#: ../plugins/mail-notification/mail-notification.c:506
-msgid "Show icon in _notification area"
-msgstr "Mostra una icona a l'Ãrea de _notificaciÃ"
-
-#: ../plugins/mail-notification/mail-notification.c:536
-msgid "Popup _message together with the icon"
-msgstr "Mostra un _missatge emergent juntament amb la icona"
+#. Translators: The '%s' is a mail
+#. * folder name.  (e.g. "Show Inbox")
+#: ../plugins/mail-notification/mail-notification.c:468
+#, c-format
+msgid "Show %s"
+msgstr "Mostra %s"
 
-#: ../plugins/mail-notification/mail-notification.c:723
-msgid "_Play sound when new messages arrive"
-msgstr "Re_produeix un de so quan arribi correu nou"
+#: ../plugins/mail-notification/mail-notification.c:673
+msgid "_Play sound when a new message arrives"
+msgstr "Re_produeix un so quan arribin correus nous"
 
-#: ../plugins/mail-notification/mail-notification.c:753
+#: ../plugins/mail-notification/mail-notification.c:703
 msgid "_Beep"
 msgstr "_Emet un to"
 
-#: ../plugins/mail-notification/mail-notification.c:766
+#: ../plugins/mail-notification/mail-notification.c:716
 msgid "Use sound _theme"
 msgstr "Utilitza el _tema de sons"
 
-#: ../plugins/mail-notification/mail-notification.c:785
+#: ../plugins/mail-notification/mail-notification.c:735
 msgid "Play _file:"
 msgstr "_Reprodueix un fitxer:"
 
-#: ../plugins/mail-notification/mail-notification.c:796
+#: ../plugins/mail-notification/mail-notification.c:744
 msgid "Select sound file"
 msgstr "Seleccioneu un fitxer de so"
 
-#: ../plugins/mail-notification/mail-notification.c:854
+#: ../plugins/mail-notification/mail-notification.c:801
 msgid "Notify new messages for _Inbox only"
 msgstr "Notifica nomÃs per als missatges a la safata _d'entrada"
 
-#: ../plugins/mail-notification/mail-notification.c:863
-msgid "Generate a _D-Bus message"
-msgstr "Genera un missatge del _D-Bus"
+#: ../plugins/mail-notification/mail-notification.c:811
+msgid "Show _notification when a new message arrives"
+msgstr "Mostra una _notificaciÃ quan arribin missatges nous"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
@@ -18588,12 +18212,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Us notifica quan arriben missatges de correu nous."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:157
+#: ../plugins/mail-to-task/mail-to-task.c:238
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Creat a partir d'un correu de %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:490
+#: ../plugins/mail-to-task/mail-to-task.c:603
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18602,7 +18226,7 @@ msgstr ""
 "El calendari seleccionat ja contÃ l'esdeveniment Â%sÂ. Voleu editar "
 "l'esdeveniment antic?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:493
+#: ../plugins/mail-to-task/mail-to-task.c:606
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18611,7 +18235,7 @@ msgstr ""
 "La llista de tasques seleccionades ja contÃ la tasca Â%sÂ. Voleu editar la "
 "tasca antiga?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:609
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18620,109 +18244,56 @@ msgstr ""
 "La llista d'anotacions seleccionada ja contÃ l'anotaciÃ Â%sÂ. Voleu editar "
 "l'anotaciÃ antiga?"
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:516
+#: ../plugins/mail-to-task/mail-to-task.c:626
+#, c-format
 msgid ""
-"Selected calendar contains some events for the given mails already. Would "
-"you like to create new events anyway?"
+"You have selected %d mails to be converted to events. Do you really want to "
+"add them all?"
 msgstr ""
-"El calendari seleccionat ja contÃ alguns esdeveniments per als correus "
-"proporcionats. Voleu crear esdeveniments nous de totes maneres?"
+"Heu seleccionat %d correus per convertir-los en esdeveniments. Segur que els "
+"voleu afegir tots?"
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#: ../plugins/mail-to-task/mail-to-task.c:629
+#, c-format
 msgid ""
-"Selected task list contains some tasks for the given mails already. Would "
-"you like to create new tasks anyway?"
+"You have selected %d mails to be converted to tasks. Do you really want to "
+"add them all?"
 msgstr ""
-"La llista de tasques seleccionada ja contÃ algunes tasques per als correus "
-"proporcionats. Voleu crear tasques noves de totes maneres?"
+"Heu seleccionat %d correus per convertir-los en tasques. Segur que els voleu "
+"afegir tots?"
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:528
+#: ../plugins/mail-to-task/mail-to-task.c:632
+#, c-format
 msgid ""
-"Selected memo list contains some memos for the given mails already. Would "
-"you like to create new memos anyway?"
+"You have selected %d mails to be converted to memos. Do you really want to "
+"add them all?"
 msgstr ""
-"La llista d'anotacions seleccionada ja contÃ algunes anotacions per als "
-"correus proporcionats. Voleu crear anotacions noves de totes maneres?"
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:549
-msgid ""
-"Selected calendar contains an event for the given mail already. Would you "
-"like to create new event anyway?"
-msgid_plural ""
-"Selected calendar contains events for the given mails already. Would you "
-"like to create new events anyway?"
-msgstr[0] ""
-"El calendari seleccionat ja contÃ un esdeveniment per al correu "
-"proporcionat. Voleu crear un esdeveniment nou de totes maneres?"
-msgstr[1] ""
-"El calendari seleccionat ja contÃ alguns esdeveniments per als correus "
-"proporcionats. Voleu crear esdeveniments nous de totes maneres?"
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:558
-msgid ""
-"Selected task list contains a task for the given mail already. Would you "
-"like to create new task anyway?"
-msgid_plural ""
-"Selected task list contains tasks for the given mails already. Would you "
-"like to create new tasks anyway?"
-msgstr[0] ""
-"La llista de tasques seleccionada ja contÃ una tasca per al correu "
-"proporcionat. Voleu crear una tasca nova de totes maneres?"
-msgstr[1] ""
-"La llista de tasques seleccionada ja contÃ algunes tasques per als correus "
-"proporcionats. Voleu crear tasques noves de totes maneres?"
+"Heu seleccionat %d correus per convertir-los en anotacions. Segur que els "
+"voleu afegir tots?"
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:567
-msgid ""
-"Selected memo list contains a memo for the given mail already. Would you "
-"like to create new memo anyway?"
-msgid_plural ""
-"Selected memo list contains memos for the given mails already. Would you "
-"like to create new memos anyway?"
-msgstr[0] ""
-"La llista d'anotacions seleccionada ja contÃ una anotaciÃ per al correu "
-"proporcionat. Voleu crear una anotaciÃ nova de totes maneres?"
-msgstr[1] ""
-"La llista d'anotacions seleccionada ja contÃ algunes anotacions per als "
-"correus proporcionats. Voleu crear anotacions noves de totes maneres?"
+#: ../plugins/mail-to-task/mail-to-task.c:651
+msgid "Do you wish to continue converting remaining mails?"
+msgstr "Voleu continuar convertint la resta de correus?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:626
+#: ../plugins/mail-to-task/mail-to-task.c:726
 msgid "[No Summary]"
 msgstr "[Sense resum]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:637
+#: ../plugins/mail-to-task/mail-to-task.c:738
 msgid "Invalid object returned from a server"
 msgstr "S'ha retornat un objecte no vÃlid d'un servidor"
 
-#: ../plugins/mail-to-task/mail-to-task.c:708
+#: ../plugins/mail-to-task/mail-to-task.c:788
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "S'ha produÃt un error durant el processament: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:737
+#: ../plugins/mail-to-task/mail-to-task.c:813
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "No es pot obrir el calendari. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:744
+#: ../plugins/mail-to-task/mail-to-task.c:820
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18730,7 +18301,7 @@ msgstr ""
 "La font que heu seleccionat Ãs nomÃs de lectura, per la qual cosa no hi "
 "podeu crear un esdeveniment. Seleccioneu una altra font."
 
-#: ../plugins/mail-to-task/mail-to-task.c:747
+#: ../plugins/mail-to-task/mail-to-task.c:823
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18738,7 +18309,7 @@ msgstr ""
 "La font que heu seleccionat Ãs nomÃs de lectura, per la qual cosa no hi "
 "podeu crear una tasca."
 
-#: ../plugins/mail-to-task/mail-to-task.c:750
+#: ../plugins/mail-to-task/mail-to-task.c:826
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18746,40 +18317,44 @@ msgstr ""
 "La font que heu seleccionat Ãs nomÃs de lectura, per la qual cosa no hi "
 "podeu crear una anotaciÃ. Seleccioneu una altra font."
 
-#: ../plugins/mail-to-task/mail-to-task.c:956
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "No s'ha pogut obtenir la llista font. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1075
+#: ../plugins/mail-to-task/mail-to-task.c:1138
+msgid "No writable calendar is available."
+msgstr "No hi ha cap calendari en mode escriptura disponible."
+
+#: ../plugins/mail-to-task/mail-to-task.c:1230
 msgid "Create an _Event"
 msgstr "Crea un _esdeveniment"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1077
+#: ../plugins/mail-to-task/mail-to-task.c:1232
 msgid "Create a new event from the selected message"
 msgstr "Crea un esdeveniment nou a partir del missatge seleccionat"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1082
+#: ../plugins/mail-to-task/mail-to-task.c:1237
 msgid "Create a Mem_o"
 msgstr "Crea una an_otaciÃ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1239
 msgid "Create a new memo from the selected message"
 msgstr "Crea una anotaciÃ nova a partir del missatge seleccionat"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1089
+#: ../plugins/mail-to-task/mail-to-task.c:1244
 msgid "Create a _Task"
 msgstr "Crea una _tasca"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1091
+#: ../plugins/mail-to-task/mail-to-task.c:1246
 msgid "Create a new task from the selected message"
 msgstr "Crea una tasca nova a partir del missatge seleccionat"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1099
+#: ../plugins/mail-to-task/mail-to-task.c:1254
 msgid "Create a _Meeting"
 msgstr "Crea una re_uniÃ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1101
+#: ../plugins/mail-to-task/mail-to-task.c:1256
 msgid "Create a new meeting from the selected message"
 msgstr "Crea una reuniÃ nova a partir del missatge seleccionat"
 
@@ -18787,60 +18362,60 @@ msgstr "Crea una reuniÃ nova a partir del missatge seleccionat"
 msgid "Convert a mail message to a task."
 msgstr "Converteix un missatge de correu en una tasca."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:294
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:346
 msgid "Get List _Archive"
 msgstr "ObtÃ l'_arxiu de la llista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:296
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:348
 msgid "Get an archive of the list this message belongs to"
 msgstr "ObtÃ un arxiu de la llista a la qual pertany aquest missatge"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:301
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:353
 msgid "Get List _Usage Information"
 msgstr "O_btÃ informaciÃ de l'Ãs de la llista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:303
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:355
 msgid "Get information about the usage of the list this message belongs to"
 msgstr ""
 "ObtÃ informaciÃ sobre l'Ãs de la llista a la qual pertany aquest missatge"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:308
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:360
 msgid "Contact List _Owner"
 msgstr "Contacta amb el pr_opietari de la llista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:310
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:362
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr ""
 "Contacteu amb el propietari de la llista a la qual pertany aquest missatge"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:315
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
 msgid "_Post Message to List"
 msgstr "Envia un _missatge a la llista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:317
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:369
 msgid "Post a message to the mailing list this message belongs to"
 msgstr ""
 "Envieu un missatge a la llista de correu a la qual pertany aquest missatge"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:322
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
 msgid "_Subscribe to List"
 msgstr "_Subscriu a la llista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:324
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:376
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Subscriviu-vos a la llista de correu a la qual pertany aquest missatge"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:329
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
 msgid "_Unsubscribe from List"
 msgstr "CancelÂla la s_ubscripciÃ a la llista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:331
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:383
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr ""
 "CancelÂla la subscripciÃ a la llista de correu a la qual pertany aquest "
 "missatge"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:338
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:390
 msgid "Mailing _List"
 msgstr "_Llista de correu"
 
@@ -18946,15 +18521,15 @@ msgstr ""
 "Voleu marcar els missatges com a llegits nomÃs a la carpeta seleccionada, o "
 "bÃ a la carpeta seleccionada i a totes les seves subcarpetes?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:193
+#: ../plugins/mark-all-read/mark-all-read.c:215
 msgid "In Current Folder and _Subfolders"
 msgstr "A la carpeta actual i a les seves _subcarpetes"
 
-#: ../plugins/mark-all-read/mark-all-read.c:207
+#: ../plugins/mark-all-read/mark-all-read.c:229
 msgid "In Current _Folder Only"
 msgstr "_NomÃs a la carpeta actual"
 
-#: ../plugins/mark-all-read/mark-all-read.c:444
+#: ../plugins/mark-all-read/mark-all-read.c:575
 msgid "Mark Me_ssages as Read"
 msgstr "Marca els mi_ssatges com a llegits"
 
@@ -18981,19 +18556,19 @@ msgstr ""
 "Visualitza els missatges de correu en format de text sense format, encara "
 "que tinguin contingut HTML."
 
-#: ../plugins/prefer-plain/prefer-plain.c:241
+#: ../plugins/prefer-plain/prefer-plain.c:251
 msgid "Show HTML if present"
 msgstr "Mostra HTML si n'hi ha"
 
-#: ../plugins/prefer-plain/prefer-plain.c:241
+#: ../plugins/prefer-plain/prefer-plain.c:252
 msgid "Let Evolution choose the best part to show."
 msgstr "Deixa que l'Evolution decideixi la part Ãptima a mostrar."
 
-#: ../plugins/prefer-plain/prefer-plain.c:242
+#: ../plugins/prefer-plain/prefer-plain.c:255
 msgid "Show plain text if present"
 msgstr "Mostra text sense format si n'hi ha"
 
-#: ../plugins/prefer-plain/prefer-plain.c:242
+#: ../plugins/prefer-plain/prefer-plain.c:256
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -19001,11 +18576,11 @@ msgstr ""
 "Mostra la part de text sense format, si Ãs que existeix. En cas contrari, "
 "l'Evolution triarÃ la millor part a mostrar."
 
-#: ../plugins/prefer-plain/prefer-plain.c:243
+#: ../plugins/prefer-plain/prefer-plain.c:260
 msgid "Only ever show plain text"
 msgstr "Mostra nomÃs text sense format"
 
-#: ../plugins/prefer-plain/prefer-plain.c:243
+#: ../plugins/prefer-plain/prefer-plain.c:261
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -19013,11 +18588,11 @@ msgstr ""
 "Mostra sempre text sense format i crea adjuncions de les altres parts, si "
 "aixÃ s'especifica."
 
-#: ../plugins/prefer-plain/prefer-plain.c:290
+#: ../plugins/prefer-plain/prefer-plain.c:313
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Mostra les parts en HTML s_uprimides com a adjuncions"
 
-#: ../plugins/prefer-plain/prefer-plain.c:310
+#: ../plugins/prefer-plain/prefer-plain.c:333
 msgid "HTML _Mode"
 msgstr "_Mode HTML"
 
@@ -19033,42 +18608,38 @@ msgstr "Importador de PST de l'Outlook"
 msgid "Outlook personal folders (.pst)"
 msgstr "Carpetes personals de l'Outlook (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:309
+#: ../plugins/pst-import/pst-importer.c:450
 msgid "_Mail"
 msgstr "_Correu"
 
-#: ../plugins/pst-import/pst-importer.c:325
+#: ../plugins/pst-import/pst-importer.c:469
 msgid "Destination folder:"
 msgstr "Carpeta de destÃ:"
 
-#. Address book
-#: ../plugins/pst-import/pst-importer.c:331
+#: ../plugins/pst-import/pst-importer.c:475
 msgid "_Address Book"
 msgstr "_Llibreta d'adreces"
 
-#. Appointments
-#: ../plugins/pst-import/pst-importer.c:338
+#: ../plugins/pst-import/pst-importer.c:476
 msgid "A_ppointments"
 msgstr "Ci_tes"
 
-#. Tasks
-#: ../plugins/pst-import/pst-importer.c:344 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:477 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tasques"
 
-#. Journal
-#: ../plugins/pst-import/pst-importer.c:350
+#: ../plugins/pst-import/pst-importer.c:478
 msgid "_Journal entries"
 msgstr "_Entrades al diari"
 
-#: ../plugins/pst-import/pst-importer.c:365
+#: ../plugins/pst-import/pst-importer.c:585
 msgid "Importing Outlook data"
 msgstr "S'estan important les dades de l'Outlook"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:146
-#: ../plugins/publish-calendar/publish-calendar.c:154
-#: ../plugins/publish-calendar/publish-calendar.c:156
+#: ../plugins/publish-calendar/publish-calendar.c:147
+#: ../plugins/publish-calendar/publish-calendar.c:155
+#: ../plugins/publish-calendar/publish-calendar.c:157
 msgid "Calendar Publishing"
 msgstr "PublicaciÃ de calendaris"
 
@@ -19080,49 +18651,49 @@ msgstr "Ubicacions"
 msgid "Publish calendars to the web."
 msgstr "Publiqueu calendaris a la web."
 
-#: ../plugins/publish-calendar/publish-calendar.c:212
-#: ../plugins/publish-calendar/publish-calendar.c:453
+#: ../plugins/publish-calendar/publish-calendar.c:216
+#: ../plugins/publish-calendar/publish-calendar.c:471
 #, c-format
 msgid "Could not open %s:"
 msgstr "No s'ha pogut obrir %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:214
+#: ../plugins/publish-calendar/publish-calendar.c:218
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "No s'ha pogut obrir %s: error desconegut"
 
-#: ../plugins/publish-calendar/publish-calendar.c:234
+#: ../plugins/publish-calendar/publish-calendar.c:238
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "S'ha produÃt un error en publicar a %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:236
+#: ../plugins/publish-calendar/publish-calendar.c:240
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "S'ha completat la publicaciÃ a %s amb Ãxit"
 
-#: ../plugins/publish-calendar/publish-calendar.c:280
+#: ../plugins/publish-calendar/publish-calendar.c:288
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Ha fallat el muntatge de %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:600
+#: ../plugins/publish-calendar/publish-calendar.c:619
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "E_nable"
 msgstr "Habi_lita"
 
-#: ../plugins/publish-calendar/publish-calendar.c:743
+#: ../plugins/publish-calendar/publish-calendar.c:767
 msgid "Are you sure you want to remove this location?"
 msgstr "Segur que voleu suprimir aquesta ubicaciÃ?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
-#. where the publishing should be done, fails. Basically, this shouldn't
-#. ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1057
+#. * where the publishing should be done, fails. Basically, this shouldn't
+#. * ever happen, and if so, then something is really wrong.
+#: ../plugins/publish-calendar/publish-calendar.c:1099
 msgid "Could not create publish thread."
 msgstr "No s'ha pogut crear el fil de publicaciÃ."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1065
+#: ../plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr "_Publica informaciÃ del calendari"
 
@@ -19216,164 +18787,103 @@ msgstr "Nom d'_usuari:"
 msgid "iCal"
 msgstr "iCal"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:69
-#: ../plugins/publish-calendar/publish-format-ical.c:82
+#: ../plugins/publish-calendar/publish-format-fb.c:95
+#: ../plugins/publish-calendar/publish-format-ical.c:92
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr ""
 "No s'ha pogut publicar el calendari: el rerefons de calendari ja no existeix"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:484
+#: ../plugins/publish-calendar/url-editor-dialog.c:518
 msgid "New Location"
 msgstr "UbicaciÃ nova"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:486
+#: ../plugins/publish-calendar/url-editor-dialog.c:520
 msgid "Edit Location"
 msgstr "Edita la ubicaciÃ"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
-#, c-format
-msgid "SpamAssassin not found, code: %d"
-msgstr "No s'ha trobat l'SpamAssassin, codi retornat: %d"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
-#, c-format
-msgid "Failed to create pipe: %s"
-msgstr "No s'ha pogut crear el conducte (ÂpipeÂ): %s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
-#, c-format
-msgid "Error after fork: %s"
-msgstr "S'ha produÃt un error desprÃs de la crida ÂforkÂ: %s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
-#, c-format
-msgid "SpamAssassin child process does not respond, killing..."
-msgstr "El procÃs fill de l'SpamAssassin no respon; se suprimirÃ..."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
-#, c-format
-msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr ""
-"S'ha interromput l'espera per al procÃs fill del SpamAssassin; es "
-"terminarÃ..."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:252
-#, c-format
-msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr ""
-"Ha fallat la creaciÃ d'un conducte cap al SpamAssassin; el codi d'error fou: "
-"%d"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:519
-#, c-format
-msgid "SpamAssassin is not available. Please install it first."
-msgstr "L'SpamAssassin no estÃ disponible. InstalÂleu-lo abans de continuar."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
-msgid "This will make SpamAssassin more reliable, but slower"
-msgstr "AixÃ farÃ que l'SpamAssassin sigui mÃs fiable, perÃ mÃs lent"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:944
-msgid "I_nclude remote tests"
-msgstr "I_nclou proves remotes"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Filter junk messages using SpamAssassin."
-msgstr "Filtra els missatges de correu brossa amb l'SpamAssassin."
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Junk Filter"
-msgstr "Filtrador de correu brossa SpamAssassin"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin Options"
-msgstr "Opcions de l'SpamAssassin"
-
-#.
-#. * Translator: the %F %T is the thirth argument for a strftime function.
-#. * It lets you define the formatting of the date in the csv-file.
-#. *
-#: ../plugins/save-calendar/csv-format.c:161
+#. Translators: the %F %T is the third argument for a
+#. * strftime function.  It lets you define the formatting
+#. * of the date in the csv-file.
+#: ../plugins/save-calendar/csv-format.c:168
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Description List"
 msgstr "Llista de descripciÃ"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Categories List"
 msgstr "Llista de categories"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Comment List"
 msgstr "Llista de comentaris"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:389
 msgid "Contact List"
 msgstr "Llista de contactes"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "Start"
 msgstr "ComenÃa"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:391
 msgid "End"
 msgstr "Acaba"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:392
 msgid "Due"
 msgstr "Venciment"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:393
 msgid "percent Done"
 msgstr "percentatge fet"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:395
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:396
 msgid "Attendees List"
 msgstr "Llista d'assistents"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:398
 msgid "Modified"
 msgstr "Modificat"
 
-#: ../plugins/save-calendar/csv-format.c:530
+#: ../plugins/save-calendar/csv-format.c:573
 msgid "A_dvanced options for the CSV format"
 msgstr "Opcions a_vanÃades del format CSV"
 
-#: ../plugins/save-calendar/csv-format.c:537
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Prepend a _header"
 msgstr "Afegeix una ca_pÃalera al comenÃament"
 
-#: ../plugins/save-calendar/csv-format.c:546
+#: ../plugins/save-calendar/csv-format.c:590
 msgid "_Value delimiter:"
 msgstr "_Separador de valors:"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:601
 msgid "_Record delimiter:"
 msgstr "Separador de _registres:"
 
-#: ../plugins/save-calendar/csv-format.c:560
+#: ../plugins/save-calendar/csv-format.c:612
 msgid "_Encapsulate values with:"
 msgstr "_Encapsula els valors amb:"
 
-#: ../plugins/save-calendar/csv-format.c:582
-msgid "Comma separated value format (.csv)"
-msgstr "Format de valors separats per comes (.csv)"
+#: ../plugins/save-calendar/csv-format.c:638
+msgid "Comma separated values (.csv)"
+msgstr "Valors separats per comes (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:162
-msgid "iCalendar format (.ics)"
-msgstr "Format de l'iCalendar (.ics)"
+#: ../plugins/save-calendar/ical-format.c:173 ../shell/e-shell-utils.c:225
+msgid "iCalendar (.ics)"
+msgstr "iCalendar (.ics)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
@@ -19388,31 +18898,31 @@ msgstr "Desa un calendari o una llista de tasques al disc."
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:147
+#: ../plugins/save-calendar/rdf-format.c:156
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:369
-msgid "RDF format (.rdf)"
-msgstr "Format RDF (.rdf)"
+#: ../plugins/save-calendar/rdf-format.c:389
+msgid "RDF (.rdf)"
+msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:120
+#: ../plugins/save-calendar/save-calendar.c:127
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../plugins/save-calendar/save-calendar.c:181
+#: ../plugins/save-calendar/save-calendar.c:189
 msgid "Select destination file"
 msgstr "Seleccioneu el fitxer destÃ"
 
-#: ../plugins/save-calendar/save-calendar.c:334
+#: ../plugins/save-calendar/save-calendar.c:344
 msgid "Save the selected calendar to disk"
 msgstr "Desa el calendari seleccionat en el disc"
 
-#: ../plugins/save-calendar/save-calendar.c:365
+#: ../plugins/save-calendar/save-calendar.c:375
 msgid "Save the selected memo list to disk"
 msgstr "Desa l'anotaciÃ seleccionada en el disc"
 
-#: ../plugins/save-calendar/save-calendar.c:396
+#: ../plugins/save-calendar/save-calendar.c:406
 msgid "Save the selected task list to disk"
 msgstr "Desa la llista de tasques seleccionades en el disc"
 
@@ -19424,20 +18934,26 @@ msgstr ""
 "Llista de parells de clau/valor que el connector de plantilles substituirÃ "
 "en el cos d'un missatge."
 
-# FIXME (dpm)
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-msgid "Drafts based template plugin"
-msgstr "Connector de plantilles basat en esborranys"
+msgid ""
+"Drafts based template plugin. You can use variables like $ORIG[subject], "
+"$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
+"an email you are replying to."
+msgstr ""
+"Connector de plantilles basat en esborranys. Podeu utilitzar variables com "
+"$ORIG[subject] ($origen[assumpte]), $ORIG[to] ($origen[per]) o $ORIG[body] "
+"($origen[cos]), que es reemplaÃaran per els valors del correu que estigueu "
+"responent."
 
-#: ../plugins/templates/templates.c:635
+#: ../plugins/templates/templates.c:1094
 msgid "No Title"
 msgstr "Sense tÃtol"
 
-#: ../plugins/templates/templates.c:746
+#: ../plugins/templates/templates.c:1195
 msgid "Save as _Template"
 msgstr "Desa com a _plantilla"
 
-#: ../plugins/templates/templates.c:748
+#: ../plugins/templates/templates.c:1197
 msgid "Save as Template"
 msgstr "Desa com a plantilla"
 
@@ -19457,27 +18973,27 @@ msgstr "vCard en lÃnia"
 msgid "Show vCards directly in mail messages."
 msgstr "Mostra les vCard directament en els missatges de correu."
 
-#: ../plugins/vcard-inline/vcard-inline.c:198
-#: ../plugins/vcard-inline/vcard-inline.c:283
+#: ../plugins/vcard-inline/vcard-inline.c:207
+#: ../plugins/vcard-inline/vcard-inline.c:292
 msgid "Show Full vCard"
 msgstr "Mostra la vCard completa"
 
-#: ../plugins/vcard-inline/vcard-inline.c:201
+#: ../plugins/vcard-inline/vcard-inline.c:210
 msgid "Show Compact vCard"
 msgstr "Mostra la vCard compacta"
 
-#: ../plugins/vcard-inline/vcard-inline.c:262
+#: ../plugins/vcard-inline/vcard-inline.c:271
 msgid "There is one other contact."
 msgstr "Hi ha un altre contacte."
 
-#: ../plugins/vcard-inline/vcard-inline.c:271
+#: ../plugins/vcard-inline/vcard-inline.c:280
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Hi ha %d altre contacte."
 msgstr[1] "Hi ha %d contactes mÃs."
 
-#: ../plugins/vcard-inline/vcard-inline.c:292
+#: ../plugins/vcard-inline/vcard-inline.c:301
 msgid "Save in Address Book"
 msgstr "Desa a la llibreta d'adreces"
 
@@ -19493,11 +19009,11 @@ msgstr "Contactes WebDAV"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:256
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:282
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:283
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Evita l'IfMatch (requerit per a l'Apache < 2.2.8)"
 
@@ -19515,27 +19031,27 @@ msgstr "VersiÃ de la configuraciÃ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
-msgstr "Amplada predeterminada de la barra lateral"
+msgstr "Amplada per defecte de la barra lateral"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window X coordinate"
-msgstr "Coordinada X de finestra predeterminada"
+msgstr "Coordinada X de finestra per defecte"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window Y coordinate"
-msgstr "Coordinada Y de finestra predeterminada"
+msgstr "Coordinada Y de finestra per defecte"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window height"
-msgstr "AlÃada predeterminada de la finestra"
+msgstr "AlÃada per defecte de la finestra"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window state"
-msgstr "Estat predeterminat de la finestra"
+msgstr "Estat per defecte de la finestra"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "Default window width"
-msgstr "Amplada predeterminada de la finestra"
+msgstr "Amplada per defecte de la finestra"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid "Enable express mode"
@@ -19571,8 +19087,7 @@ msgstr "Nom d'usuari per al servidor intermediari per a l'HTTP"
 #: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
-"Identificador o sobrenom del component a mostrar per defecte a l'inici de "
-"manera predeterminada."
+"Identificador o sobrenom del component a mostrar per defecte a l'inici."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid ""
@@ -19668,7 +19183,7 @@ msgstr "La barra lateral Ãs visible"
 msgid "Skip development warning dialog"
 msgstr "Omet el diÃleg d'avÃs de versiÃ de desenvolupament"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:373
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:314
 msgid "Start in offline mode"
 msgstr "Inicia en mode fora de lÃnia"
 
@@ -19686,23 +19201,23 @@ msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default X coordinate for the main window."
-msgstr "La coordinada X predeterminada de la finestra principal."
+msgstr "La coordinada X per defecte de la finestra principal."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The default Y coordinate for the main window."
-msgstr "La coordinada Y predeterminada de la finestra principal."
+msgstr "La coordinada Y per defecte de la finestra principal."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default height for the main window, in pixels."
-msgstr "AlÃada predeterminada de la finestra principal, en pÃxels."
+msgstr "AlÃada per defecte de la finestra principal, en pÃxels."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid "The default width for the main window, in pixels."
-msgstr "Amplada predeterminada de la finestra principal, en pÃxels."
+msgstr "Amplada per defecte de la finestra principal, en pÃxels."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The default width for the sidebar, in pixels."
-msgstr "L'amplada predeterminada de la barra lateral, en pÃxels."
+msgstr "L'amplada per defecte de la barra lateral, en pÃxels."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
@@ -19790,7 +19305,7 @@ msgid "Use HTTP proxy"
 msgstr "Utilitza un servidor intermediari HTTP"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "User name to pass as authentication when doing HTTP proxying."
+msgid "Username to pass as authentication when doing HTTP proxying."
 msgstr ""
 "Nom d'usuari a utilitzar per a l'autenticaciÃ quan es faci servir un "
 "servidor intermediari HTTP."
@@ -19835,11 +19350,11 @@ msgstr "Estil del botÃ de la finestra"
 msgid "Window buttons are visible"
 msgstr "Els botons de la finestra sÃn visibles"
 
-#: ../shell/e-shell-content.c:695 ../shell/e-shell-content.c:696
+#: ../shell/e-shell-content.c:729 ../shell/e-shell-content.c:730
 msgid "Searches"
 msgstr "Cerques"
 
-#: ../shell/e-shell-content.c:738
+#: ../shell/e-shell-content.c:773
 msgid "Save Search"
 msgstr "Desa la cerca"
 
@@ -19847,42 +19362,38 @@ msgstr "Desa la cerca"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:935
+#: ../shell/e-shell-searchbar.c:938
 msgid "Sho_w:"
 msgstr "Mos_tra:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:968
+#: ../shell/e-shell-searchbar.c:971
 msgid "Sear_ch:"
 msgstr "Cer_ca:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1031
+#: ../shell/e-shell-searchbar.c:1034
 msgid "i_n"
 msgstr "_a"
 
-#: ../shell/e-shell-utils.c:219
+#: ../shell/e-shell-utils.c:223
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:221
-msgid "iCalendar (.ics)"
-msgstr "iCalendar (.ics)"
-
-#: ../shell/e-shell-utils.c:242
+#: ../shell/e-shell-utils.c:246
 msgid "All Files (*)"
 msgstr "Tots els fitxers (*)"
 
-#: ../shell/e-shell-view.c:291
+#: ../shell/e-shell-view.c:296
 msgid "Saving user interface state"
 msgstr "S'estÃ desant l'estat de la interfÃcie d'usuari"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:643
+#: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr ""
 "VÃctor Nieto <vnie2025 alu-etsetb upc es>\n"
@@ -19894,295 +19405,299 @@ msgstr ""
 "Gil Forcada <gilforcada guifi net>\n"
 "David Planella Molas <david planella gmail com>"
 
-#: ../shell/e-shell-window-actions.c:654
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "Lloc web de l'Evolution"
 
-#: ../shell/e-shell-window-actions.c:1215
+#: ../shell/e-shell-window-actions.c:902
+msgid "Categories Editor"
+msgstr "Editor de categories"
+
+#: ../shell/e-shell-window-actions.c:1237
 msgid "Bug Buddy is not installed."
 msgstr "El Bug Buddy no estÃ instalÂlat."
 
-#: ../shell/e-shell-window-actions.c:1217
+#: ../shell/e-shell-window-actions.c:1239
 msgid "Bug Buddy could not be run."
 msgstr "No es pot executar el Bug Buddy."
 
-#: ../shell/e-shell-window-actions.c:1398
+#: ../shell/e-shell-window-actions.c:1420
 msgid "Show information about Evolution"
 msgstr "Mostra informaciÃ sobre l'Evolution"
 
-#: ../shell/e-shell-window-actions.c:1403
-#: ../shell/e-shell-window-actions.c:1417
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1439
 msgid "_Close Window"
 msgstr "_Tanca la finestra"
 
-#: ../shell/e-shell-window-actions.c:1424
+#: ../shell/e-shell-window-actions.c:1446
 msgid "_Contents"
 msgstr "C_ontingut"
 
-#: ../shell/e-shell-window-actions.c:1426
+#: ../shell/e-shell-window-actions.c:1448
 msgid "Open the Evolution User Guide"
 msgstr "Obre la guia de l'usuari de l'Evolution"
 
-#: ../shell/e-shell-window-actions.c:1452
-msgid "Evolution _FAQ"
-msgstr "_PMF de l'Evolution"
-
-#: ../shell/e-shell-window-actions.c:1454
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "Obre la pÃgina web de les Preguntes MÃs FreqÃents"
-
-#: ../shell/e-shell-window-actions.c:1459
+#: ../shell/e-shell-window-actions.c:1474
 msgid "_Forget Passwords"
 msgstr "Oblida les _contrasenyes"
 
-#: ../shell/e-shell-window-actions.c:1461
+#: ../shell/e-shell-window-actions.c:1476
 msgid "Forget all remembered passwords"
 msgstr "Oblida totes les contrasenyes recordades"
 
-#: ../shell/e-shell-window-actions.c:1466
+#: ../shell/e-shell-window-actions.c:1481
 msgid "I_mport..."
 msgstr "I_mporta..."
 
-#: ../shell/e-shell-window-actions.c:1468
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Import data from other programs"
 msgstr "Importa dades d'altres programes"
 
-#: ../shell/e-shell-window-actions.c:1473
+#: ../shell/e-shell-window-actions.c:1488
 msgid "New _Window"
 msgstr "_Finestra nova"
 
-#: ../shell/e-shell-window-actions.c:1475
+#: ../shell/e-shell-window-actions.c:1490
 msgid "Create a new window displaying this view"
 msgstr "Crea una finestra nova que mostri aquesta visualitzaciÃ"
 
-#: ../shell/e-shell-window-actions.c:1494
+#: ../shell/e-shell-window-actions.c:1502
+msgid "Available Cate_gories"
+msgstr "C_ategories disponibles"
+
+#: ../shell/e-shell-window-actions.c:1504
+msgid "Manage available categories"
+msgstr "Gestiona les categories disponibles"
+
+#: ../shell/e-shell-window-actions.c:1516
 msgid "_Quick Reference"
 msgstr "ReferÃncia rÃ_pida"
 
-#: ../shell/e-shell-window-actions.c:1496
+#: ../shell/e-shell-window-actions.c:1518
 msgid "Show Evolution's shortcut keys"
 msgstr "Mostra les dreceres de teclat de l'Evolution"
 
-#: ../shell/e-shell-window-actions.c:1503
+#: ../shell/e-shell-window-actions.c:1525
 msgid "Exit the program"
 msgstr "Surt del programa"
 
-#: ../shell/e-shell-window-actions.c:1508
+#: ../shell/e-shell-window-actions.c:1530
 msgid "_Advanced Search..."
 msgstr "Cerca _avanÃada..."
 
-#: ../shell/e-shell-window-actions.c:1510
+#: ../shell/e-shell-window-actions.c:1532
 msgid "Construct a more advanced search"
 msgstr "Creeu una cerca mÃs avanÃada"
 
-#: ../shell/e-shell-window-actions.c:1517
+#: ../shell/e-shell-window-actions.c:1539
 msgid "Clear the current search parameters"
 msgstr "Neteja els parÃmetres actuals de cerca"
 
-#: ../shell/e-shell-window-actions.c:1522
+#: ../shell/e-shell-window-actions.c:1544
 msgid "_Edit Saved Searches..."
 msgstr "_Edita les cerques desades..."
 
-#: ../shell/e-shell-window-actions.c:1524
+#: ../shell/e-shell-window-actions.c:1546
 msgid "Manage your saved searches"
 msgstr "Gestioneu les vostres cerques desades"
 
-#: ../shell/e-shell-window-actions.c:1531
+#: ../shell/e-shell-window-actions.c:1553
 msgid "Click here to change the search type"
 msgstr "Feu clic aquÃ per canviar el tipus de cerca"
 
-#: ../shell/e-shell-window-actions.c:1536
+#: ../shell/e-shell-window-actions.c:1558
 msgid "_Find Now"
 msgstr "_Cerca ara"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1538
+#: ../shell/e-shell-window-actions.c:1560
 msgid "Execute the current search parameters"
 msgstr "Executa els parÃmetres actuals de cerca"
 
-#: ../shell/e-shell-window-actions.c:1543
+#: ../shell/e-shell-window-actions.c:1565
 msgid "_Save Search..."
 msgstr "De_sa la cerca..."
 
-#: ../shell/e-shell-window-actions.c:1545
+#: ../shell/e-shell-window-actions.c:1567
 msgid "Save the current search parameters"
 msgstr "Desa els parÃmetres de cerca actuals"
 
-#: ../shell/e-shell-window-actions.c:1557
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Submit _Bug Report..."
 msgstr "En_via un informe d'error..."
 
-#: ../shell/e-shell-window-actions.c:1559
+#: ../shell/e-shell-window-actions.c:1581
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Envia un informe d'error utilitzant el Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1564
+#: ../shell/e-shell-window-actions.c:1586
 msgid "_Work Offline"
 msgstr "_Treballa fora de lÃnia"
 
-#: ../shell/e-shell-window-actions.c:1566
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Put Evolution into offline mode"
 msgstr "Posa l'Evolution en mode fora de lÃnia"
 
-#: ../shell/e-shell-window-actions.c:1571
+#: ../shell/e-shell-window-actions.c:1593
 msgid "_Work Online"
 msgstr "_Treballa en lÃnia"
 
-#: ../shell/e-shell-window-actions.c:1573
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Put Evolution into online mode"
 msgstr "Posa l'Evolution en mode en lÃnia"
 
-#: ../shell/e-shell-window-actions.c:1601
+#: ../shell/e-shell-window-actions.c:1623
 msgid "Lay_out"
 msgstr "_DisposiciÃ"
 
-#: ../shell/e-shell-window-actions.c:1608
+#: ../shell/e-shell-window-actions.c:1630
 msgid "_New"
 msgstr "_Nou"
 
-#: ../shell/e-shell-window-actions.c:1615
+#: ../shell/e-shell-window-actions.c:1637
 msgid "_Search"
 msgstr "_Cerca"
 
-#: ../shell/e-shell-window-actions.c:1622
+#: ../shell/e-shell-window-actions.c:1644
 msgid "_Switcher Appearance"
 msgstr "AparenÃa de l'_intercanviador"
 
-#: ../shell/e-shell-window-actions.c:1636
+#: ../shell/e-shell-window-actions.c:1658
 msgid "_Window"
 msgstr "_Finestra"
 
-#: ../shell/e-shell-window-actions.c:1665
+#: ../shell/e-shell-window-actions.c:1687
 msgid "Show Side _Bar"
 msgstr "Mostra la _barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1667
+#: ../shell/e-shell-window-actions.c:1689
 msgid "Show the side bar"
 msgstr "Mostra la barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1673
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show _Buttons"
 msgstr "Mostra els _botons"
 
-#: ../shell/e-shell-window-actions.c:1675
+#: ../shell/e-shell-window-actions.c:1697
 msgid "Show the switcher buttons"
 msgstr "Mostra els botons de commutaciÃ"
 
-#: ../shell/e-shell-window-actions.c:1681
+#: ../shell/e-shell-window-actions.c:1703
 msgid "Show _Status Bar"
 msgstr "Mostra la barra d'e_stat"
 
-#: ../shell/e-shell-window-actions.c:1683
+#: ../shell/e-shell-window-actions.c:1705
 msgid "Show the status bar"
 msgstr "Mostra la barra d'estat"
 
-#: ../shell/e-shell-window-actions.c:1689
+#: ../shell/e-shell-window-actions.c:1711
 msgid "Show _Tool Bar"
 msgstr "Mos_tra la barra d'eines"
 
-#: ../shell/e-shell-window-actions.c:1691
+#: ../shell/e-shell-window-actions.c:1713
 msgid "Show the tool bar"
 msgstr "Mostra la barra d'eines"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1735
 msgid "_Icons Only"
 msgstr "NomÃs _icones"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Display window buttons with icons only"
 msgstr "Visualitza els botons de la finestra nomÃs amb icones"
 
-#: ../shell/e-shell-window-actions.c:1720
+#: ../shell/e-shell-window-actions.c:1742
 msgid "_Text Only"
 msgstr "NomÃs _text"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1744
 msgid "Display window buttons with text only"
 msgstr "Visualitza els botons de finestra nomÃs amb text"
 
-#: ../shell/e-shell-window-actions.c:1727
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Icons _and Text"
 msgstr "Icones i _text"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1751
 msgid "Display window buttons with icons and text"
 msgstr "Visualitza els botons de la finestra amb icones i text"
 
-#: ../shell/e-shell-window-actions.c:1734
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Tool_bar Style"
 msgstr "Estil de la _barra d'eines"
 
-#: ../shell/e-shell-window-actions.c:1736
+#: ../shell/e-shell-window-actions.c:1758
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Visualitza els botons de la finestra utilitzant la configuraciÃ de "
 "l'escriptori"
 
-#: ../shell/e-shell-window-actions.c:1744
+#: ../shell/e-shell-window-actions.c:1766
 msgid "Define Views..."
 msgstr "Defineix les visualitzacions..."
 
-#: ../shell/e-shell-window-actions.c:1746
+#: ../shell/e-shell-window-actions.c:1768
 msgid "Create or edit views"
 msgstr "Crea o edita visualitzacions"
 
-#: ../shell/e-shell-window-actions.c:1751
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Save Custom View..."
 msgstr "Desa la visualitzaciÃ personalitzada..."
 
-#: ../shell/e-shell-window-actions.c:1753
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Save current custom view"
 msgstr "Desa la visualitzaciÃ personalitzada actual"
 
-#: ../shell/e-shell-window-actions.c:1760
+#: ../shell/e-shell-window-actions.c:1782
 msgid "C_urrent View"
 msgstr "Vis_ualitzaciÃ actual"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1792
 msgid "Custom View"
 msgstr "VisualitzaciÃ personalitzada"
 
-#: ../shell/e-shell-window-actions.c:1772
+#: ../shell/e-shell-window-actions.c:1794
 msgid "Current view is a customized view"
 msgstr "La visualitzaciÃ actual ha estat personalitzada"
 
-#: ../shell/e-shell-window-actions.c:1782
+#: ../shell/e-shell-window-actions.c:1804
 msgid "Change the page settings for your current printer"
 msgstr "Configura els parÃmetres de pÃgina per a la impressora actual"
 
-#: ../shell/e-shell-window-actions.c:2167
+#: ../shell/e-shell-window-actions.c:2194
 #, c-format
 msgid "Switch to %s"
 msgstr "Commuta a %s"
 
-#: ../shell/e-shell-window-actions.c:2382
+#: ../shell/e-shell-window-actions.c:2414
 msgid "Execute these search parameters"
 msgstr "Executa aquests parÃmetres de cerca"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:580
+#: ../shell/e-shell-window-private.c:584
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:438
+#: ../shell/e-shell-window.c:442
 msgid "New"
 msgstr "Nou"
 
-#: ../shell/e-shell.c:314
+#: ../shell/e-shell.c:361
 msgid "Preparing to go offline..."
 msgstr "S'estÃ preparant per treballar fora de lÃnia..."
 
-#: ../shell/e-shell.c:367
+#: ../shell/e-shell.c:414
 msgid "Preparing to go online..."
 msgstr "S'estÃ preparant per treballar en lÃnia..."
 
-#: ../shell/e-shell.c:429
+#: ../shell/e-shell.c:476
 msgid "Preparing to quit..."
 msgstr "S'estÃ preparant la sortida..."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:189
+#: ../shell/main.c:195
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20218,7 +19733,7 @@ msgstr ""
 "Esperem que gaudiu del resultat de la nostra feina, i esperem\n"
 "ansiosament les vostres contribucions.\n"
 
-#: ../shell/main.c:213
+#: ../shell/main.c:219
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20226,13 +19741,13 @@ msgstr ""
 "GrÃcies\n"
 "L'equip de l'Evolution\n"
 
-#: ../shell/main.c:220
+#: ../shell/main.c:226
 msgid "Do not tell me again"
 msgstr "No ho tornis a mostrar"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:367
+#: ../shell/main.c:308
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -20241,55 +19756,55 @@ msgstr ""
 "opcions disponibles sÃn ÂmailÂ (correu), ÂcalendarÂ (calendari), "
 "ÂcontactsÂ (contactes), ÂtasksÂ (tasques) i ÂmemosÂ (anotacions)"
 
-#: ../shell/main.c:371
+#: ../shell/main.c:312
 msgid "Apply the given geometry to the main window"
 msgstr "Aplica la geometria especificada a la finestra principal"
 
-#: ../shell/main.c:375
+#: ../shell/main.c:316
 msgid "Start in online mode"
 msgstr "Inicia en mode en lÃnia"
 
-#: ../shell/main.c:377
+#: ../shell/main.c:318
 msgid "Ignore network availability"
 msgstr "Ignora la disponibilitat de la xarxa"
 
-#: ../shell/main.c:379
+#: ../shell/main.c:320
 msgid "Start in \"express\" mode"
 msgstr "Inicia en mode senzill"
 
-#: ../shell/main.c:382
+#: ../shell/main.c:323
 msgid "Forcibly shut down Evolution"
 msgstr "ForÃa l'aturada de l'Evolution"
 
-#: ../shell/main.c:385
+#: ../shell/main.c:326
 msgid "Send the debugging output of all components to a file."
 msgstr "Envia la sortida de depuraciÃ de tots els components a un fitxer."
 
-#: ../shell/main.c:387
+#: ../shell/main.c:328
 msgid "Disable loading of any plugins."
 msgstr "Inhabilita la cÃrrega de connectors."
 
-#: ../shell/main.c:389
+#: ../shell/main.c:330
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr ""
 "Inhabilita la subfinestra de previsualitzaciÃ per al Correu, Contactes i "
 "Tasques."
 
-#: ../shell/main.c:393
+#: ../shell/main.c:334
 msgid "Import URIs or file names given as rest of arguments."
 msgstr ""
 "Importa els URI o noms de fitxers especificats com la resta d'arguments."
 
-#: ../shell/main.c:395
+#: ../shell/main.c:336
 msgid "Request a running Evolution process to quit"
 msgstr ""
 "SolÂlicita que surti a un procÃs de l'Evolution que s'estigui executant"
 
-#: ../shell/main.c:569 ../shell/main.c:577
+#: ../shell/main.c:512 ../shell/main.c:520
 msgid "- The Evolution PIM and Email Client"
 msgstr "El gestor d'informaciÃ personal i client de correu de l'Evolution"
 
-#: ../shell/main.c:640
+#: ../shell/main.c:583
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20298,7 +19813,7 @@ msgstr ""
 "%s: --online i --offline no es poden utilitzar junts.\n"
 "  Executeu l'ordre Â%s --helpÂ per obtenir mÃs informaciÃ.\n"
 
-#: ../shell/main.c:646
+#: ../shell/main.c:589
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -20379,72 +19894,72 @@ msgstr "_Font de prova"
 msgid "Create a new test source"
 msgstr "Crea una font de prova nova"
 
-#: ../smclient/eggdesktopfile.c:165
+#: ../smclient/eggdesktopfile.c:166
 #, c-format
 msgid "File is not a valid .desktop file"
 msgstr "El fitxer no Ãs un fitxer .desktop vÃlid"
 
-#: ../smclient/eggdesktopfile.c:188
+#: ../smclient/eggdesktopfile.c:189
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "No es reconeix la versiÃ Â%sÂ del fitxer d'escriptori"
 
-#: ../smclient/eggdesktopfile.c:957
+#: ../smclient/eggdesktopfile.c:959
 #, c-format
 msgid "Starting %s"
 msgstr "S'estÃ iniciant %s"
 
-#: ../smclient/eggdesktopfile.c:1098
+#: ../smclient/eggdesktopfile.c:1102
 #, c-format
 msgid "Application does not accept documents on command line"
 msgstr "L'aplicaciÃ no accepta documents a la lÃnia d'ordres"
 
-#: ../smclient/eggdesktopfile.c:1166
+#: ../smclient/eggdesktopfile.c:1170
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "No es reconeix l'opciÃ d'inici: %d"
 
-#: ../smclient/eggdesktopfile.c:1365
+#: ../smclient/eggdesktopfile.c:1370
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr ""
 "No es poden especificar URI de document a una entrada d'escriptori de tipus "
 "ÂType=LinkÂ"
 
-#: ../smclient/eggdesktopfile.c:1386
+#: ../smclient/eggdesktopfile.c:1391
 #, c-format
 msgid "Not a launchable item"
 msgstr "No Ãs un element que es pugui iniciar"
 
-#: ../smclient/eggsmclient.c:224
+#: ../smclient/eggsmclient.c:226
 msgid "Disable connection to session manager"
 msgstr "Inhabilita la connexiÃ al gestor de sessions"
 
-#: ../smclient/eggsmclient.c:227
+#: ../smclient/eggsmclient.c:229
 msgid "Specify file containing saved configuration"
 msgstr "Especifiqueu el fitxer que contÃ la configuraciÃ desada"
 
-#: ../smclient/eggsmclient.c:227
+#: ../smclient/eggsmclient.c:229
 msgid "FILE"
 msgstr "FITXER"
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:232
 msgid "Specify session management ID"
 msgstr "Especifiqueu l'identificador de gestiÃ de la sessiÃ"
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:232
 msgid "ID"
 msgstr "ID"
 
-#: ../smclient/eggsmclient.c:251
+#: ../smclient/eggsmclient.c:253
 msgid "Session management options:"
 msgstr "Opcions de la gestiÃ de la sessiÃ:"
 
-#: ../smclient/eggsmclient.c:252
+#: ../smclient/eggsmclient.c:254
 msgid "Show session management options"
 msgstr "Mostra les opcions de la gestiÃ de la sessiÃ"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:107
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20455,7 +19970,7 @@ msgstr ""
 "\n"
 "Editeu la configuraciÃ de la confianÃa:"
 
-#: ../smime/gui/cert-trust-dialog.c:144
+#: ../smime/gui/cert-trust-dialog.c:146
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -20465,7 +19980,7 @@ msgstr ""
 "certificat, confieu en l'autenticitat d'aquest certificat tret que aquÃ "
 "s'especifiqui el contrari"
 
-#: ../smime/gui/cert-trust-dialog.c:148
+#: ../smime/gui/cert-trust-dialog.c:150
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -20475,87 +19990,120 @@ msgstr ""
 "certificat, no confieu en l'autenticitat d'aquest certificat tret que aquÃ "
 "s'especifiqui el contrari"
 
-#: ../smime/gui/certificate-manager.c:148
-#: ../smime/gui/certificate-manager.c:460
-#: ../smime/gui/certificate-manager.c:697
-msgid "Select a certificate to import..."
-msgstr "Seleccioneu quin certificat s'importarÃ..."
-
-#: ../smime/gui/certificate-manager.c:157
-msgid "All PKCS12 files"
-msgstr "Tots els fitxers PKCS12"
+#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
+msgid "Certificate Name"
+msgstr "Nom del certificat"
 
-#: ../smime/gui/certificate-manager.c:163
-#: ../smime/gui/certificate-manager.c:475
-#: ../smime/gui/certificate-manager.c:711
-msgid "All files"
-msgstr "Tots els fitxers"
+#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+msgid "Issued To Organization"
+msgstr "EmÃs per l'Ãs de la organitzaciÃ"
 
-#: ../smime/gui/certificate-manager.c:182
-msgid "Failed to import user's certificate"
-msgstr "Ha fallat la importaciÃ del certificat de l'usuari"
+#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
+msgid "Issued To Organizational Unit"
+msgstr "EmÃs per l'Ãs de la unitat organitzacional"
 
-#: ../smime/gui/certificate-manager.c:352
-#: ../smime/gui/certificate-manager.c:574
-#: ../smime/gui/certificate-manager.c:808
-msgid "Certificate Name"
-msgstr "Nom del certificat"
+#: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
+#: ../smime/gui/certificate-manager.c:114 ../smime/gui/smime-ui.ui.h:32
+#: ../smime/lib/e-cert.c:569
+msgid "Serial Number"
+msgstr "NÃmero de sÃrie"
 
-#: ../smime/gui/certificate-manager.c:361
-#: ../smime/gui/certificate-manager.c:592
+#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
+#: ../smime/gui/certificate-manager.c:115
 msgid "Purposes"
 msgstr "Finalitats"
 
-#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
-#: ../smime/lib/e-cert.c:566
-msgid "Serial Number"
-msgstr "NÃmero de sÃrie"
+#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:23
+msgid "Issued By"
+msgstr "EmÃs per"
 
-#: ../smime/gui/certificate-manager.c:378
+#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:117
+msgid "Issued By Organization"
+msgstr "EmÃs per la organitzaciÃ"
+
+#: ../smime/gui/certificate-manager.c:80
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:118
+msgid "Issued By Organizational Unit"
+msgstr "EmÃs per la unitat organitzacional"
+
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:119
+msgid "Issued"
+msgstr "EmÃs"
+
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:120
 msgid "Expires"
 msgstr "Venciment"
 
-#: ../smime/gui/certificate-manager.c:469
-msgid "All email certificate files"
-msgstr "Tots els fitxers de certificat de correu"
+#: ../smime/gui/certificate-manager.c:83
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:121 ../smime/gui/smime-ui.ui.h:29
+msgid "SHA1 Fingerprint"
+msgstr "Empremta electrÃnica SHA1"
 
-#: ../smime/gui/certificate-manager.c:502
-msgid "Failed to import contact's certificate"
-msgstr "Ha fallat la importaciÃ del certificat del contacte"
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:122 ../smime/gui/smime-ui.ui.h:26
+msgid "MD5 Fingerprint"
+msgstr "Empremta electrÃnica MD5"
 
-#: ../smime/gui/certificate-manager.c:583
-msgid "E-Mail Address"
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
+msgid "Email Address"
 msgstr "AdreÃa electrÃnica"
 
-#: ../smime/gui/certificate-manager.c:706
+#: ../smime/gui/certificate-manager.c:575
+msgid "Select a certificate to import..."
+msgstr "Seleccioneu quin certificat s'importarÃ..."
+
+#: ../smime/gui/certificate-manager.c:588
+msgid "All files"
+msgstr "Tots els fitxers"
+
+#: ../smime/gui/certificate-manager.c:623
+msgid "Failed to import certificate"
+msgstr "Ha fallat la importaciÃ del certificat"
+
+#: ../smime/gui/certificate-manager.c:991
+msgid "All PKCS12 files"
+msgstr "Tots els fitxers PKCS12"
+
+#: ../smime/gui/certificate-manager.c:1009
+msgid "All email certificate files"
+msgstr "Tots els fitxers de certificat de correu"
+
+#: ../smime/gui/certificate-manager.c:1027
 msgid "All CA certificate files"
 msgstr "Tots els fitxers de certificat d'entitats certificadores"
 
-#: ../smime/gui/certificate-manager.c:737
-msgid "Failed to import certificate authority's certificate"
-msgstr "Ha fallat la importaciÃ del certificat de l'autoritat de certificaciÃ"
-
-#: ../smime/gui/certificate-viewer.c:338
+#: ../smime/gui/certificate-viewer.c:345
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visualitzador de certificats: %s"
 
-#: ../smime/gui/component.c:46
+#: ../smime/gui/component.c:50
 #, c-format
 msgid "Enter the password for '%s'"
 msgstr "IntroduÃu la contrasenya per a Â%sÂ"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:69
+#: ../smime/gui/component.c:76
 msgid "Enter new password for certificate database"
 msgstr "IntroduÃu una contrasenya nova per a la base de dades de certificats"
 
-#: ../smime/gui/component.c:71
+#: ../smime/gui/component.c:78
 msgid "Enter new password"
 msgstr "IntroduÃu la contrasenya nova"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:116
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20564,7 +20112,7 @@ msgstr ""
 "EmÃs per a:\n"
 "  Assumpte: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:117
+#: ../smime/gui/e-cert-selector.c:119
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20573,7 +20121,7 @@ msgstr ""
 "EmÃs per:\n"
 "  Assumpte: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:169
+#: ../smime/gui/e-cert-selector.c:172
 msgid "Select certificate"
 msgstr "Seleccioneu el certificat"
 
@@ -20598,7 +20146,7 @@ msgstr ""
 "propÃsit, n'haurÃeu d'examinar el certificat i la seva polÃtica i "
 "procediments (si estan disponibles)."
 
-#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1097
 msgid "Certificate"
 msgstr "Certificat"
 
@@ -20658,10 +20206,6 @@ msgstr "Valor del camp"
 msgid "Fingerprints"
 msgstr "Empremtes electrÃniques"
 
-#: ../smime/gui/smime-ui.ui.h:23
-msgid "Issued By"
-msgstr "EmÃs per"
-
 #: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "EmÃs el"
@@ -20670,10 +20214,6 @@ msgstr "EmÃs el"
 msgid "Issued To"
 msgstr "EmÃs per a"
 
-#: ../smime/gui/smime-ui.ui.h:26
-msgid "MD5 Fingerprint"
-msgstr "Empremta electrÃnica MD5"
-
 #: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "OrganitzaciÃ (O)"
@@ -20682,15 +20222,11 @@ msgstr "OrganitzaciÃ (O)"
 msgid "Organizational Unit (OU)"
 msgstr "Unitat organitzacional (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:29
-msgid "SHA1 Fingerprint"
-msgstr "Empremta electrÃnica SHA1"
-
-#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:829
 msgid "SSL Client Certificate"
 msgstr "Certificat SSL del client"
 
-#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:833
 msgid "SSL Server Certificate"
 msgstr "Certificat SSL del servidor"
 
@@ -20750,7 +20286,7 @@ msgstr "Fes-ne una cÃpia de _seguretat"
 msgid "_Edit CA Trust"
 msgstr "_Edita la confianÃa en l'entitat certificadora"
 
-#: ../smime/lib/e-cert-db.c:906
+#: ../smime/lib/e-cert-db.c:912
 msgid "Certificate already exists"
 msgstr "El certificat ja existeix"
 
@@ -20759,194 +20295,196 @@ msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:414
+#: ../smime/lib/e-cert.c:417
 msgid "Sign"
 msgstr "Signa"
 
-#: ../smime/lib/e-cert.c:415
+#: ../smime/lib/e-cert.c:418
 msgid "Encrypt"
 msgstr "Xifra"
 
-#: ../smime/lib/e-cert.c:527
+#: ../smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "VersiÃ"
 
-#: ../smime/lib/e-cert.c:542
+#: ../smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "VersiÃ 1"
 
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "VersiÃ 2"
 
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "VersiÃ 3"
 
-#: ../smime/lib/e-cert.c:630
+#: ../smime/lib/e-cert.c:634
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 amb xifratge RSA"
 
-#: ../smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:637
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 amb xifratge RSA"
 
-#: ../smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:640
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 amb xifratge RSA"
 
-#: ../smime/lib/e-cert.c:639
+#: ../smime/lib/e-cert.c:643
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "PKCS #1 SHA-256 amb encriptaciÃ RSA"
 
-#: ../smime/lib/e-cert.c:642
+#: ../smime/lib/e-cert.c:646
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "PKCS #1 SHA-384 amb encriptaciÃ RSA"
 
-#: ../smime/lib/e-cert.c:645
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "PKCS #1 SHA-512 amb encriptaciÃ RSA"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:676
 msgid "PKCS #1 RSA Encryption"
 msgstr "Xifratge PKCS #1 RSA"
 
-#: ../smime/lib/e-cert.c:675
+#: ../smime/lib/e-cert.c:679
 msgid "Certificate Key Usage"
 msgstr "Ãs de la clau de certificat"
 
-#: ../smime/lib/e-cert.c:678
+#: ../smime/lib/e-cert.c:682
 msgid "Netscape Certificate Type"
 msgstr "Tipus de certificat del Netscape"
 
-#: ../smime/lib/e-cert.c:681
+#: ../smime/lib/e-cert.c:685
 msgid "Certificate Authority Key Identifier"
 msgstr "Identificador de clau de l'entitat certificadora"
 
-#: ../smime/lib/e-cert.c:693
+#: ../smime/lib/e-cert.c:697
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identificador de l'objecte (%s)"
 
-#: ../smime/lib/e-cert.c:744
+#: ../smime/lib/e-cert.c:749
 msgid "Algorithm Identifier"
 msgstr "Identificador de l'algorisme"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:757
 msgid "Algorithm Parameters"
 msgstr "ParÃmetres de l'algorisme"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:779
 msgid "Subject Public Key Info"
 msgstr "InformaciÃ de clau pÃblica de l'assumpte"
 
-#: ../smime/lib/e-cert.c:779
+#: ../smime/lib/e-cert.c:784
 msgid "Subject Public Key Algorithm"
 msgstr "Algorisme de clau pÃblica de l'assumpte"
 
-#: ../smime/lib/e-cert.c:794
+#: ../smime/lib/e-cert.c:799
 msgid "Subject's Public Key"
 msgstr "Clau pÃblica de l'assumpte"
 
-#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:820 ../smime/lib/e-cert.c:870
 msgid "Error: Unable to process extension"
 msgstr "S'ha produÃt un error: no es pot processar l'extensiÃ"
 
-#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
+#: ../smime/lib/e-cert.c:841 ../smime/lib/e-cert.c:853
 msgid "Object Signer"
 msgstr "Signador de l'objecte"
 
-#: ../smime/lib/e-cert.c:840
+#: ../smime/lib/e-cert.c:845
 msgid "SSL Certificate Authority"
 msgstr "Entitat certificadora de l'SSL"
 
-#: ../smime/lib/e-cert.c:844
+#: ../smime/lib/e-cert.c:849
 msgid "Email Certificate Authority"
 msgstr "Entitat certificadora del correu electrÃnic"
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:878
 msgid "Signing"
 msgstr "Signatura"
 
 # FIXME: si algÃ vol canviar-ho, aquÃ hi ha un bon article
 # sobre el tema: http://www.firstmonday.org/issues/issue5_8/mccullagh/
 # (dpm)
-#: ../smime/lib/e-cert.c:876
+#: ../smime/lib/e-cert.c:882
 msgid "Non-repudiation"
 msgstr "Propietat de no refÃs"
 
-#: ../smime/lib/e-cert.c:880
+#: ../smime/lib/e-cert.c:886
 msgid "Key Encipherment"
 msgstr "Xifrat de clau"
 
-#: ../smime/lib/e-cert.c:884
+#: ../smime/lib/e-cert.c:890
 msgid "Data Encipherment"
 msgstr "Xifrat de dades"
 
-#: ../smime/lib/e-cert.c:888
+#: ../smime/lib/e-cert.c:894
 msgid "Key Agreement"
 msgstr "Acord sobre la clau"
 
-#: ../smime/lib/e-cert.c:892
+#: ../smime/lib/e-cert.c:898
 msgid "Certificate Signer"
 msgstr "Signador del certificat"
 
-#: ../smime/lib/e-cert.c:896
+#: ../smime/lib/e-cert.c:902
 msgid "CRL Signer"
 msgstr "Signador CRL"
 
-#: ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:951
 msgid "Critical"
 msgstr "Ãs crÃtic"
 
-#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
+#: ../smime/lib/e-cert.c:953 ../smime/lib/e-cert.c:956
 msgid "Not Critical"
 msgstr "No Ãs crÃtic"
 
-#: ../smime/lib/e-cert.c:970
+#: ../smime/lib/e-cert.c:977
 msgid "Extensions"
 msgstr "Extensions"
 
-#. Translators: This string is used in Certificate details for fields like Issuer
-#. or Subject, which shows the field name on the left and its respective value
-#. on the right, both as stored in the certificate itself. You probably do not
-#. need to change this string, unless changing the order of name and value.
-#. As a result example: "OU = VeriSign Trust Network"
-#.
-#: ../smime/lib/e-cert.c:1045
+#. Translators: This string is used in Certificate
+#. * details for fields like Issuer or Subject, which
+#. * shows the field name on the left and its respective
+#. * value on the right, both as stored in the
+#. * certificate itself.  You probably do not need to
+#. * change this string, unless changing the order of
+#. * name and value.  As a result example:
+#. * "OU = VeriSign Trust Network"
+#: ../smime/lib/e-cert.c:1055
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
+#: ../smime/lib/e-cert.c:1111 ../smime/lib/e-cert.c:1234
 msgid "Certificate Signature Algorithm"
 msgstr "Algorisme de la signatura del certificat"
 
-#: ../smime/lib/e-cert.c:1109
+#: ../smime/lib/e-cert.c:1120
 msgid "Issuer"
 msgstr "Emissor"
 
-#: ../smime/lib/e-cert.c:1164
+#: ../smime/lib/e-cert.c:1175
 msgid "Issuer Unique ID"
 msgstr "Identificador Ãnic de l'emissor"
 
-#: ../smime/lib/e-cert.c:1183
+#: ../smime/lib/e-cert.c:1194
 msgid "Subject Unique ID"
 msgstr "Identificador Ãnic de l'assumpte"
 
-#: ../smime/lib/e-cert.c:1229
+#: ../smime/lib/e-cert.c:1240
 msgid "Certificate Signature Value"
 msgstr "Valor de la signatura de certificat"
 
-#: ../smime/lib/e-pkcs12.c:250
+#: ../smime/lib/e-pkcs12.c:256
 msgid "PKCS12 File Password"
 msgstr "Fitxer de contrasenya PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:251
+#: ../smime/lib/e-pkcs12.c:257
 msgid "Enter password for PKCS12 file:"
 msgstr "IntroduÃu la contrasenya per al fitxer PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:353
+#: ../smime/lib/e-pkcs12.c:363
 msgid "Imported Certificate"
 msgstr "Certificat importat"
 
@@ -21027,7 +20565,7 @@ msgstr "Amb e_stat"
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:789
 msgid "UTC"
 msgstr "UTC"
 
@@ -21057,14 +20595,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "_SelecciÃ"
 
-#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-define-views-dialog.c:359
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Defineix les visualitzacions per a %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:354
-#: ../widgets/menus/gal-define-views-dialog.c:356
+#: ../widgets/menus/gal-define-views-dialog.c:367
+#: ../widgets/menus/gal-define-views-dialog.c:369
 msgid "Define Views"
 msgstr "Defineix les visualitzacions"
 
@@ -21074,11 +20612,11 @@ msgid "Define Views for \"%s\""
 msgstr "Defineix les visualitzacions per a Â%sÂ"
 
 # gal/menus/gal-view-factory-etable.c:38
-#: ../widgets/menus/gal-view-factory-etable.c:109
+#: ../widgets/menus/gal-view-factory-etable.c:111
 msgid "Table"
 msgstr "Taula"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:273
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Desa la visualitzaciÃ actual"
 
@@ -21091,7 +20629,7 @@ msgid "_Replace existing view"
 msgstr "_ReemplaÃa la visualitzaciÃ actual"
 
 # gal/menus/gal-define-views.glade.h:2
-#: ../widgets/menus/gal-view-new-dialog.c:106
+#: ../widgets/menus/gal-view-new-dialog.c:108
 msgid "Define New View"
 msgstr "Defineix una visualitzaciÃ nova"
 
@@ -21107,122 +20645,130 @@ msgstr "Tipus de visualitzaciÃ"
 msgid "Type of view:"
 msgstr "Tipus de visualitzaciÃ:"
 
-#: ../widgets/misc/e-account-manager.c:349
+#: ../widgets/misc/e-account-manager.c:353
 msgid "De_fault"
-msgstr "_Predeterminat"
+msgstr "_Per defecte"
 
-#: ../widgets/misc/e-account-tree-view.c:270
+#: ../widgets/misc/e-account-tree-view.c:243
+msgid "Account Name"
+msgstr "Nom del compte"
+
+#: ../widgets/misc/e-account-tree-view.c:274
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../widgets/misc/e-attachment-dialog.c:304
+#: ../widgets/misc/e-attachment-dialog.c:308
 msgid "Attachment Properties"
 msgstr "Propietats del fitxer adjunt"
 
-#: ../widgets/misc/e-attachment-dialog.c:326
+#: ../widgets/misc/e-attachment-dialog.c:330
 msgid "_Filename:"
 msgstr "Nom del f_itxer:"
 
-#: ../widgets/misc/e-attachment-dialog.c:361
+#: ../widgets/misc/e-attachment-dialog.c:365
 msgid "MIME Type:"
 msgstr "Tipus MIME:"
 
-#: ../widgets/misc/e-attachment-dialog.c:369
-#: ../widgets/misc/e-attachment-store.c:556
+#: ../widgets/misc/e-attachment-dialog.c:373
+#: ../widgets/misc/e-attachment-store.c:559
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suggereix visualitzar l'adjunciÃ automÃticament"
 
-#: ../widgets/misc/e-attachment-handler-image.c:91
+#: ../widgets/misc/e-attachment-handler-image.c:95
 msgid "Could not set as background"
 msgstr "No s'ha pogut establir com a fons de pantalla"
 
-#: ../widgets/misc/e-attachment-handler-image.c:141
+#: ../widgets/misc/e-attachment-handler-image.c:145
 msgid "Set as _Background"
 msgstr "De_fineix-la com a fons"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:90
+#: ../widgets/misc/e-attachment-handler-sendto.c:93
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
 msgstr[0] "No s'ha pogut enviar l'adjunciÃ"
 msgstr[1] "No s'han pogut enviar les adjuncions"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:132
+#: ../widgets/misc/e-attachment-handler-sendto.c:135
 msgid "_Send To..."
 msgstr "En_via a..."
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:134
+#: ../widgets/misc/e-attachment-handler-sendto.c:137
 msgid "Send the selected attachments somewhere"
 msgstr "Envia les adjuncions seleccionades"
 
-#: ../widgets/misc/e-attachment-icon-view.c:158
-#: ../widgets/misc/e-attachment-tree-view.c:543
+#: ../widgets/misc/e-attachment-icon-view.c:162
+#: ../widgets/misc/e-attachment-tree-view.c:547
 msgid "Loading"
 msgstr "S'estÃ carregant"
 
-#: ../widgets/misc/e-attachment-icon-view.c:170
-#: ../widgets/misc/e-attachment-tree-view.c:555
+#: ../widgets/misc/e-attachment-icon-view.c:174
+#: ../widgets/misc/e-attachment-tree-view.c:559
 msgid "Saving"
 msgstr "S'estÃ desant"
 
-#: ../widgets/misc/e-attachment-paned.c:93
+#: ../widgets/misc/e-attachment-paned.c:97
 msgid "Hide Attachment _Bar"
 msgstr "Amaga la _barra d'adjuncions"
 
-#: ../widgets/misc/e-attachment-paned.c:95
-#: ../widgets/misc/e-attachment-paned.c:635
+#: ../widgets/misc/e-attachment-paned.c:99
+#: ../widgets/misc/e-attachment-paned.c:639
 msgid "Show Attachment _Bar"
 msgstr "Mostra la barra _d'adjuncions"
 
-#: ../widgets/misc/e-attachment-store.c:544
+#: ../widgets/misc/e-attachment-store.c:547
 msgid "Add Attachment"
 msgstr "Afegeix una adjunciÃ"
 
-#: ../widgets/misc/e-attachment-store.c:547
+#: ../widgets/misc/e-attachment-store.c:550
 msgid "A_ttach"
 msgstr "Adjun_ta"
 
-#: ../widgets/misc/e-attachment-store.c:610
+#: ../widgets/misc/e-attachment-store.c:613
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Desa l'adjunciÃ"
 msgstr[1] "Desa les adjuncions"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:639
-#: ../widgets/misc/e-attachment.c:1806 ../widgets/misc/e-attachment.c:2348
+#: ../widgets/misc/e-attachment-store.c:642
+#: ../widgets/misc/e-attachment.c:1810 ../widgets/misc/e-attachment.c:2352
 msgid "attachment.dat"
 msgstr "adjuncio.dat"
 
-#: ../widgets/misc/e-attachment-view.c:349
+#: ../widgets/misc/e-attachment-view.c:404
+msgid "Open With Other Application..."
+msgstr "Obre amb una altra aplicaciÃ..."
+
+#: ../widgets/misc/e-attachment-view.c:411
 msgid "S_ave All"
 msgstr "De_sa'ls tots"
 
-#: ../widgets/misc/e-attachment-view.c:375
+#: ../widgets/misc/e-attachment-view.c:437
 msgid "A_dd Attachment..."
 msgstr "_Afegeix una adjunciÃ..."
 
-#: ../widgets/misc/e-attachment-view.c:399
+#: ../widgets/misc/e-attachment-view.c:461
 msgid "_Hide"
 msgstr "A_maga"
 
-#: ../widgets/misc/e-attachment-view.c:406
+#: ../widgets/misc/e-attachment-view.c:468
 msgid "Hid_e All"
 msgstr "Ama_ga'ls tots"
 
-#: ../widgets/misc/e-attachment-view.c:413
+#: ../widgets/misc/e-attachment-view.c:475
 msgid "_View Inline"
 msgstr "_Visualitza inserit"
 
-#: ../widgets/misc/e-attachment-view.c:420
+#: ../widgets/misc/e-attachment-view.c:482
 msgid "Vie_w All Inline"
 msgstr "Vi_sualitza'ls tots inserits"
 
-#: ../widgets/misc/e-attachment-view.c:738
+#: ../widgets/misc/e-attachment-view.c:803
 #, c-format
-msgid "Open with \"%s\""
+msgid "Open With \"%s\""
 msgstr "Obre amb Â%sÂ"
 
-#: ../widgets/misc/e-attachment-view.c:741
+#: ../widgets/misc/e-attachment-view.c:806
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Obre aquesta adjunciÃ amb %s"
@@ -21231,78 +20777,82 @@ msgstr "Obre aquesta adjunciÃ amb %s"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:994
+#: ../widgets/misc/e-attachment.c:998
 msgid "Attached message"
 msgstr "Missatge adjunt"
 
-#: ../widgets/misc/e-attachment.c:1849 ../widgets/misc/e-attachment.c:2650
+#: ../widgets/misc/e-attachment.c:1853 ../widgets/misc/e-attachment.c:2654
 msgid "A load operation is already in progress"
 msgstr "Ja s'estÃ efectuant una operaciÃ de cÃrrega"
 
-#: ../widgets/misc/e-attachment.c:1857 ../widgets/misc/e-attachment.c:2658
+#: ../widgets/misc/e-attachment.c:1861 ../widgets/misc/e-attachment.c:2662
 msgid "A save operation is already in progress"
 msgstr "Ja s'estÃ efectuant una operaciÃ de desament"
 
-#: ../widgets/misc/e-attachment.c:1949
+#: ../widgets/misc/e-attachment.c:1953
 #, c-format
 msgid "Could not load '%s'"
 msgstr "No s'ha pogut carregar Â%sÂ"
 
-#: ../widgets/misc/e-attachment.c:1952
+#: ../widgets/misc/e-attachment.c:1956
 #, c-format
 msgid "Could not load the attachment"
 msgstr "No s'ha pogut carregar l'adjunciÃ"
 
-#: ../widgets/misc/e-attachment.c:2228
+#: ../widgets/misc/e-attachment.c:2232
 #, c-format
 msgid "Could not open '%s'"
 msgstr "No s'ha pogut obrir Â%sÂ"
 
-#: ../widgets/misc/e-attachment.c:2231
+#: ../widgets/misc/e-attachment.c:2235
 #, c-format
 msgid "Could not open the attachment"
 msgstr "No s'ha pogut obrir l'adjunciÃ"
 
-#: ../widgets/misc/e-attachment.c:2666
+#: ../widgets/misc/e-attachment.c:2670
 msgid "Attachment contents not loaded"
 msgstr "No s'ha carregat el contingut de l'adjunciÃ"
 
-#: ../widgets/misc/e-attachment.c:2742
+#: ../widgets/misc/e-attachment.c:2746
 #, c-format
 msgid "Could not save '%s'"
 msgstr "No s'ha pogut desar Â%sÂ"
 
-#: ../widgets/misc/e-attachment.c:2745
+#: ../widgets/misc/e-attachment.c:2749
 #, c-format
 msgid "Could not save the attachment"
 msgstr "No s'ha pogut desar l'adjunciÃ"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:359
+#: ../widgets/misc/e-buffer-tagger.c:387
 msgid "Ctrl-click to open a link"
 msgstr "Premeu la tecla Ctrl i feu clic al mateix temps per obrir un enllaÃ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1229
+#: ../widgets/misc/e-calendar-item.c:1249
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:225
+#: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "Calendari mensual"
 
-#: ../widgets/misc/e-charset-combo-box.c:92
+#: ../widgets/misc/e-charset-combo-box.c:96
 msgid "Character Encoding"
 msgstr "CodificaciÃ dels carÃcters"
 
-#: ../widgets/misc/e-charset-combo-box.c:115
+#: ../widgets/misc/e-charset-combo-box.c:119
 msgid "Enter the character set to use"
 msgstr "IntroduÃu el joc de carÃcters a utilitzar"
 
-#: ../widgets/misc/e-charset-combo-box.c:335
+#: ../widgets/misc/e-charset-combo-box.c:339
 msgid "Other..."
 msgstr "Altres..."
 
+#: ../widgets/misc/e-contact-map-window.c:355
+msgid "Contacts Map"
+msgstr "Mapa de contactes"
+
 #: ../widgets/misc/e-dateedit.c:501
 msgid "Date and Time"
 msgstr "Data i hora"
@@ -21328,27 +20878,27 @@ msgid "_Today"
 msgstr "A_vui"
 
 #. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
+#. * is not permitted.
 #: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "_Cap"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1686 ../widgets/misc/e-dateedit.c:1918
+#: ../widgets/misc/e-dateedit.c:1688 ../widgets/misc/e-dateedit.c:1921
 msgctxt "date"
 msgid "None"
 msgstr "Cap"
 
-#: ../widgets/misc/e-dateedit.c:1813
+#: ../widgets/misc/e-dateedit.c:1815
 msgid "Invalid Date Value"
 msgstr "El valor de la data no Ãs vÃlid"
 
-#: ../widgets/misc/e-dateedit.c:1857
+#: ../widgets/misc/e-dateedit.c:1859
 msgid "Invalid Time Value"
 msgstr "El valor de l'hora no Ãs vÃlid"
 
-#: ../widgets/misc/e-import-assistant.c:245
+#: ../widgets/misc/e-import-assistant.c:249
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -21356,37 +20906,37 @@ msgstr ""
 "Trieu el fitxer que vulgueu importar a l'Evolution i seleccioneu-ne el tipus "
 "de la llista."
 
-#: ../widgets/misc/e-import-assistant.c:262
+#: ../widgets/misc/e-import-assistant.c:266
 msgid "F_ilename:"
 msgstr "Nom del f_itxer:"
 
-#: ../widgets/misc/e-import-assistant.c:272
+#: ../widgets/misc/e-import-assistant.c:276
 msgid "Select a file"
 msgstr "Seleccioneu un fitxer"
 
-#: ../widgets/misc/e-import-assistant.c:286
-#: ../widgets/misc/e-import-assistant.c:461
+#: ../widgets/misc/e-import-assistant.c:290
+#: ../widgets/misc/e-import-assistant.c:465
 msgid "File _type:"
 msgstr "_Tipus de fitxer:"
 
-#: ../widgets/misc/e-import-assistant.c:329
-#: ../widgets/misc/e-import-assistant.c:905
+#: ../widgets/misc/e-import-assistant.c:333
+#: ../widgets/misc/e-import-assistant.c:913
 msgid "Choose the destination for this import"
 msgstr "Trieu la destinaciÃ per a aquesta importaciÃ"
 
-#: ../widgets/misc/e-import-assistant.c:354
+#: ../widgets/misc/e-import-assistant.c:358
 msgid "Choose the type of importer to run:"
 msgstr "Trieu el tipus d'importador a executar:"
 
-#: ../widgets/misc/e-import-assistant.c:362
+#: ../widgets/misc/e-import-assistant.c:366
 msgid "Import data and settings from _older programs"
 msgstr "Importador de les dades i la configuraciÃ de pr_ogrames vells"
 
-#: ../widgets/misc/e-import-assistant.c:370
+#: ../widgets/misc/e-import-assistant.c:374
 msgid "Import a _single file"
 msgstr "Impo_rtador de fitxers individuals"
 
-#: ../widgets/misc/e-import-assistant.c:522
+#: ../widgets/misc/e-import-assistant.c:526
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -21397,37 +20947,37 @@ msgstr ""
 "importar. Si ho voleu tornar a intentar, feu clic al botÃ ÂEndarrereÂ."
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:762
+#: ../widgets/misc/e-import-assistant.c:768
 msgid "_Cancel Import"
 msgstr "CancelÂla la _importaciÃ"
 
-#: ../widgets/misc/e-import-assistant.c:904
+#: ../widgets/misc/e-import-assistant.c:912
 msgid "Preview data to be imported"
 msgstr "Previsualitza les dades a importar"
 
-#: ../widgets/misc/e-import-assistant.c:910
-#: ../widgets/misc/e-import-assistant.c:923
-#: ../widgets/misc/e-import-assistant.c:1270
-#: ../widgets/misc/e-import-assistant.c:1336
-#: ../widgets/misc/e-import-assistant.c:1345
+#: ../widgets/misc/e-import-assistant.c:918
+#: ../widgets/misc/e-import-assistant.c:931
+#: ../widgets/misc/e-import-assistant.c:1276
+#: ../widgets/misc/e-import-assistant.c:1352
+#: ../widgets/misc/e-import-assistant.c:1361
 msgid "Import Data"
 msgstr "ImportaciÃ de dades"
 
-#: ../widgets/misc/e-import-assistant.c:918
+#: ../widgets/misc/e-import-assistant.c:926
 msgid "Select what type of file you want to import from the list."
 msgstr "Seleccioneu a la llista quin tipus de fitxer voleu importar."
 
-#: ../widgets/misc/e-import-assistant.c:1260
-#: ../widgets/misc/e-import-assistant.c:1294
+#: ../widgets/misc/e-import-assistant.c:1266
+#: ../widgets/misc/e-import-assistant.c:1301
 msgid "Evolution Import Assistant"
 msgstr "Auxiliar d'importaciÃ de l'Evolution"
 
-#: ../widgets/misc/e-import-assistant.c:1277
-#: ../widgets/misc/e-import-assistant.c:1324
+#: ../widgets/misc/e-import-assistant.c:1283
+#: ../widgets/misc/e-import-assistant.c:1339
 msgid "Import Location"
 msgstr "Importa una ubicaciÃ"
 
-#: ../widgets/misc/e-import-assistant.c:1288
+#: ../widgets/misc/e-import-assistant.c:1294
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21437,28 +20987,28 @@ msgstr ""
 "Aquest auxiliar us guiarÃ a travÃs dels passos necessaris per importar "
 "fitxers externs a l'Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1302
+#: ../widgets/misc/e-import-assistant.c:1311
 msgid "Importer Type"
 msgstr "Tipus d'importador"
 
-#: ../widgets/misc/e-import-assistant.c:1310
+#: ../widgets/misc/e-import-assistant.c:1321
 msgid "Select Information to Import"
 msgstr "Seleccioneu la informaciÃ a importar"
 
-#: ../widgets/misc/e-import-assistant.c:1317
+#: ../widgets/misc/e-import-assistant.c:1330
 msgid "Select a File"
 msgstr "Seleccioneu un fitxer"
 
-#: ../widgets/misc/e-import-assistant.c:1331
+#: ../widgets/misc/e-import-assistant.c:1347
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr ""
 "Feu clic a ÂAplicaÂ per iniciar la importaciÃ del fitxer a l'Evolution."
 
-#: ../widgets/misc/e-map.c:866
+#: ../widgets/misc/e-map.c:883
 msgid "World Map"
 msgstr "Mapa del mÃn"
 
-#: ../widgets/misc/e-map.c:869
+#: ../widgets/misc/e-map.c:886
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21466,74 +21016,74 @@ msgstr ""
 "Mapa interactiu per seleccionar el fus horari amb el ratolÃ. Els usuaris amb "
 "teclat haurien de seleccionar el fus horari amb el quadre combinat de sota."
 
-#: ../widgets/misc/e-online-button.c:23
+#: ../widgets/misc/e-online-button.c:27
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr ""
 "L'Evolution estÃ en lÃnia. Feu clic en aquest botÃ per treballar fora de "
 "lÃnia."
 
-#: ../widgets/misc/e-online-button.c:26
+#: ../widgets/misc/e-online-button.c:30
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr ""
 "L'Evolution estÃ fora de lÃnia. Feu clic en aquest botÃ per treballar en "
 "lÃnia."
 
-#: ../widgets/misc/e-online-button.c:29
+#: ../widgets/misc/e-online-button.c:33
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr ""
 "L'Evolution estÃ fora de lÃnia. Feu clic en aquest botÃ per treballar en "
 "lÃnia."
 
-#: ../widgets/misc/e-preferences-window.c:275
+#: ../widgets/misc/e-preferences-window.c:279
 msgid "Evolution Preferences"
 msgstr "PreferÃncies de l'Evolution"
 
-#: ../widgets/misc/e-search-bar.c:75
+#: ../widgets/misc/e-search-bar.c:81
 #, c-format
 msgid "Matches: %d"
 msgstr "Concordances: %d"
 
-#: ../widgets/misc/e-search-bar.c:557
+#: ../widgets/misc/e-search-bar.c:563
 msgid "Close the find bar"
 msgstr "Tanca la barra de cerca"
 
-#: ../widgets/misc/e-search-bar.c:565
+#: ../widgets/misc/e-search-bar.c:571
 msgid "Fin_d:"
 msgstr "Ce_rca:"
 
-#: ../widgets/misc/e-search-bar.c:577
+#: ../widgets/misc/e-search-bar.c:583
 msgid "Clear the search"
 msgstr "Neteja la cerca"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:613
 msgid "Find the previous occurrence of the phrase"
 msgstr "Cerca l'ocurrÃncia anterior de la frase"
 
-#: ../widgets/misc/e-search-bar.c:620
+#: ../widgets/misc/e-search-bar.c:626
 msgid "_Next"
 msgstr "_SegÃent"
 
-#: ../widgets/misc/e-search-bar.c:626
+#: ../widgets/misc/e-search-bar.c:632
 msgid "Find the next occurrence of the phrase"
 msgstr "Cerca l'ocurrÃncia posterior de la frase"
 
-#: ../widgets/misc/e-search-bar.c:639
+#: ../widgets/misc/e-search-bar.c:645
 msgid "Mat_ch case"
 msgstr "Concord_anÃa de majÃscules i minÃscules"
 
-#: ../widgets/misc/e-search-bar.c:667
+#: ../widgets/misc/e-search-bar.c:673
 msgid "Reached bottom of page, continued from top"
 msgstr "S'ha arribat al final de la pÃgina, es continua des de l'inici"
 
-#: ../widgets/misc/e-search-bar.c:689
+#: ../widgets/misc/e-search-bar.c:695
 msgid "Reached top of page, continued from bottom"
 msgstr "S'ha arribat a l'inici de la pÃgina, es continua des del final"
 
-#: ../widgets/misc/e-send-options.c:543
+#: ../widgets/misc/e-send-options.c:552
 msgid "When de_leted:"
 msgstr "_En suprimir:"
 
@@ -21668,38 +21218,38 @@ msgctxt "send-options"
 msgid "None"
 msgstr "Cap"
 
-#: ../widgets/misc/e-signature-editor.c:134
-#: ../widgets/misc/e-signature-editor.c:560
-#: ../widgets/misc/e-signature-manager.c:368
-#: ../widgets/misc/e-signature-script-dialog.c:215
+#: ../widgets/misc/e-signature-editor.c:138
+#: ../widgets/misc/e-signature-editor.c:564
+#: ../widgets/misc/e-signature-manager.c:372
+#: ../widgets/misc/e-signature-script-dialog.c:219
 msgid "Unnamed"
 msgstr "Sense nom"
 
-#: ../widgets/misc/e-signature-editor.c:210
+#: ../widgets/misc/e-signature-editor.c:214
 msgid "_Save and Close"
 msgstr "De_sa i tanca"
 
-#: ../widgets/misc/e-signature-editor.c:427
+#: ../widgets/misc/e-signature-editor.c:431
 msgid "Edit Signature"
 msgstr "Edita la signatura"
 
-#: ../widgets/misc/e-signature-editor.c:442
+#: ../widgets/misc/e-signature-editor.c:446
 msgid "_Signature Name:"
 msgstr "Nom de la _signatura:"
 
-#: ../widgets/misc/e-signature-manager.c:313
+#: ../widgets/misc/e-signature-manager.c:317
 msgid "Add Signature Script"
 msgstr "Afegeix un script de signatura"
 
-#: ../widgets/misc/e-signature-manager.c:378
+#: ../widgets/misc/e-signature-manager.c:382
 msgid "Edit Signature Script"
 msgstr "Edita l'script de signatura"
 
-#: ../widgets/misc/e-signature-manager.c:598
+#: ../widgets/misc/e-signature-manager.c:602
 msgid "Add _Script"
 msgstr "Afegeix un _script"
 
-#: ../widgets/misc/e-signature-script-dialog.c:264
+#: ../widgets/misc/e-signature-script-dialog.c:268
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -21708,11 +21258,11 @@ msgstr ""
 "La sortida d'aquest script serÃ utilitzada per a la vostra signatura.\n"
 "El nom que especifiqueu nomÃs s'utilitzarÃ per mostrar-lo."
 
-#: ../widgets/misc/e-signature-script-dialog.c:309
+#: ../widgets/misc/e-signature-script-dialog.c:313
 msgid "S_cript:"
 msgstr "_Script:"
 
-#: ../widgets/misc/e-signature-script-dialog.c:340
+#: ../widgets/misc/e-signature-script-dialog.c:344
 msgid "Script file must be executable."
 msgstr "El fitxer de l'script ha de ser executable."
 
@@ -21720,118 +21270,126 @@ msgstr "El fitxer de l'script ha de ser executable."
 msgid "Click here to go to URL"
 msgstr "Feu clic per anar a l'URL"
 
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:410
 msgid "_Copy Link Location"
 msgstr "_Copia la ubicaciÃ de l'enllaÃ"
 
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:412
 msgid "Copy the link to the clipboard"
 msgstr "Copia l'enllaÃ al porta-retalls"
 
-#: ../widgets/misc/e-web-view.c:385
+#: ../widgets/misc/e-web-view.c:420
 msgid "_Open Link in Browser"
 msgstr "_Obre l'enllaÃ en el navegador"
 
-#: ../widgets/misc/e-web-view.c:387
+#: ../widgets/misc/e-web-view.c:422
 msgid "Open the link in a web browser"
 msgstr "Obre l'enllaÃ en el navegador"
 
-#: ../widgets/misc/e-web-view.c:395
+#: ../widgets/misc/e-web-view.c:430
 msgid "_Copy Email Address"
 msgstr "Copia l'adr_eÃa electrÃnica"
 
-#: ../widgets/misc/e-web-view.c:424 ../widgets/misc/e-web-view.c:1105
+#: ../widgets/misc/e-web-view.c:447
+msgid "_Copy Image"
+msgstr "_Copia la imatge"
+
+#: ../widgets/misc/e-web-view.c:449
+msgid "Copy the image to the clipboard"
+msgstr "Copia la imatge al porta-retalls"
+
+#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
 msgid "Select all text and images"
 msgstr "Selecciona tot el text i les imatges"
 
-#: ../widgets/misc/e-web-view.c:885 ../widgets/misc/e-web-view.c:887
-#: ../widgets/misc/e-web-view.c:889
+#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
+#: ../widgets/misc/e-web-view.c:986
 #, c-format
 msgid "Click to call %s"
 msgstr "Feu clic per trucar en/na %s"
 
-#: ../widgets/misc/e-web-view.c:891
+#: ../widgets/misc/e-web-view.c:988
 msgid "Click to hide/unhide addresses"
 msgstr "Feu clic per mostrar/amagar adreces"
 
-#: ../widgets/misc/e-web-view.c:893
+#: ../widgets/misc/e-web-view.c:990
 #, c-format
 msgid "Click to open %s"
 msgstr "Feu clic per obrir %s"
 
-#: ../widgets/misc/ea-calendar-item.c:299
-#: ../widgets/misc/ea-calendar-item.c:308
+#: ../widgets/misc/ea-calendar-item.c:306
+#: ../widgets/misc/ea-calendar-item.c:315
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: ../widgets/misc/ea-calendar-item.c:311
+#: ../widgets/misc/ea-calendar-item.c:318
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Calendari: de %s a %s"
 
-#: ../widgets/misc/ea-calendar-item.c:347
+#: ../widgets/misc/ea-calendar-item.c:354
 msgid "evolution calendar item"
 msgstr "element de calendari de l'Evolution"
 
-#: ../widgets/table/e-cell-combo.c:174
+#: ../widgets/table/e-cell-combo.c:187
 msgid "popup list"
 msgstr "llista desplegable"
 
-#: ../widgets/table/e-cell-date-edit.c:300
+#: ../widgets/table/e-cell-date-edit.c:299
 msgid "Now"
 msgstr "Ara"
 
 #. Translators: "None" as a label of a button to unset date in a date table cell
-#: ../widgets/table/e-cell-date-edit.c:317
+#: ../widgets/table/e-cell-date-edit.c:316
 msgctxt "table-date"
 msgid "None"
 msgstr "Cap"
 
-#: ../widgets/table/e-cell-date-edit.c:325
+#: ../widgets/table/e-cell-date-edit.c:324
 msgid "OK"
 msgstr "D'acord"
 
-#: ../widgets/table/e-cell-date-edit.c:869
+#: ../widgets/table/e-cell-date-edit.c:868
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "L'hora ha d'estar en el format: %s"
 
-#: ../widgets/table/e-cell-percent.c:76
+#: ../widgets/table/e-cell-percent.c:80
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor del percentatge ha d'estar entre 0 i 100, ambdÃs inclosos"
 
-#: ../widgets/table/e-table-click-to-add.c:592
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
+#: ../widgets/table/e-table-click-to-add.c:607
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:62
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:143
 msgid "click to add"
 msgstr "feu clic per afegir"
 
 # gal/e-table/e-table-config.c:300 gal/e-table/e-table-config.c:342
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
 msgid "(Ascending)"
 msgstr "(Ascendent)"
 
 # gal/e-table/e-table-config.c:300 gal/e-table/e-table-config.c:342
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
 msgid "(Descending)"
 msgstr "(Descendent)"
 
 # gal/e-table/e-table-config.c:307
-#: ../widgets/table/e-table-config.c:392
+#: ../widgets/table/e-table-config.c:400
 msgid "Not sorted"
 msgstr "Sense ordre"
 
 # gal/e-table/e-table-config.c:348
-#: ../widgets/table/e-table-config.c:433
+#: ../widgets/table/e-table-config.c:441
 msgid "No grouping"
 msgstr "Sense agrupar"
 
-#: ../widgets/table/e-table-config.c:654
+#: ../widgets/table/e-table-config.c:666
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Mostra els camps"
 
-#: ../widgets/table/e-table-config.c:674
+#: ../widgets/table/e-table-config.c:686
 msgid "Available Fields"
 msgstr "Camps disponibles"
 
@@ -21842,7 +21400,7 @@ msgstr "Camps disponi_bles:"
 # gal/e-table/e-table-config.glade.h:3
 # gal/e-table/e-table-config-no-group.glade.h:3
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1660
+#: ../widgets/table/e-table-header-item.c:1717
 msgid "Ascending"
 msgstr "Ascendent"
 
@@ -21857,7 +21415,7 @@ msgstr "Neteja-ho _tot"
 # gal/e-table/e-table-config.glade.h:5
 # gal/e-table/e-table-config-no-group.glade.h:5
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1660
+#: ../widgets/table/e-table-header-item.c:1717
 msgid "Descending"
 msgstr "Descendent"
 
@@ -21913,6 +21471,10 @@ msgstr "Camps _mostrats..."
 msgid "_Group By..."
 msgstr "A_grupa segons..."
 
+#: ../widgets/table/e-table-config.ui.h:21
+msgid "_Remove"
+msgstr "Sup_rimeix"
+
 #: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
 msgstr "Mos_tra el camp en la visualitzaciÃ"
@@ -21926,11 +21488,11 @@ msgid "_Sort..."
 msgstr "_Ordena..."
 
 # gal/e-table/e-table-header-item.c:1473
-#: ../widgets/table/e-table-field-chooser-dialog.c:117
+#: ../widgets/table/e-table-field-chooser-dialog.c:119
 msgid "Add a Column"
 msgstr "Afegeix una columna"
 
-#: ../widgets/table/e-table-field-chooser.c:151
+#: ../widgets/table/e-table-field-chooser.c:153
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -21939,13 +21501,13 @@ msgstr ""
 "a la ubicaciÃ on vulgueu que aparegui."
 
 #. Translators: This text is used as a special row when an ETable
-#. has turned on grouping on a column, which has set a title.
-#. The first %s is replaced with a column title.
-#. The second %s is replaced with an actual  group value.
-#. Finally the %d is replaced with count of items in this group.
-#. Example: "Family name: Smith (13 items)"
+#. * has turned on grouping on a column, which has set a title.
+#. * The first %s is replaced with a column title.
+#. * The second %s is replaced with an actual  group value.
+#. * Finally the %d is replaced with count of items in this group.
+#. * Example: "Family name: Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:361
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -21953,12 +21515,12 @@ msgstr[0] "%s: %s (%d element)"
 msgstr[1] "%s: %s (%d elements)"
 
 #. Translators: This text is used as a special row when an ETable
-#. has turned on grouping on a column, which doesn't have set a title.
-#. The %s is replaced with an actual group value.
-#. The %d is replaced with count of items in this group.
-#. Example: "Smith (13 items)"
+#. * has turned on grouping on a column, which doesn't have set a title.
+#. * The %s is replaced with an actual group value.
+#. * The %d is replaced with count of items in this group.
+#. * Example: "Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:363
+#: ../widgets/table/e-table-group-container.c:373
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
@@ -21966,119 +21528,739 @@ msgstr[0] "%s (%d element)"
 msgstr[1] "%s (%d elements)"
 
 # gal/e-table/e-table-header-item.c:1444
-#: ../widgets/table/e-table-header-item.c:1504
+#: ../widgets/table/e-table-header-item.c:1557
 msgid "Customize Current View"
 msgstr "Personalitza la visualitzaciÃ actual"
 
 # gal/e-table/e-table-header-item.c:1465
-#: ../widgets/table/e-table-header-item.c:1525
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Sort _Ascending"
 msgstr "Ordena en sentit _ascendent"
 
 # gal/e-table/e-table-header-item.c:1466
-#: ../widgets/table/e-table-header-item.c:1528
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Sort _Descending"
 msgstr "Ordena en sentit _descendent"
 
 # gal/e-table/e-table-header-item.c:1467
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1585
 msgid "_Unsort"
 msgstr "De_sordena"
 
 # gal/e-table/e-table-header-item.c:1469
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1588
 msgid "Group By This _Field"
 msgstr "Agrupa per aquest _camp"
 
 # gal/e-table/e-table-header-item.c:1470
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1591
 msgid "Group By _Box"
 msgstr "Agrupa per _quadre"
 
 # gal/e-table/e-table-header-item.c:1472
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "Remove This _Column"
 msgstr "Suprimeix aquesta co_lumna"
 
 # gal/e-table/e-table-header-item.c:1473
-#: ../widgets/table/e-table-header-item.c:1544
+#: ../widgets/table/e-table-header-item.c:1598
 msgid "Add a C_olumn..."
 msgstr "Afegeix una c_olumna..."
 
 # gal/e-table/e-table-header-item.c:1475
-#: ../widgets/table/e-table-header-item.c:1548
+#: ../widgets/table/e-table-header-item.c:1602
 msgid "A_lignment"
 msgstr "Ali_neaciÃ"
 
 # gal/e-table/e-table-header-item.c:1476
-#: ../widgets/table/e-table-header-item.c:1551
+#: ../widgets/table/e-table-header-item.c:1605
 msgid "B_est Fit"
 msgstr "Aj_ust automÃtic"
 
 # gal/e-table/e-table-header-item.c:1477
-#: ../widgets/table/e-table-header-item.c:1554
+#: ../widgets/table/e-table-header-item.c:1608
 msgid "Format Column_s..."
 msgstr "Formata les columne_s..."
 
 # gal/e-table/e-table-header-item.c:1479
-#: ../widgets/table/e-table-header-item.c:1558
+#: ../widgets/table/e-table-header-item.c:1612
 msgid "Custo_mize Current View..."
 msgstr "Personalit_za la visualitzaciÃ actual..."
 
-#: ../widgets/table/e-table-header-item.c:1617
+#: ../widgets/table/e-table-header-item.c:1674
 msgid "_Sort By"
 msgstr "_Ordena per"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1635
+#: ../widgets/table/e-table-header-item.c:1692
 msgid "_Custom"
 msgstr "_Personalitzat"
 
 #. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:123
+#: ../widgets/table/gal-a11y-e-cell-popup.c:125
 msgid "popup a child"
 msgstr "desplega un fill"
 
 #. Translators: description of a "toggle" action
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:178
 msgid "toggle the cell"
 msgstr "commuta la celÂla"
 
 #. Translators: description of an "expand" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:212
+#: ../widgets/table/gal-a11y-e-cell-tree.c:214
 msgid "expands the row in the ETree containing this cell"
 msgstr "expandeix la fila en l'ETree que contÃ la celÂla"
 
 #. Translators: description of a "collapse" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:219
+#: ../widgets/table/gal-a11y-e-cell-tree.c:221
 msgid "collapses the row in the ETree containing this cell"
 msgstr "contreu la fila de l'ETree que contÃ aquesta celÂla"
 
-#: ../widgets/table/gal-a11y-e-cell.c:119
+#: ../widgets/table/gal-a11y-e-cell.c:123
 msgid "Table Cell"
 msgstr "CelÂla de taula"
 
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:67
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:72
 msgid "click"
 msgstr "feu clic"
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:154
+#: ../widgets/table/gal-a11y-e-table-column-header.c:158
 msgid "sort"
 msgstr "ordena"
 
-#: ../widgets/text/e-text.c:2283
+#: ../widgets/text/e-text.c:2327
 msgid "Select All"
 msgstr "Selecciona-ho tot"
 
-#: ../widgets/text/e-text.c:2295
+#: ../widgets/text/e-text.c:2339
 msgid "Input Methods"
 msgstr "MÃtodes d'entrada"
 
+#~ msgid "Invalid object"
+#~ msgstr "Objecte no vÃlid"
+
+#~ msgid "Edit Alarm"
+#~ msgstr "Edita l'alarma"
+
+#~ msgid "Add Alarm"
+#~ msgstr "Afegeix una alarma"
+
+#~ msgid "Alarm"
+#~ msgstr "Alarma"
+
+#~ msgid "Alarms"
+#~ msgstr "Alarmes"
+
+#~ msgid "Click here to close the current window"
+#~ msgstr "Feu clic per tancar la finestra actual"
+
+#~ msgid "Click here to view help available"
+#~ msgstr "Feu clic per veure l'ajuda disponible"
+
+#~ msgid "Click here to save the current window"
+#~ msgstr "Feu clic per desar la finestra actual"
+
+#~ msgid "Click here to attach a file"
+#~ msgstr "Feu clic per adjuntar un fitxer"
+
+#~ msgid "_Alarms"
+#~ msgstr "_Alarmes"
+
+#~ msgid "The organizer selected no longer has an account."
+#~ msgstr "L'organitzador seleccionat ja no tÃ cap compte."
+
+#~ msgctxt "cal-alarms"
+#~ msgid "None"
+#~ msgstr "Cap"
+
+#~ msgid "Custom Alarm:"
+#~ msgstr "Alarma personalitzada:"
+
+#~ msgid "_Alarm"
+#~ msgstr "_Alarma"
+
+#~ msgid "_Group:"
+#~ msgstr "_Grup:"
+
+#~ msgid "It has alarms."
+#~ msgstr "TÃ alarmes."
+
+#~ msgctxt "iCalImp"
+#~ msgid "has alarms"
+#~ msgstr "tÃ alarmes"
+
+#~ msgid "Opening folder '%s'"
+#~ msgstr "S'estÃ obrint la carpeta Â%sÂ"
+
+#~ msgid "Please select a folder from the current account."
+#~ msgstr "Seleccioneu una carpeta del compte actual."
+
+#~ msgid "Scanning folders in \"%s\""
+#~ msgstr "S'estan analitzant les carpetes a Â%sÂ"
+
+#~ msgid "Creating folder '%s'"
+#~ msgstr "S'estÃ creant la carpeta Â%sÂ"
+
+#~ msgid "_Default junk plugin:"
+#~ msgstr "Connector de correu brossa per _defecte:"
+
+#~ msgid "_Use Secure Connection:"
+#~ msgstr "E_mpra una connexiÃ segura:"
+
+#~ msgid "Scanning folders in '%s'"
+#~ msgstr "S'estan analitzant les carpetes a Â%sÂ"
+
+# FIXME (dpm)
+#~ msgid "Retrieving quota information for folder '%s'"
+#~ msgstr ""
+#~ "S'estÃ recuperant la informaciÃ de la quota d'espai per a la carpeta Â%sÂ"
+
+#~ msgid "Opening store '%s'"
+#~ msgstr "S'estÃ obrint el magatzem Â%sÂ"
+
+#~ msgid "Local Folders"
+#~ msgstr "Carpetes locals"
+
+#~ msgid "Error saving messages to: %s:\n"
+#~ msgstr "S'ha produÃt un error en desar els missatges a: %s.\n"
+
+#~ msgid "Checking Service"
+#~ msgstr "ComprovaciÃ del servei"
+
+#~ msgid "Updating Search Folders for '%s'"
+#~ msgstr "S'estan actualitzant les carpetes de cerca per a Â%sÂ"
+
+#~ msgid "Delete messages in Search Folder \"{0}\"?"
+#~ msgstr "Voleu suprimir els missatges de la carpeta de cerca Â{0}Â?"
+
+#~ msgid "Alarm programs"
+#~ msgstr "Programes d'alarma"
+
+#~ msgid "Save as iCalendar..."
+#~ msgstr "Anomena i desa com a iCalendar..."
+
+#~ msgctxt "mail-junk-hook"
+#~ msgid "None"
+#~ msgstr "Cap"
+
+#~ msgid "Header Value Contains:"
+#~ msgstr "El valor de la capÃalera contÃ:"
+
+#~ msgid "%s plugin is available and the binary is installed."
+#~ msgstr "El connector %s estÃ disponible i el fitxer binari estÃ instalÂlat."
+
+#~ msgid ""
+#~ "%s plugin is not available. Please check whether the package is installed."
+#~ msgstr ""
+#~ "El connector %s no estÃ disponible. Comproveu que el seu paquet estigui "
+#~ "instalÂlat."
+
+#~ msgid "No junk plugin available"
+#~ msgstr "No hi ha cap connector de correu brossa disponible"
+
+#~ msgid "Bogofilter is not available. Please install it first."
+#~ msgstr ""
+#~ "El Bogofilter no estÃ disponible, per la qual cosa l'haurÃeu d'instalÂlar "
+#~ "abans."
+
+#~ msgid "Error occurred while spawning %s: %s."
+#~ msgstr "S'ha produÃt un error en executar %s: %s."
+
+#~ msgid "Bogofilter child process does not respond, killing..."
+#~ msgstr "El procÃs fill del Bogofilter no respon; se suprimirÃ..."
+
+#~ msgid "Wait for Bogofilter child process interrupted, terminating..."
+#~ msgstr ""
+#~ "S'ha interromput l'espera per al procÃs fill del Bogofilter; es "
+#~ "terminarÃ..."
+
+#~ msgid "Pipe to Bogofilter failed, error code: %d."
+#~ msgstr ""
+#~ "Ha fallat la creaciÃ d'un conducte cap al Bogofilter; el codi d'error "
+#~ "fou: %d."
+
+#~ msgid "Bogofilter Junk Filter"
+#~ msgstr "Filtrador de correu brossa Bogofilter"
+
+#~ msgid "Filter junk messages using Bogofilter."
+#~ msgstr "Filtra els missatges de correu brossa amb el Bogofilter."
+
+#~ msgid "Use _SSL"
+#~ msgstr "Utilitza l'_SSL"
+
+#~ msgid "_Secure connection"
+#~ msgstr "Utilitza una connexiÃ _segura"
+
+#~ msgid "Show a map of all the contacts"
+#~ msgstr "Mostra un mapa de tots els contactes"
+
+#~ msgid "Add a map showing the location of contacts when possible."
+#~ msgstr ""
+#~ "Afegeix un mapa que mostri la ubicaciÃ dels contactes quan sigui possible."
+
+#~ msgid "Map for contacts"
+#~ msgstr "Mapa dels contactes"
+
+#~ msgid "Checklist"
+#~ msgstr "Llista de comprovaciÃ"
+
+#~ msgid "Enter password for %s (user %s)"
+#~ msgstr "IntroduÃu la contrasenya per a %s (usuari %s)"
+
+#~ msgid "Failed to authenticate.\n"
+#~ msgstr "S'ha produÃt un error en l'autenticaciÃ.\n"
+
+#~ msgid "New _Shared Folder..."
+#~ msgstr "_Carpeta compartida nova..."
+
+#~ msgid "_Proxy Login..."
+#~ msgstr "Entrada com a _delegat..."
+
+#~ msgid "Junk Mail Settings..."
+#~ msgstr "ConfiguraciÃ del correu brossa..."
+
+#~ msgid "Track Message Status..."
+#~ msgstr "Segueix l'estat del missatge..."
+
+#~ msgid "Retract Mail"
+#~ msgstr "Retira el correu"
+
+#~ msgid "Accept"
+#~ msgstr "Accepta"
+
+#~ msgid "Accept Tentatively"
+#~ msgstr "Accepta provisionalment"
+
+#~ msgid "Decline"
+#~ msgstr "Declina"
+
+#~ msgid "Rese_nd Meeting..."
+#~ msgstr "Tor_na a enviar una reuniÃ..."
+
+#~ msgid "Create folder"
+#~ msgstr "Crea una carpeta"
+
+#~ msgid ""
+#~ "The user '%s' has shared a folder with you\n"
+#~ "\n"
+#~ "Message from '%s'\n"
+#~ "\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "\n"
+#~ "Click 'Apply' to install the shared folder\n"
+#~ "\n"
+#~ msgstr ""
+#~ "L'usuari Â%sÂ comparteix una carpeta amb vÃs\n"
+#~ "\n"
+#~ "El missatge de Â%sÂ\n"
+#~ "\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "\n"
+#~ "Feu clic a ÂAplicaÂ per instalÂlar la carpeta compartida\n"
+
+#~ msgid "Install the shared folder"
+#~ msgstr "InstalÂla la carpeta compartida"
+
+#~ msgid "Shared Folder Installation"
+#~ msgstr "InstalÂlaciÃ de la carpeta compartida"
+
+#~ msgid "Junk Settings"
+#~ msgstr "ConfiguraciÃ del correu brossa"
+
+#~ msgid "Junk Mail Settings"
+#~ msgstr "ConfiguraciÃ del correu brossa"
+
+#~ msgid "Email:"
+#~ msgstr "AdreÃa electrÃnica:"
+
+#~ msgid "Junk List:"
+#~ msgstr "Llista de correu brossa:"
+
+#~ msgid "_Enable"
+#~ msgstr "_Habilita"
+
+#~ msgid "_Junk List"
+#~ msgstr "_Llista de correu brossa"
+
+#~ msgid "Message Retract"
+#~ msgstr "Retirada de missatges"
+
+#~ msgid ""
+#~ "Retracting a message may remove it from the recipient's mailbox. Are you "
+#~ "sure you want to do this?"
+#~ msgstr ""
+#~ "Si retireu un missatge Ãs probable que se suprimeixi de la bÃstia de "
+#~ "correu del destinatari. Segur que voleu fer-ho?"
+
+#~ msgid "Message retracted successfully"
+#~ msgstr "S'ha retirat el correu amb Ãxit"
+
+#~ msgid "Insert Send options"
+#~ msgstr "Insereix opcions d'enviament"
+
+#~ msgid "The participants will receive the following notification.\n"
+#~ msgstr "Els participants rebran la segÃent notificaciÃ.\n"
+
+#~ msgid "Add Send Options to GroupWise messages"
+#~ msgstr "Afegeix opcions d'enviament als missatges del GroupWise"
+
+#~ msgid "Fine-tune your GroupWise accounts."
+#~ msgstr "Ajusteu els parÃmetres dels comptes GroupWise."
+
+#~ msgid "GroupWise Features"
+#~ msgstr "CaracterÃstiques GroupWise"
+
+#~ msgid "Message retract failed"
+#~ msgstr "Ha fallat la retirada del correu"
+
+#~ msgid "The server did not allow the selected message to be retracted."
+#~ msgstr "El servidor no ha permÃs retirar el missatge seleccionat."
+
+#~ msgid ""
+#~ "Account &quot;{0}&quot; already exists. Please check your folder tree."
+#~ msgstr ""
+#~ "Ja existeix un compte anomenat Â{0}Â. HaurÃeu de comprovar l'arbre de "
+#~ "carpetes."
+
+#~ msgid "Account Already Exists"
+#~ msgstr "Ja existeix el compte"
+
+#~ msgid "Invalid user"
+#~ msgstr "L'usuari no Ãs vÃlid"
+
+#~ msgid ""
+#~ "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+#~ "address and try again."
+#~ msgstr ""
+#~ "No s'ha pogut entrar al servidor intermediari com a Â{0}Â. HaurÃeu de "
+#~ "comprovar l'adreÃa electrÃnica introduÃda i tornar-ho a intentar."
+
+#~ msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+#~ msgstr "No es pot atorgar accÃs al servidor intermediari a l'usuari Â{0}Â"
+
+#~ msgid "Specify User"
+#~ msgstr "Seleccioneu l'usuari"
+
+#~ msgid "You have already given proxy permissions to this user."
+#~ msgstr ""
+#~ "Ja heu atorgat permisos d'accÃs al servidor intermediari a aquest usuari."
+
+#~ msgid "You have to specify a valid user name to give proxy rights."
+#~ msgstr ""
+#~ "Heu d'especificar un nom d'usuari vÃlid per atorgar-li permisos de "
+#~ "servidor intermediari."
+
+#~ msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+#~ msgstr ""
+#~ "No podeu compartir aquesta carpeta amb l'usuari que heu especificat "
+#~ "(Â{0}Â)"
+
+#~ msgid "You have to specify a user name which you want to add to the list"
+#~ msgstr ""
+#~ "Heu d'especificar el nom de l'usuari al qual vulgueu afegir a la llista"
+
+#~ msgid "Do you want to resend the meeting?"
+#~ msgstr "Voleu tornar a enviar la reuniÃ?"
+
+#~ msgid "Do you want to resend the recurring meeting?"
+#~ msgstr "Voleu tornar a enviar la reuniÃ periÃdica?"
+
+#~ msgid "Do you want to retract the original item?"
+#~ msgstr "Voleu retirar l'element original?"
+
+#~ msgid "The original will be removed from the recipient's mailbox."
+#~ msgstr "Se suprimirÃ l'original de la bÃstia de correu del destinatari."
+
+#~ msgid "This is a recurring meeting"
+#~ msgstr "Aquesta Ãs una reuniÃ periÃdica"
+
+#~ msgid "This will create a new meeting using the existing meeting details."
+#~ msgstr ""
+#~ "Aquesta acciÃ crearÃ una reuniÃ nova a partir dels detalls de la reuniÃ "
+#~ "existent."
+
+#~ msgid ""
+#~ "This will create a new meeting with the existing meeting details. The "
+#~ "recurrence rule needs to be re-entered."
+#~ msgstr ""
+#~ "Aquesta acciÃ crearÃ una reuniÃ nova a partir dels detalls de la reuniÃ "
+#~ "existent. Haureu de tornar a introduir la regla de periodicitat."
+
+#~ msgid "Would you like to accept it?"
+#~ msgstr "Ho voleu acceptar?"
+
+#~ msgid "Would you like to decline it?"
+#~ msgstr "Ho voleu cancelÂlar?"
+
+#~ msgid "C_ustomize notification message"
+#~ msgstr "Personalitza el missatge de notifi_caciÃ"
+
+#~ msgid "Con_tacts..."
+#~ msgstr "Con_tactes..."
+
+#~ msgid "Users:"
+#~ msgstr "Usuaris:"
+
+#~ msgid "_Not Shared"
+#~ msgstr "No e_s comparteix"
+
+#~ msgid "_Shared With..."
+#~ msgstr "E_s comparteix amb..."
+
+#~ msgid "Access Rights"
+#~ msgstr "Drets d'accÃs"
+
+#~ msgid "Add/Edit"
+#~ msgstr "Afegeix/edita"
+
+#~ msgid "Con_tacts"
+#~ msgstr "Con_tactes"
+
+#~ msgid "Modify _folders/options/rules/"
+#~ msgstr "Modi_fica carpetes/opcions/regles"
+
+#~ msgid "Read items marked _private"
+#~ msgstr "Llegeix elements marcats _privats"
+
+#~ msgid "Subscribe to my _alarms"
+#~ msgstr "Subscriu a les meves _alarmes"
+
+#~ msgid "Subscribe to my _notifications"
+#~ msgstr "Subscriu a les meves _notificacions"
+
+#~ msgid "_Write"
+#~ msgstr "_Escriptura"
+
+#~ msgid "permission to read|_Read"
+#~ msgstr "_Lectura"
+
+#~ msgid "Proxy"
+#~ msgstr "Servidor intermediari"
+
+# Vegeu el comentari de sota referent a aquesta mateixa cadena (dpm)
+#~ msgid "Proxy Login"
+#~ msgstr "Entrada com a delegat"
+
+#~ msgid "%sEnter password for %s (user %s)"
+#~ msgstr "%s IntroduÃu la contrasenya per a %s (usuari %s)"
+
+#~ msgid "The Proxy tab will be available only when the account is online."
+#~ msgstr ""
+#~ "La pestanya del delegat nomÃs estarÃ disponible quan el compte estigui en "
+#~ "lÃnia."
+
+#~ msgid "The Proxy tab will be available only when the account is enabled."
+#~ msgstr ""
+#~ "La pestanya del delegat nomÃs estarÃ disponible quan el compte estigui "
+#~ "habilitat."
+
+#~ msgctxt "GW"
+#~ msgid "Proxy"
+#~ msgstr "Servidor intermediari"
+
+#~ msgid "Add User"
+#~ msgstr "Afegeix un usuari"
+
+#~ msgid "Advanced send options"
+#~ msgstr "Opcions avanÃades d'enviament"
+
+#~ msgid "Users"
+#~ msgstr "Usuaris"
+
+#~ msgid "Enter the users and set permissions"
+#~ msgstr "IntroduÃu els usuaris i establiu els permisos"
+
+#~ msgid "Sharing"
+#~ msgstr "ComparticiÃ"
+
+#~ msgid "Custom Notification"
+#~ msgstr "NotificaciÃ personalitzada"
+
+#~ msgid "Add   "
+#~ msgstr "Afegeix   "
+
+#~ msgid "Modify"
+#~ msgstr "Modifica"
+
+#~ msgid "Message Status"
+#~ msgstr "Estat del missatge"
+
+#~ msgid "Subject:"
+#~ msgstr "Assumpte:"
+
+#~ msgid "From:"
+#~ msgstr "De:"
+
+#~ msgid "Creation date:"
+#~ msgstr "Data de creaciÃ:"
+
+#~ msgid "Recipient: "
+#~ msgstr "Destinatari: "
+
+#~ msgid "Delivered: "
+#~ msgstr "Entregat: "
+
+#~ msgid "Opened: "
+#~ msgstr "Obert: "
+
+#~ msgid "Accepted: "
+#~ msgstr "Acceptat: "
+
+#~ msgid "Deleted: "
+#~ msgstr "Suprimit: "
+
+#~ msgid "Declined: "
+#~ msgstr "Declinat: "
+
+#~ msgid "Completed: "
+#~ msgstr "Completat: "
+
+#~ msgid "Undelivered: "
+#~ msgstr "No entregat: "
+
+#~ msgid "Enable D-Bus messages."
+#~ msgstr "Habilita els missatges del D-Bus."
+
+#~ msgid "Generates a D-Bus message when new mail messages arrive."
+#~ msgstr "Genera un missatge del D-Bus quan arribi correu nou."
+
+#~ msgid "Popup message together with the icon."
+#~ msgstr "Mostra un missatge emergent juntament amb la icona."
+
+#~ msgid "Whether show message over the icon when new messages arrive."
+#~ msgstr ""
+#~ "Si s'ha de mostrar un missatge sobre la icona quan arribin correus nous."
+
+#~ msgid "Show icon in _notification area"
+#~ msgstr "Mostra una icona a l'Ãrea de _notificaciÃ"
+
+#~ msgid "Popup _message together with the icon"
+#~ msgstr "Mostra un _missatge emergent juntament amb la icona"
+
+#~ msgid "Generate a _D-Bus message"
+#~ msgstr "Genera un missatge del _D-Bus"
+
+#~ msgid ""
+#~ "Selected calendar contains some events for the given mails already. Would "
+#~ "you like to create new events anyway?"
+#~ msgstr ""
+#~ "El calendari seleccionat ja contÃ alguns esdeveniments per als correus "
+#~ "proporcionats. Voleu crear esdeveniments nous de totes maneres?"
+
+#~ msgid ""
+#~ "Selected task list contains some tasks for the given mails already. Would "
+#~ "you like to create new tasks anyway?"
+#~ msgstr ""
+#~ "La llista de tasques seleccionada ja contÃ algunes tasques per als "
+#~ "correus proporcionats. Voleu crear tasques noves de totes maneres?"
+
+#~ msgid ""
+#~ "Selected memo list contains some memos for the given mails already. Would "
+#~ "you like to create new memos anyway?"
+#~ msgstr ""
+#~ "La llista d'anotacions seleccionada ja contÃ algunes anotacions per als "
+#~ "correus proporcionats. Voleu crear anotacions noves de totes maneres?"
+
+#~ msgid ""
+#~ "Selected calendar contains an event for the given mail already. Would you "
+#~ "like to create new event anyway?"
+#~ msgid_plural ""
+#~ "Selected calendar contains events for the given mails already. Would you "
+#~ "like to create new events anyway?"
+#~ msgstr[0] ""
+#~ "El calendari seleccionat ja contÃ un esdeveniment per al correu "
+#~ "proporcionat. Voleu crear un esdeveniment nou de totes maneres?"
+#~ msgstr[1] ""
+#~ "El calendari seleccionat ja contÃ alguns esdeveniments per als correus "
+#~ "proporcionats. Voleu crear esdeveniments nous de totes maneres?"
+
+#~ msgid ""
+#~ "Selected task list contains a task for the given mail already. Would you "
+#~ "like to create new task anyway?"
+#~ msgid_plural ""
+#~ "Selected task list contains tasks for the given mails already. Would you "
+#~ "like to create new tasks anyway?"
+#~ msgstr[0] ""
+#~ "La llista de tasques seleccionada ja contÃ una tasca per al correu "
+#~ "proporcionat. Voleu crear una tasca nova de totes maneres?"
+#~ msgstr[1] ""
+#~ "La llista de tasques seleccionada ja contÃ algunes tasques per als "
+#~ "correus proporcionats. Voleu crear tasques noves de totes maneres?"
+
+#~ msgid ""
+#~ "Selected memo list contains a memo for the given mail already. Would you "
+#~ "like to create new memo anyway?"
+#~ msgid_plural ""
+#~ "Selected memo list contains memos for the given mails already. Would you "
+#~ "like to create new memos anyway?"
+#~ msgstr[0] ""
+#~ "La llista d'anotacions seleccionada ja contÃ una anotaciÃ per al correu "
+#~ "proporcionat. Voleu crear una anotaciÃ nova de totes maneres?"
+#~ msgstr[1] ""
+#~ "La llista d'anotacions seleccionada ja contÃ algunes anotacions per als "
+#~ "correus proporcionats. Voleu crear anotacions noves de totes maneres?"
+
+#~ msgid "SpamAssassin not found, code: %d"
+#~ msgstr "No s'ha trobat l'SpamAssassin, codi retornat: %d"
+
+#~ msgid "Failed to create pipe: %s"
+#~ msgstr "No s'ha pogut crear el conducte (ÂpipeÂ): %s"
+
+#~ msgid "Error after fork: %s"
+#~ msgstr "S'ha produÃt un error desprÃs de la crida ÂforkÂ: %s"
+
+#~ msgid "SpamAssassin child process does not respond, killing..."
+#~ msgstr "El procÃs fill de l'SpamAssassin no respon; se suprimirÃ..."
+
+#~ msgid "Wait for SpamAssassin child process interrupted, terminating..."
+#~ msgstr ""
+#~ "S'ha interromput l'espera per al procÃs fill del SpamAssassin; es "
+#~ "terminarÃ..."
+
+#~ msgid "Pipe to SpamAssassin failed, error code: %d"
+#~ msgstr ""
+#~ "Ha fallat la creaciÃ d'un conducte cap al SpamAssassin; el codi d'error "
+#~ "fou: %d"
+
+#~ msgid "SpamAssassin is not available. Please install it first."
+#~ msgstr ""
+#~ "L'SpamAssassin no estÃ disponible. InstalÂleu-lo abans de continuar."
+
+#~ msgid "SpamAssassin Junk Filter"
+#~ msgstr "Filtrador de correu brossa SpamAssassin"
+
+#~ msgid "iCalendar format (.ics)"
+#~ msgstr "Format de l'iCalendar (.ics)"
+
+# FIXME (dpm)
+#~ msgid "Drafts based template plugin"
+#~ msgstr "Connector de plantilles basat en esborranys"
+
+#~ msgid "Evolution _FAQ"
+#~ msgstr "_PMF de l'Evolution"
+
+#~ msgid "Open the Frequently Asked Questions webpage"
+#~ msgstr "Obre la pÃgina web de les Preguntes MÃs FreqÃents"
+
+#~ msgid "Failed to import contact's certificate"
+#~ msgstr "Ha fallat la importaciÃ del certificat del contacte"
+
+#~ msgid "E-Mail Address"
+#~ msgstr "AdreÃa electrÃnica"
+
+#~ msgid "Failed to import certificate authority's certificate"
+#~ msgstr ""
+#~ "Ha fallat la importaciÃ del certificat de l'autoritat de certificaciÃ"
+
 #~ msgid "Run Anjal in a window"
 #~ msgstr "Executa l'Anjal en una finestra"
 
 #~ msgid "Make Anjal the default email client"
-#~ msgstr "Fes que l'Anjal sigui el client de correu electrÃnic predeterminat"
+#~ msgstr "Fes que l'Anjal sigui el client de correu electrÃnic per defecte"
 
 #~ msgid "Anjal email client"
 #~ msgstr "Client de correu Anjal"
@@ -22113,11 +22295,11 @@ msgstr "MÃtodes d'entrada"
 
 #~ msgid "Count of default recurrence for a new event. -1 means forever."
 #~ msgstr ""
-#~ "Nombre de la periodicitat predeterminada dels esdeveniments nous. -1 "
+#~ "Nombre de la periodicitat per defecte dels esdeveniments nous. -1 "
 #~ "significa per sempre."
 
 #~ msgid "Default recurrence count"
-#~ msgstr "Nombre predeterminat de la periodicitat"
+#~ msgstr "Nombre per defecte de la periodicitat"
 
 #~ msgid "Event Gradient"
 #~ msgstr "Degradat de l'esdeveniment"
@@ -22226,9 +22408,6 @@ msgstr "MÃtodes d'entrada"
 #~ msgid "%s has published meeting information."
 #~ msgstr "En/na %s ha publicat la informaciÃ de la reuniÃ."
 
-#~ msgid "Meeting Information"
-#~ msgstr "InformaciÃ de la reuniÃ"
-
 #~ msgid "%s requests the presence of %s at a meeting."
 #~ msgstr "En/na %s solÂlicita la presÃncia de %s a la reuniÃ."
 
@@ -22506,16 +22685,16 @@ msgstr "MÃtodes d'entrada"
 #~ msgstr "No s'ha seleccionat cap servidor"
 
 #~ msgid "Default height of the subscribe dialog."
-#~ msgstr "AlÃada predeterminada del diÃleg de subscripciÃ."
+#~ msgstr "AlÃada per defecte del diÃleg de subscripciÃ."
 
 #~ msgid "Default width of the subscribe dialog."
-#~ msgstr "Amplada predeterminada del diÃleg de subscripciÃ."
+#~ msgstr "Amplada per defecte del diÃleg de subscripciÃ."
 
 #~ msgid "Subscribe dialog default height"
-#~ msgstr "AlÃada predeterminada de la finestra de subscripciÃ"
+#~ msgstr "AlÃada per defecte de la finestra de subscripciÃ"
 
 #~ msgid "Subscribe dialog default width"
-#~ msgstr "Amplada predeterminada de la finestra de subscripciÃ"
+#~ msgstr "Amplada per defecte de la finestra de subscripciÃ"
 
 #~ msgid "(Not Recommended)"
 #~ msgstr "(no es recomana)"
@@ -22738,7 +22917,7 @@ msgstr "MÃtodes d'entrada"
 #~ "commutador."
 
 #~ msgid "Default Sync Address:"
-#~ msgstr "AdreÃa de sincronitzaciÃ predeterminada:"
+#~ msgstr "AdreÃa de sincronitzaciÃ per defecte:"
 
 #~ msgid "Could not load address book"
 #~ msgstr "No s'ha pogut carregar la llibreta d'adreces"
@@ -22831,7 +23010,7 @@ msgstr "MÃtodes d'entrada"
 #~ msgstr "No s'ha pogut escriure el bloc d'aplicaciÃ d'anotacions del Pilot"
 
 #~ msgid "Default Priority:"
-#~ msgstr "Prioritat predeterminada:"
+#~ msgstr "Prioritat per defecte:"
 
 #~ msgid "Could not read pilot's ToDo application block"
 #~ msgstr "No s'ha pogut llegir el bloc d'aplicaciÃ de tasques del Pilot"
@@ -22929,9 +23108,6 @@ msgstr "MÃtodes d'entrada"
 #~ msgid "Toggles whether the From chooser is displayed"
 #~ msgstr "Commuta la visualitzaciÃ del camp ÂDeÂ"
 
-#~ msgid "Show"
-#~ msgstr "Mostra"
-
 #~ msgid "Hide"
 #~ msgstr "Oculta"
 
@@ -22962,9 +23138,6 @@ msgstr "MÃtodes d'entrada"
 #~ "Mostra el camp ÂDeÂ en enviar un missatge de correu. Aquest parÃmetre es "
 #~ "controla des del menÃ Visualitza en seleccionar un compte de correu."
 
-#~ msgid "Text message part limit"
-#~ msgstr "LÃmit de la part del missatge de text"
-
 # FIXME: (dpm). Es refereix a l'opciÃ de mantenir la signatura
 # a sobre del missatge original en respondre
 #~ msgid "<b>Top Posting Option</b> (Not Recommended)"
@@ -23003,10 +23176,10 @@ msgstr "MÃtodes d'entrada"
 
 #~ msgid "Check whether Evolution is the default mail client on startup."
 #~ msgstr ""
-#~ "Comprova si l'Evolution Ãs el gestor de correu predeterminat en iniciar."
+#~ "Comprova si l'Evolution Ãs el gestor de correu per defecte en iniciar."
 
 #~ msgid "Default Mail Client"
-#~ msgstr "Client de correu predeterminat"
+#~ msgstr "Client de correu per defecte"
 
 #~ msgid "<b>Server</b>"
 #~ msgstr "<b>Servidor</b>"
@@ -23056,9 +23229,6 @@ msgstr "MÃtodes d'entrada"
 #~ msgid "Import"
 #~ msgstr "Importa"
 
-#~ msgid "View"
-#~ msgstr "Visualitza"
-
 #~ msgid "Show _Attachment Bar"
 #~ msgstr "Mostra la barra _de fitxers adjunts"
 
@@ -23083,9 +23253,6 @@ msgstr "MÃtodes d'entrada"
 #~ msgid "expand"
 #~ msgstr "expandeix"
 
-#~ msgid "{0}"
-#~ msgstr "{0}"
-
 #~ msgid "{1}"
 #~ msgstr "{1}"
 
@@ -23171,7 +23338,7 @@ msgstr "MÃtodes d'entrada"
 #~ msgstr "{0}."
 
 #~ msgid "Default Client"
-#~ msgstr "Client predeterminat"
+#~ msgstr "Client per defecte"
 
 #~ msgid "New Tab"
 #~ msgstr "Pestanya nova"
@@ -23386,10 +23553,10 @@ msgstr "MÃtodes d'entrada"
 #~ msgstr "Aquest giny mostra un calendari en miniatura"
 
 #~ msgid "Default Calendar Client"
-#~ msgstr "Client de calendari predeterminat"
+#~ msgstr "Client de calendari per defecte"
 
 #~ msgid "Default client for calendar operations"
-#~ msgstr "Client predeterminat per a les operacions de calendari"
+#~ msgstr "Client per defecte per a les operacions de calendari"
 
 #~ msgid "This widget displays groups of calendars"
 #~ msgstr "Aquest giny mostra grups de calendaris"
@@ -23401,10 +23568,10 @@ msgstr "MÃtodes d'entrada"
 #~ msgstr "El model de la taula d'anotacions"
 
 #~ msgid "Default Memo Client"
-#~ msgstr "Client d'anotacions predeterminat"
+#~ msgstr "Client d'anotacions per defecte"
 
 #~ msgid "Default client for memo operations"
-#~ msgstr "El client predeterminat per a les operacions d'anotacions"
+#~ msgstr "El client per defecte per a les operacions d'anotacions"
 
 #~ msgid "This widget displays groups of memo lists"
 #~ msgstr "Aquest giny mostra un grup de llistes d'anotacions"
@@ -23430,10 +23597,10 @@ msgstr "MÃtodes d'entrada"
 #~ msgstr "No s'han pogut actualitzar les tasques Â%sÂ"
 
 #~ msgid "Default Task Client"
-#~ msgstr "Client de tasques predeterminat"
+#~ msgstr "Client de tasques per defecte"
 
 #~ msgid "Default client for task operations"
-#~ msgstr "Client predeterminat per les tasques d'operacions"
+#~ msgstr "Client per defecte per les tasques d'operacions"
 
 #~ msgid "This widget displays groups of task lists"
 #~ msgstr "Aquest giny mostra grups de llistes de tasques"
@@ -24116,7 +24283,7 @@ msgstr "MÃtodes d'entrada"
 #~ msgstr "<span weight=\"bold\">Format de la data i hora</span>"
 
 #~ msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-#~ msgstr "<span weight=\"bold\">Servidor lliure/ocupat predeterminat</span>"
+#~ msgstr "<span weight=\"bold\">Servidor lliure/ocupat per defecte</span>"
 
 #~ msgid "<span weight=\"bold\">Task List</span>"
 #~ msgstr "<span weight=\"bold\">Llista de tasques</span>"
@@ -24319,9 +24486,6 @@ msgstr "MÃtodes d'entrada"
 #~ msgid "message"
 #~ msgstr "missatge"
 
-#~ msgid "Save Message..."
-#~ msgstr "Desa el missatge..."
-
 #~ msgid "Show the \"Preview\" pane"
 #~ msgstr "Mostra la subfinestra ÂPrevisualitzaciÃÂ"
 
@@ -24350,7 +24514,7 @@ msgstr "MÃtodes d'entrada"
 #~ msgstr "<span weight=\"bold\">ConfiguraciÃ</span>"
 
 #~ msgid "<span weight=\"bold\">Default Behavior</span>"
-#~ msgstr "<span weight=\"bold\">Comportament predeterminat</span>"
+#~ msgstr "<span weight=\"bold\">Comportament per defecte</span>"
 
 #~ msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
 #~ msgstr "<span weight=\"bold\">Ca_pÃaleres del correu mostrades</span>"
@@ -24708,7 +24872,7 @@ msgstr "MÃtodes d'entrada"
 #~ msgstr "BotÃ combinat"
 
 #~ msgid "Activate Default"
-#~ msgstr "Activa el predeterminat"
+#~ msgstr "Activa el per defecte"
 
 #~ msgid "Popup Menu"
 #~ msgstr "MenÃ emergent"
@@ -25047,7 +25211,7 @@ msgstr "MÃtodes d'entrada"
 #~ msgstr "Control de configuraciÃ de la xarxa de l'Evolution"
 
 #~ msgid "[Default]"
-#~ msgstr "[Predeterminat]"
+#~ msgstr "[Per defecte]"
 
 #~ msgid "Signature(s)"
 #~ msgstr "Signatures"
@@ -25122,10 +25286,10 @@ msgstr "MÃtodes d'entrada"
 #~ msgstr "Afegeix una adreÃa"
 
 #~ msgid "Default height of the message window."
-#~ msgstr "Amplada predeterminada de la finestra de missatge."
+#~ msgstr "Amplada per defecte de la finestra de missatge."
 
 #~ msgid "Default width of the message window."
-#~ msgstr "Amplada predeterminada de la finestra dels missatges."
+#~ msgstr "Amplada per defecte de la finestra dels missatges."
 
 #~ msgid ""
 #~ "If the \"Preview\" pane is on, then show it side-by-side rather than "
@@ -25135,10 +25299,10 @@ msgstr "MÃtodes d'entrada"
 #~ "costat en comptes de verticalment."
 
 #~ msgid "Message Window default height"
-#~ msgstr "AlÃada predeterminada de la finestra de missatges"
+#~ msgstr "AlÃada per defecte de la finestra de missatges"
 
 #~ msgid "Message Window default width"
-#~ msgstr "Amplada predeterminada de la finestra de missatges"
+#~ msgstr "Amplada per defecte de la finestra de missatges"
 
 #~ msgid "Prompt to check if the user wants to go offline immediately"
 #~ msgstr "Pregunta si l'usuari vol treballar fora de lÃnia immediatament"
@@ -25872,9 +26036,6 @@ msgstr "MÃtodes d'entrada"
 #~ msgid "{0} is already a delegate"
 #~ msgstr "{0} ja Ãs un delegat"
 
-#~ msgid "{0} is already in the list"
-#~ msgstr "{0} ja Ãs a la llista"
-
 #~ msgid "Subscribe to Other User's Tasks"
 #~ msgstr "Subscriviu-vos a les tasques d'un altre usuari"
 
@@ -27329,8 +27490,8 @@ msgstr "MÃtodes d'entrada"
 #~ "Provides functionality for marking a calendar or an address book as the "
 #~ "default one."
 #~ msgstr ""
-#~ "Proporciona funcionalitat per a marcar com a predeterminats un calendari "
-#~ "o una llibreta d'adreces."
+#~ "Proporciona funcionalitat per a marcar com a per defecte un calendari o "
+#~ "una llibreta d'adreces."
 
 #~ msgid "S_pecify the mailbox name"
 #~ msgstr "Es_pecifiqueu el nom de la bÃstia de correu"
@@ -27559,9 +27720,6 @@ msgstr "MÃtodes d'entrada"
 #~ msgid "Item(s) belong to these _categories:"
 #~ msgstr "Els elements pertanyen a aquestes _categories:"
 
-#~ msgid "_Available Categories:"
-#~ msgstr "C_ategories disponibles:"
-
 #~ msgid "categories"
 #~ msgstr "categories"
 
@@ -28032,9 +28190,6 @@ msgstr "MÃtodes d'entrada"
 #~ msgid "Con_figure"
 #~ msgstr "Con_figura"
 
-#~ msgid "Download messages for offline"
-#~ msgstr "Baixa els missatges dels elements fora de lÃnia"
-
 #~ msgid "MTWTFSS"
 #~ msgstr "LMXJVSD"
 
@@ -28076,22 +28231,10 @@ msgstr "MÃtodes d'entrada"
 #~ msgstr "_AdreÃa:"
 
 #, fuzzy
-#~ msgid ""
-#~ "The changed email or name of this contact already\n"
-#~ "exists in this folder.  Would you like to add it anyway?"
-#~ msgstr ""
-#~ "Ja existeix el nom o l'adreÃa electrÃnica d'aquest contacte en aquesta "
-#~ "carpeta. Voleu afegir-l'hi de totes maneres?"
-
-#, fuzzy
 #~ msgid "Print cards"
 #~ msgstr "Imprimeix les tasques"
 
 #, fuzzy
-#~ msgid "Organization"
-#~ msgstr "_OrganitzaciÃ:"
-
-#, fuzzy
 #~ msgid "E-mail"
 #~ msgstr "AdreÃa electrÃnica"
 
@@ -28498,8 +28641,8 @@ msgstr "MÃtodes d'entrada"
 #, fuzzy
 #~ msgid "Mark attachment to be shown inline by default."
 #~ msgstr ""
-#~ "Identificador o sobrenom del component a mostrar per defecte a l'inici de "
-#~ "manera predeterminada."
+#~ "Identificador o sobrenom del component a mostrar per defecte a l'inici "
+#~ "per defecte."
 
 #, fuzzy
 #~ msgid "_Edit..."
@@ -28852,9 +28995,6 @@ msgstr "MÃtodes d'entrada"
 #~ msgid "Create a new contact \"%s\""
 #~ msgstr "Crea un contacte nou"
 
-#~ msgid "Add address to existing contact \"%s\""
-#~ msgstr "Afegeix l'adreÃa al contacte existent Â%sÂ"
-
 #, fuzzy
 #~ msgid "Merge E-Mail Address"
 #~ msgstr "AdreÃa electrÃnica"
@@ -29002,7 +29142,7 @@ msgstr "MÃtodes d'entrada"
 
 #, fuzzy
 #~ msgid "option menu to choose reminder units"
-#~ msgstr "Unitats predeterminades pels recordatoris"
+#~ msgstr "Unitats per defecte pels recordatoris"
 
 #~ msgid "option menu to choose time units"
 #~ msgstr "menÃ d'opcions per triar la unitat del temps"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]