Updated Galician Translation.

2008-01-26 Ignacio Casal Quinteiro <nacho.resa@gmail.com> * gl.po: Updated Galician Translation. svn path=/trunk/; revision=34899
author: Ignacio Casal Quinteiro <nacho.resa@gmail.com> 2008-01-27 00:01:32 +0800
committer: Ignacio Casal Quinteiro <icq@src.gnome.org> 2008-01-27 00:01:32 +0800
commit: b19d472595091b90fd2cfeef638e004362937e5f (patch)
tree: 27ad366dafbbbca66e2967b10fd75fcf13e6eb02 /po
parent: c7129ada34802b1a8a4ecdf0905894dd9ab8c241 (diff)
download: gsoc2013-evolution-b19d472595091b90fd2cfeef638e004362937e5f.tar
gsoc2013-evolution-b19d472595091b90fd2cfeef638e004362937e5f.tar.gz
gsoc2013-evolution-b19d472595091b90fd2cfeef638e004362937e5f.tar.bz2
gsoc2013-evolution-b19d472595091b90fd2cfeef638e004362937e5f.tar.lz
gsoc2013-evolution-b19d472595091b90fd2cfeef638e004362937e5f.tar.xz
gsoc2013-evolution-b19d472595091b90fd2cfeef638e004362937e5f.tar.zst
gsoc2013-evolution-b19d472595091b90fd2cfeef638e004362937e5f.zip
2 files changed, 2833 insertions, 2637 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 471b4d4994..1e73f3003f 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-26  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+        * gl.po: Updated Galician Translation.
+
 2008-01-26  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translation
diff --git a/po/gl.po b/po/gl.po
index 70224da919..9c7840e778 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,4 +1,4 @@
-# translation of evolution.HEAD.po to Galego
+# translation of gl.po to Galego
 # Galician translation of Evolution.
 # Copyright (C) 2000 Jesús Bravo Álvarez.
 # Copyright (C) 2001 Manuel A. Fernández Montecelo.
@@ -11,13 +11,13 @@
 # Jesús Bravo Álvarez <jba@pobox.com>, 2000.
 # Manuel A. Fernández Montecelo <manuel@sindominio.net>, 2001, 2005.
 # Ignacio Casal Quinteiro <nacho.resa@gmail.com>, 2005, 2006.
-# Ignacio Casal Quinteiro <icq@svn.gnome.org>, 2007.
+# Ignacio Casal Quinteiro <icq@svn.gnome.org>, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution.HEAD\n"
+"Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-04 14:50+0100\n"
-"PO-Revision-Date: 2007-11-04 14:47+0100\n"
+"POT-Creation-Date: 2008-01-26 15:29+0100\n"
+"PO-Revision-Date: 2008-01-26 16:57+0100\n"
 "Last-Translator: Ignacio Casal Quinteiro <icq@svn.gnome.org>\n"
 "Language-Team: Galego <proxecto@trasno.net>\n"
 "MIME-Version: 1.0\n"
@@ -160,7 +160,7 @@ msgid "calendar view for one or more days"
 msgstr "visualización de calendario para un ou máis días"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:743
+#: ../calendar/gui/calendar-component.c:747
 msgid "%A %d %b %Y"
 msgstr "%A, %d de %b de %Y"
 
@@ -171,9 +171,9 @@ msgstr "%A, %d de %b de %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:746
-#: ../calendar/gui/e-day-view-top-item.c:1340
-#: ../calendar/gui/e-day-view.c:2118
+#: ../calendar/gui/calendar-component.c:750
+#: ../calendar/gui/e-day-view-top-item.c:1358
+#: ../calendar/gui/e-day-view.c:2158
 #: ../calendar/gui/e-week-view-main-item.c:319
 #: ../calendar/gui/e-week-view-main-item.c:533
 msgid "%a %d %b"
@@ -182,9 +182,9 @@ msgstr "%a, %d de %b"
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:748
-#: ../calendar/gui/calendar-component.c:753
-#: ../calendar/gui/calendar-component.c:755
+#: ../calendar/gui/calendar-component.c:752
+#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:759
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -192,10 +192,10 @@ msgstr "%a %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:767
-#: ../calendar/gui/calendar-component.c:774
-#: ../calendar/gui/calendar-component.c:780
-#: ../calendar/gui/calendar-component.c:782
+#: ../calendar/gui/calendar-component.c:771
+#: ../calendar/gui/calendar-component.c:778
+#: ../calendar/gui/calendar-component.c:784
+#: ../calendar/gui/calendar-component.c:786
 msgid "%d %b %Y"
 msgstr "%d de %b de %Y"
 
@@ -205,9 +205,9 @@ msgstr "%d de %b de %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:772
-#: ../calendar/gui/e-day-view-top-item.c:1344
-#: ../calendar/gui/e-day-view.c:2134
+#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/e-day-view-top-item.c:1362
+#: ../calendar/gui/e-day-view.c:2174
 #: ../calendar/gui/e-week-view-main-item.c:333
 #: ../calendar/gui/e-week-view-main-item.c:547
 msgid "%d %b"
@@ -301,7 +301,7 @@ msgstr "Cela da táboa"
 
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:571
+#: ../widgets/table/e-table-click-to-add.c:581
 msgid "click to add"
 msgstr "prema para engadir"
 
@@ -360,14 +360,18 @@ msgid "Address '{0}' already exists."
 msgstr "O enderezo '{0}' xa existe."
 
 #: ../addressbook/addressbook.error.xml.h:3
+msgid "Cannot add new contact"
+msgstr "Non se pode engadir un novo contacto"
+
+#: ../addressbook/addressbook.error.xml.h:4
 msgid "Cannot move contact."
 msgstr "Non se pode mover o contacto."
 
-#: ../addressbook/addressbook.error.xml.h:4
+#: ../addressbook/addressbook.error.xml.h:5
 msgid "Category editor not available."
 msgstr "O editor de categorías non está dispoñible."
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:6
 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; "
@@ -378,15 +382,15 @@ msgstr ""
 "diferencia entre maiúsculas e minúsculas; pode ser que a súa tecla de "
 "bloqueo de maiúsculas estea activada."
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Could not get schema information for LDAP server."
 msgstr "Non se pode obter o esquema de información para o servidor LDAP."
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:8
 msgid "Could not remove addressbook."
 msgstr "Non se pode eliminar a axenda de enderezos."
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:9
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
@@ -397,60 +401,65 @@ msgstr ""
 "obter os contactos frecuentes do GroupWise e os cartafoles de contactos "
 "persoais do GroupWise."
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:10
 msgid "Delete address book '{0}'?"
 msgstr "Eliminar a axenda de enderezos '{0}'?"
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Error loading addressbook."
 msgstr "Erro ao cargar a axenda de enderezos."
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Erro ao gardar {0} en {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:13
 msgid "Failed to authenticate with LDAP server."
 msgstr "Fallo ao autenticarse co servidor LDAP."
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:13
+#: ../addressbook/addressbook.error.xml.h:14
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1705
 msgid "Failed to delete contact"
 msgstr "Fallo ao eliminar o contacto"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "GroupWise Address book creation:"
 msgstr "Creación da axenda de enderezos do GroupWise"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "LDAP server did not respond with valid schema information."
 msgstr "O servidor LDAP non respondeu cunha información válida do esquema."
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Permission Denied."
 msgstr "Permiso denegado."
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "Server Version"
 msgstr "Versión do servidor"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "Algunhas características pode que non funcionen apropiadamente co servidor "
 "actual"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "A axenda de enderezos do Evolution saíu inesperadamente."
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:21
 msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
+"The address book {0} is read only, thus you cannot add contacts there. "
+"Select other address book, please."
+msgstr "O libro de enderezos {0} é de só lectura, así que non podes engadir contactos aquí. Selecciona outro libro de enderezos."
+
+#: ../addressbook/addressbook.error.xml.h:22
+msgid "The image you have selected is large. Do you want to resize and store it?"
 msgstr "A imaxe que seleccionou é grande. Quere redimensionala e almacenala?"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:23
 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 "
@@ -460,21 +469,21 @@ msgstr ""
 "soporta esta funcionalidade ou que está mal configurada. Pida bases de busca "
 "soportadas ao seu administrador de sistema."
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book will be removed permanently."
 msgstr "Esta axenda de enderezos eliminarase permanentemente."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This addressbook could not be opened."
 msgstr "Esta axenda de enderezos non se puido abrir."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This addressbook server does not have any suggested search bases."
 msgstr ""
 "Este servidor de axendas de enderezos non ten ningunha das bases de busca "
 "propostas."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:27
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -483,27 +492,27 @@ msgstr ""
 "nome do servidor estea mal escrito ou talvez a súa conexión de rede estea "
 "caída."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Este servidor non soporta o esquema de información LDAPv3."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to open addressbook"
 msgstr "Non é posible abrir a axenda de enderezos"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "Non é posible realizar a busca."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "Non é posible gardar {0}."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "Quere gardar os cambios?"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -511,7 +520,7 @@ msgstr ""
 "Está tentando mover un contacto desde unha axenda a outra mais non se pode "
 "eliminar da orixe. Quere gardar unha copia en vez de movelo?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -521,50 +530,49 @@ msgstr ""
 "problemas ao usar o Evolution. Para uns mellores resultados o servidor "
 "debería actualizarse a unha versión soportada"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:35
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "Fixo modificacións neste contacto. Quere gardar estas modificacións?"
 
-#: ../addressbook/addressbook.error.xml.h:34
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+#: ../addressbook/addressbook.error.xml.h:36
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Os seus contactos para {0} non estarán dispoñibles até que o Evolution se "
 "reinicie."
 
-#: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:512
+#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:512
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:9
-#: ../widgets/table/e-table-config.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:18
 msgid "_Add"
 msgstr "Eng_adir"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Discard"
 msgstr "_Rexeitar"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Do not save"
 msgstr "Non gar_dar"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Resize"
 msgstr "_Redimensionar"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Use as it is"
 msgstr "_Usar tal como está"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:43
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "{0}"
 msgstr "{0}"
 
 #. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:43
+#: ../addressbook/addressbook.error.xml.h:45
 msgid "{1}"
 msgstr "{1}"
 
@@ -600,7 +608,7 @@ msgstr "Configurar aquí o completado automático"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1336
+#: ../addressbook/gui/component/addressbook-view.c:1338
 #: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:402
 #: ../plugins/exchange-operations/exchange-delegates-user.c:83
 #: ../plugins/exchange-operations/exchange-folder.c:581
@@ -646,9 +654,9 @@ msgstr "Xestione os seus certificados S/MIME aquí"
 #: ../calendar/gui/calendar-component.c:237
 #: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:481
 #: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1095
-#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:199
-#: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:302
-#: ../mail/mail-vfolder.c:223
+#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
+#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:305
+#: ../mail/mail-vfolder.c:216
 msgid "On This Computer"
 msgstr "Neste computador"
 
@@ -659,13 +667,12 @@ msgstr "Neste computador"
 #. orange
 #: ../addressbook/gui/component/addressbook-component.c:152
 #: ../addressbook/gui/component/addressbook-migrate.c:505
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
 #: ../calendar/gui/calendar-component.c:248
 #: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:491
 #: ../calendar/gui/migration.c:590 ../calendar/gui/migration.c:1103
-#: ../calendar/gui/tasks-component.c:205 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:106
+#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
 msgid "Personal"
 msgstr "Persoal"
 
@@ -706,8 +713,7 @@ msgstr "Crear unha axenda de enderezos nova"
 
 #: ../addressbook/gui/component/addressbook-component.c:409
 msgid "Failed upgrading Address Book settings or folders."
-msgstr ""
-"Fallo ao actualizar a configuración da axenda de enderezos ou os cartafoles."
+msgstr "Fallo ao actualizar a configuración da axenda de enderezos ou os cartafoles."
 
 #: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
@@ -719,9 +725,9 @@ msgid "_Type:"
 msgstr "_Tipo:"
 
 #: ../addressbook/gui/component/addressbook-config.c:632
-msgid "Copy book content locally for offline operation"
+msgid "Copy _book content locally for offline operation"
 msgstr ""
-"Copiar o contido do axenda de enderezos localmente para unha operación sen "
+"Copiar o contido da a_xenda de enderezos localmente para unha operación sen "
 "conexión"
 
 #: ../addressbook/gui/component/addressbook-config.c:981
@@ -730,15 +736,15 @@ msgstr ""
 #: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/dialogs/calendar-setup.c:380
 #: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
-#: ../plugins/itip-formatter/itip-formatter.c:2315
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2318
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Xeral"
 
 #: ../addressbook/gui/component/addressbook-config.c:982
 #: ../addressbook/gui/widgets/e-addressbook-view.c:557
-#: ../mail/importers/pine-importer.c:392
+#: ../mail/importers/pine-importer.c:387
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
@@ -757,7 +763,7 @@ msgid "Details"
 msgstr "Detalles"
 
 #: ../addressbook/gui/component/addressbook-config.c:992
-#: ../mail/em-folder-browser.c:862
+#: ../mail/em-folder-browser.c:935
 msgid "Searching"
 msgstr "Buscando"
 
@@ -771,12 +777,12 @@ msgid "Address Book Properties"
 msgstr "Propiedades da axenda de enderezos"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
 msgid "Migrating..."
 msgstr "Migrando..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrando `%s':"
@@ -834,18 +840,18 @@ msgstr ""
 "Sexa paciente mentres o Evolution migra os seus datos Pilot Sync..."
 
 #: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:504
+#: ../mail/em-folder-utils.c:503
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomear o cartafol \"%s\" como:"
 
 #: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:506
+#: ../mail/em-folder-utils.c:505
 msgid "Rename Folder"
 msgstr "Renomear o cartafol"
 
 #: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:512
+#: ../mail/em-folder-utils.c:511
 msgid "Folder names cannot contain '/'"
 msgstr "Os nomes dos cartafoles non poden conter o carácter '/'"
 
@@ -853,29 +859,28 @@ msgstr "Os nomes dos cartafoles non poden conter o carácter '/'"
 msgid "_New Address Book"
 msgstr "_Nova axenda de enderezos"
 
-#. FIXME: need to disable for undeletable folders
 #: ../addressbook/gui/component/addressbook-view.c:955
+msgid "Save As vCard..."
+msgstr "Gardar como vCard..."
+
+#: ../addressbook/gui/component/addressbook-view.c:958
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:607
-#: ../calendar/gui/e-calendar-table.c:1345
-#: ../calendar/gui/e-calendar-view.c:1696 ../calendar/gui/e-memo-table.c:935
-#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
-#: ../mail/em-folder-tree.c:2113 ../mail/em-folder-view.c:1233
+#: ../calendar/gui/calendar-component.c:609
+#: ../calendar/gui/e-calendar-table.c:1349
+#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:938
+#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
+#: ../mail/em-folder-tree.c:2107 ../mail/em-folder-view.c:1345
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-memos.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "E_liminar"
 
-#: ../addressbook/gui/component/addressbook-view.c:957
-msgid "Save As Vcard..."
-msgstr "Gardar como VCard..."
-
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:961
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1347
+#: ../addressbook/gui/component/addressbook-view.c:1349
 msgid "Contact Source Selector"
 msgstr "Selector de orixe de contactos"
 
@@ -883,12 +888,12 @@ msgstr "Selector de orixe de contactos"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accedendo anonimamente ao servidor LDAP"
 
-#: ../addressbook/gui/component/addressbook.c:197
+#: ../addressbook/gui/component/addressbook.c:200
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
 msgid "Failed to authenticate.\n"
 msgstr "Fallou ao autenticarse.\n"
 
-#: ../addressbook/gui/component/addressbook.c:204
+#: ../addressbook/gui/component/addressbook.c:207
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
 #, c-format
 msgid "Enter password for %s (user %s)"
@@ -928,13 +933,11 @@ msgstr ""
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid "URI for the folder last used in the select names dialog"
-msgstr ""
-"URI para o cartafol usado por última vez no diálogo de selección de nomes"
+msgstr "URI para o cartafol usado por última vez no diálogo de selección de nomes"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog."
-msgstr ""
-"URI para o cartafol usado por última vez no diálogo de selección de nomes."
+msgstr "URI para o cartafol usado por última vez no diálogo de selección de nomes."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
@@ -1015,10 +1018,8 @@ msgid "Email address"
 msgstr "Enderezo de correo"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr ""
-"O Evolution empregará este enderezo de correo para autenticalo co servidor."
+msgid "Evolution will use this email address to authenticate you with the server."
+msgstr "O Evolution empregará este enderezo de correo para autenticalo co servidor."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
@@ -1216,7 +1217,8 @@ msgstr "Método de _inicio de sesión:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:164
+#: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Nome:"
@@ -1230,7 +1232,7 @@ msgid "_Search scope:"
 msgstr "Ámbito da bu_sca:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:172
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Servidor:"
@@ -1251,10 +1253,9 @@ msgstr "cartóns"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../mail/em-account-editor.c:2064
 #: ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:561
-#: ../plugins/google-account-setup/google-source.c:380
+#: ../plugins/google-account-setup/google-source.c:395
 msgid "minutes"
 msgstr "minutos"
 
@@ -1296,98 +1297,98 @@ msgstr "<b>Traballo</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:551
+#: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
+msgid "Ca_tegories..."
+msgstr "Ca_tegorías..."
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:273
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
 #: ../addressbook/gui/widgets/e-minicard.c:194
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:550
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:565
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2430
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "_Nome completo..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "Imaxe"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Enderezo de correo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Ni_ckname:"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+msgid "Nic_kname:"
 msgstr "_Alcume:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "Datos persoais"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
 msgstr "Teléfono"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:202
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
-#: ../mail/mail-config.glade.h:158
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../mail/em-migrate.c:1055
 msgid "Work"
 msgstr "Traballo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Enderezo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
 msgstr "_Aniversario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
 msgstr "_Asistente:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
 msgstr "_Aniversario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: ../calendar/gui/dialogs/event-page.c:901
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../calendar/gui/dialogs/event-page.c:899
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1840
+#: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Calendario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "_Categorías..."
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_City:"
 msgstr "_Cidade:"
@@ -1464,7 +1465,7 @@ msgid "_Web Log:"
 msgstr "Rexistro _web:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_Onde:"
 
@@ -1473,8 +1474,8 @@ msgid "_Zip/Postal Code:"
 msgstr "_Código Postal:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "Enderezo"
 
@@ -1482,7 +1483,7 @@ msgstr "Enderezo"
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:301
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
 #: ../addressbook/gui/widgets/e-addressbook-model.c:312
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
@@ -1490,8 +1491,8 @@ msgstr "Enderezo"
 #: ../addressbook/gui/widgets/e-minicard-view.c:522
 #: ../addressbook/gui/widgets/e-minicard.c:187
 #: ../widgets/menus/gal-define-views-model.c:179
-#: ../widgets/table/e-cell-text.c:1831 ../widgets/text/e-text.c:3679
-#: ../widgets/text/e-text.c:3680
+#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3688
 msgid "Editable"
 msgstr "Editable"
 
@@ -2464,11 +2465,13 @@ msgid "Zimbabwe"
 msgstr "Cimbabue"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
+#: ../mail/em-mailer-prefs.c:481
 #: ../plugins/exchange-operations/exchange-delegates.c:958
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:54
+#: ../plugins/plugin-manager/plugin-manager.c:56
 #: ../plugins/save-attachments/save-attachments.c:366
 #: ../widgets/menus/gal-define-views-dialog.c:348
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
 #: ../widgets/menus/gal-view-new-dialog.c:65
 msgid "Name"
 msgstr "Nome"
@@ -2479,7 +2482,7 @@ msgstr "Messenger instantáneo AOL"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2493,7 +2496,7 @@ msgstr "Messenger Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:553
+#: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2502,7 +2505,7 @@ msgid "Service"
 msgstr "Servizo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
+#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:514
 #: ../plugins/save-calendar/csv-format.c:396
 msgid "Location"
@@ -2525,22 +2528,22 @@ msgid "Other"
 msgstr "Outros"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
+#: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:552
+#: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
@@ -2574,15 +2577,15 @@ msgstr "Modificado"
 msgid "Contact Editor - %s"
 msgstr "Editor de Contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
 msgid "Please select an image for this contact"
 msgstr "Escolla unha imaxe para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid "_No image"
 msgstr "_Sen imaxe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3088
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2590,43 +2593,43 @@ msgstr ""
 "Os datos de contacto non son válidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3092
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ten un formato non válido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ten un formato non válido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3114
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3125
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' está baleiro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3140
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
 msgid "Invalid contact."
 msgstr "Contacto non válido."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:298
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
 msgid "Contact Quick-Add"
 msgstr "Adición rápida de contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "_Edit Full"
 msgstr "_Editar Completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
 msgid "_Full name"
 msgstr "Nome _completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
 msgid "E_mail"
 msgstr "Correo _electrónico"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:369
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
 msgid "_Select Address Book"
 msgstr "_Seleccione a axenda de enderezos"
 
@@ -2770,48 +2773,35 @@ msgid "_Location:"
 msgstr "Localización:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "\n"
-msgstr "\n"
+msgid "<b>Members</b>"
+msgstr "<b>Membros</b>"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-msgid "Add an email to the List"
-msgstr "Engadir un correo á lista"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:943
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
 msgid "Contact List Editor"
 msgstr "Editor da lista de contactos"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-msgid "Insert email addresses from Address Book"
-msgstr "Inserir enderezos de correo desde a axenda de enderezos"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-msgid "Members"
-msgstr "Integrantes"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-msgid "Remove an email address from the List"
-msgstr "Eliminar un enderezo de correo da lista"
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Select..."
+msgstr "Seleccione..."
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Ocultar os enderezos cando se envíe correo a esta lista"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_List name:"
 msgstr "_Nome da lista:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
-msgid "_Select"
-msgstr "_Seleccionar"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr ""
-"_Escriba un enderezo de correo ou arrastre un contacto á lista de abaixo:"
+msgstr "_Escriba un enderezo de correo ou arrastre un contacto á lista de abaixo:"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+msgid "Contact List Members"
+msgstr "Membros da lista de contactos"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
 #: ../addressbook/gui/widgets/e-addressbook-model.c:298
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:383
 #: ../addressbook/gui/widgets/e-addressbook-view.c:217
@@ -2820,18 +2810,14 @@ msgstr ""
 msgid "Book"
 msgstr "Axenda de enderezos"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
 msgid "Is New List"
 msgstr "É unha lista nova"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:764
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
 msgid "_Members"
 msgstr "_Integrantes"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:767
-msgid "Contact List Members"
-msgstr "Membros da lista de contactos"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Contacto modificado:"
@@ -2846,12 +2832,11 @@ msgid "Duplicate Contact Detected"
 msgstr "Detectado un contacto duplicado"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-#, fuzzy
 msgid ""
 "The name or email of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
 msgstr ""
-"O nome ou enderezo de correo deste contacto xa existe neste\n"
+"O nome ou enderezo de correo deste contacto xa existe neste"
 "cartafol. Quere engadilo de todas as formas?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
@@ -2875,15 +2860,15 @@ msgid "Merge Contact"
 msgstr "Combinar contacto"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:205
-#, fuzzy
 msgid "_Merge"
-msgstr "Combinar"
+msgstr "_Combinar"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:258
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
-#: ../addressbook/gui/widgets/eab-contact-display.c:785
+#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:600
+#: ../addressbook/gui/widgets/eab-contact-display.c:860
 #: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Correo Electrónico"
@@ -2929,15 +2914,15 @@ msgid "Error getting book view"
 msgstr "Erro ao obter a visualización da axenda de enderezos"
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
-#: ../widgets/table/e-table-click-to-add.c:500
+#: ../widgets/table/e-table-click-to-add.c:510
 #: ../widgets/table/e-table-selection-model.c:303
 #: ../widgets/table/e-table.c:3335
-#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3543
-#: ../widgets/text/e-text.c:3544
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3552
 msgid "Model"
 msgstr "Modelo"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:104
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
 msgid "Error modifying card"
 msgstr "Erro ao modificar o cartón"
 
@@ -2947,7 +2932,7 @@ msgstr "Fonte"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:238
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:500
+#: ../calendar/gui/e-meeting-list-view.c:501
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
@@ -2955,14 +2940,13 @@ msgstr "Tipo"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:814
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1924
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
-msgstr "Gardar como VCard..."
+msgid "Save as vCard..."
+msgstr "Gardar como vCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:935
-#: ../calendar/gui/dialogs/comp-editor.c:1124
-#: ../calendar/gui/e-calendar-table.c:1323
-#: ../calendar/gui/e-calendar-view.c:1674 ../calendar/gui/e-memo-table.c:918
+#: ../calendar/gui/dialogs/comp-editor.c:1134
+#: ../calendar/gui/e-calendar-table.c:1327
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:921
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Abrir"
@@ -2976,8 +2960,8 @@ msgid "New Contact _List..."
 msgstr "Nova _lista de contactos..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "_Save as VCard..."
-msgstr "_Gardar como VCard..."
+msgid "_Save as vCard..."
+msgstr "_Gardar como vCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contact"
@@ -3018,10 +3002,10 @@ msgstr "Cor_tar"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:955
 #: ../calendar/gui/dialogs/comp-editor.c:463
-#: ../calendar/gui/e-calendar-table.c:1331
-#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:926
-#: ../composer/e-msg-composer.c:3209 ../mail/em-folder-tree.c:992
-#: ../mail/em-folder-view.c:1218 ../mail/message-list.c:1969
+#: ../calendar/gui/e-calendar-table.c:1335
+#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:929
+#: ../composer/e-msg-composer.c:3103 ../mail/em-folder-tree.c:1013
+#: ../mail/em-folder-view.c:1330 ../mail/message-list.c:2056
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
@@ -3042,12 +3026,12 @@ msgstr "Calquera categoría"
 
 #. E_BOOK_ERROR_OTHER_ERROR
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1705
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "Other error"
 msgstr "Outro erro"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
+#: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
 msgstr "Axudante"
 
@@ -3085,7 +3069,7 @@ msgid "Categories"
 msgstr "Categorías"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 msgid "Company"
 msgstr "Empresa"
 
@@ -3134,22 +3118,22 @@ msgid "Journal"
 msgstr "Diario"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
 msgid "Manager"
 msgstr "Xestor"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
 msgid "Mobile Phone"
 msgstr "Teléfono móbil"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "Nickname"
 msgstr "Alcume"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:604
+#: ../addressbook/gui/widgets/eab-contact-display.c:667
 msgid "Note"
 msgstr "Nota"
 
@@ -3178,14 +3162,14 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:511
+#: ../calendar/gui/e-meeting-list-view.c:513
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
 msgid "Role"
 msgstr "Rol"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Spouse"
 msgstr "Cónxuxe"
 
@@ -3219,15 +3203,15 @@ msgstr "Sitio Web"
 #: ../addressbook/gui/widgets/e-minicard.c:150
 #: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
 #: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
-#: ../widgets/table/e-table-click-to-add.c:514
+#: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-col.c:99
 #: ../widgets/table/e-table-field-chooser-item.c:655
 #: ../widgets/table/e-table-group-container.c:966
 #: ../widgets/table/e-table-group-container.c:967
 #: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
-#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
+#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
+#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
 msgid "Width"
 msgstr "Largura"
 
@@ -3235,14 +3219,14 @@ msgstr "Largura"
 #: ../addressbook/gui/widgets/e-minicard.c:157
 #: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
 #: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
-#: ../widgets/table/e-table-click-to-add.c:521
+#: ../widgets/table/e-table-click-to-add.c:531
 #: ../widgets/table/e-table-field-chooser-item.c:662
 #: ../widgets/table/e-table-group-container.c:959
 #: ../widgets/table/e-table-group-container.c:960
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
-#: ../widgets/text/e-text.c:3729 ../widgets/text/e-text.c:3730
+#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Height"
 msgstr "Altura"
 
@@ -3343,16 +3327,16 @@ msgstr "Seleccionado"
 msgid "Has Cursor"
 msgstr "Posúe cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
 msgid "_Open Link in Browser"
 msgstr "_Abrir ligazón no navegador"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2612
+#: ../mail/em-folder-view.c:2776
 msgid "_Copy Link Location"
 msgstr "_Copiar localización da ligazón"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:634
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
 msgid "_Send New Message To..."
 msgstr "_Enviar unha mensaxe nova a..."
 
@@ -3362,41 +3346,43 @@ msgid "Copy _Email Address"
 msgstr "Copiar enderezo de _correo"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:359
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
+#: ../addressbook/gui/widgets/eab-contact-display.c:372
 msgid "(map)"
 msgstr "(mapa)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:306
-#: ../addressbook/gui/widgets/eab-contact-display.c:372
+#: ../addressbook/gui/widgets/eab-contact-display.c:390
+#: ../addressbook/gui/widgets/eab-contact-display.c:402
 msgid "map"
 msgstr "mapa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:456
-#: ../addressbook/gui/widgets/eab-contact-display.c:763
+#: ../addressbook/gui/widgets/eab-contact-display.c:487
+#: ../addressbook/gui/widgets/eab-contact-display.c:827
 msgid "List Members"
 msgstr "Listar integrantes"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:567
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
 msgid "Department"
 msgstr "Departamento"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:568
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Profession"
 msgstr "Profesión"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
 msgid "Position"
 msgstr "Cargo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
 msgid "Video Chat"
 msgstr "Videoconferencia"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../addressbook/gui/widgets/eab-contact-display.c:636
 #: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:791
+#: ../calendar/gui/calendar-component.c:795
 #: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2349
+#: ../calendar/gui/gnome-cal.c:2383
 #: ../plugins/exchange-operations/exchange-delegates-user.c:83
 #: ../plugins/exchange-operations/exchange-folder.c:575
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
@@ -3408,149 +3394,149 @@ msgstr "Videoconferencia"
 msgid "Calendar"
 msgstr "Calendario"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/event-editor.c:369
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Dispoñibilidade"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
-#: ../addressbook/gui/widgets/eab-contact-display.c:590
+#: ../addressbook/gui/widgets/eab-contact-display.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:639
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:587
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Home Page"
 msgstr "Páxina persoal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
 msgid "Web Log"
 msgstr "Blogue"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
-#: ../calendar/gui/e-calendar-view.c:2318
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../calendar/gui/e-calendar-view.c:2327
 msgid "Birthday"
 msgstr "Aniversario"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
-#: ../calendar/gui/e-calendar-view.c:2319
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../calendar/gui/e-calendar-view.c:2328
 msgid "Anniversary"
 msgstr "Aniversario"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:781
+#: ../addressbook/gui/widgets/eab-contact-display.c:845
 msgid "Job Title"
 msgstr "Posto de traballo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:812
+#: ../addressbook/gui/widgets/eab-contact-display.c:881
 msgid "Home page"
 msgstr "Páxina de inicio"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:820
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
 msgid "Blog"
 msgstr "Blogue"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Success"
 msgstr "Éxito"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Backend busy"
 msgstr "Backend ocupado"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Address Book does not exist"
 msgstr "A axenda de enderezos non existe"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "No Self Contact defined"
 msgstr "Ningún contacto propio definido"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Contact not found"
 msgstr "Contacto non encontrado"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Contact ID already exists"
 msgstr "O ID de contacto xa existe"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Protocol not supported"
 msgstr "Non se soprota o protocolo"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:239
 #: ../calendar/gui/e-cal-model-tasks.c:350
 #: ../calendar/gui/e-cal-model-tasks.c:665
-#: ../calendar/gui/e-calendar-table.c:401 ../calendar/gui/print.c:2419
+#: ../calendar/gui/e-calendar-table.c:403 ../calendar/gui/print.c:2520
 msgid "Canceled"
 msgstr "Cancelado"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Could not cancel"
 msgstr "Non se puido cancelar"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #: ../calendar/gui/comp-editor-factory.c:422
 msgid "Authentication Failed"
 msgstr "Fallou a autenticación"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Authentication Required"
 msgstr "Autenticación requirida"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "TLS not Available"
 msgstr "TLS non dispoñible"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "No such source"
 msgstr "Non existe esa orixe"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "Not available in offline mode"
 msgstr "Non dispoñible en modo sen conexión"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Invalid server version"
 msgstr "Versión do servidor non válida"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:95
+#: ../addressbook/gui/widgets/eab-gui-util.c:99
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3561,7 +3547,7 @@ msgstr ""
 "o uso sen conexión. Cargue a axenda de enderezos unha vez en modo con "
 "conexión para descargar os seus contidos"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:104
+#: ../addressbook/gui/widgets/eab-gui-util.c:108
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3570,7 +3556,7 @@ msgstr ""
 "Non foi posible abrir esta axenda de enderezos. Verifique que o camiño %s "
 "existe e que ten permisos para acceder a el."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:113
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3578,7 +3564,7 @@ msgstr ""
 "Non foi posible abrir esta axenda de enderezos.  Isto significa que "
 "introduciu un URI incorrecto ou que o servidor LDAP está fóra de servizo."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:118
+#: ../addressbook/gui/widgets/eab-gui-util.c:122
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3587,7 +3573,7 @@ msgstr ""
 "Esta versión do Evolution non ten soporte LDAP compilado nela. Se quere usar "
 "LDAP no Evolution, debe instalar un paquete do Evolution co LDAP activado."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:125
+#: ../addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3595,7 +3581,7 @@ msgstr ""
 "Non foi posible abrir esta axenda de enderezos.  Isto significa que "
 "introduciu un URI incorrecto ou que o servidor é inaccesible."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3608,7 +3594,7 @@ msgstr ""
 "aumente o límite de resultados nas preferencias do servidor\n"
 "de directorios para esta axenda de enderezos."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:158
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3620,47 +3606,45 @@ msgstr ""
 "especifique máis a súa busca ou aumente o límite de tempo nas \n"
 "preferencias do servidor de directorio para esta axenda de enderezos."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:164
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-"O backend para esta axenda de enderezos non puido analizar esta consulta."
+msgstr "O backend para esta axenda de enderezos non puido analizar esta consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:163
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-"O backend para esta axenda de enderezos rexeitou efectuar esta consulta."
+msgstr "O backend para esta axenda de enderezos rexeitou efectuar esta consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
 msgid "This query did not complete successfully."
 msgstr "Esta consulta non terminou con éxito."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error adding list"
 msgstr "Erro ao engadir a lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
-#: ../addressbook/gui/widgets/eab-gui-util.c:666
+#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:670
 msgid "Error adding contact"
 msgstr "Erro ao engadir o contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:199
+#: ../addressbook/gui/widgets/eab-gui-util.c:203
 msgid "Error modifying list"
 msgstr "Erro ao modificar a lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:199
+#: ../addressbook/gui/widgets/eab-gui-util.c:203
 msgid "Error modifying contact"
 msgstr "Erro ao modificar o contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
 msgid "Error removing list"
 msgstr "Erro ao eliminar a lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:616
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:620
 msgid "Error removing contact"
 msgstr "Erro ao eliminar o contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:293
+#: ../addressbook/gui/widgets/eab-gui-util.c:297
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3675,18 +3659,16 @@ msgstr[1] ""
 "Ao abrir %d contactos abrirá %d novas ventás tamén.\n"
 "Está seguro de que quere mostrar este contacto?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:301
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
 msgid "_Don't Display"
-msgstr "Mostrar"
+msgstr "_Non mostrar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:302
-#, fuzzy
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
 msgid "Display _All Contacts"
-msgstr "C_opiar todos os contactos a..."
+msgstr "Mostrar _todos os contactos"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:328
+#: ../addressbook/gui/widgets/eab-gui-util.c:332
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3695,65 +3677,65 @@ msgstr ""
 "%s xa existe\n"
 "Quere sobrescribilo?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:336
 msgid "Overwrite"
 msgstr "Sobrescribir"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:375
-#: ../addressbook/gui/widgets/eab-gui-util.c:378
+#: ../addressbook/gui/widgets/eab-gui-util.c:379
+#: ../addressbook/gui/widgets/eab-gui-util.c:382
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "contacto"
 msgstr[1] "contactos"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:424
+#: ../addressbook/gui/widgets/eab-gui-util.c:428
 msgid "card.vcf"
 msgstr "cartón.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:461
+#: ../addressbook/gui/widgets/eab-gui-util.c:465
 msgid "Select Address Book"
 msgstr "Seleccione a axenda de enderezos"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:575
+#: ../addressbook/gui/widgets/eab-gui-util.c:579
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:727
+#: ../addressbook/gui/widgets/eab-gui-util.c:731
 msgid "Move contact to"
 msgstr "Mover contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:729
+#: ../addressbook/gui/widgets/eab-gui-util.c:733
 msgid "Copy contact to"
 msgstr "Copiar contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:732
+#: ../addressbook/gui/widgets/eab-gui-util.c:736
 msgid "Move contacts to"
 msgstr "Mover contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:734
+#: ../addressbook/gui/widgets/eab-gui-util.c:738
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:960
-msgid "Multiple VCards"
-msgstr "Varias VCards"
+#: ../addressbook/gui/widgets/eab-gui-util.c:983
+msgid "Multiple vCards"
+msgstr "Varias vCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:963
+#: ../addressbook/gui/widgets/eab-gui-util.c:986
 #, c-format
-msgid "VCard for %s"
-msgstr "VCard para %s"
+msgid "vCard for %s"
+msgstr "vCard para %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1004
-#: ../addressbook/gui/widgets/eab-gui-util.c:1022
+#: ../addressbook/gui/widgets/eab-gui-util.c:1027
+#: ../addressbook/gui/widgets/eab-gui-util.c:1052
 #, c-format
 msgid "Contact information"
 msgstr "Información de contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1024
+#: ../addressbook/gui/widgets/eab-gui-util.c:1054
 #, c-format
 msgid "Contact information for %s"
 msgstr "Información de contacto de %s"
@@ -3771,12 +3753,12 @@ msgstr[1] "Hai outros %d contactos."
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:228
 #: ../addressbook/gui/widgets/eab-vcard-control.c:279
-msgid "Show Full VCard"
-msgstr "Mostrar VCard completa"
+msgid "Show Full vCard"
+msgstr "Mostrar vCard completa"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:232
-msgid "Show Compact VCard"
-msgstr "Mostrar VCard compacta"
+msgid "Show Compact vCard"
+msgstr "Mostrar vCard compacta"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:284
 msgid "Save in addressbook"
@@ -3827,12 +3809,12 @@ msgid "Evolution LDIF importer"
 msgstr "Importador de LDIF do Evolution"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:547
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard (.vcf, .gcrd)"
+msgid "vCard (.vcf, .gcrd)"
+msgstr "vCard (.vcf, .gcrd)"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:548
-msgid "Evolution VCard Importer"
-msgstr "Importador de VCard do Evolution"
+msgid "Evolution vCard Importer"
+msgstr "Importador de vCard do Evolution"
 
 #: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -3875,7 +3857,7 @@ msgid "Format"
 msgstr "Formato"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:493
+#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
 #: ../widgets/table/e-table-field-chooser-dialog.c:81
 #: ../widgets/table/e-table-field-chooser-item.c:648
 #: ../widgets/table/e-table-field-chooser.c:81
@@ -3982,7 +3964,7 @@ msgstr "Sombreado"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:964
+#: ../plugins/exchange-operations/exchange-account-setup.c:967
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
@@ -4024,8 +4006,7 @@ msgstr "Dereitos de autor (C) 2000, Ximian, Inc."
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
-msgstr ""
-"Isto debería probar o widget do editor de estilo de impresión de contactos"
+msgstr "Isto debería probar o widget do editor de estilo de impresión de contactos"
 
 #: ../addressbook/printing/test-print.c:43
 msgid "Contact Print Test"
@@ -4074,7 +4055,6 @@ msgid "Export in asynchronous mode"
 msgstr "Exportar en modo asíncrono"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-#, fuzzy
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
@@ -4087,10 +4067,8 @@ msgid "NUMBER"
 msgstr "NÚMERO"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:102
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-"Erro nos argumentos da liña de comandos; use a opción --axuda para ver o uso."
+msgid "Command line arguments error, please use --help option to see the usage."
+msgstr "Erro nos argumentos da liña de comandos; use a opción --axuda para ver o uso."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:116
 msgid "Only support csv or vcard format."
@@ -4127,36 +4105,29 @@ msgstr ""
 #: ../calendar/calendar.error.xml.h:3
 #, fuzzy
 msgid "All information in these memos will be deleted and can not be restored."
-msgstr ""
-"Vaise eliminar toda a información destas tarefas e non se poderá restaurar."
+msgstr "Vaise eliminar toda a información destas tarefas e non se poderá restaurar."
 
 #: ../calendar/calendar.error.xml.h:4
 #, fuzzy
 msgid "All information in this memo will be deleted and can not be restored."
-msgstr ""
-"Vaise eliminar toda a información deste diario e non se poderá restaurar."
+msgstr "Vaise eliminar toda a información deste diario e non se poderá restaurar."
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
-msgstr ""
-"Vaise eliminar toda a información destas citas e non se poderá restaurar."
+msgstr "Vaise eliminar toda a información destas citas e non se poderá restaurar."
 
 #: ../calendar/calendar.error.xml.h:6
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr ""
-"Vaise eliminar toda a información destas tarefas e non se poderá restaurar."
+msgstr "Vaise eliminar toda a información destas tarefas e non se poderá restaurar."
 
 #: ../calendar/calendar.error.xml.h:7
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
-msgstr ""
-"Vaise eliminar toda a información desta cita e non se poderá restaurar."
+msgid "All information on this appointment will be deleted and can not be restored."
+msgstr "Vaise eliminar toda a información desta cita e non se poderá restaurar."
 
 #: ../calendar/calendar.error.xml.h:8
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "Vaise eliminar toda a información relativa a esta reunión e non se poderá "
 "restaurar."
@@ -4275,8 +4246,7 @@ msgstr ""
 "permitiráselles aceptar esta tarefa."
 
 #: ../calendar/calendar.error.xml.h:33
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
+msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Enviaranse convites por correo electrónico a todos os participantes e "
 "permitiráselles confirmalos."
@@ -4407,13 +4377,11 @@ msgstr "Quere gardar as modificacións feitas nesta tarefa?"
 #: ../calendar/calendar.error.xml.h:57
 #, fuzzy
 msgid "Would you like to send a cancelation notice for this memo?"
-msgstr ""
-"Quere enviar unha notificación de cancelación para esta entrada de diario?"
+msgstr "Quere enviar unha notificación de cancelación para esta entrada de diario?"
 
 #: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send all the participants a cancelation notice?"
-msgstr ""
-"Quere enviar a todos os participantes unha notificación de cancelación?"
+msgstr "Quere enviar a todos os participantes unha notificación de cancelación?"
 
 #: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to send meeting invitations to participants?"
@@ -4463,8 +4431,7 @@ msgstr "Realizou modificacións nesta nota, mais aínda non as gardou."
 
 #: ../calendar/calendar.error.xml.h:68
 msgid "Your calendars will not be available until Evolution is restarted."
-msgstr ""
-"Os seus calendarios non estarán dispoñibles até que o Evolution se reinicie."
+msgstr "Os seus calendarios non estarán dispoñibles até que o Evolution se reinicie."
 
 #: ../calendar/calendar.error.xml.h:69
 msgid "Your memos will not be available until Evolution is restarted."
@@ -4489,7 +4456,7 @@ msgid "_Save Changes"
 msgstr "_Gardar modificacións"
 
 #: ../calendar/calendar.error.xml.h:74
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:139
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Enviar"
@@ -4551,12 +4518,12 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Non se puido escribir o bloque de aplicación ToDo do pilot"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2306
+#: ../plugins/itip-formatter/itip-formatter.c:2309
 msgid "Calendar and Tasks"
 msgstr "Calendario e tarefas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1388
+#: ../calendar/gui/calendar-component.c:1392
 msgid "Calendars"
 msgstr "Calendarios"
 
@@ -4597,19 +4564,19 @@ msgid "Memo_s"
 msgstr "Nota_s"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1093
-#: ../calendar/gui/gnome-cal.c:1667 ../calendar/gui/memos-component.c:544
-#: ../calendar/gui/memos-component.c:1031 ../calendar/gui/memos-control.c:356
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1151
+#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
+#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
 #: ../calendar/gui/memos-control.c:372
 msgid "Memos"
 msgstr "Notas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/e-tasks.c:1357
-#: ../calendar/gui/gnome-cal.c:1539 ../calendar/gui/print.c:1875
-#: ../calendar/gui/tasks-component.c:535
-#: ../calendar/gui/tasks-component.c:1026 ../calendar/gui/tasks-control.c:494
-#: ../calendar/gui/tasks-control.c:510
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/e-tasks.c:1435
+#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1965
+#: ../calendar/gui/tasks-component.c:539
+#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:495
+#: ../calendar/gui/tasks-control.c:511
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
 #: ../plugins/exchange-operations/exchange-delegates-user.c:83
@@ -4645,13 +4612,13 @@ msgstr[1] "minutos"
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:289
 #: ../plugins/calendar-weather/calendar-weather.c:562
-#: ../plugins/google-account-setup/google-source.c:381
+#: ../plugins/google-account-setup/google-source.c:396
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "horas"
 msgstr[1] "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:273
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
 msgid "Start time"
 msgstr "Hora de comezo"
 
@@ -4662,10 +4629,10 @@ msgstr "Citas"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1615
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1621
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
 #: ../calendar/gui/e-itip-control.c:1155
-#: ../plugins/itip-formatter/itip-view.c:1001
+#: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "Localización:"
 
@@ -4675,7 +4642,7 @@ msgstr "_Pospor o aviso:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:165
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
@@ -4684,7 +4651,7 @@ msgstr "_Pospor o aviso:"
 #: ../ui/evolution-message-composer.xml.h:52
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:43 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -4696,31 +4663,32 @@ msgstr "_Pospor"
 msgid "location of appointment"
 msgstr "localización da cita"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1474
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
 msgid "No summary available."
 msgstr "Non hai resumo dispoñible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1483
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
 msgid "No description available."
 msgstr "Non hai descrición dispoñible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1493
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
 msgid "No location information available."
 msgstr "Non hai información da localización dispoñible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1537
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
 #, c-format
 msgid "You have %d alarms"
 msgstr "Posúe %d alarmas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#: ../mail/mail-component.c:1517
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4732,7 +4700,7 @@ msgstr ""
 "configurado para enviar unha mensaxe de correo electrónico. No seu lugar\n"
 "Evolution vai mostrar un diálogo de aviso normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4749,7 +4717,7 @@ msgstr ""
 "\n"
 "Está seguro de que quere executar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1747
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
 msgid "Do not ask me about this program again."
 msgstr "Non volver preguntar sobre este programa."
 
@@ -4758,11 +4726,10 @@ msgid "Could not initialize Bonobo"
 msgstr "Non se puido iniciar o Bonobo"
 
 #: ../calendar/gui/alarm-notify/notify-main.c:153
-#, fuzzy
 msgid ""
 "Could not create the alarm notify service factory, maybe it's already "
 "running..."
-msgstr "Non se puido crear a factoría do servizo de notificación de alarma"
+msgstr "Non se puido crear a factoría do servizo de notificación de alarma, pode que xa esté en execución..."
 
 #: ../calendar/gui/alarm-notify/util.c:41
 msgid "invalid time"
@@ -4811,16 +4778,14 @@ msgstr "Cor de fondo para as tarefas que vencen hoxe, no formato \"#rrggbb\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr ""
-"Cor de fondo para as tarefas que están pendentes, en formato \"#rrggbb\"."
+msgstr "Cor de fondo para as tarefas que están pendentes, en formato \"#rrggbb\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "Os calendarios nos que se activarán as alarmas"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Cor para debuxar a liña de Marcus Bains na barra de tempo (baleiro para a "
 "predeterminada)."
@@ -4895,8 +4860,7 @@ msgstr "Posición horizontal do panel"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr ""
-"Hora de fin da xornada laboral, en formato de vinte e catro horas, de 0 a 23."
+msgstr "Hora de fin da xornada laboral, en formato de vinte e catro horas, de 0 a 23."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
@@ -5026,8 +4990,7 @@ msgstr "Mostrar o campo Rol no editor de eventos/tarefas/reunións"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Show appointment end times in week and month views"
-msgstr ""
-"Mostrar os prazos finais das citas nas visualizacións semanal e mensual"
+msgstr "Mostrar os prazos finais das citas nas visualizacións semanal e mensual"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Show categories field in the event/meeting/task editor"
@@ -5042,12 +5005,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Mostrar o campo de estado no editor de eventos/tarefas/reunións"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Show the \"Preview\" pane"
 msgstr "Mostrar o panel de \"Previsualización\""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Show the \"Preview\" pane."
 msgstr "Mostrar o panel de \"Previsualización\"."
 
@@ -5117,12 +5080,10 @@ msgstr "Formato de hora en vinte e catro horas"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Unidades para o aviso predeterminado, \"minutos\", \"horas\" ou \"días\"."
+msgstr "Unidades para o aviso predeterminado, \"minutos\", \"horas\" ou \"días\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para determinar cando ocultar as tarefas, \"minutos\", \"horas\" ou "
 "\"días\"."
@@ -5162,15 +5123,12 @@ msgstr ""
 "semanais e mensuais."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr ""
-"Indica se se debuxa a liña Marcus Bains (liña na hora actual) no calendario."
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr "Indica se se debuxa a liña Marcus Bains (liña na hora actual) no calendario."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Whether to hide completed tasks in the tasks view."
-msgstr ""
-"Indica se se ocultan as tarefas terminadas na visualización de tarefas."
+msgstr "Indica se se ocultan as tarefas terminadas na visualización de tarefas."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Whether to set a default reminder for appointments."
@@ -5182,35 +5140,29 @@ msgstr "Indica se se mostra o campo RSVP no editor de eventos/tarefas/reunións"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Whether to show categories field in the event/meeting editor"
-msgstr ""
-"Indica se se mostra o campo de categorías no editor de eventos/reunións"
+msgstr "Indica se se mostra o campo de categorías no editor de eventos/reunións"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether to show role field in the event/task/meeting editor"
-msgstr ""
-"Indica se se mostra o campo de rol no editor de eventos/tarefas/reunións"
+msgstr "Indica se se mostra o campo de rol no editor de eventos/tarefas/reunións"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to show status field in the event/task/meeting editor"
-msgstr ""
-"Indica se se mostra o campo de estado no editor de eventos/tarefas/reunións"
+msgstr "Indica se se mostra o campo de estado no editor de eventos/tarefas/reunións"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "Indica se se mostran as horas en formato de vinte e catro horas en vez de "
 "usar am/pm."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether to show timezone field in the event/meeting editor"
-msgstr ""
-"Indica se se mostra o campo de fuso horario no editor de eventos ou reunións"
+msgstr "Indica se se mostra o campo de fuso horario no editor de eventos ou reunións"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to show type field in the event/task/meeting editor"
-msgstr ""
-"Indica se se mostra o campo de tipo no editor de eventos, tarefas ou reunións"
+msgstr "Indica se se mostra o campo de tipo no editor de eventos, tarefas ou reunións"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to show week numbers in the date navigator."
@@ -5270,7 +5222,6 @@ msgid "Unmatched"
 msgstr "Sen equivalencia"
 
 #: ../calendar/gui/cal-search-bar.c:631
-#, fuzzy
 msgid "Next 7 Days' Tasks"
 msgstr "Tarefas dos seguintes sete días"
 
@@ -5279,7 +5230,6 @@ msgid "Active Tasks"
 msgstr "Tarefas activas"
 
 #: ../calendar/gui/cal-search-bar.c:639
-#, fuzzy
 msgid "Overdue Tasks"
 msgstr "Tarefas pendentes"
 
@@ -5288,7 +5238,6 @@ msgid "Completed Tasks"
 msgstr "Tarefas terminadas"
 
 #: ../calendar/gui/cal-search-bar.c:647
-#, fuzzy
 msgid "Tasks with Attachments"
 msgstr "Tarefas con anexos"
 
@@ -5297,7 +5246,6 @@ msgid "Active Appointments"
 msgstr "Citas activas"
 
 #: ../calendar/gui/cal-search-bar.c:697
-#, fuzzy
 msgid "Next 7 Days' Appointments"
 msgstr "Citas dos seguintes sete días"
 
@@ -5325,7 +5273,7 @@ msgstr "Purgar eventos anteriores a"
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
 #: ../plugins/calendar-http/calendar-http.c:290
 #: ../plugins/calendar-weather/calendar-weather.c:563
-#: ../plugins/google-account-setup/google-source.c:382
+#: ../plugins/google-account-setup/google-source.c:397
 #: ../widgets/misc/e-send-options.glade.h:38
 msgid "days"
 msgstr "días"
@@ -5357,80 +5305,80 @@ msgstr "_Novo calendario"
 
 #: ../calendar/gui/calendar-component.c:606
 #: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../mail/em-folder-tree.c:2106
+#: ../mail/em-folder-tree.c:2102
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ../calendar/gui/calendar-component.c:608
-#: ../calendar/gui/dialogs/comp-editor.c:1126
-#: ../calendar/gui/memos-component.c:467 ../calendar/gui/tasks-component.c:458
-#: ../composer/e-msg-composer.c:3740 ../mail/em-folder-tree.c:2120
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:35
+#: ../calendar/gui/calendar-component.c:612
+#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
+#: ../composer/e-msg-composer.c:3634 ../mail/em-folder-tree.c:2116
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: ../calendar/gui/calendar-component.c:935
+#: ../calendar/gui/calendar-component.c:939
 msgid "Failed upgrading calendars."
 msgstr "Fallou ao actualizar calendarios."
 
-#: ../calendar/gui/calendar-component.c:1234
+#: ../calendar/gui/calendar-component.c:1238
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Non se puido abrir o calendario '%s' para crear eventos e reunións"
 
-#: ../calendar/gui/calendar-component.c:1250
+#: ../calendar/gui/calendar-component.c:1254
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Non hai ningún calendario dispoñible para crear eventos e reunións"
 
-#: ../calendar/gui/calendar-component.c:1363
+#: ../calendar/gui/calendar-component.c:1367
 msgid "Calendar Source Selector"
 msgstr "Selector de orixe do calendario"
 
-#: ../calendar/gui/calendar-component.c:1581
+#: ../calendar/gui/calendar-component.c:1585
 msgid "New appointment"
 msgstr "Nova cita"
 
-#: ../calendar/gui/calendar-component.c:1582
+#: ../calendar/gui/calendar-component.c:1586
 msgid "_Appointment"
 msgstr "_Cita"
 
-#: ../calendar/gui/calendar-component.c:1583
+#: ../calendar/gui/calendar-component.c:1587
 msgid "Create a new appointment"
 msgstr "Crear unha cita nova"
 
-#: ../calendar/gui/calendar-component.c:1589
+#: ../calendar/gui/calendar-component.c:1593
 msgid "New meeting"
 msgstr "Nova reunión"
 
-#: ../calendar/gui/calendar-component.c:1590
+#: ../calendar/gui/calendar-component.c:1594
 msgid "M_eeting"
 msgstr "R_eunión"
 
-#: ../calendar/gui/calendar-component.c:1591
+#: ../calendar/gui/calendar-component.c:1595
 msgid "Create a new meeting request"
 msgstr "Crear unha solicitude de nova reunión"
 
-#: ../calendar/gui/calendar-component.c:1597
+#: ../calendar/gui/calendar-component.c:1601
 msgid "New all day appointment"
 msgstr "Nova cita para todo o día"
 
-#: ../calendar/gui/calendar-component.c:1598
+#: ../calendar/gui/calendar-component.c:1602
 msgid "All Day A_ppointment"
 msgstr "_Cita para todo o día"
 
-#: ../calendar/gui/calendar-component.c:1599
+#: ../calendar/gui/calendar-component.c:1603
 msgid "Create a new all-day appointment"
 msgstr "Crear unha nova cita para todo o día"
 
-#: ../calendar/gui/calendar-component.c:1605
+#: ../calendar/gui/calendar-component.c:1609
 msgid "New calendar"
 msgstr "Novo calendario"
 
-#: ../calendar/gui/calendar-component.c:1606
+#: ../calendar/gui/calendar-component.c:1610
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
-#: ../calendar/gui/calendar-component.c:1607
+#: ../calendar/gui/calendar-component.c:1611
 msgid "Create a new calendar"
 msgstr "Crear un novo calendario"
 
@@ -5452,13 +5400,11 @@ msgstr "Visualización mensual"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:2
-#, fuzzy
 msgid "Description Contains"
 msgstr "A descrición contén"
 
 #: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
 #: ../calendar/gui/tasktypes.xml.h:3
-#, fuzzy
 msgid "Summary Contains"
 msgstr "O resumo contén"
 
@@ -5474,7 +5420,7 @@ msgstr "Método non soportado ao abrir o calendario"
 msgid "Permission denied to open the calendar"
 msgstr "Permiso denegado para abrir o calendario"
 
-#: ../calendar/gui/comp-editor-factory.c:428 ../shell/e-shell.c:1285
+#: ../calendar/gui/comp-editor-factory.c:428 ../shell/e-shell.c:1290
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
@@ -5633,21 +5579,19 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr ""
 "<i>%u e %d serán substituídas polo usuario e o dominio do enderezo de correo "
 "electrónico.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Alertas</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr ""
-"<span weight=\"bold\">Servidor de dispoñibilidade predeterminado</span>"
+msgstr "<span weight=\"bold\">Servidor de dispoñibilidade predeterminado</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #: ../mail/mail-config.glade.h:17
@@ -5680,7 +5624,7 @@ msgid "Display"
 msgstr "Mostrar"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
+#: ../calendar/gui/dialogs/recurrence-page.c:1098
 #: ../calendar/gui/e-itip-control.c:740
 msgid "Friday"
 msgstr "Venres"
@@ -5696,7 +5640,7 @@ msgstr ""
 "Días"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1094
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Monday"
 msgstr "Luns"
@@ -5720,7 +5664,7 @@ msgstr ""
 "Domingo"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:109
 msgid "Pick a color"
 msgstr "Seleccionar unha cor"
 
@@ -5730,7 +5674,7 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
+#: ../calendar/gui/dialogs/recurrence-page.c:1099
 #: ../calendar/gui/e-itip-control.c:741
 msgid "Saturday"
 msgstr "Sábado"
@@ -5748,7 +5692,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Mostrar os _números das semanas no navegador de datas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1100
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Sunday"
 msgstr "Domingo"
@@ -5767,7 +5711,7 @@ msgid "Template:"
 msgstr "Modelo:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Thursday"
 msgstr "Xoves"
@@ -5782,13 +5726,13 @@ msgid "Time format:"
 msgstr "Formato da hora:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1095
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Tuesday"
 msgstr "Martes"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/dialogs/recurrence-page.c:1096
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Wednesday"
 msgstr "Mércores"
@@ -5847,8 +5791,7 @@ msgstr "_Sáb"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Show appointment end times in week and month view"
-msgstr ""
-"_Mostrar os prazos finais das citas nas visualizacións semanal e mensual"
+msgstr "_Mostrar os prazos finais das citas nas visualizacións semanal e mensual"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Time divisions:"
@@ -5870,8 +5813,7 @@ msgstr "antes de cada cita"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y calendar contents locally for offline operation"
-msgstr ""
-"Cop_iar localmente os contidos do calendario para unha operación sen conexión"
+msgstr "Cop_iar localmente os contidos do calendario para unha operación sen conexión"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y task list contents locally for offline operation"
@@ -5968,150 +5910,151 @@ msgstr "%s  Non realizou modificacións, quere actualizar o editor?"
 msgid "Validation error: %s"
 msgstr "Erro de validación: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2247
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2337
 msgid " to "
 msgstr " para "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2251
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2341
 msgid " (Completed "
 msgstr " (Terminada "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2253
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2343
 msgid "Completed "
 msgstr "Terminada "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2258
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2348
 msgid " (Due "
 msgstr " (Pendente "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2260
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2350
 msgid "Due "
 msgstr "Pendente "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2956
+#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Mensaxe anexa - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2961
-#: ../composer/e-msg-composer.c:3146
+#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3040
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Mensaxe anexa"
 msgstr[1] "%d mensaxes anexas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3210
-#: ../mail/em-folder-tree.c:993 ../mail/em-folder-utils.c:369
-#: ../mail/em-folder-view.c:1114 ../mail/message-list.c:1970
+#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3104
+#: ../mail/em-folder-tree.c:1014 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1191 ../mail/message-list.c:2057
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3212
-#: ../mail/em-folder-tree.c:995 ../mail/message-list.c:1972
+#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3106
+#: ../mail/em-folder-tree.c:1016 ../mail/message-list.c:2059
 msgid "Cancel _Drag"
 msgstr "Cancelar o _arrastre"
 
-#: ../calendar/gui/dialogs/comp-editor.c:824
+#: ../calendar/gui/dialogs/comp-editor.c:669
+#: ../calendar/gui/dialogs/comp-editor.c:2827 ../mail/em-utils.c:372
+#: ../plugins/prefer-plain/prefer-plain.c:79
+#: ../widgets/misc/e-attachment-bar.c:359
+msgid "attachment"
+msgstr "anexo"
+
+#: ../calendar/gui/dialogs/comp-editor.c:831
 msgid "Could not update object"
 msgstr "Non se puido actualizar o obxecto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:971 ../composer/e-msg-composer.c:2573
+#: ../calendar/gui/dialogs/comp-editor.c:981 ../composer/e-msg-composer.c:2487
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> Anexo"
 msgstr[1] "<b>%d</b> Anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1003
+#: ../calendar/gui/dialogs/comp-editor.c:1013
 msgid "Hide Attachment _Bar"
 msgstr "Ocultar a _barra de anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1006
-#: ../calendar/gui/dialogs/comp-editor.c:1551
+#: ../calendar/gui/dialogs/comp-editor.c:1016
+#: ../calendar/gui/dialogs/comp-editor.c:1564
 msgid "Show Attachment _Bar"
 msgstr "Mostrar a _barra de anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
-#: ../calendar/gui/dialogs/event-page.c:1969
-#: ../calendar/gui/dialogs/task-page.c:1255 ../composer/e-msg-composer.c:3739
+#: ../calendar/gui/dialogs/comp-editor.c:1135
+#: ../calendar/gui/dialogs/event-page.c:1967
+#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3633
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:18
+#: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "E_liminar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../composer/e-msg-composer.c:3742
+#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../composer/e-msg-composer.c:3636
 msgid "_Add attachment..."
 msgstr "_Engadir anexo..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1575
-#: ../mail/em-format-html-display.c:2320
+#: ../calendar/gui/dialogs/comp-editor.c:1588
+#: ../mail/em-format-html-display.c:2374
 msgid "Show Attachments"
 msgstr "Mostrar anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1576
+#: ../calendar/gui/dialogs/comp-editor.c:1589
 msgid "Press space key to toggle attachment bar"
 msgstr "Prema a tecla de espazo para alternar a barra de anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2182
-#: ../calendar/gui/dialogs/comp-editor.c:2225
+#: ../calendar/gui/dialogs/comp-editor.c:2195
+#: ../calendar/gui/dialogs/comp-editor.c:2238
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2188
-#: ../calendar/gui/dialogs/comp-editor.c:2231
+#: ../calendar/gui/dialogs/comp-editor.c:2201
+#: ../calendar/gui/dialogs/comp-editor.c:2244
 #, c-format
 msgid "Meeting - %s"
 msgstr "Reunión - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2190
-#: ../calendar/gui/dialogs/comp-editor.c:2233
+#: ../calendar/gui/dialogs/comp-editor.c:2203
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2194
-#: ../calendar/gui/dialogs/comp-editor.c:2237
+#: ../calendar/gui/dialogs/comp-editor.c:2207
+#: ../calendar/gui/dialogs/comp-editor.c:2250
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarefa asignada - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2196
-#: ../calendar/gui/dialogs/comp-editor.c:2239
+#: ../calendar/gui/dialogs/comp-editor.c:2209
+#: ../calendar/gui/dialogs/comp-editor.c:2252
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2199
-#: ../calendar/gui/dialogs/comp-editor.c:2242
+#: ../calendar/gui/dialogs/comp-editor.c:2212
+#: ../calendar/gui/dialogs/comp-editor.c:2255
 #, fuzzy, c-format
 msgid "Memo - %s"
 msgstr "Notas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2210
-#: ../calendar/gui/dialogs/comp-editor.c:2252
+#: ../calendar/gui/dialogs/comp-editor.c:2223
+#: ../calendar/gui/dialogs/comp-editor.c:2265
 msgid "No summary"
 msgstr "Sen resumo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2802 ../mail/em-utils.c:370
-#: ../plugins/prefer-plain/prefer-plain.c:79
-#: ../widgets/misc/e-attachment-bar.c:360
-msgid "attachment"
-msgstr "anexo"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2891
-#: ../calendar/gui/dialogs/comp-editor.c:2945
-#: ../calendar/gui/dialogs/comp-editor.c:2969
+#: ../calendar/gui/dialogs/comp-editor.c:2916
+#: ../calendar/gui/dialogs/comp-editor.c:2970
+#: ../calendar/gui/dialogs/comp-editor.c:2994
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "As modificacións realizadas neste elemento pódense rexeitar se chega unha "
 "actualización"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2998
+#: ../calendar/gui/dialogs/comp-editor.c:3023
 msgid "Unable to use current version!"
 msgstr "Non é posible usar a versión actual!"
 
@@ -6206,127 +6149,126 @@ msgstr "_Cita"
 msgid "Recurrence"
 msgstr "Recorrencia"
 
-#: ../calendar/gui/dialogs/event-page.c:828
-#: ../calendar/gui/dialogs/event-page.c:2837
+#: ../calendar/gui/dialogs/event-page.c:826
+#: ../calendar/gui/dialogs/event-page.c:2835
 msgid "This event has alarms"
 msgstr "Este evento posúe alarmas"
 
-#: ../calendar/gui/dialogs/event-page.c:908
+#: ../calendar/gui/dialogs/event-page.c:906
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:460
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
-#: ../calendar/gui/dialogs/event-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:944
 msgid "_Delegatees"
 msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:948
+#: ../calendar/gui/dialogs/event-page.c:946
 msgid "Atte_ndees"
 msgstr "_Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:1130
+#: ../calendar/gui/dialogs/event-page.c:1128
 msgid "Event with no start date"
 msgstr "Evento sen data de comezo"
 
-#: ../calendar/gui/dialogs/event-page.c:1133
+#: ../calendar/gui/dialogs/event-page.c:1131
 msgid "Event with no end date"
 msgstr "Evento sen data de finalización"
 
-#: ../calendar/gui/dialogs/event-page.c:1305
-#: ../calendar/gui/dialogs/memo-page.c:703
-#: ../calendar/gui/dialogs/task-page.c:884
+#: ../calendar/gui/dialogs/event-page.c:1303
+#: ../calendar/gui/dialogs/memo-page.c:734
+#: ../calendar/gui/dialogs/task-page.c:893
 msgid "Start date is wrong"
 msgstr "A data de comezo é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1315
+#: ../calendar/gui/dialogs/event-page.c:1313
 msgid "End date is wrong"
 msgstr "A data de finalización é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1338
+#: ../calendar/gui/dialogs/event-page.c:1336
 msgid "Start time is wrong"
 msgstr "A hora de comezo é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1345
+#: ../calendar/gui/dialogs/event-page.c:1343
 msgid "End time is wrong"
 msgstr "A hora de finalización é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1507
-#: ../calendar/gui/dialogs/memo-page.c:742
-#: ../calendar/gui/dialogs/task-page.c:943
+#: ../calendar/gui/dialogs/event-page.c:1505
+#: ../calendar/gui/dialogs/memo-page.c:774
+#: ../calendar/gui/dialogs/task-page.c:952
 msgid "The organizer selected no longer has an account."
 msgstr "O organizador seleccionado xa non ten unha conta."
 
-#: ../calendar/gui/dialogs/event-page.c:1513
-#: ../calendar/gui/dialogs/memo-page.c:748
-#: ../calendar/gui/dialogs/task-page.c:949
+#: ../calendar/gui/dialogs/event-page.c:1511
+#: ../calendar/gui/dialogs/memo-page.c:780
+#: ../calendar/gui/dialogs/task-page.c:958
 msgid "An organizer is required."
 msgstr "Requírese un organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1538
-#: ../calendar/gui/dialogs/task-page.c:973
+#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/task-page.c:982
 msgid "At least one attendee is required."
 msgstr "Requírese polo menos un participante."
 
-#: ../calendar/gui/dialogs/event-page.c:1970
-#: ../calendar/gui/dialogs/task-page.c:1256
+#: ../calendar/gui/dialogs/event-page.c:1968
+#: ../calendar/gui/dialogs/task-page.c:1267
 msgid "_Add "
 msgstr "_Engadir "
 
-#: ../calendar/gui/dialogs/event-page.c:2713
+#: ../calendar/gui/dialogs/event-page.c:2711
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Non foi posible abrir o calendario '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2757
-#: ../calendar/gui/dialogs/memo-page.c:958
-#: ../calendar/gui/dialogs/task-page.c:1764
+#: ../calendar/gui/dialogs/event-page.c:2755
+#: ../calendar/gui/dialogs/memo-page.c:990
+#: ../calendar/gui/dialogs/task-page.c:1928
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:3056
+#: ../calendar/gui/dialogs/event-page.c:3053
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d día antes da cita"
 msgstr[1] "%d días antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3062
+#: ../calendar/gui/dialogs/event-page.c:3059
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora antes da cita"
 msgstr[1] "%d horas antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3068
+#: ../calendar/gui/dialogs/event-page.c:3065
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto antes da cita"
 msgstr[1] "%d minutos antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3081
+#: ../calendar/gui/dialogs/event-page.c:3078
 msgid "Customize"
 msgstr "Personalizar"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3086
+#: ../calendar/gui/dialogs/event-page.c:3083
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-itip-control.c:1141 ../composer/e-msg-composer.c:2357
-#: ../filter/filter-rule.c:892 ../mail/em-account-editor.c:701
-#: ../mail/em-account-editor.c:1421 ../mail/em-account-prefs.c:478
-#: ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
+#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
+#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates-user.c:200
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1995
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1504
-#: ../widgets/misc/e-dateedit.c:1718
+#: ../plugins/itip-formatter/itip-formatter.c:1996
+#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
+#: ../widgets/misc/e-dateedit.c:1745
+#: ../widgets/misc/e-signature-combo-box.c:50
 msgid "None"
 msgstr "Ningún"
 
@@ -6346,11 +6288,6 @@ msgstr "15 minutos antes da cita"
 msgid "Attendee_s..."
 msgstr "_Participantes..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-msgid "Ca_tegories..."
-msgstr "Ca_tegorías..."
-
 #: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "Custom Alarm:"
 msgstr "Alarma personalizada:"
@@ -6412,19 +6349,19 @@ msgstr "Organizador"
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2355
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2445
 msgid "Memo"
 msgstr "Nota"
 
-#: ../calendar/gui/dialogs/memo-page.c:920
+#: ../calendar/gui/dialogs/memo-page.c:952
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Non é posible abrir as notas en '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1104 ../mail/em-format-html.c:1526
-#: ../mail/em-format-html.c:1584 ../mail/em-format-html.c:1610
+#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html.c:1597 ../mail/em-format-html.c:1623
 #: ../mail/em-format-quote.c:207 ../mail/em-format.c:888
-#: ../mail/em-mailer-prefs.c:89 ../mail/message-list.etspec.h:18
+#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "Para"
 
@@ -6442,7 +6379,7 @@ msgid "_Description:"
 msgstr "_Descrición:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:453
+#: ../calendar/gui/dialogs/task-page.c:451
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupo:"
@@ -6483,17 +6420,17 @@ msgstr "Esta instancia e as futuras"
 msgid "All Instances"
 msgstr "Todas as instancias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:498
+#: ../calendar/gui/dialogs/recurrence-page.c:505
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita contén recorrencias que o Evolution non pode editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:819
+#: ../calendar/gui/dialogs/recurrence-page.c:826
 msgid "Recurrence date is invalid"
 msgstr "A data da recorrencia non é válida"
 
 #. 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:932
+#: ../calendar/gui/dialogs/recurrence-page.c:939
 msgid "on"
 msgstr "en"
 
@@ -6501,7 +6438,7 @@ msgstr "en"
 #. * (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:996
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "first"
 msgstr "primeiro"
 
@@ -6510,7 +6447,7 @@ msgstr "primeiro"
 #. * (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:1002
+#: ../calendar/gui/dialogs/recurrence-page.c:1009
 msgid "second"
 msgstr "segundo"
 
@@ -6518,7 +6455,7 @@ msgstr "segundo"
 #. * (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:1007
+#: ../calendar/gui/dialogs/recurrence-page.c:1014
 msgid "third"
 msgstr "terceiro"
 
@@ -6526,7 +6463,7 @@ msgstr "terceiro"
 #. * (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:1012
+#: ../calendar/gui/dialogs/recurrence-page.c:1019
 msgid "fourth"
 msgstr "cuarto"
 
@@ -6534,13 +6471,13 @@ msgstr "cuarto"
 #. * (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:1017
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "last"
 msgstr "último"
 
 #. 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:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
 msgid "Other Date"
 msgstr "Outra data"
 
@@ -6548,7 +6485,7 @@ msgstr "Outra 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:1051
+#: ../calendar/gui/dialogs/recurrence-page.c:1058
 msgid "1st to 10th"
 msgstr "Do 1º ao 10º"
 
@@ -6556,7 +6493,7 @@ msgstr "Do 1º ao 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:1057
+#: ../calendar/gui/dialogs/recurrence-page.c:1064
 msgid "11th to 20th"
 msgstr "do 11º ao 20º"
 
@@ -6564,45 +6501,45 @@ msgstr "do 11º ao 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:1063
+#: ../calendar/gui/dialogs/recurrence-page.c:1070
 msgid "21st to 31st"
 msgstr "Do 21º ao 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:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1093
 msgid "day"
 msgstr "día"
 
 #. 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:1226
+#: ../calendar/gui/dialogs/recurrence-page.c:1233
 msgid "on the"
 msgstr "no"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1419
+#: ../calendar/gui/dialogs/recurrence-page.c:1426
 msgid "occurrences"
 msgstr "ocorrencias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2157
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
 msgid "Add exception"
 msgstr "Engadir excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2200
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to modify."
 msgstr "Non se puido obter unha selección para modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2206
+#: ../calendar/gui/dialogs/recurrence-page.c:2216
 msgid "Modify exception"
 msgstr "Modificar excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2252
+#: ../calendar/gui/dialogs/recurrence-page.c:2262
 msgid "Could not get a selection to delete."
 msgstr "Non se puido obter unha selección para eliminar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2393
 msgid "Date/Time"
 msgstr "Data e hora"
 
@@ -6611,7 +6548,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Excepcións</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:2
+#: ../mail/mail-config.glade.h:3
 msgid "<b>Preview</b>"
 msgstr "<b>Previsualizar</b>"
 
@@ -6676,15 +6613,15 @@ msgstr "<span weight=\"bold\">Estado</span>"
 #: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-cal-model-tasks.c:348
 #: ../calendar/gui/e-cal-model-tasks.c:663
-#: ../calendar/gui/e-calendar-table.c:400 ../calendar/gui/e-itip-control.c:933
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/print.c:2416 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-calendar-table.c:402 ../calendar/gui/e-itip-control.c:933
+#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/print.c:2517 ../plugins/save-calendar/csv-format.c:386
 msgid "Completed"
 msgstr "Terminada"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:325 ../mail/message-list.c:1036
+#: ../calendar/gui/e-calendar-table.c:327 ../mail/message-list.c:1062
 msgid "High"
 msgstr "Alto"
 
@@ -6693,20 +6630,20 @@ msgstr "Alto"
 #: ../calendar/gui/e-cal-model-tasks.c:346
 #: ../calendar/gui/e-cal-model-tasks.c:661
 #: ../calendar/gui/e-cal-model-tasks.c:736
-#: ../calendar/gui/e-calendar-table.c:399 ../calendar/gui/print.c:2413
+#: ../calendar/gui/e-calendar-table.c:401 ../calendar/gui/print.c:2514
 msgid "In Progress"
 msgstr "En progreso"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:327 ../mail/message-list.c:1034
+#: ../calendar/gui/e-calendar-table.c:329 ../mail/message-list.c:1060
 msgid "Low"
 msgstr "Baixo"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:965 ../calendar/gui/e-calendar-table.c:326
-#: ../mail/message-list.c:1035
+#: ../calendar/gui/e-cal-model.c:965 ../calendar/gui/e-calendar-table.c:328
+#: ../mail/message-list.c:1061
 msgid "Normal"
 msgstr "Normal"
 
@@ -6714,7 +6651,7 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-component-preview.c:243
 #: ../calendar/gui/e-cal-model-tasks.c:344
 #: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:398 ../calendar/gui/print.c:2410
+#: ../calendar/gui/e-calendar-table.c:400 ../calendar/gui/print.c:2511
 msgid "Not Started"
 msgstr "Non Iniciada"
 
@@ -6727,7 +6664,7 @@ msgid "Stat_us:"
 msgstr "Esta_do:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:328
+#: ../calendar/gui/e-calendar-table.c:330
 msgid "Undefined"
 msgstr "Indefinida"
 
@@ -6745,7 +6682,7 @@ msgid "_Web Page:"
 msgstr "Páxina _Web:"
 
 #: ../calendar/gui/dialogs/task-editor.c:426
-#: ../calendar/gui/tasks-component.c:1258
+#: ../calendar/gui/tasks-component.c:1322
 msgid "_Task"
 msgstr "_Tarefa"
 
@@ -6753,11 +6690,16 @@ msgstr "_Tarefa"
 msgid "Task Details"
 msgstr "Detalles da tarefa"
 
-#: ../calendar/gui/dialogs/task-page.c:857
+#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Organi_zer:"
+msgstr "Organi_zador:"
+
+#: ../calendar/gui/dialogs/task-page.c:866
 msgid "Due date is wrong"
 msgstr "A data de vencemento é incorrecta"
 
-#: ../calendar/gui/dialogs/task-page.c:1721
+#: ../calendar/gui/dialogs/task-page.c:1885
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Non é posible abrir as tarefas en '%s'."
@@ -6774,10 +6716,6 @@ msgstr "Ca_tegorías..."
 msgid "De_scription:"
 msgstr "De_scrición:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Or_ganiser:"
-msgstr "Or_ganizador:"
-
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "Fuso horario:"
@@ -6863,7 +6801,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de activador descoñecido"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3010
+#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3296
 #, c-format
 msgid "Click to open %s"
 msgstr "Prema para abrir %s"
@@ -6883,7 +6821,7 @@ msgstr "Data de inicio:"
 #: ../calendar/gui/e-cal-component-memo-preview.c:225
 #: ../calendar/gui/e-cal-component-preview.c:274
 #: ../calendar/gui/e-itip-control.c:1201
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:68
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "Descrición:"
@@ -6908,7 +6846,7 @@ msgstr "Data de vencemento:"
 #: ../calendar/gui/e-cal-component-preview.c:229
 #: ../calendar/gui/e-itip-control.c:1169
 #: ../plugins/exchange-operations/exchange-account-setup.c:269
-#: ../plugins/itip-formatter/itip-view.c:1026
+#: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "Estado:"
 
@@ -6917,17 +6855,17 @@ msgid "Priority:"
 msgstr "Prioridade:"
 
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:317
-#: ../calendar/gui/e-cal-model.c:324 ../calendar/gui/e-calendar-table.c:303
+#: ../calendar/gui/e-cal-model.c:324 ../calendar/gui/e-calendar-table.c:305
 msgid "Public"
 msgstr "Público"
 
 #: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:326
-#: ../calendar/gui/e-calendar-table.c:304
+#: ../calendar/gui/e-calendar-table.c:306
 msgid "Private"
 msgstr "Privado"
 
 #: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:328
-#: ../calendar/gui/e-calendar-table.c:305
+#: ../calendar/gui/e-calendar-table.c:307
 msgid "Confidential"
 msgstr "Confidencial"
 
@@ -6948,13 +6886,13 @@ msgid "Summary"
 msgstr "Resumo"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:377
+#: ../calendar/gui/e-calendar-table.c:379
 msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:378
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-calendar-table.c:380
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "Busy"
 msgstr "Ocupado"
 
@@ -6970,15 +6908,15 @@ msgstr ""
 
 #: ../calendar/gui/e-cal-model-tasks.c:1011 ../calendar/gui/e-cal-model.c:971
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/e-meeting-store.c:749
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Si"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1011 ../calendar/gui/e-cal-model.c:971
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:168
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Non"
@@ -6989,12 +6927,13 @@ msgstr "Non"
 #: ../calendar/gui/e-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1210
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/print.c:969
+#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
 #: ../plugins/itip-formatter/itip-formatter.c:395
-#: ../plugins/itip-formatter/itip-formatter.c:2020
-#: ../plugins/plugin-manager/plugin-manager.c:82
-#: ../widgets/misc/e-attachment-bar.c:722
+#: ../plugins/itip-formatter/itip-formatter.c:2021
+#: ../plugins/plugin-manager/plugin-manager.c:84
+#: ../widgets/misc/e-attachment-bar.c:721
 #: ../widgets/misc/e-charset-picker.c:64
 msgid "Unknown"
 msgstr "Descoñecido"
@@ -7007,27 +6946,27 @@ msgstr "Recorrencia"
 msgid "Assigned"
 msgstr "Asignada"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:422
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
 msgid "Save As..."
 msgstr "Gardar como..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2165
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
 msgid "Select folder to save selected attachments..."
 msgstr "Seleccione o cartafol para gardar os anexos seleccionados..."
 
-#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:450
+#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:454
 #, c-format
 msgid "untitled_image.%s"
 msgstr "imaxe_sen título.%s"
 
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1325
-#: ../calendar/gui/e-calendar-view.c:1675 ../calendar/gui/e-memo-table.c:920
-#: ../mail/em-folder-view.c:1229 ../mail/em-popup.c:567 ../mail/em-popup.c:578
+#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1329
+#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:923
+#: ../mail/em-folder-view.c:1341 ../mail/em-popup.c:571 ../mail/em-popup.c:582
 msgid "_Save As..."
 msgstr "_Gardar como..."
 
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:568
-#: ../mail/em-popup.c:579
+#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
+#: ../mail/em-popup.c:583
 msgid "Set as _Background"
 msgstr "Definir como _fondo"
 
@@ -7035,137 +6974,131 @@ msgstr "Definir como _fondo"
 msgid "_Save Selected"
 msgstr "_Gardar os seleccionados"
 
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:787
+#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:791
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: ../calendar/gui/e-calendar-table.c:347
+#: ../calendar/gui/e-calendar-table.c:349
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:348
+#: ../calendar/gui/e-calendar-table.c:350
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:349
+#: ../calendar/gui/e-calendar-table.c:351
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:350
+#: ../calendar/gui/e-calendar-table.c:352
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:351
+#: ../calendar/gui/e-calendar-table.c:353
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:352
+#: ../calendar/gui/e-calendar-table.c:354
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:353
+#: ../calendar/gui/e-calendar-table.c:355
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:354
+#: ../calendar/gui/e-calendar-table.c:356
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:355
+#: ../calendar/gui/e-calendar-table.c:357
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:356
+#: ../calendar/gui/e-calendar-table.c:358
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:357
+#: ../calendar/gui/e-calendar-table.c:359
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:633
-#: ../calendar/gui/e-calendar-view.c:674 ../calendar/gui/e-memo-table.c:437
+#: ../calendar/gui/e-calendar-table.c:635
+#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "Eliminar os obxectos seleccionados"
 
-#: ../calendar/gui/e-calendar-table.c:913
-#: ../calendar/gui/e-calendar-view.c:802 ../calendar/gui/e-memo-table.c:640
+#: ../calendar/gui/e-calendar-table.c:917
+#: ../calendar/gui/e-calendar-view.c:805 ../calendar/gui/e-memo-table.c:643
 msgid "Updating objects"
 msgstr "Actualizando obxectos"
 
-#: ../calendar/gui/e-calendar-table.c:1097
-#: ../calendar/gui/e-calendar-view.c:1224 ../calendar/gui/e-memo-table.c:815
-#: ../composer/e-msg-composer.c:1388
+#: ../calendar/gui/e-calendar-table.c:1101
+#: ../calendar/gui/e-calendar-view.c:1227 ../calendar/gui/e-memo-table.c:818
+#: ../composer/e-msg-composer.c:1472
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: ../calendar/gui/e-calendar-table.c:1320
-#: ../calendar/gui/e-calendar-view.c:1657
+#: ../calendar/gui/e-calendar-table.c:1324
+#: ../calendar/gui/e-calendar-view.c:1660
 msgid "New _Task"
 msgstr "Nova _Tarefa"
 
-#: ../calendar/gui/e-calendar-table.c:1324 ../calendar/gui/e-memo-table.c:919
+#: ../calendar/gui/e-calendar-table.c:1328 ../calendar/gui/e-memo-table.c:922
 msgid "Open _Web Page"
 msgstr "Abrir páxina _web"
 
-#: ../calendar/gui/e-calendar-table.c:1326
-#: ../calendar/gui/e-calendar-view.c:1660
-#: ../calendar/gui/e-calendar-view.c:1676 ../calendar/gui/e-memo-table.c:921
-#: ../mail/em-folder-view.c:1230
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "_Imprimir..."
-
 #: ../calendar/gui/e-calendar-table.c:1330
-#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:925
+#: ../calendar/gui/e-calendar-view.c:1663 ../calendar/gui/e-memo-table.c:924
+msgid "P_rint..."
+msgstr "Imp_rimir..."
+
+#: ../calendar/gui/e-calendar-table.c:1334
+#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:928
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Co_rtar"
 
-#: ../calendar/gui/e-calendar-table.c:1332
-#: ../calendar/gui/e-calendar-view.c:1663
-#: ../calendar/gui/e-calendar-view.c:1682 ../calendar/gui/e-memo-table.c:927
+#: ../calendar/gui/e-calendar-table.c:1336
+#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:930
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: ../calendar/gui/e-calendar-table.c:1336 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1340 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Asignar Tarefa"
 
-#: ../calendar/gui/e-calendar-table.c:1337 ../calendar/gui/e-memo-table.c:931
+#: ../calendar/gui/e-calendar-table.c:1341 ../calendar/gui/e-memo-table.c:934
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Remitir como iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1338
+#: ../calendar/gui/e-calendar-table.c:1342
 msgid "_Mark as Complete"
 msgstr "_Marcar como terminada"
 
-#: ../calendar/gui/e-calendar-table.c:1339
+#: ../calendar/gui/e-calendar-table.c:1343
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar as tarefas seleccionadas como terminadas"
 
-#: ../calendar/gui/e-calendar-table.c:1340
+#: ../calendar/gui/e-calendar-table.c:1344
 msgid "_Mark as Incomplete"
 msgstr "_Marcar como non terminada"
 
-#: ../calendar/gui/e-calendar-table.c:1341
+#: ../calendar/gui/e-calendar-table.c:1345
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "_Marcar as tarefas seleccionadas como non terminadas"
 
-#: ../calendar/gui/e-calendar-table.c:1346
+#: ../calendar/gui/e-calendar-table.c:1350
 msgid "_Delete Selected Tasks"
 msgstr "E_liminar as tarefas seleccionadas"
 
-#: ../calendar/gui/e-calendar-table.c:1580
+#: ../calendar/gui/e-calendar-table.c:1587
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Prema para engadir unha tarefa"
@@ -7197,107 +7130,111 @@ msgid "Start date"
 msgstr "Data de inicio"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:534
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
+#: ../calendar/gui/e-meeting-list-view.c:538
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:69
+#: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Estado"
 
-#: ../calendar/gui/e-calendar-view.c:1343
+#: ../calendar/gui/e-calendar-view.c:1346
 msgid "Moving items"
 msgstr "Movendo elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1345
+#: ../calendar/gui/e-calendar-view.c:1348
 msgid "Copying items"
 msgstr "Copiando elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1654
+#: ../calendar/gui/e-calendar-view.c:1657
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
-#: ../calendar/gui/e-calendar-view.c:1655
+#: ../calendar/gui/e-calendar-view.c:1658
 msgid "New All Day _Event"
 msgstr "Novo _evento de día completo"
 
-#: ../calendar/gui/e-calendar-view.c:1656
+#: ../calendar/gui/e-calendar-view.c:1659
 msgid "New _Meeting"
 msgstr "Nova _reunión"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1667
+#: ../calendar/gui/e-calendar-view.c:1670
 msgid "_Current View"
 msgstr "_Visualización actual"
 
-#: ../calendar/gui/e-calendar-view.c:1669
+#: ../calendar/gui/e-calendar-view.c:1672
 msgid "Select T_oday"
 msgstr "Seleccionar _hoxe"
 
-#: ../calendar/gui/e-calendar-view.c:1670
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "_Select Date..."
 msgstr "_Seleccionar data..."
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1679
+msgid "Pri_nt..."
+msgstr "_Imprimir..."
+
+#: ../calendar/gui/e-calendar-view.c:1689
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar a un calendario..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1690
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver ao calendario..."
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1691
 msgid "_Delegate Meeting..."
 msgstr "_Delegar reunión..."
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1692
 msgid "_Schedule Meeting..."
 msgstr "_Programar reunión..."
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "_Forward as iCalendar..."
 msgstr "_Remitir como iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../calendar/gui/e-calendar-view.c:1692 ../mail/em-folder-view.c:1223
-#: ../mail/em-popup.c:572 ../mail/em-popup.c:583
+#: ../calendar/gui/e-calendar-view.c:1695 ../mail/em-folder-view.c:1335
+#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: ../calendar/gui/e-calendar-view.c:1697
+#: ../calendar/gui/e-calendar-view.c:1700
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta ocorrencia _movible"
 
-#: ../calendar/gui/e-calendar-view.c:1698 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1701 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Eliminar esta _ocorrencia"
 
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1702
 msgid "Delete _All Occurrences"
 msgstr "Eliminar _todas as ocorrencias"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2196
+#: ../calendar/gui/e-calendar-view.c:2202
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizador: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2200
+#: ../calendar/gui/e-calendar-view.c:2206
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2216 ../calendar/gui/print.c:2384
+#: ../calendar/gui/e-calendar-view.c:2222 ../calendar/gui/print.c:2474
 #, c-format
 msgid "Location: %s"
 msgstr "Localización: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2247
+#: ../calendar/gui/e-calendar-view.c:2256
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -7336,22 +7273,22 @@ msgstr "%02i divisións de minuto"
 #. 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:1336
-#: ../calendar/gui/e-day-view.c:2101
+#: ../calendar/gui/e-day-view-top-item.c:1354
+#: ../calendar/gui/e-day-view.c:2141
 #: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1566
+#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:752 ../calendar/gui/e-day-view.c:1098
-#: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:766 ../calendar/gui/e-day-view.c:1119
+#: ../calendar/gui/e-week-view.c:507 ../calendar/gui/print.c:813
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:755 ../calendar/gui/e-day-view.c:1101
-#: ../calendar/gui/e-week-view.c:509 ../calendar/gui/print.c:815
+#: ../calendar/gui/e-day-view.c:769 ../calendar/gui/e-day-view.c:1122
+#: ../calendar/gui/e-week-view.c:510 ../calendar/gui/print.c:815
 msgid "pm"
 msgstr "pm"
 
@@ -7475,12 +7412,12 @@ msgstr "Erro de iCalendar"
 
 #: ../calendar/gui/e-itip-control.c:1075 ../calendar/gui/e-itip-control.c:1091
 #: ../calendar/gui/e-itip-control.c:1102 ../calendar/gui/e-itip-control.c:1119
-#: ../plugins/itip-formatter/itip-view.c:344
-#: ../plugins/itip-formatter/itip-view.c:345
-#: ../plugins/itip-formatter/itip-view.c:432
-#: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:520
-#: ../plugins/itip-formatter/itip-view.c:521
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:436
+#: ../plugins/itip-formatter/itip-view.c:523
+#: ../plugins/itip-formatter/itip-view.c:524
 msgid "An unknown person"
 msgstr "Unha persoa descoñecida"
 
@@ -7489,27 +7426,26 @@ msgstr "Unha persoa descoñecida"
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
-msgstr ""
-"<br> Revise a seguinte información, e escolla unha acción do menú de abaixo."
+msgstr "<br> Revise a seguinte información, e escolla unha acción do menú de abaixo."
 
 #: ../calendar/gui/e-itip-control.c:1174
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/itip-utils.c:730
-#: ../plugins/itip-formatter/itip-formatter.c:2008
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/itip-utils.c:728
+#: ../plugins/itip-formatter/itip-formatter.c:2009
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:733
-#: ../plugins/itip-formatter/itip-formatter.c:2011
+#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
+#: ../plugins/itip-formatter/itip-formatter.c:2012
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
 #: ../calendar/gui/e-itip-control.c:1182
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:736 ../calendar/gui/itip-utils.c:765
-#: ../plugins/itip-formatter/itip-formatter.c:2014
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
+#: ../calendar/gui/itip-utils.c:734 ../calendar/gui/itip-utils.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:2015
 msgid "Declined"
 msgstr "Rexeitado"
 
@@ -7517,14 +7453,11 @@ msgstr "Rexeitado"
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
-msgstr ""
-"A reunión cancelouse, porén non se puido encontrar nos seus calendarios"
+msgstr "A reunión cancelouse, porén non se puido encontrar nos seus calendarios"
 
 #: ../calendar/gui/e-itip-control.c:1268
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
-msgstr ""
-"A tarefa cancelouse, porén non se puido encontrar nas súas listas de tarefas"
+msgid "The task has been canceled, however it could not be found in your task lists"
+msgstr "A tarefa cancelouse, porén non se puido encontrar nas súas listas de tarefas"
 
 #: ../calendar/gui/e-itip-control.c:1346
 #, c-format
@@ -7732,7 +7665,7 @@ msgid "Attendee status updated\n"
 msgstr "Estado do participante actualizado\n"
 
 #: ../calendar/gui/e-itip-control.c:2054
-#: ../plugins/itip-formatter/itip-formatter.c:1230
+#: ../plugins/itip-formatter/itip-formatter.c:1234
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "O estado do participante non se puido actualizar porque xa non existe o "
@@ -7780,7 +7713,7 @@ msgstr "Actualizar o estado do interlocutor"
 msgid "Send Latest Information"
 msgstr "Enviar a última información"
 
-#: ../calendar/gui/e-itip-control.c:2444 ../calendar/gui/itip-utils.c:753
+#: ../calendar/gui/e-itip-control.c:2444 ../calendar/gui/itip-utils.c:751
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
@@ -7830,64 +7763,69 @@ msgid "Attendees"
 msgstr "Participantes"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:965
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Grupo"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
+#: ../calendar/gui/print.c:967
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/print.c:968
 msgid "Room"
 msgstr "Sala"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/print.c:982
 msgid "Chair"
 msgstr "Presidente"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/e-meeting-store.c:746 ../calendar/gui/print.c:983
 msgid "Required Participant"
 msgstr "Participante requirido"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/print.c:984
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/print.c:985
 msgid "Non-Participant"
 msgstr "Non-participante"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:756
 msgid "Needs Action"
 msgstr "Necesita acción"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:410
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Tentative"
 msgstr "Provisional"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/itip-utils.c:739
-#: ../plugins/itip-formatter/itip-formatter.c:2017
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/itip-utils.c:737
+#: ../plugins/itip-formatter/itip-formatter.c:2018
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -7897,19 +7835,19 @@ msgid "Attendee                          "
 msgstr "Participante                          "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:523
+#: ../calendar/gui/e-meeting-list-view.c:526
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
 msgid "In Process"
 msgstr "En progreso"
 
 #. 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:464
-#: ../calendar/gui/e-meeting-time-sel.c:2116
+#: ../calendar/gui/e-meeting-time-sel.c:2137
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
@@ -7918,7 +7856,7 @@ 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.
 #: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2149
+#: ../calendar/gui/e-meeting-time-sel.c:2168
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -7928,67 +7866,67 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "Out of Office"
 msgstr "Fóra da oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "No Information"
 msgstr "Sen información"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:430
 msgid "A_ttendees..."
 msgstr "Par_ticipantes..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:449
+#: ../calendar/gui/e-meeting-time-sel.c:451
 msgid "O_ptions"
 msgstr "O_pcións"
 
-#: ../calendar/gui/e-meeting-time-sel.c:466
+#: ../calendar/gui/e-meeting-time-sel.c:468
 msgid "Show _only working hours"
 msgstr "Mostrar _só as horas de traballo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:476
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "Show _zoomed out"
 msgstr "Mostrar _reducido"
 
-#: ../calendar/gui/e-meeting-time-sel.c:491
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_Update free/busy"
 msgstr "_Actualizar dispoñibilidade"
 
-#: ../calendar/gui/e-meeting-time-sel.c:506
+#: ../calendar/gui/e-meeting-time-sel.c:508
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:524
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid "_Autopick"
 msgstr "Seleccionar _automaticamente"
 
-#: ../calendar/gui/e-meeting-time-sel.c:539
+#: ../calendar/gui/e-meeting-time-sel.c:541
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:556
+#: ../calendar/gui/e-meeting-time-sel.c:558
 msgid "_All people and resources"
 msgstr "_Todas as persoas e recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:565
+#: ../calendar/gui/e-meeting-time-sel.c:567
 msgid "All _people and one resource"
 msgstr "Todas as _persoas e un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:574
+#: ../calendar/gui/e-meeting-time-sel.c:576
 msgid "_Required people"
 msgstr "Persoas _requiridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:583
+#: ../calendar/gui/e-meeting-time-sel.c:585
 msgid "Required people and _one resource"
 msgstr "Persoas requiridas e _un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:619
+#: ../calendar/gui/e-meeting-time-sel.c:621
 msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:646
+#: ../calendar/gui/e-meeting-time-sel.c:648
 msgid "_End time:"
 msgstr "Hora de _finalización:"
 
@@ -8020,16 +7958,16 @@ msgstr "Lingua"
 msgid "Member"
 msgstr "Integrante"
 
-#: ../calendar/gui/e-memo-table.c:936
+#: ../calendar/gui/e-memo-table.c:939
 msgid "_Delete Selected Memos"
 msgstr "E_liminar as notas seleccionadas"
 
-#: ../calendar/gui/e-memo-table.c:1087 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1090 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Prema para engadir unha nota"
 
-#: ../calendar/gui/e-memos.c:732 ../calendar/gui/e-tasks.c:844
-#: ../calendar/gui/gnome-cal.c:2822
+#: ../calendar/gui/e-memos.c:790 ../calendar/gui/e-tasks.c:922
+#: ../calendar/gui/gnome-cal.c:2867
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8038,33 +7976,33 @@ msgstr ""
 "Erro en %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:781
+#: ../calendar/gui/e-memos.c:839
 msgid "Loading memos"
 msgstr "Cargando notas"
 
-#: ../calendar/gui/e-memos.c:862
+#: ../calendar/gui/e-memos.c:920
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Abrindo notas en %s"
 
-#: ../calendar/gui/e-memos.c:1035 ../calendar/gui/e-tasks.c:1249
+#: ../calendar/gui/e-memos.c:1093 ../calendar/gui/e-tasks.c:1327
 msgid "Deleting selected objects..."
 msgstr "Eliminando os obxectos seleccionados..."
 
-#: ../calendar/gui/e-tasks.c:894
+#: ../calendar/gui/e-tasks.c:972
 msgid "Loading tasks"
 msgstr "Cargando tarefas"
 
-#: ../calendar/gui/e-tasks.c:981
+#: ../calendar/gui/e-tasks.c:1059
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo tarefas en %s"
 
-#: ../calendar/gui/e-tasks.c:1226
+#: ../calendar/gui/e-tasks.c:1304
 msgid "Completing tasks..."
 msgstr "Finalizando tarefas..."
 
-#: ../calendar/gui/e-tasks.c:1276
+#: ../calendar/gui/e-tasks.c:1354
 msgid "Expunging"
 msgstr "Expurgando"
 
@@ -8076,47 +8014,47 @@ msgstr "Seleccionar fuso horario"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1547
+#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1637
 msgid "%d %B"
 msgstr "%d de %b"
 
-#: ../calendar/gui/gnome-cal.c:822
+#: ../calendar/gui/gnome-cal.c:828
 msgid "Updating query"
 msgstr "Actualizando consulta"
 
-#: ../calendar/gui/gnome-cal.c:2474
+#: ../calendar/gui/gnome-cal.c:2508
 msgid "_Custom View"
 msgstr "Visualización _personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2475
+#: ../calendar/gui/gnome-cal.c:2509
 msgid "_Save Custom View"
 msgstr "_Gardar visualización personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2480
+#: ../calendar/gui/gnome-cal.c:2514
 msgid "_Define Views..."
 msgstr "_Definir visualizacións..."
 
-#: ../calendar/gui/gnome-cal.c:2646
+#: ../calendar/gui/gnome-cal.c:2691
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Cargando citas de %s"
 
-#: ../calendar/gui/gnome-cal.c:2665
+#: ../calendar/gui/gnome-cal.c:2710
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Cargando tarefas de %s"
 
-#: ../calendar/gui/gnome-cal.c:2674
+#: ../calendar/gui/gnome-cal.c:2719
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Cargando notas en %s"
 
-#: ../calendar/gui/gnome-cal.c:2781
+#: ../calendar/gui/gnome-cal.c:2826
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
 
-#: ../calendar/gui/gnome-cal.c:3738
+#: ../calendar/gui/gnome-cal.c:3783
 msgid "Purging"
 msgstr "Depurando"
 
@@ -8176,58 +8114,58 @@ msgstr "Setembro"
 msgid "_Select Today"
 msgstr "_Seleccionar hoxe"
 
-#: ../calendar/gui/itip-utils.c:451 ../calendar/gui/itip-utils.c:500
-#: ../calendar/gui/itip-utils.c:606
+#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
+#: ../calendar/gui/itip-utils.c:604
 msgid "An organizer must be set."
 msgstr "Débese definir un organizador."
 
-#: ../calendar/gui/itip-utils.c:487
+#: ../calendar/gui/itip-utils.c:485
 msgid "At least one attendee is necessary"
 msgstr "É necesario polo menos un participante"
 
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
 msgid "Event information"
 msgstr "Información do evento"
 
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
 msgid "Task information"
 msgstr "Información da tarefa"
 
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:819
+#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
 #, fuzzy
 msgid "Memo information"
 msgstr "Sen información"
 
-#: ../calendar/gui/itip-utils.c:698 ../calendar/gui/itip-utils.c:837
+#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
 msgid "Free/Busy information"
 msgstr "Información de dispoñibilidade"
 
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:698
 msgid "Calendar information"
 msgstr "Información do calendario"
 
-#: ../calendar/gui/itip-utils.c:749
+#: ../calendar/gui/itip-utils.c:747
 msgid "Updated"
 msgstr "Actualizado"
 
-#: ../calendar/gui/itip-utils.c:757
+#: ../calendar/gui/itip-utils.c:755
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: ../calendar/gui/itip-utils.c:761
+#: ../calendar/gui/itip-utils.c:759
 msgid "Counter-proposal"
 msgstr "Contraproposta"
 
-#: ../calendar/gui/itip-utils.c:833
+#: ../calendar/gui/itip-utils.c:831
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Información de dispoñibilidade (de %s a %s)"
 
-#: ../calendar/gui/itip-utils.c:843
+#: ../calendar/gui/itip-utils.c:841
 msgid "iCalendar information"
 msgstr "Información de iCalendar"
 
-#: ../calendar/gui/itip-utils.c:1010
+#: ../calendar/gui/itip-utils.c:1008
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante no evento."
 
@@ -8235,71 +8173,70 @@ msgstr "Debe ser un participante no evento."
 msgid "_New Memo List"
 msgstr "_Nova lista de notas"
 
-#: ../calendar/gui/memos-component.c:540
+#: ../calendar/gui/memos-component.c:544
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d nota"
 msgstr[1] "%d notas"
 
-#: ../calendar/gui/memos-component.c:542 ../calendar/gui/tasks-component.c:533
+#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d seleccionada"
 msgstr[1] ", %d seleccionada"
 
-#: ../calendar/gui/memos-component.c:589
+#: ../calendar/gui/memos-component.c:593
 msgid "Failed upgrading memos."
 msgstr "Fallou ao actualizar as notas."
 
-#: ../calendar/gui/memos-component.c:897
+#: ../calendar/gui/memos-component.c:953
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr ""
-"Non é posible abrir a lista de notas '%s' para crear eventos e reunións"
+msgstr "Non é posible abrir a lista de notas '%s' para crear eventos e reunións"
 
-#: ../calendar/gui/memos-component.c:910
+#: ../calendar/gui/memos-component.c:966
 msgid "There is no calendar available for creating memos"
 msgstr "Non hai un calendario dispoñible para crear notas"
 
-#: ../calendar/gui/memos-component.c:1006
+#: ../calendar/gui/memos-component.c:1076
 msgid "Memo Source Selector"
 msgstr "Selector de orixe de notas"
 
-#: ../calendar/gui/memos-component.c:1189
+#: ../calendar/gui/memos-component.c:1259
 msgid "New memo"
 msgstr "Nova nota"
 
-#: ../calendar/gui/memos-component.c:1190
+#: ../calendar/gui/memos-component.c:1260
 msgid "Mem_o"
 msgstr "N_ota"
 
-#: ../calendar/gui/memos-component.c:1191
+#: ../calendar/gui/memos-component.c:1261
 msgid "Create a new memo"
 msgstr "Crear unha nova nota"
 
-#: ../calendar/gui/memos-component.c:1197
+#: ../calendar/gui/memos-component.c:1267
 msgid "New shared memo"
 msgstr "Nova nota compartida"
 
-#: ../calendar/gui/memos-component.c:1198
+#: ../calendar/gui/memos-component.c:1268
 msgid "_Shared memo"
 msgstr "Nota _compartida"
 
-#: ../calendar/gui/memos-component.c:1199
+#: ../calendar/gui/memos-component.c:1269
 msgid "Create a shared new memo"
 msgstr "Crear unha nova nota compartida"
 
-#: ../calendar/gui/memos-component.c:1205
+#: ../calendar/gui/memos-component.c:1275
 msgid "New memo list"
 msgstr "Nova lista de notas"
 
-#: ../calendar/gui/memos-component.c:1206
+#: ../calendar/gui/memos-component.c:1276
 msgid "Memo li_st"
 msgstr "Li_sta de notas"
 
-#: ../calendar/gui/memos-component.c:1207
+#: ../calendar/gui/memos-component.c:1277
 msgid "Create a new memo list"
 msgstr "Crear unha lista de notas nova"
 
@@ -8335,8 +8272,7 @@ msgstr ""
 #: ../calendar/gui/migration.c:780 ../calendar/gui/migration.c:948
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
-"Non é posible migrar a configuración antiga desde evolution/config.xmldb"
+msgstr "Non é posible migrar a configuración antiga desde evolution/config.xmldb"
 
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:809
@@ -8510,50 +8446,54 @@ msgstr "Ve"
 msgid "Sa"
 msgstr "Sá"
 
-#: ../calendar/gui/print.c:2351
+#: ../calendar/gui/print.c:2441
 msgid "Appointment"
 msgstr "Cita"
 
-#: ../calendar/gui/print.c:2353
+#: ../calendar/gui/print.c:2443
 msgid "Task"
 msgstr "Tarefa"
 
-#: ../calendar/gui/print.c:2375
+#: ../calendar/gui/print.c:2465
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
 
-#: ../calendar/gui/print.c:2426
+#: ../calendar/gui/print.c:2487
+msgid "Attendees: "
+msgstr "Participantes: "
+
+#: ../calendar/gui/print.c:2527
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2443
+#: ../calendar/gui/print.c:2544
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:2455
+#: ../calendar/gui/print.c:2556
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaxe completada: %i"
 
-#: ../calendar/gui/print.c:2467
+#: ../calendar/gui/print.c:2568
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2480
+#: ../calendar/gui/print.c:2581
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: ../calendar/gui/print.c:2491
+#: ../calendar/gui/print.c:2592
 msgid "Contacts: "
 msgstr "Contactos: "
 
 #. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2592
+#: ../calendar/gui/print.c:2694
 msgid "Upcoming Appointments"
 msgstr "Citas próximas"
 
@@ -8561,64 +8501,63 @@ msgstr "Citas próximas"
 msgid "_New Task List"
 msgstr "_Nova lista de tarefas"
 
-#: ../calendar/gui/tasks-component.c:531
+#: ../calendar/gui/tasks-component.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tarefa"
 msgstr[1] "%d tarefas"
 
-#: ../calendar/gui/tasks-component.c:580
+#: ../calendar/gui/tasks-component.c:584
 msgid "Failed upgrading tasks."
 msgstr "Fallou ao actualizar as tarefas."
 
-#: ../calendar/gui/tasks-component.c:891
+#: ../calendar/gui/tasks-component.c:941
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr ""
-"Non é posible abrir a lista de tarefas '%s' para crear eventos e reunións"
+msgstr "Non é posible abrir a lista de tarefas '%s' para crear eventos e reunións"
 
-#: ../calendar/gui/tasks-component.c:904
+#: ../calendar/gui/tasks-component.c:954
 msgid "There is no calendar available for creating tasks"
 msgstr "Non hai ningún calendario dispoñible para crear tarefas"
 
-#: ../calendar/gui/tasks-component.c:1001
+#: ../calendar/gui/tasks-component.c:1065
 msgid "Task Source Selector"
 msgstr "Selector de orixe de tarefas"
 
-#: ../calendar/gui/tasks-component.c:1257
+#: ../calendar/gui/tasks-component.c:1321
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: ../calendar/gui/tasks-component.c:1259
+#: ../calendar/gui/tasks-component.c:1323
 msgid "Create a new task"
 msgstr "Crear unha tarefa nova"
 
-#: ../calendar/gui/tasks-component.c:1265
+#: ../calendar/gui/tasks-component.c:1329
 msgid "New assigned task"
 msgstr "Nova tarefa asignada"
 
-#: ../calendar/gui/tasks-component.c:1266
+#: ../calendar/gui/tasks-component.c:1330
 msgid "Assigne_d Task"
 msgstr "Tarefa asigna_da"
 
-#: ../calendar/gui/tasks-component.c:1267
+#: ../calendar/gui/tasks-component.c:1331
 msgid "Create a new assigned task"
 msgstr "Crear unha nova tarefa asignada"
 
-#: ../calendar/gui/tasks-component.c:1273
+#: ../calendar/gui/tasks-component.c:1337
 msgid "New task list"
 msgstr "Nova lista de tarefas"
 
-#: ../calendar/gui/tasks-component.c:1274
+#: ../calendar/gui/tasks-component.c:1338
 msgid "Tas_k list"
 msgstr "Lista de tare_fas"
 
-#: ../calendar/gui/tasks-component.c:1275
+#: ../calendar/gui/tasks-component.c:1339
 msgid "Create a new task list"
 msgstr "Crear unha lista de tarefas nova"
 
-#: ../calendar/gui/tasks-control.c:454
+#: ../calendar/gui/tasks-control.c:455
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8630,26 +8569,21 @@ msgstr ""
 "\n"
 "Está seguro de que quere eliminar estas tarefas?"
 
-#: ../calendar/gui/tasks-control.c:457
+#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1131
 msgid "Do not ask me again."
 msgstr "Non preguntar de novo."
 
-#: ../calendar/gui/tasks-control.c:494 ../calendar/gui/tasks-control.c:510
+#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
 msgid "Print Tasks"
 msgstr "Imprimir tarefas"
 
-#. The first letter of each day of the week starting with Sunday
-#: ../calendar/gui/weekday-picker.c:319
-msgid "SMTWTFS"
-msgstr "DLMMXVS"
-
 #: ../calendar/importers/icalendar-importer.c:79
 msgid "Appointments and Meetings"
 msgstr "Citas e reunións"
 
 #: ../calendar/importers/icalendar-importer.c:337
 #: ../calendar/importers/icalendar-importer.c:620
-#: ../plugins/itip-formatter/itip-formatter.c:1558
+#: ../plugins/itip-formatter/itip-formatter.c:1562
 msgid "Opening calendar"
 msgstr "Abrir calendario"
 
@@ -10211,102 +10145,86 @@ msgstr "Pacífico/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacífico/Yap"
 
-#: ../composer/e-msg-composer-hdrs.c:606
+#: ../composer/e-composer-name-header.c:95
+msgid "Click here for the address book"
+msgstr "Prema aquí para ir á axenda de enderezos"
+
+#: ../composer/e-composer-post-header.c:117
 msgid "Posting destination"
 msgstr "Destino onde publicar"
 
-#: ../composer/e-msg-composer-hdrs.c:607
+#: ../composer/e-composer-post-header.c:118
 msgid "Choose folders to post the message to."
 msgstr "Escolla os cartafoles nos que publicar a mensaxe."
 
-#: ../composer/e-msg-composer-hdrs.c:638
-msgid "Click here for the address book"
-msgstr "Prema aquí para ir á axenda de enderezos"
+#: ../composer/e-composer-post-header.c:152
+msgid "Click here to select folders to post to"
+msgstr "Prema aquí para seleccionar os cartafoles nos que publicar"
 
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: ../composer/e-msg-composer-hdrs.c:670
-msgid "_Reply-To:"
-msgstr "_Responder a:"
+#. Now add the signature stuff.
+#: ../composer/e-msg-composer-hdrs.c:221
+msgid "Si_gnature:"
+msgstr "Si_natura:"
 
-#.
-#. * From
-#.
-#: ../composer/e-msg-composer-hdrs.c:677
+#: ../composer/e-msg-composer-hdrs.c:326
 msgid "Fr_om:"
 msgstr "_De:"
 
-#.
-#. * Subject
-#.
-#: ../composer/e-msg-composer-hdrs.c:684
-msgid "S_ubject:"
-msgstr "_Asunto:"
+#: ../composer/e-msg-composer-hdrs.c:332
+msgid "_Reply-To:"
+msgstr "_Responder a:"
 
-#: ../composer/e-msg-composer-hdrs.c:694
+#: ../composer/e-msg-composer-hdrs.c:335
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-msg-composer-hdrs.c:695
+#: ../composer/e-msg-composer-hdrs.c:337
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: ../composer/e-msg-composer-hdrs.c:698
+#: ../composer/e-msg-composer-hdrs.c:340
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:699
+#: ../composer/e-msg-composer-hdrs.c:342
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Introduza os enderezos que recibirán unha copia da mensaxe"
 
-#: ../composer/e-msg-composer-hdrs.c:702
+#: ../composer/e-msg-composer-hdrs.c:346
 msgid "_Bcc:"
 msgstr "_Cco:"
 
-#: ../composer/e-msg-composer-hdrs.c:703
+#: ../composer/e-msg-composer-hdrs.c:348
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
+"appearing in the recipient list of the message"
 msgstr ""
-"Introduza os enderezos que recibirán unha copia da mensaxe sen apareceren na "
+"Introduza os enderezos que recibirán unha copia da mensaxe sen aparecerer na "
 "lista de destinatarios da mensaxe."
 
-#.
-#. * Post-To
-#.
-#: ../composer/e-msg-composer-hdrs.c:710
+#: ../composer/e-msg-composer-hdrs.c:353
 msgid "_Post To:"
 msgstr "_Publicar en:"
 
-#: ../composer/e-msg-composer-hdrs.c:715
-msgid "Click here to select folders to post to"
-msgstr "Prema aquí para seleccionar os cartafoles nos que publicar"
-
-#: ../composer/e-msg-composer-hdrs.c:720
-msgid "Post To:"
-msgstr "Publicar en:"
+#: ../composer/e-msg-composer-hdrs.c:356
+msgid "S_ubject:"
+msgstr "_Asunto:"
 
 #: ../composer/e-msg-composer-select-file.c:77
 msgid "A_ttach"
 msgstr "A_nexar"
 
-#: ../composer/e-msg-composer-select-file.c:196
+#: ../composer/e-msg-composer-select-file.c:198
 msgid "Insert Attachment"
 msgstr "Inserir anexo"
 
-#: ../composer/e-msg-composer.c:818
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+#: ../composer/e-msg-composer.c:819
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Non se pode asinar a mensaxe saínte: non hai un certificado de sinatura "
 "definido para esta conta"
 
-#: ../composer/e-msg-composer.c:825
+#: ../composer/e-msg-composer.c:826
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10314,51 +10232,42 @@ msgstr ""
 "Non se pode cifrar a mensaxe saínte: non hai un certificado de cifrado "
 "definido para esta conta"
 
-#: ../composer/e-msg-composer.c:1334 ../composer/e-msg-composer.c:2602
+#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
 msgid "Hide _Attachment Bar"
 msgstr "Ocultar a _barra de anexos"
 
-#: ../composer/e-msg-composer.c:1337 ../composer/e-msg-composer.c:2605
-#: ../composer/e-msg-composer.c:3985
+#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
+#: ../composer/e-msg-composer.c:3881
 msgid "Show _Attachment Bar"
 msgstr "Mostrar a _barra de anexos"
 
-#: ../composer/e-msg-composer.c:1369 ../composer/e-msg-composer.c:1403
+#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
 msgid "Unknown reason"
 msgstr "Razón descoñecida"
 
-#: ../composer/e-msg-composer.c:1441
+#: ../composer/e-msg-composer.c:1525
 msgid "Could not open file"
 msgstr "Non se puido abrir o ficheiro"
 
-#: ../composer/e-msg-composer.c:1449
+#: ../composer/e-msg-composer.c:1533
 msgid "Unable to retrieve message from editor"
 msgstr "Non é posible obter a mensaxe do editor"
 
-#: ../composer/e-msg-composer.c:1736
+#: ../composer/e-msg-composer.c:1820
 msgid "Untitled Message"
 msgstr "Mensaxe sen título"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1772
+#: ../composer/e-msg-composer.c:1856
 msgid "Open File"
 msgstr "Abrir ficheiro"
 
-#: ../composer/e-msg-composer.c:2237 ../mail/em-account-editor.c:606
-#: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
-msgid "Autogenerated"
-msgstr "Xerado automaticamente"
-
-#: ../composer/e-msg-composer.c:2340
-msgid "Si_gnature:"
-msgstr "Si_natura:"
-
-#: ../composer/e-msg-composer.c:2616 ../composer/e-msg-composer.c:3867
-#: ../composer/e-msg-composer.c:3870
+#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3761
+#: ../composer/e-msg-composer.c:3764
 msgid "Compose Message"
 msgstr "Escribir unha mensaxe"
 
-#: ../composer/e-msg-composer.c:5125
+#: ../composer/e-msg-composer.c:5034
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10465,8 +10374,7 @@ msgstr "As opcións de envío non están dispoñibles."
 
 #: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr ""
-"O ficheiro `{0}' non é un ficheiro normal e non pode enviarse nunha mensaxe."
+msgstr "O ficheiro `{0}' non é un ficheiro normal e non pode enviarse nunha mensaxe."
 
 #: ../composer/mail-composer.error.xml.h:20
 msgid ""
@@ -10511,7 +10419,7 @@ msgstr "Necesita configurar unha conta antes de poder escribir un correo."
 msgid "_Do not Recover"
 msgstr "_Non recuperar"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:310
 msgid "_Recover"
 msgstr "_Recuperar"
 
@@ -10572,10 +10480,8 @@ msgid "The printing system reported the following details about the error:"
 msgstr "O sistema de impresión informou dos seguintes detalles sobre o erro:"
 
 #: ../e-util/e-print.c:151
-msgid ""
-"The printing system did not report any additional details about the error."
-msgstr ""
-"O sistema de impresión non informou de ningún detalle adicional sobre o erro."
+msgid "The printing system did not report any additional details about the error."
+msgstr "O sistema de impresión non informou de ningún detalle adicional sobre o erro."
 
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file &quot;{0}&quot;."
@@ -10597,10 +10503,54 @@ msgstr "O ficheiro existe &quot;{0}&quot;."
 msgid "Overwrite file?"
 msgstr "Sobrescribir o ficheiro?"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:138
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "S_obrescribir"
 
+#: ../e-util/e-util-labels.c:45
+msgid "I_mportant"
+msgstr "I_mportante"
+
+#. red
+#: ../e-util/e-util-labels.c:46
+msgid "_Work"
+msgstr "_Traballo"
+
+#. orange
+#: ../e-util/e-util-labels.c:47
+msgid "_Personal"
+msgstr "_Persoal"
+
+#. green
+#: ../e-util/e-util-labels.c:48
+msgid "_To Do"
+msgstr "_Tarefas pendentes"
+
+#. blue
+#: ../e-util/e-util-labels.c:49
+msgid "_Later"
+msgstr "_Máis tarde"
+
+#: ../e-util/e-util-labels.c:317
+msgid "Label _Name:"
+msgstr "_Nome da etiqueta:"
+
+#: ../e-util/e-util-labels.c:339
+msgid "Edit Label"
+msgstr "Editar etiqueta"
+
+#: ../e-util/e-util-labels.c:339
+msgid "Add Label"
+msgstr "Engadir etiqueta"
+
+#: ../e-util/e-util-labels.c:357
+msgid "Label name cannot be empty."
+msgstr "O nome da etiqueta non pode estar baleiro."
+
+#: ../e-util/e-util-labels.c:362
+msgid "Label with same tag already exists. Rename your label please."
+msgstr "Xa existe unha etiqueta co mesmo nome. Renomee a súa etiqueta."
+
 #: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 second ago"
@@ -10721,40 +10671,22 @@ msgstr "Seleccione unha hora coa que comparar"
 msgid "Choose a file"
 msgstr "Seleccione un ficheiro"
 
-#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
-msgid "Important"
-msgstr "Importante"
-
-#. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:150
-msgid "To Do"
-msgstr "Tarefas pendentes"
-
-#. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:97
-msgid "Later"
-msgstr "Máis tarde"
-
 #: ../filter/filter-part.c:533
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Proba"
 
 #: ../filter/filter-rule.c:800
-msgid "_Search name:"
-msgstr "_Buscar nome:"
+msgid "R_ule name:"
+msgstr "Nome da r_egra"
 
 #: ../filter/filter-rule.c:828
 msgid "Find items that meet the following criteria"
 msgstr "Buscar os elementos que cumpran cos seguintes criterios"
 
 #: ../filter/filter-rule.c:862
-#, fuzzy
 msgid "A_dd Filter Criteria"
-msgstr "Engadir regra de filtraxe"
+msgstr "En_gadir regra de filtraxe"
 
 #: ../filter/filter-rule.c:868
 msgid "If all criteria are met"
@@ -10789,11 +10721,11 @@ msgid "I_nclude threads"
 msgstr "I_ncluír fíos"
 
 #: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:307
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/filter-rule.c:990 ../mail/em-utils.c:308
+#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "Saínte"
 
@@ -10817,7 +10749,7 @@ msgstr "Falta a data."
 msgid "Missing file name."
 msgstr "Falta o nome do ficheiro."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
 msgid "Missing name."
 msgstr "Falta o nome."
 
@@ -10893,7 +10825,7 @@ msgstr "dentro de"
 msgid "months"
 msgstr "meses"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:188
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
 msgid "seconds"
 msgstr "segundos"
 
@@ -10907,7 +10839,7 @@ msgstr "a hora especificada"
 
 #: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
 #: ../plugins/calendar-weather/calendar-weather.c:564
-#: ../plugins/google-account-setup/google-source.c:383
+#: ../plugins/google-account-setup/google-source.c:398
 msgid "weeks"
 msgstr "semanas"
 
@@ -10932,8 +10864,7 @@ msgid "Composer Preferences"
 msgstr "Preferencias do editor"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+msgid "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Configurar aquí as preferencias de correo incluíndo seguranza e "
 "visualización de mensaxes"
@@ -10972,21 +10903,21 @@ msgstr "Control de configuración do editor de correo do Evolution"
 msgid "Evolution Mail preferences control"
 msgstr "Control de preferencias do Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:605
-#: ../mail/importers/elm-importer.c:333 ../mail/importers/pine-importer.c:387
-#: ../mail/mail-component.c:563 ../mail/mail-component.c:564
-#: ../mail/mail-component.c:721
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
+#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
+#: ../mail/mail-component.c:572 ../mail/mail-component.c:573
+#: ../mail/mail-component.c:737
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Correo"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:535
+#: ../mail/em-account-prefs.c:502
 msgid "Mail Accounts"
 msgstr "Contas de correo"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Preferences"
 msgstr "Preferencias de correo"
 
@@ -11017,100 +10948,95 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Seleccionar cartafol"
 
+#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
+#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+msgid "Autogenerated"
+msgstr "Xerado automaticamente"
+
 #: ../mail/em-account-editor.c:778
 msgid "Ask for each message"
 msgstr "Preguntar por cada mensaxe"
 
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
 msgid "Identity"
 msgstr "Identidade"
 
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:119
+#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
 msgid "Receiving Email"
 msgstr "Recibindo correo"
 
-#: ../mail/em-account-editor.c:2056
-#, fuzzy
+#: ../mail/em-account-editor.c:2053
 msgid "Check for _new messages every"
-msgstr "Verificar automaticamente se hai correo _novo cada"
+msgstr "Verificar automaticamente se hai mensaxes _novas cada"
+
+#: ../mail/em-account-editor.c:2061
+msgid "minu_tes"
+msgstr "minu_tos"
 
-#: ../mail/em-account-editor.c:2237 ../mail/mail-config.glade.h:134
+#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: ../mail/em-account-editor.c:2296 ../mail/mail-config.glade.h:66
+#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "Predeterminados"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2362 ../mail/mail-config.glade.h:126
+#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Seguranza"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2399 ../mail/em-account-editor.c:2490
+#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
 msgid "Receiving Options"
 msgstr "Opcións de recepción"
 
-#: ../mail/em-account-editor.c:2400 ../mail/em-account-editor.c:2491
-#, fuzzy
+#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
 msgid "Checking for New Messages"
-msgstr "Comprobando o novo correo"
+msgstr "Comprobando se hai mensaxes novas"
 
-#: ../mail/em-account-editor.c:2842 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
 msgid "Account Editor"
 msgstr "Editor de contas"
 
-#: ../mail/em-account-editor.c:2842 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Asistente de contas do Evolution"
 
-#: ../mail/em-account-prefs.c:334 ../mail/em-account-prefs.c:379
-#: ../mail/em-account-prefs.c:412
-#, fuzzy
-msgid "Di_sable"
-msgstr "Desactivar"
-
-#: ../mail/em-account-prefs.c:334 ../mail/em-account-prefs.c:379
-#: ../mail/em-account-prefs.c:414 ../mail/mail-config.glade.h:74
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "A_ctivar"
-
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:469
+#: ../mail/em-account-prefs.c:436
 msgid "[Default]"
 msgstr "[Predeterminado]"
 
-#: ../mail/em-account-prefs.c:522 ../mail/em-composer-prefs.c:943
-#: ../plugins/plugin-manager/plugin-manager.c:291
+#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
+#: ../plugins/plugin-manager/plugin-manager.c:323
 #: ../plugins/publish-calendar/publish-calendar.c:510
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../mail/em-account-prefs.c:528
+#: ../mail/em-account-prefs.c:495
 msgid "Account name"
 msgstr "Nome da conta"
 
-#: ../mail/em-account-prefs.c:530
+#: ../mail/em-account-prefs.c:497
 msgid "Protocol"
 msgstr "Protocolo"
 
 #: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:181 ../mail/mail-config.c:1036
+#: ../mail/mail-config.c:1062
 msgid "Unnamed"
 msgstr "Sen nome"
 
-#: ../mail/em-composer-prefs.c:949
+#: ../mail/em-composer-prefs.c:953
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
-#: ../mail/em-composer-prefs.c:992
+#: ../mail/em-composer-prefs.c:996
 msgid "Add signature script"
 msgstr "Engadir script de sinatura"
 
-#: ../mail/em-composer-prefs.c:1012
+#: ../mail/em-composer-prefs.c:1016
 msgid "Signature(s)"
 msgstr "Sinatura(s)"
 
@@ -11118,14 +11044,14 @@ msgstr "Sinatura(s)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensaxe reenviada --------"
 
-#: ../mail/em-composer-utils.c:1696
+#: ../mail/em-composer-utils.c:1702
 msgid "an unknown sender"
 msgstr "un remitente descoñecido"
 
 #. 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 em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1743
+#: ../mail/em-composer-utils.c:1749
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11133,7 +11059,7 @@ msgstr ""
 "O ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} ás ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribiu:"
 
-#: ../mail/em-composer-utils.c:1884
+#: ../mail/em-composer-utils.c:1890
 msgid "-----Original Message-----"
 msgstr "-----Mensaxe orixinal-----"
 
@@ -11159,248 +11085,280 @@ msgid "Attachments"
 msgstr "Anexos"
 
 #: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Ton de aviso"
 
-#: ../mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:9
+#, fuzzy
+msgid "Completed On"
+msgstr "Terminada "
+
+#: ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "contén"
 
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copiar ao cartafol"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "Data de recepción"
 
-#: ../mail/em-filter-i18n.h:10
+#: ../mail/em-filter-i18n.h:13
 msgid "Date sent"
 msgstr "Data de envío"
 
-#: ../mail/em-filter-i18n.h:11
-#: ../plugins/groupwise-features/share-folder.c:777
+#: ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:778
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "Eliminada"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "non contén"
 
-#: ../mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "non finaliza en"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:18
 msgid "does not exist"
 msgstr "non existe"
 
-#: ../mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:19
 msgid "does not return"
 msgstr "non retorna"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:20
 msgid "does not sound like"
 msgstr "non soa como"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:21
 msgid "does not start with"
 msgstr "non comeza por"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "Non existe"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "Borrador"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:24
 msgid "ends with"
 msgstr "termina en"
 
-#: ../mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "Existe"
 
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "existe"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:27
 msgid "Expression"
 msgstr "Expresión"
 
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:28
 msgid "Follow Up"
 msgstr "Seguimento"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+msgid "Important"
+msgstr "Importante"
+
+#: ../mail/em-filter-i18n.h:30
 msgid "is"
 msgstr "é"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "é posterior a"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:32
 msgid "is before"
 msgstr "é anterior a"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:33
 msgid "is Flagged"
 msgstr "está marcado"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:34
 msgid "is greater than"
 msgstr "é maior que"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:35
 msgid "is less than"
 msgstr "é menor que"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:36
 msgid "is not"
 msgstr "non é"
 
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "non está marcado"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
+#: ../mail/em-filter-i18n.h:38
+#, fuzzy
+msgid "is not set"
+msgstr "non é"
+
+#: ../mail/em-filter-i18n.h:39
+#, fuzzy
+msgid "is set"
+msgstr "non é"
+
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Correo non desexado"
 
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:41
 msgid "Junk Test"
 msgstr "Proba de correo non desexado"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "Etiqueta"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:43
 msgid "Mailing list"
 msgstr "Lista de correo"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:44
 msgid "Match All"
 msgstr "Coincidir todos"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:45
 msgid "Message Body"
 msgstr "Corpo da mensaxe"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Header"
 msgstr "Cabeceira da mensaxe"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:47
 msgid "Message is Junk"
 msgstr "A mensaxe é un correo non desexado"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is not Junk"
 msgstr "A mensaxe non é un correo non desexado"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:49
 msgid "Move to Folder"
 msgstr "Mover ao cartafol"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:50
 msgid "Pipe to Program"
 msgstr "Canalizar para o programa"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:51
 msgid "Play Sound"
 msgstr "Reproducir son"
 
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
+#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:81
 msgid "Read"
 msgstr "Ler"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:54
 msgid "Regex Match"
 msgstr "Coincidir coa expresión normal"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:55
 msgid "Replied to"
 msgstr "Contestado a"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:56
 msgid "returns"
 msgstr "retorna"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:57
 msgid "returns greater than"
 msgstr "retorna maior que"
 
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:58
 msgid "returns less than"
 msgstr "retorna menor que"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:59
 msgid "Run Program"
 msgstr "Executar o programa"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Puntuación"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Remitente"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:62
+#, fuzzy
+msgid "Set Label"
+msgstr "Etiqueta"
+
+#: ../mail/em-filter-i18n.h:63
 msgid "Set Status"
 msgstr "Definir estado"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:64
 msgid "Size (kB)"
 msgstr "Tamaño (KB)"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:65
 msgid "sounds like"
 msgstr "soa como"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:66
 msgid "Source Account"
 msgstr "Conta orixe"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:67
 msgid "Specific header"
 msgstr "Cabeceira específica"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:68
 msgid "starts with"
 msgstr "comeza por"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:70
 msgid "Stop Processing"
 msgstr "Deter o procesamento"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1683
+#: ../mail/em-filter-i18n.h:71 ../mail/em-format-html.c:1696
 #: ../mail/em-format-quote.c:320 ../mail/em-format.c:891
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:17
+#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
 #: ../mail/message-tag-followup.c:336
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "Asunto"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:72
 msgid "Unset Status"
 msgstr "Desfacer a definición de estado"
 
@@ -11411,55 +11369,54 @@ msgid "Then"
 msgstr "Despois por"
 
 #: ../mail/em-filter-rule.c:517
-#, fuzzy
 msgid "Add Ac_tion"
-msgstr "Engadir excepción"
+msgstr "Engadir a_cción"
 
-#: ../mail/em-folder-browser.c:184
+#: ../mail/em-folder-browser.c:189
 msgid "C_reate Search Folder From Search..."
 msgstr "C_rear un cartafol de busca por busca..."
 
-#: ../mail/em-folder-browser.c:206
+#: ../mail/em-folder-browser.c:214
 msgid "All Messages"
 msgstr "Todas as mensaxes"
 
-#: ../mail/em-folder-browser.c:207
+#: ../mail/em-folder-browser.c:215
 msgid "Unread Messages"
 msgstr "Mensaxes non lidas"
 
-#: ../mail/em-folder-browser.c:209
+#: ../mail/em-folder-browser.c:217
 msgid "No Label"
 msgstr "Sen etiqueta"
 
-#: ../mail/em-folder-browser.c:216
+#: ../mail/em-folder-browser.c:224
 msgid "Read Messages"
 msgstr "Mensaxes lidas"
 
-#: ../mail/em-folder-browser.c:217
+#: ../mail/em-folder-browser.c:225
 msgid "Recent Messages"
 msgstr "Mensaxes recentes"
 
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:226
 msgid "Last 5 Days' Messages"
 msgstr "Mensaxes dos últimos 5 días"
 
-#: ../mail/em-folder-browser.c:219
+#: ../mail/em-folder-browser.c:227
 msgid "Messages with Attachments"
 msgstr "Mensaxes con anexos"
 
-#: ../mail/em-folder-browser.c:220
+#: ../mail/em-folder-browser.c:228
 msgid "Important Messages"
 msgstr "Mensaxes importantes"
 
-#: ../mail/em-folder-browser.c:221
+#: ../mail/em-folder-browser.c:229
 msgid "Messages Not Junk"
 msgstr "Mensaxes que non son correos non desexados"
 
-#: ../mail/em-folder-browser.c:1038
+#: ../mail/em-folder-browser.c:1123
 msgid "Account Search"
 msgstr "Busca na conta"
 
-#: ../mail/em-folder-browser.c:1082
+#: ../mail/em-folder-browser.c:1176
 msgid "All Account Search"
 msgstr "Busca en todas as contas"
 
@@ -11479,53 +11436,53 @@ msgstr[0] "Mensaxes totais:"
 msgstr[1] "Mensaxes totais:"
 
 #: ../mail/em-folder-properties.c:323
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "Propiedades do cartafol"
 
-#: ../mail/em-folder-selection-button.c:123
+#: ../mail/em-folder-selection-button.c:124
 msgid "<click here to select a folder>"
 msgstr "<prema aquí para seleccionar un cartafol>"
 
 #: ../mail/em-folder-selector.c:262
-msgid "Create"
-msgstr "Crear"
+msgid "C_reate"
+msgstr "C_rear"
 
 #: ../mail/em-folder-selector.c:266
 msgid "Folder _name:"
 msgstr "_Nome do cartafol:"
 
-#: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
-#: ../mail/mail-vfolder.c:934 ../mail/mail-vfolder.c:1007
+#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
+#: ../mail/mail-vfolder.c:934 ../mail/mail-vfolder.c:1010
 msgid "Search Folders"
 msgstr "Cartafoles de busca"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:209 ../mail/em-folder-tree-model.c:211
+#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
 msgid "UNMATCHED"
 msgstr "NON EQUIVALENCIA"
 
-#: ../mail/em-folder-tree-model.c:466 ../mail/mail-component.c:154
+#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
 msgid "Drafts"
 msgstr "Borradores"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:469 ../mail/em-folder-tree.c:2556
-#: ../mail/mail-component.c:153
+#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2552
+#: ../mail/mail-component.c:156
 #: ../plugins/exchange-operations/exchange-delegates-user.c:83
 #: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
-#: ../mail/em-folder-tree-model.c:472 ../mail/mail-component.c:155
+#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
 msgid "Outbox"
 msgstr "Caixa de saída"
 
-#: ../mail/em-folder-tree-model.c:474 ../mail/mail-component.c:156
+#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
 msgid "Sent"
 msgstr "Enviado"
 
-#: ../mail/em-folder-tree-model.c:496 ../mail/em-folder-tree-model.c:803
+#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
 msgid "Loading..."
 msgstr "Cargando..."
 
@@ -11544,311 +11501,323 @@ msgstr "Cargando..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:373
+#: ../mail/em-folder-tree.c:372
 #, c-format
 msgid "folder-display|%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:725
+#: ../mail/em-folder-tree.c:732
 msgid "Mail Folder Tree"
 msgstr "Árbore de cartafoles de correo"
 
-#: ../mail/em-folder-tree.c:885
+#: ../mail/em-folder-tree.c:891
 #, c-format
 msgid "Moving folder %s"
 msgstr "Movendo o cartafol %s"
 
-#: ../mail/em-folder-tree.c:887
+#: ../mail/em-folder-tree.c:893
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando cartafol %s"
 
-#: ../mail/em-folder-tree.c:894 ../mail/message-list.c:1874
+#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1965
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:896 ../mail/message-list.c:1876
+#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1967
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:912
+#: ../mail/em-folder-tree.c:917
 msgid "Cannot drop message(s) into toplevel store"
-msgstr ""
-"Non se pode(n) soltar a(s) mensaxe(s) no almacenamento do nivel superior"
+msgstr "Non se pode(n) soltar a(s) mensaxe(s) no almacenamento do nivel superior"
 
-#: ../mail/em-folder-tree.c:990 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1011 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Copiar ao cartafol"
 
-#: ../mail/em-folder-tree.c:991 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1012 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Mover ao cartafol"
 
-#: ../mail/em-folder-tree.c:1701 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1721 ../mail/mail-ops.c:1055
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: ../mail/em-folder-tree.c:2101 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:32
+#: ../mail/em-folder-tree.c:2094 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:54
 msgid "_View"
 msgstr "_Ver"
 
-#: ../mail/em-folder-tree.c:2102
+#: ../mail/em-folder-tree.c:2095
 msgid "Open in _New Window"
 msgstr "Abrir nunha _nova ventá"
 
-#: ../mail/em-folder-tree.c:2107
-msgid "_Move..."
-msgstr "_Mover..."
-
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2111
+#: ../mail/em-folder-tree.c:2100
 msgid "_New Folder..."
 msgstr "_Novo cartafol..."
 
-#: ../mail/em-folder-tree.c:2114 ../ui/evolution-mail-list.xml.h:36
+#: ../mail/em-folder-tree.c:2103
+msgid "_Move..."
+msgstr "_Mover..."
+
+#: ../mail/em-folder-tree.c:2110 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ../mail/em-folder-tree.c:2115
+#: ../mail/em-folder-tree.c:2111
 msgid "Re_fresh"
 msgstr "Ac_tualizar"
 
-#: ../mail/em-folder-tree.c:2116
+#: ../mail/em-folder-tree.c:2112
 msgid "Fl_ush Outbox"
 msgstr "Lim_par a caixa de saída"
 
-#: ../mail/em-folder-tree.c:2122 ../mail/mail.error.xml.h:135
+#: ../mail/em-folder-tree.c:2118 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "_Baleirar o lixo"
 
-#: ../mail/em-folder-utils.c:105
+#: ../mail/em-folder-utils.c:103
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Copiando `%s' a `%s'"
 
-#: ../mail/em-folder-utils.c:369 ../mail/em-folder-view.c:1114
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1191
+#: ../mail/em-folder-view.c:1206
 #: ../mail/importers/evolution-mbox-importer.c:86
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: ../mail/em-folder-utils.c:369 ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1206
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: ../mail/em-folder-utils.c:590
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:587
+#: ../plugins/groupwise-features/share-folder-common.c:143
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creando o cartafol `%s'"
 
-#: ../mail/em-folder-utils.c:750
+#: ../mail/em-folder-utils.c:745
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:388
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "Crear cartafol"
 
-#: ../mail/em-folder-utils.c:750
+#: ../mail/em-folder-utils.c:745
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:388
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "Especifica onde crear o cartafol:"
 
-#: ../mail/em-folder-view.c:1050 ../mail/mail.error.xml.h:68
+#: ../mail/em-folder-view.c:1095 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Fallou a eliminación de correo"
 
-#: ../mail/em-folder-view.c:1051 ../mail/mail.error.xml.h:123
+#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Vostede non ten os permisos suficientes para eliminar este correo."
 
-#: ../mail/em-folder-view.c:1222 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1334 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Responder ao remitente"
 
-#: ../mail/em-folder-view.c:1224 ../mail/em-popup.c:574 ../mail/em-popup.c:585
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:578 ../mail/em-popup.c:589
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Reenviar"
 
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1228 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1340 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Editar como unha mensaxe nova..."
 
-#: ../mail/em-folder-view.c:1234
+#: ../mail/em-folder-view.c:1342
+#: ../plugins/print-message/org-gnome-print-message.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "_Imprimir..."
+
+#: ../mail/em-folder-view.c:1346
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: ../mail/em-folder-view.c:1235
+#: ../mail/em-folder-view.c:1347
 msgid "_Move to Folder..."
 msgstr "_Mover ao cartafol..."
 
-#: ../mail/em-folder-view.c:1236
+#: ../mail/em-folder-view.c:1348
 msgid "_Copy to Folder..."
 msgstr "_Copiar ao cartafol..."
 
-#: ../mail/em-folder-view.c:1239
+#: ../mail/em-folder-view.c:1351
 msgid "Mar_k as Read"
 msgstr "Marcar como _lida"
 
-#: ../mail/em-folder-view.c:1240
+#: ../mail/em-folder-view.c:1352
 msgid "Mark as _Unread"
 msgstr "Marcar como _non lida"
 
-#: ../mail/em-folder-view.c:1241
+#: ../mail/em-folder-view.c:1353
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/em-folder-view.c:1242
+#: ../mail/em-folder-view.c:1354
 msgid "Mark as Un_important"
 msgstr "Marcar como non _importante"
 
-#: ../mail/em-folder-view.c:1243
+#: ../mail/em-folder-view.c:1355
 msgid "Mark as _Junk"
 msgstr "Marcar como _correo non desexado"
 
-#: ../mail/em-folder-view.c:1244
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as _Not Junk"
 msgstr "Desmarcar como _correo non desexado"
 
-#: ../mail/em-folder-view.c:1245
+#: ../mail/em-folder-view.c:1357
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para _seguimento..."
 
-#: ../mail/em-folder-view.c:1247
+#: ../mail/em-folder-view.c:1359
 msgid "_Label"
 msgstr "_Etiqueta"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1248 ../widgets/misc/e-dateedit.c:473
+#: ../mail/em-folder-view.c:1360 ../widgets/misc/e-dateedit.c:498
 msgid "_None"
 msgstr "_Ningún"
 
-#: ../mail/em-folder-view.c:1253
+#: ../mail/em-folder-view.c:1363
+msgid "_New Label"
+msgstr "_Nova etiqueta"
+
+#: ../mail/em-folder-view.c:1367
 msgid "Fla_g Completed"
 msgstr "M_arcar como terminado"
 
-#: ../mail/em-folder-view.c:1254
+#: ../mail/em-folder-view.c:1368
 msgid "Cl_ear Flag"
 msgstr "E_liminar marca"
 
-#: ../mail/em-folder-view.c:1257
+#: ../mail/em-folder-view.c:1371
 msgid "Crea_te Rule From Message"
 msgstr "Crear reg_ra a partir de mensaxe"
 
-#: ../mail/em-folder-view.c:1258
-msgid "Search Folder from _Subject"
+#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
+#: ../mail/em-folder-view.c:1373
+msgid "Search Folder based on _Subject"
 msgstr "Cartafol de busca por a_sunto"
 
-#: ../mail/em-folder-view.c:1259
-msgid "Search Folder from Se_nder"
+#: ../mail/em-folder-view.c:1374
+msgid "Search Folder based on Se_nder"
 msgstr "Cartafol de busca por re_mitente"
 
-#: ../mail/em-folder-view.c:1260
-msgid "Search Folder from _Recipients"
+#: ../mail/em-folder-view.c:1375
+msgid "Search Folder based on _Recipients"
 msgstr "Cartafol de busca por des_tinatarios"
 
-#: ../mail/em-folder-view.c:1261
-msgid "Search Folder from Mailing _List"
+#: ../mail/em-folder-view.c:1376
+msgid "Search Folder based on Mailing _List"
 msgstr "Cartafol de busca por _lista de correo"
 
-#: ../mail/em-folder-view.c:1265
-msgid "Filter on Sub_ject"
+#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
+#: ../mail/em-folder-view.c:1381
+msgid "Filter based on Sub_ject"
 msgstr "Filtrar por as_unto"
 
-#: ../mail/em-folder-view.c:1266
-msgid "Filter on Sen_der"
+#: ../mail/em-folder-view.c:1382
+msgid "Filter based on Sen_der"
 msgstr "Filtrar por re_mitente"
 
-#: ../mail/em-folder-view.c:1267
-msgid "Filter on Re_cipients"
+#: ../mail/em-folder-view.c:1383
+msgid "Filter based on Re_cipients"
 msgstr "Filtrar por d_estinatarios"
 
-#: ../mail/em-folder-view.c:1268
-msgid "Filter on _Mailing List"
+#: ../mail/em-folder-view.c:1384
+msgid "Filter based on _Mailing List"
 msgstr "Filtrar por lista de _correo"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2102 ../mail/em-folder-view.c:2146
+#: ../mail/em-folder-view.c:2266 ../mail/em-folder-view.c:2310
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../mail/em-folder-view.c:2364
+#: ../mail/em-folder-view.c:2528
 msgid "Unable to retrieve message"
 msgstr "Non se puido obter a mensaxe"
 
-#: ../mail/em-folder-view.c:2383
-#, fuzzy
+#: ../mail/em-folder-view.c:2547
 msgid "Retrieving Message..."
-msgstr "<b>Obtendo a mensaxe...</b>"
+msgstr "Obtendo a mensaxe..."
 
-#: ../mail/em-folder-view.c:2611
+#: ../mail/em-folder-view.c:2775
 msgid "C_all To..."
-msgstr ""
+msgstr "Ch_amar a..."
 
-#: ../mail/em-folder-view.c:2614
+#: ../mail/em-folder-view.c:2778
 msgid "Create _Search Folder"
 msgstr "Crear cartafol de _busca"
 
-#: ../mail/em-folder-view.c:2615
+#: ../mail/em-folder-view.c:2779
 msgid "_From this Address"
 msgstr "_Desde este enderezo"
 
-#: ../mail/em-folder-view.c:2616
+#: ../mail/em-folder-view.c:2780
 msgid "_To this Address"
 msgstr "_A este enderezo"
 
-#: ../mail/em-folder-view.c:2991
+#: ../mail/em-folder-view.c:3277
 #, c-format
 msgid "Click to mail %s"
 msgstr "Prema para enviar un correo a %s"
 
-#: ../mail/em-folder-view.c:3003
-#, fuzzy, c-format
+#: ../mail/em-folder-view.c:3289
+#, c-format
 msgid "Click to call %s"
-msgstr "Prema para enviar un correo a %s"
+msgstr "Clic para chamar %s"
 
-#: ../mail/em-folder-view.c:3008
+#: ../mail/em-folder-view.c:3294
 msgid "Click to hide/unhide addresses"
 msgstr "Prema para ocultar ou mostrar os enderezos"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:514
+#: ../mail/em-format-html-display.c:515
 #, c-format
 msgid "Matches: %d"
 msgstr "Equivalencias: %d"
 
-#: ../mail/em-format-html-display.c:657
-msgid "Fi_nd:"
+#: ../mail/em-format-html-display.c:659
+msgid "Fin_d:"
 msgstr "_Buscar:"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:681
+#: ../mail/em-format-html-display.c:683
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../mail/em-format-html-display.c:686
+#: ../mail/em-format-html-display.c:688
 msgid "_Next"
 msgstr "_Seguinte"
 
-#: ../mail/em-format-html-display.c:691
+#: ../mail/em-format-html-display.c:693
 msgid "M_atch case"
 msgstr "_Diferenciar maiúsculas e minúsculas"
 
-#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:635
+#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:635
 msgid "Unsigned"
 msgstr "Non asinado"
 
-#: ../mail/em-format-html-display.c:938
+#: ../mail/em-format-html-display.c:992
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11856,11 +11825,11 @@ msgstr ""
 "Esta mensaxe non está asinada. Non hai garantía de que a mensaxe sexa "
 "auténtica."
 
-#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:636
+#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:636
 msgid "Valid signature"
 msgstr "Sinatura válida"
 
-#: ../mail/em-format-html-display.c:939
+#: ../mail/em-format-html-display.c:993
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11868,11 +11837,11 @@ msgstr ""
 "Esta mensaxe está asinada e é válida, o que significa que é moi probable que "
 "a mensaxe sexa auténtica."
 
-#: ../mail/em-format-html-display.c:940 ../mail/em-format-html.c:637
+#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:637
 msgid "Invalid signature"
 msgstr "Sinatura non válida"
 
-#: ../mail/em-format-html-display.c:940
+#: ../mail/em-format-html-display.c:994
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11880,12 +11849,11 @@ msgstr ""
 "A sinatura desta mensaxe non se pode verificar, puido ser alterada en "
 "tránsito."
 
-#: ../mail/em-format-html-display.c:941 ../mail/em-format-html.c:638
-#, fuzzy
+#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:638
 msgid "Valid signature, but cannot verify sender"
 msgstr "Sinatura válida, mais non se pode verificar o remitente"
 
-#: ../mail/em-format-html-display.c:941
+#: ../mail/em-format-html-display.c:995
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11893,11 +11861,11 @@ msgstr ""
 "Esta mensaxe está asinada cunha sinatura válida, mais non se puido verificar "
 "o remitente da mensaxe."
 
-#: ../mail/em-format-html-display.c:942 ../mail/em-format-html.c:639
+#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:639
 msgid "Signature exists, but need public key"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:942
+#: ../mail/em-format-html-display.c:996
 #, fuzzy
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
@@ -11906,11 +11874,11 @@ msgstr ""
 "Esta mensaxe está asinada cunha sinatura válida, mais non se puido verificar "
 "o remitente da mensaxe."
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:645
 msgid "Unencrypted"
 msgstr "Non cifrado"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:1003
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11918,11 +11886,11 @@ msgstr ""
 "Esta mensaxe non está cifrada. O seu contido pode verse en tránsito a través "
 "de Internet."
 
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:646
+#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:646
 msgid "Encrypted, weak"
 msgstr "Cifrado, débil"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:1004
 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 "
@@ -11932,11 +11900,11 @@ msgstr ""
 "difícil, mais non imposible para un intruso ver o contido desta mensaxe "
 "dentro dun período de tempo útil."
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:647
+#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:647
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:1005
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11944,11 +11912,11 @@ msgstr ""
 "Esta mensaxe está cifrada. Sería difícil para un intruso ver o contido desta "
 "mensaxe."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:648
 msgid "Encrypted, strong"
 msgstr "Cifrado, forte"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:1006
 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 "
@@ -11957,92 +11925,92 @@ msgstr ""
 "Esta mensaxe está cifrada cun algoritmo de cifrado forte. Sería moi difícil "
 "para un intruso ver o contido desta mensaxe dentro dun período de tempo útil."
 
-#: ../mail/em-format-html-display.c:1053 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Ver o certificado"
 
-#: ../mail/em-format-html-display.c:1068
+#: ../mail/em-format-html-display.c:1122
 msgid "This certificate is not viewable"
 msgstr "Este certificado non é visible"
 
-#: ../mail/em-format-html-display.c:1387
+#: ../mail/em-format-html-display.c:1441
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Terminado o %d de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1395
+#: ../mail/em-format-html-display.c:1449
 msgid "Overdue:"
 msgstr "Atrasada:"
 
-#: ../mail/em-format-html-display.c:1398
+#: ../mail/em-format-html-display.c:1452
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "antes do %d de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1458
+#: ../mail/em-format-html-display.c:1512
 msgid "_View Inline"
 msgstr "_Ver en liña"
 
-#: ../mail/em-format-html-display.c:1459
+#: ../mail/em-format-html-display.c:1513
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1514
 msgid "_Fit to Width"
 msgstr "_Axustar á largura"
 
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1515
 msgid "Show _Original Size"
 msgstr "Mostrar tamaño _orixinal"
 
-#: ../mail/em-format-html-display.c:1905 ../mail/em-format-html-display.c:2518
-#: ../mail/mail-config.glade.h:44 ../mail/message-list.etspec.h:1
+#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
+#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: ../mail/em-format-html-display.c:2119
+#: ../mail/em-format-html-display.c:2173
 msgid "Save attachment as"
 msgstr "Gardar anexo como"
 
-#: ../mail/em-format-html-display.c:2123
+#: ../mail/em-format-html-display.c:2177
 msgid "Select folder to save all attachments"
 msgstr "Seleccione o cartafol onde gardar todos os anexos"
 
-#: ../mail/em-format-html-display.c:2174
+#: ../mail/em-format-html-display.c:2228
 msgid "_Save Selected..."
 msgstr "_Gardar os seleccionados..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2241
+#: ../mail/em-format-html-display.c:2295
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d an_exo"
 msgstr[1] "%d an_exos"
 
-#: ../mail/em-format-html-display.c:2248 ../mail/em-format-html-display.c:2326
+#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
 msgid "S_ave"
 msgstr "G_ardar"
 
-#: ../mail/em-format-html-display.c:2259
+#: ../mail/em-format-html-display.c:2313
 msgid "S_ave All"
 msgstr "G_ardar todo"
 
-#: ../mail/em-format-html-display.c:2322
+#: ../mail/em-format-html-display.c:2376
 msgid "No Attachment"
 msgstr "Sen anexo"
 
-#: ../mail/em-format-html-display.c:2453 ../mail/em-format-html-display.c:2491
+#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
 msgid "View _Unformatted"
 msgstr "Ver sen _formato"
 
-#: ../mail/em-format-html-display.c:2455
+#: ../mail/em-format-html-display.c:2509
 msgid "Hide _Unformatted"
 msgstr "Ocultar sen _formato"
 
-#: ../mail/em-format-html-display.c:2510
+#: ../mail/em-format-html-display.c:2564
 msgid "O_pen With"
 msgstr "A_brir con"
 
-#: ../mail/em-format-html-display.c:2581
+#: ../mail/em-format-html-display.c:2635
 msgid ""
 "Evolution cannot render this email as it is too large to handle. You can "
 "view it unformatted or with an external text editor."
@@ -12094,7 +12062,7 @@ msgstr "Punteiro aos datos remotos (%s)"
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro aos datos externos descoñecidos (tipo \"%s\")"
 
-#: ../mail/em-format-html.c:1220
+#: ../mail/em-format-html.c:1221
 msgid "Formatting message"
 msgstr "Formatando a mensaxe"
 
@@ -12103,64 +12071,64 @@ msgstr "Formatando a mensaxe"
 msgid "Formatting Message..."
 msgstr "Formatando a mensaxe"
 
-#: ../mail/em-format-html.c:1527 ../mail/em-format-html.c:1591
-#: ../mail/em-format-html.c:1613 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:90
+#: ../mail/em-format-html.c:1540 ../mail/em-format-html.c:1604
+#: ../mail/em-format-html.c:1626 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1528 ../mail/em-format-html.c:1597
-#: ../mail/em-format-html.c:1616 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-html.c:1541 ../mail/em-format-html.c:1610
+#: ../mail/em-format-html.c:1629 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
 msgid "Bcc"
 msgstr "Cco"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1687 ../mail/em-format-quote.c:329
-#: ../mail/em-mailer-prefs.c:1198
+#: ../mail/em-format-html.c:1700 ../mail/em-format-quote.c:329
+#: ../mail/em-mailer-prefs.c:1458
 msgid "Mailer"
 msgstr "Aplicación de correo"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1714
+#: ../mail/em-format-html.c:1727
 #, fuzzy
 msgid " (%a, %R %Z)"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1719
+#: ../mail/em-format-html.c:1732
 #, fuzzy
 msgid " (%R %Z)"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1731 ../mail/em-format-quote.c:336
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:93
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
-#: ../widgets/misc/e-dateedit.c:363
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:336
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:368
 msgid "Date"
 msgstr "Data"
 
-#: ../mail/em-format-html.c:1754 ../mail/em-format.c:893
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-format-html.c:1767 ../mail/em-format.c:893
+#: ../mail/em-mailer-prefs.c:97
 msgid "Newsgroups"
 msgstr "Grupos de noticias"
 
 #. 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:1844
+#: ../mail/em-format-html.c:1860
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr ""
 
 #: ../mail/em-format-quote.c:207 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:7
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
 #: ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "De"
 
 #: ../mail/em-format-quote.c:207 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:88
+#: ../mail/em-mailer-prefs.c:91
 msgid "Reply-To"
 msgstr "Responder a"
 
@@ -12203,51 +12171,89 @@ msgstr "Erro ao verificar a sinatura"
 msgid "Unknown error verifying signature"
 msgstr "Erro descoñecido ao verificar a sinatura"
 
-#: ../mail/em-format.c:1658
+#: ../mail/em-format.c:1659
 #, fuzzy
 msgid "Could not parse PGP message"
 msgstr "Non se puido crear a mensaxe."
 
-#: ../mail/em-format.c:1658
+#: ../mail/em-format.c:1659
 #, fuzzy
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Non se puido analizar a mensaxe S/MIME: erro descoñecido"
 
-#: ../mail/em-mailer-prefs.c:105
+#: ../mail/em-mailer-prefs.c:108
 msgid "Every time"
 msgstr "Cada vez"
 
-#: ../mail/em-mailer-prefs.c:106
+#: ../mail/em-mailer-prefs.c:109
 msgid "Once per day"
 msgstr "Unha vez ao día"
 
-#: ../mail/em-mailer-prefs.c:107
+#: ../mail/em-mailer-prefs.c:110
 msgid "Once per week"
 msgstr "Unha vez á semana"
 
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:111
 msgid "Once per month"
 msgstr "Unha vez ao mes"
 
+#: ../mail/em-mailer-prefs.c:341
+#, fuzzy
+msgid "Add Custom Junk Header"
+msgstr "Cabeceira personalizada"
+
+#: ../mail/em-mailer-prefs.c:345
+#, fuzzy
+msgid "Header Name:"
+msgstr "Nome do _cartafol:"
+
+#: ../mail/em-mailer-prefs.c:346
+#, fuzzy
+msgid "Header Value Contains:"
+msgstr "O remitente contén"
+
+#: ../mail/em-mailer-prefs.c:451
+#, fuzzy
+msgid "Contains Value"
+msgstr "Continuar"
+
+#: ../mail/em-mailer-prefs.c:473
+#, fuzzy
+msgid "Color"
+msgstr "Cores"
+
+#: ../mail/em-mailer-prefs.c:476
+#, fuzzy
+msgid "Tag"
+msgstr "hai"
+
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:789 ../mail/em-mailer-prefs.c:843
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "O plugin %s está dispoñible e o binario está instalado."
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:797 ../mail/em-mailer-prefs.c:852
+#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
 #, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
-msgstr ""
-"O plugin %s non está dispoñible. Verifique se o paquete está instalado."
+msgid "%s plugin is not available. Please check whether the package is installed."
+msgstr "O plugin %s non está dispoñible. Verifique se o paquete está instalado."
 
-#: ../mail/em-mailer-prefs.c:818
+#: ../mail/em-mailer-prefs.c:1115
 msgid "No Junk plugin available"
 msgstr "Non hai dispoñible un plugin de correo non desexado"
 
-#: ../mail/em-migrate.c:1210
+#. green
+#: ../mail/em-migrate.c:1057
+msgid "To Do"
+msgstr "Tarefas pendentes"
+
+#. blue
+#: ../mail/em-migrate.c:1058
+msgid "Later"
+msgstr "Máis tarde"
+
+#: ../mail/em-migrate.c:1211
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12259,47 +12265,47 @@ msgstr ""
 "\n"
 "Agarde mentres o Evolution migra os seus cartafoles..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1650
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Non é posible crear un cartafol novo: `%s': %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1676
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Non é posible copiar o cartafol `%s' en `%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1861
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Non é posible examinar as caixas de correo existentes en `%s': %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2065
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Non foi posible abrir os datos antigos POP keep-on-server `%s': %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2079
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Non é posible crear o directorio de datos POP3 keep-on-server `%s': %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2108
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Non é posible copiar os datos POP3 keep-on-server `%s': %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Fallo ao crear o almacenamento de correo local `%s': %s"
 
-#: ../mail/em-migrate.c:2742
+#: ../mail/em-migrate.c:2827
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Non é posible crear os cartafoles de correo local en `%s': %s"
 
-#: ../mail/em-migrate.c:2761
+#: ../mail/em-migrate.c:2846
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12307,62 +12313,63 @@ msgstr ""
 "Non é posible ler a configuración da instalación anterior do Evolution, "
 "`evolution/config.xmldb' non existe ou está danado."
 
-#: ../mail/em-popup.c:570 ../mail/em-popup.c:581
+#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
 msgid "_Reply to sender"
 msgstr "_Responder ao remitente"
 
-#: ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Responder á _lista"
 
-#: ../mail/em-popup.c:635
+#: ../mail/em-popup.c:639
 msgid "_Add to Address Book"
 msgstr "_Engadir á axenda de enderezos"
 
-#: ../mail/em-subscribe-editor.c:601
+#: ../mail/em-subscribe-editor.c:595
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Este almacenamento non soporta subscricións ou non están activadas."
 
-#: ../mail/em-subscribe-editor.c:634
+#: ../mail/em-subscribe-editor.c:628
 msgid "Subscribed"
 msgstr "Subscrito"
 
-#: ../mail/em-subscribe-editor.c:638
+#: ../mail/em-subscribe-editor.c:632
 msgid "Folder"
 msgstr "Cartafol"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:840
+#: ../mail/em-subscribe-editor.c:834
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: ../mail/em-subscribe-editor.c:861
+#: ../mail/em-subscribe-editor.c:855
 msgid "No server has been selected"
 msgstr "Non se seleccionou ningún servidor"
 
-#: ../mail/em-utils.c:120
-msgid "Do not show this message again."
+#: ../mail/em-utils.c:121
+#, fuzzy
+msgid "_Do not show this message again."
 msgstr "Non mostrar esta mensaxe outra vez."
 
-#: ../mail/em-utils.c:315
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "Filtros de mensaxe"
 
-#: ../mail/em-utils.c:368
+#: ../mail/em-utils.c:370
 msgid "message"
 msgstr "mensaxe"
 
-#: ../mail/em-utils.c:563
+#: ../mail/em-utils.c:645
 msgid "Save Message..."
 msgstr "Gardar mensaxe..."
 
-#: ../mail/em-utils.c:612
+#: ../mail/em-utils.c:694
 msgid "Add address"
 msgstr "Engadir enderezo"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1096
+#: ../mail/em-utils.c:1178
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensaxes de %s"
@@ -12381,38 +12388,51 @@ msgstr "Permite que o Evolution mostre parte do texto de tamaño limitado"
 
 #: ../mail/evolution-mail.schemas.in.h:2
 #, fuzzy
+msgid "Always request read receipt"
+msgstr "_Requirir confirmación de lectura"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "Amount of time in seconds the error should be showed on the status bar."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:4
+#, fuzzy
 msgid "Automatic emoticon recognition"
 msgstr "Recoñecemento automático da ligazón"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Automatic link recognition"
 msgstr "Recoñecemento automático da ligazón"
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Check incoming mail being junk"
 msgstr "Verificar se o correo entrante é correo non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Citation highlight color"
 msgstr "Cor de realce de citas"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Citation highlight color."
 msgstr "Cor de realce de citas."
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Composer Window default height"
 msgstr "Altura predeterminada da ventá do editor"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Composer Window default width"
 msgstr "Largura predeterminada da ventá do editor"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:11
+msgid "Composer load/attach directory"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Comprimir a visualización de enderezos en A/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -12420,94 +12440,142 @@ msgstr ""
 "Comprime a visualización de enderezos en A/CC/CCO ao número especificado en "
 "address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Default charset in which to compose messages"
 msgstr "Conxunto de caracteres predeterminado para escribir mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Default charset in which to compose messages."
 msgstr "Conxunto de caracteres predeterminado para escribir mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Default charset in which to display messages"
 msgstr "Conxunto de caracteres predeterminado para mostrar mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Default charset in which to display messages."
 msgstr "Conxunto de caracteres predeterminado para mostrar mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Default forward style"
 msgstr "Estilo de reenvío predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.h:16
-msgid "Default height of the Composer Window"
+#: ../mail/evolution-mail.schemas.in.h:19
+#, fuzzy
+msgid "Default height of the Composer Window."
 msgstr "Altura predeterminada da ventá do editor"
 
-#: ../mail/evolution-mail.schemas.in.h:17
-msgid "Default height of the Message Window"
+#: ../mail/evolution-mail.schemas.in.h:20
+#, fuzzy
+msgid "Default height of the message window."
 msgstr "Altura predeterminada da ventá da mensaxe"
 
-#: ../mail/evolution-mail.schemas.in.h:18
-msgid "Default height of the Subscribe dialog"
+#: ../mail/evolution-mail.schemas.in.h:21
+#, fuzzy
+msgid "Default height of the subscribe dialog."
 msgstr "Altura predeterminada do diálogo de subscrición"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default reply style"
 msgstr "Estilo de resposta predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Default value for thread expand state"
 msgstr "Valor predeterminado para o estado expandido do fío"
 
-#: ../mail/evolution-mail.schemas.in.h:21
-msgid "Default width of the Composer Window"
+#: ../mail/evolution-mail.schemas.in.h:24
+#, fuzzy
+msgid "Default width of the Composer Window."
 msgstr "Largura predeterminada da ventá do editor"
 
-#: ../mail/evolution-mail.schemas.in.h:22
-msgid "Default width of the Message Window"
+#: ../mail/evolution-mail.schemas.in.h:25
+#, fuzzy
+msgid "Default width of the message window."
 msgstr "Largura predeterminada da ventá da mensaxe"
 
-#: ../mail/evolution-mail.schemas.in.h:23
-msgid "Default width of the Subscribe dialog"
+#: ../mail/evolution-mail.schemas.in.h:26
+#, fuzzy
+msgid "Default width of the subscribe dialog."
 msgstr "Largura predeterminada do diálogo de subscrición"
 
-#: ../mail/evolution-mail.schemas.in.h:24
-msgid "Directory for saving mail component files"
+#: ../mail/evolution-mail.schemas.in.h:27
+msgid "Determines whether to lookup in addressbook for sender email"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:28
+msgid ""
+"Determines whether to loopup the sender email in addressbook. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote addressbooks (like ldap) are marked for "
+"autocompletion."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:29
+msgid "Determines whether to use custom headers to check for junk"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:30
+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 "
+"checking speed."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:31
+#, fuzzy
+msgid "Directory for loading/attaching files to composer."
 msgstr "Directorio onde gardar os ficheiros enviados por correo"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:32
+#, fuzzy
+msgid "Directory for saving mail component files."
+msgstr "Directorio onde gardar os ficheiros enviados por correo"
+
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 "Debuxar os indicadores de erros de ortografía nas palabras mentres se "
 "escribe."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Empty Junk folders on exit"
 msgstr "Baleirar os cartafoles do correo non desexado ao saír"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Empty Trash folders on exit"
 msgstr "Baleirar os cartafoles do lixo ao saír"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Empty all Junk folders when exiting Evolution."
-msgstr ""
-"Baleirar todos os cartafoles de correo non desexado ao saír do Evolution."
+msgstr "Baleirar todos os cartafoles de correo non desexado ao saír do Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Baleirar todos os cartafoles do lixo ao saír do Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Activar modo cursor, para que poida ver un cursor cando lea un correo."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:39
+#, fuzzy
+msgid "Enable or disable magic space bar"
+msgstr "Activar ou desactivar a característica de busca ao teclear"
+
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Enable or disable type ahead search feature"
 msgstr "Activar ou desactivar a característica de busca ao teclear"
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:41
+#, fuzzy
+msgid "Enable search folders"
+msgstr "Cartafoles de busca"
+
+#: ../mail/evolution-mail.schemas.in.h:42
+msgid "Enable search folders on startup."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12519,28 +12587,33 @@ msgstr ""
 "facilmente un cartafol nesa barra lateral tan só tecleando o nome do "
 "cartafol e a selección salta automaticamente a ese cartafol."
 
-#: ../mail/evolution-mail.schemas.in.h:33
-msgid "Enable to render message text part of limited size."
+#: ../mail/evolution-mail.schemas.in.h:44
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
 msgstr ""
-"Activar para renderizar a parte da mensaxe de texto de tamaño limitado."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid "Enable to render message text part of limited size."
+msgstr "Activar para renderizar a parte da mensaxe de texto de tamaño limitado."
+
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar o modo cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Height of the message-list pane"
 msgstr "Altura do panel da lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Height of the message-list pane."
 msgstr "Altura do panel da lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Hides the per-folder preview and removes the selection"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12548,7 +12621,7 @@ msgstr ""
 "Se o usuario tenta abrir 10 ou máis mensaxes ao mesmo tempo, preguntar ao "
 "usuario se está seguro de que quere facelo."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -12556,7 +12629,7 @@ msgstr ""
 "Se o panel de \"Previsualización\" está activado, móstrao de lado a lado en "
 "vez de verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:52
 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 "
@@ -12567,39 +12640,51 @@ msgstr ""
 "visualizador de compoñentes Bonobo na base de datos do Gnome pode empregarse "
 "para mostrar o contido."
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:53
+msgid "It disables/enables the prompt while marking multiple messages."
+msgstr "Desactiva ou activa a pregunta cando se marcan varias mensaxes."
+
+#: ../mail/evolution-mail.schemas.in.h:54
+#, fuzzy
 msgid ""
-"It disables the feature where repeated prompts to ask if offline sync is "
-"required."
+"It disables/enables the repeated prompts to ask if offline sync is required "
+"before going into offline mode."
 msgstr ""
 "Desactiva a funcionalidade onde se repite a pregunta de se se require a "
 "sincronización sen conexión."
 
-#: ../mail/evolution-mail.schemas.in.h:42
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "Desactiva ou activa a pregunta cando se marcan varias mensaxes."
+#: ../mail/evolution-mail.schemas.in.h:55
+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 "
+"the search results."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Last time empty junk was run"
 msgstr "Última vez que se baleirou o correo non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Last time empty trash was run"
 msgstr "Última vez que se baleirou o lixo"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:58
+msgid "Level beyond which the message should be logged."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas e as súas cores asociadas"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "List of accepted licenses"
 msgstr "Lista de licenzas aceptadas"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "List of accounts"
 msgstr "Lista de contas"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12608,11 +12693,11 @@ msgstr ""
 "contén cadeas que nomean subdirectorios relativos a /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeceiras personalizadas e se están activadas."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:64
 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."
@@ -12621,138 +12706,129 @@ msgstr ""
 "lista contén cadeas que conteñen o nome: cor onde cor usa a codificación "
 "hexadecimal HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "List of mime types to check for bonobo component viewers"
-msgstr ""
-"Lista de tipos mime de verificación de visualizadores de compoñentes Bonobo"
+msgstr "Lista de tipos mime de verificación de visualizadores de compoñentes Bonobo"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista de nomes de protocolos coa se aceptou a licenza."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Load images for HTML messages over http"
 msgstr "Cargar imaxes para mensaxes HTML sobre http"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:68
 #, fuzzy
 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 contacts 2 - Always "
-"load images off the net"
+"load images off the net. 1 - Load images in messages from contacts. 2 - "
+"Always load images off the net."
 msgstr ""
 "Cargar imaxes de mensaxes HTML sobre http(s). Os valores posibles son: 0 - "
 "nunca cargar as imaxes desde a rede, 1 - cargar as imaxes se o remitente "
 "está na axenda de enderezos, 2 - cargar sempre as imaxes desde a rede"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Log filter actions"
 msgstr "Rexistrar accións de filtraxe"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Log filter actions to the specified log file."
 msgstr "Rexistrar accións de filtraxe no ficheiro de rexistro especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Logfile to log filter actions"
 msgstr "Ficheiro de rexistro para rexistrar as accións de filtraxe"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Logfile to log filter actions."
 msgstr "Ficheiro de rexistro para rexistrar as accións de filtraxe."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como visto despois do tempo de espera especificado"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como visto despois do tempo de espera especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar as citas textuais na \"Previsualización\" da mensaxe"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar as citas textuais na \"Previsualización\" da mensaxe."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Message Window default height"
 msgstr "Altura predeterminada da ventá de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Message Window default width"
 msgstr "Largura predeterminada da ventá de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Estilo de visualización de mensaxe (\"normal\", \"cabeceiras completas\", "
 "\"orixe\")"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Minimum days between emptying the junk on exit"
-msgstr ""
-"Número mínimo de días antes do baleirado do correo non desexado ao saír"
+msgstr "Número mínimo de días antes do baleirado do correo non desexado ao saír"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Número mínimo de días antes do baleirado do lixo ao saír"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "Minimum time between emptying the junk on exit, in days."
-msgstr ""
-"Tempo mínimo antes do baleirado do correo non desexado ao saír, en días."
+msgstr "Tempo mínimo antes do baleirado do correo non desexado ao saír, en días."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tempo mínimo antes do baleirado do lixo ao saír, en días."
 
-#: ../mail/evolution-mail.schemas.in.h:70
-msgid "New Mail Notify sound file"
-msgstr "Novo ficheiro de son para notificar correo"
-
-#: ../mail/evolution-mail.schemas.in.h:71
-msgid "New Mail Notify type"
-msgstr "Novo tipo de notificación de correo"
-
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Número de enderezos para mostrar en A/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Prompt on empty subject"
 msgstr "Preguntar cando o asunto está baleiro"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Preguntar ao usuario cando tente expurgar un cartafol."
 
-#: ../mail/evolution-mail.schemas.in.h:75
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar ao usuario cando tente enviar unha mensaxe sen un asunto."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Prompt to check if the user wants to go offline immediately"
-msgstr ""
-"Preguntar para verificar se o usuario quere desconectarse inmediatamente"
+msgstr "Preguntar para verificar se o usuario quere desconectarse inmediatamente"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:89
+#, fuzzy
+msgid "Prompt when deleting messages in search folder"
+msgstr "_Preguntar cando se envíen mensaxes cun asunto baleiro"
+
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Prompt when user expunges"
 msgstr "Preguntar cando o usuario expurga"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Prompt when user only fills Bcc"
 msgstr "Preguntar cando o usuario só encha o campo Cco"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr ""
-"Preguntar cando o usuario tente abrir dez ou máis mensaxes ao mesmo tempo"
+msgstr "Preguntar cando o usuario tente abrir dez ou máis mensaxes ao mesmo tempo"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12760,137 +12836,146 @@ msgstr ""
 "Preguntar ao enviar mensaxes en HTML aos destinatarios que non desexen "
 "recibilas."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Preguntar cando o usuario tente enviar unha mensaxe sen destinatarios Para "
 "ou CC."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Preguntar cando o usuario tente enviar un HTML non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Prompt while marking multiple messages"
 msgstr "Preguntar cando se marcan varias mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:97
 #, fuzzy
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Recoñecer emoticonas no texto e substituílas con imaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Recognize links in text and replace them."
 msgstr "Recoñecer ligazóns no texto e substituílas."
 
-#: ../mail/evolution-mail.schemas.in.h:86
-msgid "Run junk test on incoming mail"
+#: ../mail/evolution-mail.schemas.in.h:99
+#, fuzzy
+msgid "Run junk test on incoming mail."
 msgstr "Executar a proba de correo non desexado no correo entrante"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Save directory"
 msgstr "Directorio onde gardar"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Search for the sender photo in local addressbooks"
 msgstr "Buscar a foto do remitente nas axendas locais de enderezos"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Send HTML mail by default"
 msgstr "Enviar correo en HTML por defecto"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Send HTML mail by default."
 msgstr "Enviar correo en HTML por defecto."
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Show Animations"
 msgstr "Mostrar animacións"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Show animated images as animations."
 msgstr "Mostrar as imaxes animadas como animacións."
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Mostrar as mensaxes eliminadas (riscadas) na lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar as mensaxes eliminadas na lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Show photo of the sender"
 msgstr "Mostrar a foto do remitente"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:111
+#, fuzzy
 msgid ""
 "Show the email of the sender in the messages composite column in the message "
-"list"
+"list."
 msgstr ""
 "Mostrar o correo do remitente na columna de composición de mensaxes na lista "
 "de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Mostrar a foto do remitente no panel de lectura da mensaxe."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Show the sender email in the messages column in the message list"
-msgstr ""
-"Mostrar o correo do remitente na columna de mensaxes na lista de mensaxes"
+msgstr "Mostrar o correo do remitente na columna de mensaxes na lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:101
-msgid "Sound file to play when new mail arrives."
-msgstr "Ficheiro de son para reproducir cando chegue un correo novo."
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Specifies the header to check for junk."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:102
-msgid "Specifies the type of New Mail Notification the user wishes to use."
+#: ../mail/evolution-mail.schemas.in.h:115
+msgid ""
+"Specifies the header to check for junk. The format is headername=value in "
+"gconf."
 msgstr ""
-"Especificar o tipo de notificación de correo novo que o usuario quere usar."
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Spell check inline"
 msgstr "Verificación ortográfica en liña"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Subscribe dialog default height"
 msgstr "Altura predeterminada do diálogo de subscrición"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Subscribe dialog default width"
 msgstr "Largura predeterminada do diálogo de subscrición"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Terminal font"
 msgstr "Tipo de letra do terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Text message part limit"
 msgstr "Límite da parte de texto da mensaxe"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "The default plugin for Junk hook"
 msgstr "O plugin predefinido para a asociación de correo non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "The last time empty junk was run, in days since the epoch."
-msgstr ""
-"A última vez que se baleirou o correo non desexado, en días desde a época."
+msgstr "A última vez que se baleirou o correo non desexado, en días desde a época."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "A última vez que se baleirou o lixo, en días desde a época."
 
-#: ../mail/evolution-mail.schemas.in.h:111
-msgid "The terminal font for mail display"
+#: ../mail/evolution-mail.schemas.in.h:124
+#, fuzzy
+msgid "The terminal font for mail display."
 msgstr "O tipo de letra do terminal para mostrar o correo"
 
-#: ../mail/evolution-mail.schemas.in.h:112
-msgid "The variable width font for mail display"
+#: ../mail/evolution-mail.schemas.in.h:125
+#, fuzzy
+msgid "The variable width font for mail display."
 msgstr "O tipo de letra de largura variable para mostrar o correo"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -12898,7 +12983,7 @@ msgstr ""
 "Isto decide o tamaño máximo da parte de texto que se pode formatar no "
 "Evolution. O predeterminado é 4MB / 4096 e está especificado en KB."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:128
 #, fuzzy
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
@@ -12909,13 +12994,13 @@ msgstr ""
 "varios plugins activados. Se o plugin predeterminado listado está "
 "desactivado, entón non se usarán os outros plugins dispoñibles."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:129
 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."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:130
 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;"
@@ -12927,11 +13012,11 @@ msgstr ""
 "estrutura XML é &lt;header enabled&gt; - defínao como activado se se debe "
 "mostrar a cabeceira na visualización do correo."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "This option would help in improving the speed of fetching."
 msgstr "Esta opción podería axudar a mellorar a velocidade de recepción."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12939,15 +13024,16 @@ msgstr ""
 "Isto define o número de enderezos que se mostra na visualización da lista de "
 "mensaxes predeterminada, para os restantes móstrase un '...'."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:133
+#, fuzzy
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart"
+"collapsed state by default. Evolution requires a restart."
 msgstr ""
 "Esta opción especifica se os fíos deberían estar por defecto no estado "
 "expandido ou contraído. É necesario reiniciar o Evolution"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:134
 #, fuzzy
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
@@ -12957,103 +13043,111 @@ msgstr ""
 "Esta opción especifica se os fíos deberían estar por defecto no estado "
 "expandido ou contraído. É necesario reiniciar o Evolution"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Thread the message list."
 msgstr "Lista de mensaxes por fíos."
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Thread the message-list"
 msgstr "Lista de mensaxes por fíos"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Thread the message-list based on Subject"
 msgstr "Lista de mensaxes por fíos baseadas no asunto"
 
-#: ../mail/evolution-mail.schemas.in.h:124
-msgid "Timeout for marking message as Seen"
+#: ../mail/evolution-mail.schemas.in.h:138
+#, fuzzy
+msgid "Timeout for marking message as seen"
 msgstr "Tempo de espera para marcar unha mensaxe como vista"
 
-#: ../mail/evolution-mail.schemas.in.h:125
-msgid "Timeout for marking message as Seen."
+#: ../mail/evolution-mail.schemas.in.h:139
+#, fuzzy
+msgid "Timeout for marking message as seen."
 msgstr "Tempo de espera para marcar unha mensaxe como vista."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "UID string of the default account."
 msgstr "Cadea UID para a conta predeterminada."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Use SpamAssassin daemon and client"
 msgstr "Usar o daemon e cliente SpamAssassin"
 
-#: ../mail/evolution-mail.schemas.in.h:128
-msgid "Use SpamAssassin daemon and client (spamc/spamd)"
+#: ../mail/evolution-mail.schemas.in.h:142
+#, fuzzy
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Usar o daemon e cliente SpamAssassin (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Use custom fonts"
 msgstr "Usar tipos de letra personalizados"
 
-#: ../mail/evolution-mail.schemas.in.h:130
-msgid "Use custom fonts for displaying mail"
+#: ../mail/evolution-mail.schemas.in.h:144
+#, fuzzy
+msgid "Use custom fonts for displaying mail."
 msgstr "Usar tipos de letra personalizados para mostrar o correo"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Use only local spam tests."
 msgstr "Usar só as probas de correo local non desexado."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Usar só as probas de correo local non desexado (sen DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Use side-by-side or wide layout"
 msgstr "Usar a disposición lado a lado ou largo"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Variable width font"
 msgstr "Tipo de letra de largura variable"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "View/Bcc menu item is checked"
 msgstr "O elemento do menú Ver/Cco está seleccionado"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "View/Bcc menu item is checked."
 msgstr "O elemento do menú Ver/Cco está seleccionado."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "View/Cc menu item is checked"
 msgstr "O elemento do menú Ver/Cc está seleccionado"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "View/Cc menu item is checked."
 msgstr "O elemento do menú Ver/Cc está seleccionado."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "View/From menu item is checked"
 msgstr "O elemento do menú Ver/Desde está seleccionado"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "View/From menu item is checked."
 msgstr "O elemento do menú Ver/Desde está seleccionado."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "View/PostTo menu item is checked"
 msgstr "O elemento do menú Ver/Publicar está seleccionado"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "View/PostTo menu item is checked."
 msgstr "O elemento do menú Ver/Publicar está seleccionado."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "View/ReplyTo menu item is checked"
 msgstr "O elemento do menú Ver/Responder está seleccionado"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "View/ReplyTo menu item is checked."
 msgstr "O elemento do menú Ver/Responder está seleccionado."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:159
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13061,15 +13155,15 @@ msgstr ""
 "Se se debe ou non retroceder ao encadeamento por asuntos cando as mensaxes "
 "non conteñen cabeceiras In-Reply-To ou referencias."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Whether sort threads based on latest message in that thread"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Width of the message-list pane"
 msgstr "Largura do panel de lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Width of the message-list pane."
 msgstr "Largura do panel de lista de mensaxes."
 
@@ -13077,11 +13171,11 @@ msgstr "Largura do panel de lista de mensaxes."
 msgid "Importing Elm data"
 msgstr "Importando datos Elm"
 
-#: ../mail/importers/elm-importer.c:373
+#: ../mail/importers/elm-importer.c:369
 msgid "Evolution Elm importer"
 msgstr "Importador do Elm do Evolution"
 
-#: ../mail/importers/elm-importer.c:374
+#: ../mail/importers/elm-importer.c:370
 msgid "Import mail from Elm."
 msgstr "Importar correo desde o Elm."
 
@@ -13105,12 +13199,12 @@ msgstr "Importador de cartafoles no formato caixa de correo de Berkeley"
 msgid "Importing mailbox"
 msgstr "Importando caixa de correo"
 
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando `%s'"
 
-#: ../mail/importers/mail-importer.c:376
+#: ../mail/importers/mail-importer.c:372
 #, c-format
 msgid "Scanning %s"
 msgstr "Examinando %s"
@@ -13119,11 +13213,11 @@ msgstr "Examinando %s"
 msgid "Importing Pine data"
 msgstr "Importando datos do Pine"
 
-#: ../mail/importers/pine-importer.c:433
+#: ../mail/importers/pine-importer.c:428
 msgid "Evolution Pine importer"
 msgstr "Importador do Pine do Evolution"
 
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:429
 msgid "Import mail from Pine."
 msgstr "Importar correo do Pine."
 
@@ -13151,146 +13245,174 @@ msgstr "lista de correo %s"
 msgid "Add Filter Rule"
 msgstr "Engadir regra de filtraxe"
 
-#: ../mail/mail-component.c:524
+#: ../mail/mail-component.c:533
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionado, "
 msgstr[1] "%d seleccionado, "
 
-#: ../mail/mail-component.c:528
+#: ../mail/mail-component.c:537
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d eliminado"
 msgstr[1] "%d eliminado"
 
-#: ../mail/mail-component.c:530
+#: ../mail/mail-component.c:539
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d correo non desexado"
 msgstr[1] "%d correo non desexado"
 
-#: ../mail/mail-component.c:533
+#: ../mail/mail-component.c:542
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d borrador"
 msgstr[1] "%d borradores"
 
-#: ../mail/mail-component.c:535
+#: ../mail/mail-component.c:544
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviado"
 msgstr[1] "%d enviado"
 
-#: ../mail/mail-component.c:537
+#: ../mail/mail-component.c:546
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d non enviado"
 msgstr[1] "%d non enviado"
 
-#: ../mail/mail-component.c:543
+#: ../mail/mail-component.c:552
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d sen ler, "
 msgstr[1] "%d sen ler, "
 
-#: ../mail/mail-component.c:544
+#: ../mail/mail-component.c:553
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d en total"
 msgstr[1] "%d en total"
 
-#: ../mail/mail-component.c:874
+#: ../mail/mail-component.c:890
 msgid "New Mail Message"
 msgstr "Nova mensaxe de correo"
 
-#: ../mail/mail-component.c:875
+#: ../mail/mail-component.c:891
 msgid "_Mail Message"
 msgstr "Enviar _mensaxe"
 
-#: ../mail/mail-component.c:876
+#: ../mail/mail-component.c:892
 msgid "Compose a new mail message"
 msgstr "Compor unha mensaxe de correo nova"
 
-#: ../mail/mail-component.c:882
+#: ../mail/mail-component.c:898
 msgid "New Mail Folder"
 msgstr "Novo cartafol de correo"
 
-#: ../mail/mail-component.c:883
+#: ../mail/mail-component.c:899
 msgid "Mail _Folder"
 msgstr "_Cartafol de correo"
 
-#: ../mail/mail-component.c:884
+#: ../mail/mail-component.c:900
 msgid "Create a new mail folder"
 msgstr "Crear un cartafol de correo novo"
 
-#: ../mail/mail-component.c:1031
+#: ../mail/mail-component.c:1047
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Fallou ao actualizar a configuración do correo ou os cartafoles."
 
-#: ../mail/mail-config.c:81
-msgid "I_mportant"
-msgstr "I_mportante"
+#: ../mail/mail-component.c:1516
+msgid "Error"
+msgstr ""
 
-#. red
-#: ../mail/mail-config.c:82
-msgid "_Work"
-msgstr "_Traballo"
+#: ../mail/mail-component.c:1516
+msgid "Errors"
+msgstr ""
 
-#. orange
-#: ../mail/mail-config.c:83
-msgid "_Personal"
-msgstr "_Persoal"
+#: ../mail/mail-component.c:1517
+msgid "Warnings and Errors"
+msgstr ""
 
-#. forest green
-#: ../mail/mail-config.c:84
-msgid "_To Do"
-msgstr "_Tarefas pendentes"
+#: ../mail/mail-component.c:1518
+msgid "Debug"
+msgstr ""
 
-#. blue
-#: ../mail/mail-config.c:85
-msgid "_Later"
-msgstr "_Máis tarde"
+#: ../mail/mail-component.c:1518
+msgid "Error, Warnings and Debug messages"
+msgstr ""
+
+#: ../mail/mail-component.c:1628
+#, fuzzy
+msgid "Debug Logs"
+msgstr "Blogue"
+
+#: ../mail/mail-component.c:1632
+msgid "Show _errors in the status bar for"
+msgstr ""
+
+#: ../mail/mail-component.c:1639
+#, fuzzy
+msgid "seconds."
+msgstr "segundos"
+
+#: ../mail/mail-component.c:1649
+#, fuzzy
+msgid "Log Messages:"
+msgstr "Mensaxes"
+
+#: ../mail/mail-component.c:1701
+msgid "Log Level"
+msgstr ""
+
+#: ../mail/mail-component.c:1708 ../widgets/misc/e-dateedit.c:410
+msgid "Time"
+msgstr "Hora"
+
+#: ../mail/mail-component.c:1715 ../mail/message-list.c:2397
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "Mensaxes"
 
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " _Verificar os tipos soportados "
 
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
+msgid "(Note: Requires restart)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL non está soportado nesta compilación do Evolution</b>"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sender  Photograph</b>"
 msgstr "<b>Fotografía do remitente</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
 msgid "<b>Sig_natures</b>"
 msgstr "<b>Si_naturas</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:8
 msgid "<b>_Languages</b>"
 msgstr "<b>_Idiomas</b>"
 
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Información da conta</span>"
 
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Authentication Type</span>"
-msgstr "<span weight=\"bold\">Tipo de autenticación</span>"
-
 #: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autenticación</span>"
@@ -13317,8 +13439,9 @@ msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
 msgstr "<span weight=\"bold\">Cabeceiras de correo _mostradas</span>"
 
 #: ../mail/mail-config.glade.h:18
-msgid "<span weight=\"bold\">Labels and Colors</span>"
-msgstr "<span weight=\"bold\">Etiquetas e cores</span>"
+#, fuzzy
+msgid "<span weight=\"bold\">Labels</span>"
+msgstr "<span weight=\"bold\">Alertas</span>"
 
 #: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Loading Images</span>"
@@ -13337,47 +13460,47 @@ msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">Notificacións de recepción de mensaxes</span>"
 
 #: ../mail/mail-config.glade.h:23
-#, fuzzy
-msgid "<span weight=\"bold\">New Message Notification</span>"
-msgstr "<span weight=\"bold\">Notificación de correo novo</span>"
-
-#: ../mail/mail-config.glade.h:24
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Información opcional</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Opcións</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Privacidade bastante boa (PGP/GPG)</span>"
 
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Tipos de letra da impresión</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Información requirida</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">MIME seguro (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Seguranza</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Mensaxes enviadas e borradores</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Configuración do servidor</span>"
 
+#: ../mail/mail-config.glade.h:32
+#, fuzzy
+msgid "<span weight=\"bold\">_Authentication Type</span>"
+msgstr "<span weight=\"bold\">Tipo de autenticación</span>"
+
 #: ../mail/mail-config.glade.h:34
 msgid "Account Management"
 msgstr "Xestión de contas"
@@ -13417,64 +13540,70 @@ msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Cifrarme sempre a _min mesmo ao enviar correo cifrado"
 
 #: ../mail/mail-config.glade.h:43
+#, fuzzy
+msgid "Always request rea_d receipt"
+msgstr "_Requirir confirmación de lectura"
+
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Anexar mensaxe orixinal"
 
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Automatically insert _emoticon images"
 msgstr "_Inserir emoticonas automaticamente"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:49
 msgid "C_haracter set:"
 msgstr "Conxunto de ca_racteres:"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
+#, fuzzy
+msgid "C_heck custom headers for junk"
+msgstr "Verificar se o correo entrante é _correo non desexado"
+
+#: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
 msgstr "_Verificar tipos soportados "
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:52
 #, fuzzy
-msgid "Check in_coming messages for junk"
+msgid "Check incoming _messages for junk"
 msgstr "Verificar se o correo entrante é _correo non desexado"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Verificar a orto_grafía mentres se escribe"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Verifica se o correo entrante é correo non desexado"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "Limp_ar"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "Limpa_r"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "Cor para as palabras _incorrectas:"
 
-#: ../mail/mail-config.glade.h:56
-msgid "Colors"
-msgstr "Cores"
-
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
 msgid "Confirm _when expunging a folder"
 msgstr "Confirmar _ao expurgar un cartafol"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13490,148 +13619,164 @@ msgstr ""
 "\n"
 "Prema en \"Aplicar\" para gardar a súa configuración."
 
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "Pre_determinado"
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
 msgid "Default character e_ncoding:"
 msgstr "_Codificación de caracteres predeterminada: "
 
-#: ../mail/mail-config.glade.h:67
+#: ../mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Delete junk messages on e_xit"
 msgstr "Eliminar os correos non desexados ao saí_r"
 
-#: ../mail/mail-config.glade.h:69
-msgid "Digitally _sign outgoing messages (by default)"
+#: ../mail/mail-config.glade.h:70
+#, fuzzy
+msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Asinar _dixitalmente as mensaxes saíntes (por defecto)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:71
+msgid "Do _not mark messages as junk if sender is in my addressbook"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Do not format text contents in messages if the text si_ze exceeds"
-msgstr ""
-"Non formatar os contidos do texto dos correos se o ta_maño do texto excede"
+msgstr "Non formatar os contidos do texto dos correos se o ta_maño do texto excede"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:73
 msgid "Do not quote original message"
 msgstr "Non citar a mensaxe orixinal"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:74
 msgid "Done"
 msgstr "Feito"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr "_Cartafol de borradores:"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email Accounts"
 msgstr "Contas de correo"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Email _Address:"
 msgstr "_Enderezo de correo:"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Empty trash folders on e_xit"
 msgstr "Baleirar os cartafoles de lixo ao _saír"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
+msgid "Enable Magic S_pacebar "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:80
+#, fuzzy
+msgid "Enable Sea_rch Folders"
+msgstr "Cartafoles de busca"
+
+#: ../mail/mail-config.glade.h:81
 msgid "Encry_ption certificate:"
 msgstr "Certificado de _cifrado:"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:82
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Cifrar as mensaxes saíntes (por defecto)"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:84
 msgid "Fi_xed-width:"
 msgstr "L_argura fixa:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:85
 #, fuzzy
 msgid "Fix_ed width Font:"
 msgstr "Ti_po de letra de largura fixa:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:86
 msgid "Font Properties"
 msgstr "Propiedades do tipo de letra"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:87
 msgid "Format messages in _HTML"
 msgstr "Formato das mensaxes en _HTML"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:88
 msgid "Full Nam_e:"
 msgstr "Nom_e completo:"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:90
 #, fuzzy
 msgid "HTML Messages"
 msgstr "Mensaxes"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:91
 msgid "Headers"
 msgstr "Cabeceiras"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:92
 msgid "Highlight _quotations with"
 msgstr "_Realzar as citas con "
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "En liña"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:95
 msgid "Inline original message (Outlook style)"
 msgstr "Mensaxe orixinal en liña (estilo Outlook)"
 
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:97
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Labels"
+msgstr "Etiqueta"
+
+#: ../mail/mail-config.glade.h:99
 msgid "Languages Table"
 msgstr "Táboa de idioma"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:100
 msgid "Mail Configuration"
 msgstr "Configuración do correo"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Headers Table"
 msgstr "Táboa de cabeceiras de correo"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:103
 msgid "Mailbox location"
 msgstr "Localización da caixa de correo"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:104
 msgid "Message Composer"
 msgstr "Editor de mensaxes"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:105
+msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:106
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
-msgstr ""
-"Nota: non se lle pedirá un contrasinal até que se conecte por primeira vez"
+msgstr "Nota: non se lle pedirá un contrasinal até que se conecte por primeira vez"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:107
 msgid "Or_ganization:"
 msgstr "Or_ganización:"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:108
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da _Chave PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:108
-#, fuzzy
-msgid "Play sound file when new messages arri_ve"
-msgstr "Reproducir un ficheiro de son ao  _chegar correo novo"
-
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13639,7 +13784,7 @@ msgstr ""
 "Introduza un nome descritivo para esta conta no espazo de abaixo.\n"
 "Este nome usarase só para a visualización."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13648,7 +13793,7 @@ msgstr ""
 "seguro, pregunte ao seu administrador do sistema ou provedor de acceso a "
 "Internet."
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 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 "
@@ -13658,127 +13803,107 @@ msgstr ""
 "abaixo non necesitan encherse, a non ser que desexe incluír esta información "
 "no correo que envíe."
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Please select among the following options"
 msgstr "Escolla entre as seguintes opcións"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Avisar cando se envíen mensaxes só con destinatarios _Cco definidos"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Quote original message"
 msgstr "Citar a mensaxe orixinal"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Quoted"
 msgstr "Citada"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Re_member password"
 msgstr "_Lembrar contrasinal"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr "Lembrar _contrasinal"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "S_earch for sender photograph only in local addressbooks"
 msgstr "B_uscar fotografías do remitente só nas axendas de enderezos locais"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
 msgid "S_elect..."
 msgstr "S_eleccione..."
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "S_end message receipts:"
 msgstr "En_viar confirmacións de mensaxes:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "S_tandard Font:"
 msgstr "Tipo de letra e_stándar:"
 
-#: ../mail/mail-config.glade.h:125
-msgid "Se_lect..."
-msgstr "Se_leccione..."
-
 #: ../mail/mail-config.glade.h:127
-msgid "Select Drafts Folder"
-msgstr "Seleccionar o cartafol de borradores"
-
-#: ../mail/mail-config.glade.h:128
 msgid "Select HTML fixed width font"
 msgstr "Seleccione tipo de letra de largura fixa para HTML"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:128
 msgid "Select HTML fixed width font for printing"
 msgstr "Seleccione tipo de letra de largura fixa en HTML para imprimir"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:129
 msgid "Select HTML variable width font"
 msgstr "Seleccione tipo de letra de largura variable en HTML"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:130
 msgid "Select HTML variable width font for printing"
 msgstr "Seleccione tipo de letra de largura variable en HTML para imprimir"
 
 #: ../mail/mail-config.glade.h:132
-msgid "Select Sent Folder"
-msgstr "Seleccionar o cartafol de enviados"
-
-#: ../mail/mail-config.glade.h:133
-msgid "Select sound file"
-msgstr "Seleccionar un ficheiro de son"
-
-#: ../mail/mail-config.glade.h:135
 msgid "Sending Mail"
 msgstr "Enviando correo"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:133
 msgid "Sent _Messages Folder:"
 msgstr "Cartafol de _mensaxes enviadas:"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "O ser_vidor require autenticación"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "_Tipo de servidor: "
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:136
 msgid "Sig_ning certificate:"
 msgstr "Certificado de _sinatura:"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:137
 msgid "Signat_ure:"
 msgstr "Sinat_ura:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:139
 msgid "Signatures Table"
 msgstr "Táboa de sinaturas"
 
-#: ../mail/mail-config.glade.h:143
-msgid "Specify _filename:"
-msgstr "Especificar o nome de _ficheiro:"
-
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Verificación da ortografía"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "_Tipo: "
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:142
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -13786,7 +13911,7 @@ msgstr ""
 "Esta lista de idiomas reflicte unicamente os idiomas para os cales hai "
 "instalado un dicionario."
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:143
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13796,7 +13921,11 @@ msgstr ""
 "sinatura. O nome que especifique usarase\n"
 "só para a visualización. "
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:146
+msgid "This option will be overridden if a match for custom junk headers is found."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:147
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13804,16 +13933,16 @@ msgstr ""
 "Teclee o nome polo que quere identificar a esta conta.\n"
 "Por exemplo: \"Traballo\" ou \"Persoal\""
 
-#: ../mail/mail-config.glade.h:153 ../plugins/caldav/caldav-source.c:282
-#: ../plugins/google-account-setup/google-source.c:343
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
+#: ../plugins/google-account-setup/google-source.c:358
 msgid "User_name:"
 msgstr "_Nome de usuario:"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "Largura v_ariable:"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13823,109 +13952,103 @@ msgstr ""
 "\n"
 "Prema en \"Adiante\" para comezar. "
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:154
 msgid "_Add Signature"
 msgstr "_Engadir sinatura"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:155
 msgid "_Always load images from the Internet"
 msgstr "Cargar _sempre as imaxes desde Internet"
 
-#: ../mail/mail-config.glade.h:161
-#, fuzzy
-msgid "_Beep when new messages arrive"
-msgstr "Emitir un ton de aviso _cando chegue un correo novo"
-
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:156
 msgid "_Default junk plugin:"
 msgstr "Plugin por _defecto de correo non desexado:"
 
-#: ../mail/mail-config.glade.h:163
-#, fuzzy
-msgid "_Do not notify me when new messages arrive"
-msgstr "_Non notificarme cando chegue correo novo"
-
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Non a_sinar as peticións de reunión (para compatibilidade con Outlook)"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:159
 msgid "_Forward style:"
 msgstr "_Estilo de reenvío:"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:160
 msgid "_Keep Signature above the original message on replying"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Load images in messages from contacts"
 msgstr "_Cargar imaxes dos contactos no correo"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "_Facer esta a miña conta predeterminada"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "_Marcar as mensaxes como lidas despois de"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
 msgstr "_Nunca cargar as imaxes desde Internet"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "_Camiño:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr "_Preguntar cando se envíen mensaxes HTML a contactos que non as queren"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Preguntar cando se envíen mensaxes cun asunto baleiro"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "Estilo da _resposta:"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "_Script:"
 
+#: ../mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Select..."
+msgstr "S_eleccione..."
+
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:174
 msgid "_Show image animations"
 msgstr "_Mostrar animacións de imaxes"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Show the photograph of sender in the message preview"
-msgstr ""
-"Mo_strar a fotografía do remitente na previsualización do correo electrónico"
+msgstr "Mo_strar a fotografía do remitente na previsualización do correo electrónico"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:176
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Reducir as cabeceiras Para / Cc / Cco "
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:177
 msgid "_Use Secure Connection:"
 msgstr "_Usar unha conexión segura:"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:178
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar os mesmos tipos de letra que noutras aplicacións"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:179
 msgid "addresses"
 msgstr "enderezos"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:180
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:181
 msgid "description"
 msgstr "descrición"
 
@@ -14025,7 +14148,7 @@ msgstr "_Marca:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Marque isto para aceptar o acordo de licenza"
 
-#: ../mail/mail-folder-cache.c:881
+#: ../mail/mail-folder-cache.c:823
 #, c-format
 msgid "Pinging %s"
 msgstr "Facendo ping a %s"
@@ -14034,17 +14157,17 @@ msgstr "Facendo ping a %s"
 msgid "Filtering Selected Messages"
 msgstr "Filtrando as mensaxes seleccionadas"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Recibindo correo"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:560
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Fallo ao aplicar os filtros ao correo saínte: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14053,12 +14176,17 @@ msgstr ""
 "Fallo ao anexar a %s: %s\n"
 "anexando ao cartafol local `Enviado' no seu lugar."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Fallo ao anexar ao cartafol local `Enviado': %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:724
+#, fuzzy
+msgid "Sending message"
+msgstr "_Enviar a mensaxe"
+
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
@@ -14068,15 +14196,15 @@ msgstr "Enviando a mensaxe %d de %d"
 msgid "Failed to send %d of %d messages"
 msgstr "Fallo ao enviar %d de %d mensaxes"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
 msgid "Complete."
 msgstr "Terminado."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:869
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
@@ -14090,77 +14218,77 @@ msgstr "Movendo mensaxes a %s"
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1161
 msgid "Forwarded messages"
 msgstr "Mensaxes remitidas"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1202
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1267
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo almacenamento %s"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1338
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1427
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Almacenando cartafol '%s'"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1490
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Compactando e almacenando conta '%s'"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1491
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Almacenando conta '%s'"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1545
 msgid "Refreshing folder"
 msgstr "Actualizando o cartafol"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1582 ../mail/mail-ops.c:1632
 msgid "Expunging folder"
 msgstr "Expurgando o cartafol"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1629
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Baleirando o lixo en '%s'"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1630
 msgid "Local Folders"
 msgstr "Cartafoles locais"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1711
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recuperando a mensaxe %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1818
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Recuperando %d mensaxe"
 msgstr[1] "Recuperando %d mensaxes"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1903
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Gardando %d mensaxe"
 msgstr[1] "Gardando %d mensaxes"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1973
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14169,11 +14297,11 @@ msgstr ""
 "Erro ao gardar as mensaxes en: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2045
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2057 ../mail/mail-ops.c:2063
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14182,75 +14310,75 @@ msgstr ""
 "Non se pode crear o ficheiro de saída: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2073
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non se poden escribir os datos: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2219
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2219
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Conectando novamente a %s"
 
-#: ../mail/mail-ops.c:2361
+#: ../mail/mail-ops.c:2315
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparando a conta '%s' para o modo sen conexión"
 
-#: ../mail/mail-ops.c:2444
+#: ../mail/mail-ops.c:2401
 msgid "Checking Service"
 msgstr "Verificando servizo"
 
-#: ../mail/mail-send-recv.c:188
+#: ../mail/mail-send-recv.c:190
 msgid "Canceling..."
 msgstr "Cancelando..."
 
-#: ../mail/mail-send-recv.c:391
+#: ../mail/mail-send-recv.c:393
 msgid "Send & Receive Mail"
 msgstr "Enviar e recibir correo"
 
-#: ../mail/mail-send-recv.c:398
+#: ../mail/mail-send-recv.c:400
 msgid "Cancel _All"
 msgstr "Cancelar _todo"
 
-#: ../mail/mail-send-recv.c:506
+#: ../mail/mail-send-recv.c:510
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: ../mail/mail-send-recv.c:506 ../mail/mail-send-recv.c:579
+#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
 msgid "Waiting..."
 msgstr "En espera..."
 
-#: ../mail/mail-send-recv.c:788
+#: ../mail/mail-send-recv.c:792
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprobando o correo novo"
 
-#: ../mail/mail-session.c:202
+#: ../mail/mail-session.c:205
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introduza a frase de paso para %s"
 
-#: ../mail/mail-session.c:204
+#: ../mail/mail-session.c:207
 msgid "Enter Passphrase"
 msgstr "Introduza a frase de paso"
 
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:210
 #: ../plugins/exchange-operations/exchange-config-listener.c:711
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:212
 msgid "Enter Password"
 msgstr "Introduza o seu contrasinal"
 
-#: ../mail/mail-session.c:251
+#: ../mail/mail-session.c:254
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operación."
 
@@ -14263,7 +14391,6 @@ msgid "Enter a name for this signature."
 msgstr "Introduza un nome para esta sinatura."
 
 #: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Name:"
 msgstr "Nome:"
 
@@ -14275,8 +14402,7 @@ msgstr "Non se puido crear o directorio spool `%s': %s"
 #: ../mail/mail-tools.c:150
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
-msgstr ""
-"Tentando facer o movemail dunha orixe que non é unha caixa de correo `%s'"
+msgstr "Tentando facer o movemail dunha orixe que non é unha caixa de correo `%s'"
 
 #: ../mail/mail-tools.c:256
 #, c-format
@@ -14292,37 +14418,35 @@ msgstr "Mensaxe reenviada"
 msgid "Invalid folder: `%s'"
 msgstr "Cartafol non válido: `%s'"
 
-#: ../mail/mail-vfolder.c:91
+#: ../mail/mail-vfolder.c:89
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Configurando cartafol de busca: %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:233
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Actualizando cartafoles de busca para '%s: %s'"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Actualizando cartafoles de busca para '%s'"
 
-#: ../mail/mail-vfolder.c:1046
+#: ../mail/mail-vfolder.c:1049
 msgid "Edit Search Folder"
 msgstr "Editar cartafol de busca"
 
-#: ../mail/mail-vfolder.c:1130
+#: ../mail/mail-vfolder.c:1138
 msgid "New Search Folder"
 msgstr "Novo cartafol de busca"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{0}&quot; already exists. Please use a different name."
+msgid "A folder named &quot;{0}&quot; already exists. Please use a different name."
 msgstr "Xa existe un cartafol chamado &quot;{0}&quot;. Use un nome diferente."
 
 #: ../mail/mail.error.xml.h:2
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr "Xa existe un cartafol co nome &quot;{1}&quot;. Use un nome diferente."
 
 #: ../mail/mail.error.xml.h:3
@@ -14370,8 +14494,7 @@ msgid "Are you sure you want to delete this account?"
 msgstr "Está seguro de que quere eliminar esta conta?"
 
 #: ../mail/mail.error.xml.h:11
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "Está seguro de que quere desactivar esta conta e eliminar todos os seus "
 "proxies?"
@@ -14450,8 +14573,7 @@ msgstr "Non se pode eliminar o cartafol de sistema &quot;{0}&quot;."
 
 #: ../mail/mail.error.xml.h:29
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr ""
-"Non se pode editar o cartafol de busca &quot;{0}&quot; porque non existe."
+msgstr "Non se pode editar o cartafol de busca &quot;{0}&quot; porque non existe."
 
 #: ../mail/mail.error.xml.h:30
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
@@ -14525,27 +14647,37 @@ msgid "Delete account?"
 msgstr "Eliminar a conta?"
 
 #: ../mail/mail.error.xml.h:45
+#, fuzzy
+msgid "Delete messages in Search Folder &quot;{0}&quot;?"
+msgstr "Non se pode engadir o cartafol de busca &quot;{0}&quot;."
+
+#: ../mail/mail.error.xml.h:46
+#, fuzzy
+msgid "Delete messages in Search Folder?"
+msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
+
+#: ../mail/mail.error.xml.h:47
 msgid "Discard changes?"
 msgstr "Rexeitar as modificacións?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:48
 msgid "Do not d_elete"
 msgstr "Non _eliminar"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:49
 msgid "Do not delete"
 msgstr "Non eliminar"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:50
 msgid "Do not disable"
 msgstr "Non desactivar"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:51
 #, fuzzy
 msgid "Do you want the operation to be performed also in the subfolders?"
 msgstr "Quere que se realice esta operación nos subcartafoles?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:52
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -14553,43 +14685,43 @@ msgstr ""
 "Quere sincronizar localmente os cartafoles que están marcados para o uso sen "
 "conexión?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:53
 msgid "Do you want to mark all messages as read?"
 msgstr "Quere marcar todas as mensaxes como lidas?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:54
 msgid "Do you wish to save your changes?"
 msgstr "Quere gardar as modificacións?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:55
 msgid "Enter password."
 msgstr "Introduza o contrasinal."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:56
 msgid "Error loading filter definitions."
 msgstr "Erro ao cargar as definicións dos filtros."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:57
 msgid "Error while performing operation."
 msgstr "Erro ao efectuar a operación."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "Erro ao {0}."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "O ficheiro existe mais non se pode sobrescribir."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "O ficheiro existe mais non é un ficheiro normal."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Se continúa, non poderá recuperar estas mensaxes."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14597,11 +14729,11 @@ msgstr ""
 "Se elimina o cartafol, eliminarase permanentemente todo o seu contido e o "
 "dos seus subcartafoles."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Se procede, as contas proxy eliminaranse permanentemente."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14609,11 +14741,11 @@ msgstr ""
 "Se continúa, a información da conta e toda a\n"
 "información do proxy eliminarase permanentemente."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Se procede, a información da conta eliminarase permanentemente."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14621,19 +14753,19 @@ msgstr ""
 "Se sae, estas mensaxes non se enviarán até que o Evolution sexa iniciado de "
 "novo."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "Autenticación non válida"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "Filtros de correo actualizados automaticamente."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:72
 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 "
@@ -14645,41 +14777,41 @@ msgstr ""
 "todas as formas todos os destinatarios da súa mensaxe. Para evitar isto "
 "debería engadir polo menos un destinatario Para: ou CC: ."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
 msgstr "Marcar todas as mensaxes como lidas"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:74
 #, fuzzy
 msgid "Mark all messages in this folder and subfolders as read?"
 msgstr "Marcar todas as mensaxes nos subcartafoles como lidas?"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "Falta o cartafol."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:77
 msgid "No sources selected."
 msgstr "Non se seleccionou ningunha orixe."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:78
 #, fuzzy
 msgid "Only on _Current Folder"
 msgstr "Cartafol actual"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:79
 msgid "Opening too many messages at once may take a long time."
 msgstr "Abrir demasiadas mensaxes ao mesmo tempo pode levar moito tempo."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:80
 msgid "Please check your account settings and try again."
 msgstr "Verifique a súa configuración da conta e ténteo outra vez."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:81
 msgid "Please enable the account or send using another account."
 msgstr "Active a conta ou envíe usando outra conta."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:82
 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."
@@ -14687,71 +14819,71 @@ msgstr ""
 "Introduza un enderezo de correo válido no campo \"Para:\". Pode buscar "
 "enderezos de correo premendo no botón \"Para:\" ao lado da caixa de entrada."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:83
+#, fuzzy
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
-"{0}\n"
-"Send anyway?"
+"{0}"
 msgstr ""
 "Asegúrese de que os seguintes destinatarios queren e poden recibir mensaxes "
 "HTML:\n"
 "{0}\n"
 "Enviar de todas as maneiras?"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Please provide an unique name to identify this signature."
 msgstr "Introduza un nome único para identificar esta sinatura."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Please wait."
 msgstr "Agarde."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Problema ao migrar o cartafol de correo antigo &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 msgid "Querying server"
 msgstr "Consultando o servidor"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Estase consultando o servidor sobre unha lista de mecanismos de "
 "autenticación soportados."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:90
 msgid "Read receipt requested."
 msgstr "Requiriuse unha confirmación de lectura."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:91
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr ""
 "Está seguro de que quere eliminar o cartafol &quot;{0}&quot; e todos os seus "
 "subcartafoles?"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
 msgstr "Os cartafoles de busca actualizáronse automaticamente."
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:93
 msgid "Send Receipt"
 msgstr "Enviar notificación de recepción"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
 msgid "Signature Already Exists"
 msgstr "A sinatura xa existe"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:95
 msgid "Synchronize"
 msgstr "Sincronizar"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:96
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Sincronizar os cartafoles localmente para o uso sen conexión?"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -14759,7 +14891,7 @@ msgstr ""
 "O Evolution require os cartafoles de sistema para funcionar correctamente e "
 "non se poden renomear nin eliminar."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14776,7 +14908,7 @@ msgstr ""
 "destinatarios na súa mensaxe. Para evitar isto, debería engadir polo menos "
 "un destinatario a Para: ou Cc:. "
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:101
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14790,7 +14922,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "e actualizaranse."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14804,11 +14936,11 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "e actualizaranse."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
 msgstr "O ficheiro de script debe existir e ser executable."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14817,7 +14949,7 @@ msgstr ""
 "vaia ao editor de cartafoles de busca para engadilo explicitamente, se é "
 "necesario."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:114
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14825,14 +14957,13 @@ msgstr ""
 "Esta mensaxe non pode ser enviada porque a conta que escolleu para enviala "
 "non está activada"
 
-#: ../mail/mail.error.xml.h:114
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
+#: ../mail/mail.error.xml.h:115
+msgid "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Esta mensaxe non pode ser enviada porque non se especificou ningún "
 "destinatario"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14840,11 +14971,11 @@ msgstr ""
 "Este servidor non soporta este tipo de autenticación e quizais non soporte "
 "ningún tipo de autenticación."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
 msgstr "Modificouse esta sinatura mais non foi gardada."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:118
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14852,11 +14983,11 @@ msgstr ""
 "Isto marcará todas as mensaxes como lidas no cartafol seleccionado e nos "
 "seus subcartafoles."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
 msgstr "Non se puido conectar ao servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14864,39 +14995,46 @@ msgstr ""
 "Non é posible abrir o cartafol de borradores nesta conta. Quere usar no seu "
 "lugar o cartafol de borradores do sistema?"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
 msgstr "Non é posible ler o ficheiro da licenza."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:122
 msgid "Use _Default"
 msgstr "Usar o _predeterminado"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:123
 msgid "Use default drafts folder?"
 msgstr "Usar cartafol de borradores predeterminados?"
 
 #: ../mail/mail.error.xml.h:124
+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 ""
+
+#: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
 msgstr "Non encheu toda a información requirida."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:128
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Ten mensaxes non enviadas, aínda así quere saír?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:129
 msgid "You may not create two accounts with the same name."
 msgstr "Non pode crear dúas contas co mesmo nome"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:130
 msgid "You must name this Search Folder."
 msgstr "Debe dar un nome a este cartafol de busca."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:131
 msgid "You must specify a folder."
 msgstr "Debe especificar un cartafol."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14906,105 +15044,101 @@ msgstr ""
 "Fágao seleccionando os cartafoles individualmente, ou seleccionando todos os "
 "cartafoles locais, todos os cartafoles remotos ou ambos."
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:134
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 "O seu inicio de sesión no servidor &quot;{0}&quot; como &quot;{0}&quot; "
 "fallou."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:135
 msgid "_Append"
 msgstr "_Engadir"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "_Rexeitar as modificacións"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:137
 msgid "_Do not Synchronize"
 msgstr "_Non sincronizar"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr "_Expurgar"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:140
 msgid "_Open Messages"
 msgstr "_Abrir mensaxes"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:143
 #, fuzzy
 msgid "on Current Folder and _Subfolders"
 msgstr "Crear subcartafoles"
 
-#: ../mail/message-list.c:1024
+#: ../mail/message-list.c:1050
 msgid "Unseen"
 msgstr "Non vista"
 
-#: ../mail/message-list.c:1025
+#: ../mail/message-list.c:1051
 msgid "Seen"
 msgstr "Vista"
 
-#: ../mail/message-list.c:1026
+#: ../mail/message-list.c:1052
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:1027
+#: ../mail/message-list.c:1053
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensaxes non vistas"
 
-#: ../mail/message-list.c:1028
+#: ../mail/message-list.c:1054
 msgid "Multiple Messages"
 msgstr "Múltiples mensaxes"
 
-#: ../mail/message-list.c:1032
+#: ../mail/message-list.c:1058
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#: ../mail/message-list.c:1033
+#: ../mail/message-list.c:1059
 msgid "Lower"
 msgstr "Inferior"
 
-#: ../mail/message-list.c:1037
+#: ../mail/message-list.c:1063
 msgid "Higher"
 msgstr "Superior"
 
-#: ../mail/message-list.c:1038
+#: ../mail/message-list.c:1064
 msgid "Highest"
 msgstr "A máis alta"
 
-#: ../mail/message-list.c:1515 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1608 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1522 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1615 ../plugins/itip-formatter/itip-view.c:206
 #: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "Hoxe ás %l:%M %p"
 
-#: ../mail/message-list.c:1531 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1624 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %l:%M %p"
 
-#: ../mail/message-list.c:1543 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1636 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "O %A ás %k:%M"
 
-#: ../mail/message-list.c:1551 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1644 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "O %d de %B ás %k:%M"
 
-#: ../mail/message-list.c:1553 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1646 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: ../mail/message-list.c:2310 ../mail/message-list.etspec.h:9
-msgid "Messages"
-msgstr "Mensaxes"
-
-#: ../mail/message-list.c:3752
+#: ../mail/message-list.c:3840
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
@@ -15024,15 +15158,15 @@ msgstr "Marcada"
 msgid "Follow Up Flag"
 msgstr "Marca de seguimento"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:11
 msgid "Received"
 msgstr "Recibido"
 
-#: ../mail/message-list.etspec.h:14
+#: ../mail/message-list.etspec.h:15
 msgid "Sent Messages"
 msgstr "Mensaxes enviadas"
 
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Tamaño"
@@ -15111,19 +15245,25 @@ msgid "Enable attachment reminder plugin"
 msgstr "Activar e desactivar plugins"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
+#, fuzzy
+msgid "Enable attachment reminder plugin."
+msgstr "Activar e desactivar plugins"
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
 msgstr ""
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:453
-msgid "Keywords"
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
 msgstr ""
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:502
-#, fuzzy
-msgid "Attachment Reminder Preferences"
-msgstr "Propiedades de anexos"
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+msgid "Keywords"
+msgstr ""
 
 #: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
 #, fuzzy
@@ -15237,64 +15377,63 @@ msgstr "Reiniciar o Evolution"
 msgid "With Graphical User Interface"
 msgstr ""
 
-#: ../plugins/backup-restore/backup.c:67
-#: ../plugins/backup-restore/backup.c:107
+#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:110
 msgid "Shutting down Evolution"
 msgstr "Pechando o Evolution"
 
-#: ../plugins/backup-restore/backup.c:72
+#: ../plugins/backup-restore/backup.c:74
 msgid "Backing Evolution accounts and settings"
-msgstr ""
-"Facendo unha copia de seguranza das contas e configuracións do Evolution"
+msgstr "Facendo unha copia de seguranza das contas e configuracións do Evolution"
 
-#: ../plugins/backup-restore/backup.c:77
+#: ../plugins/backup-restore/backup.c:78
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Facendo unha copia de seguranza dos datos do Evolution (correos, contactos, "
 "calendario, tarefas, notas)"
 
-#: ../plugins/backup-restore/backup.c:87
+#: ../plugins/backup-restore/backup.c:88
 msgid "Backup complete"
 msgstr "Terminou a copia de seguranza"
 
-#: ../plugins/backup-restore/backup.c:92
-#: ../plugins/backup-restore/backup.c:133
+#: ../plugins/backup-restore/backup.c:93
+#: ../plugins/backup-restore/backup.c:136
 msgid "Restarting Evolution"
 msgstr "Reiniciando o Evolution"
 
-#: ../plugins/backup-restore/backup.c:111
+#: ../plugins/backup-restore/backup.c:114
 msgid "Backup current Evolution data"
 msgstr "Facendo unha copia dos datos actuais do Evolution"
 
-#: ../plugins/backup-restore/backup.c:116
+#: ../plugins/backup-restore/backup.c:119
 #, fuzzy
 msgid "Extracting files from backup"
 msgstr "Extraendo ficheiros do arquivo"
 
-#: ../plugins/backup-restore/backup.c:122
+#: ../plugins/backup-restore/backup.c:125
 msgid "Loading Evolution settings"
 msgstr "Cargando a configuración do Evolution"
 
-#: ../plugins/backup-restore/backup.c:126
+#: ../plugins/backup-restore/backup.c:129
 msgid "Removing temporary backup files"
 msgstr "Eliminando os ficheiros temporais da copia de seguranza"
 
-#: ../plugins/backup-restore/backup.c:244
+#: ../plugins/backup-restore/backup.c:249
 #, fuzzy, c-format
 msgid "Backing up to the folder %s"
 msgstr "Facendo a copia de seguranza en %s"
 
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:254
 #, fuzzy, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restaurando desde %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:264
+#: ../plugins/backup-restore/backup.c:270
 msgid "Evolution Backup"
 msgstr "Copia de seguranza do Evolution"
 
-#: ../plugins/backup-restore/backup.c:264
+#: ../plugins/backup-restore/backup.c:270
 msgid "Evolution Restore"
 msgstr "Restauración do Evolution"
 
@@ -15315,10 +15454,8 @@ msgstr "Está seguro de que quere pechar o Evolution?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
 #, fuzzy
-msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
-msgstr ""
-"Está seguro de que quere restaurar o Evolution desde o arquivo seleccionado?"
+msgid "Are you sure you want to restore Evolution from the selected backup file?"
+msgstr "Está seguro de que quere restaurar o Evolution desde o arquivo seleccionado?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid ""
@@ -15359,8 +15496,7 @@ msgstr ""
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
-msgstr ""
-"Facer copia de seguranza e restaurar os datos e a configuración do Evolution"
+msgstr "Facer copia de seguranza e restaurar os datos e a configuración do Evolution"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 msgid "R_estore Settings..."
@@ -15370,29 +15506,27 @@ msgstr "Configuracións de r_estauración..."
 msgid "_Backup Settings..."
 msgstr "_Configuracións de copia de seguranza..."
 
-#: ../plugins/bbdb/bbdb.c:533 ../plugins/bbdb/bbdb.c:542
+#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contactos automáticos"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:557
+#: ../plugins/bbdb/bbdb.c:565
 #, fuzzy
-msgid ""
-"_Automatically create entries in the addressbook when responding to messages"
-msgstr ""
-"Crear entradas _automaticamente na axenda de enderezos ao responder o correo"
+msgid "_Automatically create entries in the addressbook when responding to messages"
+msgstr "Crear entradas _automaticamente na axenda de enderezos ao responder o correo"
 
-#: ../plugins/bbdb/bbdb.c:563
+#: ../plugins/bbdb/bbdb.c:571
 msgid "Select Address book for Automatic Contacts"
 msgstr "Seleccione a axenda de enderezos para contactos automáticos"
 
-#: ../plugins/bbdb/bbdb.c:578
+#: ../plugins/bbdb/bbdb.c:586
 msgid "Instant Messaging Contacts"
 msgstr "Mensaxe instantánea de contactos"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:593
+#: ../plugins/bbdb/bbdb.c:601
 #, fuzzy
 msgid ""
 "Periodically synchronize contact information and images from Pidgin buddy "
@@ -15401,13 +15535,13 @@ msgstr ""
 "Sincronizar periodicamente a información e as imaxes de contacto desde a "
 "lista de amigos do Gaim"
 
-#: ../plugins/bbdb/bbdb.c:599
+#: ../plugins/bbdb/bbdb.c:607
 #, fuzzy
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Seleccione a axenda de enderezos para a lista de amigos do Gaim"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:610
+#: ../plugins/bbdb/bbdb.c:618
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronizar coa lista de _amigos agora"
 
@@ -15462,7 +15596,7 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:269
-#: ../plugins/google-account-setup/google-source.c:336
+#: ../plugins/google-account-setup/google-source.c:351
 msgid "Use _SSL"
 msgstr "Usar _SSL"
 
@@ -15484,7 +15618,7 @@ msgstr "Proporciona funcionalidade básica para calendarios locais."
 
 #: ../plugins/calendar-http/calendar-http.c:273
 #: ../plugins/calendar-weather/calendar-weather.c:546
-#: ../plugins/google-account-setup/google-source.c:360
+#: ../plugins/google-account-setup/google-source.c:375
 msgid "_Refresh:"
 msgstr "_Actualizar:"
 
@@ -15575,16 +15709,14 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Verificar se o Evolution é a aplicación de correo predeterminada"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 "Cada vez que se inicie o Evolution, verificar se é ou non o cliente de "
 "correo predeterminado."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Checks whether Evolution is the default mail client on startup."
-msgstr ""
-"Verificar se o Evolution é o cliente de correo predeterminado ao iniciar."
+msgstr "Verificar se o Evolution é o cliente de correo predeterminado ao iniciar."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 msgid "Default Mail Client "
@@ -15597,7 +15729,7 @@ msgstr ""
 "predeterminado?"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:512
+#: ../shell/main.c:624
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -15728,21 +15860,22 @@ msgstr "URL _OWA:"
 msgid "A_uthenticate"
 msgstr "A_utenticar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:837
-msgid "Authentication Type"
+#: ../plugins/exchange-operations/exchange-account-setup.c:840
+#, fuzzy
+msgid "_Authentication Type"
 msgstr "Tipo de autenticación"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:851
+#: ../plugins/exchange-operations/exchange-account-setup.c:854
 msgid "Ch_eck for Supported Types"
 msgstr "_Verificar tipos soportados"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:957
+#: ../plugins/exchange-operations/exchange-account-setup.c:960
 #: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:959
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
 #: ../plugins/exchange-operations/exchange-contacts.c:214
 #, c-format
 msgid "0 KB"
@@ -15794,10 +15927,8 @@ msgstr "O seu contrasinal actual caducou. Cambie o seu contrasinal agora."
 msgid "Your password will expire in the next %d days"
 msgstr "O contrasinal caducará nos seguintes %d días"
 
-#. Custom
 #: ../plugins/exchange-operations/exchange-delegates-user.c:159
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
-#: ../widgets/table/e-table-header-item.c:1560
 msgid "Custom"
 msgstr "Personalizado"
 
@@ -16209,8 +16340,7 @@ msgstr "Operacións do Exchange"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot change password due to configuration problems."
-msgstr ""
-"Non se pode modificar o contrasinal debido a problemas de configuración."
+msgstr "Non se pode modificar o contrasinal debido a problemas de configuración."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
 msgid "Cannot display folders."
@@ -16338,7 +16468,7 @@ msgid "Folder offline"
 msgstr "Cartafol sen conexión"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1283
+#: ../shell/e-shell.c:1288
 msgid "Generic error"
 msgstr "Erro xenérico"
 
@@ -16376,8 +16506,7 @@ msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "No Global Catalog server configured for this account."
-msgstr ""
-"Non hai ningún servidor de catálogo global configurado para esta conta."
+msgstr "Non hai ningún servidor de catálogo global configurado para esta conta."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No mailbox for user {0} on {1}."
@@ -16475,8 +16604,7 @@ msgstr "Operación non soportada"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "You are nearing your quota available for storing mail on this server."
-msgstr ""
-"Está próximo á súa cota dispoñible para almacenar correo neste servidor."
+msgstr "Está próximo á súa cota dispoñible para almacenar correo neste servidor."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
@@ -16508,8 +16636,7 @@ msgstr ""
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
-msgstr ""
-"O seu uso actual é: {0}KB. Non poderá nin enviar nin recibir correos agora."
+msgstr "O seu uso actual é: {0}KB. Non poderá nin enviar nin recibir correos agora."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
@@ -16546,7 +16673,7 @@ msgstr "Verificar os permisos do cartafol"
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid ""
 "A plugin for using an external editor as the composer. You can send only "
-"plain-text mails."
+"plain-text messages."
 msgstr ""
 
 #. the path to the shared library
@@ -16561,8 +16688,9 @@ msgid "Compose in External Editor"
 msgstr "Largura predeterminada da ventá do editor"
 
 #: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
-msgid "Compose mails using an external editor"
-msgstr ""
+#, fuzzy
+msgid "Compose messages using an external editor"
+msgstr "Largura predeterminada da ventá do editor"
 
 #: ../plugins/face/face.c:57
 msgid "Select a (48*48) png of size < 700bytes"
@@ -16590,7 +16718,7 @@ msgstr ""
 msgid "Face"
 msgstr "Francia"
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Eliminar subscrición do cartafol \"%s\""
@@ -16740,27 +16868,29 @@ msgstr "Aceptar provisionalmente"
 msgid "<b>Users:</b>"
 msgstr "<b>Usuarios:</b>"
 
+#: ../plugins/groupwise-features/properties.glade.h:2
+#, fuzzy
+msgid "C_ustomize notification message"
+msgstr "_Personalizar a mensaxe de notificación"
+
 #: ../plugins/groupwise-features/properties.glade.h:3
-#: ../widgets/table/e-table-click-to-add.c:507
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Contactos..."
+
+#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../widgets/table/e-table-click-to-add.c:517
 msgid "Message"
 msgstr "Mensaxe"
 
-#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
 msgstr "Notificación de cartafol compartido"
 
-#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "Os participantes recibirán a notificación seguinte.\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:10
-msgid "_Contacts..."
-msgstr "_Contactos..."
-
-#: ../plugins/groupwise-features/properties.glade.h:11
-msgid "_Customize notification message"
-msgstr "_Personalizar a mensaxe de notificación"
-
 #: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Not Shared"
 msgstr "_Non compartido"
@@ -16851,31 +16981,30 @@ msgstr "O separador do proxy estará dispoñible só cando a conta estea en liñ
 
 #: ../plugins/groupwise-features/proxy.c:706
 msgid "The Proxy tab will be available only when the account is enabled."
-msgstr ""
-"O separador do proxy estará dispoñible só cando a conta estea activada."
+msgstr "O separador do proxy estará dispoñible só cando a conta estea activada."
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
-#: ../plugins/groupwise-features/share-folder.c:760
+#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../plugins/groupwise-features/share-folder-common.c:323
+#: ../plugins/groupwise-features/share-folder-common.c:320
 msgid "Enter the users and set permissions"
 msgstr "Introduza os usuarios e defina os permisos"
 
-#: ../plugins/groupwise-features/share-folder-common.c:342
+#: ../plugins/groupwise-features/share-folder-common.c:339
 msgid "New _Shared Folder..."
 msgstr "Novo cartafol _compartido..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:450
+#: ../plugins/groupwise-features/share-folder-common.c:447
 msgid "Sharing"
 msgstr "Compartir"
 
-#: ../plugins/groupwise-features/share-folder.c:765
+#: ../plugins/groupwise-features/share-folder.c:766
 msgid "Add   "
 msgstr "Engadir   "
 
-#: ../plugins/groupwise-features/share-folder.c:771
+#: ../plugins/groupwise-features/share-folder.c:772
 msgid "Modify"
 msgstr "Modificar"
 
@@ -16928,7 +17057,8 @@ msgid "Completed: "
 msgstr "Terminado: "
 
 #: ../plugins/groupwise-features/status-track.c:225
-msgid "Un-delivered: "
+#, fuzzy
+msgid "Undelivered: "
 msgstr "Non entregado: "
 
 #: ../plugins/groupwise-features/status-track.c:249
@@ -16943,15 +17073,11 @@ msgstr "Plugin para configurar as orixes do calendario hula."
 msgid "Hula Account Setup"
 msgstr "Configuración da conta hula"
 
-#: ../plugins/imap-features/imap-headers.c:134
-msgid "Custom Header"
-msgstr "Cabeceira personalizada"
-
-#: ../plugins/imap-features/imap-headers.c:259
+#: ../plugins/imap-features/imap-headers.c:322
 msgid "Custom Headers"
 msgstr "Cabeceiras personalizadas"
 
-#: ../plugins/imap-features/imap-headers.c:269
+#: ../plugins/imap-features/imap-headers.c:335
 msgid "IMAP Headers"
 msgstr "Cabeceiras IMAP"
 
@@ -17071,7 +17197,8 @@ msgid "iCalendar format (.ics)"
 msgstr "Formato iCalendar (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
+#, fuzzy
+msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
 msgstr "Sincronizar a tarefa/calendario/axenda de enderezos con Apple iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
@@ -17083,134 +17210,134 @@ msgid "iPod Synchronization"
 msgstr "Sincronización con iPod"
 
 #: ../plugins/itip-formatter/itip-formatter.c:429
-#: ../plugins/itip-formatter/itip-formatter.c:550
+#: ../plugins/itip-formatter/itip-formatter.c:554
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Fallo ao cargar o calendario '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:570
+#: ../plugins/itip-formatter/itip-formatter.c:574
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Unha cita no calendario '%s' entra en conflito con esta reunión"
 
-#: ../plugins/itip-formatter/itip-formatter.c:596
+#: ../plugins/itip-formatter/itip-formatter.c:600
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Localizouse a cita no calendario '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:672
+#: ../plugins/itip-formatter/itip-formatter.c:676
 msgid "Unable to find any calendars"
 msgstr "Non é posible localizar ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:679
+#: ../plugins/itip-formatter/itip-formatter.c:683
 msgid "Unable to find this meeting in any calendar"
 msgstr "Non é posible localizar esta reunión en ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:683
+#: ../plugins/itip-formatter/itip-formatter.c:687
 msgid "Unable to find this task in any task list"
 msgstr "Non é posible localizar esta tarefa en ningunha lista de tarefas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:687
+#: ../plugins/itip-formatter/itip-formatter.c:691
 #, fuzzy
 msgid "Unable to find this memo in any memo list"
 msgstr "Non é posible localizar esta tarefa en ningunha lista de tarefas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:760
+#: ../plugins/itip-formatter/itip-formatter.c:764
 msgid "Searching for an existing version of this appointment"
 msgstr "Buscando unha versión existente desta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:923
+#: ../plugins/itip-formatter/itip-formatter.c:927
 msgid "Unable to parse item"
 msgstr "Non é posible analizar o elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:981
+#: ../plugins/itip-formatter/itip-formatter.c:985
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Non é posible enviar o elemento ao calendario '%s': %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:993
+#: ../plugins/itip-formatter/itip-formatter.c:997
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado ao calendario '%s' como aceptado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:997
+#: ../plugins/itip-formatter/itip-formatter.c:1001
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado ao calendario '%s' como provisional"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1002
+#: ../plugins/itip-formatter/itip-formatter.c:1006
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado ao calendario '%s' como rexeitado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1007
+#: ../plugins/itip-formatter/itip-formatter.c:1011
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado ao calendario '%s' como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1101
+#: ../plugins/itip-formatter/itip-formatter.c:1105
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "O organizador eliminou o delegado %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1108
+#: ../plugins/itip-formatter/itip-formatter.c:1112
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviada unha notificación de cancelación ao delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1110
+#: ../plugins/itip-formatter/itip-formatter.c:1114
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Non se puido enviar unha notificación de cancelación ao delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1195
+#: ../plugins/itip-formatter/itip-formatter.c:1199
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "O estado de participación non se puido actualizar debido a que o estado non "
 "é válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1222
+#: ../plugins/itip-formatter/itip-formatter.c:1226
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Non é posible actualizar o participante. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1226
+#: ../plugins/itip-formatter/itip-formatter.c:1230
 msgid "Attendee status updated"
 msgstr "Estado de participación actualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1251
+#: ../plugins/itip-formatter/itip-formatter.c:1255
 #, fuzzy
 msgid "Meeting information sent"
 msgstr "Información da reunión"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1254
+#: ../plugins/itip-formatter/itip-formatter.c:1258
 #, fuzzy
 msgid "Task information sent"
 msgstr "Información da tarefa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1257
+#: ../plugins/itip-formatter/itip-formatter.c:1261
 #, fuzzy
 msgid "Memo information sent"
 msgstr "Sen información"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1266
+#: ../plugins/itip-formatter/itip-formatter.c:1270
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1269
+#: ../plugins/itip-formatter/itip-formatter.c:1273
 #, fuzzy
 msgid "Unable to send task information, the task does not exist"
 msgstr "Non é posible localizar esta tarefa en ningunha lista de tarefas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1272
+#: ../plugins/itip-formatter/itip-formatter.c:1276
 msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1347
-#: ../plugins/itip-formatter/itip-formatter.c:1362
+#: ../plugins/itip-formatter/itip-formatter.c:1351
+#: ../plugins/itip-formatter/itip-formatter.c:1366
 msgid "The calendar attached is not valid"
 msgstr "O calendario anexo non é válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1348
-#: ../plugins/itip-formatter/itip-formatter.c:1363
+#: ../plugins/itip-formatter/itip-formatter.c:1352
+#: ../plugins/itip-formatter/itip-formatter.c:1367
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17218,15 +17345,15 @@ msgstr ""
 "A mensaxe di que contén un calendario mais o calendario non é un iCalendar "
 "válido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1398
-#: ../plugins/itip-formatter/itip-formatter.c:1416
-#: ../plugins/itip-formatter/itip-formatter.c:1498
+#: ../plugins/itip-formatter/itip-formatter.c:1402
+#: ../plugins/itip-formatter/itip-formatter.c:1420
+#: ../plugins/itip-formatter/itip-formatter.c:1502
 msgid "The item in the calendar is not valid"
 msgstr "O elemento no calendario non é válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1399
-#: ../plugins/itip-formatter/itip-formatter.c:1417
-#: ../plugins/itip-formatter/itip-formatter.c:1499
+#: ../plugins/itip-formatter/itip-formatter.c:1403
+#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../plugins/itip-formatter/itip-formatter.c:1503
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17234,11 +17361,11 @@ msgstr ""
 "A mensaxe contén un calendario mais o calendario non contén eventos, tarefas "
 "nin información de dispoñibilidade"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1428
+#: ../plugins/itip-formatter/itip-formatter.c:1432
 msgid "The calendar attached contains multiple items"
 msgstr "O calendario anexo contén múltiples elementos"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1429
+#: ../plugins/itip-formatter/itip-formatter.c:1433
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17246,496 +17373,495 @@ msgstr ""
 "Para procesar todos estes elementos, debería gardarse o ficheiro e "
 "importarse o calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2122
+#: ../plugins/itip-formatter/itip-formatter.c:2123
 #, fuzzy
 msgid "This meeting recurs"
 msgstr "Esta cita _repítese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2125
+#: ../plugins/itip-formatter/itip-formatter.c:2126
 #, fuzzy
 msgid "This task recurs"
 msgstr "Esta cita _repítese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2128
+#: ../plugins/itip-formatter/itip-formatter.c:2129
 #, fuzzy
 msgid "This memo recurs"
 msgstr "Esta cita _repítese"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2331
+#: ../plugins/itip-formatter/itip-formatter.c:2334
 msgid "_Delete message after acting"
 msgstr "E_liminar a mensaxe despois de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2341
-#: ../plugins/itip-formatter/itip-formatter.c:2373
+#: ../plugins/itip-formatter/itip-formatter.c:2344
+#: ../plugins/itip-formatter/itip-formatter.c:2376
 msgid "Conflict Search"
 msgstr "Buscar conflito"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2356
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione os calendarios nos que buscar conflitos entre reunións"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
 #: ../widgets/misc/e-cell-date-edit.c:239
 msgid "Today"
 msgstr "Hoxe"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../plugins/itip-formatter/itip-view.c:197
 msgid "Today %H:%M"
 msgstr "Hoxe ás %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:198
+#: ../plugins/itip-formatter/itip-view.c:201
 msgid "Today %H:%M:%S"
 msgstr "Hoxe ás %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:207
+#: ../plugins/itip-formatter/itip-view.c:210
 msgid "Today %l:%M:%S %p"
 msgstr "Hoxe ás %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:220
 msgid "Tomorrow"
 msgstr "Mañá"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:222
+#: ../plugins/itip-formatter/itip-view.c:225
 msgid "Tomorrow %H:%M"
 msgstr "Mañá ás %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:226
+#: ../plugins/itip-formatter/itip-view.c:229
 msgid "Tomorrow %H:%M:%S"
 msgstr "Mañá ás %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:231
+#: ../plugins/itip-formatter/itip-view.c:234
 msgid "Tomorrow %l:%M %p"
 msgstr "Mañá ás %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:235
+#: ../plugins/itip-formatter/itip-view.c:238
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Mañá ás %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:257
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:259
+#: ../plugins/itip-formatter/itip-view.c:262
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:263
+#: ../plugins/itip-formatter/itip-view.c:266
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:268
+#: ../plugins/itip-formatter/itip-view.c:271
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:272
+#: ../plugins/itip-formatter/itip-view.c:275
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:281
+#: ../plugins/itip-formatter/itip-view.c:284
 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.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:290
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e de %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:291
+#: ../plugins/itip-formatter/itip-view.c:294
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e de %B %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../plugins/itip-formatter/itip-view.c:299
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e de %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:300
+#: ../plugins/itip-formatter/itip-view.c:303
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e de %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:309
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e de %B de %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:311
+#: ../plugins/itip-formatter/itip-view.c:314
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e de %B de %Y ás %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:315
+#: ../plugins/itip-formatter/itip-view.c:318
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e de %B de %Y, %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:320
+#: ../plugins/itip-formatter/itip-view.c:323
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e de %B de %Y, %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:324
+#: ../plugins/itip-formatter/itip-view.c:327
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e de %B de %Y, %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:349
-#: ../plugins/itip-formatter/itip-view.c:437
-#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:352
+#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:528
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:354
+#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:530
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:359
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> publicou a seguinte información de reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:361
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> publicou a seguinte información de reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> delegoulle a reunión seguinte:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> require a súa presenza na seguinte reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:371
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> require a súa presenza na seguinte reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:377
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> quere apuntarse a unha reunión existente a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> quere apuntarse a unha reunión existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:383
 #, fuzzy, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
 msgstr "<b>%s</b> quere recibir a última información da seguinte reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> quere recibir a última información da seguinte reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:389
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> devolveu a seguinte resposta á reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:391
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> devolveu a seguinte resposta á reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:395
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> a través de %s cancelou a seguinte reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:397
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> cancelou a reunión seguinte."
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:401
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> propuxo as seguintes modificacións para a reunión."
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:403
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> propuxo as seguintes modificacións para a reunión."
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:407
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr ""
-"<b>%s</b> rexeitou as seguintes modificacións para a reunión a través de %s:"
+msgstr "<b>%s</b> rexeitou as seguintes modificacións para a reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:409
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> rexeitou as seguintes modificacións para a reunión."
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> publicou a seguinte tarefa a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:449
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> publicou a tarefa seguinte:"
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> require a asignación de %s para a seguinte tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> a través de %s asignoulle unha tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:459
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> asignoulle unha tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:465
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> a través de %s quere engadirse a unha tarefa existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:467
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> quere engadirse a unha tarefa existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:471
 #, fuzzy, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following assigned task:"
-msgstr ""
-"<b>%s</b> quere recibir a última información para a seguinte tarefa asignada:"
+msgstr "<b>%s</b> quere recibir a última información para a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:473
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
-msgstr ""
-"<b>%s</b> quere recibir a última información para a seguinte tarefa asignada:"
+msgstr "<b>%s</b> quere recibir a última información para a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:477
 #, fuzzy, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
+msgid "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> devolveu a seguinte resposta á tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:479
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> devolveu a seguinte resposta á tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:483
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> a través de %s cancelou a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:485
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> cancelou a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:489
 #, fuzzy, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> propuxo as seguintes modificacións na asignación de tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:491
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> propuxo as seguintes modificacións na asignación de tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:495
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> rexeitou a seguinte tarefa asignada a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:497
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> rexeitou a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> publicou a seguinte nota a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:537
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> publicou a seguinte nota:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> quere sumarse a unha reunión existente a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> quere sumarse a unha nota existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:545
+#: ../plugins/itip-formatter/itip-view.c:548
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> a través de %s cancelou a seguinte nota compartida:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:550
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> cancelou a seguinte nota compartida:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:818
+#: ../plugins/itip-formatter/itip-view.c:821
 msgid "_Open Calendar"
 msgstr "_Abrir calendario"
 
-#: ../plugins/itip-formatter/itip-view.c:824
-#: ../plugins/itip-formatter/itip-view.c:828
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:851
-#: ../plugins/itip-formatter/itip-view.c:856
+#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Decline"
 msgstr "_Rexeitar"
 
-#: ../plugins/itip-formatter/itip-view.c:825
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:856
+#: ../plugins/itip-formatter/itip-view.c:861
 msgid "_Accept"
 msgstr "_Aceptar"
 
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Decline all"
 msgstr "_Rexeitar todo"
 
-#: ../plugins/itip-formatter/itip-view.c:829
+#: ../plugins/itip-formatter/itip-view.c:832
 msgid "_Tentative all"
 msgstr "_Provisional todo"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:852
-#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "_Tentative"
 msgstr "_Provisional"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:833
 msgid "_Accept all"
 msgstr "_Aceptar todo"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:844
 msgid "_Send Information"
 msgstr "_Enviar información"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:845
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update Attendee Status"
 msgstr "_Actualizar o estado do participante"
 
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:851
 msgid "_Update"
 msgstr "_Actualizar"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1009
+#: ../plugins/itip-formatter/itip-view.c:1012
 msgid "Start time:"
 msgstr "Hora de comezo:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1018
+#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "End time:"
 msgstr "Hora de finalización:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1034
-#: ../plugins/itip-formatter/itip-view.c:1084
+#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: ../plugins/itip-formatter/itip-view.c:1070
+#: ../plugins/itip-formatter/itip-view.c:1073
 #, fuzzy
 msgid "Send _reply to sender"
 msgstr "_Responder ao remitente"
 
-#: ../plugins/itip-formatter/itip-view.c:1098
+#: ../plugins/itip-formatter/itip-view.c:1101
 #, fuzzy
 msgid "Send _updates to attendees"
 msgstr "Mandar _actualizacións aos participantes"
 
-#: ../plugins/itip-formatter/itip-view.c:1107
+#: ../plugins/itip-formatter/itip-view.c:1110
 #, fuzzy
 msgid "_Apply to all instances"
 msgstr "_Aplicar a todas as instancias"
 
-#: ../plugins/itip-formatter/itip-view.c:1842
+#: ../plugins/itip-formatter/itip-view.c:1119
+#, fuzzy
+msgid "Show time as _free"
+msgstr "Mostrar hora como _ocupada"
+
+#: ../plugins/itip-formatter/itip-view.c:1852
 msgid "_Tasks :"
 msgstr "_Tarefas :"
 
-#: ../plugins/itip-formatter/itip-view.c:1844
+#: ../plugins/itip-formatter/itip-view.c:1854
 msgid "Memos :"
 msgstr "Notas :"
 
@@ -17751,16 +17877,14 @@ msgstr "Formatador iTip"
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
 "&quot;{1}&quot;?"
-msgstr ""
-"&quot;{0}&quot; delegou a reunión. Quere engadir o delegado &quot;{1}&quot; ?"
+msgstr "&quot;{0}&quot; delegou a reunión. Quere engadir o delegado &quot;{1}&quot; ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
 msgstr "Esta reunión delegouse"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
 "Esta resposta non é dun participante actual. Quere engadir o remitente como "
 "un participante?"
@@ -17778,45 +17902,161 @@ msgid "Disable Account"
 msgstr "Desactivar a conta"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
-msgid "Enable libnotify notifications of new mail"
-msgstr "Activar as notificacións de novo correo de libnotify"
+#, fuzzy
+msgid "Beep or play sound file."
+msgstr "Seleccionar un ficheiro de son"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Every time a new mail arrives, pop up a libnotify notification."
-msgstr "Sempre que chegue un novo correo, emerxer unha notificación libnotify."
+msgid "Blink icon in notification area."
+msgstr ""
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
-msgid "Make the status icon blink"
-msgstr "Facer pestanexar a icona de estado"
+msgid "Enable D-Bus messages."
+msgstr ""
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-msgid "When the new-mail status icon is visible, make it blink."
-msgstr "Facer pestanexar a icona de estado de novo correo cando estea visible."
+#, fuzzy
+msgid "Enable icon in notification area."
+msgstr "Activar as notificacións de novo correo de libnotify"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#, fuzzy
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr "Xera unha mensaxe D-BUS ao chegar correo novo."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#, fuzzy
+msgid "If true, then Beep, otherwise will play sound file when new messages arrive."
+msgstr "Reproducir un ficheiro de son ao  _chegar correo novo"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+#, fuzzy
+msgid "Notify messages in Inbox only."
+msgstr "Movendo mensaxes ao cartafol %s"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "Reproducir un ficheiro de son ao  _chegar correo novo"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Popup message together with the icon."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#, fuzzy
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr "_Non notificarme cando chegue correo novo"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+msgid "Sound file name to be played."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#, fuzzy
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr "Ficheiro de son para reproducir cando chegue un correo novo."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#, fuzzy
+msgid "Whether play sound or beep when new messages arrive."
+msgstr "Reproducir un ficheiro de son ao  _chegar correo novo"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#, fuzzy
+msgid "Whether show message over the icon when new messages arrive."
+msgstr "Xera unha mensaxe D-BUS ao chegar correo novo."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#, fuzzy
+msgid "Whether the icon should blink or not."
+msgstr "Se a barra lateral debería ser visible."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:254
+#, fuzzy
+msgid "Generate a _D-Bus message"
+msgstr "Xerando a lista de mensaxes"
+
+#: ../plugins/mail-notification/mail-notification.c:362
+#, fuzzy, c-format
+msgid ""
+"You have received %d new messages\n"
+"in %s."
+msgstr "Recibiu %d mensaxes novas en %s."
 
-#: ../plugins/mail-notification/mail-notification.c:132
+#: ../plugins/mail-notification/mail-notification.c:365
 #, fuzzy, c-format
-msgid "You have received %d new message in %s."
-msgid_plural "You have received %d new messages in %s."
-msgstr[0] "Recibiu %d mensaxe nova en %s."
-msgstr[1] "Recibiu %d mensaxe nova en %s."
+msgid "You have received %d new messages."
+msgstr "Recibiu %d mensaxe nova en %s."
 
-#: ../plugins/mail-notification/mail-notification.c:153
+#: ../plugins/mail-notification/mail-notification.c:376
+#: ../plugins/mail-notification/mail-notification.c:381
 msgid "New email"
 msgstr "Novo correo"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
-msgid "Mail Notification"
-msgstr "Notificación de correo"
+#: ../plugins/mail-notification/mail-notification.c:436
+#, fuzzy
+msgid "Show icon in _notification area"
+msgstr "Mostrar o visualizador da alarma nunha bandexa de notificación"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+#: ../plugins/mail-notification/mail-notification.c:439
+#, fuzzy
+msgid "B_link icon in notification area"
+msgstr "_Personalizar a mensaxe de notificación"
+
+#: ../plugins/mail-notification/mail-notification.c:441
+msgid "Popup _message together with the icon"
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:622
+#, fuzzy
+msgid "_Play sound when new messages arrive"
+msgstr "Reproducir un ficheiro de son ao  _chegar correo novo"
+
+#: ../plugins/mail-notification/mail-notification.c:628
+#, fuzzy
+msgid "_Beep"
+msgstr "Ton de aviso"
+
+#: ../plugins/mail-notification/mail-notification.c:629
+#, fuzzy
+msgid "Play _sound file"
+msgstr "Seleccionar un ficheiro de son"
+
+#: ../plugins/mail-notification/mail-notification.c:640
+msgid "Specify _filename:"
+msgstr "Especificar o nome de _ficheiro:"
+
+#: ../plugins/mail-notification/mail-notification.c:641
+msgid "Select sound file"
+msgstr "Seleccionar un ficheiro de son"
+
+#: ../plugins/mail-notification/mail-notification.c:642
+#, fuzzy
+msgid "Pl_ay"
+msgstr "Palau"
+
+#: ../plugins/mail-notification/mail-notification.c:781
+msgid "Notify new messages for _Inbox only"
+msgstr ""
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 #, fuzzy
 msgid ""
-"Notifies the user with an icon in notification area and a notification "
-"message whenever a new message has arrived."
+"Generates a D-Bus message or notifies the user with an icon in notification "
+"area and a notification message whenever a new message has arrived."
 msgstr ""
 "Avisa ao usuario coa icona da bandexa e unha mensaxe de notificación cando "
 "chega unha nova mensaxe."
 
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Mail Notification"
+msgstr "Notificación de correo"
+
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
 msgid ""
 "A plugin which allows the creation of meetings from the contents of a mail "
@@ -17833,6 +18073,17 @@ msgstr "Con_verter en reunión"
 msgid "Mail to meeting"
 msgstr "Correo para a reunión"
 
+#: ../plugins/mail-to-task/mail-to-task.c:270
+#, fuzzy, c-format
+msgid "Cannot open calendar. %s"
+msgstr "Non se puido abrir o ficheiro"
+
+#: ../plugins/mail-to-task/mail-to-task.c:275
+msgid ""
+"Selected source is read only, thus cannot create task there. Select other "
+"source, please."
+msgstr ""
+
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 msgid ""
 "A plugin which allows the creation of tasks from the contents of a mail "
@@ -17876,8 +18127,7 @@ msgid "Mailing _List"
 msgstr "_Lista de correo"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+msgid "Provide actions for common mailing list commands (subscribe, unsubscribe...)."
 msgstr ""
 "Proporciona accións para comandos comúns de listas de correo (subscribirse, "
 "eliminar subscrición etc.)."
@@ -17981,8 +18231,7 @@ msgstr "_Propietario da lista de contactos"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
-msgstr ""
-"Contactar co propietario da lista de correo á que pertence esta mensaxe"
+msgstr "Contactar co propietario da lista de correo á que pertence esta mensaxe"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
 msgid "Get List _Archive"
@@ -18045,11 +18294,13 @@ msgid "Marks the selected calendar for offline viewing."
 msgstr "Marca o calendario seleccionado para visualizalo sen conexión."
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make this available offline"
+#, fuzzy
+msgid "_Do not make available for offline use"
 msgstr "_Non facer isto dispoñible sen conexión"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Mark Calendar for offline use"
+#, fuzzy
+msgid "_Make available for offline use"
 msgstr "_Marcar o calendario para o uso sen conexión"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
@@ -18060,22 +18311,13 @@ msgstr "Plugin que implementa plugins en mono."
 msgid "Mono Loader"
 msgstr "Cargador de mono"
 
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
-#, fuzzy
-msgid "Generates a D-BUS message when new mail messages arrive."
-msgstr "Xera unha mensaxe D-BUS ao chegar correo novo."
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
-msgid "New Mail Notification"
-msgstr "Notificación de correo novo"
-
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
 msgstr "Plugin para xestionar que plugins están activados ou desactivados."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:231
+#: ../plugins/plugin-manager/plugin-manager.c:225
 msgid "Plugin Manager"
 msgstr "Xestor de plugin"
 
@@ -18087,26 +18329,35 @@ msgstr "Activar e desactivar plugins"
 msgid "_Plugins"
 msgstr "_Plugins"
 
-#: ../plugins/plugin-manager/plugin-manager.c:55
+#: ../plugins/plugin-manager/plugin-manager.c:57
 msgid "Author(s)"
 msgstr "Autor(es)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../widgets/table/e-table-config.glade.h:5
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "Descrición"
 
-#: ../plugins/plugin-manager/plugin-manager.c:234
-#, fuzzy
-msgid "Con_figure"
-msgstr "Continuar"
-
-#: ../plugins/plugin-manager/plugin-manager.c:245
+#: ../plugins/plugin-manager/plugin-manager.c:238
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Nota: algunhas modificacións non serán efectivas até que reinicie"
 
-#: ../plugins/plugin-manager/plugin-manager.c:298
-#: ../plugins/plugin-manager/plugin-manager.c:356
+#: ../plugins/plugin-manager/plugin-manager.c:260
+#, fuzzy
+msgid "Overview"
+msgstr "Revisar"
+
+#: ../plugins/plugin-manager/plugin-manager.c:261
+#, fuzzy
+msgid "Configuration"
+msgstr "Configuración do correo"
+
+#: ../plugins/plugin-manager/plugin-manager.c:277
+msgid "There is no configuration option for this plugin."
+msgstr ""
+
+#: ../plugins/plugin-manager/plugin-manager.c:330
+#: ../plugins/plugin-manager/plugin-manager.c:392
 msgid "Plugin"
 msgstr "Plugin"
 
@@ -18220,6 +18471,10 @@ msgstr ""
 "Semanalmente\n"
 "Manual (por medio do menú Accións)"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "A_ctivar"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:10
 msgid "P_ort:"
 msgstr "P_orto:"
@@ -18313,8 +18568,7 @@ msgstr "SpamAssassin (integrado)"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
-msgstr ""
-"Plugin para gardar todos os anexos ou partes dunha mensaxe ao mesmo tempo."
+msgstr "Plugin para gardar todos os anexos ou partes dunha mensaxe ao mesmo tempo."
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
@@ -18399,27 +18653,27 @@ msgstr "Lista de participantes"
 msgid "Modified"
 msgstr "Modificado"
 
-#: ../plugins/save-calendar/csv-format.c:548
+#: ../plugins/save-calendar/csv-format.c:545
 msgid "Advanced options for the CSV format"
 msgstr "Opcións avanzadas para o formato CSV"
 
-#: ../plugins/save-calendar/csv-format.c:555
+#: ../plugins/save-calendar/csv-format.c:552
 msgid "Prepend a header"
 msgstr "Antepor unha cabeceira"
 
-#: ../plugins/save-calendar/csv-format.c:564
+#: ../plugins/save-calendar/csv-format.c:561
 msgid "Value delimiter:"
 msgstr "Delimitador de valor:"
 
-#: ../plugins/save-calendar/csv-format.c:570
+#: ../plugins/save-calendar/csv-format.c:567
 msgid "Record delimiter:"
 msgstr "Delimitador de rexistro:"
 
-#: ../plugins/save-calendar/csv-format.c:576
+#: ../plugins/save-calendar/csv-format.c:573
 msgid "Encapsulate values with:"
 msgstr "Encapsular valores con:"
 
-#: ../plugins/save-calendar/csv-format.c:598
+#: ../plugins/save-calendar/csv-format.c:595
 msgid "Comma separated value format (.csv)"
 msgstr "Formato de valores separados por comas (.csv)"
 
@@ -18444,11 +18698,11 @@ msgstr "Gardar no _disco"
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:393
+#: ../plugins/save-calendar/rdf-format.c:390
 msgid "RDF format (.rdf)"
 msgstr "Formato RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:163
+#: ../plugins/save-calendar/save-calendar.c:164
 msgid "Select destination file"
 msgstr "Seleccione ficheiro de destino"
 
@@ -18465,6 +18719,11 @@ msgid "Show _only this Calendar"
 msgstr "_Mostrar só este calendario"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
+#, fuzzy
+msgid "Show _only this Memo List"
+msgstr "Mostrar _só esta lista de tarefas"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
 msgid "Show _only this Task List"
 msgstr "Mostrar _só esta lista de tarefas"
 
@@ -18567,7 +18826,8 @@ msgid "Evolution Test component"
 msgstr "Compoñente de proba do Evolution"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings"
+#, fuzzy
+msgid "A string description of the current printer settings."
 msgstr "Unha cadea de descrición da configuración actual de impresora"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
@@ -18575,53 +18835,61 @@ msgid "Configuration version"
 msgstr "Versión de configuración"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:3
+msgid "Decides whether the crash recovery should be run or not."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
 msgstr "Largura predeterminada da barra lateral"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "Altura predeterminada da ventá"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "Estado predeterminado da ventá"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "Largura predeterminada da ventá"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID ou alias do compoñente que se mostrará por defecto ao iniciar."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "Last upgraded configuration version"
 msgstr "Última versión da configuración actualizada"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Lista de camiños aos cartafoles que se sincronizarán co disco para o uso sen "
 "conexión"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "Sidebar is visible"
 msgstr "A barra lateral é visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "Skip development warning dialog"
 msgstr "Saltar o diálogo de aviso de desenvolvemento"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12 ../shell/main.c:458
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+#, fuzzy
+msgid "Skip recovery warning dialog"
+msgstr "Saltar o diálogo de aviso de desenvolvemento"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:569
 msgid "Start in offline mode"
 msgstr "Iniciar en modo sen conexión"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Statusbar is visible"
 msgstr "A barra de estado é visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -18629,19 +18897,19 @@ msgstr ""
 "A versión de configuración do Evolution, co nivel de configuración maior/"
 "menor (por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "The default height for the main window, in pixels."
 msgstr "Altura predeterminada da ventá principal, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "The default width for the main window, in pixels."
 msgstr "A largura predeterminada da ventá principal, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "The default width for the sidebar, in pixels."
 msgstr "A largura predeterminada para a barra lateral, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -18649,7 +18917,7 @@ msgstr ""
 "A última versión actualizada da configuración do Evolution, con nivel de "
 "configuración maior/menor (por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -18659,46 +18927,52 @@ msgstr ""
 "\"toolbar\". Se se selecciona \"toolbar\", o estilo dos botóns determinarase "
 "pola configuración da barra de ferramentas do Gnome."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Toolbar is visible"
 msgstr "A barra de ferramentas é visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Whether Evolution will start up in offline mode instead of online mode."
+msgstr "Se o Evolution se iniciará en modo sen conexión en vez de en modo conectado."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid "Whether crash recovery should be done or not"
 msgstr ""
-"Se o Evolution se iniciará en modo sen conexión en vez de en modo conectado."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Whether or not the window should be maximized."
 msgstr "Se a ventá debería ou non estar maximizada."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Whether the sidebar should be visible."
 msgstr "Se a barra lateral debería ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Whether the status bar should be visible."
 msgstr "Se a barra de estado debería ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Whether the toolbar should be visible."
 msgstr "Se a barra de ferramentas debería ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
-msgstr ""
-"Se se salta o diálogo de aviso nas versión de desenvolvemento do Evolution."
+#: ../shell/apps_evolution_shell.schemas.in.h:29
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
+msgstr "Se se salta o diálogo de aviso nas versión de desenvolvemento do Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:30
+#, fuzzy
+msgid "Whether the warning dialog in recovery of Evolution is skipped."
+msgstr "Se se salta o diálogo de aviso nas versión de desenvolvemento do Evolution."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Whether the window buttons should be visible."
 msgstr "Se os botóns da ventá deberían ser visibles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Window button style"
 msgstr "Estilo dos botóns de ventá"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Window buttons are visible"
 msgstr "Os botóns da ventá son visibles"
 
@@ -18792,10 +19066,16 @@ msgstr "O nome do cartafol non pode conter o carácter \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' e '..' son nomes de cartafol reservados."
 
+#. To translators: This is the window title and %s is the
+#. component name. Most translators will want to keep it as is.
+#: ../shell/e-shell-view.c:50 ../shell/e-shell-window.c:342
+#, fuzzy, c-format
+msgid "%s - Evolution"
+msgstr "Evolution"
+
 #: ../shell/e-shell-window-commands.c:77
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr ""
-"Non parece que as ferramentas Gnome Pilot estean instaladas neste sistema."
+msgstr "Non parece que as ferramentas Gnome Pilot estean instaladas neste sistema."
 
 #: ../shell/e-shell-window-commands.c:85
 #, c-format
@@ -18823,61 +19103,67 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Sitio web do Evolution"
 
-#: ../shell/e-shell-window-commands.c:885
+#: ../shell/e-shell-window-commands.c:692
+#, fuzzy
+msgid "Error opening the FAQ webpage."
+msgstr "Erro ao abrir o calendario"
+
+#: ../shell/e-shell-window-commands.c:889
 msgid "_Work Online"
 msgstr "_Traballar con conexión"
 
-#: ../shell/e-shell-window-commands.c:898 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:902 ../ui/evolution.xml.h:56
 msgid "_Work Offline"
 msgstr "_Traballar sen conexión"
 
-#: ../shell/e-shell-window-commands.c:911
+#: ../shell/e-shell-window-commands.c:915
 msgid "Work Offline"
 msgstr "Traballar sen conexión"
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:382
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr ""
 "O Evolution está conectado neste momento. Prema neste botón para traballar "
 "sen conexión."
 
-#: ../shell/e-shell-window.c:392
+#: ../shell/e-shell-window.c:389
 msgid "Evolution is in the process of going offline."
 msgstr "O Evolution está en proceso de desconexión."
 
-#: ../shell/e-shell-window.c:399
+#: ../shell/e-shell-window.c:396
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr ""
 "O Evolution está actualmente sen conexión. Prema neste botón para traballar "
 "con conexión."
 
-#: ../shell/e-shell-window.c:825
+#: ../shell/e-shell-window.c:805
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
 #: ../shell/e-shell.c:640
-msgid "Uknown system error."
+#, fuzzy
+msgid "Unknown system error."
 msgstr "Erro de sistema descoñecido."
 
-#: ../shell/e-shell.c:836 ../shell/e-shell.c:837
+#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1275 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
 msgid "OK"
 msgstr "Aceptar"
 
-#: ../shell/e-shell.c:1277
+#: ../shell/e-shell.c:1282
 msgid "Invalid arguments"
 msgstr "Os argumentos non son válidos"
 
-#: ../shell/e-shell.c:1279
+#: ../shell/e-shell.c:1284
 msgid "Cannot register on OAF"
 msgstr "Non se pode rexistrar en OAF"
 
-#: ../shell/e-shell.c:1281
+#: ../shell/e-shell.c:1286
 msgid "Configuration Database not found"
 msgstr "Non se localizou a base de datos de configuración"
 
@@ -18901,8 +19187,7 @@ msgstr "Crear un novo elemento de proba"
 
 #: ../shell/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-"Prema en \"Importar\" para comezar a importar o ficheiro ao Evolution. "
+msgstr "Prema en \"Importar\" para comezar a importar o ficheiro ao Evolution. "
 
 #: ../shell/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -18939,7 +19224,7 @@ msgstr ""
 "ficheiros externos ao Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:219
+#: ../shell/main.c:226
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18976,7 +19261,7 @@ msgstr ""
 "Esperamos que lles sexa de proveito o resultado do noso duro traballo, e\n"
 "agardamos ansiosamente as súas colaboracións.\n"
 
-#: ../shell/main.c:243
+#: ../shell/main.c:250
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18984,43 +19269,66 @@ msgstr ""
 "Grazas\n"
 "O equipo do Evolution\n"
 
-#: ../shell/main.c:250
+#: ../shell/main.c:257
 msgid "Do not tell me again"
 msgstr "Non preguntarme de novo"
 
-#: ../shell/main.c:456
+#: ../shell/main.c:307
+#, fuzzy
+msgid "Evolution Crash Recovery"
+msgstr "Restauración do Evolution"
+
+#: ../shell/main.c:309
+#, fuzzy
+msgid "Ig_nore"
+msgstr "Ignorar"
+
+#: ../shell/main.c:324
+#, no-c-format
+msgid ""
+"Evolution appears to have exited unexpectedly the last time it was\n"
+"run.  As a precautionary measure, all preview panes will be hidden.\n"
+"You can restore the preview panes from the View menu.\n"
+msgstr ""
+
+#: ../shell/main.c:335
+#, fuzzy
+msgid "_Do not show this message again"
+msgstr "Non mostrar esta mensaxe outra vez."
+
+#: ../shell/main.c:567
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar Evolution activando o compoñente especificado"
 
-#: ../shell/main.c:460
+#: ../shell/main.c:571
 msgid "Start in online mode"
 msgstr "Iniciar en modo con conexión"
 
-#: ../shell/main.c:463
+#: ../shell/main.c:574
 msgid "Forcibly shut down all Evolution components"
 msgstr "Forzar o peche de todos os compoñentes do Evolution"
 
-#: ../shell/main.c:467
+#: ../shell/main.c:578
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forza a remigración desde o Evolution 1.4"
 
-#: ../shell/main.c:470
+#: ../shell/main.c:581
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar a saída da depuración de todos os compoñentes a un ficheiro."
 
-#: ../shell/main.c:472
+#: ../shell/main.c:583
 msgid "Disable loading of any plugins."
 msgstr "Desactivar a carga de calquera plugin."
 
-#: ../shell/main.c:474
+#: ../shell/main.c:585
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr ""
 
-#: ../shell/main.c:503
+#: ../shell/main.c:615
 msgid "- The Evolution PIM and Email Client"
 msgstr "- O cliente de correo e PIM do Evolution"
 
-#: ../shell/main.c:516
+#: ../shell/main.c:628
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19447,8 +19755,7 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Ten certificados destas organizacións que o identifican:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Ten nun ficheiro os certificados que identifican a estas autoridades de "
 "certificación:"
@@ -19768,6 +20075,10 @@ msgstr "Renomear o cartafol seleccionado"
 msgid "S_ave Address Book As VCard"
 msgstr "G_ardar axenda de enderezos como VCard"
 
+#: ../ui/evolution-addressbook.xml.h:31
+msgid "Save as VCard..."
+msgstr "Gardar como VCard..."
+
 #: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
 msgstr "Gardar os contactos seleccionados como unha VCard."
@@ -19776,7 +20087,7 @@ msgstr "Gardar os contactos seleccionados como unha VCard."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Gardar os contactos do cartafol seleccionado como unha VCard."
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2715
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2723
 msgid "Select All"
 msgstr "Seleccionar todo"
 
@@ -19851,7 +20162,7 @@ msgstr "_Mover contacto a..."
 msgid "_Move Folder Contacts To"
 msgstr "_Mover cartafol de contactos a"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
 msgid "_New"
 msgstr "_Novo"
 
@@ -20065,11 +20376,12 @@ msgstr "_Pechar"
 #: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:53
 #: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:44
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:46
+#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:45
 msgid "_Help"
 msgstr "_Axuda"
 
@@ -20102,8 +20414,7 @@ msgstr "Clasificar como público"
 
 #: ../ui/evolution-event-editor.xml.h:7
 msgid "Click here to set or unset alarms for this event"
-msgstr ""
-"Prema aquí para configurar ou desconfigurar as alarmas para este evento"
+msgstr "Prema aquí para configurar ou desconfigurar as alarmas para este evento"
 
 #: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
 msgid "Insert advanced send options"
@@ -20236,95 +20547,99 @@ msgid "Create or edit rules for filtering new mail"
 msgstr "Crear ou editar regras para a filtraxe do correo novo"
 
 #: ../ui/evolution-mail-global.xml.h:7
-msgid "Download messages for Offline"
-msgstr "Descargar as mensaxes para o modo sen conexión"
-
-#: ../ui/evolution-mail-global.xml.h:8
-msgid "Download messages for offline"
-msgstr "Descargar as mensaxes para o modo sen conexión"
-
-#: ../ui/evolution-mail-global.xml.h:9
 msgid "Download messages of accounts/folders marked for offline"
 msgstr ""
 "Descargar as mensaxes para as contas ou cartafoles marcados para o modo sen "
 "conexión"
 
-#: ../ui/evolution-mail-global.xml.h:10
+#: ../ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
 msgstr "Baleirar o _lixo"
 
-#: ../ui/evolution-mail-global.xml.h:11 ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_Cartafol"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "Mover o cartafol seleccionado a outro cartafol"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
-msgstr ""
-"Eliminar permanentemente todas as mensaxes eliminadas en todos os cartafoles"
+msgstr "Eliminar permanentemente todas as mensaxes eliminadas en todos os cartafoles"
 
-#: ../ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "_Cartafoles de busca"
 
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:14
 msgid "Show Message _Preview"
 msgstr "Mostrar pre _visualización da mensaxe"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview below the message list"
 msgstr "Mostrar a previsualización da mensaxe baixo a lista de mensaxes"
 
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview side-by-side with the message list"
 msgstr "Mostrar a previsualización de mensaxes ao lado da lista de mensaxes"
 
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "Show message preview window"
 msgstr "Mostrar a ventá de previsualización da mensaxe"
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "Subscribirse ou eliminar subscrición dos cartafoles en servidores remotos"
+
+#: ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
 msgstr ""
-"Subscribirse ou eliminar subscrición dos cartafoles en servidores remotos"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
 msgstr "Visualización _clásica"
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:21
 msgid "_Copy Folder To..."
 msgstr "_Copiar cartafol a..."
 
+#: ../ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Debug Logs"
+msgstr "Rexistro _web:"
+
 #: ../ui/evolution-mail-global.xml.h:23
+#, fuzzy
+msgid "_Download Messages for Offline Usage"
+msgstr "Descargar as mensaxes para o modo sen conexión"
+
+#: ../ui/evolution-mail-global.xml.h:25
 msgid "_Message Filters"
 msgstr "Filtros de _mensaxe"
 
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution-mail-global.xml.h:26
 msgid "_Move Folder To..."
 msgstr "_Mover a cartafol a.."
 
-#: ../ui/evolution-mail-global.xml.h:25
+#: ../ui/evolution-mail-global.xml.h:27
 msgid "_New..."
 msgstr "_Novo..."
 
-#: ../ui/evolution-mail-global.xml.h:26
+#: ../ui/evolution-mail-global.xml.h:28
 msgid "_Preview"
 msgstr "_Previsualización"
 
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:30
+#: ../ui/evolution-mail-global.xml.h:32
 msgid "_Subscriptions"
 msgstr "_Subscricións"
 
-#: ../ui/evolution-mail-global.xml.h:31
+#: ../ui/evolution-mail-global.xml.h:33
 msgid "_Vertical View"
 msgstr "Visualización _vertical"
 
@@ -20378,8 +20693,7 @@ msgid "Hide _Read Messages"
 msgstr "Ocultar as mensaxes _lidas"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
+msgid "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Ocultar as mensaxes eliminadas en vez de mostralas riscadas"
 
 #: ../ui/evolution-mail-list.xml.h:16
@@ -20387,71 +20701,85 @@ msgid "Mar_k All Messages as Read"
 msgstr "Ma_rcar todas as mensaxes como lidas"
 
 #: ../ui/evolution-mail-list.xml.h:17
+#, fuzzy
+msgid "Mark all messages in the folder as read"
+msgstr "Marcar todas as mensaxes nos subcartafoles como lidas?"
+
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Paste message(s) from the clipboard"
 msgstr "Pegar a(s) mensaxe(s) desde o portapapeis"
 
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Eliminar permanentemente as mensaxes eliminadas neste cartafol"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Permanently remove this folder"
 msgstr "Eliminar permanentemente este cartafol"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh..."
 msgstr "Ac_tualizar..."
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Refresh the folder"
 msgstr "Actualizar o cartafol"
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Select Message S_ubthread"
+msgstr "Seleccionar _fío de mensaxe"
+
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Select Message _Thread"
 msgstr "Seleccionar _fío de mensaxe"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Select _All Messages"
 msgstr "Seleccionar _todas as mensaxes"
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all and only the messages that are not currently selected"
-msgstr ""
-"Seleccionar todas e unicamente as mensaxes non seleccionadas actualmente"
+msgstr "Seleccionar todas e unicamente as mensaxes non seleccionadas actualmente"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:27
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Seleccionar todas as mensaxes do mesmo fío que a mensaxe seleccionada"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:28
+#, fuzzy
+msgid "Select all replies to the currently selected message"
+msgstr "Seleccionar todas as mensaxes do mesmo fío que a mensaxe seleccionada"
+
+#: ../ui/evolution-mail-list.xml.h:29
 msgid "Select all visible messages"
 msgstr "Seleccionar todas as mensaxes visibles"
 
-#: ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-mail-list.xml.h:30
 msgid "Show Hidde_n Messages"
 msgstr "Mostrar as mensaxes o_cultas"
 
-#: ../ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:31
 msgid "Show messages that have been temporarily hidden"
 msgstr "Mostrar as mensaxes ocultas temporalmente"
 
-#: ../ui/evolution-mail-list.xml.h:29
+#: ../ui/evolution-mail-list.xml.h:32
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Ocultar temporalmente todas as mensaxes lidas"
 
-#: ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-mail-list.xml.h:33
 msgid "Temporarily hide the selected messages"
 msgstr "Ocultar temporalmente as mensaxes seleccionadas"
 
-#: ../ui/evolution-mail-list.xml.h:31
+#: ../ui/evolution-mail-list.xml.h:34
 msgid "Threaded Message list"
 msgstr "Lista de mensaxes por fíos"
 
-#: ../ui/evolution-mail-list.xml.h:33
+#: ../ui/evolution-mail-list.xml.h:36
 msgid "_Group By Threads"
 msgstr "A_grupar por fíos"
 
-#: ../ui/evolution-mail-list.xml.h:34 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "_Mensaxe"
@@ -20487,8 +20815,7 @@ msgstr "Redactar unha _nova mensaxe"
 
 #: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to all of the recipients of the selected message"
-msgstr ""
-"Redactar unha resposta para todos os destinatarios da mensaxe seleccionada"
+msgstr "Redactar unha resposta para todos os destinatarios da mensaxe seleccionada"
 
 #: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the mailing list of the selected message"
@@ -20780,7 +21107,7 @@ msgstr "Seleccionar _todo o texto"
 msgid "Select all the text in a message"
 msgstr "Seleccionar todo o texto dunha mensaxe"
 
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "Definir a configuración da páxina para a impresora actual"
 
@@ -20908,7 +21235,7 @@ msgstr "_Ampliar"
 msgid "Close this window"
 msgstr "Pechar esta ventá"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "Barra de ferramentas principal"
 
@@ -21315,151 +21642,165 @@ msgid "Display window buttons with text only"
 msgstr "Mostrar os botóns da ventá só con texto"
 
 #: ../ui/evolution.xml.h:10
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
+
+#: ../ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Saír do programa"
 
-#: ../ui/evolution.xml.h:11
+#: ../ui/evolution.xml.h:12
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Esquecer todos os contrasinais memorizados para que llos pidan de novo"
 
-#: ../ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:13
 msgid "Hide window buttons"
 msgstr "Ocultar os botóns da ventá"
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:14
 msgid "I_mport..."
 msgstr "I_mportar..."
 
-#: ../ui/evolution.xml.h:14
-msgid "Icons _and text"
+#: ../ui/evolution.xml.h:15
+#, fuzzy
+msgid "Icons _and Text"
 msgstr "Iconas _e texto"
 
-#: ../ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
 msgstr "Importar datos doutros programas"
 
-#: ../ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:17
 msgid "Lay_out"
 msgstr "_Disposición"
 
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:19
 msgid "New _Window"
 msgstr "Nova _ventá"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:20
+msgid "Open the Frequently Asked Questions webpage"
+msgstr ""
+
+#: ../ui/evolution.xml.h:21
 #, fuzzy
 msgid "Page Set_up..."
 msgstr "Configuración de páxina:"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
 msgstr "_Preferencias"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:24
 msgid "Send / _Receive"
 msgstr "Enviar / _Recibir"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:25
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar elementos da fila e obter elementos novos"
 
-#: ../ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:26
 msgid "Set up Pilot configuration"
 msgstr "Definir a configuración do Pilot"
 
-#: ../ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:28
 msgid "Show Side _Bar"
 msgstr "Mostrar _barra lateral"
 
-#: ../ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:29
 msgid "Show _Status Bar"
 msgstr "Mostrar _barra de estado"
 
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:30
 msgid "Show _Toolbar"
 msgstr "Mostrar _barra de ferramentas"
 
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:31
 msgid "Show information about Evolution"
 msgstr "Mostrar información sobre o Evolution"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "Enviar un informe de erro"
 
-#. <menuitem name="HelpFAQ" verb=""
-#. _label="Evolution _FAQ"/>
-#.
-#. <separator/>
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "_Enviar un informe de erro"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:35
 msgid "Toggle whether we are working offline."
 msgstr "Alternar entre se estamos traballando sen conexión ou non"
 
-#: ../ui/evolution.xml.h:38
-msgid "Tool_bar style"
+#: ../ui/evolution.xml.h:36
+#, fuzzy
+msgid "Tool_bar Style"
 msgstr "Estilo da _barra de ferramentas"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Side Bar"
 msgstr "Ver/Ocultar a barra lateral"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:38
 msgid "View/Hide the Status Bar"
 msgstr "Ver/Ocultar a barra de estado"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:39
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:40
 msgid "_Close Window"
 msgstr "_Pechar ventá"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:43
 msgid "_Forget Passwords"
 msgstr "Es_quecer contrasinais"
 
-#: ../ui/evolution.xml.h:47
-msgid "_Hide buttons"
+#: ../ui/evolution.xml.h:44
+msgid "_Frequently Asked Questions"
+msgstr ""
+
+#: ../ui/evolution.xml.h:46
+#, fuzzy
+msgid "_Hide Buttons"
 msgstr "_Ocultar botóns"
 
-#: ../ui/evolution.xml.h:48
-msgid "_Icons only"
+#: ../ui/evolution.xml.h:47
+#, fuzzy
+msgid "_Icons Only"
 msgstr "Só _iconas"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:49
 msgid "_Quick Reference"
 msgstr "_Referencia rápida"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:50
 msgid "_Quit"
 msgstr "_Saír"
 
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:51
 msgid "_Switcher Appearance"
 msgstr "Aparencia do _selector"
 
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:52
 msgid "_Synchronization Options..."
 msgstr "Opcións de _sincronización..."
 
-#: ../ui/evolution.xml.h:54
-msgid "_Text only"
+#: ../ui/evolution.xml.h:53
+#, fuzzy
+msgid "_Text Only"
 msgstr "Só _texto"
 
-#: ../ui/evolution.xml.h:56
+#: ../ui/evolution.xml.h:55
 msgid "_Window"
 msgstr "_Ventá"
 
@@ -21598,11 +21939,11 @@ msgstr "Definir visualizacións para \"%s\""
 msgid "Table"
 msgstr "Táboa"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:179
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
 msgid "Instance"
 msgstr "Instancia"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:229
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
 msgid "Save Current View"
 msgstr "Gardar visualización actual"
 
@@ -21674,7 +22015,7 @@ msgstr "Tipo de visualización"
 msgid "Type of view:"
 msgstr "Tipo de visualización:"
 
-#: ../widgets/misc/e-attachment-bar.c:1029
+#: ../widgets/misc/e-attachment-bar.c:1028
 msgid "Attachment Bar"
 msgstr "Barra de anexos"
 
@@ -21705,15 +22046,9 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Suxerir que se mostre o anexo automaticamente"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr "LMMXVSD"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1088
-#: ../widgets/misc/e-calendar-item.c:1742
+#: ../widgets/misc/e-calendar-item.c:1077
+#: ../widgets/misc/e-calendar-item.c:1724
 msgid "%B %Y"
 msgstr "%B de %Y"
 
@@ -21722,23 +22057,23 @@ msgid "Month Calendar"
 msgstr "Calendario mensual"
 
 #: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3635
-#: ../widgets/text/e-text.c:3636
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3643
+#: ../widgets/text/e-text.c:3644
 msgid "Fill color"
 msgstr "Encher con cor"
 
 #: ../widgets/misc/e-canvas-background.c:460
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3642
-#: ../widgets/text/e-text.c:3643 ../widgets/text/e-text.c:3650
-#: ../widgets/text/e-text.c:3651
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3650
+#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3658
+#: ../widgets/text/e-text.c:3659
 msgid "GDK fill color"
 msgstr "Encher con cor GDK"
 
 #: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3657
-#: ../widgets/text/e-text.c:3658
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3666
 msgid "Fill stipple"
 msgstr "Encher con liña punteada"
 
@@ -21765,14 +22100,14 @@ msgstr "Y2"
 #: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
 #: ../widgets/table/e-table-group-container.c:973
 #: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3014
+#: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "Largura mínima"
 
 #: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
 #: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3063
 msgid "Minimum Width"
 msgstr "Largura mínima"
 
@@ -21891,39 +22226,35 @@ msgstr "Outro..."
 msgid "Ch_aracter Encoding"
 msgstr "Codificación dos car_acteres"
 
-#: ../widgets/misc/e-dateedit.c:321
+#: ../widgets/misc/e-dateedit.c:324
 msgid "Date and Time"
 msgstr "Data e hora"
 
-#: ../widgets/misc/e-dateedit.c:340
+#: ../widgets/misc/e-dateedit.c:345
 msgid "Text entry to input date"
 msgstr "Entrada de texto para introducir a data"
 
-#: ../widgets/misc/e-dateedit.c:362
+#: ../widgets/misc/e-dateedit.c:367
 msgid "Click this button to show a calendar"
 msgstr "Prema este botón para mostrar un calendario"
 
-#: ../widgets/misc/e-dateedit.c:384
+#: ../widgets/misc/e-dateedit.c:409
 msgid "Combo box to select time"
 msgstr "Caixa de combinación para seleccionar a hora"
 
-#: ../widgets/misc/e-dateedit.c:385
-msgid "Time"
-msgstr "Hora"
-
-#: ../widgets/misc/e-dateedit.c:459
+#: ../widgets/misc/e-dateedit.c:484
 msgid "No_w"
 msgstr "A_gora"
 
-#: ../widgets/misc/e-dateedit.c:465
+#: ../widgets/misc/e-dateedit.c:490
 msgid "_Today"
 msgstr "_Hoxe"
 
-#: ../widgets/misc/e-dateedit.c:1631
+#: ../widgets/misc/e-dateedit.c:1655
 msgid "Invalid Date Value"
 msgstr "O valor da data non é válido"
 
-#: ../widgets/misc/e-dateedit.c:1657
+#: ../widgets/misc/e-dateedit.c:1684
 msgid "Invalid Time Value"
 msgstr "O valor da hora non é válido"
 
@@ -21980,53 +22311,53 @@ msgid "Spacing around expander arrow"
 msgstr "Espazamento ao redor da frecha do expansor"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:182
-#: ../widgets/misc/e-filter-bar.c:310 ../widgets/misc/e-filter-bar.c:747
+#: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
+#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:748
 msgid "Advanced Search"
 msgstr "Busca avanzada"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:233
+#: ../widgets/misc/e-filter-bar.c:234
 msgid "Save Search"
 msgstr "Gardar a busca"
 
-#: ../widgets/misc/e-filter-bar.c:270
+#: ../widgets/misc/e-filter-bar.c:271
 msgid "_Searches"
 msgstr "_Buscas"
 
-#: ../widgets/misc/e-filter-bar.c:272
+#: ../widgets/misc/e-filter-bar.c:273
 msgid "Searches"
 msgstr "Buscas"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
 msgid "_Save Search..."
 msgstr "_Gardar a busca..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
 msgid "_Edit Saved Searches..."
 msgstr "_Editar as buscas gardadas..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:114
 msgid "_Advanced Search..."
 msgstr "Busca _avanzada..."
 
-#: ../widgets/misc/e-filter-bar.h:103
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "All Accounts"
 msgstr "Todas as contas"
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Account"
 msgstr "Conta actual"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:106
 msgid "Current Folder"
 msgstr "Cartafol actual"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "Current Message"
 msgstr "Mensaxe actual"
 
-#: ../widgets/misc/e-image-chooser.c:172
+#: ../widgets/misc/e-image-chooser.c:173
 msgid "Choose Image"
 msgstr "Seleccione unha imaxe"
 
@@ -22067,54 +22398,54 @@ msgstr "Modelo de refluxo"
 msgid "Column width"
 msgstr "Largura de columna"
 
-#: ../widgets/misc/e-search-bar.c:348 ../widgets/misc/e-search-bar.c:477
-#: ../widgets/misc/e-search-bar.c:479
+#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
+#: ../widgets/misc/e-search-bar.c:480
 #, fuzzy
 msgid "Search"
 msgstr "_Buscar"
 
-#: ../widgets/misc/e-search-bar.c:348 ../widgets/misc/e-search-bar.c:477
-#: ../widgets/misc/e-search-bar.c:479
+#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
+#: ../widgets/misc/e-search-bar.c:480
 #, fuzzy
 msgid "Click here to change the search type"
 msgstr "Prema aquí para anexar un ficheiro"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:616
 msgid "_Find Now"
 msgstr "_Buscar agora"
 
-#: ../widgets/misc/e-search-bar.c:614
+#: ../widgets/misc/e-search-bar.c:617
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: ../widgets/misc/e-search-bar.c:869
+#: ../widgets/misc/e-search-bar.c:872
 msgid "Item ID"
 msgstr "ID de elemento"
 
-#: ../widgets/misc/e-search-bar.c:876 ../widgets/text/e-text.c:3557
-#: ../widgets/text/e-text.c:3558
+#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3566
 msgid "Text"
 msgstr "Texto"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1010
+#: ../widgets/misc/e-search-bar.c:1013
 msgid "Sho_w: "
 msgstr "Mos_trar: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1027
+#: ../widgets/misc/e-search-bar.c:1030
 msgid "Sear_ch: "
 msgstr "Busca_r: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1039
+#: ../widgets/misc/e-search-bar.c:1042
 msgid " i_n "
 msgstr " e_n "
 
@@ -22273,14 +22604,14 @@ msgid "_When opened:"
 msgstr "_Ao abrir:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:213
+#: ../widgets/misc/e-task-widget.c:297
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:219
+#: ../widgets/misc/e-task-widget.c:303
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% terminada)"
@@ -22313,35 +22644,35 @@ msgstr "lista emerxente"
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
 
-#: ../widgets/table/e-cell-pixbuf.c:383
+#: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "Columna seleccionada"
 
-#: ../widgets/table/e-cell-pixbuf.c:390
+#: ../widgets/table/e-cell-pixbuf.c:367
 msgid "Focused Column"
 msgstr "Columna enfocada"
 
-#: ../widgets/table/e-cell-pixbuf.c:397
+#: ../widgets/table/e-cell-pixbuf.c:374
 msgid "Unselected Column"
 msgstr "Columna non seleccionada"
 
-#: ../widgets/table/e-cell-text.c:1803
+#: ../widgets/table/e-cell-text.c:1807
 msgid "Strikeout Column"
 msgstr "Riscar columna"
 
-#: ../widgets/table/e-cell-text.c:1810
+#: ../widgets/table/e-cell-text.c:1814
 msgid "Underline Column"
 msgstr "Subliñar columna"
 
-#: ../widgets/table/e-cell-text.c:1817
+#: ../widgets/table/e-cell-text.c:1821
 msgid "Bold Column"
 msgstr "Columna en negra"
 
-#: ../widgets/table/e-cell-text.c:1824
+#: ../widgets/table/e-cell-text.c:1828
 msgid "Color Column"
 msgstr "Cor da columna"
 
-#: ../widgets/table/e-cell-text.c:1838
+#: ../widgets/table/e-cell-text.c:1842
 msgid "BG Color Column"
 msgstr "Cor de fondo da columna"
 
@@ -22366,7 +22697,7 @@ msgid "No grouping"
 msgstr "Sen agrupar"
 
 #: ../widgets/table/e-table-config.c:643
-#: ../widgets/table/e-table-config.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
 msgstr "Mostrar os campos"
 
@@ -22388,51 +22719,72 @@ msgid "Clear All"
 msgstr "Limpar todo"
 
 #: ../widgets/table/e-table-config.glade.h:4
+#, fuzzy
+msgid "Clear _All"
+msgstr "Limpar todo"
+
+#: ../widgets/table/e-table-config.glade.h:5
 #: ../widgets/table/e-table-header-item.c:1582
 msgid "Descending"
 msgstr "Descendente"
 
-#: ../widgets/table/e-table-config.glade.h:7
+#: ../widgets/table/e-table-config.glade.h:8
 msgid "Group Items By"
 msgstr "Agrupar os elementos por"
 
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Down"
 msgstr "Mover _abaixo"
 
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.glade.h:10
 msgid "Move _Up"
 msgstr "Mover _arriba"
 
-#: ../widgets/table/e-table-config.glade.h:11
-msgid "Show field in View"
+#: ../widgets/table/e-table-config.glade.h:12
+#, fuzzy
+msgid "Show _field in View"
 msgstr "Mostrar o campo na visualización"
 
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.glade.h:13
+#, fuzzy
+msgid "Show field i_n View"
+msgstr "Mostrar o campo na visualización"
+
+#: ../widgets/table/e-table-config.glade.h:14
+#, fuzzy
+msgid "Show field in _View"
+msgstr "Mostrar o campo na visualización"
+
+#: ../widgets/table/e-table-config.glade.h:15
 msgid "Sort"
 msgstr "Ordenar"
 
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:16
 msgid "Sort Items By"
 msgstr "Ordenar os elementos por"
 
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:17
 msgid "Then By"
 msgstr "Despois por"
 
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.glade.h:19
 msgid "_Fields Shown..."
 msgstr "_Campos mostrados..."
 
-#: ../widgets/table/e-table-config.glade.h:17
+#: ../widgets/table/e-table-config.glade.h:20
 msgid "_Group By..."
 msgstr "_Agrupar por..."
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.glade.h:22
+#, fuzzy
+msgid "_Show field in View"
+msgstr "Mostrar o campo na visualización"
+
+#: ../widgets/table/e-table-config.glade.h:23
 msgid "_Show these fields in order:"
 msgstr "_Mostrar estes campos por orde:"
 
-#: ../widgets/table/e-table-config.glade.h:20
+#: ../widgets/table/e-table-config.glade.h:24
 msgid "_Sort..."
 msgstr "_Ordenar..."
 
@@ -22484,7 +22836,7 @@ msgstr[1] "%s (%d elementos)"
 #: ../widgets/table/e-table-group-container.c:897
 #: ../widgets/table/e-table-group-leaf.c:572
 #: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:2972 ../widgets/table/e-table-item.c:2973
+#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
 msgid "Alternating Row Colors"
 msgstr "Alternar as cores das filas"
 
@@ -22492,7 +22844,7 @@ msgstr "Alternar as cores das filas"
 #: ../widgets/table/e-table-group-container.c:904
 #: ../widgets/table/e-table-group-leaf.c:579
 #: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:2979 ../widgets/table/e-table-item.c:2980
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
 #: ../widgets/table/e-tree.c:3307 ../widgets/table/e-tree.c:3308
 msgid "Horizontal Draw Grid"
 msgstr "Debuxar a grade horizontal"
@@ -22501,7 +22853,7 @@ msgstr "Debuxar a grade horizontal"
 #: ../widgets/table/e-table-group-container.c:911
 #: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2986 ../widgets/table/e-table-item.c:2987
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
 #: ../widgets/table/e-tree.c:3313 ../widgets/table/e-tree.c:3314
 msgid "Vertical Draw Grid"
 msgstr "Debuxar a grade vertical"
@@ -22510,7 +22862,7 @@ msgstr "Debuxar a grade vertical"
 #: ../widgets/table/e-table-group-container.c:918
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2993 ../widgets/table/e-table-item.c:2994
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
 #: ../widgets/table/e-tree.c:3319 ../widgets/table/e-tree.c:3320
 msgid "Draw focus"
 msgstr "Debuxar o foco"
@@ -22519,7 +22871,7 @@ msgstr "Debuxar o foco"
 #: ../widgets/table/e-table-group-container.c:925
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3000 ../widgets/table/e-table-item.c:3001
+#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
 msgid "Cursor mode"
 msgstr "Modo do cursor"
 
@@ -22527,7 +22879,7 @@ msgstr "Modo do cursor"
 #: ../widgets/table/e-table-group-container.c:932
 #: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2965 ../widgets/table/e-table-item.c:2966
+#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
 msgid "Selection model"
 msgstr "Modelo de selección"
 
@@ -22535,7 +22887,7 @@ msgstr "Modelo de selección"
 #: ../widgets/table/e-table-group-container.c:939
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
 #: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3301
 #: ../widgets/table/e-tree.c:3302
 msgid "Length Threshold"
@@ -22545,7 +22897,7 @@ msgstr "Límite de lonxitude"
 #: ../widgets/table/e-table-group-container.c:946
 #: ../widgets/table/e-table-group-leaf.c:649
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
 #: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3333
 #: ../widgets/table/e-tree.c:3334
 msgid "Uniform row height"
@@ -22607,9 +22959,16 @@ msgid "Custo_mize Current View..."
 msgstr "Perso_nalizar a visualización actual..."
 
 #: ../widgets/table/e-table-header-item.c:1542
-msgid "Sort By"
+#, fuzzy
+msgid "_Sort By"
 msgstr "Ordenar por"
 
+#. Custom
+#: ../widgets/table/e-table-header-item.c:1560
+#, fuzzy
+msgid "_Custom"
+msgstr "Personalizado"
+
 #: ../widgets/table/e-table-header-item.c:1893
 msgid "Font Description"
 msgstr "Descrición do tipo de letra"
@@ -22625,15 +22984,15 @@ msgstr "Ordenar a información"
 msgid "Tree"
 msgstr "Árbore"
 
-#: ../widgets/table/e-table-item.c:2951 ../widgets/table/e-table-item.c:2952
+#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
 msgid "Table header"
 msgstr "Cabeceira da táboa"
 
-#: ../widgets/table/e-table-item.c:2958 ../widgets/table/e-table-item.c:2959
+#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
 msgid "Table model"
 msgstr "Modelo da táboa"
 
-#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
 msgid "Cursor row"
 msgstr "Fila do cursor"
 
@@ -22658,274 +23017,107 @@ msgstr "Aparencia retro"
 msgid "Draw lines and +/- expanders."
 msgstr "Debuxar liñas e expansores +/-."
 
-#: ../widgets/text/e-text.c:2727
+#: ../widgets/text/e-text.c:2735
 msgid "Input Methods"
 msgstr "Métodos de entrada"
 
-#: ../widgets/text/e-text.c:3550 ../widgets/text/e-text.c:3551
+#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
 msgid "Event Processor"
 msgstr "Procesador de eventos"
 
-#: ../widgets/text/e-text.c:3564 ../widgets/text/e-text.c:3565
+#: ../widgets/text/e-text.c:3572 ../widgets/text/e-text.c:3573
 msgid "Bold"
 msgstr "Negra"
 
-#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+#: ../widgets/text/e-text.c:3579 ../widgets/text/e-text.c:3580
 msgid "Strikeout"
 msgstr "Riscar"
 
-#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
 msgid "Anchor"
 msgstr "Áncora"
 
-#: ../widgets/text/e-text.c:3586 ../widgets/text/e-text.c:3587
+#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
 msgid "Justification"
 msgstr "Aliñamento"
 
-#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
+#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
 msgid "Clip Width"
 msgstr "Largura do clip"
 
-#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+#: ../widgets/text/e-text.c:3608 ../widgets/text/e-text.c:3609
 msgid "Clip Height"
 msgstr "Altura do clip"
 
-#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+#: ../widgets/text/e-text.c:3615 ../widgets/text/e-text.c:3616
 msgid "Clip"
 msgstr "Clip"
 
-#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+#: ../widgets/text/e-text.c:3622 ../widgets/text/e-text.c:3623
 msgid "Fill clip rectangle"
 msgstr "Encher o rectángulo do clip"
 
-#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+#: ../widgets/text/e-text.c:3629 ../widgets/text/e-text.c:3630
 msgid "X Offset"
 msgstr "Desprazamento X"
 
-#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+#: ../widgets/text/e-text.c:3636 ../widgets/text/e-text.c:3637
 msgid "Y Offset"
 msgstr "Desprazamento Y"
 
-#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
+#: ../widgets/text/e-text.c:3672 ../widgets/text/e-text.c:3673
 msgid "Text width"
 msgstr "Largura do texto"
 
-#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+#: ../widgets/text/e-text.c:3679 ../widgets/text/e-text.c:3680
 msgid "Text height"
 msgstr "Altura do texto"
 
-#: ../widgets/text/e-text.c:3686 ../widgets/text/e-text.c:3687
+#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
 msgid "Use ellipsis"
 msgstr "Usar a elipse"
 
-#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
+#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
 msgid "Ellipsis"
 msgstr "Elipse"
 
-#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
+#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
 msgid "Line wrap"
 msgstr "Axuste de liña"
 
-#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
+#: ../widgets/text/e-text.c:3715 ../widgets/text/e-text.c:3716
 msgid "Break characters"
 msgstr "Caracteres de quebra"
 
-#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
+#: ../widgets/text/e-text.c:3722 ../widgets/text/e-text.c:3723
 msgid "Max lines"
 msgstr "Máximo de liñas"
 
-#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw borders"
 msgstr "Debuxar os bordos"
 
-#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Allow newlines"
 msgstr "Permitir liñas novas"
 
-#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Draw background"
 msgstr "Debuxar o fondo"
 
-#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
+#: ../widgets/text/e-text.c:3765 ../widgets/text/e-text.c:3766
 msgid "Draw button"
 msgstr "Debuxar o botón"
 
-#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
+#: ../widgets/text/e-text.c:3772 ../widgets/text/e-text.c:3773
 msgid "Cursor position"
 msgstr "Posición do cursor"
 
-#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
+#: ../widgets/text/e-text.c:3779 ../widgets/text/e-text.c:3780
 msgid "IM Context"
 msgstr "Contexto MI"
 
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
 msgid "Handle Popup"
 msgstr "Tirador emerxente"
 
-#~ msgid "A Folder with this name already exists"
-#~ msgstr "Xa existe un cartafol con este nome"
-
-#~ msgid "_Address: "
-#~ msgstr "_Enderezo: "
-
-#~ msgid ""
-#~ "The changed email or name of this contact already\n"
-#~ "exists in this folder.  Would you like to add it anyway?"
-#~ msgstr ""
-#~ "O enderezo ou nome modificado deste contacto xa existe neste\n"
-#~ "cartafol. Quere engadilo de todas as formas?"
-
-#~ msgid ""
-#~ "All information in these journal entries will be deleted and can not be "
-#~ "restored."
-#~ msgstr ""
-#~ "Vaise eliminar toda a información destas entradas do diario e non se "
-#~ "poderá restaurar."
-
-#~ msgid ""
-#~ "All information on this journal entry will be deleted and can not be "
-#~ "restored."
-#~ msgstr ""
-#~ "Vaise eliminar toda a información desta entrada do diario e non se poderá "
-#~ "restaurar."
-
-#~ msgid "Are you sure you want to delete the journal entry '{0}'?"
-#~ msgstr "Está seguro de que quere eliminar a entrada de diario '{0}'?"
-
-#~ msgid "Are you sure you want to delete these {0} journal entries?"
-#~ msgstr "Está seguro de que quere eliminar estas {0} entradas do diario?"
-
-#~ msgid "Are you sure you want to delete this journal entry?"
-#~ msgstr "Está seguro de que quere eliminar esta entrada do diario?"
-
-#~ msgid ""
-#~ "If you do not send a cancelation notice, the other participants may not "
-#~ "know the journal has been deleted."
-#~ msgstr ""
-#~ "Se non envía unha notificación de cancelación, os outros participantes "
-#~ "quizais non saiban que se eliminou o diario."
-
-#~ msgid "This journal entry has been deleted."
-#~ msgstr "Eliminouse esta entrada de diario."
-
-#~ msgid "This journal entry has been changed."
-#~ msgstr "Modificouse esta entrada de diario."
-
-#~ msgid "Journal entry - %s"
-#~ msgstr "Entrada de diario - %s"
-
-#~ msgid "The journal entry could not be deleted due to a corba error"
-#~ msgstr "A entrada do diario non se puido eliminar debido a un erro de Corba"
-
-#~ msgid "The journal entry could not be deleted because permission was denied"
-#~ msgstr ""
-#~ "A entrada do diario non se puido eliminar porque se denegou o permiso"
-
-#~ msgid "The journal entry could not be deleted due to an error"
-#~ msgstr "A entrada do diario non se puido eliminar debido a un erro"
-
-#~ msgid ""
-#~ "You are modifying a recurring journal entry. What would you like to "
-#~ "modify?"
-#~ msgstr ""
-#~ "Está modificando unha entrada do diario recorrente. Que quere modificar?"
-
-#~ msgid "Task sort"
-#~ msgstr "Clasificación das tarefas"
-
-#~ msgid "Memo sort"
-#~ msgstr "Ordenar nota"
-
-#~ msgid "Journal information"
-#~ msgstr "Información do diario"
-
-#~ msgid "The Evolution PIM and Email Client"
-#~ msgstr "O cliente de correo e PIM do Evolution"
-
-#~ msgid "Enable"
-#~ msgstr "Activado"
-
-#~ msgid "<b>Then</b>"
-#~ msgstr "<b>Despois</b>"
-
-#~ msgid "Valid signature, cannot verify sender"
-#~ msgstr "Sinatura válida, non se pode verificar o remitente"
-
-#~ msgid "Automatic smiley recognition"
-#~ msgstr "Recoñecemento automático das emoticonas"
-
-#~ msgid "HTML Mail"
-#~ msgstr "Correo HTML"
-
-#~ msgid "Mark as _Read"
-#~ msgstr "Marcar como _lida"
-
-#~ msgid "_Do not Mark as Read"
-#~ msgstr "Non marcar como _lida"
-
-#~ msgid "Check Evolution archive"
-#~ msgstr "Verificar o arquivo do Evolution"
-
-#~ msgid "With GUI"
-#~ msgstr "Con interface gráfica de usuario"
-
-#~ msgid "<b>Junk Mail Settings</b>"
-#~ msgstr "<b>Configuración do correo non desexado</b>"
-
-#~ msgid "<b>Subject</b> :"
-#~ msgstr "<b>Asunto</b>:"
-
-#~ msgid "<b>From</b> :"
-#~ msgstr "<b>De</b>:"
-
-#~ msgid "Unable to find this journal entry in any journal"
-#~ msgstr "Non é posible localizar esta entrada do diario en ningún diario"
-
-#~ msgid "You have received %d new messages in %s."
-#~ msgstr "Recibiu %d mensaxes novas en %s."
-
-#~ msgid "System error: %s"
-#~ msgstr "Erro de sistema: %s"
-
-#~ msgid "Camel error: %s"
-#~ msgstr "Erro de Camel: %s"
-
-#~ msgid "Account cannot send e-mail"
-#~ msgstr "A conta non pode enviar correo electrónico"
-
-#~ msgid "No store available"
-#~ msgstr "Non hai almacén dispoñible"
-
-#~ msgid ""
-#~ "A plugin which implements a CORBA interface for accessing mail data "
-#~ "remotely."
-#~ msgstr ""
-#~ "Un plugin que implementa unha interface Corba para acceder aos datos de "
-#~ "correo de forma remota."
-
-#~ msgid "Mail Remote"
-#~ msgstr "Correo remoto"
-
-#~ msgid "(Untitled)"
-#~ msgstr "(Sen título)"
-
-#~ msgid "_Phone List"
-#~ msgstr "Lista de _teléfonos"
-
-#~ msgid "_Edit..."
-#~ msgstr "_Editar..."
-
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid "<- _Remove"
-#~ msgstr "<- E_liminar"
-
-#~ msgid "Sh_ow these fields in order:"
-#~ msgstr "_Mostrar estes campos por orde:"
-
-#~ msgid "_Add ->"
-#~ msgstr "_Engadir ->"
-
-#~ msgid "Emulate label resize"
-#~ msgstr "Emular o redimensionamento de etiqueta"
author	Ignacio Casal Quinteiro <nacho.resa@gmail.com>	2008-01-27 00:01:32 +0800
committer	Ignacio Casal Quinteiro <icq@src.gnome.org>	2008-01-27 00:01:32 +0800
commit	b19d472595091b90fd2cfeef638e004362937e5f (patch)
tree	27ad366dafbbbca66e2967b10fd75fcf13e6eb02 /po
parent	c7129ada34802b1a8a4ecdf0905894dd9ab8c241 (diff)
download	gsoc2013-evolution-b19d472595091b90fd2cfeef638e004362937e5f.tar gsoc2013-evolution-b19d472595091b90fd2cfeef638e004362937e5f.tar.gz gsoc2013-evolution-b19d472595091b90fd2cfeef638e004362937e5f.tar.bz2 gsoc2013-evolution-b19d472595091b90fd2cfeef638e004362937e5f.tar.lz gsoc2013-evolution-b19d472595091b90fd2cfeef638e004362937e5f.tar.xz gsoc2013-evolution-b19d472595091b90fd2cfeef638e004362937e5f.tar.zst gsoc2013-evolution-b19d472595091b90fd2cfeef638e004362937e5f.zip