[evolution/gnome-2-30] Updated Galician translations

From: Francisco Diéguez Souto <frandieguez src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution/gnome-2-30] Updated Galician translations
Date: Tue, 14 Sep 2010 07:51:29 +0000 (UTC)
commit 1a8f0092b543cb320cb54dd3003ab75081139fa9
Author: Fran DiÃ©guez <fran dieguez mabishu com>
Date:   Tue Sep 14 09:48:24 2010 +0200

    Updated Galician translations

 po/gl.po |10803 +++++++++++++++++++++++++++++---------------------------------
 1 files changed, 4997 insertions(+), 5806 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index fa76940..d6b4f0a 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -18,14 +18,14 @@
 # Fran DiÃ©guez <frandieguez ubuntu com>, 2009, 2010.
 # Fran Dieguez <frandieguez ubuntu com>, 2010.
 #
-#: ../shell/main.c:537
+#: ../shell/main.c:533
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-master-po-gl-53747.merged\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution\n"
-"POT-Creation-Date: 2010-09-06 14:39+0000\n"
-"PO-Revision-Date: 2010-09-08 23:30+0200\n"
+"POT-Creation-Date: 2010-09-13 22:04+0000\n"
+"PO-Revision-Date: 2010-09-13 10:38+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez ubuntu com>\n"
 "Language-Team: Galician <gnome-gl-list gnome org>\n"
 "MIME-Version: 1.0\n"
@@ -41,9 +41,9 @@ msgid ""
 "'{0}' is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
 msgstr ""
-"'{0}' Ã© unha axenda de enderezos sÃ³ de lectura e non pode ser modificada. "
-"Seleccione unha axenda de enderezos nova na barra lateral da visualizaciÃ³n "
-"de Contactos."
+"Â«{0}Â» Ã© unha axenda de enderezos sÃ³ de lectura e non pode ser modificada. "
+"Seleccione unha axenda de enderezos nova na barra lateral da vista de "
+"Contactos.: %s"
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -55,7 +55,7 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
-msgstr "O enderezo '{0}' xa existe."
+msgstr "O enderezo Â«{0}Â» xa existe."
 
 #: ../addressbook/addressbook.error.xml.h:5
 msgid "Cannot add new contact"
@@ -101,46 +101,51 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
-msgstr "Quere eliminar a axenda de enderezos '{0}'?"
+msgstr "Quere eliminar a axenda de enderezos Â«{0}Â»?"
 
 #: ../addressbook/addressbook.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+msgid "Do _Not Delete"
+msgstr "_Non eliminar"
+
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Produciuse un erro ao gardar {0} en {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
 msgstr "Produciuse un fallo ao autenticarse no servidor LDAP."
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1264
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
 msgid "Failed to delete contact"
 msgstr "Produciuse un fallo ao eliminar o contacto"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
 msgstr "CreaciÃ³n da axenda de enderezos do GroupWise:"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:18
 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: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 address book 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?"
 msgstr "A imaxe que seleccionou Ã© grande. Quere redimensionala e almacenala?"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:22
 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 "
@@ -150,16 +155,16 @@ msgstr ""
 "permite esta funcionalidade ou que estÃ¡ mal configurada. Pida bases de busca "
 "compatÃbeis ao seu administrador de sistema."
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book could not be opened."
 msgstr "Non Ã© posÃbel abrir esta axenda de enderezos."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book server does not have any suggested search bases."
 msgstr ""
 "Este servidor de axenda de enderezos non ten ningunha base de busca suxerida."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:25
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -168,31 +173,31 @@ msgstr ""
 "servidor pode estar escrito incorrectamente, ou a sÃºa conexiÃ³n de rede pode "
 "estar caÃda."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This address book will be removed permanently."
 msgstr "Esta axenda de enderezos eliminarase permanentemente."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Este servidor non Ã© compatÃbel  co esquema de informaciÃ³n LDAPv3."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to open address book"
 msgstr "Non Ã© posÃbel abrir a axenda de enderezos"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to perform search."
 msgstr "Non Ã© posÃbel realizar a busca."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "Non Ã© posÃbel gardar {0}."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Would you like to save your changes?"
 msgstr "Quere gardar os cambios?"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -200,7 +205,7 @@ msgstr ""
 "EstÃ¡ tentando mover un contacto dunha axenda de enderezos a outra mais non Ã© "
 "posÃbel eliminar da orixe. Quere gardar unha copia en seu lugar?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -210,74 +215,50 @@ msgstr ""
 "problemas ao usar o Evolution. Para ter os mellores resultados o servidor "
 "deberÃa ser actualizado a unha versiÃ³n compatÃbel"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "You do not have permission to delete contacts in this address book."
 msgstr ""
 "Vostede non ten permisos para eliminar contactos de esta axenda de enderezos."
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../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 esas modificaciÃ³ns?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../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Ã±Ãbeis atÃ© que o Evolution sexa "
 "reiniciado."
 
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:525
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "Eng_adir"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Discard"
 msgstr "Re_xeitar"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Do not save"
 msgstr "Non gar_dar"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Resize"
 msgstr "_Redimensionar"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../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 address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
-#: ../addressbook/conduit/address-conduit.c:597
-msgid "Default Sync Address:"
-msgstr "Enderezo de sincronizaciÃ³n predefinido:"
-
-#: ../addressbook/conduit/address-conduit.c:1631
-#: ../addressbook/conduit/address-conduit.c:1632
-msgid "Could not load address book"
-msgstr "Non foi posÃbel cargar a axenda de enderezos"
-
-#: ../addressbook/conduit/address-conduit.c:1709
-#: ../addressbook/conduit/address-conduit.c:1712
-msgid "Could not read pilot's Address application block"
-msgstr "Non foi posÃbel ler o bloque de Aplicativo de enderezos do pilot"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2020
 msgid "Anniversary"
 msgstr "Aniversario"
 
@@ -288,352 +269,303 @@ msgstr "Aniversario"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:118
+#: ../calendar/gui/e-calendar-view.c:2019 ../capplet/anjal-settings-main.c:117
 #: ../shell/main.c:122
 msgid "Birthday"
 msgstr "Aniversario"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Blog:"
+msgstr "Blog:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegorÃas..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 msgid "Calendar:"
 msgstr "_Calendario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/importers/evolution-vcard-importer.c:934
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:590
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:589
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:604
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2583
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:295
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "Correo ElectrÃ³nico"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Free/Busy:"
 msgstr "_DispoÃ±ibilidade:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "_Nome completo..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "Enderezo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
 msgstr "PÃ¡xina de _inicio:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "Imaxe"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
 msgstr "<b>MensaxarÃa instantÃ¡nea</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
 msgstr "Traballo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "Enderezo de correo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "_Alcume:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "Notas"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1725
 msgid "Other"
 msgstr "Outros"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "Datos persoais"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "TelÃ©fono"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Video Chat:"
 msgstr "_Videoconferencia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "<b>Enderezos Web</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Log:"
-msgstr "Rexistro _web:"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+msgid "Web addresses"
+msgstr "Enderezos Web"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "Traballo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Address:"
 msgstr "_Enderezo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Anniversary:"
 msgstr "_Aniversario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Assistant:"
 msgstr "_Asistente:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Birthday:"
 msgstr "_Aniversario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../calendar/gui/dialogs/event-page.c:826
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+msgid "_Blog:"
+msgstr "_Blog:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../plugins/itip-formatter/itip-view.c:1921
 msgid "_Calendar:"
 msgstr "_Calendario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_City:"
 msgstr "_Cidade:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Company:"
 msgstr "_Empresa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Country:"
 msgstr "_PaÃs:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_File under:"
 msgstr "_Arquivar como:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Free/Busy:"
 msgstr "_DispoÃ±ibilidade:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Home Page:"
 msgstr "PÃ¡xina de _inicio:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Manager:"
 msgstr "_Xestor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_PO Box:"
 msgstr "_Apdo. de correos:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Profession:"
 msgstr "_ProfesiÃ³n:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Spouse:"
 msgstr "_CÃ³nxuxe:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_State/Province:"
 msgstr "E_stado/Provincia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "_TÃtulo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Video Chat:"
 msgstr "_Videoconferencia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Wants to receive HTML mail"
 msgstr "_Quere recibir correo en HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-msgid "_Web Log:"
-msgstr "Rexistro _web:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "_Onde:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
 msgid "_Zip/Postal Code:"
 msgstr "_CÃ³digo Postal:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:320
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
-msgid "Name"
-msgstr "Nome"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:530
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "EditÃ¡bel"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
 #: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
 #: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
 #: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
 #: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
 #: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:352
 msgid "Error adding contact"
 msgstr "Produciuse un erro ao engadir o contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
 msgid "Error modifying contact"
 msgstr "Produciuse un erro ao modificar o contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:236
 msgid "Error removing contact"
 msgstr "Produciuse un erro ao eliminar o contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "Axenda de enderezos de orixe"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "Axenda de enderezos de destino"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "Ã? un contacto novo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "Campos que se poden escribir"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "Campos requiridos"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "Modificado"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:599
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2578
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de Contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3001
 msgid "Please select an image for this contact"
 msgstr "Escolla unha imaxe para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3002
 msgid "_No image"
 msgstr "_Sen imaxe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3275
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -641,56 +573,46 @@ msgstr ""
 "Os datos de contacto non son vÃ¡lidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3279
 #, c-format
 msgid "'%s' has an invalid format"
-msgstr "'%s' ten un formato non vÃ¡lido"
+msgstr "Â«%sÂ» ten un formato non vÃ¡lido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3286
 #, c-format
 msgid "%s'%s' has an invalid format"
-msgstr "%s'%s' ten un formato non vÃ¡lido"
+msgstr "%sÂ«%sÂ» ten un formato non vÃ¡lido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
 #, c-format
 msgid "%s'%s' is empty"
-msgstr "%s'%s' estÃ¡ baleiro"
+msgstr "%sÂ«%sÂ» estÃ¡ baleiro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3326
 msgid "Invalid contact."
 msgstr "Contacto non vÃ¡lido."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
 msgstr "AdiciÃ³n rÃ¡pida de contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Edit Full"
 msgstr "_Editar completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
 msgstr "Nome _completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 msgid "E_mail"
 msgstr "Correo _electrÃ³nico"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
 msgstr "_Seleccione a axenda de enderezos"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
-msgid "Shell"
-msgstr "Terminal"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr "O singleton de EShell"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "Dr."
@@ -757,7 +679,7 @@ msgid "_Suffix:"
 msgstr "_Sufixo:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:657
 msgid "Contact List Editor"
 msgstr "Editor da lista de contactos"
 
@@ -774,7 +696,7 @@ msgid "_List name:"
 msgstr "_Nome da lista:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:173
 msgid "_Select..."
 msgstr "_Seleccionar..."
 
@@ -783,39 +705,27 @@ 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:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:751
 msgid "Contact List Members"
 msgstr "Membros da lista de contactos"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:905
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1320
 msgid "_Members"
 msgstr "_Integrantes"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
 msgid "Error adding list"
 msgstr "Produciuse un erro ao engadir a lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
 msgid "Error modifying list"
 msgstr "Produciuse un erro ao modificar a lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
 msgid "Error removing list"
 msgstr "Produciuse un erro ao eliminar a lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:520
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Book"
-msgstr "Axenda de enderezos"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "Ã? unha lista nova"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Contacto modificado:"
@@ -854,134 +764,111 @@ msgstr ""
 "cartafol. Quere engadilo de todas as formas?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-merging.c:241
 msgid "_Merge"
 msgstr "_Combinar"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:166
+#: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
+#, c-format
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:224
 msgid "Merge Contact"
 msgstr "Combinar contacto"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
-#: ../modules/calendar/e-memo-shell-view-actions.c:767
-#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../modules/addressbook/e-book-shell-view-actions.c:920
+#: ../modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../modules/calendar/e-memo-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:967
 msgid "Any field contains"
 msgstr "Calquera campo contÃ©n"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
 msgid "Email begins with"
 msgstr "O correo comeza por"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
 msgid "Name contains"
 msgstr "O nome contÃ©n"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:142
+#: ../addressbook/gui/widgets/e-addressbook-model.c:143
 msgid "No contacts"
 msgstr "Sen contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:146
+#: ../addressbook/gui/widgets/e-addressbook-model.c:147
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d contacto"
 msgstr[1] "%d contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:315
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
 msgid "Error getting book view"
-msgstr "Produciuse un erro ao obter a visualizaciÃ³n da axenda de enderezos"
+msgstr "Produciuse un erro ao obter a vista da axenda de enderezos"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:540
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-msgid "Query"
-msgstr "Consulta"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:714
+#: ../addressbook/gui/widgets/e-addressbook-model.c:716
 msgid "Search Interrupted"
 msgstr "BÃºsqueda interrompida"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "Modelo"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Produciuse un erro ao modificar a tarxeta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#: ../addressbook/gui/widgets/e-addressbook-view.c:626
 msgid "Cut selected contacts to the clipboard"
 msgstr "Cortar o texto seleccionado para o portapapeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:632
 msgid "Copy selected contacts to the clipboard"
 msgstr "Copiar o texto seleccionado ao portapapeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:638
 msgid "Paste contacts from the clipboard"
 msgstr "Pegar os contactos desde o portapapeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:644
+#: ../modules/addressbook/e-book-shell-view-actions.c:745
 msgid "Delete selected contacts"
 msgstr "Eliminar os contactos seleccionados"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:650
 msgid "Select all visible contacts"
 msgstr "Seleccionar todos os contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
-msgid "Shell View"
-msgstr "VisualizaciÃ³n de terminal"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "Orixe"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1282
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "EstÃ¡ seguro de que quere eliminar estas listas de contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1286
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 msgid "Are you sure you want to delete this contact list?"
 msgstr "EstÃ¡ seguro de que quere eliminar estas listas de contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1290
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "EstÃ¡ seguro de que quere eliminar a lista de contactos (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1296
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
 msgid "Are you sure you want to delete these contacts?"
 msgstr "EstÃ¡ seguro de que quere eliminar estes contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
 msgid "Are you sure you want to delete this contact?"
 msgstr "EstÃ¡ seguro de que quere eliminar estes contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "EstÃ¡ seguro de que quere eliminar o contacto (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1459
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1472
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -990,11 +877,11 @@ msgstr ""
 "Ao abrir %d contacto abrirÃ¡ tamÃ©n %d novas xanelas.\n"
 "EstÃ¡ seguro de que quere mostrar este contacto?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1464
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
 msgid "_Don't Display"
 msgstr "_Non mostrar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
 msgid "Display _All Contacts"
 msgstr "Mostrar _todos os contactos"
 
@@ -1028,7 +915,7 @@ msgid "Car Phone"
 msgstr "TelÃ©fono do automÃ³bil"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:5
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -1129,7 +1016,7 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:569
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rol"
@@ -1154,7 +1041,6 @@ msgid "Telex"
 msgstr "TÃ©lex"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:825
 msgid "Title"
 msgstr "TÃtulo"
 
@@ -1166,59 +1052,7 @@ msgstr "Unidade"
 msgid "Web Site"
 msgstr "Sitio Web"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-msgid "Width"
-msgstr "Largura"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "Altura"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-msgid "Has Focus"
-msgstr "Ten foco"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Campo"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Nome do campo"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Modelo de texto"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Lonxitude mÃ¡xima do campo"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
-msgid "Column Width"
-msgstr "Largura da columna"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -1228,7 +1062,7 @@ msgstr ""
 "\n"
 "Buscando os contactos..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1242,7 +1076,7 @@ msgstr ""
 "\n"
 "ou prema dÃºas veces aquÃ para crear un contacto novo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1252,11 +1086,11 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Non hai elementos para mostrar nesta visualizaciÃ³n.\n"
+"Non hai elementos para mostrar nesta vista.\n"
 "\n"
 "Prema aquÃ dÃºas veces para crear un contacto novo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1266,7 +1100,7 @@ msgstr ""
 "\n"
 "Buscar o contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1274,11 +1108,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Non hai elementos para mostrar nesta visualizaciÃ³n."
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "Adaptador"
+"Non hai elementos para mostrar nesta vista."
 
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
@@ -1289,21 +1119,13 @@ msgid "Home Email"
 msgstr "Correo electrÃ³nico particular"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:807
 msgid "Other Email"
 msgstr "Outro correo electrÃ³nico"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "Seleccionado"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "PosÃºe cursor"
-
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+#: ../addressbook/gui/widgets/ea-minicard-view.c:184
 msgid "evolution address book"
 msgstr "axenda de enderezos do Evolution"
 
@@ -1315,7 +1137,7 @@ msgstr "Contacto novo"
 msgid "New Contact List"
 msgstr "Lista de contactos nova"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#: ../addressbook/gui/widgets/ea-minicard-view.c:167
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -1343,17 +1165,17 @@ msgid "Copy _Email Address"
 msgstr "Copiar enderezo de _correo"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:374
+#: ../widgets/misc/e-web-view.c:396
 msgid "Copy the email address to the clipboard"
 msgstr "Copia obxectos no portapapeis."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:379
+#: ../widgets/misc/e-web-view.c:401
 msgid "_Send New Message To..."
 msgstr "_Enviar unha mensaxe nova a..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:381
+#: ../widgets/misc/e-web-view.c:403
 msgid "Send a mail message to this address"
 msgstr "Converte unha mensaxe nunha tarefa."
 
@@ -1389,22 +1211,22 @@ msgid "Video Chat"
 msgstr "Videoconferencia"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:445
-#: ../plugins/groupwise-features/camel-gw-listener.c:560
-#: ../plugins/hula-account-setup/camel-hula-listener.c:371
-#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../modules/calendar/e-cal-shell-view.c:488
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:499
 msgid "Calendar"
 msgstr "Calendario"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:355
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "DispoÃ±ibilidade"
@@ -1432,21 +1254,19 @@ msgid "Web Log"
 msgstr "Blogue"
 
 #. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:346 ../mail/e-mail-migrate.c:962
-#: ../modules/addressbook/e-book-shell-backend.c:176
-#: ../modules/addressbook/e-book-shell-migrate.c:507
-#: ../modules/calendar/e-cal-shell-backend.c:181
-#: ../modules/calendar/e-cal-shell-migrate.c:574
-#: ../modules/calendar/e-memo-shell-backend.c:154
+#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../modules/addressbook/e-book-shell-backend.c:116
+#: ../modules/addressbook/e-book-shell-migrate.c:138
+#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../modules/calendar/e-cal-shell-migrate.c:156
+#: ../modules/calendar/e-memo-shell-backend.c:112
 #: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/calendar/e-task-shell-backend.c:112
+#: ../modules/calendar/e-task-shell-migrate.c:121
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "Persoal"
@@ -1463,119 +1283,13 @@ msgstr "PÃ¡xina de inicio"
 msgid "Blog"
 msgstr "Blogue"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:754
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:853
 #, c-format
 msgid "Click to mail %s"
 msgstr "Prema para enviar un correo a %s"
 
-#. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Success"
-msgstr "Ã?xito"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
-msgid "Backend busy"
-msgstr "Backend ocupado"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Repository offline"
-msgstr "Repositorio desconectado"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
-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:58
-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:61
-msgid "Permission denied"
-msgstr "Permiso denegado"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Contact not found"
-msgstr "Contacto non encontrado"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-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:64
-msgid "Protocol not supported"
-msgstr "O protocolo non Ã© compatÃbel"
-
-#. E_BOOK_ERROR_CANCELLED
-#. To Translators: This is task status
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
-msgid "Canceled"
-msgstr "Cancelado"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
-msgid "Could not cancel"
-msgstr "Non foi posÃbel cancelar"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Authentication Failed"
-msgstr "Produciuse un fallo na autenticaciÃ³n"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Authentication Required"
-msgstr "AutenticaciÃ³n requirida"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
-msgid "TLS not Available"
-msgstr "TLS non dispoÃ±Ãbel"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
 #: ../addressbook/gui/widgets/eab-gui-util.c:71
-msgid "No such source"
-msgstr "Non existe esa orixe"
-
-#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
-msgid "Not available in offline mode"
-msgstr "Non dispoÃ±Ãbel en modo sen conexiÃ³n"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-msgid "Other error"
-msgstr "Outro erro"
-
-#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
-msgid "Invalid server version"
-msgstr "VersiÃ³n do servidor non vÃ¡lida"
-
-#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
-msgid "Unsupported authentication method"
-msgstr "MÃ©todo de autenticaciÃ³n non incompatÃbel"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:107
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1586,7 +1300,7 @@ msgstr ""
 "para o seu uso sen conexiÃ³n. Cargue unha vez a axenda de enderezos no modo "
 "con conexiÃ³n para descargar os seus contidos."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1595,7 +1309,7 @@ msgstr ""
 "Non Ã© posÃbel abrir esta axenda de enderezos. Verifique que o camiÃ±o %s "
 "existe e que estÃ¡n definidos os permisos para acceder a ela."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:128
+#: ../addressbook/gui/widgets/eab-gui-util.c:92
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1604,7 +1318,7 @@ msgstr ""
 "usar o LDAP no Evolution ten que ter instalado un paquete do Evolution con "
 "capacidades LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:101
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1612,11 +1326,11 @@ msgstr ""
 "Non Ã© posÃbel abrir esta axenda de enderezos. Isto pode significar que se "
 "introduciu un URI incorrecto ou que o servidor non Ã© atinxÃbel."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:145
+#: ../addressbook/gui/widgets/eab-gui-util.c:109
 msgid "Detailed error message:"
 msgstr "Mensaxe de erro detallada:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:168
+#: ../addressbook/gui/widgets/eab-gui-util.c:133
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1628,7 +1342,7 @@ msgstr ""
 "Faga unha busca mÃ¡is especÃfica ou eleve o lÃmite de resultados\n"
 "nas preferencias do servidor de cartafoles para esta axenda de enderezos."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:174
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1641,44 +1355,52 @@ msgstr ""
 "servidor\n"
 "de cartafoles para esta axenda de enderezos."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:180
-msgid "The backend for this address book was unable to parse this query."
-msgstr "O backend desta axenda de enderezos non puido analizar esta consulta."
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr ""
+"O backend desta axenda de enderezos non puido analizar esta consulta. %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
-msgid "The backend for this address book refused to perform this query."
-msgstr "O backend desta axenda de enderezos rexeitou efectuar esta consulta."
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr ""
+"O backend desta axenda de enderezos rexeitou efectuar esta consulta. %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
-msgid "This query did not complete successfully."
-msgstr "Esta consulta non terminou con Ã©xito."
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "Esta consulta non terminou con Ã©xito. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:247
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Select Address Book"
 msgstr "Seleccione a axenda de enderezos"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:310
+#: ../addressbook/gui/widgets/eab-gui-util.c:286
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:425
 msgid "Move contact to"
 msgstr "Mover contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:427
 msgid "Copy contact to"
 msgstr "Copiar contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:442
+#: ../addressbook/gui/widgets/eab-gui-util.c:430
 msgid "Move contacts to"
 msgstr "Mover contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:432
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
@@ -1686,54 +1408,61 @@ msgstr "Copiar contactos a"
 msgid "Card View"
 msgstr "VisualizaciÃ³n de tarxeta"
 
-#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-csv-importer.c:720
 #: ../addressbook/importers/evolution-ldif-importer.c:516
-#: ../addressbook/importers/evolution-vcard-importer.c:262
-#: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../addressbook/importers/evolution-vcard-importer.c:264
+#: ../calendar/importers/icalendar-importer.c:325
+#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importando..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:858
+#: ../addressbook/importers/evolution-csv-importer.c:1008
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:859
+#: ../addressbook/importers/evolution-csv-importer.c:1009
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV e importador Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:867
+#: ../addressbook/importers/evolution-csv-importer.c:1017
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:868
+#: ../addressbook/importers/evolution-csv-importer.c:1018
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV e importador Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:876
+#: ../addressbook/importers/evolution-csv-importer.c:1026
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:877
+#: ../addressbook/importers/evolution-csv-importer.c:1027
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV e importador Tab"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:689
+#: ../addressbook/importers/evolution-ldif-importer.c:742
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato de intercambio de datos LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:690
+#: ../addressbook/importers/evolution-ldif-importer.c:743
 msgid "Evolution LDIF importer"
 msgstr "Importador de LDIF do Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:565
+#: ../addressbook/importers/evolution-vcard-importer.c:623
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:566
+#: ../addressbook/importers/evolution-vcard-importer.c:624
 msgid "Evolution vCard Importer"
 msgstr "Importador de vCard do Evolution"
 
+#. Uncomment next if it is successful to get total number if pages in list view
+#. * g_object_get (operation, "n-pages", &n_pages, NULL)
+#: ../addressbook/printing/e-contact-print.c:746
+#, c-format
+msgid "Page %d"
+msgstr "PÃ¡xina %d"
+
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
@@ -1810,21 +1539,21 @@ msgstr "Erro inmanexÃ¡bel"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accedendo anonimamente ao servidor LDAP"
 
-#: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../addressbook/util/addressbook.c:215
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "Produciuse un fallo ao autenticarse.\n"
 
-#: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../addressbook/util/addressbook.c:222
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduza o contrasinal para %s (usuario %s)"
 
-#: ../addressbook/util/addressbook.c:225
-#: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:809
-#: ../plugins/google-account-setup/google-source.c:440
+#: ../addressbook/util/addressbook.c:230
+#: ../calendar/common/authentication.c:53
+#: ../plugins/caldav/caldav-browse-server.c:813
+#: ../plugins/google-account-setup/google-source.c:438
 #: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -1836,8 +1565,8 @@ msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar from the side bar in the Calendar view."
 msgstr ""
-"'{0}' Ã© un calendario sÃ³ de lectura e non se pode modificar. Seleccione un "
-"calendario diferente na barra lateral da visualizaciÃ³n de Calendario."
+"Â«{0}Â» Ã© un calendario sÃ³ de lectura e non se pode modificar. Seleccione un "
+"calendario diferente na barra lateral da vista de Calendario."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
@@ -1845,24 +1574,24 @@ msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
 msgstr ""
-"'{0}' Ã© un calendario sÃ³ de lectura e non se pode modificar. Seleccione un "
+"Â«{0}Â» Ã© un calendario sÃ³ de lectura e non se pode modificar. Seleccione un "
 "calendario diferente que poida aceptar citas."
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
 msgstr ""
-"Engadir un resumo significativo Ã¡ sÃºa cita daralle unha idea sobre o contido "
-"aos seus destinatarios."
+"Engadir un resumo significativo Ã¡ sÃºa cita daralle aos seus destinatarios "
+"unha idea sobre o contido."
 
 #: ../calendar/calendar.error.xml.h:6
 msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
 msgstr ""
-"Engadir un resumo significativo Ã¡ sÃºa tarefa daralle unha idea sobre o "
-"contido aos seus destinatarios."
+"Engadir un resumo significativo Ã¡ sÃºa tarefa daralle unha idea aos seus "
+"destinatarios sobre o contido."
 
 #: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
@@ -1910,19 +1639,19 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
-msgstr "EstÃ¡ seguro de que quere eliminar a tarefa '{0}'?"
+msgstr "EstÃ¡ seguro de que quere eliminar a tarefa Â«{0}Â»?"
 
 #: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "EstÃ¡ seguro de que quere eliminar a cita titulada '{0}'?"
+msgstr "EstÃ¡ seguro de que quere eliminar a cita titulada Â«{0}Â»?"
 
 #: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the meeting titled '{0}'?"
-msgstr "EstÃ¡ seguro de que quere eliminar a cita titulada '{0}'?"
+msgstr "EstÃ¡ seguro de que quere eliminar a cita titulada Â«{0}Â»?"
 
 #: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete the memo '{0}'?"
-msgstr "EstÃ¡ seguro de que quere eliminar a nota '{0}'?"
+msgstr "EstÃ¡ seguro de que quere eliminar a nota Â«{0}Â»?"
 
 #: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} appointments?"
@@ -1959,40 +1688,36 @@ msgid "Are you sure you want to delete this task?"
 msgstr "EstÃ¡ seguro de que quere eliminar esta tarefa?"
 
 #: ../calendar/calendar.error.xml.h:26
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "EstÃ¡ seguro que quere gardar a nota sen un resumo?"
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr "EstÃ¡ seguro de que quere gardar a cita sen un resumo?"
 
 #: ../calendar/calendar.error.xml.h:27
-msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "EstÃ¡ seguro de que quere enviar a cita sen un resumo?"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "EstÃ¡ seguro que quere gardar a nota sen un resumo?"
 
 #: ../calendar/calendar.error.xml.h:28
-msgid "Are you sure you want to send the task without a summary?"
-msgstr "EstÃ¡ seguro de que quere enviar a tarefa sen un resumo?"
+msgid "Are you sure you want to save the task without a summary?"
+msgstr "EstÃ¡ seguro de que quere gardar a tarefa sen un resumo?"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Calendar repository is offline."
-msgstr "O repositorio de calendarios estÃ¡ desconectado."
-
-#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
-msgstr "Non Ã© posÃbel crear un novo actividade"
+msgstr "Non Ã© posÃbel crear unha nova actividade"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "Non Ã© posÃbel gardar o actividade"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
-msgstr "Quere eliminar o calendario '{0}'?"
+msgstr "Quere eliminar o calendario Â«{0}Â»?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
-msgstr "Quere eliminar a lista de notas '{0}'?"
+msgstr "Quere eliminar a lista de notas Â«{0}Â»?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
-msgstr "Quere eliminar a lista de tarefas '{0}'?"
+msgstr "Quere eliminar a lista de tarefas Â«{0}Â»?"
 
 #: ../calendar/calendar.error.xml.h:35
 msgid "Do _not Send"
@@ -2037,12 +1762,7 @@ msgstr "Produciuse un erro ao cargar a lista de notas"
 msgid "Error loading task list"
 msgstr "Produciuse un erro ao cargar a lista de tarefas"
 
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "Erro en '{0}'"
-
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2050,7 +1770,7 @@ msgstr ""
 "Se non envÃa unha notificaciÃ³n de cancelaciÃ³n, os outros participantes "
 "quizais non saiban que se cancelou a cita."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -2058,7 +1778,7 @@ msgstr ""
 "Se non envÃa unha notificaciÃ³n de cancelaciÃ³n, os outros participantes "
 "quizais non saiban que se eliminou a nota."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2066,11 +1786,7 @@ msgstr ""
 "Se non envÃa unha notificaciÃ³n de cancelaciÃ³n, os outros participantes "
 "quizais non saiban que se eliminou a tarefa."
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "No response from the server."
-msgstr "Non hai resposta do servidor."
-
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -2078,7 +1794,7 @@ msgstr ""
 "Ao enviar informaciÃ³n actualizada permite que outros participantes manteÃ±an "
 "os seus calendarios ao dÃa."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -2086,7 +1802,7 @@ msgstr ""
 "Ao enviar informaciÃ³n actualizada permÃtese que outros participantes "
 "manteÃ±an a sÃºa lista de tarefas ao dÃa."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -2094,7 +1810,7 @@ msgstr ""
 "Estanse descargando algÃºns anexos. Gardar a cita farÃ¡ que se perdan eses "
 "anexos."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:50
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -2102,98 +1818,94 @@ msgstr ""
 "Estanse descargando algÃºns anexos. Gardar a tarefa farÃ¡ que se perdan eses "
 "anexos."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:51
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Pode que algunhas caracterÃsticas non funcionen apropiadamente co servidor "
 "actual."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "O calendario do Evolution saÃu inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Os calendarios do Evolution saÃron inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "As notas do Evolution saÃron inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "As tarefas do Evolution saÃron inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:56
 msgid "The calendar is not marked for offline usage."
 msgstr "O calendario non estÃ¡ marcado para o uso sen conexiÃ³n."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:57
 msgid "The memo list is not marked for offline usage."
 msgstr "A lista de notas non estÃ¡ marcada para o uso no modo sen conexiÃ³n."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:58
 msgid "The task list is not marked for offline usage."
 msgstr "A lista de tarefas non estÃ¡ marcada para o uso sen conexiÃ³n."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:59
 msgid "This calendar will be removed permanently."
 msgstr "Este calendario eliminarase permanentemente."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:60
 msgid "This memo list will be removed permanently."
 msgstr "Esta lista de notas vaise eliminar permanentemente."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:61
 msgid "This task list will be removed permanently."
 msgstr "Esta lista de tarefas vaise eliminar permanentemente."
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "Non Ã© posÃbel cargar o calendario"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Quere gardar as modificaciÃ³ns feitas nesta cita?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this meeting?"
 msgstr "Quere gardar as modificaciÃ³ns feitas nesta nota?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
 msgstr "Quere gardar as modificaciÃ³ns feitas nesta nota?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this task?"
 msgstr "Quere gardar as modificaciÃ³ns feitas nesta tarefa?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Quere enviar unha notificaciÃ³n de cancelaciÃ³n para esta nota?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:67
 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?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Quere enviar convites para a cita aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
 msgstr "Quere enviar esta tarefa aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Quere enviar informaciÃ³n actualizada da cita aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
 msgstr "Quere enviar informaciÃ³n actualizada das tarefas aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:72
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2203,105 +1915,58 @@ msgstr ""
 "problemas ao usar o Evolution. Para os mellores resultados, o servidor "
 "deberÃa actualizarse a unha versiÃ³n compatÃbel."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Modificou esta cita, mais aÃnda non a gardou."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "Modificou esta tarefa, mais aÃnda non a gardou."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have changed this task, but not yet saved it."
 msgstr "Modificou esta tarefa, mais aÃnda non a gardou."
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:76
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Realizou modificaciÃ³ns nesta nota, mais aÃnda non as gardou."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Os seus calendarios non estarÃ¡n dispoÃ±Ãbeis atÃ© que reinicie o Evolution."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "As sÃºas notas non estarÃ¡n dispoÃ±Ãbeis atÃ© que reinicie o Evolution."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:79
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "As sÃºas tarefas non estarÃ¡n dispoÃ±Ãbeis atÃ© que reinicie o Evolution."
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:80
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "_Rexeitar as modificaciÃ³ns"
 
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:268
+#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:271
 msgid "_Save"
 msgstr "_Gardar"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:82
 msgid "_Save Changes"
 msgstr "_Gardar modificaciÃ³ns"
 
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../calendar/calendar.error.xml.h:83
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:141
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:84
 msgid "_Send Notice"
 msgstr "_Enviar notificaciÃ³n"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}."
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:252
-msgid "Split Multi-Day Events:"
-msgstr "Dividir eventos de dÃas mÃºltiples:"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1532
-#: ../calendar/conduits/calendar/calendar-conduit.c:1533
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1022
-#: ../calendar/conduits/todo/todo-conduit.c:1023
-msgid "Could not start evolution-data-server"
-msgstr "Non foi posÃbel iniciar o evolution-data-server"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1640
-#: ../calendar/conduits/calendar/calendar-conduit.c:1643
-msgid "Could not read pilot's Calendar application block"
-msgstr "Non foi posÃbel ler o bloque do Aplicativo de Calendario do pilot"
-
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
-msgid "Could not read pilot's Memo application block"
-msgstr "Non foi posÃbel ler o bloque do Aplicativo Memo do pilot"
-
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
-msgid "Could not write pilot's Memo application block"
-msgstr "Non foi posÃbel escribir o bloque do Aplicativo Memo do pilot"
-
-#: ../calendar/conduits/todo/todo-conduit.c:231
-msgid "Default Priority:"
-msgstr "Prioridade predefinida:"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1106
-#: ../calendar/conduits/todo/todo-conduit.c:1109
-msgid "Could not read pilot's ToDo application block"
-msgstr "Non foi posÃbel ler o bloque do Aplicativo Tarefas pendentes do pilot"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1151
-#: ../calendar/conduits/todo/todo-conduit.c:1154
-msgid "Could not write pilot's ToDo application block"
-msgstr ""
-"Non foi posÃbel escribir o bloque do Aplicativo Tarefas pendentes do pilot"
-
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
@@ -2314,7 +1979,7 @@ msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
 msgid "Start time"
 msgstr "Hora de comezo"
 
@@ -2329,10 +1994,10 @@ msgstr "Ignorar _todo"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1573
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
-#: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
+#: ../calendar/gui/e-itip-control.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Location:"
 msgstr "LocalizaciÃ³n:"
 
@@ -2345,65 +2010,56 @@ msgid "_Dismiss"
 msgstr "_Ignorar"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1026
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
-#: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1621
-#: ../widgets/menus/gal-define-views.ui.h:5
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 msgid "_Snooze"
 msgstr "_Pospor"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-contacts-source.c:335
 msgid "hours"
 msgstr "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 msgid "location of appointment"
 msgstr "localizaciÃ³n da cita"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-contacts-source.c:334
 msgid "minutes"
 msgstr "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1434
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1556
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1581
 msgid "No summary available."
 msgstr "Non hai un resumo dispoÃ±Ãbel."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1443
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "Non hai unha descriciÃ³n dispoÃ±Ãbel."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "Non hai informaciÃ³n da localizaciÃ³n dispoÃ±Ãbel."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1519
 #, c-format
 msgid "You have %d alarms"
 msgstr "Ten %d alarmas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2415,7 +2071,7 @@ msgstr ""
 "configurado para enviar unha mensaxe de correo electrÃ³nico. No seu lugar\n"
 "O Evolution vai mostrar un diÃ¡logo de aviso normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2432,7 +2088,7 @@ msgstr ""
 "\n"
 "EstÃ¡ seguro de que quere executar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1748
 msgid "Do not ask me about this program again."
 msgstr "Non volver preguntar sobre este programa."
 
@@ -2474,7 +2130,7 @@ msgid "Alarm programs"
 msgstr "Programas de alarma"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Tempo (en segundos) durante o que mostrarÃ¡ o erro na barra de estado."
 
@@ -2484,12 +2140,11 @@ msgstr "Pedir confirmaciÃ³n ao eliminar elementos"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "Cor de fondo para as tarefas que vencen hoxe, no formato \"#rrggbb\"."
+msgstr "Cor de fondo para as tarefas que vencen hoxe, no formato Â«#rrggbbÂ»."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr ""
-"Cor de fondo para as tarefas que estÃ¡n pendentes, no formato \"#rrggbb\"."
+msgstr "Cor de fondo para as tarefas que estÃ¡n pendentes, no formato Â«#rrggbbÂ»."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
 msgid "Calendars to run alarms for"
@@ -2504,11 +2159,11 @@ msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "Cor para debuxar a liÃ±a de Marcus Bains na visualizaciÃ³n diaria."
+msgstr "Cor para debuxar a liÃ±a de Marcus Bains na Vista diaria."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
-msgstr "Comprimir as fins de semana na visualizaciÃ³n mensual"
+msgstr "Comprimir as fins de semana na vista mensual"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
@@ -2562,7 +2217,7 @@ msgstr "URL do modelo de dispoÃ±ibilidade"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Gradient of the events in calendar views."
-msgstr "GradaciÃ³n de eventos nas visualizaciÃ³ns de calendario."
+msgstr "GradaciÃ³n de eventos nas vistas de calendario."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide completed tasks"
@@ -2594,35 +2249,35 @@ msgstr ""
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr ""
-"Se Ã© \"true\", mÃ³strase o panel de previsualizaciÃ³n de recordatorios na "
-"xanela principal."
+"Se Ã© Â«trueÂ», mÃ³strase o panel de previsualizaciÃ³n de recordatorios na xanela "
+"principal."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr ""
-"Se Ã© \"true\", mÃ³strase o panel de previsualizaciÃ³n de tarefas na xanela "
+"Se Ã© Â«trueÂ», mÃ³strase o panel de previsualizaciÃ³n de tarefas na xanela "
 "principal."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
-"Os intervalos de tempo mostrados nas visualizaciÃ³ns diaria e de semana "
-"laboral, en minutos."
+"Os intervalos de tempo mostrados nas vistas diaria e de semana laboral, en "
+"minutos."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Last alarm time"
 msgstr "Hora da Ãºltima alarma"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Level beyond which the message should be logged."
 msgstr "Nivel a partir do que se deberÃa rexistrar a mensaxe."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of recently used second time zones in a Day View."
 msgstr ""
-"Unha listaxe dos fusos horarios secundarios usados recentemente nunha "
-"VisualizaciÃ³n diaria."
+"Unha listaxe dos fusos horarios secundarios usados recentemente nunha Vista "
+"diaria."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of server URLs for free/busy publishing."
@@ -2675,11 +2330,11 @@ msgstr "Minuto de comezo da xornada laboral, de 0 a 59."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Month view horizontal pane position"
-msgstr "PosiciÃ³n do panel horizontal da visualizaciÃ³n mensual"
+msgstr "PosiciÃ³n do panel horizontal da vista mensual"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view vertical pane position"
-msgstr "PosiciÃ³n do panel vertical na visualizaciÃ³n mensual"
+msgstr "PosiciÃ³n do panel vertical na vista mensual"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Number of units for determining a default reminder."
@@ -2698,17 +2353,16 @@ msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
-"PosiciÃ³n do panel horizontal, entre a visualizaciÃ³n e o navegador de datas "
-"do calendario e a lista de tarefas cando non estÃ¡ na visualizaciÃ³n mensual, "
-"en pÃxeles."
+"PosiciÃ³n do panel horizontal, entre a vista e o navegador de datas do "
+"calendario e a lista de tarefas cando non estÃ¡ na vista mensual, en pÃxeles."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
-"PosiciÃ³n do panel horizontal, entre a visualizaciÃ³n e o navegador de datas "
-"do calendario e a lista de tarefas na visualizaciÃ³n mensual, en pÃxeles."
+"PosiciÃ³n do panel horizontal, entre a vista e o navegador de datas do "
+"calendario e a lista de tarefas na vista mensual, en pÃxeles."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the memo preview pane when oriented vertically."
@@ -2741,17 +2395,16 @@ msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
-"PosiciÃ³n do panel vertical, entre a visualizaciÃ³n e o navegador de datas do "
-"calendario e a lista de tarefas na visualizaciÃ³n mensual, en pÃxeles."
+"PosiciÃ³n do panel vertical, entre a vista e o navegador de datas do "
+"calendario e a lista de tarefas na vista mensual, en pÃxeles."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr ""
-"PosiciÃ³n do panel vertical, entre a visualizaciÃ³n e o navegador de datas do "
-"calendario e a lista de tarefas cando non estÃ¡ na visualizaciÃ³n mensual, en "
-"pÃxeles."
+"PosiciÃ³n do panel vertical, entre a vista e o navegador de datas do "
+"calendario e a lista de tarefas cando non estÃ¡ na vista mensual, en pÃxeles."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary calendar"
@@ -2771,8 +2424,7 @@ msgstr "Programas que poden ser executados polas alarmas."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Recently used second time zones in a Day View"
-msgstr ""
-"Fusos horarios secundarios usados recentemente nunha VisualizaciÃ³n diaria"
+msgstr "Fusos horarios secundarios usados recentemente nunha Vista diaria"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Save directory for alarm audio"
@@ -2792,8 +2444,7 @@ msgstr "Mostrar o campo Rol no editor de eventos/tarefas/reuniÃ³ns"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 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 vistas semanal e mensual"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show categories field in the event/meeting/task editor"
@@ -2809,11 +2460,11 @@ msgstr "Mostrar o campo de estado no editor de eventos/tarefas/reuniÃ³ns"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show the memo preview pane"
-msgstr "Mostrar o panel de \"PrevisualizaciÃ³n\""
+msgstr "Mostrar o panel de Â«PrevisualizaciÃ³nÂ»"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Show the task preview pane"
-msgstr "Mostrar o panel de \"PrevisualizaciÃ³n\""
+msgstr "Mostrar o panel de Â«PrevisualizaciÃ³nÂ»"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Show timezone field in the event/meeting editor"
@@ -2824,39 +2475,36 @@ msgid "Show type field in the event/task/meeting editor"
 msgstr "Mostrar o campo de tipo no editor de eventos/tarefas/reuniÃ³ns"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
-msgid "Show week number in Day and Work Week View"
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr ""
-"Mostrar o nÃºmero de semana nas visualizaciÃ³ns de DÃa e de Semana laborÃ¡bel"
+"Mostrar os nÃºmeros das semanas na Vista diaria, Vista semanal, Vista de "
+"semana laboral e o Navegador do calendario"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
-msgid "Show week numbers in date navigator"
-msgstr "Mostrar os nÃºmeros de semana no navegador de datas"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
 msgstr ""
-"Mostra os fusos horarios secundarios nunha VisualizaciÃ³n diaria, se estÃ¡ "
+"Mostra os fusos horarios secundarios nunha Vista diaria, se estÃ¡ "
 "estabelecido. O valor Ã© semellante ao usado na chave 'timezone'."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Task layout style"
 msgstr "Estilo da disposiciÃ³n de tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Task preview pane position (horizontal)"
 msgstr "PosiciÃ³n do panel vertical de tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (vertical)"
 msgstr "PosiciÃ³n do panel vertical de tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Tasks due today color"
 msgstr "Cor para as tarefas que vencen hoxe"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -2866,43 +2514,43 @@ msgstr ""
 "u substitÃºese pola parte de usuario do enderezo de correo e %d substitÃºese "
 "polo dominio."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
 "O fuso horario predefinido que se empregarÃ¡ nas datas e horas no calendario, "
 "como unha localizaciÃ³n non traducida da base de datos de fusos horarios "
-"Olsen, como en \"America/New York\"."
+"Olsen, como en Â«America/New YorkÂ»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
 "list. \"1\" (Vertical View) places the preview pane next to the memo list."
 msgstr ""
 "O estilo de disposiciÃ³n determina onde dispoÃ±er o panel de previsualizaciÃ³n "
-"en relaciÃ³n coa lista de recordatorios. \"0\" (VisualizaciÃ³n clÃ¡sica) mostra "
-"o panel de previsualizaciÃ³n debaixo da lista de recordatorios. \"1"
+"en relaciÃ³n coa lista de recordatorios. Â«0Â» (VisualizaciÃ³n clÃ¡sica) mostra o "
+"panel de previsualizaciÃ³n debaixo da lista de recordatorios. \"1"
 "\" (VisualizaciÃ³n vertical) mostra o panel de previsualizaciÃ³n ao lado da "
 "lista de recordatorios."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
 "list. \"1\" (Vertical View) places the preview pane next to the task list."
 msgstr ""
 "O estilo de disposiciÃ³n determina onde dispoÃ±er o panel de previsualizaciÃ³n "
-"en relaciÃ³n coa lista de tarefas. \"0\" (VisualizaciÃ³n clÃ¡sica) mostra o "
-"panel de previsualizaciÃ³n debaixo da lista de tarefas. \"1\" (VisualizaciÃ³n "
-"vertical) mostra o panel de previsualizaciÃ³n ao lado da lista de tarefas."
+"en relaciÃ³n coa lista de tarefas. Â«0Â» (VisualizaciÃ³n clÃ¡sica) mostra o panel "
+"de previsualizaciÃ³n debaixo da lista de tarefas. Â«1Â» (VisualizaciÃ³n vertical) "
+"mostra o panel de previsualizaciÃ³n ao lado da lista de tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "The second timezone for a Day View"
-msgstr "O segundo fuso horario dunha VisualizaciÃ³n diaria"
+msgstr "O segundo fuso horario dunha Vista diaria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -2910,90 +2558,89 @@ msgstr ""
 "Isto pode tomar tres valores diferentes: 0 para erros; 1 para avisos e 2 "
 "para as mensaxes de depuraciÃ³n."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Time divisions"
 msgstr "DivisiÃ³ns horarias"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time the last alarm ran, in time_t."
 msgstr "A hora na que se executou a Ãºltima alarma, en time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Timezone"
 msgstr "Fuso horario"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 msgstr ""
-"Transparencia dos eventos nas visualizaciÃ³ns de calendario, un valor entre 0 "
+"Transparencia dos eventos nas vistas de calendario, un valor entre 0 "
 "(transparente) e 1 (opaco)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Twenty four hour time format"
 msgstr "Formato de hora en vinte e catro horas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "URI of the highlighted (\"primary\") calendar"
-msgstr "URI do calendario realzado (\"primario\")"
+msgstr "URI do calendario realzado (Â«primarioÂ»)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "URI of the highlighted (\"primary\") memo list"
-msgstr "URI da lista de memorizaciÃ³n realzada (\"primary\")"
+msgstr "URI da lista de memorizaciÃ³n realzada (Â«primaryÂ»)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") task list"
-msgstr "URI da lista de tarefas realzada (\"primaria\")"
+msgstr "URI da lista de tarefas realzada (Â«primariaÂ»)"
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "Unidades para o aviso predefinido: \"minutes\", \"hours\" ou \"days\"."
+msgstr "Unidades para o aviso predefinido: Â«minutesÂ», Â«hoursÂ» ou Â«daysÂ»."
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
-"Unidades para determinar cando ocultar as tarefas: \"minutes\", \"hours\" ou "
-"\"days\"."
+"Unidades para determinar cando ocultar as tarefas: Â«minutesÂ», Â«hoursÂ» ou Â«daysÂ»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Use system timezone"
 msgstr "Empregar o fuso horario do sistema"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr ""
 "Usar o fuso horario do sistema no canto do fuso horario seleccionado no "
 "Evolution."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Vertical pane position"
 msgstr "PosiciÃ³n vertical do panel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Week start"
 msgstr "Comezo da semana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "O dÃa no que comeza a semana, desde o domingo (0) atÃ© o sÃ¡bado (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Se se debe usar ou non a bandexa de notificaciÃ³n para mostrar alarmas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Indica se se solicita confirmaciÃ³n ao eliminar unha cita ou tarefa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Indica se se solicita confirmaciÃ³n ao expurgar citas ou tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -3001,94 +2648,87 @@ msgstr ""
 "Indica se se comprimen as fins de semana. Isto pon o sÃ¡bado e o domingo no "
 "mesmo espazo que un dÃa laborÃ¡bel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
-"Indica se se mostra a hora de finalizaciÃ³n dos eventos nas visualizaciÃ³ns "
-"semanais e mensuais."
+"Indica se se mostra a hora de finalizaciÃ³n dos eventos nas vistas semanais e "
+"mensuais."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 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:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 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 vista de tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr "Se desprazarse na vista de mes por semana ou por mes."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to set a default reminder for appointments."
 msgstr "Indica se se define un aviso predefinido para as citas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Indica se se mostra o campo RSVP no editor de eventos/tarefas/reuniÃ³ns"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 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"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 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"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 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"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 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:119
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 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"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 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"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
-msgid "Whether to show week number in the Day and Work Week View."
-msgstr ""
-"Indica se se mostra o nÃºmero de semana nas visualizaciÃ³ns Diaria e de Semana "
-"laborÃ¡bel."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
-msgid "Whether to show week numbers in the date navigator."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+msgid "Whether to show week numbers in various places in the Calendar."
 msgstr "Indica se se mostran os nÃºmeros de semana no navegador de datas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Work days"
 msgstr "DÃas laborÃ¡beis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Workday end hour"
 msgstr "Hora de finalizaciÃ³n da xornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Workday end minute"
 msgstr "Minuto de finalizaciÃ³n da xornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday start hour"
 msgstr "Hora de comezo da xornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday start minute"
 msgstr "Minuto de comezo da xornada laboral"
 
@@ -3098,7 +2738,7 @@ msgstr "O obxecto non Ã© vÃ¡lido"
 
 #: ../calendar/gui/calendar-view-factory.c:117
 msgid "Day View"
-msgstr "VisualizaciÃ³n diaria"
+msgstr "Vista diaria"
 
 #: ../calendar/gui/calendar-view-factory.c:120
 msgid "Work Week View"
@@ -3106,11 +2746,11 @@ msgstr "VisualizaciÃ³n de semana laboral"
 
 #: ../calendar/gui/calendar-view-factory.c:123
 msgid "Week View"
-msgstr "VisualizaciÃ³n semanal"
+msgstr "Vista semanal"
 
 #: ../calendar/gui/calendar-view-factory.c:126
 msgid "Month View"
-msgstr "VisualizaciÃ³n mensual"
+msgstr "Vista mensual"
 
 #: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:3
@@ -3138,17 +2778,17 @@ msgid "Classification"
 msgstr "ClasificaciÃ³n"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:571 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-task-table.c:490
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:514
+#: ../widgets/misc/e-attachment-tree-view.c:524
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "DescriciÃ³n"
@@ -3169,7 +2809,7 @@ msgid "Exist"
 msgstr "Existe"
 
 #: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
@@ -3182,25 +2822,26 @@ msgid "Organizer"
 msgstr "Organizador"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:569 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privado"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-cal-model.c:567
-#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:514 ../calendar/gui/e-cal-model.c:521
+#: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "PÃºblico"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:300
+#: ../calendar/gui/dialogs/event-editor.c:322
+#: ../calendar/gui/dialogs/event-editor.c:343
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Recorrencia"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
@@ -3262,6 +2903,7 @@ msgid "Add Alarm"
 msgstr "Engadir alarma"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+#: ../calendar/gui/dialogs/event-editor.c:360
 msgid "Alarm"
 msgstr "Alarmas"
 
@@ -3277,7 +2919,7 @@ msgstr "Son de alarma personalizado"
 msgid "Mes_sage:"
 msgstr "Mensa_xes:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:81
 msgid "Options"
 msgstr "_OpciÃ³ns"
 
@@ -3318,17 +2960,15 @@ msgid "before"
 msgstr "Ã© anterior a"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
 msgid "day(s)"
 msgstr "dÃas"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-contacts-source.c:336
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:37
 msgid "days"
 msgstr "dÃas"
 
@@ -3336,19 +2976,20 @@ msgstr "dÃas"
 msgid "end of appointment"
 msgstr "Cita nova"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "tempos adicionais a cada"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
 msgstr "horas"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
 msgstr "minutos"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
 msgstr "localizaciÃ³n da cita"
 
@@ -3362,36 +3003,36 @@ msgstr "Enga_dir"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 msgid "Alarms"
 msgstr "Alarmas"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:108
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
 #: ../calendar/gui/e-day-view-time-item.c:797
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
 #: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:343
+#: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "Seleccionar..."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:503
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:504
 msgid "Selected Calendars for Alarms"
 msgstr "Seleccionar calendario para alarmas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:797
-msgid "Time and date:"
-msgstr "Hora e data:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
+msgid "Ti_me and date:"
+msgstr "_Hora e data:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:798
-msgid "Date only:"
-msgstr "SÃ³ data:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+msgid "_Date only:"
+msgstr "SÃ³ _data:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
@@ -3402,7 +3043,7 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
 msgid "(Shown in a Day View)"
-msgstr "(Mostrar nunha VisualizaciÃ³n diaria)"
+msgstr "(Mostrar nunha Vista diaria)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
 msgid "05 minutes"
@@ -3424,13 +3065,13 @@ msgstr "minutos"
 msgid "60 minutes"
 msgstr "minutos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
 msgid "Alerts"
 msgstr "Alarmas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
-#: ../modules/addressbook/autocompletion-config.c:153
+#: ../mail/mail-config.ui.h:30
+#: ../modules/addressbook/autocompletion-config.c:156
 msgid "Date/Time Format"
 msgstr "Data/Formato de hora"
 
@@ -3455,20 +3096,20 @@ msgid "Display alarms in _notification area only"
 msgstr "Mostrar as alertas sÃ³ na Ã¡rea de _notificaciÃ³n"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Venres"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
-#: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2667
+#: ../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:200 ../mail/mail-config.ui.h:56
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2678
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "Xeral"
 
@@ -3481,190 +3122,196 @@ msgid "Minutes"
 msgstr "minutos"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Luns"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:85
 msgid "Pick a color"
 msgstr "Seleccionar unha cor"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
 msgid "S_un"
 msgstr "_Dom"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "SÃ¡bado"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
 msgid "Sc_roll Month View by a week"
 msgstr "Desp_razar a vista de mes por semana"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Se_cond zone:"
 msgstr "Seg_undo fuso horario:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Select the calendars for alarm notification"
 msgstr "Seleccione os calendarios para a notificaciÃ³n de alarma"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
 msgid "Sh_ow a reminder"
 msgstr "M_ostrar un aviso"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
 msgid "Show a _reminder"
 msgstr "Mostrar un a_viso"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
-msgid "Show week _numbers in date navigator"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
+msgid "Show week _numbers"
 msgstr "Mostrar os _nÃºmeros das semanas no navegador de datas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
-msgid "Show week n_umber in Day and Work Week View"
-msgstr ""
-"Mostrar o _nÃºmero de semana nas visualizaciÃ³ns Diaria e de Semana laborÃ¡bel"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Domingo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "T_asks due today:"
 msgstr "T_arefas que vencen hoxe:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_hu"
 msgstr "_Xov"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "Lista de tarefas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "Template:"
 msgstr "Modelo:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Xoves"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:595
 msgid "Time"
 msgstr "Hora"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Time _zone:"
 msgstr "Fuso _horario:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 msgid "Time format:"
 msgstr "Formato da hora:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Martes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Use s_ystem time zone"
 msgstr "Empregar o fuso horario do s_istema"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "MÃ©rcores"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 msgid "Wee_k starts on:"
 msgstr "A _semana comeza en:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Work Week"
 msgstr "Semana laboral"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Work days:"
 msgstr "DÃas laborÃ¡beis:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Pedir confirmaciÃ³n ao eliminar elementos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Compress weekends in month view"
-msgstr "_Comprimir as fins de semana na visualizaciÃ³n mensual"
+msgstr "_Comprimir as fins de semana na vista mensual"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Day begins:"
 msgstr "A _xornada comeza Ã¡s:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Fri"
 msgstr "_Ven"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Hide completed tasks after"
 msgstr "_Ocultar as tarefas terminadas despois de"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Mon"
 msgstr "_Lun"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Overdue tasks:"
 msgstr "Tarefas _atrasadas:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Sat"
 msgstr "_SÃ¡b"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.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 vistas semanal e mensual"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Time divisions:"
 msgstr "Di_visiÃ³ns horarias:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Tue"
 msgstr "_Mar"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Wed"
 msgstr "MÃ©_r"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "before every anniversary/birthday"
 msgstr "antes de cada data especial ou aniversario"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every appointment"
 msgstr "antes de cada cita"
 
@@ -3673,15 +3320,15 @@ msgid "Type:"
 msgstr "Tipo:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
+#: ../modules/addressbook/addressbook-config.c:510
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:165
+#: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:282
+#: ../widgets/misc/e-signature-script-dialog.c:286
 msgid "_Name:"
 msgstr "_Nome:"
 
@@ -3702,35 +3349,35 @@ msgstr ""
 "Copia_r localmente os contidos da lista de notas para unha operaciÃ³n sen "
 "conexiÃ³n"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "Colo_r:"
 msgstr "Co_r:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "Lista de notas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "Propiedades do calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "Calendario novo"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "Propiedades da lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
 msgstr "Lista de tarefas nova"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
 msgstr "Propiedades da lista de notas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
 msgstr "Lista de notas nova"
 
@@ -3787,266 +3434,251 @@ 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:191 ../calendar/gui/print.c:2418
-msgid " to "
-msgstr " para "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr " (Terminada "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "Terminada "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr " (Pendente "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "Pendente "
-
-#: ../calendar/gui/dialogs/comp-editor.c:248
+#: ../calendar/gui/dialogs/comp-editor.c:246
 msgid "Could not save attachments"
 msgstr "Non foi posÃbel gardar os anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:516
+#: ../calendar/gui/dialogs/comp-editor.c:522
 msgid "Could not update object"
 msgstr "Non foi posÃbel actualizar o obxecto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:615
+#: ../calendar/gui/dialogs/comp-editor.c:637
 msgid "Edit Appointment"
 msgstr "Editar cita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:644
 #, c-format
 msgid "Meeting - %s"
 msgstr "ReuniÃ³n - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:624
+#: ../calendar/gui/dialogs/comp-editor.c:646
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:630
+#: ../calendar/gui/dialogs/comp-editor.c:652
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarefa asignada - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:632
+#: ../calendar/gui/dialogs/comp-editor.c:654
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:637
+#: ../calendar/gui/dialogs/comp-editor.c:659
 #, c-format
 msgid "Memo - %s"
 msgstr "Nota - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:653
+#: ../calendar/gui/dialogs/comp-editor.c:675
 msgid "No Summary"
 msgstr "Sen resumo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:762
+#: ../calendar/gui/dialogs/comp-editor.c:786
 msgid "Keep original item?"
 msgstr "Quere gardar o elemento orixinal?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:949
+#: ../calendar/gui/dialogs/comp-editor.c:983
 msgid "Click here to close the current window"
 msgstr "Prema aquÃ para pechar a xanela actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:956 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1460
-#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:391 ../widgets/misc/e-web-view.c:969
+#: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:117
+#: ../shell/e-shell-window-actions.c:1454
+#: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:552
+#: ../widgets/misc/e-web-view.c:413 ../widgets/misc/e-web-view.c:1066
 msgid "Copy the selection"
 msgstr "Copiar a selecciÃ³n"
 
-#: ../calendar/gui/dialogs/comp-editor.c:963 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1467
-#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:963
+#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:124
+#: ../shell/e-shell-window-actions.c:1461
+#: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:547
+#: ../widgets/misc/e-web-view.c:1060
 msgid "Cut the selection"
 msgstr "Cortar a selecciÃ³n"
 
-#: ../calendar/gui/dialogs/comp-editor.c:970
-#: ../shell/e-shell-window-actions.c:1474
-#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
+#: ../calendar/gui/dialogs/comp-editor.c:1004
+#: ../shell/e-shell-window-actions.c:1468
+#: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:562
 msgid "Delete the selection"
 msgstr "Cortar a selecciÃ³n"
 
-#: ../calendar/gui/dialogs/comp-editor.c:977
+#: ../calendar/gui/dialogs/comp-editor.c:1011
 msgid "Click here to view help available"
 msgstr "Prema aquÃ para ver a axuda dispoÃ±Ãbel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:984 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1509
-#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:975
+#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:131
+#: ../shell/e-shell-window-actions.c:1503
+#: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:557
+#: ../widgets/misc/e-web-view.c:1072
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do portapapeis"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1005
+#: ../calendar/gui/dialogs/comp-editor.c:1039
 msgid "Click here to save the current window"
 msgstr "Prema aquÃ para gardar a xanela actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1012 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1579
-#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
+#: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:138
+#: ../shell/e-shell-window-actions.c:1573
+#: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:567
 msgid "Select all text"
 msgstr "Seleccionar todo o texto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1019
+#: ../calendar/gui/dialogs/comp-editor.c:1053
 msgid "_Classification"
 msgstr "_ClasificaciÃ³n"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1033 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1628
-#: ../widgets/misc/e-signature-editor.c:217
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:152
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../shell/e-shell-window-actions.c:1608
+#: ../widgets/menus/gal-define-views.ui.h:5
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:145
+#: ../shell/e-shell-window-actions.c:1615
+#: ../widgets/misc/e-signature-editor.c:220
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1040
-#: ../shell/e-shell-window-actions.c:1635
+#: ../calendar/gui/dialogs/comp-editor.c:1074
+#: ../shell/e-shell-window-actions.c:1622
 msgid "_Help"
 msgstr "A_xuda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1047
+#: ../calendar/gui/dialogs/comp-editor.c:1081
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1054
-#: ../composer/e-composer-actions.c:312
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../composer/e-composer-actions.c:315
 msgid "_Options"
 msgstr "_OpciÃ³ns"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1061 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:159
+#: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "_Ver"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1071
-#: ../composer/e-composer-actions.c:240
+#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../composer/e-composer-actions.c:243
 msgid "_Attachment..."
 msgstr "_Anexo..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../calendar/gui/dialogs/comp-editor.c:1107
 msgid "Click here to attach a file"
 msgstr "Prema aquÃ para anexar un ficheiro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "_Categories"
 msgstr "_CategorÃas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "Toggles whether to display categories"
 msgstr "Alterna entre se se mostran as categorÃas ou non"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Time _Zone"
 msgstr "_Fuso horario"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1091
+#: ../calendar/gui/dialogs/comp-editor.c:1125
 msgid "Toggles whether the time zone is displayed"
 msgstr "Alterna entre se se mostra ou non o campo Fuso horario"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1134
 msgid "Pu_blic"
 msgstr "PÃº_blico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "Classify as public"
 msgstr "Clasificar como pÃºblico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1107
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "_Private"
 msgstr "_Privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1109
+#: ../calendar/gui/dialogs/comp-editor.c:1143
 msgid "Classify as private"
 msgstr "Clasificar como privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1114
+#: ../calendar/gui/dialogs/comp-editor.c:1148
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1116
+#: ../calendar/gui/dialogs/comp-editor.c:1150
 msgid "Classify as confidential"
 msgstr "Clasificar como confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1124
+#: ../calendar/gui/dialogs/comp-editor.c:1158
 msgid "R_ole Field"
 msgstr "Campo de _rol"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1126
+#: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "Toggles whether the Role field is displayed"
 msgstr "Alterna entre se se mostra o campo Rol ou non"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
+#: ../calendar/gui/dialogs/comp-editor.c:1166
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1134
+#: ../calendar/gui/dialogs/comp-editor.c:1168
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Alterna entre se se mostra o campo RSVP ou non"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1140
+#: ../calendar/gui/dialogs/comp-editor.c:1174
 msgid "_Status Field"
 msgstr "Campo de e_stado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1142
+#: ../calendar/gui/dialogs/comp-editor.c:1176
 msgid "Toggles whether the Status field is displayed"
 msgstr "Alterna entre se se mostra o campo Estado ou non"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1148
+#: ../calendar/gui/dialogs/comp-editor.c:1182
 msgid "_Type Field"
 msgstr "Campo _tipo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1150
+#: ../calendar/gui/dialogs/comp-editor.c:1184
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Alterna entre se mostrar o Tipo de participante ou non"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1174
+#: ../calendar/gui/dialogs/comp-editor.c:1208
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "_Documentos recentes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1702
-#: ../composer/e-composer-actions.c:436
+#: ../calendar/gui/dialogs/comp-editor.c:1743
+#: ../composer/e-composer-actions.c:431
 msgid "Attach"
 msgstr "Anexar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1757
-msgid "Save"
-msgstr "Gardar"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2041
-#: ../calendar/gui/dialogs/comp-editor.c:2090
-#: ../calendar/gui/dialogs/comp-editor.c:2983
+#: ../calendar/gui/dialogs/comp-editor.c:2072
+#: ../calendar/gui/dialogs/comp-editor.c:2121
+#: ../calendar/gui/dialogs/comp-editor.c:3086
 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:2951
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "anexo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3013
+#: ../calendar/gui/dialogs/comp-editor.c:3118
 msgid "Unable to use current version!"
 msgstr "Non Ã© posÃbel usar a versiÃ³n actual!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:91
+#: ../calendar/gui/dialogs/copy-source-dialog.c:92
 msgid "Could not open source"
 msgstr "Non foi posÃbel abrir a orixe"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:99
+#: ../calendar/gui/dialogs/copy-source-dialog.c:100
 msgid "Could not open destination"
 msgstr "Non foi posÃbel abrir o destino"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:108
+#: ../calendar/gui/dialogs/copy-source-dialog.c:109
 msgid "Destination is read only"
 msgstr "O destino Ã© sÃ³ de lectura"
 
@@ -4056,53 +3688,73 @@ msgstr ""
 "Quere e_liminar este elemento das caixas de correo de todos os outros "
 "destinatarios?"
 
-#: ../calendar/gui/dialogs/delete-error.c:55
-msgid "The event could not be deleted due to a corba error"
-msgstr "Non foi posÃbel eliminar a actividade debido a un erro de Corba"
+#: ../calendar/gui/dialogs/delete-comp.c:217
+msgid "_Retract comment"
+msgstr "_Retirar comentario"
 
-#: ../calendar/gui/dialogs/delete-error.c:58
-msgid "The task could not be deleted due to a corba error"
-msgstr "Non foi posÃbel eliminar a tarefa debido a un erro de Corba"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:56
+#, c-format
+msgid "The event could not be deleted due to a dbus error: %s"
+msgstr "Non foi posÃbel eliminar o evento debido a un erro: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:61
-msgid "The memo could not be deleted due to a corba error"
-msgstr "Non foi posÃbel eliminar a nota debido a un erro de Corba"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:60
+#, c-format
+msgid "The task could not be deleted due to a dbus error: %s"
+msgstr "Non foi posÃbel eliminar a tarefa debido a un erro: %s"
 
+#. Translators: The '%s' is replaced with a detailed error message
 #: ../calendar/gui/dialogs/delete-error.c:64
-msgid "The item could not be deleted due to a corba error"
-msgstr "Non foi posÃbel eliminar o elemento debido a un erro de Corba"
+#, c-format
+msgid "The memo could not be deleted due to a dbus error: %s"
+msgstr "Non foi posÃbel eliminar o recordatorio debido a un erro: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:68
+#, c-format
+msgid "The item could not be deleted due to a dbus error: %s"
+msgstr "Non foi posÃbel eliminar o elemento debido a un erro: %s"
+
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The event could not be deleted because permission was denied"
 msgstr "Non foi posÃbel eliminar o evento porque se denegou o permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The task could not be deleted because permission was denied"
 msgstr "Non foi posÃbel eliminar a tarefa porque se denegou o permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:81
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Non foi posÃbel eliminar o recordatorio porque se denegou o permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:80
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The item could not be deleted because permission was denied"
 msgstr "Non foi posÃbel eliminar o elemento porque se denegou o permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:87
-msgid "The event could not be deleted due to an error"
-msgstr "Non foi posÃbel eliminar o evento debido a un erro"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:92
+#, c-format
+msgid "The event could not be deleted due to an error: %s"
+msgstr "Non foi posÃbel eliminar o evento debido a un erro: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
-msgid "The task could not be deleted due to an error"
-msgstr "Non foi posÃbel eliminar a tarefa debido a un erro"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:96
+#, c-format
+msgid "The task could not be deleted due to an error: %s"
+msgstr "Non foi posÃbel eliminar a tarefa debido a un erro: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
-msgid "The memo could not be deleted due to an error"
-msgstr "Non foi posÃbel eliminar o recordatorio debido a un erro"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:100
+#, c-format
+msgid "The memo could not be deleted due to an error: %s"
+msgstr "Non foi posÃbel eliminar o recordatorio debido a un erro: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:96
-msgid "The item could not be deleted due to an error"
-msgstr "Non foi posÃbel eliminar o elemento debido a un erro"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:104
+#, c-format
+msgid "The item could not be deleted due to an error: %s"
+msgstr "Non foi posÃbel eliminar o elemento debido a un erro: %s"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
@@ -4116,140 +3768,154 @@ msgstr "Delegar en:"
 msgid "Enter Delegate"
 msgstr "Introducir delegado"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:217
 msgid "_Alarms"
 msgstr "_Alarmas"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:219
 msgid "Click here to set or unset alarms for this event"
 msgstr ""
 "Prema aquÃ para configurar ou desconfigurar as alarmas para este actividade"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/event-editor.c:227
 msgid "Show Time as _Busy"
 msgstr "Mostrar hora como oc_upada"
 
-#: ../calendar/gui/dialogs/event-editor.c:213
+#: ../calendar/gui/dialogs/event-editor.c:229
 msgid "Toggles whether to show time as busy"
 msgstr "Alterna entre se se mostran as horas como ocupadas ou non"
 
-#: ../calendar/gui/dialogs/event-editor.c:222
+#: ../calendar/gui/dialogs/event-editor.c:238
 msgid "_Recurrence"
 msgstr "_Recorrencia"
 
-#: ../calendar/gui/dialogs/event-editor.c:224
+#: ../calendar/gui/dialogs/event-editor.c:240
 msgid "Make this a recurring event"
 msgstr "Converter en actividade recorrente"
 
-#: ../calendar/gui/dialogs/event-editor.c:229
+#: ../calendar/gui/dialogs/event-editor.c:245
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
-#: ../widgets/misc/e-send-options.ui.h:17
+#: ../plugins/groupwise-features/send-options.c:212
+#: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "OpciÃ³ns de envÃo"
 
-#: ../calendar/gui/dialogs/event-editor.c:231
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/task-editor.c:129
 msgid "Insert advanced send options"
 msgstr "Inserir opciÃ³ns avanzadas de envÃo"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:255
 msgid "All _Day Event"
 msgstr "Evento de _dÃa completo"
 
-#: ../calendar/gui/dialogs/event-editor.c:241
+#: ../calendar/gui/dialogs/event-editor.c:257
 msgid "Toggles whether to have All Day Event"
 msgstr "Alterna entre se se ten un actividade de dÃa completo ou non"
 
-#: ../calendar/gui/dialogs/event-editor.c:250
+#: ../calendar/gui/dialogs/event-editor.c:266
 msgid "_Free/Busy"
 msgstr "_DispoÃ±ibilidade"
 
-#: ../calendar/gui/dialogs/event-editor.c:252
+#: ../calendar/gui/dialogs/event-editor.c:268
 msgid "Query free / busy information for the attendees"
 msgstr "Consultar informaciÃ³n de dispoÃ±ibilidade para os participantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:297
-msgid "Appoint_ment"
-msgstr "_Cita"
+#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2610
+msgid "Appointment"
+msgstr "Cita"
+
+#: ../calendar/gui/dialogs/event-editor.c:385
+#: ../calendar/gui/dialogs/event-page.ui.h:3
+#: ../calendar/gui/e-meeting-list-view.c:148
+msgid "Attendees"
+msgstr "Participantes"
+
+#: ../calendar/gui/dialogs/event-editor.c:578
+msgid "Print this event"
+msgstr "Imprimir esta evento"
 
-#: ../calendar/gui/dialogs/event-page.c:751
+#: ../calendar/gui/dialogs/event-page.c:766
+msgid "Event's start time is in the past"
+msgstr "A hora de inicio do evento estÃ¡ no pasado"
+
+#: ../calendar/gui/dialogs/event-page.c:807
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr ""
 "Incluso se non pode ser editada, porque o calendario seleccionado Ã© de sÃ³ "
 "lectura"
 
-#: ../calendar/gui/dialogs/event-page.c:755
+#: ../calendar/gui/dialogs/event-page.c:811
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr ""
 "Incluso se non pode ser totalmente editada porque vostede Ã© o organizador"
 
-#: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2725
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../calendar/gui/dialogs/event-page.c:2775
 msgid "This event has alarms"
 msgstr "Este actividade ten alarmas"
 
-#: ../calendar/gui/dialogs/event-page.c:833
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.c:890
+#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
-#: ../calendar/gui/dialogs/event-page.c:880
+#: ../calendar/gui/dialogs/event-page.c:937
 msgid "_Delegatees"
 msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.c:939
 msgid "Atte_ndees"
 msgstr "_Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:1097
+#: ../calendar/gui/dialogs/event-page.c:1154
 msgid "Event with no start date"
 msgstr "Actividade sen data de comezo"
 
-#: ../calendar/gui/dialogs/event-page.c:1100
+#: ../calendar/gui/dialogs/event-page.c:1157
 msgid "Event with no end date"
 msgstr "Actividade sen data de finalizaciÃ³n"
 
-#: ../calendar/gui/dialogs/event-page.c:1271
-#: ../calendar/gui/dialogs/memo-page.c:658
-#: ../calendar/gui/dialogs/task-page.c:864
+#: ../calendar/gui/dialogs/event-page.c:1328
+#: ../calendar/gui/dialogs/memo-page.c:686
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "Start date is wrong"
 msgstr "A data de comezo Ã© incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1281
+#: ../calendar/gui/dialogs/event-page.c:1338
 msgid "End date is wrong"
 msgstr "A data de finalizaciÃ³n Ã© incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1304
+#: ../calendar/gui/dialogs/event-page.c:1361
 msgid "Start time is wrong"
 msgstr "A hora de comezo Ã© incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1311
+#: ../calendar/gui/dialogs/event-page.c:1368
 msgid "End time is wrong"
 msgstr "A hora de finalizaciÃ³n Ã© incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1473
-#: ../calendar/gui/dialogs/memo-page.c:699
-#: ../calendar/gui/dialogs/task-page.c:924
+#: ../calendar/gui/dialogs/event-page.c:1530
+#: ../calendar/gui/dialogs/memo-page.c:727
+#: ../calendar/gui/dialogs/task-page.c:967
 msgid "The organizer selected no longer has an account."
 msgstr "O organizador seleccionado xa non ten unha conta."
 
-#: ../calendar/gui/dialogs/event-page.c:1479
-#: ../calendar/gui/dialogs/memo-page.c:705
-#: ../calendar/gui/dialogs/task-page.c:930
+#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/memo-page.c:733
+#: ../calendar/gui/dialogs/task-page.c:973
 msgid "An organizer is required."
 msgstr "RequÃrese un organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1504
-#: ../calendar/gui/dialogs/task-page.c:954
+#: ../calendar/gui/dialogs/event-page.c:1561
+#: ../calendar/gui/dialogs/task-page.c:997
 msgid "At least one attendee is required."
 msgstr "RequÃrese polo menos un participante."
 
-#: ../calendar/gui/dialogs/event-page.c:2598
+#: ../calendar/gui/dialogs/event-page.c:2649
 #, c-format
 msgid "Unable to open the calendar '%s'."
-msgstr "Non foi posÃbel abrir o calendario '%s'."
+msgstr "Non foi posÃbel abrir o calendario Â«%sÂ»."
 
 #. Translators: This string is used when we are creating an Event
 #. (meeting or appointment)  on behalf of some other user
@@ -4257,132 +3923,146 @@ msgstr "Non foi posÃbel abrir o calendario '%s'."
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2642
-#: ../calendar/gui/dialogs/memo-page.c:917
-#: ../calendar/gui/dialogs/task-page.c:1746
+#: ../calendar/gui/dialogs/event-page.c:2693
+#: ../calendar/gui/dialogs/memo-page.c:946
+#: ../calendar/gui/dialogs/task-page.c:1787
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "EstÃ¡ actuando no nome de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2944
+#: ../calendar/gui/dialogs/event-page.c:2994
 #, 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:2950
+#: ../calendar/gui/dialogs/event-page.c:3000
 #, 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:2956
+#: ../calendar/gui/dialogs/event-page.c:3006
 #, 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:2969
+#: ../calendar/gui/dialogs/event-page.c:3019
 msgid "Customize"
 msgstr "Personalizar"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2971
+#: ../calendar/gui/dialogs/event-page.c:3021
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-msgid "1 day before appointment"
-msgstr "%d dÃa antes da cita"
-
 #: ../calendar/gui/dialogs/event-page.ui.h:2
-msgid "1 hour before appointment"
-msgstr "%d hora antes da cita"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:3
-msgid "15 minutes before appointment"
-msgstr "%d minuto antes da cita"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
-msgstr "Participante_s..."
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
+msgstr "Participa_ntes..."
 
 #: ../calendar/gui/dialogs/event-page.ui.h:6
-#: ../calendar/gui/e-meeting-list-view.c:148
-msgid "Attendees"
-msgstr "Participantes"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Custom Alarm:"
 msgstr "Alarma personalizada:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 msgid "Event Description"
 msgstr "DescriciÃ³n da actividade"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "Resu_mo:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "_Alarm"
 msgstr "_Alarma"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:345
+#: ../widgets/misc/e-attachment-dialog.c:349
 msgid "_Description:"
 msgstr "_DescriciÃ³n:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "_LocalizaciÃ³n:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+msgid "_Summary:"
+msgstr "_Resumo:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "_Time:"
 msgstr "_Hora:"
 
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#| msgid "1 day before appointment"
+msgctxt "eventpage"
+msgid "1 day before appointment"
+msgstr "1 dÃa antes da cita"
+
+#. TRANSLATORS: Predefined alarm's description
 #: ../calendar/gui/dialogs/event-page.ui.h:19
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+#| msgid "1 hour before appointment"
+msgctxt "eventpage"
+msgid "1 hour before appointment"
+msgstr "1 hora antes da cita"
+
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:21
+#| msgid "15 minutes before appointment"
+msgctxt "eventpage"
+msgid "15 minutes before appointment"
+msgstr "15 minutos antes da cita"
+
+#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+#| msgid "for"
+msgctxt "eventpage"
 msgid "for"
-msgstr "cuarto"
+msgstr "durante"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
+#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+#| msgid "until"
+msgctxt "eventpage"
 msgid "until"
-msgstr ""
-"para\n"
-"atÃ©"
+msgstr "atÃ©"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2614
 msgid "Memo"
 msgstr "Nota"
 
-#: ../calendar/gui/dialogs/memo-page.c:350
+#: ../calendar/gui/dialogs/memo-editor.c:156
+msgid "Print this memo"
+msgstr "Imprimir esta nota"
+
+#: ../calendar/gui/dialogs/memo-page.c:338
+msgid "Memo's start date is in the past"
+msgstr "A hora de inicio da nota non estÃ¡ no pasado"
+
+#: ../calendar/gui/dialogs/memo-page.c:376
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "A nota non pode ser editada porque a nota solicitado Ã© de sÃ³ lectura"
 
-#: ../calendar/gui/dialogs/memo-page.c:354
+#: ../calendar/gui/dialogs/memo-page.c:380
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "A nota non pode ser totalmente editada porque vostede Ã© o organizador"
 
-#: ../calendar/gui/dialogs/memo-page.c:878
+#: ../calendar/gui/dialogs/memo-page.c:907
 #, c-format
 msgid "Unable to open memos in '%s'."
-msgstr "Non Ã© posÃbel abrir as notas en '%s'."
+msgstr "Non Ã© posÃbel abrir as notas en Â«%sÂ»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1045 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:963 ../mail/em-format-html.c:2246
-#: ../mail/em-format-html.c:2305 ../mail/em-format-html.c:2329
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:80
+#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:270
+#: ../em-format/em-format.c:1040 ../mail/em-format-html.c:2289
+#: ../mail/em-format-html.c:2348 ../mail/em-format-html.c:2372
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "Para"
 
@@ -4391,68 +4071,73 @@ msgstr "Para"
 msgid "Sta_rt date:"
 msgstr "Data de _comezo:"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "Resu_mo:"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "_Para:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:383
+#: ../calendar/gui/dialogs/task-page.c:426
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "EstÃ¡ modificando unha actividade recorrente. Que quere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "EstÃ¡ delegando unha actividade recorrente. Que quere delegar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "EstÃ¡ modificando unha tarefa recorrente. Que quere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "EstÃ¡ modificando unha nota recorrente. Que Ã© o que quere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "Unicamente esta instancia"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "Esta instancia e as anteriores"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "Esta instancia e as futuras"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "Todas as instancias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 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:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "A data da recorrencia non Ã© vÃ¡lida"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:934
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "End time of the recurrence was before event's start"
 msgstr ""
 "A hora de finalizaciÃ³n da recorrencia era anterior Ã¡ do comezo do actividade"
 
 #. 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:963
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "en"
 
@@ -4460,7 +4145,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:1020
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "primeiro"
 
@@ -4469,7 +4154,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:1026
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "segundo"
 
@@ -4477,7 +4162,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:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "terceiro"
 
@@ -4485,7 +4170,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:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "cuarto"
 
@@ -4493,7 +4178,7 @@ msgstr "cuarto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fifth"
 msgstr "quinto"
 
@@ -4501,13 +4186,13 @@ msgstr "quinto"
 #. * (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:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 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:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Outra data"
 
@@ -4515,7 +4200,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:1076
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "Do 1 ao 10"
 
@@ -4523,7 +4208,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:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "do 11 ao 20"
 
@@ -4531,45 +4216,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:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 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
+#. (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:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 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:1242
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "no"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "apariciÃ³ns"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2122
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
 msgid "Add exception"
 msgstr "Engadir excepciÃ³n"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2163
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
 msgstr "Non foi posÃbel obter unha selecciÃ³n para modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2169
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
 msgstr "Modificar excepciÃ³n"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2213
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
 msgstr "Non foi posÃbel obter unha selecciÃ³n para eliminar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2352
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
 msgstr "Data e hora"
 
@@ -4581,7 +4266,7 @@ msgstr "Cada"
 msgid "Exceptions"
 msgstr "<b>ExcepciÃ³ns</b>"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:89
 msgid "Preview"
 msgstr "_PrevisualizaciÃ³n"
 
@@ -4589,48 +4274,90 @@ msgstr "_PrevisualizaciÃ³n"
 msgid "This appointment rec_urs"
 msgstr "Esta cita r_epÃtese"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
-msgid "forever"
-msgstr "Nunca"
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+msgctxt "recurrpage"
+msgid "day(s)"
+msgstr "dÃas()"
 
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:10
-msgid "month(s)"
-msgstr "Mes"
+msgctxt "recurrpage"
+msgid "for"
+msgstr "por"
 
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+#| msgid "forever"
+msgctxt "recurrpage"
+msgid "forever"
+msgstr "para sempre"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
+#| msgid "month(s)"
+msgctxt "recurrpage"
+msgid "month(s)"
+msgstr "mes(es)"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
+msgctxt "recurrpage"
+msgid "until"
+msgstr "atÃ©"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
+#| msgid "week(s)"
+msgctxt "recurrpage"
 msgid "week(s)"
-msgstr "semanas"
+msgstr "semana(s)"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+#| msgid "year(s)"
+msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
 msgstr "Enviar as miÃ±as alarmas con este actividade"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:164
 msgid "Notify new attendees _only"
 msgstr "Notificar mensaxes n_ovas"
 
-#: ../calendar/gui/dialogs/task-details-page.c:379
-#: ../calendar/gui/dialogs/task-details-page.c:399
+#: ../calendar/gui/dialogs/task-details-page.c:350
+#: ../calendar/gui/dialogs/task-details-page.c:372
 msgid "Completed date is wrong"
 msgstr "A data de finalizaciÃ³n Ã© incorrecta"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:483
 msgid "Web Page"
 msgstr "PÃ¡xina web"
 
 #. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:588
+#: ../calendar/gui/print.c:2697 ../mail/em-sync-stream.c:151
+#: ../mail/em-sync-stream.c:178 ../mail/em-sync-stream.c:199
+#, c-format
+msgid "Canceled"
+msgstr "Cancelado"
+
+#. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
 #: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2694 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "Terminada"
@@ -4638,48 +4365,48 @@ msgstr "Terminada"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1178 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1183 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "Alta"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2691
 msgid "In Progress"
 msgstr "En progreso"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1176 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1181 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "Baixa"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1315 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1177
-#: ../widgets/misc/e-send-options.ui.h:11
+#: ../calendar/gui/e-cal-model.c:1269 ../calendar/gui/e-task-table.c:512
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1182
+#: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "Normal"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2688 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
-msgstr "Non Iniciada"
+msgstr "Non iniciada"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:16
 msgid "P_ercent complete:"
@@ -4693,8 +4420,8 @@ msgstr "Esta_do:"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-calendar-view.c:1773
+#: ../calendar/gui/e-meeting-list-view.c:594
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
@@ -4703,8 +4430,8 @@ msgstr "Estado"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "Indefinida"
 
@@ -4713,7 +4440,7 @@ msgid "_Date completed:"
 msgstr "_Data completada:"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Priority:"
 msgstr "_Prioridade:"
 
@@ -4721,54 +4448,63 @@ msgstr "_Prioridade:"
 msgid "_Web Page:"
 msgstr "PÃ¡xina _Web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:117
 msgid "_Status Details"
 msgstr "Detalles do e_stado"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:119
 msgid "Click to change or view the status details of the task"
 msgstr "Prema para cambiar ou ver os detalles da tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../calendar/gui/dialogs/task-editor.c:127
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "OpciÃ³n_s de envÃo"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
-msgid "_Task"
-msgstr "_Tarefa"
+#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2612
+#: ../widgets/misc/e-send-options.c:503
+msgid "Task"
+msgstr "Tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:331
 msgid "Task Details"
 msgstr "Detalles da tarefa"
 
-#: ../calendar/gui/dialogs/task-page.c:336
+#: ../calendar/gui/dialogs/task-editor.c:373
+msgid "Print this task"
+msgstr "Imprimir esta tarefa"
+
+#: ../calendar/gui/dialogs/task-page.c:343
+msgid "Task's start date is in the past"
+msgstr "A hora de inicio da tarefa estÃ¡ no padado"
+
+#: ../calendar/gui/dialogs/task-page.c:344
+msgid "Task's due date is in the past"
+msgstr "A data de vencemento da tarefa estÃ¡ no pasado"
+
+#: ../calendar/gui/dialogs/task-page.c:379
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr ""
 "A tarefa non pode ser editada porque a tarefa seleccionada Ã© de sÃ³ lectura"
 
-#: ../calendar/gui/dialogs/task-page.c:340
+#: ../calendar/gui/dialogs/task-page.c:383
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr ""
 "A tarefa non pode ser editada totalmente porque vostede non Ã© o organizador"
 
-#: ../calendar/gui/dialogs/task-page.c:391
+#: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zador:"
 
-#: ../calendar/gui/dialogs/task-page.c:837
+#: ../calendar/gui/dialogs/task-page.c:880
 msgid "Due date is wrong"
 msgstr "A data de vencemento Ã© incorrecta"
 
-#: ../calendar/gui/dialogs/task-page.c:1703
+#: ../calendar/gui/dialogs/task-page.c:1744
 #, c-format
 msgid "Unable to open tasks in '%s'."
-msgstr "Non Ã© posÃbel abrir as tarefas en '%s'."
-
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-msgid "Atte_ndees..."
-msgstr "Participa_ntes..."
+msgstr "Non Ã© posÃbel abrir as tarefas en Â«%sÂ»."
 
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
@@ -4858,7 +4594,7 @@ msgstr "%s a %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de activador descoÃ±ecido"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:668
 msgid "Untitled"
 msgstr "Sen tÃtulo"
 
@@ -4867,7 +4603,7 @@ msgid "Categories:"
 msgstr "CategorÃas"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "Resumo:"
 
@@ -4882,8 +4618,8 @@ msgstr "Data de vencemento:"
 
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../calendar/gui/e-itip-control.c:1189
+#: ../plugins/itip-formatter/itip-view.c:1074
 msgid "Status:"
 msgstr "Estado:"
 
@@ -4892,8 +4628,8 @@ msgid "Priority:"
 msgstr "Prioridade:"
 
 #: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
+#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "DescriciÃ³n:"
 
@@ -4908,32 +4644,32 @@ msgstr "PÃ¡xina Web:"
 msgid "Created"
 msgstr "Creado"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
 msgid "End Date"
 msgstr "Data final"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Last modified"
 msgstr "Ã?ltimo modificado"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Data de inicio"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-task-table.c:563
 msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:564
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4944,63 +4680,47 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1321
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
 #: ../calendar/gui/e-meeting-store.c:856
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Si"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1321
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+#: ../calendar/gui/e-meeting-store.c:181
 msgid "No"
 msgstr "Non"
 
-#: ../calendar/gui/e-cal-model.c:378
-msgid "Default Client"
-msgstr "Cliente predefinido"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:551
-#: ../shell/e-shell.c:868
-msgid "Shell Settings"
-msgstr "ConfiguraciÃ³n do Exchange"
-
-#: ../calendar/gui/e-cal-model.c:389 ../calendar/gui/gnome-cal.c:552
-#: ../shell/e-shell.c:869
-msgid "Application-wide settings"
-msgstr "ConfiguraciÃ³n do completado automÃ¡tico"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:573 ../calendar/gui/e-itip-control.c:1197
-#: ../calendar/gui/e-itip-control.c:1336
+#: ../calendar/gui/e-cal-model.c:527 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.c:1349
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:932
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:967
+#: ../plugins/itip-formatter/itip-formatter.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2345
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "DescoÃ±ecido"
 
-#: ../calendar/gui/e-cal-model.c:1317
+#: ../calendar/gui/e-cal-model.c:1271
 msgid "Recurring"
 msgstr "Recorrencia"
 
-#: ../calendar/gui/e-cal-model.c:1319
+#: ../calendar/gui/e-cal-model.c:1273
 msgid "Assigned"
 msgstr "Asignada"
 
-#: ../calendar/gui/e-cal-model.c:2225
+#: ../calendar/gui/e-cal-model.c:2175
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
@@ -5037,97 +4757,97 @@ msgid "Start date"
 msgstr "Data de inicio"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-list-view.c:557
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:572
+#: ../widgets/misc/e-attachment-tree-view.c:582
 msgid "Type"
 msgstr "Tipo"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:407
 msgid "Cut selected events to the clipboard"
 msgstr "Cortar o texto seleccionado para o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:413
 msgid "Copy selected events to the clipboard"
 msgstr "Copiar o texto seleccionado ao portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:419
 msgid "Paste events from the clipboard"
 msgstr "Pegar eventos desde o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:425
 msgid "Delete selected events"
 msgstr "Eliminar os eventos seleccionados"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
-#: ../calendar/gui/e-task-table.c:265
+#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:188
+#: ../calendar/gui/e-task-table.c:266
 msgid "Deleting selected objects"
 msgstr "Eliminar os obxectos seleccionados"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:847
+#: ../calendar/gui/e-task-table.c:1070
 msgid "Updating objects"
 msgstr "Actualizando obxectos"
 
-#: ../calendar/gui/e-calendar-view.c:1690
-#: ../calendar/gui/e-itip-control.c:1182
+#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2326
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2333
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: ../calendar/gui/e-calendar-view.c:1691
-#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2332
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2339
 msgid "Declined"
 msgstr "Rexeitado"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1722
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "Provisional"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1723
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2342
 msgid "Delegated"
 msgstr "Delegado"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1724
 msgid "Needs action"
 msgstr "Necesita unha acciÃ³n"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:738
+#: ../calendar/gui/e-calendar-view.c:1868 ../calendar/gui/e-memo-table.c:530
+#: ../calendar/gui/e-task-table.c:745
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizador: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1872 ../calendar/gui/e-memo-table.c:535
+#: ../calendar/gui/e-task-table.c:748
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1888 ../calendar/gui/print.c:2646
 #, c-format
 msgid "Location: %s"
 msgstr "LocalizaciÃ³n: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1919
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -5170,8 +4890,8 @@ msgstr "Mostrar o fuso horario secundario"
 #. 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:864 ../calendar/gui/e-day-view.c:1883
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1878
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
@@ -5181,10 +4901,10 @@ msgstr "%A %d de %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1900
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:989
+#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1895
+#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../modules/calendar/e-cal-shell-view-private.c:1014
 msgid "%a %d %b"
 msgstr "%a, %d de %b"
 
@@ -5193,31 +4913,35 @@ msgstr "%a, %d de %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1916
-#: ../calendar/gui/e-week-view-main-item.c:245
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:1025
+#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1911
+#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../modules/calendar/e-cal-shell-view-private.c:1050
 msgid "%d %b"
 msgstr "%d de %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1116 ../calendar/gui/e-week-view.c:750
+#: ../calendar/gui/e-day-view.c:1077 ../calendar/gui/e-week-view.c:749
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1119 ../calendar/gui/e-week-view.c:753
+#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
 #: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2613
+#: ../calendar/gui/e-day-view.c:2646
 #, c-format
 msgid "Week %d"
 msgstr "Semana %d"
 
+#: ../calendar/gui/e-itip-control.c:761
+msgid "Recurring:"
+msgstr "Recorrencia:"
+
 #: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Si. (Recorrencia complexa)"
@@ -5304,7 +5028,7 @@ msgstr "Finaliza"
 msgid "Due"
 msgstr "Vence"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
 msgid "iCalendar Information"
 msgstr "informaciÃ³n de iCalendar"
 
@@ -5313,313 +5037,313 @@ msgstr "informaciÃ³n de iCalendar"
 msgid "iCalendar Error"
 msgstr "Erro de iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
-#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:538
 msgid "An unknown person"
 msgstr "Unha persoa descoÃ±ecida"
 
-#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-itip-control.c:1145
 msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
+"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."
+"Revise a seguinte informaciÃ³n e escolla unha acciÃ³n do menÃº de embaixo."
 
 #. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../calendar/gui/e-itip-control.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:2320
 msgctxt "cal-itip"
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../plugins/itip-formatter/itip-formatter.c:2336
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: ../calendar/gui/e-itip-control.c:1277
+#: ../calendar/gui/e-itip-control.c:1290
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr ""
 "A cita foi cancelouse, porÃ©n non foi posÃbel encontralo nos seus calendarios"
 
-#: ../calendar/gui/e-itip-control.c:1279
+#: ../calendar/gui/e-itip-control.c:1292
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "A tarefa cancelouse, porÃ©n non foi posÃbel encontralo nas sÃºas listas de "
 "tarefas"
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> publicou informaciÃ³n sobre unha cita."
+msgid "%s has published meeting information."
+msgstr "%s publicou informaciÃ³n sobre unha cita."
 
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Information"
 msgstr "InformaciÃ³n da cita"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1376
 #, c-format
-msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr "<b>%s</b> solicita a presenza de %s nunha cita."
+msgid "%s requests the presence of %s at a meeting."
+msgstr "%s solicita a presenza de %s nunha cita."
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1378
 #, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> require a sÃºa presenza nunha cita."
+msgid "%s requests your presence at a meeting."
+msgstr "%s require a sÃºa presenza nunha cita."
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Proposal"
 msgstr "Proposta de cita"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
-msgstr "<b>%s</b> quere que se lle engada a unha cita existente."
+msgid "%s wishes to be added to an existing meeting."
+msgstr "%s quere que se lle engada a unha cita existente."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Update"
 msgstr "ActualizaciÃ³n da cita"
 
-#: ../calendar/gui/e-itip-control.c:1377
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> quere recibir a Ãºltima informaciÃ³n sobre a cita."
+msgid "%s wishes to receive the latest meeting information."
+msgstr "%s quere recibir a Ãºltima informaciÃ³n sobre a cita."
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Update Request"
 msgstr "Solicitude de actualizaciÃ³n da cita"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> respondeu a unha peticiÃ³n de cita."
+msgid "%s has replied to a meeting request."
+msgstr "%s respondeu a unha peticiÃ³n de cita."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Meeting Reply"
 msgstr "Resposta de cita"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1406
 #, c-format
-msgid "<b>%s</b> has canceled a meeting."
-msgstr "<b>%s</b> cancelou unha cita."
+msgid "%s has canceled a meeting."
+msgstr "%s cancelou unha cita."
 
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Meeting Cancelation"
 msgstr "CancelaciÃ³n da cita"
 
-#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
-#: ../calendar/gui/e-itip-control.c:1521
+#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
+#: ../calendar/gui/e-itip-control.c:1534
 #, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> enviou unha mensaxe inintelixÃbel."
+msgid "%s has sent an unintelligible message."
+msgstr "%s enviou unha mensaxe inintelixÃbel."
 
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1418
 msgid "Bad Meeting Message"
 msgstr "Mensaxe de cita incorrecta"
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1445
 #, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> publicou informaciÃ³n da tarefa."
+msgid "%s has published task information."
+msgstr "%s publicou informaciÃ³n da tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1446
 msgid "Task Information"
 msgstr "InformaciÃ³n da tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1453
 #, c-format
-msgid "<b>%s</b> requests %s to perform a task."
-msgstr "<b>%s</b> require a %s que efectÃºe unha tarefa."
+msgid "%s requests %s to perform a task."
+msgstr "%s require a %s que efectÃºe unha tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> require que efectÃºe unha tarefa."
+msgid "%s requests you perform a task."
+msgstr "%s require que efectÃºe unha tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Proposal"
 msgstr "Proposta de tarefa"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
-msgstr "<b>%s</b> quere que se lle engada a unha tarefa existente."
+msgid "%s wishes to be added to an existing task."
+msgstr "%s quere que se lle engada a unha tarefa existente."
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Update"
 msgstr "ActualizaciÃ³n de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1454
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> quere recibir a Ãºltima informaciÃ³n sobre a tarefa."
+msgid "%s wishes to receive the latest task information."
+msgstr "%s quere recibir a Ãºltima informaciÃ³n sobre a tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Update Request"
 msgstr "Solicitude de actualizaciÃ³n de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1475
 #, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> respondeu a unha asignaciÃ³n de tarefa."
+msgid "%s has replied to a task assignment."
+msgstr "%s respondeu a unha asignaciÃ³n de tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Task Reply"
 msgstr "Resposta de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1483
 #, c-format
-msgid "<b>%s</b> has canceled a task."
-msgstr "<b>%s</b> cancelou unha tarefa."
+msgid "%s has canceled a task."
+msgstr "%s cancelou unha tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Task Cancelation"
 msgstr "CancelaciÃ³n de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1495
 msgid "Bad Task Message"
 msgstr "Mensaxe de tarefa incorrecta"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1519
 #, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> publicou informaciÃ³n de dispoÃ±ibilidade."
+msgid "%s has published free/busy information."
+msgstr "%s publicou informaciÃ³n de dispoÃ±ibilidade."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1520
 msgid "Free/Busy Information"
 msgstr "InformaciÃ³n de dispoÃ±ibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1524
 #, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> require a sÃºa informaciÃ³n de dispoÃ±ibilidade."
+msgid "%s requests your free/busy information."
+msgstr "%s require a sÃºa informaciÃ³n de dispoÃ±ibilidade."
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1525
 msgid "Free/Busy Request"
 msgstr "Solicitude de dispoÃ±ibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1516
+#: ../calendar/gui/e-itip-control.c:1529
 #, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> respondeu a unha solicitude de dispoÃ±ibilidade."
+msgid "%s has replied to a free/busy request."
+msgstr "%s respondeu a unha solicitude de dispoÃ±ibilidade."
 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1530
 msgid "Free/Busy Reply"
 msgstr "Resposta de dispoÃ±ibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1535
 msgid "Bad Free/Busy Message"
 msgstr "Mensaxe incorrecta de dispoÃ±ibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1598
+#: ../calendar/gui/e-itip-control.c:1611
 msgid "The message does not appear to be properly formed"
 msgstr "A mensaxe non parece estar formada apropiadamente"
 
-#: ../calendar/gui/e-itip-control.c:1657
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The message contains only unsupported requests."
 msgstr "Esta mensaxe sÃ³ contÃ©n solicitudes non compatÃbeis."
 
-#: ../calendar/gui/e-itip-control.c:1690
+#: ../calendar/gui/e-itip-control.c:1703
 msgid "The attachment does not contain a valid calendar message"
 msgstr "O anexo non contÃ©n unha mensaxe de calendario vÃ¡lida"
 
-#: ../calendar/gui/e-itip-control.c:1728
+#: ../calendar/gui/e-itip-control.c:1741
 msgid "The attachment has no viewable calendar items"
 msgstr "O anexo non ten elementos de calendario visÃbeis"
 
-#: ../calendar/gui/e-itip-control.c:1970
+#: ../calendar/gui/e-itip-control.c:1983
 msgid "Update complete\n"
 msgstr "ActualizaciÃ³n terminada\n"
 
-#: ../calendar/gui/e-itip-control.c:2004
+#: ../calendar/gui/e-itip-control.c:2017
 msgid "Object is invalid and cannot be updated\n"
 msgstr "O obxecto non Ã© vÃ¡lido e non pode ser actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:2022
+#: ../calendar/gui/e-itip-control.c:2035
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Esta resposta non Ã© dun participante actual. Quere engadilo como "
 "participante?"
 
-#: ../calendar/gui/e-itip-control.c:2040
+#: ../calendar/gui/e-itip-control.c:2053
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Non foi posÃbel actualizar o estado do participante debido a un estado non "
 "vÃ¡lido!\n"
 
-#: ../calendar/gui/e-itip-control.c:2064
+#: ../calendar/gui/e-itip-control.c:2077
 msgid "Attendee status updated\n"
 msgstr "Estado do participante actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:2071
+#: ../calendar/gui/e-itip-control.c:2084
 #: ../plugins/itip-formatter/itip-formatter.c:1421
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Non foi posÃbel actualizar estado do participante porque xa non existe o "
 "elemento"
 
-#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
+#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
 msgid "Item sent!\n"
 msgstr "Elemento enviado!\n"
 
-#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
+#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
 msgid "The item could not be sent!\n"
 msgstr "Non foi posÃbel enviar o elemento!\n"
 
-#: ../calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2273
 msgid "Choose an action:"
 msgstr "Seleccione unha acciÃ³n:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2289
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-itip-control.c:2302
+#: ../calendar/gui/e-meeting-list-view.c:582
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2342
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../calendar/gui/e-itip-control.c:2353
+#: ../calendar/gui/e-itip-control.c:2366
 #: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../calendar/gui/e-itip-control.c:2354
+#: ../calendar/gui/e-itip-control.c:2367
 msgid "Tentatively accept"
 msgstr "Aceptar provisionalmente"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2368
 #: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "Rexeitar"
 
-#: ../calendar/gui/e-itip-control.c:2380
+#: ../calendar/gui/e-itip-control.c:2393
 msgid "Send Free/Busy Information"
 msgstr "Enviar informaciÃ³n de dispoÃ±ibilidade"
 
-#: ../calendar/gui/e-itip-control.c:2404
+#: ../calendar/gui/e-itip-control.c:2417
 msgid "Update respondent status"
 msgstr "Actualizar o estado do interlocutor"
 
-#: ../calendar/gui/e-itip-control.c:2428
+#: ../calendar/gui/e-itip-control.c:2441
 msgid "Send Latest Information"
 msgstr "Enviar a Ãºltima informaciÃ³n"
 
-#: ../calendar/gui/e-itip-control.c:2452
+#: ../calendar/gui/e-itip-control.c:2465
 #: ../modules/mail/e-mail-shell-view-actions.c:1036
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../widgets/misc/e-activity-proxy.c:300
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -5668,72 +5392,72 @@ msgid "Resources"
 msgstr "Recursos"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 #: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 #: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Grupo"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "Sala"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "Presidente"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 #: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "Participante requirido"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "Non-participante"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/e-meeting-store.c:863
 msgid "Needs Action"
 msgstr "Necesita acciÃ³n"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:537
 msgid "Attendee                          "
 msgstr "Participante                          "
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 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:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2376
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
@@ -5742,7 +5466,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:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2407
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -5752,67 +5476,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "Out of Office"
 msgstr "FÃ³ra da oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "Sen informaciÃ³n"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
-msgid "A_ttendees..."
-msgstr "Par_ticipantes..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "O_pciÃ³ns"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "Show _only working hours"
 msgstr "Mostrar _sÃ³ as horas de traballo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "Show _zoomed out"
 msgstr "Mostrar _reducido"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_Update free/busy"
 msgstr "_Actualizar dispoÃ±ibilidade"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:659
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid "_Autopick"
 msgstr "Seleccionar _automaticamente"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_All people and resources"
 msgstr "_Todas as persoas e recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:720
 msgid "All _people and one resource"
 msgstr "Todas as _persoas e un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "_Required people"
 msgstr "Persoas _requiridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:739
 msgid "Required people and _one resource"
 msgstr "Persoas requiridas e _un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:785
 msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "Hora de _finalizaciÃ³n:"
 
@@ -5840,45 +5560,47 @@ msgstr "Idioma"
 msgid "Member"
 msgstr "Integrante"
 
-#: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:456
+#: ../calendar/gui/e-memo-table.c:414
+#: ../modules/calendar/e-cal-shell-content.c:473
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:432
+#: ../plugins/caldav/caldav-browse-server.c:431
 msgid "Memos"
 msgstr "Notas"
 
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:492 ../calendar/gui/e-task-table.c:709
 msgid "* No Summary *"
 msgstr "* Sen resumo *"
 
-#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:577 ../calendar/gui/e-task-table.c:789
 msgid "Start: "
 msgstr "Comezo: "
 
-#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:596 ../calendar/gui/e-task-table.c:807
 msgid "Due: "
 msgstr "Pendente: "
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:712
 msgid "Cut selected memos to the clipboard"
 msgstr "Cortar as mensaxes seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:713
+#: ../calendar/gui/e-memo-table.c:718
 msgid "Copy selected memos to the clipboard"
 msgstr "Copiar as mensaxes seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:724
 msgid "Paste memos from the clipboard"
 msgstr "Pegar recordatorios desde o portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:725
-#: ../modules/calendar/e-memo-shell-view-actions.c:565
+#: ../calendar/gui/e-memo-table.c:730
+#: ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Delete selected memos"
 msgstr "Eliminar as notas seleccionadas"
 
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:736
 msgid "Select all visible memos"
 msgstr "Seleccionar todas as mensaxes visÃbeis"
 
@@ -5886,86 +5608,51 @@ msgstr "Seleccionar todas as mensaxes visÃbeis"
 msgid "Click to add a memo"
 msgstr "Prema para engadir unha nota"
 
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "70%"
-
-#: ../calendar/gui/e-task-table.c:538
-msgid "80%"
-msgstr "80%"
-
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
 #: ../calendar/gui/e-task-table.c:539
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "100%"
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:418
+#: ../calendar/gui/e-task-table.c:631 ../calendar/gui/print.c:2072
+#: ../calendar/importers/icalendar-importer.c:81
+#: ../calendar/importers/icalendar-importer.c:828
+#: ../modules/calendar/e-cal-shell-content.c:434
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
-#: ../plugins/caldav/caldav-browse-server.c:430
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: ../calendar/gui/e-task-table.c:928
+#: ../calendar/gui/e-task-table.c:935
 msgid "Cut selected tasks to the clipboard"
 msgstr "Cortar o texto seleccionado para o portapapeis"
 
-#: ../calendar/gui/e-task-table.c:934
+#: ../calendar/gui/e-task-table.c:941
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copiar o texto seleccionado ao portapapeis"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:947
 msgid "Paste tasks from the clipboard"
 msgstr "Pegar as tarefas desde o portapapeis"
 
-#: ../calendar/gui/e-task-table.c:946
-#: ../modules/calendar/e-task-shell-view-actions.c:689
+#: ../calendar/gui/e-task-table.c:953
+#: ../modules/calendar/e-task-shell-view-actions.c:690
 msgid "Delete selected tasks"
 msgstr "Eliminar as tarefas seleccionadas"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:959
 msgid "Select all visible tasks"
 msgstr "Seleccionar todas as mensaxes visÃbeis"
 
-#: ../calendar/gui/e-timezone-entry.c:354
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "Seleccionar fuso horario"
 
@@ -5973,56 +5660,56 @@ msgstr "Seleccionar fuso horario"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
 msgid "%d %B"
 msgstr "%d de %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:276
+#: ../calendar/gui/ea-cal-view-event.c:286
 msgid "It has alarms."
 msgstr "Ten alarmas."
 
-#: ../calendar/gui/ea-cal-view-event.c:279
+#: ../calendar/gui/ea-cal-view-event.c:289
 msgid "It has recurrences."
 msgstr "Ten recorrencias."
 
-#: ../calendar/gui/ea-cal-view-event.c:282
+#: ../calendar/gui/ea-cal-view-event.c:292
 msgid "It is a meeting."
 msgstr "Ã? unha cita."
 
-#: ../calendar/gui/ea-cal-view-event.c:288
+#: ../calendar/gui/ea-cal-view-event.c:298
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Evento de calendario: o resumo Ã© %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:290
+#: ../calendar/gui/ea-cal-view-event.c:300
 msgid "Calendar Event: It has no summary."
 msgstr "Evento de calendario: non ten resumo."
 
-#: ../calendar/gui/ea-cal-view-event.c:312
+#: ../calendar/gui/ea-cal-view-event.c:322
 msgid "calendar view event"
 msgstr "visualizaciÃ³n de actividades de calendario"
 
-#: ../calendar/gui/ea-cal-view-event.c:540
+#: ../calendar/gui/ea-cal-view-event.c:551
 msgid "Grab Focus"
 msgstr "Obter o foco"
 
-#: ../calendar/gui/ea-cal-view.c:300
+#: ../calendar/gui/ea-cal-view.c:304
 msgid "New Appointment"
 msgstr "Nova cita"
 
-#: ../calendar/gui/ea-cal-view.c:301
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New All Day Event"
 msgstr "Novo actividade de dÃa completo"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "New Meeting"
 msgstr "Nova cita"
 
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "Go to Today"
 msgstr "Ir a hoxe"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:308
 msgid "Go to Date"
 msgstr "Ir Ã¡ data"
 
@@ -6031,7 +5718,7 @@ msgstr "Ir Ã¡ data"
 msgid "a table to view and select the current time range"
 msgstr "unha tÃ¡boa para ver e seleccionar o intervalo de tempo actual"
 
-#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:150 ../calendar/gui/ea-week-view.c:149
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -6040,14 +5727,14 @@ msgstr[1] "Ten %d eventos."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:157 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:155 ../calendar/gui/ea-week-view.c:152
 msgid "It has no events."
 msgstr "Non ten eventos."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:164
+#: ../calendar/gui/ea-day-view.c:162
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "VisualizaciÃ³n de semana laboral: %s. %s"
@@ -6055,47 +5742,47 @@ msgstr "VisualizaciÃ³n de semana laboral: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:170
+#: ../calendar/gui/ea-day-view.c:168
 #, c-format
 msgid "Day View: %s. %s"
-msgstr "VisualizaciÃ³n diaria: %s. %s"
+msgstr "Vista diaria: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:201
+#: ../calendar/gui/ea-day-view.c:202
 msgid "calendar view for a work week"
 msgstr "visualizaciÃ³n de calendario para unha semana laboral"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:204
 msgid "calendar view for one or more days"
 msgstr "visualizaciÃ³n de calendario para un ou mÃ¡is dÃas"
 
-#: ../calendar/gui/ea-gnome-calendar.c:46
-#: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/gui/ea-gnome-calendar.c:48
+#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "Calendario do GNOME"
 
-#: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:985
+#: ../calendar/gui/ea-gnome-calendar.c:199
+#: ../modules/calendar/e-cal-shell-view-private.c:1010
 msgid "%A %d %b %Y"
 msgstr "%A, %d de %b de %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:204
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:992
-#: ../modules/calendar/e-cal-shell-view-private.c:998
-#: ../modules/calendar/e-cal-shell-view-private.c:1001
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../modules/calendar/e-cal-shell-view-private.c:1017
+#: ../modules/calendar/e-cal-shell-view-private.c:1023
+#: ../modules/calendar/e-cal-shell-view-private.c:1026
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:226
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:228
+#: ../calendar/gui/ea-gnome-calendar.c:234
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:1018
-#: ../modules/calendar/e-cal-shell-view-private.c:1029
-#: ../modules/calendar/e-cal-shell-view-private.c:1036
-#: ../modules/calendar/e-cal-shell-view-private.c:1039
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../modules/calendar/e-cal-shell-view-private.c:1043
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
+#: ../modules/calendar/e-cal-shell-view-private.c:1061
+#: ../modules/calendar/e-cal-shell-view-private.c:1064
 msgid "%d %b %Y"
 msgstr "%d de %b de %Y"
 
@@ -6110,24 +5797,24 @@ msgstr "Prema aquÃ para localizar mÃ¡is eventos."
 #: ../calendar/gui/ea-week-view.c:157
 #, c-format
 msgid "Month View: %s. %s"
-msgstr "VisualizaciÃ³n mensual: %s. %s"
+msgstr "Vista mensual: %s. %s"
 
 #: ../calendar/gui/ea-week-view.c:161
 #, c-format
 msgid "Week View: %s. %s"
-msgstr "VisualizaciÃ³n semanal: %s. %s"
+msgstr "Vista semanal: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:192
+#: ../calendar/gui/ea-week-view.c:195
 msgid "calendar view for a month"
 msgstr "VisualizaciÃ³n de calendario para un mes"
 
-#: ../calendar/gui/ea-week-view.c:194
+#: ../calendar/gui/ea-week-view.c:197
 msgid "calendar view for one or more weeks"
-msgstr "visualizaciÃ³n de calendario para unha ou mÃ¡is semanas"
+msgstr "vista de calendario para unha ou mÃ¡is semanas"
 
-#: ../calendar/gui/gnome-cal.c:2297
+#: ../calendar/gui/gnome-cal.c:2311
 msgid "Purging"
-msgstr "Depurando"
+msgstr "Limpando"
 
 #: ../calendar/gui/goto-dialog.ui.h:1
 msgid "April"
@@ -6139,7 +5826,7 @@ msgstr "Agosto"
 
 #: ../calendar/gui/goto-dialog.ui.h:3
 msgid "December"
-msgstr "Integrante"
+msgstr "Decembro"
 
 #: ../calendar/gui/goto-dialog.ui.h:4
 msgid "February"
@@ -6151,66 +5838,67 @@ msgstr "Xaneiro"
 
 #: ../calendar/gui/goto-dialog.ui.h:6
 msgid "July"
-msgstr "Jullo"
+msgstr "Xullo"
 
 #: ../calendar/gui/goto-dialog.ui.h:7
 msgid "June"
-msgstr "Correo non desexado"
+msgstr "XuÃ±o"
 
 #: ../calendar/gui/goto-dialog.ui.h:8
 msgid "March"
-msgstr "Buscar"
+msgstr "Marzo"
 
 #: ../calendar/gui/goto-dialog.ui.h:9
 msgid "May"
-msgstr "Luns"
+msgstr "Maio"
 
 #: ../calendar/gui/goto-dialog.ui.h:10
 msgid "November"
-msgstr "Integrante"
+msgstr "Novembro"
 
 #: ../calendar/gui/goto-dialog.ui.h:11
 msgid "October"
-msgstr "Outros"
+msgstr "Outubro"
 
 #: ../calendar/gui/goto-dialog.ui.h:12
 msgid "Select Date"
 msgstr "Seleccionar data"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "Integrante"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+msgid "Select _Today"
+msgstr "Seleccionar _hoxe"
 
 #: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "_Seleccionar hoxe"
+msgid "September"
+msgstr "Setembro"
 
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
-msgstr "DÃ©bese definir un organizador."
+msgstr "Debe definirse un organizador."
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "Ã? necesario polo menos un participante"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "InformaciÃ³n do actividade"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "InformaciÃ³n da tarefa"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "InformaciÃ³n da nota"
 
-#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "InformaciÃ³n de dispoÃ±ibilidade"
 
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "InformaciÃ³n do calendario"
 
@@ -6218,7 +5906,7 @@ msgstr "InformaciÃ³n do calendario"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Aceptado"
@@ -6227,7 +5915,7 @@ msgstr "Aceptado"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:686
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
@@ -6239,7 +5927,7 @@ msgstr "Aceptado provisionalmente"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Rexeitado"
@@ -6248,7 +5936,7 @@ msgstr "Rexeitado"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegado"
@@ -6256,7 +5944,7 @@ msgstr "Delegado"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Actualizado"
@@ -6264,7 +5952,7 @@ msgstr "Actualizado"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancelar"
@@ -6272,7 +5960,7 @@ msgstr "Cancelar"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Actualizar"
@@ -6280,31 +5968,31 @@ msgstr "Actualizar"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:734
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contraproposta"
 
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "InformaciÃ³n de dispoÃ±ibilidade (de %s a %s)"
 
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "InformaciÃ³n de iCalendar"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "Non foi posÃbel almacenar un recurso, o novo evento colisiona con algÃºn "
 "outro."
 
-#: ../calendar/gui/itip-utils.c:834
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
 msgstr "Non foi posÃbel almacenar un recurso, erro:"
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante no actividade."
 
@@ -6460,49 +6148,73 @@ msgstr "Ve"
 msgid "Sa"
 msgstr "SÃ¡"
 
-#: ../calendar/gui/print.c:2564
-msgid "Appointment"
-msgstr "Cita"
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:2449
+msgid " to "
+msgstr " para "
 
-#: ../calendar/gui/print.c:2566
-msgid "Task"
-msgstr "Tarefa"
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:2457
+msgid " (Completed "
+msgstr " (Terminada "
+
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:2461
+msgid "Completed "
+msgstr "Terminada "
+
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:2469
+msgid " (Due "
+msgstr " (Pendente "
 
-#: ../calendar/gui/print.c:2591
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:2474
+msgid "Due "
+msgstr "Pendente "
+
+#: ../calendar/gui/print.c:2637
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2661
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2704
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2719
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2737
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaxe completada: %i"
 
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2748
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2761
 #, c-format
 msgid "Categories: %s"
 msgstr "CategorÃas: %s"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2772
 msgid "Contacts: "
 msgstr "Contactos: "
 
@@ -6511,10 +6223,6 @@ msgstr "Contactos: "
 msgid "% Completed"
 msgstr "% Terminado"
 
-#: ../calendar/gui/tasktypes.xml.h:7
-msgid "Cancelled"
-msgstr "Cancelado"
-
 #: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "En progreso"
@@ -6527,44 +6235,189 @@ msgstr "Ã© maior que"
 msgid "is less than"
 msgstr "Ã© menor que"
 
-#: ../calendar/importers/icalendar-importer.c:75
+#: ../calendar/importers/icalendar-importer.c:80
 msgid "Appointments and Meetings"
 msgstr "Citas e reuniÃ³ns"
 
-#: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../calendar/importers/icalendar-importer.c:350
+#: ../calendar/importers/icalendar-importer.c:707
+#: ../plugins/itip-formatter/itip-formatter.c:1835
 msgid "Opening calendar"
 msgstr "Abrir calendario"
 
-#: ../calendar/importers/icalendar-importer.c:442
+#: ../calendar/importers/icalendar-importer.c:493
 msgid "iCalendar files (.ics)"
 msgstr "Ficheiros iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:443
+#: ../calendar/importers/icalendar-importer.c:494
 msgid "Evolution iCalendar importer"
 msgstr "Importador de iCalendar do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:531
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Reminder!"
 msgstr "Aviso!"
 
-#: ../calendar/importers/icalendar-importer.c:583
-msgid "vCalendar files (.vcf)"
-msgstr "Ficheiros vCalendar (.vcf)"
+#: ../calendar/importers/icalendar-importer.c:662
+msgid "vCalendar files (.vcs)"
+msgstr "Ficheiros vCalendar (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:584
+#: ../calendar/importers/icalendar-importer.c:663
 msgid "Evolution vCalendar importer"
 msgstr "Importador de vCalendar do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:823
 msgid "Calendar Events"
 msgstr "Eventos de calendario"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:861
 msgid "Evolution Calendar intelligent importer"
 msgstr "Importador intelixente do calendario do Evolution"
 
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+msgctxt "iCalImp"
+msgid "Meeting"
+msgstr "ReuniÃ³n"
+
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+msgctxt "iCalImp"
+msgid "Event"
+msgstr "Evento"
+
+#: ../calendar/importers/icalendar-importer.c:929
+#: ../calendar/importers/icalendar-importer.c:1244
+msgctxt "iCalImp"
+msgid "Task"
+msgstr "Tarefa"
+
+#: ../calendar/importers/icalendar-importer.c:932
+#: ../calendar/importers/icalendar-importer.c:1245
+msgctxt "iCalImp"
+msgid "Memo"
+msgstr "Nota"
+
+#: ../calendar/importers/icalendar-importer.c:941
+msgctxt "iCalImp"
+msgid "has recurrences"
+msgstr "ten recorrencias"
+
+#: ../calendar/importers/icalendar-importer.c:946
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "Ã© unha instancia"
+
+#: ../calendar/importers/icalendar-importer.c:951
+msgctxt "iCalImp"
+msgid "has alarms"
+msgstr "ten alarmas"
+
+#: ../calendar/importers/icalendar-importer.c:956
+msgctxt "iCalImp"
+msgid "has attachments"
+msgstr "ten anexos"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:969
+msgctxt "iCalImp"
+msgid "Public"
+msgstr "PÃºblico"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:972
+msgctxt "iCalImp"
+msgid "Private"
+msgstr "Privado"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:975
+msgctxt "iCalImp"
+msgid "Confidential"
+msgstr "Confidencial"
+
+#. Translators: Appointment's classification section name
+#: ../calendar/importers/icalendar-importer.c:979
+msgctxt "iCalImp"
+msgid "Classification"
+msgstr "ClasificaciÃ³n"
+
+#. Translators: Appointment's summary
+#. Translators: Column header for a component summary
+#: ../calendar/importers/icalendar-importer.c:984
+#: ../calendar/importers/icalendar-importer.c:1284
+msgctxt "iCalImp"
+msgid "Summary"
+msgstr "Resumo"
+
+#. Translators: Appointment's location
+#: ../calendar/importers/icalendar-importer.c:990
+msgctxt "iCalImp"
+msgid "Location"
+msgstr "LocalizaciÃ³n"
+
+#. Translators: Appointment's start time
+#. Translators: Column header for a component start date/time
+#: ../calendar/importers/icalendar-importer.c:998
+#: ../calendar/importers/icalendar-importer.c:1280
+msgctxt "iCalImp"
+msgid "Start"
+msgstr "Comezar"
+
+#. Translators: 'Due' like the time due a task should be finished
+#: ../calendar/importers/icalendar-importer.c:1009
+msgctxt "iCalImp"
+msgid "Due"
+msgstr "Vence"
+
+#. Translators: Appointment's end time
+#: ../calendar/importers/icalendar-importer.c:1021
+msgctxt "iCalImp"
+msgid "End"
+msgstr "Remata"
+
+#. Translators: Appointment's categories
+#: ../calendar/importers/icalendar-importer.c:1031
+msgctxt "iCalImp"
+msgid "Categories"
+msgstr "CategorÃas"
+
+#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
+#: ../calendar/importers/icalendar-importer.c:1055
+msgctxt "iCalImp"
+msgid "Completed"
+msgstr "Rematada"
+
+#. Translators: Appointment's URL
+#: ../calendar/importers/icalendar-importer.c:1063
+msgctxt "iCalImp"
+msgid "URL"
+msgstr "URL"
+
+#. Translators: Appointment's organizer
+#: ../calendar/importers/icalendar-importer.c:1074
+#: ../calendar/importers/icalendar-importer.c:1077
+msgctxt "iCalImp"
+msgid "Organizer"
+msgstr "Organizador"
+
+#. Translators: Appointment's attendees
+#: ../calendar/importers/icalendar-importer.c:1097
+#: ../calendar/importers/icalendar-importer.c:1100
+msgctxt "iCalImp"
+msgid "Attendees"
+msgstr "Participantes"
+
+#: ../calendar/importers/icalendar-importer.c:1114
+msgctxt "iCalImp"
+msgid "Description"
+msgstr "DescriciÃ³n"
+
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../calendar/importers/icalendar-importer.c:1276
+msgctxt "iCalImp"
+msgid "Type"
+msgstr "Tipo"
+
 #.
 #. *
 #. * This program is free software; you can redistribute it and/or
@@ -8122,169 +7975,153 @@ msgstr "PacÃfico/Yap"
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: ../composer/e-composer-actions.c:242
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:245
+#: ../widgets/misc/e-attachment-view.c:379
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
 
-#: ../composer/e-composer-actions.c:247
-#: ../widgets/misc/e-signature-editor.c:203
+#: ../composer/e-composer-actions.c:250
+#: ../widgets/misc/e-signature-editor.c:206
 msgid "_Close"
 msgstr "_Pechar"
 
-#: ../composer/e-composer-actions.c:249
+#: ../composer/e-composer-actions.c:252
 msgid "Close the current file"
 msgstr "Pechar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:254
+#: ../composer/e-composer-actions.c:257
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: ../composer/e-composer-actions.c:261
+#: ../composer/e-composer-actions.c:264
 msgid "Print Pre_view"
 msgstr "Pre_visualizaciÃ³n da impresiÃ³n"
 
-#: ../composer/e-composer-actions.c:270
+#: ../composer/e-composer-actions.c:273
 msgid "Save the current file"
 msgstr "Gardar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:275
+#: ../composer/e-composer-actions.c:278
 msgid "Save _As..."
 msgstr "Gardar _como..."
 
-#: ../composer/e-composer-actions.c:277
+#: ../composer/e-composer-actions.c:280
 msgid "Save the current file with a different name"
 msgstr "Gardar o ficheiro actual cun nome diferente"
 
-#: ../composer/e-composer-actions.c:282
+#: ../composer/e-composer-actions.c:285
 msgid "Save as _Draft"
 msgstr "Gardar como borra_dor"
 
-#: ../composer/e-composer-actions.c:284
+#: ../composer/e-composer-actions.c:287
 msgid "Save as draft"
 msgstr "Gardar como borrador"
 
-#: ../composer/e-composer-actions.c:289 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:292 ../composer/e-composer-private.c:297
 msgid "S_end"
 msgstr "_Enviar"
 
-#: ../composer/e-composer-actions.c:291
+#: ../composer/e-composer-actions.c:294
 msgid "Send this message"
 msgstr "Enviar esta mensaxe"
 
-#: ../composer/e-composer-actions.c:296
+#: ../composer/e-composer-actions.c:299
 msgid "New _Message"
 msgstr "_Mensaxe nova"
 
-#: ../composer/e-composer-actions.c:298
+#: ../composer/e-composer-actions.c:301
 msgid "Open New Message window"
 msgstr "Abrir unha xanela de Mensaxe nova"
 
-#: ../composer/e-composer-actions.c:305
+#: ../composer/e-composer-actions.c:308
 msgid "Character _Encoding"
 msgstr "C_odificaciÃ³n de caracteres"
 
-#: ../composer/e-composer-actions.c:322
+#: ../composer/e-composer-actions.c:325
 msgid "PGP _Encrypt"
 msgstr "C_ifrar con PGP"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:327
 msgid "Encrypt this message with PGP"
 msgstr "Cifrar esta mensaxe con PGP"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:333
 msgid "PGP _Sign"
 msgstr "A_sinar con PGP"
 
-#: ../composer/e-composer-actions.c:332
+#: ../composer/e-composer-actions.c:335
 msgid "Sign this message with your PGP key"
 msgstr "Asinar esta mensaxe coa sÃºa chave PGP"
 
-#: ../composer/e-composer-actions.c:338
+#: ../composer/e-composer-actions.c:341
 msgid "_Prioritize Message"
 msgstr "_Mensaxe prioritaria"
 
-#: ../composer/e-composer-actions.c:340
+#: ../composer/e-composer-actions.c:343
 msgid "Set the message priority to high"
 msgstr "Definir a prioridade da mensaxe como alta"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:349
 msgid "Re_quest Read Receipt"
 msgstr "_Requirir confirmaciÃ³n de lectura"
 
-#: ../composer/e-composer-actions.c:348
+#: ../composer/e-composer-actions.c:351
 msgid "Get delivery notification when your message is read"
 msgstr "Obter unha notificaciÃ³n de entrega cando se lea a sÃºa mensaxe"
 
-#: ../composer/e-composer-actions.c:354
+#: ../composer/e-composer-actions.c:357
 msgid "S/MIME En_crypt"
 msgstr "_Cifrar con S/MIME"
 
-#: ../composer/e-composer-actions.c:356
+#: ../composer/e-composer-actions.c:359
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Cifrar esta mensaxe co seu certificado de cifrado S/MIME"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:365
 msgid "S/MIME Sig_n"
 msgstr "Si_natura S/MIME"
 
-#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-actions.c:367
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Asinar esta mensaxe co seu certificado de sinatura S/MIME"
 
-#: ../composer/e-composer-actions.c:370
+#: ../composer/e-composer-actions.c:373
 msgid "_Bcc Field"
 msgstr "Campo _Cco"
 
-#: ../composer/e-composer-actions.c:372
+#: ../composer/e-composer-actions.c:375
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo CCO"
 
-#: ../composer/e-composer-actions.c:378
+#: ../composer/e-composer-actions.c:381
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ../composer/e-composer-actions.c:380
+#: ../composer/e-composer-actions.c:383
 msgid "Toggles whether the CC field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo CC"
 
-#: ../composer/e-composer-actions.c:386
-msgid "_From Field"
-msgstr "Campo _De"
-
-#: ../composer/e-composer-actions.c:388
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Alterna entre se se mostra ou non o selector do campo De"
-
-#: ../composer/e-composer-actions.c:394
+#: ../composer/e-composer-actions.c:389
 msgid "_Reply-To Field"
 msgstr "Campo _Responder a"
 
-#: ../composer/e-composer-actions.c:396
+#: ../composer/e-composer-actions.c:391
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo Responder a"
 
-#: ../composer/e-composer-actions.c:439
+#: ../composer/e-composer-actions.c:434
 msgid "Save Draft"
 msgstr "Gardar borrador"
 
-#: ../composer/e-composer-header.c:129
-msgid "Show"
-msgstr "Mostrar"
-
-#: ../composer/e-composer-header.c:137
-msgid "Hide"
-msgstr "Ocultar"
-
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 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-composer-header-table.c:47
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -8292,95 +8129,82 @@ msgstr ""
 "Introduza os enderezos que recibirÃ¡n unha copia da mensaxe sen aparecerer na "
 "lista de destinatarios da mensaxe"
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:1005
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:78
-msgid "From"
-msgstr "De"
-
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:1014
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:1018
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:1023
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "Cc"
-
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:1028
 msgid "_Bcc:"
 msgstr "_Cco:"
 
-#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "Cco"
-
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:1033
 msgid "_Post To:"
 msgstr "_Publicar en:"
 
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:1037
 msgid "S_ubject:"
 msgstr "_Asunto:"
 
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1046
 msgid "Si_gnature:"
 msgstr "Si_natura:"
 
-#: ../composer/e-composer-name-header.c:134
+#: ../composer/e-composer-name-header.c:141
 msgid "Click here for the address book"
 msgstr "Prema aquÃ para ir Ã¡ axenda de enderezos"
 
-#: ../composer/e-composer-post-header.c:116
+#: ../composer/e-composer-post-header.c:131
 msgid "Click here to select folders to post to"
 msgstr "Prema aquÃ para seleccionar os cartafoles nos que publicar"
 
-#: ../composer/e-composer-private.c:199
+#: ../composer/e-composer-private.c:215
 msgid "Undo the last action"
 msgstr "Desfacer a Ãºltima acciÃ³n"
 
-#: ../composer/e-composer-private.c:203
+#: ../composer/e-composer-private.c:219
 msgid "Redo the last undone action"
 msgstr "Refacer a Ãºltima acciÃ³n desfeita"
 
-#: ../composer/e-composer-private.c:207
+#: ../composer/e-composer-private.c:223
 msgid "Search for text"
 msgstr "Buscar texto"
 
-#: ../composer/e-composer-private.c:211
+#: ../composer/e-composer-private.c:227
 msgid "Search for and replace text"
 msgstr "Buscar e substituÃr texto"
 
-#: ../composer/e-composer-private.c:301
+#: ../composer/e-composer-private.c:317
 msgid "Save draft"
 msgstr "Gardar borrador"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:197
+#: ../plugins/attachment-reminder/attachment-reminder.c:117
 msgid "_Do not show this message again."
 msgstr "_Non mostrar esta mensaxe outra vez."
 
-#: ../composer/e-msg-composer.c:983
+#: ../composer/e-msg-composer.c:1030
+#, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Non Ã© posÃbel asinar a mensaxe saÃnte: non hai un certificado de sinatura "
 "definido para esta conta"
 
-#: ../composer/e-msg-composer.c:990
+#: ../composer/e-msg-composer.c:1042
+#, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8388,23 +8212,17 @@ msgstr ""
 "Non Ã© posÃbel cifrar a mensaxe saÃnte: non hai un certificado de cifrado "
 "definido para esta conta"
 
-#: ../composer/e-msg-composer.c:1381
-msgid "Unable to reconstruct message from autosave file"
-msgstr "Non Ã© posÃbel obter a mensaxe do editor"
-
-#: ../composer/e-msg-composer.c:1447 ../composer/e-msg-composer.c:1692
+#: ../composer/e-msg-composer.c:1466 ../composer/e-msg-composer.c:1811
 msgid "Compose Message"
 msgstr "Escribir unha mensaxe"
 
-#: ../composer/e-msg-composer.c:3363
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
+#: ../composer/e-msg-composer.c:3477
+msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
-"<b>(O editor contÃ©n un corpo de mensaxe que non ten texto, polo que non se "
-"pode editar.)</b>"
+"(O editor contÃ©n un corpo de mensaxe que non ten texto, polo que non se pode "
+"editar.)"
 
-#: ../composer/e-msg-composer.c:3963
+#: ../composer/e-msg-composer.c:4085
 msgid "Untitled Message"
 msgstr "Mensaxe sen tÃtulo"
 
@@ -8425,7 +8243,7 @@ msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr ""
-"EstÃ¡ seguro de que quere rexeitar a mensaxe titulada '{0}', que estÃ¡ "
+"EstÃ¡ seguro de que quere rexeitar a mensaxe titulada Â«{0}Â», que estÃ¡ "
 "redactando?"
 
 #: ../composer/mail-composer.error.xml.h:4
@@ -8491,9 +8309,9 @@ msgstr ""
 "nova. Recuperar a mensaxe permitiralle continuar onde a deixou."
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+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 ser enviado nunha "
+"O ficheiro Â«{0}Â» non Ã© un ficheiro normal e non pode ser enviado nunha "
 "mensaxe."
 
 #: ../composer/mail-composer.error.xml.h:17
@@ -8512,8 +8330,8 @@ msgid "Unable to activate the address selector control."
 msgstr "Non Ã© posÃbel activar o control de selecciÃ³n de enderezos."
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
-msgstr "Non pode anexar o ficheiro `{0}' a esta mensaxe."
+msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgstr "Non pode anexar o ficheiro Â«{0}Â» a esta mensaxe."
 
 #: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
@@ -8535,85 +8353,100 @@ msgstr "_Recuperar"
 msgid "_Save Draft"
 msgstr "_Gardar borrador"
 
-#: ../capplet/anjal-settings-main.c:199
+#: ../capplet/anjal-settings-main.c:198
 msgid "Run Anjal in a window"
 msgstr "Executar Anjar nunha xanela"
 
-#: ../capplet/anjal-settings-main.c:200
+#: ../capplet/anjal-settings-main.c:199
 msgid "Make Anjal the default email client"
 msgstr "Facer Anjal o cliente de correo electrÃ³nico predefinido"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:207
+#: ../capplet/anjal-settings-main.c:206
 msgid "ID of the socket to embed in"
 msgstr "ID do socket para incrustar"
 
-#: ../capplet/anjal-settings-main.c:208
+#: ../capplet/anjal-settings-main.c:207
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:221
+#: ../capplet/anjal-settings-main.c:220
 msgid "Anjal email client"
 msgstr "Cliente de correo Anjal"
 
-#: ../capplet/settings/mail-account-view.c:56
+#: ../capplet/settings/mail-account-view.c:74
 msgid "Please enter your full name."
 msgstr "Insira o seu nome completo."
 
-#: ../capplet/settings/mail-account-view.c:57
+#: ../capplet/settings/mail-account-view.c:75
 msgid "Please enter your email address."
 msgstr "Insira o seu enderezo de correo electrÃ³nico:"
 
-#: ../capplet/settings/mail-account-view.c:58
+#: ../capplet/settings/mail-account-view.c:76
 msgid "The email address you have entered is invalid."
 msgstr "O enderezo de correo electrÃ³nico inserido Ã© incorrecto."
 
-#: ../capplet/settings/mail-account-view.c:181
-msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Detalles persoais:</span>"
+#: ../capplet/settings/mail-account-view.c:77
+msgid "Please enter your password."
+msgstr "Insira o seu enderezo de correo electrÃ³nico:"
+
+#: ../capplet/settings/mail-account-view.c:256
+#: ../plugins/caldav/caldav-source.c:66
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../capplet/settings/mail-account-view.c:360
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-source.c:81
+msgid "Google"
+msgstr "Google"
+
+#: ../capplet/settings/mail-account-view.c:464
+msgid "Personal details:"
+msgstr "InformaciÃ³n persoal:"
 
-#: ../capplet/settings/mail-account-view.c:186
+#: ../capplet/settings/mail-account-view.c:471
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../capplet/settings/mail-account-view.c:195
+#: ../capplet/settings/mail-account-view.c:480
 msgid "Email address:"
 msgstr "Enderezo de correo:"
 
-#: ../capplet/settings/mail-account-view.c:205
-msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Detalles de recepciÃ³n:</span>"
+#: ../capplet/settings/mail-account-view.c:490
+msgid "Details:"
+msgstr "Detalles:"
 
-#: ../capplet/settings/mail-account-view.c:210
-#: ../capplet/settings/mail-account-view.c:258
+#: ../capplet/settings/mail-account-view.c:498
+msgid "Receiving"
+msgstr "OpciÃ³ns de recepciÃ³n"
+
+#: ../capplet/settings/mail-account-view.c:505
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: ../capplet/settings/mail-account-view.c:219
-#: ../capplet/settings/mail-account-view.c:267
+#: ../capplet/settings/mail-account-view.c:514
 msgid "Server address:"
 msgstr "Endrezo do servidor:"
 
-#: ../capplet/settings/mail-account-view.c:228
-#: ../capplet/settings/mail-account-view.c:276
+#: ../capplet/settings/mail-account-view.c:523
 msgid "Username:"
 msgstr "Nome de usuario:"
 
-#: ../capplet/settings/mail-account-view.c:237
-#: ../capplet/settings/mail-account-view.c:285
+#: ../capplet/settings/mail-account-view.c:532
 msgid "Use encryption:"
 msgstr "Usar cifrado:"
 
-#: ../capplet/settings/mail-account-view.c:242
-#: ../capplet/settings/mail-account-view.c:290
+#: ../capplet/settings/mail-account-view.c:537
+#: ../capplet/settings/mail-account-view.c:572
 msgid "never"
 msgstr "nunca"
 
-#: ../capplet/settings/mail-account-view.c:253
-msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Detalles de envÃo:</span>"
+#: ../capplet/settings/mail-account-view.c:549
+msgid "Sending"
+msgstr "OpciÃ³ns de envÃo"
 
-#: ../capplet/settings/mail-account-view.c:309
+#: ../capplet/settings/mail-account-view.c:591
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
@@ -8624,21 +8457,21 @@ msgstr ""
 "configurar as preferencias. Se non Ã© posÃbel facelo de forma automatica "
 "necesitarÃ¡ os detalles do seu servidor."
 
-#: ../capplet/settings/mail-account-view.c:311
+#: ../capplet/settings/mail-account-view.c:593
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
 "entered but you may need to change them."
 msgstr ""
-"Desculpe, non foi posÃbel adiviÃ±ar as configuraciÃ³ns para configurar o seu "
-"correo electrÃ³nico automaticamente. InsÃraas debaixo, tente comezar coas que "
-"estÃ¡n inseridas debaixo pero o mÃ¡is seguro e que teÃ±a que cambialas."
+"Non foi posÃbel adiviÃ±ar as configuraciÃ³ns para configurar o seu correo "
+"electrÃ³nico automaticamente. InsÃraas embaixo, tente comezar coas que estÃ¡n "
+"inseridas embaixo pero o mÃ¡is seguro e que teÃ±a que cambialas."
 
-#: ../capplet/settings/mail-account-view.c:313
+#: ../capplet/settings/mail-account-view.c:595
 msgid "You can specify more options to configure the account."
 msgstr "Vostede pode especificar mÃ¡is opciÃ³ns para configurar a conta."
 
-#: ../capplet/settings/mail-account-view.c:315
+#: ../capplet/settings/mail-account-view.c:597
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
@@ -8646,13 +8479,13 @@ msgstr ""
 "Agora necesita as sÃºas configuraciÃ³ns para enviar correo. Tentouse adiviÃ±ar "
 "pero deberÃa comprobalas para asegurarse."
 
-#: ../capplet/settings/mail-account-view.c:316
+#: ../capplet/settings/mail-account-view.c:598
 msgid "You can specify your default settings for your account."
 msgstr ""
 "Vostede pode especificar as sÃºas configuraciÃ³ns predefinidas para a sÃºa "
 "conta."
 
-#: ../capplet/settings/mail-account-view.c:317
+#: ../capplet/settings/mail-account-view.c:599
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -8660,86 +8493,128 @@ msgstr ""
 "O tempo para verificar as cousas antes de tentar conectar ao servidor e "
 "obter o seu correo electrÃ³nico"
 
-#: ../capplet/settings/mail-account-view.c:332
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2185
-#: ../mail/mail-config.ui.h:58
+#: ../capplet/settings/mail-account-view.c:614
+#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2222
+#: ../mail/mail-config.ui.h:62
 msgid "Identity"
 msgstr "Identidade"
 
-#: ../capplet/settings/mail-account-view.c:332
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Next - Receiving mail"
-msgstr "Seguinte - Recibindo o correo"
+msgstr "Seguinte - RecepciÃ³n o correo"
 
-#: ../capplet/settings/mail-account-view.c:333
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Receiving mail"
-msgstr "Recibindo correo"
+msgstr "RecepciÃ³n de correo"
 
-#: ../capplet/settings/mail-account-view.c:333
-#: ../capplet/settings/mail-account-view.c:334
+#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:616
 msgid "Next - Sending mail"
 msgstr "Seguinte - Enviando o correo"
 
-#: ../capplet/settings/mail-account-view.c:333
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Back - Identity"
 msgstr "Anterior - Identidade"
 
-#: ../capplet/settings/mail-account-view.c:333
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Next - Receiving options"
 msgstr "Seguinte - OpciÃ³ns de recepciÃ³n"
 
-#: ../capplet/settings/mail-account-view.c:334
+#: ../capplet/settings/mail-account-view.c:616
 msgid "Receiving options"
 msgstr "OpciÃ³ns de recepciÃ³n"
 
-#: ../capplet/settings/mail-account-view.c:334
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:616
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Receiving mail"
-msgstr "Anterior - Recibindo o correo"
+msgstr "Anterior - RecepciÃ³n de correo"
 
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Sending mail"
-msgstr "Enviando correo"
+msgstr "EnvÃo de correo"
 
-#: ../capplet/settings/mail-account-view.c:336
-#: ../capplet/settings/mail-account-view.c:337
+#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:619
 msgid "Next - Review account"
-msgstr "Seguinte - Revisando a conta"
+msgstr "Seguinte - Revisar a conta"
 
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Next - Defaults"
 msgstr "Seguinte - Predefinidos"
 
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Receiving options"
 msgstr "Anterior - OpciÃ³ns de recepciÃ³n"
 
-#: ../capplet/settings/mail-account-view.c:337
-#: ../mail/em-account-editor.c:2763 ../mail/mail-config.ui.h:31
+#: ../capplet/settings/mail-account-view.c:619
+#: ../mail/em-account-editor.c:2988 ../mail/mail-config.ui.h:34
 msgid "Defaults"
 msgstr "Predefinidos"
 
-#: ../capplet/settings/mail-account-view.c:337
+#: ../capplet/settings/mail-account-view.c:619
 msgid "Back - Sending mail"
-msgstr "Anterior - Enviando correo"
+msgstr "Anterior - EnvÃo de correo"
 
-#: ../capplet/settings/mail-account-view.c:339
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Review account"
 msgstr "Revisar a conta"
 
-#: ../capplet/settings/mail-account-view.c:339
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Finish"
 msgstr "Rematar"
 
-#: ../capplet/settings/mail-account-view.c:339
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Back - Sending"
-msgstr "Anterior - Enviando"
+msgstr "Anterior - EnvÃo"
+
+#: ../capplet/settings/mail-account-view.c:726
+msgid "Setup Google contacts with Evolution"
+msgstr "Engadir contactos WebDAV ao Evolution."
+
+#: ../capplet/settings/mail-account-view.c:727
+msgid "Setup Google calendar with Evolution"
+msgstr "Engadir calendario de Google a Evolution."
+
+#: ../capplet/settings/mail-account-view.c:732
+msgid "You may need to enable IMAP access."
+msgstr "Pode que deba activar o acceso IMAP."
+
+#: ../capplet/settings/mail-account-view.c:740
+msgid "Google account settings:"
+msgstr "OpciÃ³ns de conta de Google:"
 
-#: ../capplet/settings/mail-account-view.c:671
-#: ../capplet/settings/mail-settings-view.c:262
+#: ../capplet/settings/mail-account-view.c:767
+msgid "Setup Yahoo calendar with Evolution"
+msgstr "Engadir calendarios de metereoloxÃa a Evolution."
+
+#: ../capplet/settings/mail-account-view.c:771
+msgid ""
+"Yahoo calendars are named as firstname_lastname. We have tried to form the "
+"calendar name. So please confirm and re-enter the calendar name if it is not "
+"correct."
+msgstr ""
+"Os calendarios de Yahoo chÃ¡manse home_apelido. Tentou formar o nome do "
+"calendario. Confirme e volva a introducir o nome do calendario se non Ã© "
+"correcto."
+
+#: ../capplet/settings/mail-account-view.c:778
+msgid "Yahoo account settings:"
+msgstr "OpciÃ³ns de conta de Yahoo:"
+
+#: ../capplet/settings/mail-account-view.c:792
+msgid "Yahoo Calendar name:"
+msgstr "Escoller ficheiro de calendario"
+
+#: ../capplet/settings/mail-account-view.c:1061
+msgid "Password:"
+msgstr "Con_trasinal:"
+
+#: ../capplet/settings/mail-account-view.c:1129
+#: ../capplet/settings/mail-settings-view.c:267
 msgid "Close Tab"
 msgstr "Pechar separador"
 
-#: ../capplet/settings/mail-account-view.c:681
+#: ../capplet/settings/mail-account-view.c:1139
 msgid "Account Wizard"
 msgstr "Asistente da conta"
 
@@ -8748,38 +8623,37 @@ msgid "Evolution account assistant"
 msgstr "Asistente de contas do Evolution"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:338 ../mail/e-mail-migrate.c:2948
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:215
-#: ../mail/message-list.c:1660
-#: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
-#: ../modules/calendar/e-cal-shell-backend.c:122
-#: ../modules/calendar/e-cal-shell-backend.c:134
-#: ../modules/calendar/e-cal-shell-migrate.c:564
-#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:664
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
+#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:207
+#: ../mail/message-list.c:1666
+#: ../modules/addressbook/e-book-shell-backend.c:96
+#: ../modules/addressbook/e-book-shell-migrate.c:130
+#: ../modules/calendar/e-cal-shell-backend.c:102
+#: ../modules/calendar/e-cal-shell-migrate.c:146
+#: ../modules/calendar/e-memo-shell-backend.c:92
 #: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/calendar/e-task-shell-backend.c:92
+#: ../modules/calendar/e-task-shell-migrate.c:111
 msgid "On This Computer"
 msgstr "Neste computador"
 
 #: ../capplet/settings/mail-settings-view.c:146
-#: ../plugins/groupwise-features/share-folder.c:747
-msgid "Modify"
-msgstr "Modificar"
+#, c-format
+msgid "Modify %s..."
+msgstr "Modificar %s..."
 
 #: ../capplet/settings/mail-settings-view.c:148
 msgid "Add a new account"
 msgstr "Engadir unha nova conta"
 
-#: ../capplet/settings/mail-settings-view.c:183
-msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
-msgstr "<span size=\"large\" weight=\"bold\">XestiÃ³n de conta</span>"
+#: ../capplet/settings/mail-settings-view.c:184
+msgid "Account management"
+msgstr "XestiÃ³n de contas"
 
-#: ../capplet/settings/mail-settings-view.c:272
+#: ../capplet/settings/mail-settings-view.c:277
 msgid "Settings"
 msgstr "ConfiguraciÃ³ns"
 
@@ -8791,8 +8665,8 @@ msgstr "InformaciÃ³n do calendario"
 msgid "Evolution Alarm Notify"
 msgstr "Importador do Elm do Evolution"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:827
-#: ../shell/e-shell-window-private.c:251
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:845
+#: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -8817,41 +8691,41 @@ msgid "Email Settings"
 msgstr "ConfiguraciÃ³n de correo electrÃ³nico"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:224
+#: ../e-util/e-activity.c:228
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (Cancelado)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:227
+#: ../e-util/e-activity.c:231
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (completada)"
 
 #. Translators: This is an activity whose percent
 #. * complete is unknown.
-#: ../e-util/e-activity.c:231
+#: ../e-util/e-activity.c:235
 #, c-format
 msgid "%s..."
 msgstr "%s (...)"
 
-#: ../e-util/e-activity.c:236
+#: ../e-util/e-activity.c:240
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% terminada)"
 
-#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
 msgid "Evolution Error"
 msgstr "Erro do Evolution"
 
-#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
 msgid "Evolution Warning"
 msgstr "Aviso do Evolution"
 
-#: ../e-util/e-alert.c:634
+#: ../e-util/e-alert.c:659
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
-msgstr "Erro interno: requiriuse un erro descoÃ±ecido '%s'"
+msgstr "Erro interno: requiriuse un erro descoÃ±ecido Â«%sÂ»"
 
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
@@ -8909,33 +8783,37 @@ msgstr "Europeo occidental"
 msgid "Western European, New"
 msgstr "Europeo occidental, novo"
 
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "Tradicional"
 
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "Simplificado"
 
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
 msgid "Ukrainian"
 msgstr "UcraÃno"
 
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
 msgid "Visual"
 msgstr "Visual"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
-#: ../plugins/itip-formatter/itip-view.c:195
-#: ../widgets/table/e-cell-date-edit.c:311
+#: ../modules/calendar/e-cal-shell-view-actions.c:1790
+#: ../plugins/itip-formatter/itip-view.c:191
+#: ../widgets/table/e-cell-date-edit.c:308
 msgid "Today"
 msgstr "Hoxe"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "MaÃ±Ã¡"
 
@@ -8943,23 +8821,29 @@ msgstr "MaÃ±Ã¡"
 msgid "Yesterday"
 msgstr "Onte"
 
-#: ../e-util/e-datetime-format.c:210
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
 #, c-format
-msgid "%d days from now"
-msgstr "%d dÃas desde agora"
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "Dentro de %d dÃa"
+msgstr[1] "Dentro de %d dÃas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../e-util/e-datetime-format.c:212
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214
 #, c-format
-msgid "%d days ago"
-msgstr "hai %d dÃas"
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Hai %d dÃa"
+msgstr[1] "Hai %d dÃas"
 
-#: ../e-util/e-datetime-format.c:286 ../e-util/e-datetime-format.c:296
-#: ../e-util/e-datetime-format.c:305
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
 msgid "Use locale default"
 msgstr "Usar os locais predefinidos"
 
-#: ../e-util/e-datetime-format.c:499
+#: ../e-util/e-datetime-format.c:502
 msgid "Format:"
 msgstr "Formato:"
 
@@ -8980,18 +8864,6 @@ msgstr "Facendo ping a %s"
 msgid "Writing \"%s\" to %s"
 msgstr "Copiando `%s' a `%s'"
 
-#: ../e-util/e-logger.c:175
-msgid "Name of the logger"
-msgstr "Nome do compoÃ±ente que se estÃ¡ rexistrando"
-
-#: ../e-util/e-module.c:188
-msgid "Filename"
-msgstr "Nome do f_icheiro:"
-
-#: ../e-util/e-module.c:189
-msgid "The filename of the module"
-msgstr "Modificar o nome deste cartafol"
-
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "Rexistros de depuraciÃ³n"
@@ -9014,13 +8886,15 @@ msgstr "Rexistro de mensaxes:"
 msgid "Log Level"
 msgstr "Nivel de rexistro"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2733
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2757
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensaxes"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1446
+#: ../shell/e-shell-window-actions.c:1426
+#: ../shell/e-shell-window-actions.c:1433
+#: ../shell/e-shell-window-actions.c:1440
 msgid "Close this window"
 msgstr "Pechar esta xanela"
 
@@ -9044,19 +8918,8 @@ msgstr "DepuraciÃ³n"
 msgid "Error, Warnings and Debug messages"
 msgstr "Erros, avisos e mensaxes de depuraciÃ³n"
 
-#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "Activado"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "Indica se o engadido estÃ¡ activado"
-
-#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:337
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "semanas"
@@ -9075,21 +8938,21 @@ msgid ""
 msgstr ""
 "O sistema de impresiÃ³n non informou de ningÃºn detalle adicional sobre o erro."
 
-#: ../e-util/e-signature.c:701
+#: ../e-util/e-signature.c:707
 msgid "Autogenerated"
 msgstr "Xerado automaticamente"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1
 msgid "Because \"{1}\"."
-msgstr "Porque \"{1}\"."
+msgstr "Porque Â«{1}Â»."
 
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file \"{0}\"."
-msgstr "Non Ã© posÃbel abrir o ficheiro \"{0}\"."
+msgstr "Non Ã© posÃbel abrir o ficheiro Â«{0}Â»."
 
 #: ../e-util/e-system.error.xml.h:3
 msgid "Cannot save file \"{0}\"."
-msgstr "Non Ã© posÃbel gardar o ficheiro \"{0}\"."
+msgstr "Non Ã© posÃbel gardar o ficheiro Â«{0}Â»."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
@@ -9097,126 +8960,134 @@ msgstr "Quere sobrescribilo?"
 
 #: ../e-util/e-system.error.xml.h:5
 msgid "File exists \"{0}\"."
-msgstr "O ficheiro xa existe \"{0}\"."
+msgstr "O ficheiro xa existe Â«{0}Â»."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:140
 msgid "_Overwrite"
 msgstr "S_obrescribir"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:146
 msgid "Could not open the link."
 msgstr "Non foi posÃbel abrir a ligazÃ³n."
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:193
 msgid "Could not display help for Evolution."
 msgstr "Non foi posÃbel mostrar a axuda do Evolution."
 
-#: ../e-util/gconf-bridge.c:1307
+#: ../e-util/gconf-bridge.c:1281
 #, c-format
 msgid "GConf error: %s"
 msgstr "Erro do GConf: %s"
 
-#: ../e-util/gconf-bridge.c:1318
+#: ../e-util/gconf-bridge.c:1292
 msgid "All further errors shown only on terminal."
 msgstr "Todos os erros posteriores mostraranse sÃ³ no terminal."
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../modules/mail/em-mailer-prefs.c:79
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1038
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:72
+msgid "From"
+msgstr "De"
+
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1039
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:964
-#: ../mail/em-format-html.c:2247 ../mail/em-format-html.c:2309
-#: ../mail/em-format-html.c:2332 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1041
+#: ../mail/em-format-html.c:2290 ../mail/em-format-html.c:2352
+#: ../mail/em-format-html.c:2375 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:965
-#: ../mail/em-format-html.c:2248 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2335 ../modules/mail/em-mailer-prefs.c:82
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1042
+#: ../mail/em-format-html.c:2291 ../mail/em-format-html.c:2356
+#: ../mail/em-format-html.c:2378 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "Cco"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:966
+#: ../em-format/em-format-quote.c:410 ../em-format/em-format.c:1043
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:83
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
+#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "Asunto"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2429
-#: ../modules/mail/em-mailer-prefs.c:1131
+#: ../em-format/em-format-quote.c:421 ../mail/em-format-html.c:2472
+#: ../modules/mail/em-mailer-prefs.c:1120
 msgid "Mailer"
 msgstr "Aplicativo de correo"
 
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1225
+#: ../em-format/em-format-quote.c:500 ../mail/em-composer-utils.c:1296
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensaxe reenviada --------"
 
-#: ../em-format/em-format.c:967 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:84 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../em-format/em-format.c:1044 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:527
+#: ../widgets/misc/e-dateedit.c:549
 msgid "Date"
 msgstr "Data"
 
-#: ../em-format/em-format.c:968 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:1045 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
 msgstr "Grupos de noticias"
 
-#: ../em-format/em-format.c:969 ../modules/mail/em-mailer-prefs.c:86
+#: ../em-format/em-format.c:1046 ../modules/mail/em-mailer-prefs.c:80
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Cara"
 
-#: ../em-format/em-format.c:1325
+#: ../em-format/em-format.c:1431
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: ../em-format/em-format.c:1380
+#: ../em-format/em-format.c:1503
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Non foi posÃbel analizar a mensaxe S/MIME: erro descoÃ±ecido"
 
-#: ../em-format/em-format.c:1518 ../em-format/em-format.c:1680
+#: ../em-format/em-format.c:1662 ../em-format/em-format.c:1846
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Non foi posÃbel analizar a mensaxe MIME. MostrÃ¡ndoa como orixe."
 
-#: ../em-format/em-format.c:1526
+#: ../em-format/em-format.c:1672
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de cifrado non compatÃbel para multipart/encrypted"
 
-#: ../em-format/em-format.c:1538
+#: ../em-format/em-format.c:1688
 msgid "Could not parse PGP/MIME message"
 msgstr "Non foi posÃbel analizar a mensaxe PGP/MIME"
 
-#: ../em-format/em-format.c:1538
+#: ../em-format/em-format.c:1689
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Non foi posÃbel analizar a mensaxe PGP/MIME: erro descoÃ±ecido"
 
-#: ../em-format/em-format.c:1704
+#: ../em-format/em-format.c:1871
 msgid "Unsupported signature format"
 msgstr "O formato da sinatura non Ã© compatÃbel"
 
-#: ../em-format/em-format.c:1712 ../em-format/em-format.c:1853
+#: ../em-format/em-format.c:1881 ../em-format/em-format.c:2041
 msgid "Error verifying signature"
 msgstr "Produciuse un erro ao verificar a sinatura"
 
-#: ../em-format/em-format.c:1712 ../em-format/em-format.c:1842
-#: ../em-format/em-format.c:1853
+#: ../em-format/em-format.c:1882 ../em-format/em-format.c:2029
+#: ../em-format/em-format.c:2042
 msgid "Unknown error verifying signature"
 msgstr "Produciuse un erro descoÃ±ecido ao verificar a sinatura"
 
-#: ../em-format/em-format.c:1930
-msgid "Could not parse PGP message"
-msgstr "Non foi posÃbel analizar a mensaxe PGP"
+#: ../em-format/em-format.c:2129
+msgid "Could not parse PGP message: "
+msgstr "Non foi posÃbel analizar a mensaxe PGP: "
 
-#: ../em-format/em-format.c:1930
-msgid "Could not parse PGP message: Unknown error"
-msgstr "Non foi posÃbel analizar a mensaxe PGP: erro descoÃ±ecido"
+#: ../em-format/em-format.c:2135 ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
+#: ../smime/gui/certificate-manager.c:100
+msgid "Unknown error"
+msgstr "Erro descoÃ±ecido"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -9224,7 +9095,7 @@ msgstr[0] "hai un segundo"
 msgstr[1] "hai %d segundos"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
@@ -9232,7 +9103,7 @@ msgstr[0] "dentro de 1 segundo"
 msgstr[1] "dentro de %d segundos"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -9240,7 +9111,7 @@ msgstr[0] "hai 1 minuto"
 msgstr[1] "hai %d minutos"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
@@ -9248,7 +9119,7 @@ msgstr[0] "dentro de 1 minuto"
 msgstr[1] "dentro de %d minutos"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -9256,7 +9127,7 @@ msgstr[0] "hai 1 hora"
 msgstr[1] "hai %d horas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
@@ -9264,7 +9135,7 @@ msgstr[0] "dentro de 1 hora"
 msgstr[1] "dentro de %d horas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -9272,7 +9143,7 @@ msgstr[0] "hai 1 dÃa"
 msgstr[1] "hai %d dÃas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
@@ -9280,7 +9151,7 @@ msgstr[0] "dentro de 1 dÃa"
 msgstr[1] "dentro de %d dÃas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -9288,7 +9159,7 @@ msgstr[0] "hai 1 semana"
 msgstr[1] "hai %d semanas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
@@ -9296,7 +9167,7 @@ msgstr[0] "dentro de 1 semana"
 msgstr[1] "dentro de %d semanas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -9304,7 +9175,7 @@ msgstr[0] "hai 1 mes"
 msgstr[1] "hai %d meses"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
@@ -9312,106 +9183,106 @@ msgstr[0] "dentro de 1 mes"
 msgstr[1] "dentro de %d meses"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "hai 1 ano"
 msgstr[1] "hai %d anos"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "dentro de 1 ano"
 msgstr[1] "dentro de %d anos"
 
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:122
 msgid "<click here to select a date>"
 msgstr "<prema aquÃ para seleccionar unha data>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:125 ../filter/e-filter-datespec.c:136
+#: ../filter/e-filter-datespec.c:147
 msgid "now"
 msgstr "agora"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:132
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:275
 msgid "Select a time to compare against"
 msgstr "Seleccione unha hora coa que comparar"
 
-#: ../filter/e-filter-file.c:184
+#: ../filter/e-filter-file.c:188
 msgid "Choose a File"
 msgstr "Seleccione un ficheiro"
 
-#: ../filter/e-filter-rule.c:659
+#: ../filter/e-filter-rule.c:663
 msgid "R_ule name:"
 msgstr "Nome da r_egra:"
 
-#: ../filter/e-filter-rule.c:689
+#: ../filter/e-filter-rule.c:693
 msgid "Find items that meet the following conditions"
 msgstr "Encontrar os elementos que cumpran as seguintes condiciÃ³ns"
 
-#: ../filter/e-filter-rule.c:723
-msgid "A_dd Condition"
-msgstr "Enga_dir unha condiciÃ³n"
-
-#: ../filter/e-filter-rule.c:732
+#: ../filter/e-filter-rule.c:718
 msgid "If all conditions are met"
 msgstr "Se se cumpren todas as condiciÃ³ns"
 
-#: ../filter/e-filter-rule.c:733
+#: ../filter/e-filter-rule.c:719
 msgid "If any conditions are met"
 msgstr "Se se cumpre calquera condiciÃ³n"
 
-#: ../filter/e-filter-rule.c:736
+#: ../filter/e-filter-rule.c:722
 msgid "_Find items:"
 msgstr "_Buscar elementos:"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:759
+#: ../filter/e-filter-rule.c:749
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../filter/e-filter-rule.c:760
+#: ../filter/e-filter-rule.c:750
 msgid "All related"
 msgstr "Todos os relacionados"
 
-#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:14
+#: ../filter/e-filter-rule.c:751 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Respostas"
 
-#: ../filter/e-filter-rule.c:762
+#: ../filter/e-filter-rule.c:752
 msgid "Replies and parents"
 msgstr "Respostas e pais"
 
-#: ../filter/e-filter-rule.c:763
+#: ../filter/e-filter-rule.c:753
 msgid "No reply or parent"
 msgstr "Sen resposta nin pai"
 
-#: ../filter/e-filter-rule.c:766
+#: ../filter/e-filter-rule.c:756
 msgid "I_nclude threads"
 msgstr "I_ncluÃr fÃos"
 
-#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../filter/e-filter-rule.c:779
+msgid "A_dd Condition"
+msgstr "Enga_dir unha condiciÃ³n"
+
+#: ../filter/e-filter-rule.c:1128 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1128 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "SaÃnte"
 
-#: ../filter/e-rule-editor.c:265
+#: ../filter/e-rule-editor.c:270
 msgid "Add Rule"
 msgstr "Engadir regra"
 
-#: ../filter/e-rule-editor.c:352
+#: ../filter/e-rule-editor.c:359
 msgid "Edit Rule"
 msgstr "Editar regra"
 
@@ -9435,7 +9306,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:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Falta o nome."
 
@@ -9491,7 +9362,7 @@ msgstr ""
 "A data da mensaxe compararase coa\n"
 "data actual do momento no que se produce a filtraxe."
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:189
 msgid "_Filter Rules"
 msgstr "Regras de _filtro"
 
@@ -9517,7 +9388,7 @@ msgstr ""
 msgid "months"
 msgstr "Mes"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:190
 msgid "seconds"
 msgstr "segundos"
 
@@ -9533,44 +9404,28 @@ msgstr "o tempo que especificou"
 msgid "years"
 msgstr "Cabeceiras"
 
-#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1031 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:118
-#: ../widgets/misc/e-attachment-paned.c:123
+#: ../mail/e-mail-attachment-bar.c:91 ../mail/e-mail-attachment-bar.c:96
+#: ../mail/em-format-html-display.c:1024 ../mail/mail-config.ui.h:15
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:129
+#: ../widgets/misc/e-attachment-paned.c:134
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Anexo"
 msgstr[1] "Anexos"
 
-#: ../mail/e-mail-attachment-bar.c:590
-#: ../widgets/misc/e-attachment-paned.c:581
+#: ../mail/e-mail-attachment-bar.c:611
+#: ../widgets/misc/e-attachment-paned.c:599
 msgid "Icon View"
 msgstr "VisualizaciÃ³n en iconas"
 
-#: ../mail/e-mail-attachment-bar.c:591
-#: ../widgets/misc/e-attachment-paned.c:582
+#: ../mail/e-mail-attachment-bar.c:612
+#: ../widgets/misc/e-attachment-paned.c:600
 msgid "List View"
 msgstr "VisualizaciÃ³n de lista"
 
-#: ../mail/e-mail-browser.c:771 ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr "Enfocar o tracker"
-
-#: ../mail/e-mail-browser.c:781
-msgid "Shell Module"
-msgstr "Modo de selecciÃ³n"
-
-#: ../mail/e-mail-browser.c:782 ../mail/message-list.c:2626
-msgid "The mail shell backend"
-msgstr "A infraestrutura da terminal de mail"
-
-#: ../mail/e-mail-browser.c:792
-msgid "Show Deleted"
-msgstr "Eliminada"
-
-#: ../mail/e-mail-browser.c:793
-msgid "Show deleted messages"
-msgstr "Mensaxes reenviadas"
+#: ../mail/e-mail-browser.c:265
+msgid "(No Subject)"
+msgstr "(Sen asunto)"
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
@@ -9588,7 +9443,7 @@ msgstr "_Desde este enderezo"
 msgid "Create Search _Folder"
 msgstr "Crear cartafol de _busca"
 
-#: ../mail/e-mail-label-dialog.c:220
+#: ../mail/e-mail-label-dialog.c:222
 msgid "_Label name:"
 msgstr "_Nome da etiqueta:"
 
@@ -9617,7 +9472,7 @@ msgid "_Later"
 msgstr "_MÃ¡is tarde"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:519
+#: ../modules/mail/e-mail-shell-view-actions.c:505
 msgid "Add Label"
 msgstr "Engadir etiqueta"
 
@@ -9637,115 +9492,57 @@ msgstr ""
 msgid "Color"
 msgstr "Cor"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2746
-#: ../modules/mail/e-mail-shell-view-private.c:961
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:334
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "Nome"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
+#: ../mail/em-folder-tree-model.c:696 ../mail/em-folder-tree.c:2840
+#: ../modules/mail/e-mail-shell-view-private.c:1062
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:688
 msgid "Drafts"
 msgstr "Borradores"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:700
 msgid "Outbox"
 msgstr "Caixa de saÃda"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:702
 msgid "Sent"
 msgstr "Enviado"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:691
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:578
 msgid "Templates"
 msgstr "Modelos"
 
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "Importante"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "Tarefas pendentes"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "MÃ¡is tarde"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:131
 msgid "Migrating..."
 msgstr "Migrando..."
 
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:164
 msgid "Migration"
 msgstr "MigraciÃ³n"
 
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:204
 #, c-format
 msgid "Migrating '%s':"
-msgstr "Migrando '%s':"
+msgstr "Migrando Â«%sÂ»:"
 
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "Non Ã© posÃbel crear un cartafol novo: `%s': %s"
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "Non Ã© posÃbel copiar o cartafol `%s' en `%s': %s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "Non Ã© posÃbel examinar as caixas de correo existentes en `%s': %s"
-
-#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2932
+#: ../mail/e-mail-migrate.c:649
 msgid "Migrating Folders"
 msgstr "MigraciÃ³n de cartafoles"
 
-#: ../mail/e-mail-migrate.c:1824
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"A localizaciÃ³n e a xerarquÃa dos cartafoles da caixa de correo modificouse "
-"desde Evolution 1.x.\n"
-"\n"
-"Agarde mentres o Evolution migra os seus cartafoles..."
-
-#: ../mail/e-mail-migrate.c:2027
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "Non Ã© posÃbel abrir os datos antigos POP keep-on-server `%s': %s"
-
-#: ../mail/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "Non Ã© posÃbel crear o cartafol de datos POP3 keep-on-server `%s': %s"
-
-#: ../mail/e-mail-migrate.c:2075
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "Non Ã© posÃbel copiar os datos POP3 keep-on-server `%s': %s"
-
-#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "Produciuse un fallo ao crear o almacenamento de correo local `%s': %s"
-
-#: ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:650
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9757,45 +9554,50 @@ msgstr ""
 "\n"
 "Sexa paciente mentres o Evolution migra os seus cartafoles..."
 
-#: ../mail/e-mail-migrate.c:3030
+#: ../mail/e-mail-migrate.c:796
 #, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "Non Ã© posÃbel crear os cartafoles de correo local en `%s': %s"
+msgid "Unable to create local mail folders at '%s': %s"
+msgstr "Non Ã© posÃbel crear os cartafoles de correo local en Â«%sÂ»: %s"
 
-#: ../mail/e-mail-migrate.c:3048
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"Non Ã© posÃbel ler a configuraciÃ³n da instalaciÃ³n anterior do Evolution: "
-"`evolution/config.xmldb' non existe ou estÃ¡ danado."
+#: ../mail/e-mail-notebook-view.c:563
+msgid "Please select a folder"
+msgstr "Seleccione un cartafol."
 
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:107
-#: ../modules/calendar/e-task-shell-view-actions.c:568
+#: ../mail/e-mail-reader-utils.c:109
+#: ../modules/calendar/e-task-shell-view-actions.c:570
 msgid "Do not ask me again"
 msgstr "Non preguntar de novo."
 
-#: ../mail/e-mail-reader.c:258 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:276 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copiar ao cartafol"
 
-#: ../mail/e-mail-reader.c:258 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:276 ../mail/em-folder-utils.c:402
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: ../mail/e-mail-reader.c:632 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:689 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Mover ao cartafol"
 
-#: ../mail/e-mail-reader.c:632 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:689 ../mail/em-folder-utils.c:402
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../mail/e-mail-reader.c:858
+#. Check buttons
+#: ../mail/e-mail-reader.c:954 ../mail/e-mail-reader.c:1070
+#: ../mail/e-mail-reader.c:1111
+msgid "_Do not ask me again."
+msgstr "_Non preguntarme de novo."
+
+#: ../mail/e-mail-reader.c:1116
+msgid "_Always ignore Reply-To: for mailing lists."
+msgstr "_Ignorar sempre Â«Responder a:Â» para as roldas de correo."
+
+#: ../mail/e-mail-reader.c:1206
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Gardar mensaxe..."
@@ -9807,576 +9609,624 @@ msgstr[1] "Gardar mensaxe..."
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:879 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
+#: ../mail/e-mail-reader.c:1227
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Mensaxe"
 msgstr[1] "Mensaxe"
 
-#: ../mail/e-mail-reader.c:1137
+#: ../mail/e-mail-reader.c:1492
 msgid "A_dd Sender to Address Book"
 msgstr "_Engadir o remitente Ã¡ axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1139
+#: ../mail/e-mail-reader.c:1494
 msgid "Add sender to address book"
 msgstr "Engadir o remitente Ã¡ axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1144
+#: ../mail/e-mail-reader.c:1499
 msgid "Check for _Junk"
 msgstr "Verificar se hai correo non dese_xado"
 
-#: ../mail/e-mail-reader.c:1146
+#: ../mail/e-mail-reader.c:1501
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrar as mensaxes seleccionadas polo estado de correo non desexado"
 
-#: ../mail/e-mail-reader.c:1151
+#: ../mail/e-mail-reader.c:1506
 msgid "_Copy to Folder..."
 msgstr "_Copiar ao cartafol..."
 
-#: ../mail/e-mail-reader.c:1153
+#: ../mail/e-mail-reader.c:1508
 msgid "Copy selected messages to another folder"
 msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:1158
+#: ../mail/e-mail-reader.c:1513
 msgid "_Delete Message"
 msgstr "E_liminar mensaxe"
 
-#: ../mail/e-mail-reader.c:1160
+#: ../mail/e-mail-reader.c:1515
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar as mensaxes seleccionadas para eliminalas"
 
-#: ../mail/e-mail-reader.c:1165
+#: ../mail/e-mail-reader.c:1520
 msgid "Filter on Mailing _List..."
-msgstr "Filtrar por _lista de correo..."
+msgstr "Filtrar por _rolda de correo..."
 
-#: ../mail/e-mail-reader.c:1167
+#: ../mail/e-mail-reader.c:1522
 msgid "Create a rule to filter messages to this mailing list"
-msgstr "Crear unha regra para filtrar mensaxes a esta lista de correo"
+msgstr "Crear unha regra para filtrar mensaxes a esta rolda de correo"
 
-#: ../mail/e-mail-reader.c:1172
+#: ../mail/e-mail-reader.c:1527
 msgid "Filter on _Recipients..."
 msgstr "Filtrar por _destinatarios..."
 
-#: ../mail/e-mail-reader.c:1174
+#: ../mail/e-mail-reader.c:1529
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Crear unha regra para filtrar mensaxes a estes destinatarios"
 
-#: ../mail/e-mail-reader.c:1179
+#: ../mail/e-mail-reader.c:1534
 msgid "Filter on Se_nder..."
 msgstr "Filtrar por re_mitente..."
 
-#: ../mail/e-mail-reader.c:1181
+#: ../mail/e-mail-reader.c:1536
 msgid "Create a rule to filter messages from this sender"
 msgstr "Crear unha regra para filtrar mensaxes deste remitente"
 
-#: ../mail/e-mail-reader.c:1186
+#: ../mail/e-mail-reader.c:1541
 msgid "Filter on _Subject..."
 msgstr "Filtrar por a_sunto..."
 
-#: ../mail/e-mail-reader.c:1188
+#: ../mail/e-mail-reader.c:1543
 msgid "Create a rule to filter messages with this subject"
 msgstr "Crear unha regra para filtrar mensaxes con este asunto"
 
-#: ../mail/e-mail-reader.c:1193
+#: ../mail/e-mail-reader.c:1548
 msgid "A_pply Filters"
 msgstr "_Aplicar filtros"
 
-#: ../mail/e-mail-reader.c:1195
+#: ../mail/e-mail-reader.c:1550
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplicar as regras de filtraxe Ã¡s mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:1200
+#: ../mail/e-mail-reader.c:1555
 msgid "_Find in Message..."
 msgstr "_Buscar na mensaxe..."
 
-#: ../mail/e-mail-reader.c:1202
+#: ../mail/e-mail-reader.c:1557
 msgid "Search for text in the body of the displayed message"
 msgstr "Buscar texto no corpo da mensaxe mostrada"
 
-#: ../mail/e-mail-reader.c:1207
+#: ../mail/e-mail-reader.c:1562
 msgid "_Clear Flag"
 msgstr "E_liminar marca"
 
-#: ../mail/e-mail-reader.c:1209
+#: ../mail/e-mail-reader.c:1564
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Crear unha tarefa nova a partir da mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:1214
+#: ../mail/e-mail-reader.c:1569
 msgid "_Flag Completed"
 msgstr "_Marcar como terminado"
 
-#: ../mail/e-mail-reader.c:1216
+#: ../mail/e-mail-reader.c:1571
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Seleccionar todas as mensaxes do mesmo fÃo que a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:1221
+#: ../mail/e-mail-reader.c:1576
 msgid "Follow _Up..."
 msgstr "Seg_uimento..."
 
-#: ../mail/e-mail-reader.c:1223
+#: ../mail/e-mail-reader.c:1578
 msgid "Flag the selected messages for follow-up"
 msgstr "Marcar as mensaxes seleccionadas para o seguimento"
 
-#: ../mail/e-mail-reader.c:1228
+#: ../mail/e-mail-reader.c:1583
 msgid "_Attached"
 msgstr "_Anexada"
 
-#: ../mail/e-mail-reader.c:1230 ../mail/e-mail-reader.c:1237
+#: ../mail/e-mail-reader.c:1585 ../mail/e-mail-reader.c:1592
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Reenviar a alguÃ©n a mensaxe seleccionada como un anexo"
 
-#: ../mail/e-mail-reader.c:1235
+#: ../mail/e-mail-reader.c:1590
 msgid "Forward As _Attached"
 msgstr "_Remitir como iCalendar"
 
-#: ../mail/e-mail-reader.c:1242
+#: ../mail/e-mail-reader.c:1597
 msgid "_Inline"
 msgstr "_En liÃ±a"
 
-#: ../mail/e-mail-reader.c:1244 ../mail/e-mail-reader.c:1251
+#: ../mail/e-mail-reader.c:1599 ../mail/e-mail-reader.c:1606
 msgid "Forward the selected message in the body of a new message"
 msgstr "Reenviar a mensaxe seleccionada no corpo dunha mensaxe nova"
 
-#: ../mail/e-mail-reader.c:1249
+#: ../mail/e-mail-reader.c:1604
 msgid "Forward As _Inline"
 msgstr "Estilo de _reenvÃo:"
 
-#: ../mail/e-mail-reader.c:1256
+#: ../mail/e-mail-reader.c:1611
 msgid "_Quoted"
 msgstr "_Citada"
 
-#: ../mail/e-mail-reader.c:1258 ../mail/e-mail-reader.c:1265
+#: ../mail/e-mail-reader.c:1613 ../mail/e-mail-reader.c:1620
 msgid "Forward the selected message quoted like a reply"
 msgstr "Reenviar a mensaxe seleccionada citada como unha resposta"
 
-#: ../mail/e-mail-reader.c:1263
+#: ../mail/e-mail-reader.c:1618
 msgid "Forward As _Quoted"
 msgstr "Estilo de _reenvÃo:"
 
-#: ../mail/e-mail-reader.c:1270
+#: ../mail/e-mail-reader.c:1625
 msgid "_Load Images"
 msgstr "_Cargar imaxes"
 
-#: ../mail/e-mail-reader.c:1272
+#: ../mail/e-mail-reader.c:1627
 msgid "Force images in HTML mail to be loaded"
 msgstr "Forzar a carga de imaxes no correo HTML"
 
-#: ../mail/e-mail-reader.c:1277
+#: ../mail/e-mail-reader.c:1632
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../mail/e-mail-reader.c:1279
+#: ../mail/e-mail-reader.c:1634
 msgid "Mark the selected messages as important"
 msgstr "Marcar as mensaxes seleccionadas como importantes"
 
-#: ../mail/e-mail-reader.c:1284
+#: ../mail/e-mail-reader.c:1639
 msgid "_Junk"
 msgstr "_Correo non desexado"
 
-#: ../mail/e-mail-reader.c:1286
+#: ../mail/e-mail-reader.c:1641
 msgid "Mark the selected messages as junk"
 msgstr "Marcar as mensaxes seleccionadas como correo non desexado"
 
-#: ../mail/e-mail-reader.c:1291
+#: ../mail/e-mail-reader.c:1646
 msgid "_Not Junk"
 msgstr "_Non Ã© correo non desexado"
 
-#: ../mail/e-mail-reader.c:1293
+#: ../mail/e-mail-reader.c:1648
 msgid "Mark the selected messages as not being junk"
 msgstr "Marcar as mensaxes seleccionadas como non lixo"
 
-#: ../mail/e-mail-reader.c:1298
+#: ../mail/e-mail-reader.c:1653
 msgid "_Read"
 msgstr "_Lida"
 
-#: ../mail/e-mail-reader.c:1300
+#: ../mail/e-mail-reader.c:1655
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar as mensaxes seleccionadas como lidas"
 
-#: ../mail/e-mail-reader.c:1305
+#: ../mail/e-mail-reader.c:1660
 msgid "Uni_mportant"
 msgstr "Non i_mportante"
 
-#: ../mail/e-mail-reader.c:1307
+#: ../mail/e-mail-reader.c:1662
 msgid "Mark the selected messages as unimportant"
 msgstr "Marcar as mensaxes seleccionadas como non importantes"
 
-#: ../mail/e-mail-reader.c:1312
+#: ../mail/e-mail-reader.c:1667
 msgid "_Unread"
 msgstr "_Non lida"
 
-#: ../mail/e-mail-reader.c:1314
+#: ../mail/e-mail-reader.c:1669
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar as mensaxes seleccionadas como non lidas"
 
-#: ../mail/e-mail-reader.c:1319
+#: ../mail/e-mail-reader.c:1674
 msgid "_Edit as New Message..."
 msgstr "_Editar como unha mensaxe nova..."
 
-#: ../mail/e-mail-reader.c:1321
+#: ../mail/e-mail-reader.c:1676
 msgid "Open the selected messages in the composer for editing"
 msgstr "Abrir as mensaxes seleccionadas no editor para editalas"
 
-#: ../mail/e-mail-reader.c:1326
+#: ../mail/e-mail-reader.c:1681
 msgid "Compose _New Message"
 msgstr "Redactar unha mensaxe _nova"
 
-#: ../mail/e-mail-reader.c:1328
+#: ../mail/e-mail-reader.c:1683
 msgid "Open a window for composing a mail message"
 msgstr "Abrir unha xanela para compor unha mensaxe de correo"
 
-#: ../mail/e-mail-reader.c:1333
+#: ../mail/e-mail-reader.c:1688
 msgid "_Open in New Window"
 msgstr "_Abrir nunha xanela nova"
 
-#: ../mail/e-mail-reader.c:1335
+#: ../mail/e-mail-reader.c:1690
 msgid "Open the selected messages in a new window"
 msgstr "Abrir as mensaxes seleccionadas nunha xanela nova"
 
-#: ../mail/e-mail-reader.c:1340
+#: ../mail/e-mail-reader.c:1695
 msgid "_Move to Folder..."
 msgstr "_Mover ao cartafol..."
 
-#: ../mail/e-mail-reader.c:1342
+#: ../mail/e-mail-reader.c:1697
 msgid "Move selected messages to another folder"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:1347
+#: ../mail/e-mail-reader.c:1702
+msgid "_Switch to Folder"
+msgstr "_Cambiar ao cartafol"
+
+#: ../mail/e-mail-reader.c:1704
+msgid "Display the parent folder"
+msgstr "Mostrar o cartafol superior"
+
+#: ../mail/e-mail-reader.c:1709
+msgid "Switch to _next tab"
+msgstr "Cambiar ao _seguinte separador"
+
+#: ../mail/e-mail-reader.c:1711
+msgid "Switch to the next tab"
+msgstr "Cambiar ao seguinte separador"
+
+#: ../mail/e-mail-reader.c:1716
+msgid "Switch to _previous tab"
+msgstr "Cambiar ao _anterior separador"
+
+#: ../mail/e-mail-reader.c:1718
+msgid "Switch to the previous tab"
+msgstr "Cambiar ao separador anterior"
+
+#: ../mail/e-mail-reader.c:1723
+msgid "Cl_ose current tab"
+msgstr "Pe_char o separador actual"
+
+#: ../mail/e-mail-reader.c:1725
+msgid "Close current tab"
+msgstr "Pechar o separador actual"
+
+#: ../mail/e-mail-reader.c:1730
 msgid "_Next Message"
 msgstr "_Seguinte mensaxe"
 
-#: ../mail/e-mail-reader.c:1349
+#: ../mail/e-mail-reader.c:1732
 msgid "Display the next message"
 msgstr "Mostrar a seguinte mensaxe"
 
-#: ../mail/e-mail-reader.c:1354
+#: ../mail/e-mail-reader.c:1737
 msgid "Next _Important Message"
 msgstr "Seguinte mensaxe _importante"
 
-#: ../mail/e-mail-reader.c:1356
+#: ../mail/e-mail-reader.c:1739
 msgid "Display the next important message"
 msgstr "Mostrar a seguinte mensaxe importante"
 
-#: ../mail/e-mail-reader.c:1361
+#: ../mail/e-mail-reader.c:1744
 msgid "Next _Thread"
 msgstr "Seguinte _fÃo"
 
-#: ../mail/e-mail-reader.c:1363
+#: ../mail/e-mail-reader.c:1746
 msgid "Display the next thread"
 msgstr "Mostrar o seguinte fÃo"
 
-#: ../mail/e-mail-reader.c:1368
+#: ../mail/e-mail-reader.c:1751
 msgid "Next _Unread Message"
 msgstr "Seguinte mensaxe _non lida"
 
-#: ../mail/e-mail-reader.c:1370
+#: ../mail/e-mail-reader.c:1753
 msgid "Display the next unread message"
 msgstr "Mostrar a seguinte mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:1375
+#: ../mail/e-mail-reader.c:1758
 msgid "_Previous Message"
 msgstr "_Mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:1377
+#: ../mail/e-mail-reader.c:1760
 msgid "Display the previous message"
 msgstr "Mostrar a mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:1382
+#: ../mail/e-mail-reader.c:1765
 msgid "Pr_evious Important Message"
 msgstr "Ant_erior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:1384
+#: ../mail/e-mail-reader.c:1767
 msgid "Display the previous important message"
 msgstr "Mostrar a anterior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:1389
+#: ../mail/e-mail-reader.c:1772
 msgid "P_revious Unread Message"
 msgstr "Ante_rior mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:1391
+#: ../mail/e-mail-reader.c:1774
 msgid "Display the previous unread message"
 msgstr "Mostrar a anterior mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:1398
+#: ../mail/e-mail-reader.c:1781
 msgid "Print this message"
 msgstr "Imprimir esta mensaxe"
 
-#: ../mail/e-mail-reader.c:1405
+#: ../mail/e-mail-reader.c:1788
 msgid "Preview the message to be printed"
 msgstr "Previsualizar a mensaxe que se vai imprimir"
 
-#: ../mail/e-mail-reader.c:1410
+#: ../mail/e-mail-reader.c:1793
 msgid "Re_direct"
 msgstr "Re_direccionar"
 
-#: ../mail/e-mail-reader.c:1412
+#: ../mail/e-mail-reader.c:1795
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redireccionar a alguÃ©n (rebotar) a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:1417
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../mail/e-mail-reader.c:1800 ../mail/mail.error.xml.h:91
+#: ../modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../modules/mail/e-mail-attachment-handler.c:151
 msgid "Reply to _All"
 msgstr "Responder a t_odos"
 
-#: ../mail/e-mail-reader.c:1419
+#: ../mail/e-mail-reader.c:1802
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr ""
 "Redactar unha resposta para todos os destinatarios da mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:1424
+#: ../mail/e-mail-reader.c:1807 ../mail/mail.error.xml.h:92
 msgid "Reply to _List"
 msgstr "Responder Ã¡ _lista"
 
-#: ../mail/e-mail-reader.c:1426
+#: ../mail/e-mail-reader.c:1809
 msgid "Compose a reply to the mailing list of the selected message"
-msgstr "Redactar unha resposta para a lista de correo da mensaxe seleccionada"
+msgstr "Redactar unha resposta para a rolda de correo da mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:1431
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../mail/e-mail-reader.c:1814
+#: ../modules/mail/e-mail-attachment-handler.c:158
 msgid "_Reply to Sender"
 msgstr "_Responder ao remitente"
 
-#: ../mail/e-mail-reader.c:1433
+#: ../mail/e-mail-reader.c:1816
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Redactar unha resposta para o remitente da mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:1438
+#: ../mail/e-mail-reader.c:1821
 msgid "_Save as mbox..."
 msgstr "Gardar como..."
 
-#: ../mail/e-mail-reader.c:1440
+#: ../mail/e-mail-reader.c:1823
 msgid "Save selected messages as an mbox file"
 msgstr "Gardar as mensaxes como un ficheiro de texto"
 
-#: ../mail/e-mail-reader.c:1445
+#: ../mail/e-mail-reader.c:1828
 msgid "Search Folder from Mailing _List..."
-msgstr "Cartafol de busca por _lista de correo..."
+msgstr "Cartafol de busca por ro_lda de correo..."
 
-#: ../mail/e-mail-reader.c:1447
+#: ../mail/e-mail-reader.c:1830
 msgid "Create a search folder for this mailing list"
-msgstr "Crear un cartafol de busca para esta lista de correo"
+msgstr "Crear un cartafol de busca para esta rolda de correo"
 
-#: ../mail/e-mail-reader.c:1452
+#: ../mail/e-mail-reader.c:1835
 msgid "Search Folder from Recipien_ts..."
 msgstr "Cartafol de busca por des_tinatarios..."
 
-#: ../mail/e-mail-reader.c:1454
+#: ../mail/e-mail-reader.c:1837
 msgid "Create a search folder for these recipients"
 msgstr "Crear un cartafol de busca para estes destinatarios"
 
-#: ../mail/e-mail-reader.c:1459
+#: ../mail/e-mail-reader.c:1842
 msgid "Search Folder from Sen_der..."
 msgstr "Cartafol de busca por _remitente..."
 
-#: ../mail/e-mail-reader.c:1461
+#: ../mail/e-mail-reader.c:1844
 msgid "Create a search folder for this sender"
 msgstr "Crear un cartafol de busca para este remitente"
 
-#: ../mail/e-mail-reader.c:1466
+#: ../mail/e-mail-reader.c:1849
 msgid "Search Folder from S_ubject..."
 msgstr "Cartafol de busca por as_unto..."
 
-#: ../mail/e-mail-reader.c:1468
+#: ../mail/e-mail-reader.c:1851
 msgid "Create a search folder for this subject"
 msgstr "Crear un cartafol de busca para este asunto"
 
-#: ../mail/e-mail-reader.c:1473
+#: ../mail/e-mail-reader.c:1856
 msgid "_Message Source"
 msgstr "Orixe da _mensaxe"
 
-#: ../mail/e-mail-reader.c:1475
+#: ../mail/e-mail-reader.c:1858
 msgid "Show the raw email source of the message"
 msgstr "Mostrar o cÃ³digo fonte da mensaxe"
 
-#: ../mail/e-mail-reader.c:1487
+#: ../mail/e-mail-reader.c:1870
 msgid "_Undelete Message"
 msgstr "_Recuperar a mensaxe"
 
-#: ../mail/e-mail-reader.c:1489
+#: ../mail/e-mail-reader.c:1872
 msgid "Undelete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:1494
+#: ../mail/e-mail-reader.c:1877
 msgid "_Normal Size"
 msgstr "TamaÃ±o _normal"
 
-#: ../mail/e-mail-reader.c:1496
+#: ../mail/e-mail-reader.c:1879
 msgid "Reset the text to its original size"
 msgstr "Restabelecer o texto ao seu tamaÃ±o orixinal"
 
-#: ../mail/e-mail-reader.c:1501
+#: ../mail/e-mail-reader.c:1884
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:1503
+#: ../mail/e-mail-reader.c:1886
 msgid "Increase the text size"
 msgstr "Aumentar o tamaÃ±o do texto"
 
-#: ../mail/e-mail-reader.c:1508
+#: ../mail/e-mail-reader.c:1891
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
-#: ../mail/e-mail-reader.c:1510
+#: ../mail/e-mail-reader.c:1893
 msgid "Decrease the text size"
 msgstr "DiminuÃr o tamaÃ±o do texto"
 
-#: ../mail/e-mail-reader.c:1517
+#: ../mail/e-mail-reader.c:1900
 msgid "Create R_ule"
 msgstr "Crear r_egra"
 
-#: ../mail/e-mail-reader.c:1524
+#: ../mail/e-mail-reader.c:1907
 msgid "Ch_aracter Encoding"
 msgstr "CodificaciÃ³n de car_acteres"
 
-#: ../mail/e-mail-reader.c:1531
+#: ../mail/e-mail-reader.c:1914
 msgid "F_orward As"
 msgstr "Reen_viar como..."
 
-#: ../mail/e-mail-reader.c:1538
+#: ../mail/e-mail-reader.c:1921
+msgid "_Group Reply"
+msgstr "_Responder ao grupo"
+
+#: ../mail/e-mail-reader.c:1928
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ../mail/e-mail-reader.c:1545
+#: ../mail/e-mail-reader.c:1935
 msgid "Mar_k As"
 msgstr "Mar_car como"
 
-#: ../mail/e-mail-reader.c:1552
+#: ../mail/e-mail-reader.c:1942
 msgid "_Message"
 msgstr "_Mensaxe"
 
-#: ../mail/e-mail-reader.c:1559
+#: ../mail/e-mail-reader.c:1949
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:1584
+#: ../mail/e-mail-reader.c:1974
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para _seguimento..."
 
-#: ../mail/e-mail-reader.c:1592
+#: ../mail/e-mail-reader.c:1982
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/e-mail-reader.c:1596
+#: ../mail/e-mail-reader.c:1986
 msgid "Mark as _Junk"
 msgstr "Marcar como correo _non desexado"
 
-#: ../mail/e-mail-reader.c:1600
+#: ../mail/e-mail-reader.c:1990
 msgid "Mark as _Not Junk"
 msgstr "Desmarcar como correo non dese_xado"
 
-#: ../mail/e-mail-reader.c:1604
+#: ../mail/e-mail-reader.c:1994
 msgid "Mar_k as Read"
 msgstr "Marcar como _lida"
 
-#: ../mail/e-mail-reader.c:1608
+#: ../mail/e-mail-reader.c:1998
 msgid "Mark as Uni_mportant"
 msgstr "Marcar como non im_portante"
 
-#: ../mail/e-mail-reader.c:1612
+#: ../mail/e-mail-reader.c:2002
 msgid "Mark as _Unread"
 msgstr "Marcar como _non lida"
 
-#: ../mail/e-mail-reader.c:1648
+#: ../mail/e-mail-reader.c:2038
 msgid "_Caret Mode"
 msgstr "Activar _cursor"
 
-#: ../mail/e-mail-reader.c:1650
+#: ../mail/e-mail-reader.c:2040
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Mostrar un cursor intermitente no corpo das mensaxes mostradas"
 
-#: ../mail/e-mail-reader.c:1656
+#: ../mail/e-mail-reader.c:2046
 msgid "All Message _Headers"
 msgstr "Todas as ca_beceiras da mensaxe"
 
-#: ../mail/e-mail-reader.c:1658
+#: ../mail/e-mail-reader.c:2048
 msgid "Show messages with all email headers"
 msgstr "Mostrar as mensaxes con todas as cabeceiras de correo electrÃ³nico"
 
-#: ../mail/e-mail-reader.c:1899
+#: ../mail/e-mail-reader.c:2269
 msgid "Unable to retrieve message"
 msgstr "Non foi posÃbel obter a mensaxe"
 
-#: ../mail/e-mail-reader.c:1902 ../mail/e-mail-reader.c:1959
-#: ../mail/mail-ops.c:1848
+#: ../mail/e-mail-reader.c:2329 ../mail/mail-ops.c:1891
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Recuperando a mensaxe %s"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2473
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:534
-#: ../plugins/google-account-setup/google-source.c:656
-#: ../widgets/misc/e-account-tree-view.c:234
+#: ../mail/e-mail-reader.c:2893 ../mail/mail-config.ui.h:31
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:537
+#: ../plugins/google-account-setup/google-source.c:659
+#: ../widgets/misc/e-account-tree-view.c:240
 msgid "Default"
 msgstr "Predefinido"
 
-#: ../mail/e-mail-reader.c:2594
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:3041
+#: ../modules/mail/e-mail-attachment-handler.c:144
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: ../mail/e-mail-reader.c:2595
+#: ../mail/e-mail-reader.c:3042
 msgid "Forward the selected message to someone"
 msgstr "Reenviar a alguÃ©n a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2640 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:753
+#: ../mail/e-mail-reader.c:3061
+msgid "Group Reply"
+msgstr "Responder ao grupo"
+
+#: ../mail/e-mail-reader.c:3062
+msgid "Reply to the mailing list, or to all recipients"
+msgstr "Responder Ã¡ rolda de correo ou a todos os destinatarios"
+
+#: ../mail/e-mail-reader.c:3107 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:743
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../mail/e-mail-reader.c:2644
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
-#: ../widgets/misc/e-calendar.c:193
+#: ../mail/e-mail-reader.c:3140
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../mail/e-mail-reader.c:2648
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
-#: ../widgets/misc/e-calendar.c:169
+#: ../mail/e-mail-reader.c:3144
+#: ../modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:2652 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:3154 ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "Responder"
 
+#: ../mail/e-mail-reader.c:3722
+#, c-format
+msgid "Folder '%s'"
+msgstr "Cartafol Â«%sÂ»"
+
 #: ../mail/e-mail-tag-editor.c:292
 msgid "Flag to Follow Up"
 msgstr "Marcar para facer seguimento"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:512 ../mail/mail-config.ui.h:77
+#: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "Sen cifrado"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:516 ../mail/mail-config.ui.h:136
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:520 ../mail/mail-config.ui.h:105
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
-#: ../mail/em-account-editor.c:594
+#: ../mail/em-account-editor.c:607
 #, c-format
 msgid "%s License Agreement"
 msgstr "Acordo de licenza %s"
 
-#: ../mail/em-account-editor.c:601
+#: ../mail/em-account-editor.c:614
 #, c-format
 msgid ""
 "\n"
@@ -10390,34 +10240,34 @@ msgstr ""
 "e marque a caixa de verificaciÃ³n para aceptalo\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:901 ../widgets/misc/e-signature-combo-box.c:79
 msgctxt "mail-signature"
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:985
 msgid "Never"
 msgstr "Nunca"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:986
 msgid "Always"
 msgstr "Sempre"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:987
 msgid "Ask for each message"
 msgstr "Preguntar para cada mensaxe"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1723 ../widgets/misc/e-account-tree-view.c:128
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2098
 msgid "Mail Configuration"
 msgstr "ConfiguraciÃ³n do correo"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2099
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10425,32 +10275,32 @@ msgid ""
 msgstr ""
 "DÃ¡moslle a benvida ao asistente de configuraciÃ³n de correo do Evolution.\n"
 "\n"
-"Prema en \"Adiante\" para comezar."
+"Prema en Â«AdianteÂ» para comezar."
 
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2102
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
-"Introduza o seu nome e enderezo de correo abaixo. Os campos \"opcionais\" de "
+"Introduza o seu nome e enderezo de correo abaixo. Os campos Â«opcionaisÂ» de "
 "abaixo non necesitan encherse, a non ser que desexe incluÃr esta informaciÃ³n "
 "no correo que envÃe."
 
-#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2222
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2261
+#: ../mail/mail-config.ui.h:98
 msgid "Receiving Email"
-msgstr "Recibindo correo"
+msgstr "RecepciÃ³n de correo"
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2105
 msgid "Please configure the following account settings."
 msgstr "Configure as seguintes opciÃ³ns de conta."
 
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2699
+#: ../mail/em-account-editor.c:2107 ../mail/em-account-editor.c:2743
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: ../mail/em-account-editor.c:2071
+#: ../mail/em-account-editor.c:2108
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10459,23 +10309,23 @@ msgstr ""
 "seguro, pregunte ao seu administrador do sistema ou provedor de acceso a "
 "Internet."
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2110
 msgid "Account Management"
 msgstr "XestiÃ³n de contas"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2111
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
 "Introduza un nome descritivo para esta conta no espazo de abaixo.\n"
-"Este nome usarase sÃ³ para os efectos de visualizaciÃ³n."
+"Este nome usarase sÃ³ para os efectos de vista."
 
-#: ../mail/em-account-editor.c:2078
+#: ../mail/em-account-editor.c:2115
 msgid "Done"
 msgstr "Feito"
 
-#: ../mail/em-account-editor.c:2079
+#: ../mail/em-account-editor.c:2116
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10488,58 +10338,54 @@ msgstr ""
 "Agora estÃ¡ preparado para enviar e recibir correo \n"
 "usando o Evolution. \n"
 "\n"
-"Prema en \"Aplicar\" para gardar a sÃºa configuraciÃ³n."
+"Prema en Â«AplicarÂ» para gardar a sÃºa configuraciÃ³n."
 
-#: ../mail/em-account-editor.c:2509
+#: ../mail/em-account-editor.c:2557
 msgid "Check for _new messages every"
 msgstr "Verificar automaticamente se hai mensaxes _novas cada"
 
-#: ../mail/em-account-editor.c:2517
+#: ../mail/em-account-editor.c:2565
 msgid "minu_tes"
 msgstr "minu_tos"
 
-#: ../mail/em-account-editor.c:2825 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2841
+msgid "Please select a folder from the current account."
+msgstr "Seleccione un cartafol desde a conta actual."
+
+#: ../mail/em-account-editor.c:3111 ../mail/mail-config.ui.h:112
 msgid "Security"
 msgstr "Seguranza"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2870 ../mail/em-account-editor.c:2938
+#: ../mail/em-account-editor.c:3156 ../mail/em-account-editor.c:3224
 msgid "Receiving Options"
 msgstr "OpciÃ³ns de recepciÃ³n"
 
-#: ../mail/em-account-editor.c:2871 ../mail/em-account-editor.c:2939
+#: ../mail/em-account-editor.c:3157 ../mail/em-account-editor.c:3225
 msgid "Checking for New Messages"
 msgstr "Comprobando se hai mensaxes novas"
 
-#: ../mail/em-account-editor.c:3407
-msgid "Account Editor"
-msgstr "Editor de contas"
-
-#: ../mail/em-account-editor.c:3407
-msgid "Evolution Account Assistant"
-msgstr "Asistente de contas do Evolution"
-
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1575
+#: ../mail/em-composer-utils.c:1729
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
-msgstr "A sÃºa mensaxe a %s sobre \"%s\" o %s foi lida."
+msgstr "A sÃºa mensaxe a %s sobre Â«%sÂ» o %s foi lida."
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1623
+#: ../mail/em-composer-utils.c:1777
 #, c-format
 msgid "Delivery Notification for: \"%s\""
-msgstr "NotificaciÃ³n de envÃo para: \"%s\""
+msgstr "NotificaciÃ³n de envÃo para: Â«%sÂ»"
 
-#: ../mail/em-composer-utils.c:1947
+#: ../mail/em-composer-utils.c:2186
 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:1994
+#: ../mail/em-composer-utils.c:2233
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10547,19 +10393,19 @@ msgstr ""
 "O ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} Ã¡s ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribiu:"
 
-#: ../mail/em-composer-utils.c:2138
+#: ../mail/em-composer-utils.c:2377
 msgid "-----Original Message-----"
 msgstr "-----Mensaxe orixinal-----"
 
-#: ../mail/em-composer-utils.c:2323
+#: ../mail/em-composer-utils.c:2589
 msgid "Posting destination"
 msgstr "Destino onde publicar"
 
-#: ../mail/em-composer-utils.c:2324
+#: ../mail/em-composer-utils.c:2590
 msgid "Choose folders to post the message to."
 msgstr "Escolla os cartafoles nos que publicar a mensaxe."
 
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-filter-folder-element.c:260
 msgid "Select Folder"
 msgstr "Seleccionar cartafol"
 
@@ -10576,10 +10422,18 @@ msgstr "Asignar cor"
 msgid "Assign Score"
 msgstr "Asignar puntuaciÃ³n"
 
+#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "Cco"
+
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Ton de aviso"
 
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "Cc"
+
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "Terminado o"
@@ -10640,6 +10494,10 @@ msgstr "Seguimento"
 msgid "Forward to"
 msgstr "Reenviar a"
 
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "Importante"
+
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "Ã© posterior a"
@@ -10664,7 +10522,7 @@ msgstr "non estÃ¡ definida"
 msgid "is set"
 msgstr "estÃ¡ definida"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66
 msgid "Junk"
 msgstr "Correo non desexado"
 
@@ -10678,7 +10536,7 @@ msgstr "Etiqueta"
 
 #: ../mail/em-filter-i18n.h:44
 msgid "Mailing list"
-msgstr "Lista de correo"
+msgstr "Rolda de correo"
 
 #: ../mail/em-filter-i18n.h:45
 msgid "Match All"
@@ -10713,7 +10571,7 @@ msgid "Play Sound"
 msgstr "Reproducir son"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
 msgid "Read"
 msgstr "Ler"
 
@@ -10794,16 +10652,16 @@ msgid "Unset Status"
 msgstr "Desfacer a definiciÃ³n de estado"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:533
 msgid "Then"
 msgstr "EntÃ³n"
 
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:564
 msgid "Add Ac_tion"
 msgstr "Engadir a_cciÃ³n"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:126
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Mensaxes non lidas:"
@@ -10811,24 +10669,24 @@ msgstr[1] "Mensaxes non lidas:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:130
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Mensaxes totais:"
 msgstr[1] "Mensaxes totais:"
 
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:148
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Cuota de uso (%s):"
 
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:150
 #, c-format
 msgid "Quota usage"
 msgstr "Cuota de uso"
 
-#: ../mail/em-folder-properties.c:399
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/em-folder-properties.c:288
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Folder Properties"
 msgstr "Propiedades do cartafol"
 
@@ -10836,126 +10694,109 @@ msgstr "Propiedades do cartafol"
 msgid "<click here to select a folder>"
 msgstr "<prema aquÃ para seleccionar un cartafol>"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:264
 msgid "C_reate"
 msgstr "C_rear"
 
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:268
 msgid "Folder _name:"
 msgstr "_Nome do cartafol:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
-#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
+#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
+#: ../mail/mail-vfolder.c:1067 ../mail/mail-vfolder.c:1132
 msgid "Search Folders"
 msgstr "Cartafoles de busca"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:174 ../mail/em-folder-tree-model.c:176
 msgid "UNMATCHED"
 msgstr "SEN EQUIVALENCIA"
 
-#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
+#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree-model.c:1113
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: ../mail/em-folder-tree.c:192
+#: ../mail/em-folder-tree.c:191
 #, c-format
 msgid "Scanning folders in \"%s\""
-msgstr "Examinando os cartafoles en \"%s\""
+msgstr "Examinando os cartafoles en Â«%sÂ»"
 
-#: ../mail/em-folder-tree.c:605
+#: ../mail/em-folder-tree.c:611
 msgid "Folder names cannot contain '/'"
 msgstr "Os nomes dos cartafoles non poden conter o carÃ¡cter '/'"
 
-#. Translators: This is the string used for displaying the
-#. * folder names in folder trees. The first "%s" will be
-#. * replaced by the folder's name and "%u" will be replaced
-#. * with the number of unread messages in the folder. The
-#. * second %s will be replaced with a "+" letter for collapsed
-#. * folders with unread messages in some subfolder too,
-#. * or with an empty string for other cases.
-#. *
-#. * Most languages should translate this as "%s (%u%s)". The
-#. * languages that use localized digits (like Persian) may
-#. * need to replace "%u" with "%Iu". Right-to-left languages
-#. * (like Arabic and Hebrew) may need to add bidirectional
-#. * formatting codes to take care of the cases the folder
-#. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
-#.
-#: ../mail/em-folder-tree.c:1087
+#: ../mail/em-folder-tree.c:1100
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1321
+#: ../mail/em-folder-tree.c:1339
 msgid "Mail Folder Tree"
 msgstr "Ã?rbore de cartafoles de correo"
 
-#: ../mail/em-folder-tree.c:1611 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1656 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "Movendo o cartafol %s"
 
-#: ../mail/em-folder-tree.c:1613 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1660 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando cartafol %s"
 
-#: ../mail/em-folder-tree.c:1620 ../mail/message-list.c:2146
+#: ../mail/em-folder-tree.c:1669 ../mail/message-list.c:2164
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:1622 ../mail/message-list.c:2148
+#: ../mail/em-folder-tree.c:1673 ../mail/message-list.c:2166
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:1637
+#: ../mail/em-folder-tree.c:1690
+#, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Non Ã© posÃbel soltar as mensaxes no almacenamento do nivel superior"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:403
 msgid "Move Folder To"
 msgstr "_Mover o cartafol a..."
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:403
 msgid "Copy Folder To"
 msgstr "_Copiar cartafol a..."
 
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../mail/em-folder-utils.c:533
+#: ../plugins/groupwise-features/share-folder-common.c:137
 #, c-format
-msgid "Creating folder `%s'"
-msgstr "Creando o cartafol `%s'"
+msgid "Creating folder '%s'"
+msgstr "Creando o cartafol Â«%sÂ»"
 
-#: ../mail/em-folder-utils.c:670
+#: ../mail/em-folder-utils.c:693
 msgid "Create Folder"
 msgstr "Crear cartafol"
 
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:694
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:342
 msgid "Specify where to create the folder:"
 msgstr "Especificar onde crear o cartafol:"
 
-#: ../mail/em-folder-utils.c:691
+#: ../mail/em-folder-utils.c:714
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
-msgstr "Eliminando a subscriciÃ³n do cartafol \"%s\""
+msgstr "Eliminando a subscriciÃ³n do cartafol Â«%sÂ»"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1540
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1576
 msgid "Unsigned"
 msgstr "Non asinado"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -10963,11 +10804,11 @@ msgstr ""
 "Esta mensaxe non estÃ¡ asinada. Non hai garantÃa de que a mensaxe sexa "
 "autÃ©ntica."
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1541
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1577
 msgid "Valid signature"
 msgstr "Sinatura vÃ¡lida"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -10975,11 +10816,11 @@ msgstr ""
 "Esta mensaxe estÃ¡ asinada e Ã© vÃ¡lida, o que significa que Ã© moi probÃ¡bel que "
 "a mensaxe sexa autÃ©ntica."
 
-#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1542
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1578
 msgid "Invalid signature"
 msgstr "Sinatura non vÃ¡lida"
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -10987,11 +10828,11 @@ msgstr ""
 "A sinatura desta mensaxe non se pode verificar, puido ser alterada en "
 "trÃ¡nsito."
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1543
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1579
 msgid "Valid signature, but cannot verify sender"
 msgstr "A sinatura Ã© vÃ¡lida, mais non se pode verificar o remitente"
 
-#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -10999,11 +10840,11 @@ msgstr ""
 "Esta mensaxe estÃ¡ asinada cunha sinatura vÃ¡lida, mais non foi posÃbel "
 "verificar o remitente da mensaxe."
 
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1544
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1580
 msgid "Signature exists, but need public key"
 msgstr "A sinatura existe, mais precisa unha chave pÃºblica"
 
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:94
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -11011,11 +10852,11 @@ msgstr ""
 "Esta mensaxe estÃ¡ asinada cunha sinatura, mais non existe unha chave pÃºblica "
 "correspondente."
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1550
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1586
 msgid "Unencrypted"
 msgstr "Non cifrada"
 
-#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11023,11 +10864,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:115 ../mail/em-format-html.c:1551
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1587
 msgid "Encrypted, weak"
 msgstr "Cifrada; dÃ©bil"
 
-#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html-display.c:102
 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 "
@@ -11037,11 +10878,11 @@ msgstr ""
 "difÃcil, mais non imposÃbel para un intruso ver o contido desta mensaxe "
 "dentro dun perÃodo de tempo Ãºtil."
 
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1552
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1588
 msgid "Encrypted"
 msgstr "Cifrada"
 
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11049,11 +10890,11 @@ msgstr ""
 "Esta mensaxe estÃ¡ cifrada. SerÃa difÃcil para un intruso ver o contido desta "
 "mensaxe."
 
-#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1553
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1589
 msgid "Encrypted, strong"
 msgstr "Cifrada; forte"
 
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:104
 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 "
@@ -11062,15 +10903,15 @@ 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:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_Ver o certificado"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "Este certificado non Ã© visÃbel"
 
-#: ../mail/em-format-html-display.c:511
+#: ../mail/em-format-html-display.c:497
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -11079,118 +10920,138 @@ msgstr ""
 "procesamento demora demasiado. Pode visualizalo sen formato ou ben cun "
 "editor de texto externo."
 
-#: ../mail/em-format-html-display.c:740
+#: ../mail/em-format-html-display.c:725
 msgid "Completed on"
 msgstr "Terminado o"
 
-#: ../mail/em-format-html-display.c:748
+#: ../mail/em-format-html-display.c:733
 msgid "Overdue:"
 msgstr "Atrasada:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:752
+#: ../mail/em-format-html-display.c:737
 msgid "by"
 msgstr "por"
 
-#: ../mail/em-format-html-display.c:964 ../mail/em-format-html-display.c:1003
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html-display.c:996
 msgid "View _Unformatted"
 msgstr "Ver sen _formato"
 
-#: ../mail/em-format-html-display.c:966
+#: ../mail/em-format-html-display.c:951
 msgid "Hide _Unformatted"
 msgstr "Ocultar sen _formato"
 
-#: ../mail/em-format-html-display.c:1023
+#: ../mail/em-format-html-display.c:1016
 msgid "O_pen With"
 msgstr "A_brir con"
 
-#: ../mail/em-format-html-print.c:163
+#: ../mail/em-format-html-print.c:176
 #, c-format
 msgid "Page %d of %d"
 msgstr "PÃ¡xina %d de %d"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:153
 msgid "Formatting message"
 msgstr "Formatando a mensaxe"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:352
 msgid "Formatting Message..."
 msgstr "Formatando a mensaxe..."
 
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
+#: ../mail/em-format-html.c:1421 ../mail/em-format-html.c:1430
 #, c-format
-msgid "Retrieving `%s'"
-msgstr "Recuperando `%s'"
+msgid "Retrieving '%s'"
+msgstr "Obtendo Â«%sÂ»"
 
-#: ../mail/em-format-html.c:1859
+#: ../mail/em-format-html.c:1901
 msgid "Unknown external-body part."
 msgstr "Parte do corpo externo descoÃ±ecida."
 
-#: ../mail/em-format-html.c:1867
+#: ../mail/em-format-html.c:1909
 msgid "Malformed external-body part."
 msgstr "Parte do corpo externo formada incorrectamente."
 
-#: ../mail/em-format-html.c:1897
+#: ../mail/em-format-html.c:1939
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro ao sitio FTP (%s)"
 
-#: ../mail/em-format-html.c:1908
+#: ../mail/em-format-html.c:1950
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Punteiro ao ficheiro local (%s) vÃ¡lido no sitio \"%s\""
+msgstr "Punteiro ao ficheiro local (%s) vÃ¡lido no sitio Â«%sÂ»"
 
-#: ../mail/em-format-html.c:1910
+#: ../mail/em-format-html.c:1952
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro ao ficheiro local (%s)"
 
-#: ../mail/em-format-html.c:1931
+#: ../mail/em-format-html.c:1973
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro aos datos remotos (%s)"
 
-#: ../mail/em-format-html.c:1942
+#: ../mail/em-format-html.c:1984
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Punteiro aos datos externos descoÃ±ecidos (tipo \"%s\")"
+msgstr "Punteiro aos datos externos descoÃ±ecidos (tipo Â«%sÂ»)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#.
-#: ../mail/em-format-html.c:2602
+#: ../mail/em-format-html.c:2647
+#, c-format
+msgid "This message was sent by %s on behalf of %s"
+msgstr "Esta mensaxe foi enviada por %s no nome de %s"
+
+#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
+#: ../mail/em-html-stream.c:122
 #, c-format
-msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
-msgstr "Esta mensaxe foi enviada por <b>%s</b> no nome de <b>%s</b>"
+msgid "No HTML stream available"
+msgstr "Non hai un fluxo HTML dispoÃ±Ãbel"
 
-#: ../mail/em-subscribe-editor.c:586
+#: ../mail/em-subscribe-editor.c:677
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Este almacenamento non Ã© compatÃbel con subscriciÃ³ns, ou non estÃ¡n activadas."
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:728
 msgid "Subscribed"
 msgstr "Subscrito"
 
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:732
 msgid "Folder"
 msgstr "Cartafol"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:1120
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:1166
 msgid "No server has been selected"
 msgstr "Non se seleccionou un servidor"
 
-#: ../mail/em-utils.c:310
+#. Translators: This message is shown only for ten or more
+#. * messages to be opened.  The %d is replaced with the actual
+#. * count of messages. If you need a '%' in your text, then
+#. * write it doubled, like '%%'.
+#: ../mail/em-utils.c:106
+#, c-format
+msgid "Are you sure you want to open %d message at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "EstÃ¡ seguro de que quere abrir %d mensaxe Ã¡ vez?"
+msgstr[1] "EstÃ¡ seguro de que quere abrir %d mensaxes Ã¡ vez?"
+
+#: ../mail/em-utils.c:152
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
+msgid "_Do not show this message again"
+msgstr "_Non mostrar esta mensaxe outra vez"
+
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "Filtros de mensaxe"
 
-#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:816
+#: ../mail/em-utils.c:848
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensaxes de %s"
@@ -11199,7 +11060,7 @@ msgstr "Mensaxes de %s"
 msgid "Search _Folders"
 msgstr "Carta_foles de busca"
 
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:525
 msgid "Add Folder"
 msgstr "Cartafol"
 
@@ -11209,7 +11070,7 @@ msgstr "Altura predefinida da xanela"
 
 #: ../mail/evolution-mail.schemas.in.h:2
 msgid "\"Filter Editor\" window maximize state"
-msgstr "Estado maximizado da xanela \"Enviar e recibir correo\""
+msgstr "Estado maximizado da xanela Â«Enviar e recibir correoÂ»"
 
 #: ../mail/evolution-mail.schemas.in.h:3
 msgid "\"Filter Editor\" window width"
@@ -11221,7 +11082,7 @@ msgstr "Altura predefinida da xanela"
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "\"Search Folder Editor\" window maximize state"
-msgstr "Estado maximizado da xanela \"Enviar e recibir correo\""
+msgstr "Estado maximizado da xanela Â«Enviar e recibir correoÂ»"
 
 #: ../mail/evolution-mail.schemas.in.h:6
 msgid "\"Search Folder Editor\" window width"
@@ -11229,69 +11090,65 @@ msgstr "Cartafol de busca por _lista de correo"
 
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Send and Receive Mail\" window height"
-msgstr "Altura da xanela \"Enviar e recibir correo\""
+msgstr "Altura da xanela Â«Enviar e recibir correoÂ»"
 
 #: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Send and Receive Mail\" window maximize state"
-msgstr "Estado maximizado da xanela \"Enviar e recibir correo\""
+msgstr "Estado maximizado da xanela Â«Enviar e recibir correoÂ»"
 
 #: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Send and Receive Mail\" window width"
-msgstr "Largura da xanela \"Enviar e recibir correo\""
+msgstr "Largura da xanela Â«Enviar e recibir correoÂ»"
 
 #: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr "Permite que o Evolution mostre unha parte de texto de tamaÃ±o limitado"
-
-#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "Requirir sempre confirmaciÃ³n de lectura"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "RecoÃ±ecemento automÃ¡tico de emoticonas"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
 msgstr "RecoÃ±ecemento automÃ¡tico da ligazÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "Verificar se o correo entrante Ã© correo non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "Cor de realce de citas"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "Cor de realce de citas."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "Altura predefinida da xanela do editor"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "Largura predefinida da xanela do editor"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "Cartafol para cargar/anexar do editor"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Comprimir a visualizaciÃ³n de enderezos en A/CC/CCO"
+msgstr "Comprimir a vista de enderezos en A/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr ""
-"Comprime a visualizaciÃ³n de enderezos en A/CC/CCO co nÃºmero especificado en "
+"Comprime a vista de enderezos en A/CC/CCO co nÃºmero especificado en "
 "address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11299,77 +11156,77 @@ msgstr ""
 "Controla a frecuencia coa que se sincronizan os cambios locais co servidor "
 "de correo remoto. O intervalo debe ser de polo menos 30 segundos."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Custom headers to use while checking for junk."
 msgstr ""
 "As cabeceiras personalizadas para usar mentres se verifica o correo non "
 "desexado."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
 msgstr ""
 "As cabeceiras personalizadas para usar mentres se verifica o correo non "
-"desexado. A lista de elementos son cadeas no formato \"headername=value\"."
+"desexado. A lista de elementos son cadeas no formato Â«headername=valueÂ»."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
 msgstr "Conxunto de caracteres predefinido para escribir mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages."
 msgstr "Conxunto de caracteres predefinido para escribir mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to display messages"
 msgstr "Conxunto de caracteres predefinido para mostrar mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages."
 msgstr "Conxunto de caracteres predefinido para mostrar mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "Estilo de reenvÃo predefinido"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "Altura predefinida da xanela do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the mail browser window."
 msgstr "Altura predefinida da xanela do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "Altura predefinida do diÃ¡logo de subscriciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default maximized state of the mail browser window."
 msgstr "Largura predefinida da xanela do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "Estilo de resposta predefinido"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "Valor predefinido para o estado expandido do fÃo"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "Largura predefinida da xanela do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the mail browser window."
 msgstr "Largura predefinida da xanela do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "Largura predefinida do diÃ¡logo de subscriciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -11377,12 +11234,12 @@ msgstr ""
 "Determina se hai que buscar correo non desexado nos enderezos filtrando sÃ³ "
 "as axendas de enderezos locais"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Determina se hai que buscar enderezos de remitentes nas axendas de enderezos"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -11395,13 +11252,13 @@ msgstr ""
 "axendas de enderezos remotas (LDAP, por exemplo) estÃ¡n marcadas para o "
 "completado automÃ¡tico."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Determina se se deben usar cabeceiras personalizadas para comprobar o correo "
 "non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
 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 "
@@ -11411,28 +11268,32 @@ msgstr ""
 "non desexado. Se esta opciÃ³n estÃ¡ activada e se mencionan as cabeceiras, "
 "mellorarase a velocidade de comprobaciÃ³n do correo non desexado."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr ""
 "Determina se se debe usar o mesmo tipo de letra para as liÃ±as De e Asunto na "
-"columna Mensaxes da visualizaciÃ³n vertical."
+"columna Mensaxes da vista vertical."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Directory for loading/attaching files to composer."
 msgstr "Cartafol onde cargar/anexar os ficheiros no editor."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "Cartafol onde gardar os ficheiros enviados por correo."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr ""
 "Desactivar ou activar a elisiÃ³n (...) dos nomes de cartafoles na barra "
 "lateral"
 
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr "SÃ³ mostrar as mensaxes de texto que non excedan certo tamaÃ±o"
+
 #: ../mail/evolution-mail.schemas.in.h:49
 msgid "Do not add signature delimiter"
 msgstr "Non foi posÃbel gardar o ficheiro de sinatura."
@@ -11509,19 +11370,34 @@ msgstr ""
 "previsualizaciÃ³n da mensaxe, na lista de mensaxes e nos cartafoles."
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
 msgstr ""
-"Active isto para renderizar a parte da mensaxe de texto de tamaÃ±o limitado."
+"Activar a mostra de sÃ³ as mensaxes que non excedan o tamaÃ±o definido pola "
+"chave 'message_text_part_limit'."
 
 #: ../mail/evolution-mail.schemas.in.h:65
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr ""
+"Activar o uso das opciÃ³ns de visualizaciÃ³n de lista de mensaxes simiares "
+"para todos os cartafoles"
+
+#: ../mail/evolution-mail.schemas.in.h:66
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr ""
+"Active esta opciÃ³n para usar a barra de espazo para desprazarse na "
+"previsualizaciÃ³n da mensaxe, na lista de mensaxes e nos cartafoles."
+
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar o modo de cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Codificar os nomes de ficheiro como o Outlook ou o Gmail"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -11533,19 +11409,27 @@ msgstr ""
 "UTF-8 enviados polo Evolution, porque estes non seguen a RFC 2231, senÃ³n que "
 "usan un estÃ¡ndar RFC 2047 incorrecto."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "Flush Outbox after filtering"
+msgstr "Limpar a Caixa de saÃda despois de flitrar"
+
+#: ../mail/evolution-mail.schemas.in.h:71
+msgid "Group Reply replies to list"
+msgstr "Responder ao grupo responde Ã¡ rolda"
+
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Height of the message-list pane"
 msgstr "Altura do panel da lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Height of the message-list pane."
 msgstr "Altura do panel da lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Oculta a previsualizaciÃ³n por cartafol e elimina a selecciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -11553,7 +11437,7 @@ msgstr ""
 "Se un usuario tenta abrir 10 ou mÃ¡is mensaxes ao mesmo tempo, pregÃºntalle se "
 "estÃ¡ seguro de que o quere facer."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:76
 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 "
@@ -11564,57 +11448,60 @@ msgstr ""
 "que apareza nesta listaxe e que estea mapeado a un visualizador de "
 "compoÃ±entes Bonobo na base de datos de tipos MIME do GNOME."
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "Ignore list Reply-To:"
+msgstr "Ignorar Â«Responder a:Â» para as roldas:"
+
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
 msgstr ""
-"A altura inicial da xanela \"Enviar e recibir correo\". O valor actualÃzase "
-"a medida que o usuario redimensiona a xanela verticalmente."
+"A altura inicial da xanela Â«Editor de filtroÂ». O valor actualÃzase a medida "
+"que o usuario redimensiona a xanela verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"A altura inicial da xanela \"Enviar e recibir correo\". O valor actualÃzase "
+"A altura inicial da xanela Â«Editor do cartafol de buscaÂ». O valor actualÃzase "
 "a medida que o usuario redimensiona a xanela verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"A altura inicial da xanela \"Enviar e recibir correo\". O valor actualÃzase "
-"a medida que o usuario redimensiona a xanela verticalmente."
+"A altura inicial da xanela Â«Enviar e recibir correo electrÃ³nicoÂ». O valor "
+"actualÃzase a medida que o usuario redimensiona a xanela verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
 "value is not used by Evolution since the \"Filter Editor\" window cannot be "
 "maximized. This key exists only as an implementation detail."
 msgstr ""
-"A altura inicial da xanela \"Enviar e recibir correo\". O valor actualÃzase "
-"cando o usuario maximiza ou restaura a xanela. Nota: Este valor en "
-"particular non se usa no Evolution desde que a xanela \"Enviar e recibir "
-"correo\" non pode ser maximizada. Esta chave sÃ³ existe como un detalle de "
-"implementaciÃ³n."
+"A altura inicial da xanela Â«Editor do filtroÂ». O valor actualÃzase cando o "
+"usuario maximiza ou restaura a xanela. Nota: Este valor en particular non se "
+"usa no Evolution desde que a xanela \"Enviar e recibir correo\" non pode ser "
+"maximizada. Esta chave sÃ³ existe como un detalle de implementaciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
 "particular value is not used by Evolution since the \"Search Folder Editor\" "
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
-"A altura inicial da xanela \"Enviar e recibir correo\". O valor actualÃzase "
+"A altura inicial da xanela Â«Editor do cartafol de buscaÂ». O valor actualÃzase "
 "cando o usuario maximiza ou restaura a xanela. Nota: Este valor en "
 "particular non se usa no Evolution desde que a xanela \"Enviar e recibir "
 "correo\" non pode ser maximizada. Esta chave sÃ³ existe como un detalle de "
 "implementaciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11622,29 +11509,29 @@ msgid ""
 "\" window cannot be maximized. This key exists only as an implementation "
 "detail."
 msgstr ""
-"A altura inicial da xanela \"Enviar e recibir correo\". O valor actualÃzase "
-"cando o usuario maximiza ou restaura a xanela. Nota: Este valor en "
-"particular non se usa no Evolution desde que a xanela \"Enviar e recibir "
+"A altura inicial da xanela Â«Enviar e recibir correo electrÃ³nicoÂ». O valor "
+"actualÃzase cando o usuario maximiza ou restaura a xanela. Nota: Este valor "
+"en particular non se usa no Evolution desde que a xanela \"Enviar e recibir "
 "correo\" non pode ser maximizada. Esta chave sÃ³ existe como un detalle de "
 "implementaciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
 msgstr ""
-"A largura inicial da xanela \"Enviar e recibir correo\". O valor actualÃzase "
-"a medida que o usuario redimensiona a xanela horizontalmente."
+"A largura inicial da xanela \"Editor de filtro\". O valor actualÃzase a "
+"medida que o usuario redimensiona a xanela horizontalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
-"A largura inicial da xanela \"Enviar e recibir correo\". O valor actualÃzase "
-"a medida que o usuario redimensiona a xanela horizontalmente."
+"A largura inicial da xanela \"Editor do cartafol de busca\". O valor "
+"actualÃzase a medida que o usuario redimensiona a xanela horizontalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11652,7 +11539,19 @@ msgstr ""
 "A largura inicial da xanela \"Enviar e recibir correo\". O valor actualÃzase "
 "a medida que o usuario redimensiona a xanela horizontalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid ""
+"Instead of the normal \"Reply to All\" behaviour, this option will make the "
+"'Group Reply' toolbar button try to reply only to the mailing list through "
+"which you happened to receive the copy of the message to which you're "
+"replying."
+msgstr ""
+"No lugar do comportamento normal de Â«Responder a todosÂ» esta opciÃ³n que o "
+"botÃ³n da barra de ferramentas Â«Responder ao grupoÂ» tentarÃ¡ responder sÃ³ Ã¡ "
+"rolda de correo mediante a que vostede recibiu a copia da mensaxe que estÃ¡ "
+"respondendo."
+
+#: ../mail/evolution-mail.schemas.in.h:88
 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 "
@@ -11662,37 +11561,64 @@ msgstr ""
 "mensaxes dun cartafol de busca bÃ³rranse as mensaxes permanentemente, non sÃ³ "
 "dos resultados da busca."
 
-#: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
+#: ../mail/evolution-mail.schemas.in.h:89
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"private reply to a message which arrived via a mailing list."
+msgstr ""
+"Activa/desactiva as preguntas repetitivas para avisar de que estÃ¡ enviando "
+"unha resposta privada a un correo que chegou a travÃ©s dunha rolda de correo."
+
+#: ../mail/evolution-mail.schemas.in.h:90
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+msgstr ""
+"Desactiva ou activa as mensaxes repetitivas para avisalo de que estÃ¡ "
+"enviando unha resposta a moita xente."
+
+#: ../mail/evolution-mail.schemas.in.h:91
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying sending "
+"a private reply to a message which arrived via a mailing list, but the list "
+"sets a Reply-To: header which redirects your reply back to the list"
+msgstr ""
+"Desactiva ou activa as mensaxes repetitivas para avisalo de que estÃ¡ "
+"tentando enviar unha resposta privada a un correo que chegou a travÃ©s dunha "
+"rolda de correo, pero a lista estabelece unha cabeceira Â«Responder a:Â» que "
+"redirecciona a sÃºa resposta de novo Ã¡ rolda."
+
+#: ../mail/evolution-mail.schemas.in.h:92
+msgid "Last time Empty Junk was run"
 msgstr "Ã?ltima vez que se baleirou o correo non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
+#: ../mail/evolution-mail.schemas.in.h:93
+msgid "Last time Empty Trash was run"
 msgstr "Ã?ltima vez que se baleirou o lixo"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Layout style"
 msgstr "Disp_osiciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas e as cores asociadas"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr ""
 "Lista dos tipos MIME para os que verificar os visualizadores de compoÃ±entes "
 "do Bonobo"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "List of accepted licenses"
 msgstr "Lista de licenzas aceptadas"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "List of accounts"
 msgstr "Lista de contas"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -11701,17 +11627,17 @@ msgstr ""
 "contÃ©n cadeas que nomean subcartafoles relativos a /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeceiras personalizadas e se estas estÃ¡n activadas."
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 "Lista dos cÃ³digos de idioma dos dicionarios usados para a verificaciÃ³n "
 "ortogrÃ¡fica."
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:103
 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."
@@ -11720,15 +11646,15 @@ msgstr ""
 "lista contÃ©n cadeas que conteÃ±en nome:cor, onde \"cor\" usa a codificaciÃ³n "
 "hexadecimal HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista de nomes de protocolos cuxa licenza foi aceptada."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Load images for HTML messages over HTTP"
 msgstr "Cargar as imaxes das mensaxes HTML sobre HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:106
 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 "
@@ -11738,109 +11664,124 @@ msgstr ""
 "\" - Non cargar nunca as imaxes de fÃ³ra da rede. \"1\" - Cargar as imaxes "
 "nas mensaxes dos contactos. \"2\" - Cargar sempre as imaxes de fÃ³ra da rede."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Log filter actions"
 msgstr "Rexistrar acciÃ³ns de filtraxe"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Log filter actions to the specified log file."
 msgstr "Rexistrar as acciÃ³ns de filtraxe no ficheiro de rexistro especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Logfile to log filter actions"
 msgstr "Ficheiro de rexistro para rexistrar as acciÃ³ns de filtraxe"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Logfile to log filter actions."
 msgstr "Ficheiro de rexistro para rexistrar as acciÃ³ns de filtraxe."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Mail browser height"
 msgstr "Altura uniforme da fila"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Mail browser maximized"
 msgstr "Navegador de mail maximizado"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Mail browser width"
 msgstr "O correo comeza por"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como visto despois do tempo de espera especificado"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como visto despois do tempo de espera especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar as citas textuais na \"PrevisualizaciÃ³n\" da mensaxe"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar as citas textuais na \"PrevisualizaciÃ³n\" da mensaxe."
 
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Message text limit for display"
+msgstr "LÃmite do texto do mensaxe para mostralo"
+
 # (pofilter) gconf: do not translate gconf attribute: "source"
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr ""
-"Estilo de visualizaciÃ³n da mensaxe (\"normal\", \"full headers\", \"source\")"
+msgstr "Estilo de vista da mensaxe (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:120
 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"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:121
 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:112
+#: ../mail/evolution-mail.schemas.in.h:122
 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."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:123
 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:114
+#: ../mail/evolution-mail.schemas.in.h:124
 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:115
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt on empty subject"
 msgstr "Preguntar cando o asunto estÃ¡ baleiro"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Preguntar ao usuario cando tente compactar un cartafol."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:127
 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 asunto."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Prompt when deleting messages in search folder"
 msgstr "Preguntar cando se eliminen mensaxes nun cartafol de busca"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Prompt when mailing list hijacks private replies"
+msgstr "Preguntar cando a rolda de correo secuestre as respostas privadas"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Prompt when replying privately to list messages"
+msgstr "Preguntar ao responder de forma privada a correos dunha rolda"
+
+#: ../mail/evolution-mail.schemas.in.h:131
+msgid "Prompt when replying to many recipients"
+msgstr "Preguntar ao responder a moitos destinatarios"
+
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Prompt when user expunges"
 msgstr "Preguntar cando o usuario compacta"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Prompt when user only fills Bcc"
 msgstr "Preguntar cando o usuario sÃ³ encha o campo Cco"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 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"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11848,65 +11789,65 @@ msgstr ""
 "Preguntar ao enviar mensaxes en HTML a destinatarios que non desexen "
 "recibilas."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:136
 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:124
+#: ../mail/evolution-mail.schemas.in.h:137
 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:125
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Prompt while marking multiple messages"
 msgstr "Preguntar cando se marquen varias mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Put personalized signatures at the top of replies"
 msgstr "PoÃ±er sinaturas personalizadas no inicio das respostas"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Put the cursor at the bottom of replies"
 msgstr "PoÃ±er o cursor ao fondo da resposta"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:141
 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:129
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Recognize links in text and replace them."
 msgstr "RecoÃ±ecer ligazÃ³ns no texto e substituÃlas."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Run junk test on incoming mail."
 msgstr "Realizar a proba de correo non desexado no correo entrante."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Save directory"
 msgstr "Cartafol onde gardar"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Search for the sender photo in local address books"
 msgstr "Buscar a fotografÃa do remitente nas axendas locais de enderezos"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Send HTML mail by default"
 msgstr "Enviar correo en HTML por omisiÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Send HTML mail by default."
 msgstr "Enviar correo en HTML por omisiÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Sender email-address column in the message list"
 msgstr "Columna cos enderezos dos remitentes na lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Server synchronization interval"
 msgstr "Intervalo de sincronizaciÃ³n do servidor"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -11914,67 +11855,63 @@ msgstr ""
 "EstabelÃ©zao a TRUE no caso de que queira engadir o delimitador de sinatura "
 "antes da sÃºa sinatura ao escribir un correo electrÃ³nico."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Mostrar o campo \"Bcc\" ao enviar unha mensaxe de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Mostrar o campo \"Cc\" ao enviar unha mensaxe de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Mostrar o campo \"De\" ao enviar a unha rolda de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Show \"From\" field when sending a mail message"
-msgstr "Mostrar o campo \"De\" ao enviar unha mensaxe de correo"
-
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Mostrar o campo \"Respostar a\" ao enviar a unha rolda de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Mostrar o campo \"Respostar a\" ao enviar unha mensaxe de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Show Animations"
 msgstr "Mostrar animaciÃ³ns"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Show all message headers"
 msgstr "Contraer todos os fÃos de mensaxe"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Show all the headers when viewing a messages."
 msgstr "Mostrar o campo \"Respostar a\" ao enviar unha mensaxe de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Show animated images as animations."
 msgstr "Mostrar as imaxes animadas como animaciÃ³ns."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:160
 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:149
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar as mensaxes eliminadas na lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show image animations"
 msgstr "Mostrar as animaciÃ³ns de imaxe "
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show original \"Date\" header value."
 msgstr "Mostrar o valor da cabeceira \"Date\" orixinal"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Show photo of the sender"
 msgstr "Mostrar a foto do remitente"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11982,7 +11919,7 @@ msgstr ""
 "Mostrar o campo \"Bcc\" ao enviar unha mensaxe de correo. Isto pÃ³dese "
 "configurar desde o menÃº Ver cando se selecciona unha conta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11990,7 +11927,7 @@ msgstr ""
 "Mostrar o campo \"Cc\" ao enviar unha mensaxe de correo. Isto pÃ³dese "
 "configurar desde o menÃº Ver cando se selecciona unha conta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11998,15 +11935,7 @@ msgstr ""
 "Mostrar o campo \"De\" ao enviar a unha rolda de correo. Isto pÃ³dese "
 "configurar desde o menÃº Ver cando se selecciona unha conta de novas."
 
-#: ../mail/evolution-mail.schemas.in.h:156
-msgid ""
-"Show the \"From\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-"Mostrar o campo \"De\" ao enviar unha mensaxe de correo. Isto pÃ³dese "
-"configurar desde o menÃº Ver cando se selecciona unha conta de correo."
-
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -12014,7 +11943,7 @@ msgstr ""
 "Mostrar o campo \"Respostar a\" ao enviar a unha rolda de correo. Isto "
 "pÃ³dese configurar desde o menÃº VEr cando se selecciona unha conta de novas."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -12022,14 +11951,14 @@ msgstr ""
 "Mostrar o campo \"Respostar a\" ao enviar unha mensaxe de correo. Isto "
 "pÃ³dese configurar desde o menÃº Ver cando se selecciona unha conta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr ""
 "Mostrar o enderezo do remitente nunha columna Ã¡ parte na lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -12039,52 +11968,72 @@ msgstr ""
 "distinto). Doutro xeito mÃ³strase o valor de cabeceira \"Data no formato "
 "predefinido polo usuario e o fuso de hora local."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:172
 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:162
+#: ../mail/evolution-mail.schemas.in.h:173
+msgid ""
+"Some mailing lists set a Reply-To: header to trick users into sending "
+"replies to the list, even when they ask Evolution to make a private reply. "
+"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
+"so that Evolution will do as you ask it. If you use the private reply "
+"action, it will reply privately, while if you use the 'Reply to List' action "
+"it will do that. It works by comparing the Reply-To: header with a List-"
+"Post: header, if there is one."
+msgstr ""
+"Algunhas roldas de correo estabelecen unha cabeceira Â«Responder a:Â» para "
+"forzar aos usuarios a responder Ã¡ rolda, incluso cando os usuarios piden que "
+"Evolution envÃe unha resposta privada. Estabelecer esta opciÃ³n a Â«trueÂ» "
+"intentarÃ¡ ignorar tales cabeceiras Â«Responder a:Â», de tal forma que Evolution "
+"faga o que se lle pide. Se usa a acciÃ³n de resposta privada, responderÃ¡ de "
+"forma privada, mentres que se usa a acciÃ³n Â«Responder Ã¡ roldaÂ» farÃ¡ iso "
+"mesmo. Funciona comparando a cabeceira Â«Responder a:Â» cunha cabeceira Â«List-"
+"Post:Â», se existe."
+
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Spell check inline"
 msgstr "VerificaciÃ³n ortogrÃ¡fica en liÃ±a"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Spell checking color"
 msgstr "Cor da verificaciÃ³n ortogrÃ¡fica"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Spell checking languages"
 msgstr "Idiomas da verificaciÃ³n ortogrÃ¡fica"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Subscribe dialog default height"
 msgstr "Altura predefinida do diÃ¡logo de subscriciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Subscribe dialog default width"
 msgstr "Largura predefinida do diÃ¡logo de subscriciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Terminal font"
 msgstr "Tipo de letra do terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Text message part limit"
-msgstr "LÃmite da parte de texto da mensaxe"
-
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "The default plugin for Junk hook"
 msgstr "O engadido predefinido para a asociaciÃ³n de correo non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
+#: ../mail/evolution-mail.schemas.in.h:181
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
-"A Ãºltima vez que se baleirou o correo non desexado, en dÃas desde a Ã©poca."
+"A Ãºltima vez que se baleirou o correo non desexado, en dÃas desde o 1 de "
+"xaneiro de 1970 (Epoch)."
 
-#: ../mail/evolution-mail.schemas.in.h:171
-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:182
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr ""
+"A Ãºltima vez que se baleirou o Lixo, en dÃas desde o 1 de xaneiro de 1970 "
+"(Epoch)."
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -12096,15 +12045,15 @@ msgstr ""
 "panel de previsualizaciÃ³n debaixo da lista de mensaxes. \"1\" (VisualizaciÃ³n "
 "vertical) mostra o panel de previsualizaciÃ³n ao lado da lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "The terminal font for mail display."
 msgstr "O tipo de letra do terminal para mostrar o correo."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "The variable width font for mail display."
 msgstr "O tipo de letra de largura variÃ¡bel para mostrar o correo."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -12112,15 +12061,17 @@ msgstr ""
 "Isto pode ter tres valores posÃbeis: \"0\" para erros; \"1\" para avisos; \"2"
 "\" para mensaxes de depuraciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:187
 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 in terms of KB."
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
 msgstr ""
-"Isto decide o tamaÃ±o mÃ¡ximo da parte de texto que pode ser formatada no "
-"Evolution. O predefinido Ã© 4MB/4096 KB e estÃ¡ especificado en termos de KB."
+"Isto decide o tamaÃ±o mÃ¡ximo da parte de texto que se pode formatar no "
+"Evolution, estÃ¡ especificado en termos de KB. O predefinido Ã© 4096 (4MB). "
+"Este valor Ãºsase sÃ³ cando a chave 'force_message_limit' estÃ¡ activada."
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -12130,7 +12081,7 @@ msgstr ""
 "varios engadidos activados. Se o engadido predefinido listado estÃ¡ "
 "desactivado, entÃ³n non se usarÃ¡n os outros engadidos dispoÃ±Ãbeis."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:189
 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."
@@ -12139,7 +12090,7 @@ msgstr ""
 "ler. Isto deselecciona o correo da lista e elimina a previsualizaciÃ³n para "
 "ese cartafol."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:190
 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;"
@@ -12149,9 +12100,9 @@ msgstr ""
 "Esta chave deberÃa conter unha lista de estruturas XML especificando as "
 "cabeceiras personalizadas e indicando se se deben mostrar. O formato da "
 "estrutura XML Ã© &lt;header enabled&gt; - defÃnao como activado se se debe "
-"mostrar a cabeceira na visualizaciÃ³n do correo."
+"mostrar a cabeceira na vista do correo."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -12162,11 +12113,11 @@ msgstr ""
 "para excluÃr os correos enviados por contactos coÃ±ecidos do filtro de correo "
 "non desexado."
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:192
 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:182
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12174,7 +12125,7 @@ msgstr ""
 "Isto define o nÃºmero de enderezos que se mostra na visualizaciÃ³n da lista de "
 "mensaxes predefinidas; para os restantes mÃ³strase un '...'."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -12182,7 +12133,7 @@ msgstr ""
 "Esta opciÃ³n especifica se as conversas deberÃan estar por omisiÃ³n no estado "
 "expandido ou contraÃdo. Ã? necesario reiniciar o Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -12192,53 +12143,53 @@ msgstr ""
 "da Ãºltima mensaxe en cada conversa e non segundo a data das mensaxes. Ã? "
 "necesario reiniciar o Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "Thread the message-list based on Subject"
 msgstr "Lista de mensaxes por fÃos baseadas no asunto"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid "Timeout for marking message as seen"
 msgstr "Tempo de espera para marcar unha mensaxe como vista"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Timeout for marking message as seen."
 msgstr "Tempo de espera para marcar unha mensaxe como vista."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "UID string of the default account."
 msgstr "Cadea UID para a conta predefinida."
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 "Cor de subliÃ±ado para as palabras escritas incorrectamente cando se usa a "
 "verificaciÃ³n ortogrÃ¡fica en liÃ±a."
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid "Use SpamAssassin daemon and client"
 msgstr "Usar o daemon e cliente SpamAssassin"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Usar o daemon e cliente SpamAssassin (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Use custom fonts"
 msgstr "Usar tipos de letra personalizados"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Use custom fonts for displaying mail."
 msgstr "Usar tipos de letra personalizados para mostrar o correo."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid "Use only local spam tests."
 msgstr "Usar sÃ³ probas locais de correo non desexado."
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Usar sÃ³ as probas locais de correo non desexado (sen DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -12248,7 +12199,7 @@ msgstr ""
 "responde a unha mensaxe. Isto determina se o cursor se sitÃºa no inicio da "
 "mensaxe ou no fondo."
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -12258,23 +12209,23 @@ msgstr ""
 "cando responden a unha mensaxe. Isto determina se a sinatura se sitÃºa no "
 "inicio da mensaxe ou no fondo."
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "Variable width font"
 msgstr "Tipo de letra de largura variÃ¡bel"
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Indica cando unha solicitude lida e recibida se engade a cada unha das "
 "mensaxes de forma predefinida."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 "Se hai que desactivar a funcionalidade de elisiÃ³n (...) dos nomes dos "
 "cartafoles na barra lateral."
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12282,75 +12233,99 @@ msgstr ""
 "Se se debe ou non retroceder ao encadeamento por asuntos cando as mensaxes "
 "non conteÃ±en cabeceiras En resposta a ou Referencias."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "Whether sort threads based on latest message in that thread"
 msgstr ""
 "Indica se clasificar os fÃos de mensaxes segundo a Ãºltima mensaxe que "
 "apareza nelas"
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:214
+msgid ""
+"Whether to flush Outbox after filtering is done. Outbox flush will happen "
+"only when there was used any 'Forward to' filter action and approximately "
+"one minute after the last action invocation."
+msgstr ""
+"Indica se limpar a Caixa de saÃda despois de que remate o filtrado. A "
+"limpeza da Caixa de saÃda sÃ³ acontecerÃ¡ cando se use calquera acciÃ³n de "
+"filtrado Â«Reenviar aÂ» e aproximadamente un minuto despois da invocaciÃ³n da "
+"Ãºltima acciÃ³n."
+
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Width of the message-list pane"
 msgstr "Largura do panel de lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Width of the message-list pane."
 msgstr "Largura do panel de lista de mensaxes."
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "Importando datos Elm"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
-#: ../modules/mail/e-mail-shell-view.c:952
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
+#: ../modules/mail/e-mail-shell-view.c:964
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:500
 msgid "Mail"
 msgstr "Correo"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:366
 msgid "Evolution Elm importer"
 msgstr "Importador do Elm do Evolution"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:367
 msgid "Import mail from Elm."
 msgstr "Importar correo desde o Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
-msgid "Destination folder:"
-msgstr "Cartafol de destino:"
+#: ../mail/importers/evolution-mbox-importer.c:116
+#: ../plugins/dbx-import/dbx-importer.c:226
+msgid "_Destination folder:"
+msgstr "Cartafol de _destino:"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/dbx-import/dbx-importer.c:232
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "Select folder to import into"
 msgstr "Seleccionar un cartafol para o que importar"
 
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:245
+#: ../mail/importers/evolution-mbox-importer.c:382
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "Asunto"
+
+#: ../mail/importers/evolution-mbox-importer.c:387
+msgctxt "mboxImp"
+msgid "From"
+msgstr "De"
+
+#: ../mail/importers/evolution-mbox-importer.c:431
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Caixa de correo Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:432
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de cartafoles no formato caixa de correo de Berkeley"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "Importando caixa de correo"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
+#: ../mail/importers/mail-importer.c:150
+#: ../plugins/dbx-import/dbx-importer.c:554
+#: ../plugins/pst-import/pst-importer.c:452
+#: ../plugins/pst-import/pst-importer.c:558
 #, c-format
-msgid "Importing `%s'"
-msgstr "Importando `%s'"
+msgid "Importing '%s'"
+msgstr "Importando Â«%sÂ»"
 
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:295
 #, c-format
 msgid "Scanning %s"
 msgstr "Examinando %s"
@@ -12359,469 +12334,552 @@ msgstr "Examinando %s"
 msgid "Importing Pine data"
 msgstr "Importando datos do Pine"
 
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
+#: ../mail/importers/pine-importer.c:405
+#: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:447
 msgid "Evolution Pine importer"
 msgstr "Importador do Pine do Evolution"
 
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:448
 msgid "Import mail from Pine."
 msgstr "Importar correo do Pine."
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Enviar a %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "Correo de %s"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "O asunto Ã© %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
-msgstr "lista de correo %s"
+msgstr "rolda de correo %s"
 
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "Engadir unha regra de filtraxe"
 
-#: ../mail/mail-config.ui.h:1
-msgid "(Note: Requires restart of the application)"
-msgstr "(Nota: Ã© preciso reiniciar o aplicativo)"
+#. Translators: The first %s is name of the affected
+#. * filter rule(s), the second %s is URI of the removed
+#. * folder. For more than one filter rule is each of
+#. * them on a separate line, with four spaces in front
+#. * of its name, without quotes.
+#: ../mail/mail-autofilter.c:451
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been modified to account for the deleted folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
+msgstr[0] ""
+"A regra de filtrado Â«%sÂ»\n"
+"foi modificada na conta por mor do cartafol eliminado\n"
+"Â«%sÂ»."
+msgstr[1] ""
+"As regras de filtrados Â«%sÂ»\n"
+"foron modificadas na conta por mor do cartafol eliminado\n"
+"Â«%sÂ»."
 
+#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
 #: ../mail/mail-config.ui.h:2
-msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<b>OpciÃ³n para responder por encima</b> (Non se recomenda)"
+msgid "(Not Recommended)"
+msgstr "(Non recomendado)"
 
 #: ../mail/mail-config.ui.h:3
+msgid "(Note: Requires restart of the application)"
+msgstr "(Nota: Ã© preciso reiniciar o aplicativo)"
+
+#: ../mail/mail-config.ui.h:4
 msgid "Account Information"
 msgstr "Sen informaciÃ³n"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "Engadir sinatura _nova..."
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Asinar sem_pre as mensaxes saÃntes cando se use esta conta"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Ci_frar tamÃ©n para un mesmo ao enviar correo cifrado"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Enviar sempre _copia de carbÃ³n (Cc) a:"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Enviar sempre copia de carbÃ³n _oculta (Cco) a:"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Confia_r sempre nas chaves do meu anel de chaves ao cifrar"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Cifrar sempre para un _mesmo ao enviar correo cifrado"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
 msgstr "Requirir sempre confirmaciÃ³n de lec_tura"
 
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+#: ../mail/mail-config.ui.h:14
+msgid "Apply the same _view settings to all folders"
+msgstr "Aplicar as mesmas opciÃ³ns de _vista para todos os cartafoles"
+
+#: ../mail/mail-config.ui.h:16
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "AutenticaciÃ³n"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:17
 msgid "Automatically insert _emoticon images"
 msgstr "Inserir imaxes de _emoticonas automaticamente"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:18
 msgid "C_haracter set:"
 msgstr "Conxunto de ca_racteres:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:19
 msgid "Ch_eck for Supported Types"
 msgstr "_Verificar os tipos compatÃbeis"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:20
 msgid "Check cu_stom headers for junk"
 msgstr ""
 "Verificar as cabeceiras personalizada_s para detectar correo non desexado"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:21
 msgid "Check incoming _messages for junk"
 msgstr "Verificar as _mensaxes entrantes para detectar correo non desexado"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:22
 msgid "Check spelling while I _type"
 msgstr "Verificar a orto_grafÃa mentres se escribe"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:23
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Verifica se o correo entrante Ã© correo non desexado"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "Limp_ar"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:25
 msgid "Clea_r"
 msgstr "Limpa_r"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:26
 msgid "Color for _misspelled words:"
 msgstr "Cor para as palabras escritas _incorrectamente:"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:27
 msgid "Composing Messages"
 msgstr "Escribir unha mensaxe"
 
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "ConfiguraciÃ³n"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:29
 msgid "Confirm _when expunging a folder"
 msgstr "Confirmar a_o compactar un cartafol"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:32
 msgid "Default Behavior"
 msgstr "Prioridade predefinida:"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:33
 msgid "Default character e_ncoding:"
 msgstr "CodificaciÃ³_n de caracteres predefinida:"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:35
 msgid "Delete Mail"
 msgstr "Eliminar"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:36
 msgid "Delete junk messages on e_xit"
 msgstr "Eliminar os correos non desexados ao saÃ_r"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:38
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Asinar dixitalmente as mensaxes saÃnt_es (por omisiÃ³n)"
 
-#: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
-msgstr "Todas as ca_beceiras da mensaxe"
+#: ../mail/mail-config.ui.h:39
+msgid "Displayed Message Headers"
+msgstr "Cabeceiras mostradas do mensaxe"
 
-#: ../mail/mail-config.ui.h:37
-msgid "Do not format messages when text si_ze exceeds"
-msgstr "Non formatar as mensaxes cando o ta_maÃ±o do texto excede"
+#: ../mail/mail-config.ui.h:40
+msgid "Do not display messages when text si_ze exceeds"
+msgstr "Non mostrar mensaxes se o tama_Ã±o do texto excede"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:41
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "Non ma_rcar as mensaxes como correo non desexado se o remitente estÃ¡ na miÃ±a "
 "axenda de enderezos"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:42
 msgid "Do not quote"
 msgstr "Non eliminar"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:43
 msgid "Drafts _Folder:"
 msgstr "Carta_fol de borradores:"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:44
 msgid "Email _Address:"
 msgstr "_Enderezo de correo:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:45
 msgid "Empty trash folders on e_xit"
 msgstr "Baleirar os cartafoles de lixo ao _saÃr"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:46
 msgid "Enable Magic S_pacebar"
 msgstr "Activar a barra de espa_zos mÃ¡xica"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:47
 msgid "Enable Sea_rch Folders"
 msgstr "Activar cartafoles de _busca"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:49
 msgid "Encry_ption certificate:"
 msgstr "Certificado de ci_frado:"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:50
 msgid "Encrypt out_going messages (by default)"
 msgstr "Cifrar as mensaxes saÃn_tes (por omisiÃ³n)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:51
 msgid "Fi_xed-width:"
 msgstr "Largura fi_xa:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:52
 msgid "Fix_ed width Font:"
 msgstr "Tipo de letra de largura f_ixa:"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:53
 msgid "Font Properties"
 msgstr "Propiedades do tipo de letra"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:54
 msgid "Format messages in _HTML"
 msgstr "Formato das mensaxes en _HTML"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:55
 msgid "Full Nam_e:"
 msgstr "Nom_e completo:"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:57
+msgid "Group Reply goes only to mailing list, if possible"
+msgstr "Responder ao grupo sÃ³ envÃa Ã¡ rolda de correo, se Ã© posÃbel"
+
+#: ../mail/mail-config.ui.h:58
 msgid "HTML Messages"
 msgstr "Mensaxes HTML"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:59
 msgid "H_TTP Proxy:"
 msgstr "Proxy H_TTP:"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:60
 msgid "Headers"
 msgstr "Cabeceiras"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:61
 msgid "Highlight _quotations with"
 msgstr "Realzar as _citas con"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:63
+msgid "Ignore Reply-To: for mailing lists"
+msgstr "Ignorar Â«Responder a:Â» para as roldas de correo"
+
+#: ../mail/mail-config.ui.h:64
 msgid "Inline"
 msgstr "En liÃ±a"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:65
 msgid "Inline (Outlook style)"
 msgstr "En liÃ±a (estilo Outlook)"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:67
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:69
 msgid "Languages Table"
 msgstr "TÃ¡boa de idiomas"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:70
 msgid "Loading Images"
 msgstr "_Cargar imaxes"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:71
 msgid "Mail Headers Table"
 msgstr "TÃ¡boa de cabeceiras de correo"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:72
 msgid "Mailbox location"
 msgstr "LocalizaciÃ³n da caixa de correo"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:73
 msgid "Message Display"
 msgstr "Mensaxes"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:74
 msgid "Message Fonts"
 msgstr "A mensaxe contÃ©n"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:75
 msgid "Message Receipts"
 msgstr "Retirada de mensaxe"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:76
 msgid "No _Proxy for:"
 msgstr "Sen pro_xy para:"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:78
 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"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:79
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "IgnÃ³rase a opciÃ³n se se encontra unha coincidencia para as cabeceiras "
 "personalizadas de correo non desexado."
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:80
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "Datos persoais"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:82
 msgid "Or_ganization:"
 msgstr "Organi_zaciÃ³n:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da _Chave PGP/GPG:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:84
 msgid "Pass_word:"
 msgstr "Con_trasinal:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:86
 msgid "Port:"
 msgstr "Porto:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:87
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Preg_untar cando se envÃen mensaxes sÃ³ con destinatarios Cco definidos"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "<span weight=\"bold\">Privacidade bastante boa (PGP/GPG)</span>"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:90
 msgid "Printed Fonts"
 msgstr "Imprimir notas"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:91
+msgid "Prompt when mailing list redirects private reply back to list"
+msgstr ""
+"Preguntar cando unha rolda de correo redirixa as respostas privadas de novo "
+"Ã¡ rolda"
+
+#: ../mail/mail-config.ui.h:92
+msgid "Prompt when sending private replies to mailing _list messages"
+msgstr "Preguntar ao enviar respostas privadas a mensaxes da _rolda de correo"
+
+#: ../mail/mail-config.ui.h:93
+msgid "Prompt when sending replies to _many recipients"
+msgstr "Preguntar ao enviar mensaxes con _moitos destinatarios"
+
+#: ../mail/mail-config.ui.h:94
 msgid "Proxy Settings"
 msgstr "ConfiguraciÃ³n de correo non desexado"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:95
 msgid "Quoted"
 msgstr "_Citada"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:96
 msgid "Re_member password"
 msgstr "Le_mbrar contrasinal"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:97
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:99
 msgid "Remember _password"
 msgstr "Lembrar _contrasinal"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:100
 msgid "Required Information"
 msgstr "InformaciÃ³n do servidor"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:101
+msgid "SHA1"
+msgstr "SHA1"
+
+#: ../mail/mail-config.ui.h:102
+msgid "SHA256"
+msgstr "SHA256"
+
+#: ../mail/mail-config.ui.h:103
+msgid "SHA384"
+msgstr "SHA384"
+
+#: ../mail/mail-config.ui.h:104
+msgid "SHA512"
+msgstr "SHA512"
+
+#: ../mail/mail-config.ui.h:106
 msgid "SSL is not supported in this build of Evolution"
-msgstr "<b>SSL non Ã© compatÃbel con esta versiÃ³n do Evolution</b>"
+msgstr "SSL non Ã© compatÃbel con esta versiÃ³n do Evolution"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:107
 msgid "S_earch for sender photograph only in local address books"
 msgstr "B_uscar o remitente da fotografÃa sÃ³ nas axendas de enderezos locais"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:108
 msgid "S_elect..."
 msgstr "S_eleccionar..."
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:109
 msgid "S_end message receipts:"
 msgstr "En_viar confirmaciÃ³ns de mensaxes:"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:110
 msgid "S_tandard Font:"
 msgstr "Tipo de letra es_tÃ¡ndar:"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:111
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME seguro (S/MIME)"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:113
 msgid "Select Drafts Folder"
 msgstr "Seleccionar cartafol"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:114
 msgid "Select HTML fixed width font"
 msgstr "Seleccione o tipo de letra de largura fixa para HTML"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:115
 msgid "Select HTML fixed width font for printing"
 msgstr "Seleccione o tipo de letra de largura fixa en HTML para imprimir"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:116
 msgid "Select HTML variable width font"
 msgstr "Seleccione o tipo de letra de largura variÃ¡bel en HTML"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:117
 msgid "Select HTML variable width font for printing"
 msgstr "Seleccione o tipo de letra de largura variÃ¡bel en HTML para imprimir"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:118
+msgid "Select Junk Folder"
+msgstr "Seleccione o cartafol de correo non desexado"
+
+#: ../mail/mail-config.ui.h:119
 msgid "Select Sent Folder"
 msgstr "Seleccionar cartafol"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:120
+msgid "Select Trash Folder"
+msgstr "Seleccionar o cartafol de Lixo"
+
+#: ../mail/mail-config.ui.h:121
 msgid "Sender Photograph"
 msgstr "<b>FotografÃa do remitente</b>"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:122
 msgid "Sending Mail"
 msgstr "Enviando correo"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:123
 msgid "Sent _Messages Folder:"
 msgstr "Cartafol de _mensaxes enviadas:"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:124
 msgid "Sent and Draft Messages"
 msgstr "Mensaxes enviadas"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:125
 msgid "Ser_ver requires authentication"
 msgstr "O ser_vidor require autenticaciÃ³n"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:126
 msgid "Server Configuration"
 msgstr "InformaciÃ³n do servidor"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:127
 msgid "Server _Type:"
 msgstr "_Tipo de servidor:"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:128
+msgid "Si_gning algorithm:"
+msgstr "Algoritmo de si_natura:"
+
+#: ../mail/mail-config.ui.h:129
 msgid "Sig_natures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:130
 msgid "Sig_ning certificate:"
 msgstr "Certificado de si_natura:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:131
 msgid "Signat_ure:"
 msgstr "Sinat_ura:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:132
 msgid "Signatures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:133
+msgid "Signing _algorithm:"
+msgstr "_Algoritmo de sinatura:"
+
+#: ../mail/mail-config.ui.h:134
 msgid "Spell Checking"
 msgstr "VerificaciÃ³n ortogrÃ¡fica"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:135
 msgid "Start _typing at the bottom on replying"
 msgstr "Comezar a escri_bir ao final da resposta"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:137
 msgid "T_ype:"
 msgstr "T_ipo:"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:138
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12829,7 +12887,7 @@ msgstr ""
 "Esta lista de idiomas reflicte unicamente os idiomas para os cales hai "
 "instalado un dicionario."
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:139
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12838,7 +12896,12 @@ msgstr ""
 "A saÃda deste script usarase como a sÃºa\n"
 "sinatura. O nome que especifique usarase sÃ³ para os efectos de visualizaciÃ³n."
 
-#: ../mail/mail-config.ui.h:126
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:143
+msgid "Top Posting Option"
+msgstr "OpciÃ³n de publicar por enriba"
+
+#: ../mail/mail-config.ui.h:144
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12846,183 +12909,193 @@ msgstr ""
 "Teclee o nome polo que quere identificar a esta conta.\n"
 "Por exemplo: \"Traballo\" ou \"Persoal\""
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:146
 msgid "Us_ername:"
 msgstr "Nome de _usuario:"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:147
 msgid "Use Authe_ntication"
 msgstr "Usar aute_nticaciÃ³n"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
-#: ../plugins/google-account-setup/google-contacts-source.c:283
-#: ../plugins/google-account-setup/google-source.c:620
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
+#: ../mail/mail-config.ui.h:148 ../plugins/caldav/caldav-source.c:225
+#: ../plugins/google-account-setup/google-contacts-source.c:286
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
 msgid "User_name:"
 msgstr "_Nome de usuario:"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:149
 msgid "V_ariable-width:"
 msgstr "Largura v_ariÃ¡bel:"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:150
 msgid "_Add Signature"
 msgstr "_Engadir sinatura"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:151
 msgid "_Always load images from the Internet"
 msgstr "Cargar _sempre as imaxes desde Internet"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:152
 msgid "_Authentication Type"
 msgstr "Tipo de _autenticaciÃ³n"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:153
 msgid "_Default junk plugin:"
 msgstr "engadido por _omisiÃ³n de correo non desexado:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:154
 msgid "_Direct connection to the Internet"
 msgstr "ConexiÃ³n _directa a Internet"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:155
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Non asinar as peticiÃ³ns de cita (para a compatibilidade co Outlook)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:156
 msgid "_Forward style:"
 msgstr "Estilo de _reenvÃo:"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:157
+msgid "_Junk Folder:"
+msgstr "Cartafol de correo non _desexado:"
+
+#: ../mail/mail-config.ui.h:158
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Manter a sinatura sobre a mensaxe orixinal ao responder"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:159
 msgid "_Languages"
 msgstr "Idioma"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:160
 msgid "_Load images in messages from contacts"
 msgstr "Ca_rgar as imaxes nas mensaxes dos contactos"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:161
 msgid "_Lookup in local address book only"
 msgstr "_Buscar sÃ³ nas axendas de enderezos locais"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:162
 msgid "_Make this my default account"
 msgstr "_Facer desta a miÃ±a conta predefinida"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:163
 msgid "_Manual proxy configuration:"
 msgstr "ConfiguraciÃ³n _manual do proxy:"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:164
 msgid "_Mark messages as read after"
 msgstr "_Marcar as mensaxes como lidas despois de"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:166
 msgid "_Never load images from the Internet"
 msgstr "_Nunca cargar as imaxes desde Internet"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:167
 msgid "_Path:"
 msgstr "_CamiÃ±o:"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:168
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Preguntar ao enviar correo HTML aos contactos que non o queren"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:169
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Preguntar cando se envÃen mensaxes cun asunto baleiro"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:170
 msgid "_Reply style:"
 msgstr "Estilo da _resposta:"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:171
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:172
 msgid "_Secure HTTP Proxy:"
 msgstr "Proxy HTTP _seguro:"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:174 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "_Servidor:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:176
 msgid "_Show image animations"
 msgstr "_Mostrar animaciÃ³ns de imaxes"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:177
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Mostrar a fotografÃa do remitente na previsualizaciÃ³n da mensaxe"
 
-#: ../mail/mail-config.ui.h:159
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:179
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Reducir as cabeceiras Para/Cc/Cco como "
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:180
+msgid "_Trash Folder:"
+msgstr "Cartafol de correo _lixo:"
+
+#: ../mail/mail-config.ui.h:181
 msgid "_Use Secure Connection:"
 msgstr "_Usar unha conexiÃ³n segura:"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:182
 msgid "_Use system defaults"
 msgstr "_Usar as configuraciÃ³ns predefinidas do sistema"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:183
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar os mesmos tipos de letra que noutros aplicativos"
 
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "am"
 
-#: ../mail/mail-config.ui.h:164
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:186
 msgid "addresses"
 msgstr "enderezos"
 
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "por"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:188
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:189
 msgid "description"
 msgstr "descriciÃ³n"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "Todos os cartafoles remotos activados"
 
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "Todos os cartafoles locais e remotos activados"
 
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "Todos os cartafoles locais"
 
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
 msgid "Call"
 msgstr "Chamar"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "Ter_minado"
 
+#: ../mail/mail-dialogs.ui.h:6
+msgid "Collapse _all"
+msgstr "Contraer _todas"
+
 #: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "Editar a sinatura"
@@ -13032,58 +13105,66 @@ msgid "Do Not Forward"
 msgstr "Non reenviar"
 
 #: ../mail/mail-dialogs.ui.h:9
+msgid "E_xpand all"
+msgstr "E_xpandir todas"
+
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Folder Subscriptions"
 msgstr "SubscriciÃ³ns de cartafoles"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Follow-Up"
 msgstr "Seguimento"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "For Your Information"
 msgstr "Para a sÃºa informaciÃ³n"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "Forward"
 msgstr "Reenviar"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:15
 msgid "License Agreement"
 msgstr "Acordo de licenza"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:16
 msgid "No Response Necessary"
 msgstr "Non Ã© necesaria unha resposta"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Review"
 msgstr "Revisar"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "S_erver:"
 msgstr "S_ervidor:"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
+msgid "S_how only items containing:"
+msgstr "SÃ³ _mostrar elementos que conteÃ±an:"
+
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Search Folder Sources"
 msgstr "Orixe do cartafol de busca"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:25
 msgid "Security Information"
 msgstr "InformaciÃ³n de seguranza"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:26
 msgid "Specific folders"
 msgstr "Cartafoles especÃficos"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:27
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13091,183 +13172,178 @@ msgstr ""
 "As mensaxes que seleccionou para o seguimento lÃstanse abaixo.\n"
 "Seleccione unha acciÃ³n de seguimento desde o menÃº \"Marcar\"."
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Accept License"
 msgstr "_Aceptar a licenza"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Due By:"
 msgstr "_Vence o:"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:31
 msgid "_Flag:"
 msgstr "_Marca:"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:32
 msgid "_Tick this to accept the license agreement"
 msgstr "Ma_rque isto para aceptar o acordo de licenza"
 
-#: ../mail/mail-folder-cache.c:901
+#: ../mail/mail-folder-cache.c:783
 #, c-format
 msgid "Pinging %s"
 msgstr "Facendo ping a %s"
 
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "Filtrando as mensaxes seleccionadas"
 
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:245
 msgid "Fetching Mail"
-msgstr "Recibindo correo"
+msgstr "Obtendo as mensaxes"
 
-#. sending mail, filtering failed
-#: ../mail/mail-ops.c:584
+#: ../mail/mail-ops.c:592
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Produciuse un fallo ao aplicar os filtros ao correo saÃnte: %s"
 
-#: ../mail/mail-ops.c:596 ../mail/mail-ops.c:623
+#: ../mail/mail-ops.c:608 ../mail/mail-ops.c:635
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
 "Produciuse un fallo ao anexar a %s: %s\n"
-"anexando ao cartafol local `Enviados' no seu lugar."
+"No seu lugar anexaranse ao cartafol local Â«EnviadosÂ»."
 
-#: ../mail/mail-ops.c:640
+#: ../mail/mail-ops.c:654
 #, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Produciuse un fallo ao anexar ao cartafol local `Enviados': %s"
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "Produciuse un fallo ao anexar ao cartafol local Â«EnviadosÂ»: %s"
 
-#: ../mail/mail-ops.c:751 ../mail/mail-ops.c:832
+#: ../mail/mail-ops.c:774 ../mail/mail-ops.c:866
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:782
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: ../mail/mail-ops.c:788
+#: ../mail/mail-ops.c:826
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Produciuse un fallo ao enviar %d de %d mensaxes"
 
-#: ../mail/mail-ops.c:790 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:783
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:792 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:785
 msgid "Complete."
 msgstr "Terminado."
 
-#: ../mail/mail-ops.c:904
+#: ../mail/mail-ops.c:938
 #, c-format
 msgid "Saving message to folder '%s'"
-msgstr "Gardando a mensaxe no cartafol %s"
+msgstr "Gardando a mensaxe no cartafol Â«%sÂ»"
 
-#: ../mail/mail-ops.c:981
+#: ../mail/mail-ops.c:1018
 #, c-format
 msgid "Moving messages to '%s'"
-msgstr "Movendo as mensaxes a %s"
+msgstr "Movendo as mensaxes a Â«%sÂ»"
 
-#: ../mail/mail-ops.c:981
+#: ../mail/mail-ops.c:1018
 #, c-format
 msgid "Copying messages to '%s'"
-msgstr "Copiando as mensaxes a %s"
+msgstr "Copiando as mensaxes a Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1090
+#: ../mail/mail-ops.c:1127
 #, c-format
 msgid "Scanning folders in '%s'"
-msgstr "Examinando os cartafoles en \"%s\""
+msgstr "Examinando os cartafoles en Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1198
+#: ../mail/mail-ops.c:1235
 msgid "Forwarded messages"
 msgstr "Mensaxes reenviadas"
 
-#: ../mail/mail-ops.c:1239
+#: ../mail/mail-ops.c:1276
 #, c-format
 msgid "Opening folder '%s'"
-msgstr "Abrindo cartafol %s"
+msgstr "Abrindo o cartafol Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1305
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
-msgstr "Obtendo a informaciÃ³n de cuota do cartafol %s"
+msgstr "Obtendo a informaciÃ³n da cuota do cartafol Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1377
+#: ../mail/mail-ops.c:1414
 #, c-format
 msgid "Opening store '%s'"
-msgstr "Abrindo almacenamento %s"
+msgstr "Abrindo o almacÃ©n Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1448
+#: ../mail/mail-ops.c:1485
 #, c-format
 msgid "Removing folder '%s'"
-msgstr "Eliminando o cartafol %s"
+msgstr "Eliminando o cartafol Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1566
+#: ../mail/mail-ops.c:1609
 #, c-format
 msgid "Storing folder '%s'"
-msgstr "Almacenando o cartafol '%s'"
+msgstr "Almacenando o cartafol Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1629
+#: ../mail/mail-ops.c:1672
 #, c-format
 msgid "Expunging and storing account '%s'"
-msgstr "Compactando e almacenando a conta '%s'"
+msgstr "Compactando e almacenando a conta Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1673
 #, c-format
 msgid "Storing account '%s'"
-msgstr "Almacenando a conta '%s'"
+msgstr "Almacenando a conta Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1684
+#: ../mail/mail-ops.c:1727
 #, c-format
 msgid "Refreshing folder '%s'"
-msgstr "Actualizando o cartafol %s"
+msgstr "Actualizando o cartafol Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1724
+#: ../mail/mail-ops.c:1767
 #, c-format
 msgid "Expunging folder '%s'"
-msgstr "Compactando o cartafol %s"
+msgstr "Compactando o cartafol Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1769
+#: ../mail/mail-ops.c:1812
 #, c-format
 msgid "Emptying trash in '%s'"
-msgstr "Baleirando o lixo en '%s'"
+msgstr "Baleirando o lixo en Â«%sÂ»"
 
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1813
 msgid "Local Folders"
 msgstr "Cartafoles locais"
 
-#: ../mail/mail-ops.c:1966
+#: ../mail/mail-ops.c:2016
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
-msgstr[0] "Recuperando %d mensaxe"
-msgstr[1] "Recuperando %d mensaxes"
+msgstr[0] "Descargando %d mensaxe"
+msgstr[1] "Descargando %d mensaxes"
 
-#: ../mail/mail-ops.c:2055
+#: ../mail/mail-ops.c:2105
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Gardando %d mensaxe"
 msgstr[1] "Gardando %d mensaxes"
 
-#: ../mail/mail-ops.c:2135
+#: ../mail/mail-ops.c:2192
 #, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"Produciuse un erro ao gardar as mensaxes en: %s:\n"
-" %s"
+msgid "Error saving messages to: %s:\n"
+msgstr "Produciuse un erro ao gardar as mensaxes en: %s:\n"
 
-#: ../mail/mail-ops.c:2207
+#: ../mail/mail-ops.c:2265
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: ../mail/mail-ops.c:2225 ../mail/mail-ops.c:2233
+#: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13276,147 +13352,185 @@ msgstr ""
 "Non Ã© posÃbel crear o ficheiro de saÃda: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2248
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Non Ã© posÃbel escribir os datos: %s"
+#: ../mail/mail-ops.c:2310
+msgid "Could not write data: "
+msgstr "Non Ã© posÃbel escribir os datos: "
 
-#: ../mail/mail-ops.c:2393
+#: ../mail/mail-ops.c:2454
 #, c-format
 msgid "Disconnecting from '%s'"
-msgstr "Desconectando de %s"
+msgstr "Desconectando de Â«%sÂ»"
 
-#: ../mail/mail-ops.c:2393
+#: ../mail/mail-ops.c:2454
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Conectando novamente con %s"
 
-#: ../mail/mail-ops.c:2489
+#: ../mail/mail-ops.c:2550
 #, c-format
 msgid "Preparing account '%s' for offline"
-msgstr "Preparando a conta '%s' para o modo sen conexiÃ³n"
+msgstr "Preparando a conta Â«%sÂ» para o modo sen conexiÃ³n"
 
-#: ../mail/mail-ops.c:2575
+#: ../mail/mail-ops.c:2636
 msgid "Checking Service"
 msgstr "Verificando o servizo"
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:188
 msgid "Canceling..."
 msgstr "Cancelando..."
 
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:440
 msgid "Send & Receive Mail"
 msgstr "Enviar e recibir correo"
 
-#: ../mail/mail-send-recv.c:444
+#: ../mail/mail-send-recv.c:457
 msgid "Cancel _All"
 msgstr "Cancelar _todo"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:569
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:649
 msgid "Waiting..."
-msgstr "En espera..."
+msgstr "Agardando..."
 
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:896
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprobando o correo novo"
 
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:225
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introduza a frase de paso para %s"
 
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:227
 msgid "Enter Passphrase"
 msgstr "Introduza a frase de paso"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:230
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza o contrasinal para %s"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:232
 msgid "Enter Password"
 msgstr "Introduza o contrasinal"
 
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:277
+#, c-format
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operaciÃ³n."
 
-#: ../mail/mail-session.c:663
+#: ../mail/mail-session.c:722
+#, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr ""
 "Non se proporcionou ningÃºn enderezo de destino; foi cancelado o reenvÃo da "
 "mensaxe."
 
-#: ../mail/mail-session.c:669
+#: ../mail/mail-session.c:731
+#, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 "Non se encontrou ningunha conta para usar; foi cancelado o reenvÃo da "
 "mensaxe."
 
-#: ../mail/mail-tools.c:123
+#: ../mail/mail-tools.c:128
 #, c-format
-msgid "Could not create spool directory `%s': %s"
-msgstr "Non foi posÃbel crear o cartafol spool `%s': %s"
+msgid "Could not create spool directory '%s': %s"
+msgstr "Non foi posÃbel crear o cartafol spool Â«%sÂ»: %s"
 
-#: ../mail/mail-tools.c:153
+#: ../mail/mail-tools.c:161
 #, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
+msgid "Trying to movemail a non-mbox source '%s'"
 msgstr ""
-"Tentando facer un movemail dunha orixe que non Ã© unha caixa de correo `%s'"
+"Tentando mover o correo desde unha orixe que non Ã© unha caixa de correo Â«%sÂ»"
 
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:273
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe reenviada - %s"
 
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:275
 msgid "Forwarded message"
 msgstr "Mensaxe reenviada"
 
-#: ../mail/mail-tools.c:301
+#: ../mail/mail-tools.c:318
 #, c-format
-msgid "Invalid folder: `%s'"
-msgstr "Cartafol non vÃ¡lido: `%s'"
+msgid "Invalid folder: '%s'"
+msgstr "Cartafol non vÃ¡lido: Â«%sÂ»"
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Configurando o cartafol de busca: %s"
 
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:224
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Actualizando os cartafoles de busca para '%s: %s'"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:231
 #, c-format
 msgid "Updating Search Folders for '%s'"
-msgstr "Actualizando os cartafoles de busca para '%s'"
+msgstr "Actualizando os cartafoles de busca para Â«%sÂ»"
 
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected
+#. * search folder(s), the second %s is the URI of the
+#. * removed folder. For more than one search folder is
+#. * each of them on a separate line, with four spaces
+#. * in front of its name, without quotes.
+#: ../mail/mail-vfolder.c:675
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been modified to account for the deleted "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
+msgstr[0] ""
+"O cartafol de busca \n"
+"Â«%sÂ» foi actualizado debido a que se eliminou o cartafol \n"
+"Â«%sÂ»."
+msgstr[1] ""
+"Os cartafols de busca \n"
+"Â«%sÂ» foi actualizado debido a que se eliminou o cartafol\n"
+"Â«%sÂ»."
+
+#: ../mail/mail-vfolder.c:1185
 msgid "Edit Search Folder"
 msgstr "Editar cartafol de busca"
 
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1290
 msgid "New Search Folder"
 msgstr "Cartafol de busca novo"
 
 #: ../mail/mail.error.xml.h:1
+msgid "\"Check Junk\" Failed"
+msgstr "Produciuse un fallo na comprobaciÃ³n de correo lixo"
+
+#: ../mail/mail.error.xml.h:2
+msgid "\"Report Junk\" Failed"
+msgstr "Produciuse un fallo ao informar de que Ã© correo non desexado"
+
+#: ../mail/mail.error.xml.h:3
+msgid "\"Report Not Junk\" Failed"
+msgstr "Produciuse un fallo ao informar de que non Ã© non desexado"
+
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "Xa existe un cartafol co nome \"{0}\". Use un nome diferente."
 
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Xa existe un cartafol co nome \"{1}\". Use un nome diferente."
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13428,7 +13542,7 @@ msgstr ""
 "Pode escoller entre ignorar este cartafol, sobrescribir ou anexar os seus "
 "contidos ou saÃr."
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
@@ -13436,13 +13550,13 @@ msgstr ""
 "Foi solicitada unha confirmaciÃ³n de lectura para \"{1}\". QuÃ©relle enviar a "
 "confirmaciÃ³n de lectura a {0}?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 msgstr "Xa existe unha sinatura co nome \"{0}\". Use un nome diferente."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13450,26 +13564,22 @@ msgstr ""
 "Engadir unha liÃ±a de asunto significativa Ã¡s mensaxes darÃ¡ aos seus "
 "destinatarios unha idea sobre o contido do correo."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "EstÃ¡ seguro de que quere eliminar esta conta e todos os seus proxies?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:13
 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
+#: ../mail/mail.error.xml.h:14
 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?"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "EstÃ¡ seguro de que quere abrir {0} mensaxes ao mesmo tempo?"
-
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13477,7 +13587,7 @@ msgstr ""
 "EstÃ¡ seguro de que quere eliminar permanentemente todas as mensaxes "
 "eliminadas en todos os cartafoles?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
@@ -13485,87 +13595,79 @@ msgstr ""
 "EstÃ¡ seguro de que quere eliminar permanentemente todas as mensaxes "
 "eliminadas do cartafol \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "EstÃ¡ seguro de que quere enviar unha mensaxe en formato HTML?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "EstÃ¡ seguro de que quere enviar unha mensaxe sÃ³ con destinatarios Cco?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "EstÃ¡ seguro de que quere enviar unha mensaxe sÃ³ con destinatarios Cco?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "EstÃ¡ seguro de que quere enviar unha mensaxe sÃ³ con destinatarios Cco?"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "EstÃ¡ seguro de que quere enviar unha mensaxe sen un asunto?"
 
-#: ../mail/mail.error.xml.h:20
-msgid "Because \"{0}\"."
-msgstr "Por causa de \"{0}\"."
-
 #: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "Por causa de \"{2}\"."
-
-#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "Sinatura en branco"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Non Ã© posÃbel engadir o Cartafol de busca \"{0}\"."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Non Ã© posÃbel copiar o cartafol \"{0}\" en \"{1}\"."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "Non Ã© posÃbel crear o cartafol \"{0}\"."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "Non Ã© posÃbel crear o cartafol de gardado temporal."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Non Ã© posÃbel crear o cartafol de gardado porque \"{1}\""
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Non Ã© posÃbel eliminar o cartafol \"{0}\"."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Non Ã© posÃbel eliminar o cartafol de sistema \"{0}\"."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Non Ã© posÃbel editar o Cartafol de busca \"{0}\" porque non existe."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Non Ã© posÃbel mover o cartafol \"{0}\" a \"{1}\"."
 
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{1}\""
-msgstr "Non Ã© posÃbel abrir a orixe \"{1}\""
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot open source \"{1}\"."
+msgstr "Non Ã© posÃbel abrir a orixe Â«{1}Â»"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "Non Ã© posÃbel abrir a orixe \"{2}\"."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "Non Ã© posÃbel abrir o destino \"{2}\"."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -13574,35 +13676,31 @@ msgstr ""
 "instalaciÃ³n. Non serÃ¡ capaz de usar este provedor atÃ© que acepte a sÃºa "
 "licenza."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Non Ã© posÃbel renomear \"{0}\" como \"{1}\"."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Non Ã© posÃbel renomear ou mover o cartafol de sistema \"{0}\"."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "Non Ã© posÃbel gardar as modificaciÃ³ns na conta."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Non Ã© posÃbel gardar no cartafol \"{0}\"."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "Non Ã© posÃbel gardar no ficheiro \"{0}\"."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Non Ã© posÃbel estabelecer o script de sinatura \"{0}\"."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "Produciuse un fallo na verificaciÃ³n de correo non desexado"
-
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13611,27 +13709,27 @@ msgstr ""
 "moitos contrasinais diferencian maiÃºsculas de minÃºsculas, a sÃºa tecla Bloq "
 "MaiÃºs pode estar activada."
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "Non foi posÃbel gardar o ficheiro de sinatura."
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Quere eliminar as mensaxes no Cartafol de busca \"{0}\"?"
 
+#: ../mail/mail.error.xml.h:46
+msgid "Do _Not Disable"
+msgstr "_Non desactivar"
+
 #: ../mail/mail.error.xml.h:47
-msgid "Do not d_elete"
-msgstr "Non _eliminar"
+msgid "Do _Not Send"
+msgstr "_Non enviar"
 
 #: ../mail/mail.error.xml.h:48
-msgid "Do not delete"
-msgstr "Non eliminar"
+msgid "Do _Not Synchronize"
+msgstr "_Non sincronizar"
 
 #: ../mail/mail.error.xml.h:49
-msgid "Do not disable"
-msgstr "Non desactivar"
-
-#: ../mail/mail.error.xml.h:50
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -13639,60 +13737,63 @@ 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:50
 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:51
 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:52
 msgid "Enter password."
 msgstr "Introduza o contrasinal."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "Produciuse un erro ao cargar as definiciÃ³ns dos filtros."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "Produciuse un erro ao efectuar a operaciÃ³n."
 
-#: ../mail/mail.error.xml.h:56
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "Produciuse un 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 Ã© posÃbel sobrescribilo."
 
-#: ../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 "
+"If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr ""
-"Se elimina o cartafol eliminarase permanentemente todo o seu contido e o dos "
-"seus subcartafoles."
+"Se elimina o cartafol todo o seu contido e o dos seus subcartafoles "
+"eliminarase permanentemente."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Se elimina o cartafol eliminarase permanentemente todo o seu contido."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:64
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Se procede, as contas proxy eliminaranse permanentemente."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13700,11 +13801,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:65
+#: ../mail/mail.error.xml.h:67
 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:66
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13712,23 +13813,23 @@ msgstr ""
 "Se sae, estas mensaxes non se enviarÃ¡n atÃ© que o Evolution sexa iniciado de "
 "novo."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:70
 msgid "Invalid authentication"
 msgstr "AutenticaciÃ³n non vÃ¡lida"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:71
 msgid "Mail Deletion Failed"
 msgstr "Produciuse un fallo na eliminaciÃ³n de correo"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:72
 msgid "Mail filters automatically updated."
 msgstr "Filtros de correo actualizados automaticamente."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:73
 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 "
@@ -13740,27 +13841,27 @@ 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:72
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "Falta o cartafol."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Non se seleccionou ningunha orixe."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:77
 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:76
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "Verifique a configuraciÃ³n da conta e tÃ©nteo outra vez."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:79
 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:78
+#: ../mail/mail.error.xml.h:80
 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."
@@ -13768,7 +13869,7 @@ 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:79
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13778,67 +13879,63 @@ msgstr ""
 "HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "Introduza un nome Ãºnico para identificar esta sinatura."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "Agarde."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:85
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Produciuse un problema ao migrar o cartafol de correo antigo \"{0}\"."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Estase consultando o servidor sobre unha lista de mecanismos de "
 "autenticaciÃ³n compatÃbeis."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:87
 msgid "Read receipt requested."
 msgstr "Solicitouse unha confirmaciÃ³n de lectura."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:88
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
 "EstÃ¡ seguro de que quere eliminar o cartafol \"{0}\" e todos os seus "
 "cartafoles secundarios?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:89
 msgid "Really delete folder \"{0}\"?"
 msgstr "Confirma o borrado do cartafol \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:88
-msgid "Report Junk Failed"
-msgstr "Produciuse un fallo ao informar de correo non desexado"
-
-#: ../mail/mail.error.xml.h:89
-msgid "Report Not Junk Failed"
-msgstr "Produciuse un fallo ao informe do correo que non Ã© non desexado"
-
 #: ../mail/mail.error.xml.h:90
+msgid "Reply _Privately"
+msgstr "Responder en pri_vado"
+
+#: ../mail/mail.error.xml.h:93
 msgid "Search Folders automatically updated."
 msgstr "Os cartafoles de busca actualizÃ¡ronse automaticamente."
 
-#: ../mail/mail.error.xml.h:91
-msgid "Send Receipt"
-msgstr "Enviar notificaciÃ³n de recepciÃ³n"
+#: ../mail/mail.error.xml.h:94
+msgid "Send private reply?"
+msgstr "Enviar a resposta privada?"
+
+#: ../mail/mail.error.xml.h:95
+msgid "Send reply to all recipients?"
+msgstr "Desexa enviar a resposta a todos os destinatarios?"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:96
 msgid "Signature Already Exists"
 msgstr "A sinatura xa existe"
 
-#: ../mail/mail.error.xml.h:93
-msgid "Synchronize"
-msgstr "Sincronizar"
-
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:97
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Sincronizar os cartafoles localmente para o uso sen conexiÃ³n?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13846,7 +13943,7 @@ msgstr ""
 "O Evolution precisa os cartafoles de sistema para funcionar correctamente e "
 "non Ã© posÃbel renomear, mover nin eliminar."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13863,35 +13960,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:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"Os seguintes cartafoles de busca:\n"
-"{0}\n"
-"usan o cartafol que se eliminou agora:\n"
-"    \"{1}\"\n"
-"e foron actualizados."
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"As seguintes regras de filtraxe:\n"
-"{0}\n"
-"usan o cartafol que se eliminou agora:\n"
-"    \"{1}\"\n"
-"e foron actualizadas."
-
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:102
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13900,7 +13969,7 @@ msgstr ""
 "electrÃ³nico correcto:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13909,11 +13978,11 @@ msgstr ""
 "electrÃ³nico correcto:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:106
 msgid "The script file must exist and be executable."
 msgstr "O ficheiro de script debe existir e ser executÃ¡bel."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13922,7 +13991,7 @@ msgstr ""
 "vaia ao editor de cartafoles de busca para engadilo explicitamente, se Ã© "
 "necesario."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -13930,14 +13999,14 @@ msgstr ""
 "Esta mensaxe non pode ser enviada porque a conta que escolleu para enviala "
 "non estÃ¡ activada"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:110
 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:118
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13945,11 +14014,11 @@ msgstr ""
 "Este servidor non Ã© compatÃbel con este tipo de autenticaciÃ³n e quizais non "
 "permita ningÃºn tipo de autenticaciÃ³n."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:112
 msgid "This signature has been changed, but has not been saved."
 msgstr "Modificouse esta sinatura mais non foi gardada."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -13957,11 +14026,15 @@ msgstr ""
 "Isto marcarÃ¡ todas as mensaxes como lidas no cartafol seleccionado e nos "
 "seus subcartafoles."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:114
+msgid "This will mark all messages as read in the selected folder."
+msgstr "Isto marcarÃ¡ todas as mensaxes como lidas no cartafol seleccionado."
+
+#: ../mail/mail.error.xml.h:115
 msgid "Unable to connect to the GroupWise server."
 msgstr "Non foi posÃbel conectar co servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13969,19 +14042,19 @@ msgstr ""
 "Non Ã© posÃbel abrir o cartafol de borradores nesta conta. Quere usar no seu "
 "lugar o cartafol de borradores do sistema?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:117
 msgid "Unable to read license file."
 msgstr "Non Ã© posÃbel ler o ficheiro da licenza."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:118
 msgid "Use _Default"
 msgstr "Usar o pre_determinado"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:119
 msgid "Use default drafts folder?"
 msgstr "Quere usar o cartafol de borradores predefinidos?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13991,31 +14064,59 @@ msgstr ""
 "mensaxes reais dun dos seus cartafoles locais ou remotos.\n"
 "EstÃ¡ seguro de que quere facer isto?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:122
+msgid ""
+"You are replying privately to a message which arrived via a mailing list, "
+"but the list is trying to redirect your reply to go back to the list. Are "
+"you sure you want to proceed?"
+msgstr ""
+"EstÃ¡ respondendo de forma privada a un correo electrÃ³nico que chegou "
+"mediante unha rolda de correo, pero a rolda estÃ¡ tentando redireccionar a "
+"sÃºa resposta de novo Ã¡ rolda. Ten certeza que quere proceder?"
+
+#: ../mail/mail.error.xml.h:123
+msgid ""
+"You are replying to a message which arrived via a mailing list, but you are "
+"replying privately to the sender; not to the list. Are you sure you want to "
+"proceed?"
+msgstr ""
+"EstÃ¡ respondendo a un correo electrÃ³nico que chegou mediante unha rolda de "
+"correo, pero estÃ¡ respondendo de forma privada ao remitente, non Ã¡ rolda. "
+"Ten certeza seguro que quere proceder?"
+
+#: ../mail/mail.error.xml.h:124
+msgid ""
+"You are replying to a message which was sent to many recipients. Are you "
+"sure you want to reply to ALL of them?"
+msgstr ""
+"EstÃ¡ respondendo a un correo electrÃ³nico que se enviou a moitos "
+"destinatarios. Ten certeza que quere responder a TODOS eles?"
+
+#: ../mail/mail.error.xml.h:125
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Vostede non ten os permisos suficientes para eliminar este correo."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:126
 msgid "You have not filled in all of the required information."
 msgstr "Non encheu toda a informaciÃ³n requirida."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:127
 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:131
+#: ../mail/mail.error.xml.h:128
 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:132
+#: ../mail/mail.error.xml.h:129
 msgid "You must name this Search Folder."
 msgstr "Debe dar un nome a este cartafol de busca."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:130
 msgid "You must specify a folder."
 msgstr "Debe especificar un cartafol."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14025,119 +14126,125 @@ msgstr ""
 "FÃ¡gao seleccionando os cartafoles individualmente, ou seleccionando todos os "
 "cartafoles locais e todos os cartafoles remotos ou ambos."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:133
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr ""
 "Produciuse un fallo no seu inicio de sesiÃ³n no servidor \"{0}\" como \"{0}\"."
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:134
 msgid "_Append"
 msgstr "_Engadir"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:135
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "_Disable"
+msgstr "_Desactivar"
+
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "_Rexeitar as modificaciÃ³ns"
 
-#: ../mail/mail.error.xml.h:139
-msgid "_Do not Synchronize"
-msgstr "_Non sincronizar"
-
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:866
+#: ../mail/mail.error.xml.h:137
+#: ../modules/mail/e-mail-shell-view-actions.c:887
 msgid "_Empty Trash"
 msgstr "_Baleirar o lixo"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:138
 msgid "_Expunge"
 msgstr "_Compactar"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:139
 msgid "_Open Messages"
 msgstr "_Abrir mensaxes"
 
-#: ../mail/message-list.c:1165
+#: ../mail/mail.error.xml.h:142
+msgid "_Send Receipt"
+msgstr "_Enviar confirmaciÃ³n"
+
+#: ../mail/mail.error.xml.h:143
+msgid "_Synchronize"
+msgstr "_Sincronizar"
+
+#: ../mail/message-list.c:1170
 msgid "Unseen"
 msgstr "Non vista"
 
-#: ../mail/message-list.c:1166
+#: ../mail/message-list.c:1171
 msgid "Seen"
 msgstr "Vista"
 
-#: ../mail/message-list.c:1167
+#: ../mail/message-list.c:1172
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:1168
+#: ../mail/message-list.c:1173
 msgid "Forwarded"
 msgstr "Reenviada"
 
-#: ../mail/message-list.c:1169
+#: ../mail/message-list.c:1174
 msgid "Multiple Unseen Messages"
 msgstr "MÃºltiples mensaxes non vistas"
 
-#: ../mail/message-list.c:1170
+#: ../mail/message-list.c:1175
 msgid "Multiple Messages"
 msgstr "MÃºltiples mensaxes"
 
-#: ../mail/message-list.c:1174
+#: ../mail/message-list.c:1179
 msgid "Lowest"
 msgstr "A mÃ¡is baixa"
 
-#: ../mail/message-list.c:1175
+#: ../mail/message-list.c:1180
 msgid "Lower"
 msgstr "Inferior"
 
-#: ../mail/message-list.c:1179
+#: ../mail/message-list.c:1184
 msgid "Higher"
 msgstr "Superior"
 
-#: ../mail/message-list.c:1180
+#: ../mail/message-list.c:1185
 msgid "Highest"
 msgstr "A mÃ¡is alta"
 
-#: ../mail/message-list.c:1790 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1795 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1797 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1802 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Hoxe Ã¡s %l:%M %p"
 
-#: ../mail/message-list.c:1806
+#: ../mail/message-list.c:1811
 msgid "Yesterday %l:%M %p"
 msgstr "Onte Ã¡s %l:%M %p"
 
 # (pofilter) variables: do not translate: %a, %l, %p
-#: ../mail/message-list.c:1818
+#: ../mail/message-list.c:1823
 msgid "%a %l:%M %p"
 msgstr "O %A Ã¡s %k:%M"
 
 # (pofilter) variables: do not translate: %b, %l, %p
-#: ../mail/message-list.c:1826
+#: ../mail/message-list.c:1831
 msgid "%b %d %l:%M %p"
 msgstr "O %d de %B Ã¡s %k:%M"
 
 # (pofilter) variables: do not translate: %b
-#: ../mail/message-list.c:1828
+#: ../mail/message-list.c:1833
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: ../mail/message-list.c:2574
+#: ../mail/message-list.c:2598
 msgid "Select all visible messages"
 msgstr "Seleccionar todas as mensaxes visÃbeis"
 
-#: ../mail/message-list.c:2625 ../shell/e-shell-view.c:729
-msgid "Shell Backend"
-msgstr "Infraestrutura shell"
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4532 ../mail/message-list.c:5032
+#: ../mail/message-list.c:4412 ../mail/message-list.c:4820
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
-#: ../mail/message-list.c:4864
+#: ../mail/message-list.c:4643
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14145,15 +14252,7 @@ msgstr ""
 "Non hai mensaxes que satisfagan os seus criterios de busca. Limpe a busca no "
 "elemento de menÃº Buscar->Limpar ou cÃ¡mbieo."
 
-#: ../mail/message-list.c:4866
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-"SÃ³ hai mensaxes ocultas neste cartafol. Use Ver -> Mostrar mensaxes ocultas "
-"para velas."
-
-#: ../mail/message-list.c:4868
+#: ../mail/message-list.c:4645
 msgid "There are no messages in this folder."
 msgstr "Non hai mensaxes neste cartafol."
 
@@ -14182,7 +14281,7 @@ msgid "Sent Messages"
 msgstr "Mensaxes enviadas"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:560
+#: ../widgets/misc/e-attachment-tree-view.c:570
 msgid "Size"
 msgstr "TamaÃ±o"
 
@@ -14191,27 +14290,27 @@ msgid "Subject - Trimmed"
 msgstr "Asunto - Recortado"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "Body contains"
 msgstr "O corpo contÃ©n"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Message contains"
 msgstr "A mensaxe contÃ©n"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1293
+#: ../modules/mail/e-mail-shell-view-actions.c:1292
 msgid "Recipients contain"
 msgstr "Os destinatarios conteÃ±en"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1299
 msgid "Sender contains"
 msgstr "O remitente contÃ©n"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
 msgid "Subject contains"
 msgstr "O asunto contÃ©n"
 
@@ -14245,17 +14344,17 @@ msgstr ""
 "TLS. Isto significa que a sÃºa conexiÃ³n serÃ¡ insegura e que vostede serÃ¡ "
 "vulnerÃ¡bel a fallos de seguranza."
 
-#: ../modules/addressbook/addressbook-config.c:592
-msgid "Use in _Birthday & Anniversaries calendar"
-msgstr "Datas de nacementos e aniversarios"
+#: ../modules/addressbook/addressbook-config.c:602
+msgid "U_se in Birthday & Anniversaries calendar"
+msgstr "U_sar no calendario Cumpleanos e aniversarios"
 
-#: ../modules/addressbook/addressbook-config.c:628
+#: ../modules/addressbook/addressbook-config.c:638
 msgid "Copy _book content locally for offline operation"
 msgstr ""
 "Copiar o contido da a_xenda de enderezos localmente para unha operaciÃ³n sen "
 "conexiÃ³n"
 
-#: ../modules/addressbook/addressbook-config.c:736
+#: ../modules/addressbook/addressbook-config.c:746
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -14265,7 +14364,7 @@ msgstr ""
 "Proporcionouse unha lista de portos estÃ¡ndar. Pregunte ao seu administrador "
 "do sistema que porto deberÃa especificar."
 
-#: ../modules/addressbook/addressbook-config.c:810
+#: ../modules/addressbook/addressbook-config.c:820
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -14275,7 +14374,7 @@ msgstr ""
 "definir isto como \"Enderezo de correo\" require o acceso anÃ³nimo ao "
 "servidor LDAP."
 
-#: ../modules/addressbook/addressbook-config.c:885
+#: ../modules/addressbook/addressbook-config.c:895
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -14287,29 +14386,29 @@ msgstr ""
 "todas as entradas por debaixo da sÃºa base de busca. Un Ã¡mbito \"un\" sÃ³ "
 "incluirÃ¡ as entradas un nivel por debaixo da sÃºa base."
 
-#: ../modules/addressbook/addressbook-config.c:991
+#: ../modules/addressbook/addressbook-config.c:1011
 msgid "Server Information"
 msgstr "InformaciÃ³n do servidor"
 
-#: ../modules/addressbook/addressbook-config.c:996
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1016
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Detalles"
 
-#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/addressbook/addressbook-config.c:1017
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "Buscando"
 
-#: ../modules/addressbook/addressbook-config.c:999
+#: ../modules/addressbook/addressbook-config.c:1019
 msgid "Downloading"
 msgstr "Descargando"
 
-#: ../modules/addressbook/addressbook-config.c:1205
+#: ../modules/addressbook/addressbook-config.c:1225
 msgid "Address Book Properties"
 msgstr "Propiedades da axenda de enderezos"
 
-#: ../modules/addressbook/addressbook-config.c:1207
+#: ../modules/addressbook/addressbook-config.c:1227
 msgid "New Address Book"
 msgstr "Nova axenda de enderezos"
 
@@ -14400,483 +14499,374 @@ msgstr ""
 msgid "Whether to show the preview pane."
 msgstr "Indica se se mostra o panel de previsualizaciÃ³n."
 
-#: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
+#: ../modules/addressbook/autocompletion-config.c:162
+#: ../modules/mail/em-mailer-prefs.c:1141
+msgid "_Table column:"
 msgstr "Columna da tÃ¡boa:"
 
-#: ../modules/addressbook/autocompletion-config.c:162
+#: ../modules/addressbook/autocompletion-config.c:165
 msgid "Autocompletion"
 msgstr "Completado automÃ¡tico"
 
-#: ../modules/addressbook/autocompletion-config.c:165
+#: ../modules/addressbook/autocompletion-config.c:168
 msgid "Always _show address of the autocompleted contact"
 msgstr "Mo_strar sempre o enderezo do contacto completado automaticamente"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:191
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-backend.c:98
+#: ../modules/addressbook/e-book-shell-migrate.c:148
 msgid "On LDAP Servers"
 msgstr "En servidores LDAP"
 
-#: ../modules/addressbook/e-book-shell-backend.c:341
+#: ../modules/addressbook/e-book-shell-backend.c:280
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: ../modules/addressbook/e-book-shell-backend.c:343
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-backend.c:282
+#: ../modules/addressbook/e-book-shell-view-actions.c:773
 msgid "Create a new contact"
 msgstr "Crear un contacto novo"
 
-#: ../modules/addressbook/e-book-shell-backend.c:348
+#: ../modules/addressbook/e-book-shell-backend.c:287
 msgctxt "New"
 msgid "Contact _List"
 msgstr "_Lista de contactos"
 
-#: ../modules/addressbook/e-book-shell-backend.c:350
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-backend.c:289
+#: ../modules/addressbook/e-book-shell-view-actions.c:780
 msgid "Create a new contact list"
 msgstr "Crear unha lista de contactos nova"
 
-#: ../modules/addressbook/e-book-shell-backend.c:358
+#: ../modules/addressbook/e-book-shell-backend.c:297
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-backend.c:360
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-backend.c:299
+#: ../modules/addressbook/e-book-shell-view-actions.c:703
 msgid "Create a new address book"
 msgstr "Crear unha axenda de enderezos nova"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:377
-#: ../modules/addressbook/e-book-shell-view.c:397
-#: ../modules/calendar/e-cal-shell-backend.c:124
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/addressbook/e-book-shell-backend.c:316
+#: ../modules/addressbook/e-book-shell-view.c:401
+#: ../modules/calendar/e-cal-shell-backend.c:104
+#: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "Contactos"
 
-#: ../modules/addressbook/e-book-shell-backend.c:597
-#: ../modules/calendar/e-cal-shell-backend.c:813
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-msgid "Source List"
-msgstr "Orixe"
-
-#: ../modules/addressbook/e-book-shell-backend.c:598
-msgid "The registry of address books"
-msgstr "Non foi posÃbel obter unha lista de axendas de enderezos"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-msgid "Current View"
-msgstr "_VisualizaciÃ³n actual"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr "A visualizaciÃ³n de axenda de enderezo seleccionada actualmente"
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-msgid "Previewed Contact"
-msgstr "Contacto novo"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-msgid "The contact being shown in the preview pane"
-msgstr "Indica se se mostra o panel de previsualizaciÃ³n."
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:688
-msgid "Preview is Visible"
-msgstr "A barra lateral Ã© visÃbel"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:689
-msgid "Whether the preview pane is visible"
-msgstr "Indica se se mostra o panel de previsualizaciÃ³n."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "Servidores LDAP"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "ConfiguraciÃ³n do completado automÃ¡tico"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"A localizaciÃ³n e a xerarquÃa dos cartafoles de contactos do Evolution "
-"modificouse desde o Evolution 1.x.\n"
-"\n"
-"Sexa paciente mentres o Evolution migra os seus cartafoles..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Modificouse o formato dos contactos da lista de correo.\n"
-"\n"
-"Sexa paciente mentres o Evolution migra os seus cartafoles..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Modificouse a maneira en que o Evolution almacena algÃºns nÃºmeros de "
-"telÃ©fono.\n"
-"\n"
-"Sexa paciente mentres o Evolution migra os seus cartafoles..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Modificouse o rexistro de modificaciÃ³ns e os ficheiros de mapa no Palm Sync "
-"do Evolution.\n"
-"\n"
-"Sexa paciente mentres o Evolution migra os seus datos Pilot Sync..."
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:763
-#: ../modules/calendar/e-memo-shell-sidebar.c:689
-#: ../modules/calendar/e-task-shell-sidebar.c:689
-msgid "Source Selector Widget"
-msgstr "Selector de orixe de notas"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-msgid "This widget displays groups of address books"
-msgstr "Non foi posÃbel obter unha lista de axendas de enderezos"
+#: ../modules/addressbook/e-book-shell-backend.c:325
+msgid "Certificates"
+msgstr "Certificados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:549
 msgid "Save as vCard"
 msgstr "Gardar como vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Co_py All Contacts To..."
 msgstr "Co_piar todos os contactos a..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:682
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Copiar os contactos do cartafol seleccionado noutro cartafol"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "D_elete Address Book"
 msgstr "E_liminar a axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:689
 msgid "Delete the selected address book"
 msgstr "Eliminar o cartafol seleccionado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Mo_ve All Contacts To..."
 msgstr "Mo_ver todos os contactos a..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:696
 msgid "Move the contacts of the selected address book to another"
 msgstr "Mover os contactos do cartafol seleccionado a outro cartafol"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "_New Address Book"
 msgstr "_Nova axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 msgid "Address _Book Properties"
 msgstr "Propiedades da a_xenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:710
 msgid "Show properties of the selected address book"
 msgstr "Modificar as propiedades do cartafol seleccionado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
-#: ../modules/calendar/e-memo-shell-view-actions.c:619
-#: ../modules/calendar/e-task-shell-view-actions.c:743
-#: ../modules/mail/e-mail-shell-view-actions.c:950
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
+#: ../modules/calendar/e-cal-shell-view-actions.c:1354
+#: ../modules/calendar/e-memo-shell-view-actions.c:620
+#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/mail/e-mail-shell-view-actions.c:971
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:717
 msgid "Rename the selected address book"
 msgstr "Renomear o cartafol seleccionado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 msgid "S_ave Address Book as vCard"
 msgstr "G_ardar axenda de enderezos como VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:724
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Gardar os contactos do cartafol seleccionado como unha VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:713
+#: ../modules/addressbook/e-book-shell-view-actions.c:731
 msgid "Stop loading"
 msgstr "Deter a carga"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "_Copy Contact To..."
 msgstr "_Copiar contacto a..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:738
 msgid "Copy selected contacts to another address book"
 msgstr "Copiar os contactos seleccionados a outro cartafol"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:725
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "_Delete Contact"
 msgstr "E_liminar contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "_Find in Contact..."
 msgstr "_Buscar no contacto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:752
 msgid "Search for text in the displayed contact"
 msgstr "Buscar texto no corpo da mensaxe mostrada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "_Forward Contact..."
 msgstr "_Reenviar contacto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:759
 msgid "Send selected contacts to another person"
 msgstr "Enviar os contactos seleccionados a outra persoa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "_Move Contact To..."
 msgstr "_Mover contacto a..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:766
 msgid "Move selected contacts to another address book"
 msgstr "Mover os contactos seleccionados a outro cartafol"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "_New Contact..."
 msgstr "Contacto _novo..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "New Contact _List..."
 msgstr "_Lista de contactos nova..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
 msgid "_Open Contact"
 msgstr "_Contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:787
 msgid "View the current contact"
 msgstr "Ver o contacto actual"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
 msgid "_Send Message to Contact..."
 msgstr "_Enviar mensaxe ao contacto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:794
 msgid "Send a message to the selected contacts"
 msgstr "Enviar unha mensaxe aos contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Actions"
 msgstr "_AcciÃ³ns"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
-#: ../modules/calendar/e-memo-shell-view-actions.c:656
-#: ../modules/calendar/e-task-shell-view-actions.c:808
+#: ../modules/addressbook/e-book-shell-view-actions.c:808
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-task-shell-view-actions.c:809
 #: ../modules/mail/e-mail-shell-view-actions.c:1094
 msgid "_Preview"
 msgstr "_PrevisualizaciÃ³n"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
-#: ../modules/calendar/e-memo-shell-view-actions.c:669
-#: ../modules/calendar/e-task-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:817
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+#: ../modules/calendar/e-memo-shell-view-actions.c:670
+#: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Delete"
 msgstr "E_liminar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:830
+#: ../modules/addressbook/e-book-shell-view-actions.c:976
 msgid "_Save as vCard..."
 msgstr "_Gardar como vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:858
 msgid "Contact _Preview"
 msgstr "_PrevisualizaciÃ³n de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:860
 msgid "Show contact preview window"
 msgstr "Mostrar a xanela de previsualizaciÃ³n de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
-#: ../modules/calendar/e-task-shell-view-actions.c:890
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/addressbook/e-book-shell-view-actions.c:879
+#: ../modules/calendar/e-memo-shell-view-actions.c:727
+#: ../modules/calendar/e-task-shell-view-actions.c:891
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
 msgid "_Classic View"
 msgstr "VisualizaciÃ³n _clÃ¡sica"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:881
 msgid "Show contact preview below the contact list"
 msgstr "Mostrar a previsualizaciÃ³n da mensaxe baixo a lista de mensaxes"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
-#: ../modules/calendar/e-memo-shell-view-actions.c:733
-#: ../modules/calendar/e-task-shell-view-actions.c:897
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/addressbook/e-book-shell-view-actions.c:886
+#: ../modules/calendar/e-memo-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
 msgid "_Vertical View"
 msgstr "VisualizaciÃ³n _vertical"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:888
 msgid "Show contact preview alongside the contact list"
 msgstr "Mostrar a xanela de previsualizaciÃ³n de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
-#: ../modules/calendar/e-memo-shell-view-actions.c:743
-#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
+#: ../modules/calendar/e-cal-shell-view-actions.c:1656
+#: ../modules/calendar/e-memo-shell-view-actions.c:744
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Any Category"
 msgstr "Calquera categorÃa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
-#: ../modules/calendar/e-task-shell-view-actions.c:949
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
+#: ../modules/calendar/e-cal-shell-view-actions.c:1670
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Unmatched"
 msgstr "Sen equivalencia"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
-#: ../modules/calendar/e-memo-shell-view-actions.c:760
-#: ../modules/calendar/e-task-shell-view-actions.c:959
-#: ../modules/mail/e-mail-shell-view-actions.c:1272
-#: ../shell/e-shell-content.c:516
+#: ../modules/addressbook/e-book-shell-view-actions.c:913
+#: ../modules/calendar/e-cal-shell-view-actions.c:1680
+#: ../modules/calendar/e-memo-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../shell/e-shell-content.c:467
 msgid "Advanced Search"
 msgstr "Busca avanzada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:946
 msgid "Print all shown contacts"
 msgstr "Imprimir os contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "Preview the contacts to be printed"
 msgstr "Previsualiza os contactos que se van imprimir"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "Print selected contacts"
 msgstr "Imprimir os contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "Gardar como vCard..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:978
 msgid "Save selected contacts as a vCard"
 msgstr "Gardar os contactos seleccionados como unha VCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:341
+#: ../modules/addressbook/e-book-shell-view.c:345
 msgid "_Forward Contacts"
 msgstr "_Reenviar contactos"
 
-#: ../modules/addressbook/e-book-shell-view.c:343
+#: ../modules/addressbook/e-book-shell-view.c:347
 msgid "_Forward Contact"
 msgstr "_Reenviar contacto"
 
-#: ../modules/addressbook/e-book-shell-view.c:374
+#: ../modules/addressbook/e-book-shell-view.c:378
 msgid "_Send Message to Contacts"
 msgstr "Enviar unha _mensaxe aos contactos"
 
-#: ../modules/addressbook/e-book-shell-view.c:376
+#: ../modules/addressbook/e-book-shell-view.c:380
 msgid "_Send Message to List"
 msgstr "Enviar unha _mensaxe Ã¡ lista"
 
-#: ../modules/addressbook/e-book-shell-view.c:378
+#: ../modules/addressbook/e-book-shell-view.c:382
 msgid "_Send Message to Contact"
 msgstr "Enviar unha _mensaxe ao contacto"
 
-#: ../modules/addressbook/eab-composer-util.c:137
+#: ../modules/addressbook/eab-composer-util.c:143
 msgid "Multiple vCards"
 msgstr "MÃºltiples vCards"
 
-#: ../modules/addressbook/eab-composer-util.c:145
+#: ../modules/addressbook/eab-composer-util.c:151
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard para %s"
 
-#: ../modules/addressbook/eab-composer-util.c:157
-#: ../modules/addressbook/eab-composer-util.c:184
+#: ../modules/addressbook/eab-composer-util.c:163
+#: ../modules/addressbook/eab-composer-util.c:190
 #, c-format
 msgid "Contact information"
 msgstr "InformaciÃ³n de contacto"
 
-#: ../modules/addressbook/eab-composer-util.c:186
+#: ../modules/addressbook/eab-composer-util.c:192
 #, c-format
 msgid "Contact information for %s"
 msgstr "InformaciÃ³n de contacto de %s"
 
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
 msgstr "1"
 
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr "389"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr "636"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
 msgid "Anonymously"
 msgstr "Anonimamente"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:7
 msgid "B_rowse this book until limit reached"
 msgstr "Examina_r esta axenda de enderezos atÃ© atinxir o lÃmite"
 
-#: ../modules/addressbook/ldap-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "Lo_gin:"
 msgstr "_Iniciar a sesiÃ³n:"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../modules/addressbook/ldap-config.ui.h:11
 msgid "One"
 msgstr "Conectado"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "Filtro de busca"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "_Base de busca:"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
 msgstr "_Filtro de busca:"
 
-#: ../modules/addressbook/ldap-config.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:16
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
@@ -14886,173 +14876,144 @@ msgstr ""
 "obxectos do tipo \"persoa\"."
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:18
 msgid "Sub"
 msgstr "Do"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Supported Search Bases"
 msgstr "Bases de busca compatÃbeis"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "Using distinguished name (DN)"
 msgstr ""
 "Anonimamente\n"
 "Empregar enderezo de correo\n"
 "Empregar nome distintivo (DN)"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using email address"
 msgstr "_Enderezo de correo:"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Download limit:"
 msgstr "LÃmite de _descarga:"
 
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Find Possible Search Bases"
 msgstr "_Localizar bases de busca posÃbeis"
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Login method:"
 msgstr "MÃ©todo de _inicio de sesiÃ³n:"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_Porto:"
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "Ã?mbito da bu_sca:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
 msgstr "_Tempo de espera:"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "_Usar unha conexiÃ³n segura:"
 
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "tarxetas"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "I_mportar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:341
+#: ../modules/calendar/e-cal-attachment-handler.c:343
 msgid "Select a Calendar"
 msgstr "Seleccione un calendario"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:368
+#: ../modules/calendar/e-cal-attachment-handler.c:370
 msgid "Select a Task List"
 msgstr "Seleccione unha lista de tarefas"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:378
+#: ../modules/calendar/e-cal-attachment-handler.c:380
 msgid "I_mport to Calendar"
 msgstr "I_mportar ao calendario"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:385
+#: ../modules/calendar/e-cal-attachment-handler.c:387
 msgid "I_mport to Tasks"
 msgstr "_Importar Ã¡s tarefas"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:126
-#: ../modules/calendar/e-cal-shell-migrate.c:599
-#: ../modules/calendar/e-memo-shell-backend.c:110
+#: ../modules/calendar/e-cal-shell-backend.c:106
+#: ../modules/calendar/e-cal-shell-migrate.c:181
+#: ../modules/calendar/e-memo-shell-backend.c:94
 #: ../modules/calendar/e-memo-shell-migrate.c:136
-#: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-backend.c:94
+#: ../modules/calendar/e-task-shell-migrate.c:145
 msgid "On The Web"
 msgstr "Na Web"
 
-#: ../modules/calendar/e-cal-shell-backend.c:128
+#: ../modules/calendar/e-cal-shell-backend.c:108
 #: ../plugins/calendar-weather/calendar-weather.c:117
 msgid "Weather"
 msgstr "O tempo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:252
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-backend.c:193
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "Datas de nacementos e aniversarios"
 
-#: ../modules/calendar/e-cal-shell-backend.c:456
+#: ../modules/calendar/e-cal-shell-backend.c:406
 msgctxt "New"
 msgid "_Appointment"
 msgstr "Cit_a"
 
-#: ../modules/calendar/e-cal-shell-backend.c:458
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-backend.c:408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "Create a new appointment"
 msgstr "Crear unha cita nova"
 
-#: ../modules/calendar/e-cal-shell-backend.c:463
+#: ../modules/calendar/e-cal-shell-backend.c:413
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Ci_ta para todo o dÃa"
 
-#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-backend.c:415
 msgid "Create a new all-day appointment"
 msgstr "Crear nova cita nova para todo o dÃa"
 
-#: ../modules/calendar/e-cal-shell-backend.c:470
+#: ../modules/calendar/e-cal-shell-backend.c:420
 msgctxt "New"
 msgid "M_eeting"
 msgstr "R_euniÃ³n"
 
-#: ../modules/calendar/e-cal-shell-backend.c:472
+#: ../modules/calendar/e-cal-shell-backend.c:422
 msgid "Create a new meeting request"
 msgstr "Crear unha solicitude de cita nova"
 
-#: ../modules/calendar/e-cal-shell-backend.c:480
+#: ../modules/calendar/e-cal-shell-backend.c:430
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
-#: ../modules/calendar/e-cal-shell-backend.c:482
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-backend.c:432
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "Create a new calendar"
 msgstr "Crear un calendario novo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:517
-#: ../plugins/itip-formatter/itip-formatter.c:2658
+#: ../modules/calendar/e-cal-shell-backend.c:717
+#: ../plugins/itip-formatter/itip-formatter.c:2669
 msgid "Calendar and Tasks"
 msgstr "Calendario e tarefas"
 
-#: ../modules/calendar/e-cal-shell-backend.c:814
-msgid "The registry of calendars"
-msgstr "Calendario primario"
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"A localizaciÃ³n e xerarquÃa dos cartafoles de calendario do Evolution "
-"modificouse desde o Evolution 1.x.\n"
-"\n"
-"Agarde mentres o Evolution migra os seus cartafoles..."
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
-"Non Ã© posÃbel migrar a configuraciÃ³n antiga desde evolution/config.xmldb"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "Non foi posÃbel migrar o calendario `%s'"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:168
-#: ../modules/calendar/e-memo-shell-sidebar.c:163
-#: ../modules/calendar/e-task-shell-sidebar.c:163
+#: ../modules/calendar/e-cal-shell-sidebar.c:171
+#: ../modules/calendar/e-memo-shell-sidebar.c:165
+#: ../modules/calendar/e-task-shell-sidebar.c:165
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -15061,36 +15022,20 @@ msgstr ""
 "Erro en %s:\n"
 " %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:227
+#: ../modules/calendar/e-cal-shell-sidebar.c:239
 msgid "Loading calendars"
 msgstr "Cargando calendario"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:617
+#: ../modules/calendar/e-cal-shell-sidebar.c:674
+msgid "_New Calendar..."
+msgstr "Calendario _novo"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:691
 msgid "Calendar Selector"
 msgstr "Selector de orixe do calendario"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:743
-msgid "Date Navigator Widget"
-msgstr "Widget do navegador de datas"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:744
-msgid "This widget displays a miniature calendar"
-msgstr "Este widget mostra unha calendario en miniatura"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:753
-msgid "Default Calendar Client"
-msgstr "Cliente de correo predefinido"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:754
-msgid "Default client for calendar operations"
-msgstr "O cliente predefinido para as operaciÃ³ns no calendario"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:764
-msgid "This widget displays groups of calendars"
-msgstr "Este widget mostra grupos de calendarios"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:952
+#: ../modules/calendar/e-cal-shell-sidebar.c:1032
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Abrir calendario en %s"
@@ -15120,298 +15065,298 @@ msgstr "Purgar eventos anteriores a"
 msgid "Copying Items"
 msgstr "Copiando elementos"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-actions.c:804
 msgid "Moving Items"
 msgstr "Movendo elementos"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1098
+#: ../modules/calendar/e-cal-shell-view-actions.c:1126
 msgid "event"
 msgstr "Enviado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1100
-#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-actions.c:1128
+#: ../modules/calendar/e-cal-shell-view-memopad.c:210
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:503
-#: ../modules/calendar/e-task-shell-view-actions.c:620
+#: ../modules/calendar/e-memo-shell-view-actions.c:504
+#: ../modules/calendar/e-task-shell-view-actions.c:621
 msgid "Save as iCalendar"
 msgstr "Seleccione un calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1291
 msgid "D_elete Calendar"
 msgstr "_Eliminar o calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Delete the selected calendar"
 msgstr "Eliminar o calendario seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
 msgid "Go Back"
 msgstr "AtrÃ¡s"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
 msgid "Go Forward"
 msgstr "Adiante"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
-msgid "Select _Today"
-msgstr "Seleccionar _hoxe"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
 msgid "Select today"
 msgstr "Seleccionar hoxe"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Select _Date"
 msgstr "Seleccionar _data"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Select a specific date"
 msgstr "Seleccionar unha data especÃfica"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "_New Calendar"
 msgstr "Calendario _novo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-cal-shell-view-actions.c:1340
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "Purg_e"
 msgstr "D_epurar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "Purge old appointments and meetings"
 msgstr "Depurar as reuniÃ³ns e as citas antigas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "Re_fresh"
 msgstr "Ac_tualizar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
 msgid "Refresh the selected calendar"
 msgstr "Renomear o cartafol seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
 msgid "Rename the selected calendar"
 msgstr "Renomear o cartafol seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Show _Only This Calendar"
 msgstr "M_ostrar sÃ³ este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar a un calendario..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "_Delegate Meeting..."
 msgstr "_Delegar cita..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "_Delete Appointment"
 msgstr "_Eliminar esta cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Delete selected appointments"
 msgstr "Eliminar a cita seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Delete This _Occurrence"
 msgstr "Eliminar esta _apariciÃ³n"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Delete this occurrence"
 msgstr "Eliminar esta apariciÃ³n"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Delete All Occ_urrences"
 msgstr "Eliminar _todas as apariciÃ³ns"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Delete all occurrences"
 msgstr "Eliminar todas as apariciÃ³ns"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "New All Day _Event..."
 msgstr "Novo _actividade de dÃa completo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
 msgid "Create a new all day event"
 msgstr "Crear nova cita nova para todo o dÃa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
-#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-actions.c:1410
+#: ../modules/calendar/e-cal-shell-view-memopad.c:244
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:577
-#: ../modules/calendar/e-task-shell-view-actions.c:701
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Forward as iCalendar..."
 msgstr "Remi_tir como iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
 msgid "New _Meeting..."
 msgstr "_ReuniÃ³n nova"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Create a new meeting"
 msgstr "Crear unha solicitude de cita nova"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1424
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver ao calendario..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "New _Appointment..."
 msgstr "_Cita nova..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta apariciÃ³n _movÃbel"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "_Open Appointment"
 msgstr "_Abrir cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "View the current appointment"
 msgstr "Ver a cita actual"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1452
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../modules/calendar/e-cal-shell-view-actions.c:1466
+#: ../modules/calendar/e-cal-shell-view-memopad.c:272
 msgid "Save as iCalendar..."
 msgstr "Gardar como vCard..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "_Schedule Meeting..."
 msgstr "_Programar cita..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Converts an appointment to a meeting"
 msgstr "Depurar as reuniÃ³ns e as citas antigas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
 msgid "Conv_ert to Appointment..."
 msgstr "_Cita nova..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "Converts a meeting to an appointment"
 msgstr "%s ao finalizar a cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+msgid "Quit"
+msgstr "SaÃr"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Day"
 msgstr "DÃa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1613
 msgid "Show one day"
 msgstr "Mostrar un dÃa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "List"
 msgstr "Lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
 msgid "Show as list"
 msgstr "Mostrar como unha lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "Month"
 msgstr "Mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
 msgid "Show one month"
 msgstr "Mostrar un mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Week"
 msgstr "Semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
 msgid "Show one week"
 msgstr "Mostrar unha semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
 msgid "Show one work week"
 msgstr "Mostrar unha semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
 msgid "Active Appointments"
 msgstr "Citas activas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1663
 msgid "Next 7 Days' Appointments"
 msgstr "Citas dos prÃ³ximos sete dÃas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
-#: ../modules/calendar/e-memo-shell-view-actions.c:774
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../modules/calendar/e-memo-shell-view-actions.c:775
+#: ../modules/calendar/e-task-shell-view-actions.c:974
 msgid "Description contains"
 msgstr "A descriciÃ³n contÃ©n"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
-#: ../modules/calendar/e-memo-shell-view-actions.c:781
-#: ../modules/calendar/e-task-shell-view-actions.c:980
+#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../modules/calendar/e-memo-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:981
 msgid "Summary contains"
 msgstr "O resumo contÃ©n"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1713
 msgid "Print this calendar"
 msgstr "Imprimir este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
 msgid "Preview the calendar to be printed"
 msgstr "Previsualiza o calendario que se vai imprimir"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1793
 msgid "Go To"
 msgstr "Ir a"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:501
+#: ../modules/calendar/e-cal-shell-view-memopad.c:208
+#: ../modules/calendar/e-memo-shell-view-actions.c:502
 msgid "memo"
 msgstr "Nota"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
 msgid "New _Memo"
 msgstr "Nota nova"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:252
-#: ../modules/calendar/e-memo-shell-backend.c:320
-#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#: ../modules/calendar/e-cal-shell-view-memopad.c:253
+#: ../modules/calendar/e-memo-shell-backend.c:281
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "Create a new memo"
 msgstr "Crear unha nota nova"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:640
+#: ../modules/calendar/e-cal-shell-view-memopad.c:258
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
 msgid "_Open Memo"
 msgstr "_Abrir nota"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "View the selected memo"
 msgstr "Ver a nota seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-memopad.c:265
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Open _Web Page"
 msgstr "Abrir pÃ¡xina _web"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:807
+#: ../modules/calendar/e-cal-shell-view-memopad.c:284
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
 msgid "Print the selected memo"
 msgstr "Ver a nota seleccionada"
 
@@ -15420,22 +15365,22 @@ msgstr "Ver a nota seleccionada"
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:618
+#: ../modules/calendar/e-task-shell-view-actions.c:619
 msgid "task"
 msgstr "Tarefa"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:680
+#: ../modules/calendar/e-task-shell-view-actions.c:681
 msgid "_Assign Task"
 msgstr "_Asignar Tarefa"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "_Mark as Complete"
 msgstr "_Marcar como terminada"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:759
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "Mark selected tasks as complete"
 msgstr "Marcar as tarefas seleccionadas como terminadas"
 
@@ -15444,96 +15389,76 @@ msgid "_Mark as Incomplete"
 msgstr "_Marcar como non terminada"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:766
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Mark selected tasks as incomplete"
 msgstr "Marcar as tarefas seleccionadas como terminadas"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "New _Task"
 msgstr "Nova _tarefa"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:773
+#: ../modules/calendar/e-task-shell-backend.c:280
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Create a new task"
 msgstr "Crear unha tarefa nova"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:778
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "_Open Task"
 msgstr "_Abrir tarefa"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "View the selected task"
 msgstr "Ver a tarefa seleccionada"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:822
-#: ../modules/calendar/e-task-shell-view-actions.c:1021
+#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
 msgid "_Save as iCalendar..."
 msgstr "Remi_tir como iCalendar..."
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:1006
+#: ../modules/calendar/e-task-shell-view-actions.c:1007
 msgid "Print the selected task"
 msgstr "Ver a tarefa seleccionada"
 
-#: ../modules/calendar/e-memo-shell-backend.c:318
+#: ../modules/calendar/e-memo-shell-backend.c:279
 msgctxt "New"
 msgid "Mem_o"
 msgstr "N_ota"
 
-#: ../modules/calendar/e-memo-shell-backend.c:325
+#: ../modules/calendar/e-memo-shell-backend.c:286
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "Nota _compartida"
 
-#: ../modules/calendar/e-memo-shell-backend.c:327
+#: ../modules/calendar/e-memo-shell-backend.c:288
 msgid "Create a new shared memo"
 msgstr "Crear unha nota compartida nova"
 
-#: ../modules/calendar/e-memo-shell-backend.c:335
+#: ../modules/calendar/e-memo-shell-backend.c:296
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Lista de notas"
 
-#: ../modules/calendar/e-memo-shell-backend.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:600
+#: ../modules/calendar/e-memo-shell-backend.c:298
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Create a new memo list"
 msgstr "Crear unha lista de notas nova"
 
-#: ../modules/calendar/e-memo-shell-backend.c:588
-msgid "The registry of memo lists"
-msgstr "Lista de notas primaria"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-msgid "The memo table model"
-msgstr "Modelo da tÃ¡boa"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:222
+#: ../modules/calendar/e-memo-shell-sidebar.c:233
 msgid "Loading memos"
 msgstr "Cargando notas"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:571
+#: ../modules/calendar/e-memo-shell-sidebar.c:613
 msgid "Memo List Selector"
 msgstr "Selector de orixe de notas"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:679
-msgid "Default Memo Client"
-msgstr "Cliente de recordatorios predefinido"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:680
-msgid "Default client for memo operations"
-msgstr "Cliente predefinido para as operaciÃ³ns nas citas"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:690
-msgid "This widget displays groups of memo lists"
-msgstr "Este widget mostra os grupos de listas de recordatorios"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:870
+#: ../modules/calendar/e-memo-shell-sidebar.c:918
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Abrindo notas en %s"
@@ -15543,63 +15468,63 @@ msgstr "Abrindo notas en %s"
 msgid "Print Memos"
 msgstr "Imprimir notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:563
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
 msgid "_Delete Memo"
 msgstr "E_liminar mensaxe"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:570
+#: ../modules/calendar/e-memo-shell-view-actions.c:571
 msgid "_Find in Memo..."
 msgstr "_Buscar na cita..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:572
+#: ../modules/calendar/e-memo-shell-view-actions.c:573
 msgid "Search for text in the displayed memo"
 msgstr "Buscar texto no corpo da cita mostrada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "D_elete Memo List"
 msgstr "E_liminar a lista de citas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:593
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "Delete the selected memo list"
 msgstr "Eliminar a lista de citas seleccionadas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:598
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "_New Memo List"
 msgstr "Lista de notas _nova"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "Refresh the selected memo list"
 msgstr "Eliminar as notas seleccionadas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "Rename the selected memo list"
 msgstr "Renomear o cartafol seleccionado"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-memo-shell-view-actions.c:627
 msgid "Show _Only This Memo List"
 msgstr "M_ostrar sÃ³ esta lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:705
+#: ../modules/calendar/e-memo-shell-view-actions.c:706
 msgid "Memo _Preview"
 msgstr "_PrevisualizaciÃ³n"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:707
+#: ../modules/calendar/e-memo-shell-view-actions.c:708
 msgid "Show memo preview pane"
 msgstr "Mostrar o panel de previsualizaciÃ³n"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Show memo preview below the memo list"
 msgstr "Mostrar a previsualizaciÃ³n da mensaxe baixo a lista de mensaxes"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:735
+#: ../modules/calendar/e-memo-shell-view-actions.c:736
 msgid "Show memo preview alongside the memo list"
 msgstr "Mostrar a previsualizaciÃ³n da mensaxe baixo a lista de mensaxes"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:793
+#: ../modules/calendar/e-memo-shell-view-actions.c:794
 msgid "Print the list of memos"
 msgstr "Imprimir a lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:800
+#: ../modules/calendar/e-memo-shell-view-actions.c:801
 msgid "Preview the list of memos to be printed"
 msgstr "Previsualiza a lista de notas para imprimir"
 
@@ -15624,78 +15549,40 @@ msgstr "E_liminar a mensaxe"
 msgid "Delete Memo"
 msgstr "Eliminar a cita"
 
-#: ../modules/calendar/e-task-shell-backend.c:322
+#: ../modules/calendar/e-task-shell-backend.c:278
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../modules/calendar/e-task-shell-backend.c:329
+#: ../modules/calendar/e-task-shell-backend.c:285
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tarefa asigna_da"
 
-#: ../modules/calendar/e-task-shell-backend.c:331
+#: ../modules/calendar/e-task-shell-backend.c:287
 msgid "Create a new assigned task"
 msgstr "Crear unha tarefa asignada nova"
 
-#: ../modules/calendar/e-task-shell-backend.c:339
+#: ../modules/calendar/e-task-shell-backend.c:295
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../modules/calendar/e-task-shell-backend.c:297
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "Create a new task list"
 msgstr "Crear unha lista de tarefas nova"
 
-#: ../modules/calendar/e-task-shell-backend.c:598
-msgid "The registry of task lists"
-msgstr "Lista de tarefas primaria"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-msgid "The task table model"
-msgstr "Modelo da tÃ¡boa"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"A localizaciÃ³n e xerarquÃa dos cartafoles de tarefas do Evolution "
-"modificouse desde o Evolution 1.x.\n"
-"\n"
-"Agarde mentres o Evolution migra os seus cartafoles..."
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "Non foi posÃbel migrar as tarefas `%s'"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:222
+#: ../modules/calendar/e-task-shell-sidebar.c:233
 msgid "Loading tasks"
 msgstr "Cargando tarefas"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:571
+#: ../modules/calendar/e-task-shell-sidebar.c:613
 msgid "Task List Selector"
 msgstr "Selector de orixe de tarefas"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:679
-msgid "Default Task Client"
-msgstr "Cliente de tarefas predefinido"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:680
-msgid "Default client for task operations"
-msgstr "Cliente predefinido para a operaciÃ³n na tarefa"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:690
-msgid "This widget displays groups of task lists"
-msgstr "Este widget mostra os grupos de listas de tarefas"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:870
+#: ../modules/calendar/e-task-shell-sidebar.c:918
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo tarefas en %s"
@@ -15705,7 +15592,7 @@ msgstr "Abrindo tarefas en %s"
 msgid "Print Tasks"
 msgstr "Imprimir tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:562
+#: ../modules/calendar/e-task-shell-view-actions.c:563
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15717,95 +15604,95 @@ msgstr ""
 "\n"
 "EstÃ¡ seguro de que quere eliminar estas tarefas?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "_Delete Task"
 msgstr "E_liminar"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:694
+#: ../modules/calendar/e-task-shell-view-actions.c:695
 msgid "_Find in Task..."
 msgstr "_Buscar na tarefa..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:696
+#: ../modules/calendar/e-task-shell-view-actions.c:697
 msgid "Search for text in the displayed task"
 msgstr "Buscar texto no corpo da tarefa mostrada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "Copy..."
 msgstr "_Copiar..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "D_elete Task List"
 msgstr "_Eliminar a lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "Delete the selected task list"
 msgstr "Eliminar a lista de tarefas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:722
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "_New Task List"
 msgstr "Lista de tarefas _nova"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "Refresh the selected task list"
 msgstr "Eliminar as tarefas seleccionadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Rename the selected task list"
 msgstr "Renomear o cartafol seleccionado"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Show _Only This Task List"
 msgstr "M_ostrar sÃ³ esta lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "Mar_k as Incomplete"
 msgstr "_Marcar como non terminada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:794
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Delete completed tasks"
 msgstr "Eliminar as tarefas terminadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:869
+#: ../modules/calendar/e-task-shell-view-actions.c:870
 msgid "Task _Preview"
 msgstr "_Previsualizar tarefa"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:871
+#: ../modules/calendar/e-task-shell-view-actions.c:872
 msgid "Show task preview pane"
 msgstr "Mostrar o panel de previsualizaciÃ³n"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:892
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Show task preview below the task list"
 msgstr "Mostrar a previsualizaciÃ³n da mensaxe baixo a lista de mensaxes"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:899
+#: ../modules/calendar/e-task-shell-view-actions.c:900
 msgid "Show task preview alongside the task list"
 msgstr "Mostrar a previsualizaciÃ³n da mensaxe baixo a lista de mensaxes"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:907
+#: ../modules/calendar/e-task-shell-view-actions.c:908
 msgid "Active Tasks"
 msgstr "Tarefas activas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:921
+#: ../modules/calendar/e-task-shell-view-actions.c:922
 msgid "Completed Tasks"
 msgstr "Tarefas terminadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:928
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Next 7 Days' Tasks"
 msgstr "Tarefas dos prÃ³ximos sete dÃas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:935
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Overdue Tasks"
 msgstr "Tarefas atrasadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:942
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Tasks with Attachments"
 msgstr "Tarefas con anexos"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:992
+#: ../modules/calendar/e-task-shell-view-actions.c:993
 msgid "Print the list of tasks"
 msgstr "Imprimir a lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:999
+#: ../modules/calendar/e-task-shell-view-actions.c:1000
 msgid "Preview the list of tasks to be printed"
 msgstr "Previsualiza a lista de tarefas para imprimir"
 
@@ -15830,213 +15717,181 @@ msgstr "Eliminar a tarefa"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
+#: ../modules/mail/e-mail-attachment-handler.c:345
 #, c-format
 msgid "%d attached messages"
 msgstr "%d mensaxes anexas"
 
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
+#: ../modules/mail/e-mail-junk-hook.c:89
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:171
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mensaxe de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:173
 msgid "Compose a new mail message"
 msgstr "Compor unha mensaxe de correo nova"
 
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:181
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Carta_fol de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:183
 msgid "Create a new mail folder"
 msgstr "Crear un cartafol novo de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:481
 msgid "Mail Accounts"
 msgstr "Contas de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:489
 msgid "Mail Preferences"
 msgstr "Preferencias de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:497
 msgid "Composer Preferences"
 msgstr "Preferencias do editor"
 
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:505
 msgid "Network Preferences"
 msgstr "Preferencias de rede"
 
-#: ../modules/mail/e-mail-shell-content.c:678
-msgid "Group by Threads"
-msgstr "Agr_upar por fÃos"
-
-#: ../modules/mail/e-mail-shell-content.c:679
-msgid "Whether to group messages by threads"
-msgstr "Indica se as mensaxes se agrupan por fÃos"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:859
-#: ../modules/mail/e-mail-shell-view.c:875
+#: ../modules/mail/e-mail-shell-view-actions.c:880
+#: ../modules/mail/e-mail-shell-view.c:883
 msgid "_Disable Account"
 msgstr "Desactivar conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:861
+#: ../modules/mail/e-mail-shell-view-actions.c:882
 msgid "Disable this account"
 msgstr "Desactivar conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:868
+#: ../modules/mail/e-mail-shell-view-actions.c:889
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr ""
 "Eliminar permanentemente todas as mensaxes eliminadas en todos os cartafoles"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:873
+#: ../modules/mail/e-mail-shell-view-actions.c:894
 msgid "C_reate Search Folder From Search..."
 msgstr "C_rear un cartafol de busca por busca..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:880
+#: ../modules/mail/e-mail-shell-view-actions.c:901
 msgid "_Download Messages for Offline Usage"
 msgstr "_Descargar as mensaxes para o uso sen conexiÃ³n"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:903
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Descargar as mensaxes para as contas e cartafoles marcados para o modo sen "
 "conexiÃ³n"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:887
+#: ../modules/mail/e-mail-shell-view-actions.c:908
 msgid "Fl_ush Outbox"
 msgstr "Lim_par a caixa de saÃda"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:894
+#: ../modules/mail/e-mail-shell-view-actions.c:915
 msgid "_Copy Folder To..."
 msgstr "_Copiar cartafol a..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:896
+#: ../modules/mail/e-mail-shell-view-actions.c:917
 msgid "Copy the selected folder into another folder"
 msgstr "Copiar o cartafol seleccionado noutro cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:903
+#: ../modules/mail/e-mail-shell-view-actions.c:924
 msgid "Permanently remove this folder"
 msgstr "Eliminar permanentemente este cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:908
+#: ../modules/mail/e-mail-shell-view-actions.c:929
 msgid "E_xpunge"
 msgstr "Com_pactar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:910
+#: ../modules/mail/e-mail-shell-view-actions.c:931
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Eliminar permanentemente as mensaxes eliminadas deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:915
+#: ../modules/mail/e-mail-shell-view-actions.c:936
 msgid "Mar_k All Messages as Read"
 msgstr "Ma_rcar todas as mensaxes como lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:917
+#: ../modules/mail/e-mail-shell-view-actions.c:938
 msgid "Mark all messages in the folder as read"
 msgstr "Marcar todas as mensaxes do cartafol como lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:922
+#: ../modules/mail/e-mail-shell-view-actions.c:943
 msgid "_Move Folder To..."
 msgstr "_Mover o cartafol a..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:924
+#: ../modules/mail/e-mail-shell-view-actions.c:945
 msgid "Move the selected folder into another folder"
 msgstr "Mover o cartafol seleccionado a outro cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:929
+#: ../modules/mail/e-mail-shell-view-actions.c:950
 msgid "_New..."
 msgstr "_Novo..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:931
+#: ../modules/mail/e-mail-shell-view-actions.c:952
 msgid "Create a new folder for storing mail"
 msgstr "Crear un cartafol novo para almacenar correo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:938
+#: ../modules/mail/e-mail-shell-view-actions.c:959
 msgid "Change the properties of this folder"
 msgstr "Modificar as propiedades deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:945
+#: ../modules/mail/e-mail-shell-view-actions.c:966
 msgid "Refresh the folder"
 msgstr "Actualizar o cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:952
+#: ../modules/mail/e-mail-shell-view-actions.c:973
 msgid "Change the name of this folder"
 msgstr "Modificar o nome deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:957
+#: ../modules/mail/e-mail-shell-view-actions.c:978
 msgid "Select Message _Thread"
 msgstr "Seleccionar o _fÃo da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:959
+#: ../modules/mail/e-mail-shell-view-actions.c:980
 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"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:964
+#: ../modules/mail/e-mail-shell-view-actions.c:985
 msgid "Select Message S_ubthread"
 msgstr "Seleccionar o fÃo sec_undario da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:966
+#: ../modules/mail/e-mail-shell-view-actions.c:987
 msgid "Select all replies to the currently selected message"
 msgstr "Seleccionar todas as respostas Ã¡ mensaxe seleccionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:971
+#: ../modules/mail/e-mail-shell-view-actions.c:992
 msgid "_Unsubscribe"
 msgstr "Eliminar s_ubscriciÃ³n"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:973
+#: ../modules/mail/e-mail-shell-view-actions.c:994
 msgid "Unsubscribe from the selected folder"
 msgstr "Renomear o cartafol seleccionado"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:999
 msgid "Empty _Trash"
 msgstr "Baleirar o _lixo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:980
+#: ../modules/mail/e-mail-shell-view-actions.c:1001
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr ""
 "Eliminar permanentemente todas as mensaxes eliminadas en todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:985
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
 msgid "_New Label"
 msgstr "Etiqueta _nova"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:994
+#: ../modules/mail/e-mail-shell-view-actions.c:1015
 msgid "N_one"
 msgstr "NingÃºn"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1001
-msgid "Hide _Read Messages"
-msgstr "Ocultar as mensaxes _lidas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1003
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Ocultar temporalmente todas as mensaxes lidas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1008
-msgid "Hide S_elected Messages"
-msgstr "Ocultar as mensaxes s_eleccionadas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1010
-msgid "Temporarily hide the selected messages"
-msgstr "Ocultar temporalmente as mensaxes seleccionadas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1015
-msgid "Show Hidde_n Messages"
-msgstr "Mostrar as mensaxes o_cultas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1017
-msgid "Show messages that have been temporarily hidden"
-msgstr "Mostrar as mensaxes ocultas temporalmente"
-
 #: ../modules/mail/e-mail-shell-view-actions.c:1038
 msgid "Cancel the current mail operation"
 msgstr "Cancelar a operaciÃ³n de correo actual"
@@ -16095,233 +15950,256 @@ msgid "_New Folder..."
 msgstr "Cartafol _novo..."
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1151
-msgid "Hide _Deleted Messages"
-msgstr "Ocultar as mensaxes elimina_das"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "Ocultar as mensaxes eliminadas en vez de mostralas riscadas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1160
 msgid "Show Message _Preview"
 msgstr "Mostrar _previsualizaciÃ³n da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1162
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
 msgid "Show message preview pane"
 msgstr "Mostrar a xanela de previsualizaciÃ³n da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
+msgid "Show _Deleted Messages"
+msgstr "Mostrar as mensaxes _eliminadas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
+msgid "Show deleted messages with a line through them"
+msgstr "Mostrar as mensaxes eliminadas riscÃ¡ndoas."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
 msgid "_Group By Threads"
 msgstr "Agr_upar por fÃos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1170
+#: ../modules/mail/e-mail-shell-view-actions.c:1169
 msgid "Threaded message list"
 msgstr "Lista de mensaxes por fÃos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1191
+#: ../modules/mail/e-mail-shell-view-actions.c:1190
 msgid "Show message preview below the message list"
 msgstr "Mostrar a previsualizaciÃ³n da mensaxe baixo a lista de mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1197
 msgid "Show message preview alongside the message list"
 msgstr "Mostrar a previsualizaciÃ³n da mensaxe baixo a lista de mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1206
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
 msgid "All Messages"
 msgstr "Todas as mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Important Messages"
 msgstr "Mensaxes importantes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Last 5 Days' Messages"
 msgstr "Mensaxes dos Ãºltimos 5 dÃas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Messages Not Junk"
 msgstr "Mensaxes que non son lixo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Messages with Attachments"
 msgstr "Mensaxes con anexos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1241
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "No Label"
 msgstr "Sen etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1248
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Read Messages"
 msgstr "Mensaxes lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1255
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
 msgid "Recent Messages"
 msgstr "Mensaxes recentes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1262
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "Unread Messages"
 msgstr "Mensaxes non lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
 msgid "Subject or Addresses contain"
 msgstr "O asunto ou os enderezos conteÃ±en"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1323
 msgid "All Accounts"
 msgstr "Todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1330
 msgid "Current Account"
 msgstr "Conta actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../modules/mail/e-mail-shell-view-actions.c:1337
 msgid "Current Folder"
 msgstr "Cartafol actual"
 
-#: ../modules/mail/e-mail-shell-view-private.c:889
+#: ../modules/mail/e-mail-shell-view-private.c:990
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionado, "
 msgstr[1] "%d seleccionados, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:900
+#: ../modules/mail/e-mail-shell-view-private.c:1001
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d eliminado"
 msgstr[1] "%d eliminados"
 
-#: ../modules/mail/e-mail-shell-view-private.c:906
-#: ../modules/mail/e-mail-shell-view-private.c:913
+#: ../modules/mail/e-mail-shell-view-private.c:1007
+#: ../modules/mail/e-mail-shell-view-private.c:1014
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d correo non desexado"
 msgstr[1] "%d correos non desexados"
 
-#: ../modules/mail/e-mail-shell-view-private.c:919
+#: ../modules/mail/e-mail-shell-view-private.c:1020
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d borrador"
 msgstr[1] "%d borradores"
 
-#: ../modules/mail/e-mail-shell-view-private.c:925
+#: ../modules/mail/e-mail-shell-view-private.c:1026
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d non enviado"
 msgstr[1] "%d non enviados"
 
-#: ../modules/mail/e-mail-shell-view-private.c:931
+#: ../modules/mail/e-mail-shell-view-private.c:1032
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviado"
 msgstr[1] "%d enviados"
 
-#: ../modules/mail/e-mail-shell-view-private.c:943
+#: ../modules/mail/e-mail-shell-view-private.c:1044
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d sen ler, "
 msgstr[1] "%d sen ler, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:946
+#: ../modules/mail/e-mail-shell-view-private.c:1047
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d en total"
 msgstr[1] "%d en total"
 
-#: ../modules/mail/e-mail-shell-view.c:548
+#: ../modules/mail/e-mail-shell-view.c:559
 msgid "All Account Search"
 msgstr "Buscar en todas as contas"
 
-#: ../modules/mail/e-mail-shell-view.c:685
+#: ../modules/mail/e-mail-shell-view.c:686
 msgid "Account Search"
 msgstr "Buscar na conta"
 
-#: ../modules/mail/e-mail-shell-view.c:873
+#: ../modules/mail/e-mail-shell-view.c:881
 msgid "Proxy _Logout"
 msgstr "_Terminar a sesiÃ³n proxy"
 
-#: ../modules/mail/em-composer-prefs.c:473
+#: ../modules/mail/em-account-prefs.c:133
+msgid "Evolution Account Assistant"
+msgstr "Asistente de contas do Evolution"
+
+#: ../modules/mail/em-account-prefs.c:182
+msgid "Account Editor"
+msgstr "Editor de contas"
+
+#: ../modules/mail/em-composer-prefs.c:505
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:211
+msgid "Enabled"
+msgstr "Activado"
+
+#: ../modules/mail/em-composer-prefs.c:509
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Every time"
 msgstr "Cada vez"
 
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per day"
 msgstr "Unha vez ao dÃa"
 
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per week"
 msgstr "Unha vez Ã¡ semana"
 
-#: ../modules/mail/em-mailer-prefs.c:100
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per month"
 msgstr "Unha vez ao mes"
 
-#: ../modules/mail/em-mailer-prefs.c:222
+#: ../modules/mail/em-mailer-prefs.c:201
 msgid "Add Custom Junk Header"
 msgstr "Engadir unha cabeceira personalizada para o correo non desexado"
 
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:209
 msgid "Header Name:"
 msgstr "Nome da cabeceira:"
 
-#: ../modules/mail/em-mailer-prefs.c:227
+#: ../modules/mail/em-mailer-prefs.c:210
 msgid "Header Value Contains:"
 msgstr "O valor da cabeceira contÃ©n:"
 
-#: ../modules/mail/em-mailer-prefs.c:326
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:310
 msgid "Header"
 msgstr "Cabeceira"
 
-#: ../modules/mail/em-mailer-prefs.c:330
+#: ../modules/mail/em-mailer-prefs.c:314
 msgid "Contains Value"
 msgstr "ContÃ©n o valor"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:723 ../modules/mail/em-mailer-prefs.c:794
+#: ../modules/mail/em-mailer-prefs.c:707 ../modules/mail/em-mailer-prefs.c:778
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "O engadido %s estÃ¡ dispoÃ±Ãbel e o binario estÃ¡ instalado."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:803
+#: ../modules/mail/em-mailer-prefs.c:715 ../modules/mail/em-mailer-prefs.c:787
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "O engadido %s non estÃ¡ dispoÃ±Ãbel. Verifique se o paquete estÃ¡ instalado."
 
-#: ../modules/mail/em-mailer-prefs.c:767
+#: ../modules/mail/em-mailer-prefs.c:751
 msgid "No junk plugin available"
 msgstr "Non hai dispoÃ±Ãbel un engadido de correo non desexado"
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1152
-msgid "_Table column:"
-msgstr "Columna da tÃ¡boa:"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1143
 msgid "_Date header:"
 msgstr "Data da cabeceira:"
 
-#: ../modules/mail/em-mailer-prefs.c:1155
+#: ../modules/mail/em-mailer-prefs.c:1144
 msgid "Show _original header value"
 msgstr "Mostrar tamaÃ±o _orixinal"
 
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "Verificar se o Evolution Ã© o aplicativo de correo predefinido"
+
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+"Cada vez que se inicie o Evolution, verificar se Ã© ou non o cliente de "
+"correo predefinido."
+
+#: ../modules/mailto-handler/evolution-mailto-handler.c:140
+msgid "Do you want to make Evolution your default email client?"
+msgstr ""
+"Quere que Evolution sexa o seu cliente de correo electrÃ³nico predefinido?"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Ola Python"
@@ -16338,6 +16216,51 @@ msgstr "engadido de proba de Python"
 msgid "Test Plugin for Python EPlugin loader."
 msgstr "engadido de proba de Python para o cargador Python Eengadido."
 
+#: ../modules/startup-wizard/evolution-startup-wizard.c:275
+#: ../widgets/misc/e-import-assistant.c:396
+msgid "Please select the information that you would like to import:"
+msgstr "Seleccione a informaciÃ³n que quere importar:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:307
+#: ../widgets/misc/e-import-assistant.c:552
+#, c-format
+msgid "From %s:"
+msgstr "De: %s:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:318
+#: ../modules/startup-wizard/evolution-startup-wizard.c:415
+msgid "Importing Files"
+msgstr "Importando ficheiros"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:393
+msgid "Import cancelled. Click \"Forward\" to continue."
+msgstr "Cancelouse a importaciÃ³n. Prema Â«AdianteÂ» para continuar."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:411
+msgid "Import complete. Click \"Forward\" to continue."
+msgstr "A importaciÃ³n rematou. Prema Â«AdianteÂ» para continuar."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:471
+msgid "Evolution Setup Assistant"
+msgstr "Asistente de configuraciÃ³n do Evolution"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+msgid "Welcome"
+msgstr "Benvido/a"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:482
+msgid ""
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"Benvido/a a Evolution. As seguintes pantallas permitiranlle a Evolution "
+"conectarse Ã¡s sÃºas contas de correo e importar ficheiros desde outros "
+"aplicativos.\n"
+"\n"
+"Prema o botÃ³n \"Adiante\" para continuar. "
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
 msgstr "Engadir axendas de enderezos locais ao Evolution."
@@ -16354,16 +16277,8 @@ msgstr ""
 "Lista de pistas do engadido de aviso de anexos para buscar no corpo dunha "
 "mensaxe"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr ""
-"Lista de pistas do engadido de aviso de anexos para buscar no corpo dunha "
-"mensaxe."
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:451
+#: ../plugins/templates/templates.c:410
 msgid "Keywords"
 msgstr "Palabras chave"
 
@@ -16403,25 +16318,25 @@ msgstr "vCards en liÃ±a"
 msgid "Play audio attachments directly in mail messages."
 msgstr "Reproducir os anexos de audio directamente desde Evolution."
 
-#: ../plugins/backup-restore/backup-restore.c:152
+#: ../plugins/backup-restore/backup-restore.c:160
 msgid "Select name of the Evolution backup file"
 msgstr "Seleccione o nome do ficheiro de copia de seguranza do Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:191
 msgid "_Restart Evolution after backup"
 msgstr "_Reiniciar o Evolution despois de facer unha copia de seguranza"
 
-#: ../plugins/backup-restore/backup-restore.c:209
+#: ../plugins/backup-restore/backup-restore.c:217
 msgid "Select name of the Evolution backup file to restore"
 msgstr ""
 "Seleccione o nome do ficheiro de copia de seguranza do Evolution que quere "
 "restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:222
+#: ../plugins/backup-restore/backup-restore.c:230
 msgid "_Restart Evolution after restore"
 msgstr "_Reiniciar o Evolution despois de restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:290
+#: ../plugins/backup-restore/backup-restore.c:298
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -16431,36 +16346,36 @@ msgstr ""
 "pode restaurar todos os correos, calendarios, tarefas, notas e contactos. \n"
 "TamÃ©n restaurarÃ¡ todas as configuraciÃ³ns persoais, filtros de correo etc."
 
-#: ../plugins/backup-restore/backup-restore.c:297
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restaurar o Evolution desde o ficheiro de copia de seguranza"
 
-#: ../plugins/backup-restore/backup-restore.c:304
+#: ../plugins/backup-restore/backup-restore.c:312
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Seleccione o arquivo do Evolution para restaurar:"
 
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:315
 msgid "Choose a file to restore"
 msgstr "Escolla un ficheiro para restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:323
 msgid "Restore from backup"
 msgstr "Restaurar desde unha copia de seguranza"
 
-#: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
-msgstr "_ConfiguraciÃ³ns de copia de seguranza..."
+#: ../plugins/backup-restore/backup-restore.c:361
+msgid "_Backup Evolution Settings..."
+msgstr "_Respaldar axustes de Evolutionâ?¦"
 
-#: ../plugins/backup-restore/backup-restore.c:355
+#: ../plugins/backup-restore/backup-restore.c:363
 msgid "Backup Evolution data and settings to an archive file"
 msgstr ""
 "Facer copia de seguranza e restaurar os datos e a configuraciÃ³n do Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
-msgstr "ConfiguraciÃ³ns de r_estauraciÃ³n..."
+#: ../plugins/backup-restore/backup-restore.c:368
+msgid "R_estore Evolution Settings..."
+msgstr "R_estaurar axustes de Evolutionâ?¦"
 
-#: ../plugins/backup-restore/backup-restore.c:362
+#: ../plugins/backup-restore/backup-restore.c:370
 msgid "Restore Evolution data and settings from an archive file"
 msgstr ""
 "Facer copia de seguranza e restaurar os datos e a configuraciÃ³n do Evolution"
@@ -16512,8 +16427,8 @@ msgid "Restarting Evolution"
 msgstr "Reiniciando o Evolution"
 
 #: ../plugins/backup-restore/backup.c:255
-msgid "Backup current Evolution data"
-msgstr "Facendo unha copia dos datos actuais do Evolution"
+msgid "Back up current Evolution data"
+msgstr "Facer unha copia de seguridade dos datos de Evolution"
 
 #: ../plugins/backup-restore/backup.c:260
 msgid "Extracting files from backup"
@@ -16542,33 +16457,33 @@ msgid "Restoring from the folder %s"
 msgstr "Restaurando desde o cartafol %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Backup"
 msgstr "Copia de seguranza do Evolution"
 
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Restore"
 msgstr "RestauraciÃ³n do Evolution"
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:496
 msgid "Backing up Evolution Data"
 msgstr "Facendo unha copia de seguranza dos datos do Evolution"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:497
 msgid "Please wait while Evolution is backing up your data."
 msgstr ""
 "Agarde mentres o Evolution estÃ¡ facendo unha copia de seguranza dos seus "
 "datos."
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:499
 msgid "Restoring Evolution Data"
 msgstr "Restaurando os datos do Evolution"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:500
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Agarde mentres o Evolution restaura os seus datos."
 
-#: ../plugins/backup-restore/backup.c:510
+#: ../plugins/backup-restore/backup.c:518
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Isto poderÃa levar algÃºn tempo, dependendo da cantidade de datos da sÃºa "
@@ -16596,81 +16511,83 @@ msgstr ""
 "seguranza seleccionado?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid ""
-"Evolution backup can start only when Evolution is not running. Please make "
-"sure that you save and close all your unsaved windows before proceeding.  If "
-"you want Evolution to restart automatically after backup, please enable the "
-"toggle button."
-msgstr ""
-"A copia de seguranza do Evolution sÃ³ pode comezar cando o Evolution non se "
-"estea executando. AsegÃºrese de que garda e pecha todas as xanelas non "
-"gardadas antes de proceder. Se quere que o Evolution se reinicie "
-"automaticamente despois da copia de seguranza, active o botÃ³n de estado."
+msgid "Close and Backup Evolution"
+msgstr "Pechar e facer copia de seguranza de Evolution"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Close and Restore Evolution"
+msgstr "Pechar e restaurar o Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Insufficient Permissions"
 msgstr "Permisos insuficientes"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Invalid Evolution backup file"
 msgstr "O ficheiro de copia de seguranza do Evolution non Ã© vÃ¡lido"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
 msgid "Please select a valid backup file to restore."
 msgstr "Seleccione un ficheiro de copia de seguranza vÃ¡lido para restaurar."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid "The selected folder is not writable."
 msgstr "O cartafol seleccionado non Ã© escribÃbel."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
 msgid ""
-"This will delete all your current Evolution data and settings and restore "
-"them from your backup. Evolution restore can start only when Evolution is "
-"not running. Please make sure that you close all your unsaved windows before "
-"you proceed. If you want Evolution to restart automatically restart after "
-"restore, please enable the toggle button."
+"To backup your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
 msgstr ""
+"Para facer unha copia de seguranza dos seus datos e configuraciÃ³ns primeiro "
+"debe pechar Evolution. AsegÃºrese que garda calquera dato sen gardar antes de "
+"proceder."
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
+msgid ""
+"To restore your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding. This will delete "
+"all your current Evolution data and settings and restore them from your "
+"backup."
+msgstr ""
+"Para restaurar os seus datos e configuraciÃ³ns primeiro debe pechar "
+"Evolution. AsegÃºrese que garda calquera dato sen gardar antes de proceder. "
 "Isto eliminarÃ¡ todos os datos e configuraciÃ³ns actuais do Evolution e "
-"restauraraos desde a sua copia de seguranza. A restauraciÃ³n do Evolution sÃ³ "
-"pode comezar cando o Evolution non se estea executando. AsegÃºrese de que "
-"pecha todas as xanelas non gardadas antes de proceder. Se quere que o "
-"Evolution se reinicie automaticamente despois da restauraciÃ³n, active o "
-"botÃ³n de estado."
+"restauraraos desde a sÃºa copia de seguranza."
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contactos automÃ¡ticos"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
 msgid "Create _address book entries when sending mails"
 msgstr ""
 "Crear _automaticamente as entradas da axenda de enderezos ao enviar as "
 "mensaxes"
 
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr "Seleccione a axenda de enderezos para contactos automÃ¡ticos"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "Contactos de mensaxerÃa instantÃ¡nea"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
+#: ../plugins/bbdb/bbdb.c:745
+msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
-"Sincronizar a informaciÃ³n de contacto e as imaxes desde a lista de amigos do "
-"Pidgin"
+"_Sincronizar a informaciÃ³n e as imaxes de contactos desde a lista de amigos "
+"do Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Seleccione a axenda de enderezos para a lista de amigos do Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronizar coa lista de _amigos agora"
 
@@ -16692,28 +16609,28 @@ msgstr ""
 "correo electrÃ³nico ao responder as mensaxes. TamÃ©n enche a informaciÃ³n de "
 "contacto IM desde a sÃºa lista de amigos."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "Bogofilter non estÃ¡ dispoÃ±Ãbel. InstÃ¡leo primeiro."
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Produciuse un erro ao iniciar %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "O proceso fillo Bogofilter non responde; matÃ¡ndoo..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:189
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Interrompeuse a espera polo proceso fillo Bogofilter; terminando..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:212
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr ""
@@ -16747,17 +16664,17 @@ msgstr "OpciÃ³ns do Bogofilter"
 msgid "Filter junk messages using Bogofilter."
 msgstr "Filtra os correos non desexados usando o Bogofilter."
 
-#: ../plugins/caldav/caldav-browse-server.c:198
+#: ../plugins/caldav/caldav-browse-server.c:197
 msgid "Authentication failed. Server requires correct login."
 msgstr ""
 "Produciuse un fallo na autenticaciÃ³n. O servidor require un inicio de sesiÃ³n "
 "correcto."
 
-#: ../plugins/caldav/caldav-browse-server.c:200
+#: ../plugins/caldav/caldav-browse-server.c:199
 msgid "Given URL cannot be found."
 msgstr "Non Ã© posÃbel encontrar o URL fornecido."
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16766,36 +16683,31 @@ msgstr ""
 "O servidor devolveu datos non esperados.\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
-#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
-msgid "Unknown error"
-msgstr "Erro descoÃ±ecido"
-
-#: ../plugins/caldav/caldav-browse-server.c:334
-#: ../plugins/caldav/caldav-browse-server.c:585
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
 msgid "Failed to parse server response."
 msgstr "Produciuse un fallo ao actualizar delegados:"
 
-#: ../plugins/caldav/caldav-browse-server.c:428
+#: ../plugins/caldav/caldav-browse-server.c:427
 msgid "Events"
 msgstr "Finaliza"
 
-#: ../plugins/caldav/caldav-browse-server.c:450
+#: ../plugins/caldav/caldav-browse-server.c:449
 msgid "User's calendars"
 msgstr "Calendario novo"
 
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
 msgid "Failed to get server URL."
 msgstr "Produciuse un fallo ao autenticarse no servidor LDAP."
 
-#: ../plugins/caldav/caldav-browse-server.c:627
-#: ../plugins/caldav/caldav-browse-server.c:668
-#: ../plugins/caldav/caldav-browse-server.c:1272
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
+#: ../plugins/caldav/caldav-browse-server.c:1277
 msgid "Searching for user's calendars..."
 msgstr "Buscando os contactos..."
 
-#: ../plugins/caldav/caldav-browse-server.c:666
+#: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Could not find any user calendar."
 msgstr "Non Ã© posÃbel localizar ningÃºn calendario"
 
@@ -16809,67 +16721,63 @@ msgstr "Produciuse un fallo no intento anterior: %s"
 msgid "Previous attempt failed with code %d"
 msgstr "Produciuse un fallo no intento anterior co cÃ³digo %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:799
+#: ../plugins/caldav/caldav-browse-server.c:801
 #, c-format
-msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
-msgstr "Introduza o contrasinal para %s (usuario %s)"
+msgid "Enter password for user %s on server %s"
+msgstr "Introduza o contrasinal para %s no servidor %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:856
+#: ../plugins/caldav/caldav-browse-server.c:860
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
-msgstr "Non Ã© posÃbel crear a mensaxe para o URL '%s'"
+msgstr "Non Ã© posÃbel crear a mensaxe para o URL Â«%sÂ»"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1091
+#: ../plugins/caldav/caldav-browse-server.c:1095
 msgid "Searching folder content..."
 msgstr "Buscando nos contidos do cartafol..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1134
+#: ../plugins/caldav/caldav-browse-server.c:1138
 msgid "List of available calendars:"
 msgstr "Calendarios locais"
 
-#: ../plugins/caldav/caldav-browse-server.c:1171
+#: ../plugins/caldav/caldav-browse-server.c:1175
 msgid "Supports"
 msgstr "Compatibilidade con Hula"
 
-#: ../plugins/caldav/caldav-browse-server.c:1249
+#: ../plugins/caldav/caldav-browse-server.c:1254
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "Produciuse un fallo ao crear a canalizaciÃ³n: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1357
+#: ../plugins/caldav/caldav-browse-server.c:1362
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
-msgstr "O URL do servidor '%s' non Ã© un URL vÃ¡lido"
+msgstr "O URL do servidor Â«%sÂ» non Ã© un URL vÃ¡lido"
 
-#: ../plugins/caldav/caldav-browse-server.c:1363
+#: ../plugins/caldav/caldav-browse-server.c:1368
 msgid "Browse for a CalDAV calendar"
 msgstr "Explorar por un calendario CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:66
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../plugins/caldav/caldav-source.c:215
-#: ../plugins/calendar-http/calendar-http.c:92
+#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/calendar-http/calendar-http.c:100
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:219
-#: ../plugins/google-account-setup/google-contacts-source.c:305
+#: ../plugins/caldav/caldav-source.c:223
+#: ../plugins/google-account-setup/google-contacts-source.c:308
 msgid "Use _SSL"
 msgstr "Usar _SSL"
 
-#: ../plugins/caldav/caldav-source.c:228
+#: ../plugins/caldav/caldav-source.c:235
 msgid "Brows_e server for a calendar"
 msgstr "_Explorar o servidor por un calendario"
 
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-file/calendar-file.c:178
-#: ../plugins/calendar-http/calendar-http.c:111
-#: ../plugins/calendar-weather/calendar-weather.c:393
-#: ../plugins/google-account-setup/google-contacts-source.c:323
-#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/caldav/caldav-source.c:251
+#: ../plugins/calendar-file/calendar-file.c:191
+#: ../plugins/calendar-http/calendar-http.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:395
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:630
 msgid "Re_fresh:"
 msgstr "Actuali_zar:"
 
@@ -16881,31 +16789,31 @@ msgstr "Engade a compatibilidade de CalDAV con Evolution."
 msgid "CalDAV Support"
 msgstr "Compatibilidade de CalDAV"
 
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:125
 msgid "_Customize options"
 msgstr "Personalizar as op_ciÃ³ns"
 
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:144
 msgid "File _name:"
 msgstr "Nome do f_icheiro:"
 
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:148
 msgid "Choose calendar file"
 msgstr "Escoller ficheiro de calendario"
 
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:196
 msgid "On open"
 msgstr "Ao abrir"
 
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:197
 msgid "On file change"
 msgstr "Cambio de ficheiro"
 
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:198
 msgid "Periodically"
 msgstr "Periodicamente"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:213
 msgid "Force read _only"
 msgstr "Forzar s_Ã³ lectura"
 
@@ -16917,11 +16825,11 @@ msgstr "Engadir calendarios locais a Evolution."
 msgid "Local Calendars"
 msgstr "Calendarios locais"
 
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/calendar-http/calendar-http.c:134
 msgid "_Secure connection"
 msgstr "ConexiÃ³n _segura"
 
-#: ../plugins/calendar-http/calendar-http.c:186
+#: ../plugins/calendar-http/calendar-http.c:194
 msgid "Userna_me:"
 msgstr "No_me de usuario:"
 
@@ -16969,26 +16877,26 @@ msgstr "Tempo: noite despexada"
 msgid "Weather: Thunderstorms"
 msgstr "Tempo: treboadas"
 
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
 msgid "Select a location"
 msgstr "Seleccione unha localizaciÃ³n"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:448
 msgid "_Units:"
 msgstr "_Unidades:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:455
 msgid "Metric (Celsius, cm, etc)"
 msgstr "MÃ©trico (CentÃgrados, cm etc.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Non mÃ©trico (Fahrenheit, polgadas etc.)"
 
@@ -17018,47 +16926,43 @@ msgstr ""
 msgid "Map for contacts"
 msgstr "Sen contactos"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "Verificar se o Evolution Ã© o aplicativo de correo predefinido"
+#: ../plugins/dbx-import/dbx-importer.c:232
+msgid "Select folder to import OE folder into"
+msgstr "Seleccione un cartafol onde importar o cartafol de OE"
 
-#: ../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."
-msgstr ""
-"Cada vez que se inicie o Evolution, verificar se Ã© ou non o cliente de "
-"correo predefinido."
+#: ../plugins/dbx-import/dbx-importer.c:251
+msgid "Importing Outlook Express data"
+msgstr "Importando os datos do Outlook Express"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Check whether Evolution is the default mail client on startup."
-msgstr "Verificar se o Evolution Ã© o cliente de correo predefinido ao iniciar."
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
+msgid "Import Outlook Express messages from DBX file"
+msgstr "Importar as mensaxes do Outlook desde un ficheiro DBX"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client"
-msgstr "Cliente de correo predefinido"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
+msgid "Outlook DBX import"
+msgstr "Importar DBX do Outlook"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
-msgid "Do you want to make Evolution your default e-mail client?"
-msgstr ""
-"Quere que o Evolution sexa o seu cliente de correo electrÃ³nico predefinido?"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+msgid "Outlook Express 5/6 personal folders (.dbx)"
+msgstr "Cartafol persoal do Outlook Expres 5/6 (.dbx)"
 
-#: ../plugins/default-source/default-source.c:75
+#: ../plugins/default-source/default-source.c:83
 msgid "Mark as _default address book"
 msgstr "Marcar como a axenda de enderezos pre_determinada"
 
-#: ../plugins/default-source/default-source.c:88
+#: ../plugins/default-source/default-source.c:96
 msgid "A_utocomplete with this address book"
 msgstr "Mostrar o nome completado automaticamente cun enderezo"
 
-#: ../plugins/default-source/default-source.c:97
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default calendar"
 msgstr "Marcar como calendario pre_determinado"
 
-#: ../plugins/default-source/default-source.c:98
+#: ../plugins/default-source/default-source.c:106
 msgid "Mark as _default task list"
 msgstr "Marcar como a lista de tarefas pre_determinada"
 
-#: ../plugins/default-source/default-source.c:99
+#: ../plugins/default-source/default-source.c:107
 msgid "Mark as _default memo list"
 msgstr "Marcar como a lista de notas pre_determinada"
 
@@ -17098,7 +17002,7 @@ msgid "Protected"
 msgstr "Protexido"
 
 #: ../plugins/email-custom-header/email-custom-header.c:324
-#: ../widgets/misc/e-send-options.ui.h:16
+#: ../widgets/misc/e-send-options.ui.h:21
 msgid "Secret"
 msgstr "Secreto"
 
@@ -17113,12 +17017,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../plugins/email-custom-header/email-custom-header.c:569
+#: ../plugins/email-custom-header/email-custom-header.c:571
 msgid "_Custom Header"
 msgstr "Cabeceira p_ersonalizada"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:830
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -17128,12 +17032,12 @@ msgstr ""
 "Nome dos valores da chave para unha Cabeceira personalizada separados por \";"
 "\"."
 
-#: ../plugins/email-custom-header/email-custom-header.c:948
+#: ../plugins/email-custom-header/email-custom-header.c:884
 msgid "Key"
 msgstr "Chave"
 
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/email-custom-header/email-custom-header.c:900
+#: ../plugins/templates/templates.c:416
 msgid "Values"
 msgstr "Valores"
 
@@ -17156,7 +17060,7 @@ msgstr ""
 "Lanza automaticamente o editor ao presionar unha tecla no editor de correo"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:126
 msgid "Automatically launch when a new mail is edited"
 msgstr "Lanzar automaticamente cando se edite un novo correo"
 
@@ -17168,11 +17072,11 @@ msgstr "Editor externo predefinido"
 msgid "The default command that must be used as the editor."
 msgstr "A orde predefinida que se debe usar como o editor."
 
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:115
 msgid "Command to be executed to launch the editor: "
 msgstr "A orde que se executarÃ¡ para iniciar o editor: "
 
-#: ../plugins/external-editor/external-editor.c:109
+#: ../plugins/external-editor/external-editor.c:116
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -17180,8 +17084,8 @@ msgstr ""
 "Para o Emacs use \"xemacs\"\n"
 "Para o VI use \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#: ../plugins/external-editor/external-editor.c:382
+#: ../plugins/external-editor/external-editor.c:384
 msgid "Compose in External Editor"
 msgstr "CompoÃ±er no editor externo"
 
@@ -17192,7 +17096,7 @@ msgstr "Editor externo"
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
 msgid "Use an external editor to compose plain-text mail messages."
 msgstr ""
-"Empregar un editor externo para crear mensaxes de correo en texto plano."
+"Empregar un editor externo para crear mensaxes de correo en texto simple."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
@@ -17259,7 +17163,7 @@ msgstr "_Inserir a imaxe de cara predefinida"
 msgid "Load new _Face picture"
 msgstr "Caragar a imaxe da nova _cara"
 
-#: ../plugins/face/face.c:415
+#: ../plugins/face/face.c:422
 msgid "Include _Face"
 msgstr "I_ncluÃr fÃos"
 
@@ -17291,24 +17195,19 @@ msgstr "Non foi posÃbel enviar o elemento!"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "O ficheiro que seleccionou non semella ser unha imaxe .png. Erro: {0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:82
-msgid "Google"
-msgstr "Google"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:273
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
-msgid "<b>Server</b>"
-msgstr "<b>Servidor</b>"
+#: ../plugins/google-account-setup/google-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+msgid "Server"
+msgstr "Servidor"
 
-#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/google-account-setup/google-source.c:437
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "Introduza o contrasinal para que o usuario %s acceda aos calendarios "
 "subscritos."
 
-#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/google-account-setup/google-source.c:548
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17317,19 +17216,19 @@ msgstr ""
 "Non Ã© posÃbel ler datos desde o servidor do Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:727
-#: ../plugins/mail-to-task/mail-to-task.c:943
+#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:737
+#: ../plugins/mail-to-task/mail-to-task.c:953
 msgid "Unknown error."
 msgstr "Erro descoÃ±ecido."
 
-#: ../plugins/google-account-setup/google-source.c:631
+#: ../plugins/google-account-setup/google-source.c:634
 msgid "Cal_endar:"
 msgstr "Cal_endario:"
 
-#: ../plugins/google-account-setup/google-source.c:666
-msgid "Retrieve _list"
-msgstr "Obter _lista"
+#: ../plugins/google-account-setup/google-source.c:669
+msgid "Retrieve _List"
+msgstr "Obter a _lista"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "Add Google Calendars to Evolution."
@@ -17339,7 +17238,7 @@ msgstr "Engadir calendario de Google a Evolution."
 msgid "Google Calendars"
 msgstr "Calendarios de Google"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "Lista de verificaciÃ³n"
 
@@ -17371,12 +17270,12 @@ msgstr "Aceptar provisionalmente"
 msgid "Rese_nd Meeting..."
 msgstr "Ree_nviar cita..."
 
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:342
 msgid "Create folder"
 msgstr "Crear cartafol"
 
-#: ../plugins/groupwise-features/install-shared.c:227
+#: ../plugins/groupwise-features/install-shared.c:217
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17390,9 +17289,9 @@ msgid ""
 "Click 'Apply' to install the shared folder\n"
 "\n"
 msgstr ""
-"O usuario '%s' compartiu un cartafol con vostede\n"
+"O usuario Â«%sÂ» compartiu un cartafol con vostede\n"
 "\n"
-"Mensaxe de '%s'\n"
+"Mensaxe de Â«%sÂ»\n"
 "\n"
 "\n"
 "%s\n"
@@ -17401,19 +17300,19 @@ msgstr ""
 "Prema en 'adiante' para instalar o cartafol compartido\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:239
+#: ../plugins/groupwise-features/install-shared.c:229
 msgid "Install the shared folder"
 msgstr "Instalar o cartafol compartido"
 
-#: ../plugins/groupwise-features/install-shared.c:243
+#: ../plugins/groupwise-features/install-shared.c:233
 msgid "Shared Folder Installation"
 msgstr "InstalaciÃ³n de cartafol compartido"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "ConfiguraciÃ³n de correo non desexado"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
 #: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "ConfiguraciÃ³n de correo non desexado"
@@ -17426,11 +17325,6 @@ msgstr "Correo electrÃ³nico:"
 msgid "Junk List:"
 msgstr "Lista de correo non dese_xado"
 
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:596
-msgid "_Disable"
-msgstr "_Desactivar"
-
 #: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "_Activar"
@@ -17449,7 +17343,7 @@ msgstr "E_liminar"
 msgid "Message Retract"
 msgstr "Retirada de mensaxe"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
+#: ../plugins/groupwise-features/mail-retract.c:90
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
@@ -17457,7 +17351,7 @@ msgstr ""
 "Ao retirar unha mensaxe pode eliminala da caixa de correo do destinatario. "
 "EstÃ¡ seguro de que quere facer isto?"
 
-#: ../plugins/groupwise-features/mail-retract.c:107
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr "Mensaxe anulada con Ã©xito"
 
@@ -17582,25 +17476,25 @@ msgid "Would you like to decline it?"
 msgstr "Quere esquecela?"
 
 #: ../plugins/groupwise-features/properties.ui.h:1
-msgid "<b>Users:</b>"
-msgstr "<b>Usuarios:</b>"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "Personali_zar a mensaxe de notificaciÃ³n"
 
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "Con_tacts..."
 msgstr "Con_tactos..."
 
-#: ../plugins/groupwise-features/properties.ui.h:6
+#: ../plugins/groupwise-features/properties.ui.h:5
 msgid "Shared Folder Notification"
 msgstr "NotificaciÃ³n de cartafol compartido"
 
-#: ../plugins/groupwise-features/properties.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:7
 msgid "The participants will receive the following notification.\n"
 msgstr "Os participantes recibirÃ¡n a seguinte notificaciÃ³n.\n"
 
+#: ../plugins/groupwise-features/properties.ui.h:9
+msgid "Users:"
+msgstr "Usuarios:"
+
 #: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "_Non compartido"
@@ -17658,51 +17552,58 @@ msgid "Proxy"
 msgstr "Proxy"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>Nome da conta</b>"
+#: ../widgets/misc/e-account-tree-view.c:230
+msgid "Account Name"
+msgstr "Nome da conta"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "Iniciar sesiÃ³n no proxy"
 
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s Introduza o seu contrasinal para %s (usuario %s)"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "O separador do proxy estarÃ¡ dispoÃ±Ãbel sÃ³ cando a conta estea en liÃ±a."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "O separador do proxy estarÃ¡ dispoÃ±Ãbel sÃ³ cando a conta estea activada."
 
-#: ../plugins/groupwise-features/proxy.c:931
-#: ../plugins/groupwise-features/share-folder.c:701
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:700
+msgctxt "GW"
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../plugins/groupwise-features/proxy.c:926
+#: ../plugins/groupwise-features/share-folder.c:691
 msgid "Add User"
 msgstr "Engadir usuario"
 
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:214
 msgid "Advanced send options"
 msgstr "OpciÃ³ns de envÃo avanzadas"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
-#: ../plugins/groupwise-features/share-folder.c:736
+#: ../plugins/groupwise-features/share-folder-common.c:310
+#: ../plugins/groupwise-features/share-folder.c:726
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:311
 msgid "Enter the users and set permissions"
 msgstr "Introduza os usuarios e defina os permisos"
 
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:407
 msgid "Sharing"
 msgstr "Compartir"
 
@@ -17710,67 +17611,63 @@ msgstr "Compartir"
 msgid "Custom Notification"
 msgstr "NotificaciÃ³n personalizada"
 
-#: ../plugins/groupwise-features/share-folder.c:741
+#: ../plugins/groupwise-features/share-folder.c:731
 msgid "Add   "
 msgstr "Engadir   "
 
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/share-folder.c:737
+msgid "Modify"
+msgstr "Modificar"
+
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "Estado da mensaxe"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "De:"
 
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "Data de creaciÃ³n:"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:206
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:213
 msgid "Delivered: "
 msgstr "Entregada: "
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Opened: "
 msgstr "Aberta: "
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Accepted: "
 msgstr "Aceptada: "
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:229
 msgid "Deleted: "
 msgstr "Eliminada: "
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:234
 msgid "Declined: "
 msgstr "Rexeitada: "
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:239
 msgid "Completed: "
 msgstr "Terminada: "
 
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:244
 msgid "Undelivered: "
 msgstr "Sen entregar: "
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr "Engade a compatibilidade de Hula con Evolution."
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "Compatibilidade con Hula"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "vCards en liÃ±a"
@@ -17779,12 +17676,12 @@ msgstr "vCards en liÃ±a"
 msgid "View image attachments directly in mail messages."
 msgstr "Mostrar vCards directamente nas mensaxes de correo."
 
-#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.c:330
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "Cabeceiras personalizadas"
 
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:343
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "Cabeceiras IMAP"
@@ -17817,7 +17714,7 @@ msgid ""
 "Use this if you do not have filters based on mailing lists"
 msgstr ""
 "Cabeceiras _bÃ¡sicas - (o mÃ¡is rÃ¡pido) \n"
-"Use isto se non ten filtros baseados en listas de correo"
+"Use isto se non ten filtros baseados en roldas de correo"
 
 #: ../plugins/imap-features/imap-headers.ui.h:10
 msgid "_Fetch All Headers"
@@ -17831,34 +17728,36 @@ msgstr "Axuste os detalles das sÃºas contas IMAP."
 msgid "IMAP Features"
 msgstr "CaracterÃsticas IMAP"
 
-#: ../plugins/itip-formatter/itip-formatter.c:486
+#. Translators: The first '%s' is replaced with a calendar name,
+#. the second '%s' with an error message
+#: ../plugins/itip-formatter/itip-formatter.c:485
 #, c-format
-msgid "Failed to load the calendar '%s'"
-msgstr "Produciuse un fallo ao cargar o calendario '%s'"
+msgid "Failed to load the calendar '%s' (%s)"
+msgstr "Produciuse un fallo ao cargar o calendario Â«%sÂ» (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:649
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
-msgstr "Unha cita no calendario '%s' entra en conflito con esta cita"
+msgstr "Unha cita no calendario Â«%sÂ» entra en conflito con esta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:688
+#: ../plugins/itip-formatter/itip-formatter.c:685
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
-msgstr "Localizouse a cita no calendario '%s'"
+msgstr "Localizouse a cita no calendario Â«%sÂ»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:784
 msgid "Unable to find any calendars"
 msgstr "Non Ã© posÃbel localizar ningÃºn calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:791
 msgid "Unable to find this meeting in any calendar"
 msgstr "Non Ã© posÃbel localizar esta cita en ningÃºn calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:798
+#: ../plugins/itip-formatter/itip-formatter.c:795
 msgid "Unable to find this task in any task list"
 msgstr "Non Ã© posÃbel localizar esta tarefa en ningunha lista de tarefas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:799
 msgid "Unable to find this memo in any memo list"
 msgstr "Non Ã© posÃbel localizar esta nota en ningunha lista de notas"
 
@@ -17877,27 +17776,27 @@ msgstr "Non Ã© posÃbel analizar o elemento"
 #: ../plugins/itip-formatter/itip-formatter.c:1144
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
-msgstr "Non Ã© posÃbel enviar o elemento ao calendario '%s'. %s"
+msgstr "Non Ã© posÃbel enviar o elemento ao calendario Â«%sÂ». %s"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1156
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
-msgstr "Enviado ao calendario '%s' como aceptado"
+msgstr "Enviado ao calendario Â«%sÂ» como aceptado"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1160
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
-msgstr "Enviado ao calendario '%s' como provisional"
+msgstr "Enviado ao calendario Â«%sÂ» como provisional"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1165
 #, c-format
 msgid "Sent to calendar '%s' as declined"
-msgstr "Enviado ao calendario '%s' como rexeitado"
+msgstr "Enviado ao calendario Â«%sÂ» como rexeitado"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1170
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
-msgstr "Enviado ao calendario '%s' como cancelado"
+msgstr "Enviado ao calendario Â«%sÂ» como cancelado"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1264
 #, c-format
@@ -17960,13 +17859,13 @@ msgstr "Calendarios"
 msgid "Save Calendar"
 msgstr "Calendario novo"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1597
 msgid "The calendar attached is not valid"
 msgstr "O calendario anexo non Ã© vÃ¡lido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
-#: ../plugins/itip-formatter/itip-formatter.c:1599
+#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17974,15 +17873,15 @@ msgstr ""
 "A mensaxe di que contÃ©n un calendario mais o calendario non Ã© un iCalendar "
 "vÃ¡lido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1638
+#: ../plugins/itip-formatter/itip-formatter.c:1666
+#: ../plugins/itip-formatter/itip-formatter.c:1775
 msgid "The item in the calendar is not valid"
 msgstr "O elemento no calendario non Ã© vÃ¡lido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1640
-#: ../plugins/itip-formatter/itip-formatter.c:1668
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1639
+#: ../plugins/itip-formatter/itip-formatter.c:1667
+#: ../plugins/itip-formatter/itip-formatter.c:1776
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17990,11 +17889,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:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1680
 msgid "The calendar attached contains multiple items"
 msgstr "O calendario anexo contÃ©n mÃºltiples elementos"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1682
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18002,514 +17901,506 @@ msgstr ""
 "Para procesar todos estes elementos, deberÃa gardarse o ficheiro e "
 "importarse o calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2454
 msgid "This meeting recurs"
 msgstr "Esta cita repÃtese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2457
 msgid "This task recurs"
 msgstr "Esta tarefa repÃtese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2460
 msgid "This memo recurs"
 msgstr "Esta nota repÃtese"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2683
+#: ../plugins/itip-formatter/itip-formatter.c:2694
 msgid "_Delete message after acting"
 msgstr "E_liminar a mensaxe despois de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2693
-#: ../plugins/itip-formatter/itip-formatter.c:2726
+#: ../plugins/itip-formatter/itip-formatter.c:2704
+#: ../plugins/itip-formatter/itip-formatter.c:2737
 msgid "Conflict Search"
 msgstr "Buscar conflito"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2708
+#: ../plugins/itip-formatter/itip-formatter.c:2719
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione os calendarios nos que buscar conflitos entre reuniÃ³ns"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Hoxe Ã¡s %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
 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:213
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Hoxe Ã¡s %l:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "MaÃ±Ã¡ Ã¡s %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
 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:237
+#: ../plugins/itip-formatter/itip-view.c:233
 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:241
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "MaÃ±Ã¡ Ã¡s %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
 #, 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:265
+#: ../plugins/itip-formatter/itip-view.c:261
 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:269
+#: ../plugins/itip-formatter/itip-view.c:265
 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:274
+#: ../plugins/itip-formatter/itip-view.c:270
 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:278
+#: ../plugins/itip-formatter/itip-view.c:274
 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:287
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %e de %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:289
 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:297
+#: ../plugins/itip-formatter/itip-view.c:293
 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:302
+#: ../plugins/itip-formatter/itip-view.c:298
 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:306
+#: ../plugins/itip-formatter/itip-view.c:302
 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:312
+#: ../plugins/itip-formatter/itip-view.c:308
 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:317
+#: ../plugins/itip-formatter/itip-view.c:313
 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:321
+#: ../plugins/itip-formatter/itip-view.c:317
 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:326
+#: ../plugins/itip-formatter/itip-view.c:322
 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:330
+#: ../plugins/itip-formatter/itip-view.c:326
 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:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
-msgid "Please respond on behalf of <b>%s</b>"
-msgstr "Responda de parte de <b>%s</b>"
-
-#: ../plugins/itip-formatter/itip-view.c:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
-#, c-format
-msgid "Received on behalf of <b>%s</b>"
-msgstr "Recibido de parte de <b>%s</b>"
-
-#: ../plugins/itip-formatter/itip-view.c:362
-#, c-format
-msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr "<b>%s</b> publicou a seguinte informaciÃ³n de cita a travÃ©s de %s:"
-
-#: ../plugins/itip-formatter/itip-view.c:364
-#, c-format
-msgid "<b>%s</b> has published the following meeting information:"
-msgstr "<b>%s</b> publicou a seguinte informaciÃ³n de cita:"
+msgid "Please respond on behalf of %s"
+msgstr "Responda de parte de %s"
 
 #: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
-msgid "<b>%s</b> has delegated the following meeting to you:"
-msgstr "<b>%s</b> delegoulle a cita seguinte:"
-
-#: ../plugins/itip-formatter/itip-view.c:372
-#, 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 cita a travÃ©s de %s:"
+msgid "Received on behalf of %s"
+msgstr "Recibido de parte de %s"
 
 #: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
-msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr "<b>%s</b> require a sÃºa presenza na seguinte cita:"
+msgid "%s through %s has published the following meeting information:"
+msgstr "%s publicou a seguinte informaciÃ³n de cita a travÃ©s de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr "<b>%s</b> quere apuntarse a unha cita existente a travÃ©s de %s:"
+msgid "%s has published the following meeting information:"
+msgstr "%s publicou a seguinte informaciÃ³n de cita:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr "<b>%s</b> quere apuntarse a unha cita existente:"
+msgid "%s has delegated the following meeting to you:"
+msgstr "%s delegoulle a cita seguinte:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
-msgstr ""
-"<b>%s</b> a travÃ©s de %s quere recibir a Ãºltima informaciÃ³n para a prÃ³xima "
-"cita:"
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "%s require a sÃºa presenza na seguinte cita a travÃ©s de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
-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 cita:"
+msgid "%s requests your presence at the following meeting:"
+msgstr "%s require a sÃºa presenza na seguinte cita:"
 
 #: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
-msgid "<b>%s</b> through %s has sent back the following meeting response:"
-msgstr "<b>%s</b> a travÃ©s de %s devolveu a seguinte resposta Ã¡ cita:"
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "%s quere apuntarse a unha cita existente a travÃ©s de %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
-msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr "<b>%s</b> devolveu a seguinte resposta Ã¡ cita:"
+msgid "%s wishes to add to an existing meeting:"
+msgstr "%s quere apuntarse a unha cita existente:"
 
 #: ../plugins/itip-formatter/itip-view.c:398
 #, 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 cita:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr ""
+"%s a travÃ©s de %s quere recibir a Ãºltima informaciÃ³n para a prÃ³xima cita:"
 
 #: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
-msgid "<b>%s</b> has canceled the following meeting."
-msgstr "<b>%s</b> cancelou a cita seguinte."
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr "%s quere recibir a Ãºltima informaciÃ³n da seguinte cita:"
 
 #: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following meeting changes."
-msgstr ""
-"<b>%s</b> a travÃ©s de %s propuxo as seguintes modificaciÃ³ns para a cita."
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "%s a travÃ©s de %s devolveu a seguinte resposta Ã¡ cita:"
 
 #: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
-msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b> propuxo as seguintes modificaciÃ³ns para a cita."
+msgid "%s has sent back the following meeting response:"
+msgstr "%s devolveu a seguinte resposta Ã¡ cita:"
 
 #: ../plugins/itip-formatter/itip-view.c:410
 #, 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 cita a travÃ©s de %s:"
+msgid "%s through %s has canceled the following meeting:"
+msgstr "%s a travÃ©s de %s cancelou a seguinte cita:"
 
 #: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
-msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b> rexeitou as seguintes modificaciÃ³ns para a cita."
+msgid "%s has canceled the following meeting."
+msgstr "%s cancelou a cita seguinte."
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:416
 #, 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:"
+msgid "%s through %s has proposed the following meeting changes."
+msgstr "%s a travÃ©s de %s propuxo as seguintes modificaciÃ³ns para a cita."
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:418
 #, c-format
-msgid "<b>%s</b> has published the following task:"
-msgstr "<b>%s</b> publicou a tarefa seguinte:"
+msgid "%s has proposed the following meeting changes."
+msgstr "%s propuxo as seguintes modificaciÃ³ns para a cita."
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:422
 #, 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:"
+msgid "%s through %s has declined the following meeting changes:"
+msgstr "%s rexeitou as seguintes modificaciÃ³ns para a cita a travÃ©s de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:460
+#: ../plugins/itip-formatter/itip-view.c:424
 #, 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:"
+msgid "%s has declined the following meeting changes."
+msgstr "%s rexeitou as seguintes modificaciÃ³ns para a cita."
 
 #: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
-msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> asignoulle unha tarefa:"
+msgid "%s through %s has published the following task:"
+msgstr "%s publicou a seguinte tarefa a travÃ©s de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:464
 #, 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:"
+msgid "%s has published the following task:"
+msgstr "%s publicou a tarefa seguinte:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b> quere engadirse a unha tarefa existente:"
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "%s require a asignaciÃ³n de %s para a seguinte tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
-msgstr ""
-"<b>%s</b> a travÃ©s de %s quere recibir a Ãºltima informaciÃ³n para a seguinte "
-"tarefa asignada:"
+msgid "%s through %s has assigned you a task:"
+msgstr "%s a travÃ©s de %s asignoulle unha tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:474
 #, 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:"
+msgid "%s has assigned you a task:"
+msgstr "%s asignoulle unha tarefa:"
 
 #: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr ""
-"<b>%s</b> a travÃ©s de %s devolveu a seguinte resposta para a seguinte tarefa "
-"asignada:"
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "%s a travÃ©s de %s quere engadirse a unha tarefa existente:"
 
 #: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
-msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr "<b>%s</b> devolveu a seguinte resposta Ã¡ tarefa asignada:"
+msgid "%s wishes to add to an existing task:"
+msgstr "%s quere engadirse a unha tarefa existente:"
 
 #: ../plugins/itip-formatter/itip-view.c:486
 #, 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:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
+msgstr ""
+"%s a travÃ©s de %s quere recibir a Ãºltima informaciÃ³n para a seguinte tarefa "
+"asignada:"
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-msgid "<b>%s</b> has canceled the following assigned task:"
-msgstr "<b>%s</b> cancelou a seguinte tarefa asignada:"
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr "%s quere recibir a Ãºltima informaciÃ³n para a seguinte tarefa asignada:"
 
 #: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid "%s through %s has sent back the following assigned task response:"
 msgstr ""
-"<b>%s</b> a travÃ©s de %s propuxo as seguintes modificaciÃ³ns na asignaciÃ³n de "
-"tarefas:"
+"%s a travÃ©s de %s devolveu a seguinte resposta para a seguinte tarefa "
+"asignada:"
 
 #: ../plugins/itip-formatter/itip-view.c:494
 #, 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:"
+msgid "%s has sent back the following assigned task response:"
+msgstr "%s devolveu a seguinte resposta Ã¡ tarefa asignada:"
 
 #: ../plugins/itip-formatter/itip-view.c:498
 #, 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:"
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "%s a travÃ©s de %s cancelou a seguinte tarefa asignada:"
 
 #: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
-msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b> rexeitou a seguinte tarefa asignada:"
+msgid "%s has canceled the following assigned task:"
+msgstr "%s cancelou a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:504
 #, 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:"
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr ""
+"%s a travÃ©s de %s propuxo as seguintes modificaciÃ³ns na asignaciÃ³n de "
+"tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:506
 #, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> publicou a seguinte nota:"
+msgid "%s has proposed the following task assignment changes:"
+msgstr "%s propuxo as seguintes modificaciÃ³ns na asignaciÃ³n de tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:510
+#, c-format
+msgid "%s through %s has declined the following assigned task:"
+msgstr "%s rexeitou a seguinte tarefa asignada a travÃ©s de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:512
+#, c-format
+msgid "%s has declined the following assigned task:"
+msgstr "%s rexeitou a seguinte tarefa asignada:"
+
+#: ../plugins/itip-formatter/itip-view.c:549
+#, c-format
+msgid "%s through %s has published the following memo:"
+msgstr "%s publicou a seguinte nota a travÃ©s de %s:"
+
+#: ../plugins/itip-formatter/itip-view.c:551
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
-msgstr "<b>%s</b> quere sumarse a unha cita existente a travÃ©s de %s:"
+msgid "%s has published the following memo:"
+msgstr "%s publicou a seguinte nota:"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../plugins/itip-formatter/itip-view.c:556
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b> quere sumarse a unha nota existente:"
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "%s quere sumarse a unha cita existente a travÃ©s de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:558
 #, 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:"
+msgid "%s wishes to add to an existing memo:"
+msgstr "%s quere sumarse a unha nota existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:552
+#: ../plugins/itip-formatter/itip-view.c:562
 #, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "<b>%s</b> cancelou a seguinte nota compartida:"
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "%s a travÃ©s de %s cancelou a seguinte nota compartida:"
 
-#: ../plugins/itip-formatter/itip-view.c:676
+#: ../plugins/itip-formatter/itip-view.c:564
+#, c-format
+msgid "%s has canceled the following shared memo:"
+msgstr "%s cancelou a seguinte nota compartida:"
+
+#: ../plugins/itip-formatter/itip-view.c:688
 msgid "All day:"
 msgstr "Todo o dÃa:"
 
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:698
 msgid "Start day:"
 msgstr "Data de _comezo:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1053
 msgid "Start time:"
 msgstr "Hora de comezo:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:710
 msgid "End day:"
 msgstr "%d dÃa"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:1064
 msgid "End time:"
 msgstr "Hora de finalizaciÃ³n:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Open Calendar"
 msgstr "_Abrir calendario"
 
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:881
 msgid "_Decline"
 msgstr "_Rexeitar"
 
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
 #: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
-msgid "_Accept"
-msgstr "_Aceptar"
-
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:883
+msgid "A_ccept"
+msgstr "A_ceptar"
+
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Decline all"
 msgstr "_Rexeitar todo"
 
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Tentative all"
 msgstr "Facer _provisional todo"
 
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "_Tentative"
 msgstr "_Provisional"
 
-#: ../plugins/itip-formatter/itip-view.c:843
-msgid "_Accept all"
+#: ../plugins/itip-formatter/itip-view.c:855
+msgid "A_ccept all"
 msgstr "_Aceptar todo"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Send Information"
 msgstr "_Enviar informaciÃ³n"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Update Attendee Status"
 msgstr "Act_ualizar o estado do participante"
 
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:873
 msgid "_Update"
 msgstr "Act_ualizar"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1084
+#: ../plugins/itip-formatter/itip-view.c:1138
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1123
 msgid "Send _reply to sender"
 msgstr "_Responder ao remitente"
 
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1153
 msgid "Send _updates to attendees"
 msgstr "Mandar as act_ualizaciÃ³ns aos participantes"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Apply to all instances"
 msgstr "_Aplicar en todos os casos"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "Show time as _free"
 msgstr "Mostrar a hora como _libre"
 
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1174
 msgid "_Preserve my reminder"
 msgstr "_Preservar o meu aviso"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "_Inherit reminder"
 msgstr "_Herdar o aviso"
 
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Tasks:"
 msgstr "_Tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1925
 msgid "_Memos:"
 msgstr "_Notas:"
 
@@ -18522,17 +18413,15 @@ msgid "Itip Formatter"
 msgstr "Formatador iTip"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr ""
 "&quot;{0}&quot; delegou a cita. Quere engadir o delegado &quot;{1}&quot;?"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
 msgstr "Esta cita foi delegada"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
@@ -18544,22 +18433,18 @@ msgid "Beep or play sound file."
 msgstr "Emitir un ton de aviso ou reproducir un ficheiro de son."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Blink icon in notification area."
-msgstr "Volver intermitente a icona da Ã¡rea de notificaciÃ³n."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable D-Bus messages."
 msgstr "Activar as mensaxes D-Bus."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "Activar a icona da Ã¡rea de notificaciÃ³n."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Xera unha mensaxe D-Bus cando chegan mensaxes novas."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
@@ -18567,72 +18452,67 @@ msgstr ""
 "Se Ã© \"true\", entÃ³n emitir un ton de aviso, en caso contrario, reproducir "
 "un ficheiro de son cando cheguen mensaxes novas."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 msgid "Notify new messages for Inbox only."
 msgstr "Notificar as mensaxes novas sÃ³ para a caixa de entrada."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Play sound when new messages arrive."
 msgstr "Reproducir un son cando cheguen mensaxes novas."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr ""
 "O ficheiro de son que quere reproducir cando chegue unha mensaxe nova, se "
 "non estÃ¡ no modo de ton de aviso."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Popup message together with the icon."
 msgstr "Facer emerxer a mensaxe xunto coa icona."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr ""
 "Mostrar a icona de mensaxe nova na Ã¡rea de notificaciÃ³n cando cheguen "
 "mensaxes novas."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
 msgstr "Nome do ficheiro de son que quere reproducir."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr ""
 "O ficheiro de son que quere reproducir cando chegue unha mensaxe nova, se "
 "non estÃ¡ no modo de ton de aviso."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Use sound theme"
 msgstr "Usar tema de sons"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Whether play sound or beep when new messages arrive."
 msgstr ""
 "Se emitir ou non un son ou un ton de aviso cando cheguen mensaxes novas."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether show message over the icon when new messages arrive."
 msgstr ""
 "Se mostrar ou non a mensaxe sobre a icona cando cheguen mensaxes novas."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
-msgid "Whether the icon should blink or not."
-msgstr "Se a icona se deberÃa volver intermitente ou non."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Se notificar as mensaxes sÃ³ na caixa de entrada ou non."
 
-#: ../plugins/mail-notification/mail-notification.c:344
+#: ../plugins/mail-notification/mail-notification.c:352
 msgid "Evolution's Mail Notification"
 msgstr "NotificaciÃ³n de correo do Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:374
 msgid "Mail Notification Properties"
 msgstr "Propiedades da notificaciÃ³n de correo"
 
-#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#: ../plugins/mail-notification/mail-notification.c:507
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18647,69 +18527,66 @@ msgstr[1] ""
 "Recibiu %d mensaxes novas\n"
 "en %s."
 
-#. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:506
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:519
 #, c-format
 msgid "From: %s"
 msgstr "De: %s:"
 
-#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:518
+#. Translators: "Subject:" is preceding a new mail
+#. * subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:532
 #, c-format
 msgid "Subject: %s"
 msgstr "Asunto: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:542
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Recibiu %d mensaxe nova."
 msgstr[1] "Recibiu %d mensaxes novas."
 
-#: ../plugins/mail-notification/mail-notification.c:547
-#: ../plugins/mail-notification/mail-notification.c:552
+#: ../plugins/mail-notification/mail-notification.c:559
+#: ../plugins/mail-notification/mail-notification.c:566
 msgid "New email"
 msgstr "Novo correo"
 
-#: ../plugins/mail-notification/mail-notification.c:606
+#: ../plugins/mail-notification/mail-notification.c:627
 msgid "Show icon in _notification area"
 msgstr "Mostrar a icona na Ã¡rea de _notificaciÃ³n"
 
-# (pofilter) accelerators: accelerator _ is missing from translation
-#: ../plugins/mail-notification/mail-notification.c:634
-msgid "B_link icon in notification area"
-msgstr "Volver _intermitente a icona da Ã¡rea de notificaciÃ³n"
-
-#: ../plugins/mail-notification/mail-notification.c:644
+#: ../plugins/mail-notification/mail-notification.c:656
 msgid "Popup _message together with the icon"
 msgstr "Facer emerxer a _mensaxe xunto coa icona"
 
-#: ../plugins/mail-notification/mail-notification.c:829
+#: ../plugins/mail-notification/mail-notification.c:843
 msgid "_Play sound when new messages arrive"
 msgstr "_Reproducir un son cando cheguen mensaxes novas"
 
-#: ../plugins/mail-notification/mail-notification.c:858
+#: ../plugins/mail-notification/mail-notification.c:872
 msgid "_Beep"
 msgstr "_Ton de aviso"
 
-#: ../plugins/mail-notification/mail-notification.c:871
+#: ../plugins/mail-notification/mail-notification.c:885
 msgid "Use sound _theme"
 msgstr "Usar _tema de sons"
 
-#: ../plugins/mail-notification/mail-notification.c:890
+#: ../plugins/mail-notification/mail-notification.c:904
 msgid "Play _file:"
 msgstr "Reproducir un ficheiro de _son"
 
-#: ../plugins/mail-notification/mail-notification.c:901
+#: ../plugins/mail-notification/mail-notification.c:915
 msgid "Select sound file"
 msgstr "Seleccionar un ficheiro de son"
 
-#: ../plugins/mail-notification/mail-notification.c:959
+#: ../plugins/mail-notification/mail-notification.c:973
 msgid "Notify new messages for _Inbox only"
 msgstr "Notificar mensaxes novas sÃ³ para a caixa de _entrada"
 
 # (pofilter) accelerators: accelerator _ is missing from translation
-#: ../plugins/mail-notification/mail-notification.c:968
+#: ../plugins/mail-notification/mail-notification.c:982
 msgid "Generate a _D-Bus message"
 msgstr "Xerar unha mensaxe _D-Bus"
 
@@ -18722,39 +18599,42 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Reproducir un son cando cheguen mensaxes novas."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:166
+#: ../plugins/mail-to-task/mail-to-task.c:158
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Creado desde un correo electrÃ³nico por %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:498
+#: ../plugins/mail-to-task/mail-to-task.c:490
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 msgstr ""
-"O calendario seleccionado contÃ©n xa unha actividade '%s'. Quere editar a  "
+"O calendario seleccionado contÃ©n xa unha actividade Â«%sÂ». Quere editar a  "
 "actividade vella?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:501
+#: ../plugins/mail-to-task/mail-to-task.c:493
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
 "old task?"
 msgstr ""
-"A lista de tarefas seleccionadas contÃ©n xa unha tarefa '%s'. Quere editar a "
+"A lista de tarefas seleccionadas contÃ©n xa unha tarefa Â«%sÂ». Quere editar a "
 "actividade vella?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:504
+#: ../plugins/mail-to-task/mail-to-task.c:496
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
 "old memo?"
 msgstr ""
-"A lista de notas seleccionada xa contÃ©n unha nota '%s' . Quere editar a nota "
+"A lista de notas seleccionada xa contÃ©n unha nota Â«%sÂ» . Quere editar a nota "
 "vella?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:521
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:516
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18762,7 +18642,10 @@ msgstr ""
 "O calendario seleccionado xa contÃ©n algunhas actividades para os correos "
 "dados. Quere crear actividades novas de todas maneiras?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:524
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:522
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18770,7 +18653,10 @@ msgstr ""
 "A lista de tarefas seleccionada xa contÃ©n algunhas tarefas para os correos "
 "dados. Quere crear tarefas novas de todas maneiras?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:527
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:528
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18778,7 +18664,10 @@ msgstr ""
 "A lista de notas seleccionada xa contÃ©n algunhas notas para os correos "
 "dados. Quere crear notas novas de todas maneiras?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:545
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:549
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18792,7 +18681,10 @@ msgstr[1] ""
 "O calendario seleccionado xa contÃ©n unha actividade para o correo dado. "
 "Quere crear actividades novas de todas maneiras?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:551
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:558
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18806,7 +18698,10 @@ msgstr[1] ""
 "A lista de tarefas seleccionada xa contÃ©n tarefas para o correo dado. Quere "
 "crear actividades novas de todas maneiras?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:557
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:567
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18820,25 +18715,25 @@ msgstr[1] ""
 "A lista de notas seleccionada xa contÃ©n notas para os correos dados. Quere "
 "crear notas novas de todas maneiras?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../plugins/mail-to-task/mail-to-task.c:626
 msgid "[No Summary]"
 msgstr "[Sen resumo]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:627
+#: ../plugins/mail-to-task/mail-to-task.c:637
 msgid "Invalid object returned from a server"
 msgstr "O obxecto devolto polo servidor non Ã© vÃ¡lido"
 
-#: ../plugins/mail-to-task/mail-to-task.c:698
+#: ../plugins/mail-to-task/mail-to-task.c:708
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Produciuse un erro no proceso: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:727
+#: ../plugins/mail-to-task/mail-to-task.c:737
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Non Ã© posÃbel abrir o calendario. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:734
+#: ../plugins/mail-to-task/mail-to-task.c:744
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18846,7 +18741,7 @@ msgstr ""
 "A orixe seleccionada Ã© sÃ³ de lectura, polo que non Ã© posÃbel crear eventos "
 "nela. Seleccione outra orixe."
 
-#: ../plugins/mail-to-task/mail-to-task.c:737
+#: ../plugins/mail-to-task/mail-to-task.c:747
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18854,7 +18749,7 @@ msgstr ""
 "A orixe seleccionada Ã© sÃ³ de lectura, polo que non Ã© posÃbel crear tarefas "
 "nela. Seleccione outra orixe."
 
-#: ../plugins/mail-to-task/mail-to-task.c:740
+#: ../plugins/mail-to-task/mail-to-task.c:750
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18862,40 +18757,40 @@ msgstr ""
 "A orixe seleccionada Ã© sÃ³ de lectura, polo que non Ã© posÃbel crear notas "
 "nela. Seleccione outra orixe."
 
-#: ../plugins/mail-to-task/mail-to-task.c:943
+#: ../plugins/mail-to-task/mail-to-task.c:953
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Non Ã© posÃbel obter a lista orixe. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1072
 msgid "Create an _Event"
 msgstr "Cr_ear unha actividade"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1064
+#: ../plugins/mail-to-task/mail-to-task.c:1074
 msgid "Create a new event from the selected message"
 msgstr "Crear unha actividade nova a partir da mensaxe seleccionada"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1079
 msgid "Create a Mem_o"
 msgstr "Crear unha n_ota"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1071
+#: ../plugins/mail-to-task/mail-to-task.c:1081
 msgid "Create a new memo from the selected message"
 msgstr "Crear unha nota nova a partir da mensaxe seleccionada"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1086
 msgid "Create a _Task"
 msgstr "Crear unha _tarefa"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1078
+#: ../plugins/mail-to-task/mail-to-task.c:1088
 msgid "Create a new task from the selected message"
 msgstr "Crear unha tarefa nova a partir da mensaxe seleccionada"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1096
 msgid "Create a _Meeting"
 msgstr "Crear unha _cita"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1088
+#: ../plugins/mail-to-task/mail-to-task.c:1098
 msgid "Create a new meeting from the selected message"
 msgstr "Crear unha cita nova a partir da mensaxe seleccionada"
 
@@ -18903,67 +18798,67 @@ msgstr "Crear unha cita nova a partir da mensaxe seleccionada"
 msgid "Convert a mail message to a task."
 msgstr "Converte unha mensaxe nunha tarefa."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:291
 msgid "Get List _Archive"
 msgstr "Obter _arquivo da lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Get an archive of the list this message belongs to"
 msgstr "Obter un arquivo da lista Ã¡ que pertence esta mensaxe"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:298
 msgid "Get List _Usage Information"
 msgstr "Obter informaciÃ³n do _uso da lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Obter informaciÃ³n sobre o uso da lista Ã¡ que pertence esta mensaxe"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:305
 msgid "Contact List _Owner"
 msgstr "Pr_opietario da lista de contactos"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr ""
 "Contactar co propietario da lista de correo Ã¡ que pertence esta mensaxe"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:312
 msgid "_Post Message to List"
 msgstr "_Publicar unha mensaxe na lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Publicar unha mensaxe na lista de correo Ã¡ que pertence esta mensaxe"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:319
 msgid "_Subscribe to List"
 msgstr "_Subscribirse Ã¡ lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Subscribirse Ã¡ lista de correo Ã¡ que pertence esta mensaxe"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:326
 msgid "_Unsubscribe from List"
 msgstr "E_liminar subscriciÃ³n da lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:328
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Eliminar subscriciÃ³n da lista de correo Ã¡ que pertence esta mensaxe"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:335
 msgid "Mailing _List"
 msgstr "_Lista de correo"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Mailing List Actions"
-msgstr "AcciÃ³ns das listas de correo"
+msgstr "AcciÃ³ns das roldas de correo"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
 msgstr ""
-"Proporciona acciÃ³ns para ordes comÃºns de listas de correo (subscribirse, "
+"Proporciona acciÃ³ns para ordes comÃºns de roldas de correo (subscribirse, "
 "eliminar subscriciÃ³n etc.)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
@@ -19060,15 +18955,15 @@ msgstr ""
 "Quere marcar as mensaxes do cartafol actual como lidas ou tamÃ©n as dos seus "
 "subcartafoles?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:174
+#: ../plugins/mark-all-read/mark-all-read.c:196
 msgid "In Current Folder and _Subfolders"
 msgstr "No cartafol actual e _subcartafoles"
 
-#: ../plugins/mark-all-read/mark-all-read.c:188
+#: ../plugins/mark-all-read/mark-all-read.c:210
 msgid "In Current _Folder Only"
 msgstr "SÃ³ no carta_fol actual"
 
-#: ../plugins/mark-all-read/mark-all-read.c:415
+#: ../plugins/mark-all-read/mark-all-read.c:439
 msgid "Mark Me_ssages as Read"
 msgstr "Marcar as men_saxes como lidas"
 
@@ -19108,7 +19003,7 @@ msgstr "engadido"
 
 #: ../plugins/plugin-manager/plugin-manager.c:430
 msgid "_Plugins"
-msgstr "_engadidos"
+msgstr "_Engadidos"
 
 #: ../plugins/plugin-manager/plugin-manager.c:432
 msgid "Enable and disable plugins"
@@ -19117,30 +19012,30 @@ msgstr "Activar e desactivar engadidos"
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
-msgstr "Modo de texto plano"
+msgstr "Modo de texto simple"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
 msgid "Prefer Plain Text"
-msgstr "Preferir texto plano"
+msgstr "Preferir texto simple"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr ""
-"Ver mensaxes de correo como texto plano aÃnda que conteÃ±an contido HTML."
+"Ver mensaxes de correo como texto simple aÃnda que conteÃ±an contido HTML."
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "Mostrar HTML se estÃ¡ presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Let Evolution choose the best part to show."
 msgstr "Deixar que Evolution cree a mellor parte a mostrar."
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid "Show plain text if present"
 msgstr "Mostrar HTML se estÃ¡ presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -19148,21 +19043,21 @@ msgstr ""
 "Mostrar a parte en texto simple, se estÃ¡ presente, doutro xeito Evolution "
 "seleccionarÃ¡ a mellor parte a mostrar."
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid "Only ever show plain text"
 msgstr "Mostrar sÃ³ PLANO"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr "Mostrar sempre a parte de texto simple e "
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:247
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Mostra a parte HTML _suprimida como anexos"
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:267
 msgid "HTML _Mode"
 msgstr "_Modo HTML"
 
@@ -19186,31 +19081,35 @@ msgstr "ImportaciÃ³n de PST do Outlook"
 msgid "Outlook personal folders (.pst)"
 msgstr "Cartafoles persoais do Outlook (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:299
+#: ../plugins/pst-import/pst-importer.c:295
 msgid "_Mail"
 msgstr "_Correo"
 
+#: ../plugins/pst-import/pst-importer.c:307
+msgid "Destination folder:"
+msgstr "Cartafol de destino:"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:313
 msgid "_Address Book"
 msgstr "_Axenda de enderezos"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:320
 msgid "A_ppointments"
 msgstr "Ci_tas"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:326 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tarefas"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:332
 msgid "_Journal entries"
 msgstr "Entradas de _diario"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:347
 msgid "Importing Outlook data"
 msgstr "ImportaciÃ³n de datos do Outlook"
 
@@ -19381,49 +19280,49 @@ msgstr "LocalizaciÃ³n nova"
 msgid "Edit Location"
 msgstr "Editar localizaciÃ³n"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "Non se encontrou o SpamAssassin; cÃ³digo: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:129
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Produciuse un fallo ao crear a canalizaciÃ³n: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Erro despois de facer fork: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "O proceso fillo SpamAssassin non responde; matÃ¡ndoo..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:234
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Interrompeuse a espera polo proceso fillo SpamAssassin; terminando..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr ""
 "Produciuse un fallo na canalizaciÃ³n co SpamAssassin; cÃ³digo de erro: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:506
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "O SpamAssassin non estÃ¡ dispoÃ±Ãbel."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:927
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr ""
 "Isto pode facer que o SpamAssassin sexa mÃ¡is fiÃ¡bel, aÃnda que mÃ¡is lento"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:935
 msgid "I_nclude remote tests"
 msgstr "I_ncluÃr probas remotas"
 
@@ -19540,78 +19439,26 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "Formato RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:111
+#: ../plugins/save-calendar/save-calendar.c:120
 msgid "_Format:"
 msgstr "_Formato:"
 
-#: ../plugins/save-calendar/save-calendar.c:172
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "Seleccione un ficheiro de destino"
 
-#: ../plugins/save-calendar/save-calendar.c:325
+#: ../plugins/save-calendar/save-calendar.c:334
 msgid "Save the selected calendar to disk"
 msgstr "Gardar as mensaxes como un ficheiro de texto"
 
-#: ../plugins/save-calendar/save-calendar.c:356
+#: ../plugins/save-calendar/save-calendar.c:365
 msgid "Save the selected memo list to disk"
 msgstr "Gardar as mensaxes como un ficheiro de texto"
 
-#: ../plugins/save-calendar/save-calendar.c:387
+#: ../plugins/save-calendar/save-calendar.c:396
 msgid "Save the selected task list to disk"
 msgstr "Garda un calendario ou unha lista de tarefas no disco."
 
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "Guides you through your initial account setup."
-msgstr "GuÃao durante a configuraciÃ³n inicial da sÃºa conta."
-
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Setup Assistant"
-msgstr "Asistente de configuraciÃ³n"
-
-#: ../plugins/startup-wizard/startup-wizard.c:110
-msgid "Evolution Setup Assistant"
-msgstr "Asistente de configuraciÃ³n do Evolution"
-
-#: ../plugins/startup-wizard/startup-wizard.c:115
-msgid "Welcome"
-msgstr "Benvido/a"
-
-#: ../plugins/startup-wizard/startup-wizard.c:118
-msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"Benvido/a ao Evolution. As seguintes pantallas permitiranlle ao Evolution "
-"conectarse Ã¡s sÃºas contas de correo e importar ficheiros desde outros "
-"aplicativos.\n"
-"\n"
-"Prema o botÃ³n \"Adiante\" para continuar. "
-
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../widgets/misc/e-import-assistant.c:385
-msgid "Please select the information that you would like to import:"
-msgstr "Seleccione a informaciÃ³n que quere importar:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:168
-#: ../widgets/misc/e-import-assistant.c:542
-#, c-format
-msgid "From %s:"
-msgstr "De: %s:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:185
-msgid "Importing files"
-msgstr "ImportaciÃ³n de ficheiros"
-
-#: ../plugins/startup-wizard/startup-wizard.c:248
-msgid "Importing data."
-msgstr "Importando datos."
-
-#: ../plugins/startup-wizard/startup-wizard.c:250
-msgid "Please wait"
-msgstr "Espere"
-
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Sort mail message threads by subject."
 msgstr "Ordenar os fÃos das mensaxes de correo por asunto."
@@ -19625,7 +19472,7 @@ msgid "Thread messages by subject"
 msgstr "Encadear mensaxes polo asunto"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:56
+#: ../plugins/subject-thread/subject-thread.c:63
 msgid "F_all back to threading messages by subject"
 msgstr "Volver a relacionar as mensaxes polo _asunto"
 
@@ -19641,15 +19488,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "engadido de modelo baseado en borradores"
 
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:621
 msgid "No Title"
 msgstr "Sen tÃtulo"
 
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:715
 msgid "Save as _Template"
 msgstr "Gardar como _modelo"
 
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:717
 msgid "Save as Template"
 msgstr "Gardar como modelo"
 
@@ -19669,29 +19516,29 @@ msgstr "vCards en liÃ±a"
 msgid "Show vCards directly in mail messages."
 msgstr "Mostrar vCards directamente nas mensaxes de correo."
 
-#: ../plugins/vcard-inline/vcard-inline.c:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:181
+#: ../plugins/vcard-inline/vcard-inline.c:266
 msgid "Show Full vCard"
 msgstr "Mostrar vCard completa"
 
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:184
 msgid "Show Compact vCard"
 msgstr "Mostrar vCard compacta"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:245
 msgid "There is one other contact."
 msgstr "Hai outro contacto mÃ¡is."
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:254
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Hai outro contacto mÃ¡is."
 msgstr[1] "Hai outros %d contactos."
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:275
 msgid "Save in Address Book"
 msgstr "Gardar na axenda de enderezos"
 
@@ -19707,11 +19554,11 @@ msgstr "Contactos WebDAV"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Evit_ar o IfMatch (necesario no Apache < 2.2.8)"
 
@@ -19878,7 +19725,7 @@ msgstr "A barra lateral Ã© visÃbel"
 msgid "Skip development warning dialog"
 msgstr "Saltar o diÃ¡logo de aviso de desenvolvemento"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:348
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:331
 msgid "Start in offline mode"
 msgstr "Iniciar en modo sen conexiÃ³n"
 
@@ -20037,562 +19884,363 @@ msgstr "Estilo dos botÃ³ns de xanela"
 msgid "Window buttons are visible"
 msgstr "Os botÃ³ns da xanela son visÃbeis"
 
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:528 ../shell/e-shell-content.c:529
 msgid "Searches"
 msgstr "Buscas"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:571
 msgid "Save Search"
 msgstr "Gardar a busca"
 
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
 #. Translators: The "Show:" label precedes a combo box that
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:885
+#: ../shell/e-shell-searchbar.c:929
 msgid "Sho_w:"
 msgstr "Mos_trar: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:912
+#: ../shell/e-shell-searchbar.c:960
 msgid "Sear_ch:"
 msgstr "Busca_r: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:972
+#: ../shell/e-shell-searchbar.c:1021
 msgid "i_n"
 msgstr " e_n "
 
-#: ../shell/e-shell-switcher.c:448
-msgid "Toolbar Style"
-msgstr "Estilo da _barra de ferramentas"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr "O estilo da barra de ferramentas do alternador"
-
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
-msgid "Toolbar Visible"
-msgstr "A barra de ferramentas Ã© visÃbel"
-
-#: ../shell/e-shell-switcher.c:466
-msgid "Whether the switcher is visible"
-msgstr "Se a barra lateral deberÃa ser visÃbel."
-
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../shell/e-shell-utils.c:249
+#: ../shell/e-shell-utils.c:255
 msgid "iCalendar (.ics)"
 msgstr "Ficheiros iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:270
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "Todos os ficheiros"
 
-#: ../shell/e-shell-view.c:681
-msgid "Switcher Action"
-msgstr "Cambiar a %s"
-
-#: ../shell/e-shell-view.c:682
-msgid "The switcher action for this shell view"
-msgstr "A acciÃ³n do alternador para esta visualizaciÃ³n de terminal de ordes"
-
-#: ../shell/e-shell-view.c:697
-msgid "Page Number"
-msgstr "NÃºmero de serie"
-
-#: ../shell/e-shell-view.c:698
-msgid "The notebook page number of the shell view"
-msgstr ""
-"O nÃºmero de pÃ¡xina do libro de notas da visualizaciÃ³n de terminal de ordes"
-
-#: ../shell/e-shell-view.c:714
-msgid "Search Rule"
-msgstr "Filtro de busca"
-
-#: ../shell/e-shell-view.c:715
-msgid "Criteria for the current search results"
-msgstr "Criterio para os resultados da bÃºsqueda actual"
-
-#: ../shell/e-shell-view.c:730
-msgid "The EShellBackend for this shell view"
-msgstr "O EShellBackend para esta visualizacion de terminal de ordes"
-
-#: ../shell/e-shell-view.c:745
-msgid "Shell Content Widget"
-msgstr "Widget de contido de intÃ©rprete de ordes"
-
-#: ../shell/e-shell-view.c:746
-msgid "The content widget appears in a shell window's right pane"
-msgstr ""
-"O contido do wiget aparece no panel dereito da xanela da terminal de ordes"
-
-#: ../shell/e-shell-view.c:762
-msgid "Shell Sidebar Widget"
-msgstr "Largura predefinida da barra lateral"
-
-#: ../shell/e-shell-view.c:763
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr ""
-"A barra lateral do widget aparece no panel da esquerda da xanela da terminal "
-"de ordes"
-
-#: ../shell/e-shell-view.c:778
-msgid "Shell Taskbar Widget"
-msgstr "Widget da barra de ferramentas da terminal de ordes"
-
-#: ../shell/e-shell-view.c:779
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr ""
-"O widget da barra de ferramentas aparece na parte inferior da xanela da "
-"terminal de ordes"
-
-#: ../shell/e-shell-view.c:794
-msgid "Shell Window"
-msgstr "_Xanela nova"
-
-#: ../shell/e-shell-view.c:795
-msgid "The window to which the shell view belongs"
-msgstr "A xanela Ã¡ que pertence a visualizaciÃ³n da terminal de ordes"
-
-#: ../shell/e-shell-view.c:811
-msgid "The key file holding widget state data"
-msgstr "O ficheiro chave que contÃ©n os datos de estado do wiget"
-
-#: ../shell/e-shell-view.c:826
-msgid "The title of the shell view"
-msgstr "O tÃtulo da visualizaciÃ³n da terminal de sesiÃ³n"
-
-#: ../shell/e-shell-view.c:840
-msgid "Current View ID"
-msgstr "_VisualizaciÃ³n actual"
-
-#: ../shell/e-shell-view.c:841
-msgid "The current GAL view ID"
-msgstr "Gardar a visualizaciÃ³n personalizada actual"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
 #: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr ""
-"Fran Dieguez <frandieguez ubuntu com>, 2009, 2010:\n"
-"AntÃ³n MÃ©ixome <meixome certima net>, 2009, 2010;"
+"Fran DiÃ©guez <frandieguez ubuntu com>, 2009, 2010.\n"
+"AntÃ³n MÃ©ixome <meixome certima net>, 2010.\n"
+"AntÃ³n MÃ©ixome <meixome mancomun org>, 2009.\n"
+"MancomÃºn - Centro de Referencia e Servizos de Software Libre <g11n mancomun "
+"org>, 2009.\n"
+"Ignacio Casal Quinteiro <icq svn gnome org>, 2007, 2008.\n"
+"Ignacio Casal Quinteiro <nacho resa gmail com>, 2005, 2006.\n"
+"Manuel A. FernÃ¡ndez Montecelo <manuel sindominio net>, 2001, 2005.\n"
+"JesÃºs Bravo Ã?lvarez <jba pobox com>, 2000."
 
 #: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "Sitio web do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1224
+#: ../shell/e-shell-window-actions.c:1236
 msgid "Bug Buddy is not installed."
 msgstr "O Bug buddy non estÃ¡ instalado."
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1238
 msgid "Bug Buddy could not be run."
 msgstr "Non foi posÃbel executar o Bug Buddy."
 
-#: ../shell/e-shell-window-actions.c:1343
-msgid "GNOME Pilot is not installed."
-msgstr "O Bug buddy non estÃ¡ instalado."
-
-#: ../shell/e-shell-window-actions.c:1345
-msgid "GNOME Pilot could not be run."
-msgstr "Non foi posÃbel executar o Bug Buddy."
-
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1419
 msgid "Show information about Evolution"
 msgstr "Mostrar informaciÃ³n sobre o Evolution"
 
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1424
+#: ../shell/e-shell-window-actions.c:1438
 msgid "_Close Window"
 msgstr "_Pechar xanela"
 
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1445
 msgid "_Contents"
 msgstr "Ci_tas"
 
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1447
 msgid "Open the Evolution User Guide"
 msgstr "Abrir o cartafol doutro usuario"
 
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1473
 msgid "Evolution _FAQ"
 msgstr "_FAQ do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1475
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Abrir a pÃ¡xina web das Preguntas frecuentes (FAQ)"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1480
 msgid "_Forget Passwords"
 msgstr "_Esquecer os contrasinais"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1482
 msgid "Forget all remembered passwords"
 msgstr "EstÃ¡ seguro de que quere esquecer todos os contrasinais memorizados?"
 
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1487
 msgid "I_mport..."
 msgstr "I_mportar..."
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1489
 msgid "Import data from other programs"
 msgstr "Importar datos doutros programas"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1494
 msgid "New _Window"
 msgstr "_Xanela nova"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1496
 msgid "Create a new window displaying this view"
 msgstr "Crear unha xanela nova ao mostrar este cartafol"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1510
 msgid "Configure Evolution"
 msgstr "ConfiguraciÃ³n"
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1515
 msgid "_Quick Reference"
 msgstr "_Referencia rÃ¡pida"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1517
 msgid "Show Evolution's shortcut keys"
 msgstr "Modificar a configuraciÃ³n do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1524
 msgid "Exit the program"
 msgstr "SaÃr do programa"
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1529
 msgid "_Advanced Search..."
 msgstr "Busca _avanzada..."
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1531
 msgid "Construct a more advanced search"
 msgstr "ConstrÃºe unha bÃºsqueda mÃ¡is avanzada"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1538
 msgid "Clear the current search parameters"
 msgstr "Limpar bÃºsqueda"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1543
 msgid "_Edit Saved Searches..."
 msgstr "_Editar as buscas gardadas..."
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1545
 msgid "Manage your saved searches"
 msgstr "Xestionar o seu correo, contactos e calendario"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1552
 msgid "Click here to change the search type"
 msgstr "Prema aquÃ para cambiar o tipo de busca"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1557
 msgid "_Find Now"
 msgstr "_Buscar agora"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1559
 msgid "Execute the current search parameters"
 msgstr "Cancelar a operaciÃ³n de correo actual"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1564
 msgid "_Save Search..."
 msgstr "_Gardar a busca..."
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1566
 msgid "Save the current search parameters"
 msgstr "Gardar o ficheiro actual"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1578
 msgid "Send / _Receive"
 msgstr "Enviar/_Recibir"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1580
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar elementos da fila e obter elementos novos"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1585
 msgid "Submit _Bug Report..."
 msgstr "Enviar un _informe de erro"
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1587
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1598
-msgid "GNOME Pilot _Synchronization..."
-msgstr "_SincronizaciÃ³n con GNOME Pilot..."
-
-#: ../shell/e-shell-window-actions.c:1600
-msgid "Set up GNOME Pilot configuration"
-msgstr "Definir a configuraciÃ³n do GNOME Pilot"
-
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1592
 msgid "_Work Offline"
 msgstr "_Traballar sen conexiÃ³n"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1594
 msgid "Put Evolution into offline mode"
 msgstr "Iniciar en modo sen conexiÃ³n"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1599
 msgid "_Work Online"
 msgstr "_Traballar con conexiÃ³n"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1601
 msgid "Put Evolution into online mode"
 msgstr "Iniciar en modo con conexiÃ³n"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1629
 msgid "Lay_out"
 msgstr "Disp_osiciÃ³n"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1636
 msgid "_New"
 msgstr "_Novo"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1643
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1650
 msgid "_Switcher Appearance"
 msgstr "Aparencia do _selector"
 
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1664
 msgid "_Window"
 msgstr "_Xanela"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1693
 msgid "Show Side _Bar"
 msgstr "Mostrar _barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show the side bar"
 msgstr "Mostrar _barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1701
 msgid "Show _Buttons"
 msgstr "Mostrar animaciÃ³ns"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1703
 msgid "Show the switcher buttons"
 msgstr "Mostrar o fuso horario secundario"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1709
 msgid "Show _Status Bar"
 msgstr "Mostrar _barra de estado"
 
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1711
 msgid "Show the status bar"
 msgstr "Mostrar _barra de estado"
 
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1717
 msgid "Show _Tool Bar"
 msgstr "Mostrar barra de _ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1732
+#: ../shell/e-shell-window-actions.c:1719
 msgid "Show the tool bar"
 msgstr "Mostrar barra de _ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1741
 msgid "_Icons Only"
 msgstr "SÃ³ _iconas"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1743
 msgid "Display window buttons with icons only"
 msgstr "Mostrar os botÃ³ns da xanela sÃ³ con iconas"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1748
 msgid "_Text Only"
 msgstr "SÃ³ _texto"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1750
 msgid "Display window buttons with text only"
 msgstr "Mostrar os botÃ³ns da xanela sÃ³ con texto"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1755
 msgid "Icons _and Text"
 msgstr "Iconas _e texto"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1757
 msgid "Display window buttons with icons and text"
 msgstr "Mostrar os botÃ³ns da xanela con iconas e texto"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1762
 msgid "Tool_bar Style"
 msgstr "Estilo da _barra de ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1764
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Mostrar os botÃ³ns da xanela usando a configuraciÃ³n da barra de ferramentas "
 "do escritorio"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Define Views..."
-msgstr "Definir visualizaciÃ³ns..."
+msgstr "Definir vistas..."
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1774
 msgid "Create or edit views"
-msgstr "Crear ou editar visualizaciÃ³ns"
+msgstr "Crear ou editar vistas"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1779
 msgid "Save Custom View..."
-msgstr "Gardar visualizaciÃ³n personalizada..."
+msgstr "Gardar vista personalizada..."
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1781
 msgid "Save current custom view"
-msgstr "Gardar a visualizaciÃ³n personalizada actual"
+msgstr "Gardar a vista personalizada actual"
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1788
 msgid "C_urrent View"
 msgstr "VisualizaciÃ³n act_ual"
 
-#: ../shell/e-shell-window-actions.c:1811
+#: ../shell/e-shell-window-actions.c:1798
 msgid "Custom View"
 msgstr "VisualizaciÃ³n personalizada"
 
-#: ../shell/e-shell-window-actions.c:1813
+#: ../shell/e-shell-window-actions.c:1800
 msgid "Current view is a customized view"
-msgstr "A visualizaciÃ³n actual Ã© unha visualizaciÃ³n personalizada"
+msgstr "A vista actual Ã© unha visualizaciÃ³n personalizada"
 
-#: ../shell/e-shell-window-actions.c:1823
+#: ../shell/e-shell-window-actions.c:1810
 msgid "Change the page settings for your current printer"
 msgstr "Definir a configuraciÃ³n da pÃ¡xina para a impresora actual"
 
-#: ../shell/e-shell-window-actions.c:2200
+#: ../shell/e-shell-window-actions.c:2183
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
-#: ../shell/e-shell-window-actions.c:2413
+#: ../shell/e-shell-window-actions.c:2396
 msgid "Execute these search parameters"
 msgstr "Executar estes parÃ¡metros de bÃºsqueda"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:570
+#: ../shell/e-shell-window-private.c:576
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:419
 msgid "New"
 msgstr "Novo"
 
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr "VisualizaciÃ³n da terminal de ordes activa"
-
-#: ../shell/e-shell-window.c:617
-msgid "Name of the active shell view"
-msgstr "Nome da visualizaciÃ³n nova:"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr "O EFocusTracker da xanela da terminal de ordes"
-
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:804
-msgid "Geometry"
-msgstr "XeometrÃa"
-
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:805
-msgid "Initial window geometry string"
-msgstr "A cadea da xeometrÃa inicial da xanela"
-
-#: ../shell/e-shell-window.c:662
-msgid "Safe Mode"
-msgstr "Activar _cursor"
-
-#: ../shell/e-shell-window.c:663
-msgid "Whether the shell window is in safe mode"
-msgstr "Indica se o engadido estÃ¡ activado"
-
-#: ../shell/e-shell-window.c:694
-msgid "Sidebar Visible"
-msgstr "A barra lateral Ã© visÃbel"
-
-#: ../shell/e-shell-window.c:695
-msgid "Whether the shell window's side bar is visible"
-msgstr "Se os botÃ³ns da xanela deberÃan ser visÃbeis."
-
-#: ../shell/e-shell-window.c:709
-msgid "Switcher Visible"
-msgstr "A barra lateral Ã© visÃbel"
-
-#: ../shell/e-shell-window.c:710
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr "Se os botÃ³ns da xanela deberÃan ser visÃbeis."
-
-#: ../shell/e-shell-window.c:725
-msgid "Taskbar Visible"
-msgstr "A barra de estado Ã© visÃbel"
-
-#: ../shell/e-shell-window.c:726
-msgid "Whether the shell window's task bar is visible"
-msgstr "Se a barra de estado deberÃa ser visÃbel."
-
-#: ../shell/e-shell-window.c:741
-msgid "Whether the shell window's tool bar is visible"
-msgstr "Se os botÃ³ns da xanela deberÃan ser visÃbeis."
-
-#: ../shell/e-shell-window.c:755
-msgid "UI Manager"
-msgstr "Xestor"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr "O GtkUIManager da xanela da terminal de ordes"
-
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:244
 msgid "Preparing to go offline..."
-msgstr "Preparando a conta '%s' para o modo sen conexiÃ³n"
+msgstr "Preparando a conta Â«%sÂ» para o modo sen conexiÃ³n"
 
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:294
 msgid "Preparing to go online..."
-msgstr "Preparando a conta '%s' para o modo sen conexiÃ³n"
+msgstr "Preparando a conta Â«%sÂ» para o modo sen conexiÃ³n"
 
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:353
 msgid "Preparing to quit..."
 msgstr "PreparÃ¡ndose para saÃr..."
 
-#: ../shell/e-shell.c:820
-msgid "Module Directory"
-msgstr "Cartafol onde gardar"
-
-#: ../shell/e-shell.c:821
-msgid "The directory from which to load EModules"
-msgstr "O cartafol desde o cal ler EModules"
-
-#: ../shell/e-shell.c:836
-msgid "Network Available"
-msgstr "TLS non dispoÃ±Ãbel"
-
-#: ../shell/e-shell.c:837
-msgid "Whether the network is available"
-msgstr "Indica se o engadido estÃ¡ activado"
-
-#: ../shell/e-shell.c:852 ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "Conectado"
-
-#: ../shell/e-shell.c:853
-msgid "Whether the shell is online"
-msgstr "Indica se o engadido estÃ¡ activado"
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:178
+#: ../shell/main.c:180
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20629,7 +20277,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:202
+#: ../shell/main.c:204
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20637,61 +20285,57 @@ msgstr ""
 "Grazas\n"
 "O equipo do Evolution\n"
 
-#: ../shell/main.c:209
+#: ../shell/main.c:211
 msgid "Do not tell me again"
 msgstr "Non preguntarme de novo"
 
-#: ../shell/main.c:344
+#: ../shell/main.c:327
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar o Evolution activando o compoÃ±ente especificado"
 
-#: ../shell/main.c:346
+#: ../shell/main.c:329
 msgid "Apply the given geometry to the main window"
 msgstr "Aplicar a xeometrÃa fornecida Ã¡ xanela principal"
 
-#: ../shell/main.c:350
+#: ../shell/main.c:333
 msgid "Start in online mode"
 msgstr "Iniciar en modo con conexiÃ³n"
 
-#: ../shell/main.c:352
+#: ../shell/main.c:335
 msgid "Start in \"express\" mode"
 msgstr "Iniciar en modo \"express\""
 
-#: ../shell/main.c:355
+#: ../shell/main.c:338
 msgid "Forcibly shut down Evolution"
 msgstr "Forzar o peche de todos os compoÃ±entes do Evolution"
 
-#: ../shell/main.c:359
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "Forza a remigraciÃ³n desde o Evolution 1.4"
-
-#: ../shell/main.c:362
+#: ../shell/main.c:341
 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:364
+#: ../shell/main.c:343
 msgid "Disable loading of any plugins."
 msgstr "Desactivar a carga de calquera engadido."
 
-#: ../shell/main.c:366
+#: ../shell/main.c:345
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar o panel de previsualizaciÃ³n de correo, contactos e tarefas."
 
-#: ../shell/main.c:370
+#: ../shell/main.c:349
 msgid "Import URIs or file names given as rest of arguments."
 msgstr ""
 "Imporatar os URIs ou nomes de ficheiros fornecidos como o resto dos "
 "argumentos."
 
-#: ../shell/main.c:372
+#: ../shell/main.c:351
 msgid "Request a running Evolution process to quit"
 msgstr "Reiniciando o Evolution"
 
-#: ../shell/main.c:489
+#: ../shell/main.c:475 ../shell/main.c:483
 msgid "- The Evolution PIM and Email Client"
 msgstr "- O cliente de correo e PIM do Evolution"
 
-#: ../shell/main.c:549
+#: ../shell/main.c:545
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20705,99 +20349,44 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "EstÃ¡ seguro de que quere esquecer todos os contrasinais memorizados?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "Continuar"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "Non Ã© posÃbel actualizar directamente desde a versiÃ³n {0}"
 
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "Quere eliminar os datos antigos da versiÃ³n {0}?"
+msgid "Continue Anyway"
+msgstr "Continuar de todas formas"
 
 #: ../shell/shell.error.xml.h:4
 msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+msgstr ""
+"Evolution xa non admite a actualizaciÃ³n directamente desde a versiÃ³n {0}. "
+"PorÃ©n, como soluciÃ³n pode intentar actualizar primeiro a Evolution 2 e "
+"despois a Evolution 3."
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr ""
 "Ao esquecer os seus contrasinais memorizados eliminarÃ¡ todos os contrasinais "
 "gardados. VolverÃ¡selle preguntar a prÃ³xima vez que sexan necesarios."
 
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "Espazo en disco insuficiente para a actualizaciÃ³n."
-
 #: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "EstÃ¡ seguro de que quere eliminar os datos antigos?"
+msgid "Quit Now"
+msgstr "SaÃr agora"
 
 #: ../shell/shell.error.xml.h:8
-msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be "
-"permanently removed.\n"
-"\n"
-"It is suggested you manually verify that all of your mail, contact, and "
-"calendar data is present, and that this version of Evolution operates "
-"correctly before deleting this old data.\n"
-"\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution "
-"without manual intervention.\n"
-msgstr ""
-"Todo o contido do cartafol &quot;evolution&quot; vaise eliminar "
-"permanentemente.\n"
-"\n"
-"SuxÃreselle que verifique manualmente que todos os datos do seu correo, "
-"contactos, e calendarios estÃ¡n presentes, e que esta versiÃ³n do Evolution "
-"funciona correctamente antes de eliminar os datos antigos.\n"
-"\n"
-"Unha vez eliminados, non poderÃ¡ desactualizarse Ã¡ versiÃ³n anterior do "
-"Evolution sen intervenciÃ³n manual.\n"
-
-#: ../shell/shell.error.xml.h:14
-msgid ""
-"The previous version of Evolution stored its data in a different location.\n"
-"\n"
-"If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently. If you choose to keep "
-"this data, then you may manually remove the contents of &quot;"
-"evolution&quot; at your convenience.\n"
-msgstr ""
-"As versiÃ³ns anteriores do Evolution gardan os seus datos nunha localizaciÃ³n "
-"diferente.\n"
-"\n"
-"Se escolle eliminar estes datos, todos os contidos do cartafol &quot;"
-"evolution&quot; serÃ¡n eliminados permanentemente. Se escolle gardar estes "
-"datos, entÃ³n poderÃ¡ eliminar os contidos de &quot;evolution&quot; cando o "
-"vexa conveniente.\n"
-
-#: ../shell/shell.error.xml.h:18
 msgid "Upgrade from previous version failed:"
 msgstr "Produciuse un fallo ao actualizar desde a versiÃ³n anterior: {0}"
 
-#: ../shell/shell.error.xml.h:19
-msgid ""
-"Upgrading your data and settings will require up to {0} of disk space, but "
-"you only have {1} available.\n"
-"\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
-msgstr ""
-"A actualizaciÃ³n dos seus datos e configuraciÃ³n requirirÃ¡ atÃ© {0} de espazo "
-"no disco, mais sÃ³ ten {1} dispoÃ±Ãbeis.\n"
-"\n"
-"NecesitarÃ¡ facer mÃ¡is espazo dispoÃ±Ãbel no seu cartafol persoal antes de que "
-"poida continuar."
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "_Esquecer"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "_Conservar os datos"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "_Avisarme mÃ¡is tarde"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "{0}\n"
 "\n"
@@ -20835,7 +20424,7 @@ msgstr "O ficeiro non Ã© un ficheiro .desktop vÃ¡lido"
 #: ../smclient/eggdesktopfile.c:188
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
-msgstr "VersiÃ³n '%s' de ficheiro desktop non recoÃ±ecida"
+msgstr "VersiÃ³n Â«%sÂ» de ficheiro desktop non recoÃ±ecida"
 
 #: ../smclient/eggdesktopfile.c:958
 #, c-format
@@ -20891,14 +20480,14 @@ msgstr "OpciÃ³ns de xestiÃ³n de sesiÃ³n:"
 msgid "Show session management options"
 msgstr "Mostrar as animaciÃ³ns de imaxe "
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
 "\n"
 "Edit trust settings:"
 msgstr ""
-"O certificado '%s' Ã© un certificado AC.\n"
+"O certificado Â«%sÂ» Ã© un certificado AC.\n"
 "\n"
 "Edite a configuraciÃ³n de confianza:"
 
@@ -20922,67 +20511,76 @@ msgstr ""
 "certificado, entÃ³n non confÃa na autenticidade deste certificado a non ser "
 "que se indique outra cousa aquÃ"
 
-#: ../smime/gui/certificate-manager.c:135
-#: ../smime/gui/certificate-manager.c:382
-#: ../smime/gui/certificate-manager.c:610
+#: ../smime/gui/certificate-manager.c:148
+#: ../smime/gui/certificate-manager.c:460
+#: ../smime/gui/certificate-manager.c:697
 msgid "Select a certificate to import..."
 msgstr "Seleccione un certificado para importar..."
 
-#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:157
 msgid "All PKCS12 files"
 msgstr "Todos os ficheiros PKCS12"
 
-#: ../smime/gui/certificate-manager.c:150
-#: ../smime/gui/certificate-manager.c:397
-#: ../smime/gui/certificate-manager.c:624
+#: ../smime/gui/certificate-manager.c:163
+#: ../smime/gui/certificate-manager.c:475
+#: ../smime/gui/certificate-manager.c:711
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:487
-#: ../smime/gui/certificate-manager.c:712
+#: ../smime/gui/certificate-manager.c:182
+msgid "Failed to import user's certificate"
+msgstr "Certificado importado"
+
+#: ../smime/gui/certificate-manager.c:352
+#: ../smime/gui/certificate-manager.c:574
+#: ../smime/gui/certificate-manager.c:808
 msgid "Certificate Name"
 msgstr "Nome do certificado"
 
-#: ../smime/gui/certificate-manager.c:283
-#: ../smime/gui/certificate-manager.c:505
+#: ../smime/gui/certificate-manager.c:361
+#: ../smime/gui/certificate-manager.c:592
 msgid "Purposes"
 msgstr "Obxectivos"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "NÃºmero de serie"
 
-#: ../smime/gui/certificate-manager.c:300
+#: ../smime/gui/certificate-manager.c:378
 msgid "Expires"
 msgstr "Caduca"
 
-#: ../smime/gui/certificate-manager.c:391
+#: ../smime/gui/certificate-manager.c:469
 msgid "All email certificate files"
 msgstr "Todos os ficheiros de certificaciÃ³n de correo"
 
-#: ../smime/gui/certificate-manager.c:496
+#: ../smime/gui/certificate-manager.c:502
+msgid "Failed to import contact's certificate"
+msgstr "Produciuse un fallo ao eliminar o contacto"
+
+#: ../smime/gui/certificate-manager.c:583
 msgid "E-Mail Address"
 msgstr "Enderezo de correo electrÃ³nico"
 
-#: ../smime/gui/certificate-manager.c:619
+#: ../smime/gui/certificate-manager.c:706
 msgid "All CA certificate files"
 msgstr "Todos os ficheiros CA de certificaciÃ³n de correo"
 
-#: ../smime/gui/certificate-manager.c:1058
-msgid "Certificates"
-msgstr "Certificados"
+#: ../smime/gui/certificate-manager.c:737
+msgid "Failed to import certificate authority's certificate"
+msgstr ""
+"Produciuse un fallo ao importar o certificado da autoridade certificadora"
 
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visualizador de certificados: %s"
 
 #: ../smime/gui/component.c:46
 #, c-format
-msgid "Enter the password for `%s'"
-msgstr "Introduza o seu contrasinal para `%s'"
+msgid "Enter the password for '%s'"
+msgstr "Introduza o seu contrasinal para Â«%sÂ»"
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:69
@@ -21012,7 +20610,7 @@ msgstr ""
 "Emitido por:\n"
 "  Asunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "Seleccione o certificado"
 
@@ -21025,14 +20623,10 @@ msgid "Authorities"
 msgstr "Autoridades"
 
 #: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup"
-msgstr "Facer unha copia de seguranza"
+msgid "Backup _All"
+msgstr "Respaldar _todo"
 
 #: ../smime/gui/smime-ui.ui.h:4
-msgid "Backup All"
-msgstr "Facer unha copia de seguranza para todo"
-
-#: ../smime/gui/smime-ui.ui.h:5
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -21040,163 +20634,155 @@ msgstr ""
 "Antes de confiar nesta CA para calquera obxectivo, deberÃa examinar o seu "
 "certificado e as sÃºas directrices e procedementos (se estÃ¡n dispoÃ±Ãbeis)."
 
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
 msgid "Certificate"
 msgstr "Certificado"
 
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:6
 msgid "Certificate Authority Trust"
 msgstr "Confianza na autoridade do certificado"
 
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Fields"
 msgstr "<b>Campos do certificado</b>"
 
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../smime/gui/smime-ui.ui.h:8
 msgid "Certificate Hierarchy"
 msgstr "<b>XerarquÃa do certificado</b>"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "Certificate details"
 msgstr "Detalles do certificado"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificates Table"
 msgstr "TÃ¡boa de certificados"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Common Name (CN)"
 msgstr "Nome comÃºn (CN)"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "Certificados de contactos"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Non confiar na autenticidade deste certificado"
 
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Edit"
-msgstr "Editar"
-
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Email Certificate Trust Settings"
 msgstr "Control de confianza de certificados de correo"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Email Recipient Certificate"
 msgstr "Certificado do destinatario do correo"
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Signer Certificate"
 msgstr "Certificado do asinante do correo"
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "Caduca o"
 
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Field Value"
 msgstr "Nome do campo"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Fingerprints"
 msgstr "ImpresiÃ³n dixital MD5"
 
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Import"
-msgstr "Importar"
-
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "Issued By"
 msgstr "Emitido o"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "Emitido o"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Issued To"
 msgstr "Emitido o"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "MD5 Fingerprint"
 msgstr "ImpresiÃ³n dixital MD5"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "OrganizaciÃ³n (O)"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Organizational Unit (OU)"
 msgstr "Unidade organizacional (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "SHA1 Fingerprint"
 msgstr "ImpresiÃ³n dixital SHA1"
 
-#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
 msgid "SSL Client Certificate"
 msgstr "Certificado de cliente SSL"
 
-#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
 msgid "SSL Server Certificate"
 msgstr "Certificado de servidor SSL"
 
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:33
 msgid "This certificate has been verified for the following uses:"
 msgstr "<b>Este certificado verificouse para os seguintes usos:</b>"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:34
 msgid "Trust the authenticity of this certificate"
 msgstr "Confiar na autenticidade deste certificado"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:35
 msgid "Trust this CA to identify email users."
 msgstr "Confiar nesta AC para identificar a usuarios de correo."
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust this CA to identify software developers."
 msgstr "Confiar nesta AC para identificar desenvolvedores de software."
 
-#: ../smime/gui/smime-ui.ui.h:39
-msgid "Trust this CA to identify web sites."
-msgstr "Confiar nesta AC para identificar sitios web."
+#: ../smime/gui/smime-ui.ui.h:37
+msgid "Trust this CA to identify websites."
+msgstr "Confiar nesta CA para identificar sitios web."
 
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Validity"
 msgstr "<b>ValidaciÃ³n</b>"
 
-#: ../smime/gui/smime-ui.ui.h:41
-msgid "View"
-msgstr "Ver"
-
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Ten certificados destas organizaciÃ³ns que o identifican:"
 
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../smime/gui/smime-ui.ui.h:40
 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:"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "You have certificates on file that identify these people:"
 msgstr "Ten nun ficheiro os certificados que identifican a estas persoas:"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "Your Certificates"
 msgstr "Os seus certificados"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#. This is a verb, as in "make a backup".
+#: ../smime/gui/smime-ui.ui.h:44
+msgid "_Backup"
+msgstr "_Respaldar"
+
+#: ../smime/gui/smime-ui.ui.h:45
 msgid "_Edit CA Trust"
 msgstr "_Editar confianza na CA"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:686
+#: ../smime/lib/e-cert-db.c:906
 msgid "Certificate already exists"
 msgstr "O certificado xa existe"
 
@@ -21241,125 +20827,143 @@ msgstr "PKCS #1 MD5 con cifrado RSA"
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:639
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "PKCS #1 SHA-256 con cifrado RSA"
+
+#: ../smime/lib/e-cert.c:642
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "PKCS #1 SHA-384 con cifrado RSA"
+
+#: ../smime/lib/e-cert.c:645
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "PKCS #1 SHA-512 con cifrado RSA"
+
+#: ../smime/lib/e-cert.c:672
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 cifrado RSA"
 
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Key Usage"
 msgstr "Uso da chave de certificado"
 
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:678
 msgid "Netscape Certificate Type"
 msgstr "Tipo de certificado Netscape"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:681
 msgid "Certificate Authority Key Identifier"
 msgstr "Identificador da chave da autoridade do certificado"
 
-#: ../smime/lib/e-cert.c:684
+#: ../smime/lib/e-cert.c:693
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identificador do obxecto (%s)"
 
-#: ../smime/lib/e-cert.c:735
+#: ../smime/lib/e-cert.c:744
 msgid "Algorithm Identifier"
 msgstr "Identificador do algoritmo"
 
-#: ../smime/lib/e-cert.c:743
+#: ../smime/lib/e-cert.c:752
 msgid "Algorithm Parameters"
 msgstr "ParÃ¡metros do algoritmo"
 
-#: ../smime/lib/e-cert.c:765
+#: ../smime/lib/e-cert.c:774
 msgid "Subject Public Key Info"
 msgstr "InformaciÃ³n do asunto da chave pÃºblica"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:779
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritmo da chave pÃºblica do asunto"
 
-#: ../smime/lib/e-cert.c:785
+#: ../smime/lib/e-cert.c:794
 msgid "Subject's Public Key"
 msgstr "Chave pÃºblica do asunto"
 
-#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
+#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
 msgid "Error: Unable to process extension"
 msgstr "Erro: non Ã© posÃbel procesar a extensiÃ³n"
 
-#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
 msgid "Object Signer"
 msgstr "Asinante do obxecto"
 
-#: ../smime/lib/e-cert.c:831
+#: ../smime/lib/e-cert.c:840
 msgid "SSL Certificate Authority"
 msgstr "Autoridade do certificado SSL"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:844
 msgid "Email Certificate Authority"
 msgstr "Autoridade do certificado de correo"
 
-#: ../smime/lib/e-cert.c:863
+#: ../smime/lib/e-cert.c:872
 msgid "Signing"
 msgstr "Sinatura"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:876
 msgid "Non-repudiation"
 msgstr "Non rexeitar"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:880
 msgid "Key Encipherment"
 msgstr "Cifrado da chave"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:884
 msgid "Data Encipherment"
 msgstr "Cifrado de datos"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:888
 msgid "Key Agreement"
 msgstr "Acordo de chaves"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:892
 msgid "Certificate Signer"
 msgstr "Asinante do certificado"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:896
 msgid "CRL Signer"
 msgstr "Asinante da LRC"
 
-#: ../smime/lib/e-cert.c:935
+#: ../smime/lib/e-cert.c:944
 msgid "Critical"
 msgstr "CrÃtico"
 
-#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
+#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
 msgid "Not Critical"
 msgstr "Non crÃtico"
 
-#: ../smime/lib/e-cert.c:961
+#: ../smime/lib/e-cert.c:970
 msgid "Extensions"
 msgstr "ExtensiÃ³ns"
 
-#: ../smime/lib/e-cert.c:1030
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
+#: ../smime/lib/e-cert.c:1045
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritmo de sinatura do certificado"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1109
 msgid "Issuer"
 msgstr "Emisor"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1164
 msgid "Issuer Unique ID"
 msgstr "ID Ãºnico do emisor"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1183
 msgid "Subject Unique ID"
 msgstr "ID Ãºnico do asunto"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1229
 msgid "Certificate Signature Value"
 msgstr "Valor da sinatura do certificado"
 
@@ -21405,7 +21009,7 @@ msgstr "VisualizaciÃ³n de semana _laboral"
 
 #: ../views/mail/galview.xml.h:1
 msgid "As Sent Folder for Wi_de View"
-msgstr "Como _cartafol de enviados para a visualizaciÃ³n ampla"
+msgstr "Como _cartafol de enviados para a vista ampla"
 
 #: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
@@ -21429,7 +21033,7 @@ msgstr "Por marca de _seguimento"
 
 #: ../views/mail/galview.xml.h:7
 msgid "For _Wide View"
-msgstr "Para a visualizaciÃ³n _ampla"
+msgstr "Para a vista _ampla"
 
 #: ../views/mail/galview.xml.h:8
 msgid "_Messages"
@@ -21448,11 +21052,11 @@ msgid "With _Status"
 msgstr "Con e_stado"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
 msgid "UTC"
 msgstr "UTC"
 
@@ -21482,190 +21086,170 @@ msgstr ""
 msgid "_Selection"
 msgstr "Modo de selecciÃ³n"
 
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "ColecciÃ³n"
-
-#: ../widgets/menus/gal-define-views-dialog.c:332
+#: ../widgets/menus/gal-define-views-dialog.c:346
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
-msgstr "Definir visualizaciÃ³ns para %s"
+msgstr "Definir vistas para %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:340
-#: ../widgets/menus/gal-define-views-dialog.c:342
+#: ../widgets/menus/gal-define-views-dialog.c:354
+#: ../widgets/menus/gal-define-views-dialog.c:356
 msgid "Define Views"
-msgstr "Definir visualizaciÃ³ns"
+msgstr "Definir vistas"
 
 #: ../widgets/menus/gal-define-views.ui.h:2
 #, no-c-format
 msgid "Define Views for \"%s\""
-msgstr "Definir visualizaciÃ³ns para \"%s\""
+msgstr "Definir vistas para Â«%sÂ»"
 
 #: ../widgets/menus/gal-view-factory-etable.c:113
 msgid "Table"
 msgstr "TÃ¡boa"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "Instancia"
-
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
-msgstr "Gardar visualizaciÃ³n actual"
+msgstr "Gardar vista actual"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
 msgid "_Create new view"
-msgstr "_Crear visualizaciÃ³n nova"
+msgstr "_Crear vista nova"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
 msgid "_Replace existing view"
-msgstr "_SubstituÃr visualizaciÃ³n existente"
-
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "FactorÃa"
+msgstr "_SubstituÃr vista existente"
 
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
-msgstr "Definir visualizaciÃ³ns novas"
+msgstr "Definir vistas novas"
 
 #: ../widgets/menus/gal-view-new-dialog.ui.h:1
 msgid "Name of new view:"
-msgstr "Nome da visualizaciÃ³n nova:"
+msgstr "Nome da vista nova:"
 
 #: ../widgets/menus/gal-view-new-dialog.ui.h:2
 msgid "Type of View"
-msgstr "Tipo de visualizaciÃ³n"
+msgstr "Tipo de vista"
 
 #: ../widgets/menus/gal-view-new-dialog.ui.h:3
 msgid "Type of view:"
-msgstr "Tipo de visualizaciÃ³n:"
+msgstr "Tipo de vista:"
 
-#: ../widgets/misc/e-account-manager.c:348
+#: ../widgets/misc/e-account-manager.c:351
 msgid "De_fault"
 msgstr "Pre_determinado"
 
-#: ../widgets/misc/e-account-tree-view.c:224
-msgid "Account Name"
-msgstr "Nome da conta"
-
-#: ../widgets/misc/e-account-tree-view.c:255
+#: ../widgets/misc/e-account-tree-view.c:261
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "_AcciÃ³ns"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr "Un GtkRadioAction"
-
-#: ../widgets/misc/e-attachment-dialog.c:305
+#: ../widgets/misc/e-attachment-dialog.c:307
 msgid "Attachment Properties"
 msgstr "Propiedades de anexos"
 
-#: ../widgets/misc/e-attachment-dialog.c:328
+#: ../widgets/misc/e-attachment-dialog.c:332
 msgid "_Filename:"
 msgstr "Nome do _ficheiro:"
 
-#: ../widgets/misc/e-attachment-dialog.c:363
+#: ../widgets/misc/e-attachment-dialog.c:367
 msgid "MIME Type:"
 msgstr "Tipo MIME:"
 
-#: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:550
+#: ../widgets/misc/e-attachment-dialog.c:375
+#: ../widgets/misc/e-attachment-store.c:525
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suxerir mostrar o anexo automaticamente"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:100
 msgid "Could not set as background"
 msgstr "Non foi posÃbel definir como fondo"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:152
 msgid "Set as _Background"
 msgstr "Definir como _fondo"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:87
+#: ../widgets/misc/e-attachment-handler-sendto.c:90
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
 msgstr[0] "Non foi posÃbel enviar o anexo"
 msgstr[1] "Non foi posÃbel enviar os anexos"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:129
+#: ../widgets/misc/e-attachment-handler-sendto.c:132
 msgid "_Send To..."
 msgstr "_Enviar a..."
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:131
+#: ../widgets/misc/e-attachment-handler-sendto.c:134
 msgid "Send the selected attachments somewhere"
 msgstr "Enviar os anexos seleccionados a algÃºn lugar"
 
-#: ../widgets/misc/e-attachment-icon-view.c:495
-#: ../widgets/misc/e-attachment-tree-view.c:535
+#: ../widgets/misc/e-attachment-icon-view.c:506
+#: ../widgets/misc/e-attachment-tree-view.c:545
 msgid "Loading"
 msgstr "Cargando"
 
-#: ../widgets/misc/e-attachment-icon-view.c:507
-#: ../widgets/misc/e-attachment-tree-view.c:547
+#: ../widgets/misc/e-attachment-icon-view.c:518
+#: ../widgets/misc/e-attachment-tree-view.c:557
 msgid "Saving"
 msgstr "Gargando"
 
-#: ../widgets/misc/e-attachment-paned.c:87
+#: ../widgets/misc/e-attachment-paned.c:98
 msgid "Hide Attachment _Bar"
 msgstr "Ocultar a _barra de anexos"
 
-#: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:100
+#: ../widgets/misc/e-attachment-paned.c:631
 msgid "Show Attachment _Bar"
 msgstr "Mostrar a _barra de anexos"
 
-#: ../widgets/misc/e-attachment-paned.c:605
-msgid "Show _Attachment Bar"
-msgstr "Mostrar a _barra de anexos"
-
-#: ../widgets/misc/e-attachment-store.c:538
+#: ../widgets/misc/e-attachment-store.c:513
 msgid "Add Attachment"
 msgstr "Engadir anexo"
 
-#: ../widgets/misc/e-attachment-store.c:541
+#: ../widgets/misc/e-attachment-store.c:516
 msgid "A_ttach"
 msgstr "A_nexar"
 
-#: ../widgets/misc/e-attachment-store.c:604
+#: ../widgets/misc/e-attachment-store.c:579
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Gardar anexo"
 msgstr[1] "Gardar anexos"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment-store.c:608
+#: ../widgets/misc/e-attachment.c:1785 ../widgets/misc/e-attachment.c:2327
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:351
 msgid "S_ave All"
 msgstr "G_ardar todos"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:377
 msgid "A_dd Attachment..."
 msgstr "_Engadir anexo..."
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:401
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:408
+msgid "Hid_e All"
+msgstr "O_cultar todos"
+
+#: ../widgets/misc/e-attachment-view.c:415
 msgid "_View Inline"
 msgstr "_Ver en liÃ±a"
 
-#: ../widgets/misc/e-attachment-view.c:639
+#: ../widgets/misc/e-attachment-view.c:422
+msgid "Vie_w All Inline"
+msgstr "_Ver todos en liÃ±a"
+
+#: ../widgets/misc/e-attachment-view.c:739
 #, c-format
 msgid "Open with \"%s\""
-msgstr "Abrir con \"%s\""
+msgstr "Abrir con Â«%sÂ»"
 
-#: ../widgets/misc/e-attachment-view.c:642
+#: ../widgets/misc/e-attachment-view.c:742
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Abrir os anexos en %s"
@@ -21675,183 +21259,124 @@ msgstr "Abrir os anexos en %s"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1002
+#: ../widgets/misc/e-attachment.c:997
 msgid "Attached message"
 msgstr "Mensaxe anexa"
 
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
 msgid "A load operation is already in progress"
 msgstr "Xa se estÃ¡ a executar unha operaciÃ³n de cargado"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1836 ../widgets/misc/e-attachment.c:2637
 msgid "A save operation is already in progress"
 msgstr "Xa se estÃ¡ a executar unha operaciÃ³n de gardado"
 
-#: ../widgets/misc/e-attachment.c:1920
+#: ../widgets/misc/e-attachment.c:1928
 #, c-format
 msgid "Could not load '%s'"
-msgstr "Non foi posÃbel cargar '%s'"
+msgstr "Non foi posÃbel cargar Â«%sÂ»"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1931
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Non foi posÃbel cargar o anexo"
 
-#: ../widgets/misc/e-attachment.c:2199
+#: ../widgets/misc/e-attachment.c:2207
 #, c-format
 msgid "Could not open '%s'"
-msgstr "Non foi posÃbel abrir '%s'"
+msgstr "Non foi posÃbel abrir Â«%sÂ»"
 
-#: ../widgets/misc/e-attachment.c:2202
+#: ../widgets/misc/e-attachment.c:2210
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Non foi posÃbel abrir o anexo"
 
-#: ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:2645
 msgid "Attachment contents not loaded"
 msgstr "Os contidos dos anexos non foron cargados"
 
-#: ../widgets/misc/e-attachment.c:2713
+#: ../widgets/misc/e-attachment.c:2721
 #, c-format
 msgid "Could not save '%s'"
-msgstr "Non foi posÃbel gardar '%s'"
+msgstr "Non foi posÃbel gardar Â«%sÂ»"
 
-#: ../widgets/misc/e-attachment.c:2716
+#: ../widgets/misc/e-attachment.c:2724
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Non foi posÃbel gardar o anexo"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:363
+#: ../widgets/misc/e-buffer-tagger.c:359
 msgid "Ctrl-click to open a link"
 msgstr "Prema para abrir %s"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1258
 msgid "%B %Y"
 msgstr "%B de %Y"
 
-#: ../widgets/misc/e-calendar.c:217
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "Calendario mensual"
 
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "Encher con cor"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "Encher con cor GDK"
-
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "Encher con liÃ±a de puntos"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
-msgid "Minimum width"
-msgstr "Largura mÃnima"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
-msgid "Minimum Width"
-msgstr "Largura mÃnima"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "Espazamento"
-
-#: ../widgets/misc/e-charset-combo-box.c:93
+#: ../widgets/misc/e-charset-combo-box.c:96
 msgid "Character Encoding"
 msgstr "CodificaciÃ³n de caracteres"
 
-#: ../widgets/misc/e-charset-combo-box.c:117
+#: ../widgets/misc/e-charset-combo-box.c:122
 msgid "Enter the character set to use"
 msgstr "Introduza o conxunto de caracteres que se vai usar"
 
-#: ../widgets/misc/e-charset-combo-box.c:336
+#: ../widgets/misc/e-charset-combo-box.c:341
 msgid "Other..."
 msgstr "Outro..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:505
 msgid "Date and Time"
 msgstr "Data e hora"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:526
 msgid "Text entry to input date"
 msgstr "Entrada de texto para introducir a data"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:548
 msgid "Click this button to show a calendar"
 msgstr "Prema este botÃ³n para mostrar un calendario"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:594
 msgid "Drop-down combination box to select time"
 msgstr "Caixa de combinaciÃ³n despregÃ¡bel para seleccionar a hora"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:666
 msgid "No_w"
 msgstr "Ago_ra"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:672
 msgid "_Today"
 msgstr "_Hoxe"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
+#: ../widgets/misc/e-dateedit.c:680
 msgid "_None"
 msgstr "_NingÃºn"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1685 ../widgets/misc/e-dateedit.c:1917
 msgctxt "date"
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1812
 msgid "Invalid Date Value"
 msgstr "O valor da data non Ã© vÃ¡lido"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1856
 msgid "Invalid Time Value"
 msgstr "O valor da hora non Ã© vÃ¡lido"
 
-#: ../widgets/misc/e-import-assistant.c:238
+#: ../widgets/misc/e-import-assistant.c:249
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -21859,40 +21384,37 @@ msgstr ""
 "Escolla o ficheiro que quere importar ao Evolution e seleccione que tipo de "
 "ficheiro Ã© na listaxe."
 
-#: ../widgets/misc/e-import-assistant.c:255
+#: ../widgets/misc/e-import-assistant.c:266
 msgid "F_ilename:"
 msgstr "Nome do f_icheiro:"
 
-#: ../widgets/misc/e-import-assistant.c:265
+#: ../widgets/misc/e-import-assistant.c:276
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: ../widgets/misc/e-import-assistant.c:279
-#: ../widgets/misc/e-import-assistant.c:455
+#: ../widgets/misc/e-import-assistant.c:290
+#: ../widgets/misc/e-import-assistant.c:465
 msgid "File _type:"
 msgstr "_Tipo de ficheiro:"
 
-#: ../widgets/misc/e-import-assistant.c:322
+#: ../widgets/misc/e-import-assistant.c:333
+#: ../widgets/misc/e-import-assistant.c:916
 msgid "Choose the destination for this import"
 msgstr "Escolla o destino desta importaciÃ³n"
 
-#: ../widgets/misc/e-import-assistant.c:347
+#: ../widgets/misc/e-import-assistant.c:358
 msgid "Choose the type of importer to run:"
 msgstr "Seleccione o tipo de importador que se executarÃ¡:"
 
-#: ../widgets/misc/e-import-assistant.c:355
+#: ../widgets/misc/e-import-assistant.c:366
 msgid "Import data and settings from _older programs"
 msgstr "Importar datos e configuraciÃ³n de programas _antigos"
 
-#: ../widgets/misc/e-import-assistant.c:363
+#: ../widgets/misc/e-import-assistant.c:374
 msgid "Import a _single file"
 msgstr "Importar un Ãºni_co ficheiro"
 
-#: ../widgets/misc/e-import-assistant.c:439
-msgid "Select what type of file you want to import from the list."
-msgstr "Seleccione o tipo de ficheiro que quere importar desde a lista."
-
-#: ../widgets/misc/e-import-assistant.c:516
+#: ../widgets/misc/e-import-assistant.c:526
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -21903,17 +21425,38 @@ msgstr ""
 "localizou ningunha configuraciÃ³n que se poida importar. Se\n"
 "quere tentalo de novo, prema o botÃ³n \"AtrÃ¡s\"."
 
-#: ../widgets/misc/e-import-assistant.c:1187
-#: ../widgets/misc/e-import-assistant.c:1214
+#. Install a custom "Cancel Import" button.
+#: ../widgets/misc/e-import-assistant.c:773
+msgid "_Cancel Import"
+msgstr "Cancelar"
+
+#: ../widgets/misc/e-import-assistant.c:915
+msgid "Preview data to be imported"
+msgstr "Previsualizar os datos a importar"
+
+#: ../widgets/misc/e-import-assistant.c:921
+#: ../widgets/misc/e-import-assistant.c:934
+#: ../widgets/misc/e-import-assistant.c:1284
+#: ../widgets/misc/e-import-assistant.c:1350
+#: ../widgets/misc/e-import-assistant.c:1359
+msgid "Import Data"
+msgstr "Importante"
+
+#: ../widgets/misc/e-import-assistant.c:929
+msgid "Select what type of file you want to import from the list."
+msgstr "Seleccione o tipo de ficheiro que quere importar desde a lista."
+
+#: ../widgets/misc/e-import-assistant.c:1274
+#: ../widgets/misc/e-import-assistant.c:1308
 msgid "Evolution Import Assistant"
 msgstr "Asistente de importaciÃ³n do Evolution"
 
-#: ../widgets/misc/e-import-assistant.c:1196
-#: ../widgets/misc/e-import-assistant.c:1248
+#: ../widgets/misc/e-import-assistant.c:1291
+#: ../widgets/misc/e-import-assistant.c:1338
 msgid "Import Location"
 msgstr "Importar localizaciÃ³n"
 
-#: ../widgets/misc/e-import-assistant.c:1207
+#: ../widgets/misc/e-import-assistant.c:1302
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21923,33 +21466,28 @@ msgstr ""
 "Este asistente guiarao no proceso de importaciÃ³n de\n"
 "ficheiros externos ao Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1223
+#: ../widgets/misc/e-import-assistant.c:1316
 msgid "Importer Type"
 msgstr "Tipo de importador"
 
-#: ../widgets/misc/e-import-assistant.c:1232
+#: ../widgets/misc/e-import-assistant.c:1324
 msgid "Select Information to Import"
 msgstr "Seleccione a informaciÃ³n para importar"
 
-#: ../widgets/misc/e-import-assistant.c:1240
+#: ../widgets/misc/e-import-assistant.c:1331
 msgid "Select a File"
 msgstr "Seleccionar un ficheiro"
 
-#: ../widgets/misc/e-import-assistant.c:1255
+#: ../widgets/misc/e-import-assistant.c:1345
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr ""
 "Prema en \"Importar\" para comezar a importar o ficheiro ao Evolution. "
 
-#: ../widgets/misc/e-import-assistant.c:1261
-#: ../widgets/misc/e-import-assistant.c:1271
-msgid "Import Data"
-msgstr "Importante"
-
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:557
 msgid "World Map"
 msgstr "Mapa do mundo"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:559
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21976,126 +21514,56 @@ msgstr ""
 "O Evolution estÃ¡ actualmente desconectado.\n"
 "Prema neste botÃ³n para traballar conectado."
 
-#: ../widgets/misc/e-online-button.c:135
-msgid "The button state is online"
-msgstr "O estado do botÃ³n Ã© conectado"
-
-#: ../widgets/misc/e-paned.c:306
-msgid "Horizontal Position"
-msgstr "PosiciÃ³n horizontal do panel"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr "PosiciÃ³n do panel ao orientalo horizontalmente"
-
-#: ../widgets/misc/e-paned.c:318
-msgid "Vertical Position"
-msgstr "PosiciÃ³n vertical do panel"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr "PosiciÃ³n do panel ao orientalo verticalmente"
-
-#: ../widgets/misc/e-paned.c:330
-msgid "Proportion"
-msgstr "_Propiedades"
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr "ProporciÃ³n do tamaÃ±o do segundo panel"
-
-#: ../widgets/misc/e-paned.c:342
-msgid "Fixed Resize"
-msgstr "_Redimensionar"
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr "Manter o segundo panel fixo durante o redimensionado"
-
-#: ../widgets/misc/e-pilot-settings.c:95
-msgid "Sync with:"
-msgstr "Sincronizar con:"
-
-#: ../widgets/misc/e-pilot-settings.c:103
-msgid "Sync Private Records:"
-msgstr "Sincronizar rexistros privados:"
-
-#: ../widgets/misc/e-pilot-settings.c:112
-msgid "Sync Categories:"
-msgstr "Sincronizar categorÃas:"
-
-#: ../widgets/misc/e-preferences-window.c:218
+#: ../widgets/misc/e-preferences-window.c:278
 msgid "Evolution Preferences"
 msgstr "Preferencias do Evolution"
 
-#: ../widgets/misc/e-search-bar.c:77
+#: ../widgets/misc/e-search-bar.c:81
 #, c-format
 msgid "Matches: %d"
 msgstr "Equivalencias: %d"
 
-#: ../widgets/misc/e-search-bar.c:558
+#: ../widgets/misc/e-search-bar.c:557
 msgid "Close the find bar"
 msgstr "Pechar esta barra de bÃºsqueda"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:565
 msgid "Fin_d:"
 msgstr "_Buscar:"
 
-#: ../widgets/misc/e-search-bar.c:578
+#: ../widgets/misc/e-search-bar.c:577
 msgid "Clear the search"
 msgstr "Limpar bÃºsqueda"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:600
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:606
 msgid "Find the previous occurrence of the phrase"
 msgstr "Buscar a anterior apariciÃ³n na frase"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:616
 msgid "_Next"
 msgstr "_Seguinte"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:622
 msgid "Find the next occurrence of the phrase"
 msgstr "Buscar a seguinte apariciÃ³n na frase"
 
-#: ../widgets/misc/e-search-bar.c:633
+#: ../widgets/misc/e-search-bar.c:632
 msgid "Mat_ch case"
 msgstr "_Coincidir maiÃºsculas e minÃºsculas"
 
-#: ../widgets/misc/e-search-bar.c:661
+#: ../widgets/misc/e-search-bar.c:660
 msgid "Reached bottom of page, continued from top"
 msgstr "Atinxiuse o final da pÃ¡xina, continÃºase pola parte superior"
 
-#: ../widgets/misc/e-search-bar.c:683
+#: ../widgets/misc/e-search-bar.c:682
 msgid "Reached top of page, continued from bottom"
 msgstr "Atinxiuse a parte superior da pÃ¡xina, continÃºase pola parte inferior"
 
-#: ../widgets/misc/e-selection-model-array.c:593
-#: ../widgets/table/e-tree-selection-model.c:803
-msgid "Cursor Row"
-msgstr "Fila de cursor"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "Columna de cursor"
-
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "Clasificador"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "Modo de selecciÃ³n"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "Modo do cursor"
-
-#: ../widgets/misc/e-send-options.c:515
+#: ../widgets/misc/e-send-options.c:516
 msgid "When de_leted:"
 msgstr "Ao e_liminar:"
 
@@ -22116,193 +21584,208 @@ msgid "Delivery Options"
 msgstr "<b>OpciÃ³ns de entrega</b>"
 
 #: ../widgets/misc/e-send-options.ui.h:6
+#| msgid "_Until"
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_AtÃ©"
+
+#: ../widgets/misc/e-send-options.ui.h:7
+#| msgid "_After"
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_Despois"
+
+#: ../widgets/misc/e-send-options.ui.h:8
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "dÃas"
+
+#: ../widgets/misc/e-send-options.ui.h:9
+#| msgid "Wi_thin"
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "Den_tro"
+
+#: ../widgets/misc/e-send-options.ui.h:10
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "dÃas"
+
+#: ../widgets/misc/e-send-options.ui.h:11
 msgid "For Your Eyes Only"
 msgstr "SÃ³ para os seus ollos"
 
-#: ../widgets/misc/e-send-options.ui.h:7
+#: ../widgets/misc/e-send-options.ui.h:12
 msgid "Gene_ral Options"
 msgstr "OpciÃ³ns _xerais"
 
-#: ../widgets/misc/e-send-options.ui.h:10
+#: ../widgets/misc/e-send-options.ui.h:15
 msgid "Mail Receipt"
 msgstr ""
 "Ningunha\n"
 "NotificaciÃ³n de recepciÃ³n de correo"
 
-#: ../widgets/misc/e-send-options.ui.h:12
+#: ../widgets/misc/e-send-options.ui.h:17
 msgid "Proprietary"
 msgstr "Prioridade"
 
-#: ../widgets/misc/e-send-options.ui.h:13
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "R_eply requested"
 msgstr "R_esposta requirida"
 
-#: ../widgets/misc/e-send-options.ui.h:15
+#: ../widgets/misc/e-send-options.ui.h:20
 msgid "Return Notification"
 msgstr "<b>Devolver notificaciÃ³n</b>"
 
-#: ../widgets/misc/e-send-options.ui.h:18
+#: ../widgets/misc/e-send-options.ui.h:23
 msgid "Sta_tus Tracking"
 msgstr "Seguimento de es_tado"
 
-#: ../widgets/misc/e-send-options.ui.h:19
+#: ../widgets/misc/e-send-options.ui.h:24
 msgid "Standard"
 msgstr "Tipo de letra es_tÃ¡ndar:"
 
-#: ../widgets/misc/e-send-options.ui.h:20
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "Status Tracking"
 msgstr "Seguimento de es_tado"
 
-#: ../widgets/misc/e-send-options.ui.h:21
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "Top Secret"
 msgstr "Alto secreto"
 
-#: ../widgets/misc/e-send-options.ui.h:23
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "When acce_pted:"
 msgstr "Ao ace_ptar:"
 
-#: ../widgets/misc/e-send-options.ui.h:24
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "When co_mpleted:"
 msgstr "Ao co_mpletar:"
 
-#: ../widgets/misc/e-send-options.ui.h:25
+#: ../widgets/misc/e-send-options.ui.h:30
 msgid "When decli_ned:"
 msgstr "Ao _rexeitar:"
 
-#: ../widgets/misc/e-send-options.ui.h:26
-msgid "Wi_thin"
-msgstr "Den_tro"
-
-#: ../widgets/misc/e-send-options.ui.h:27
-msgid "_After:"
-msgstr "_Despois:"
-
-#: ../widgets/misc/e-send-options.ui.h:28
+#: ../widgets/misc/e-send-options.ui.h:31
 msgid "_All information"
 msgstr "_Toda a informaciÃ³n"
 
-#: ../widgets/misc/e-send-options.ui.h:29
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Classification:"
 msgstr "_ClasificaciÃ³n:"
 
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Delay message delivery"
 msgstr "_Atrasar a entrega da mensaxe"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delivered"
 msgstr "_Entregada"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Set expiration date"
 msgstr "_Definir a data de vencemento"
 
-#: ../widgets/misc/e-send-options.ui.h:34
-msgid "_Until:"
-msgstr "_AtÃ©:"
-
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When convenient"
 msgstr "_Cando sexa conveniente"
 
-#: ../widgets/misc/e-send-options.ui.h:36
+#: ../widgets/misc/e-send-options.ui.h:38
 msgid "_When opened:"
 msgstr "_Ao abrir:"
 
 #. Translators: Used in send options dialog
-#: ../widgets/misc/e-send-options.ui.h:39
-#| msgid "None"
+#: ../widgets/misc/e-send-options.ui.h:40
 msgctxt "send-options"
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../widgets/misc/e-signature-editor.c:133
-#: ../widgets/misc/e-signature-editor.c:549
-#: ../widgets/misc/e-signature-manager.c:349
-#: ../widgets/misc/e-signature-script-dialog.c:218
+#: ../widgets/misc/e-signature-editor.c:136
+#: ../widgets/misc/e-signature-editor.c:524
+#: ../widgets/misc/e-signature-manager.c:353
+#: ../widgets/misc/e-signature-script-dialog.c:220
 msgid "Unnamed"
 msgstr "Sen nome"
 
-#: ../widgets/misc/e-signature-editor.c:210
+#: ../widgets/misc/e-signature-editor.c:213
 msgid "_Save and Close"
 msgstr "_Gardar e saÃr"
 
-#: ../widgets/misc/e-signature-editor.c:389
+#: ../widgets/misc/e-signature-editor.c:391
 msgid "Edit Signature"
 msgstr "Editar a sinatura"
 
-#: ../widgets/misc/e-signature-editor.c:404
+#: ../widgets/misc/e-signature-editor.c:406
 msgid "_Signature Name:"
 msgstr "Nome da _sinatura:"
 
-#: ../widgets/misc/e-signature-manager.c:294
+#: ../widgets/misc/e-signature-manager.c:298
 msgid "Add Signature Script"
 msgstr "Engadir script de sinatura"
 
-#: ../widgets/misc/e-signature-manager.c:359
+#: ../widgets/misc/e-signature-manager.c:363
 msgid "Edit Signature Script"
 msgstr "Editar a sinatura"
 
-#: ../widgets/misc/e-signature-manager.c:576
+#: ../widgets/misc/e-signature-manager.c:579
 msgid "Add _Script"
 msgstr "Engadir _script"
 
-#: ../widgets/misc/e-signature-script-dialog.c:266
+#: ../widgets/misc/e-signature-script-dialog.c:270
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only."
 msgstr ""
 "A saÃda deste script usarase como a sÃºa\n"
-"sinatura. O nome que especifique usarase sÃ³ para os efectos de visualizaciÃ³n."
+"sinatura. O nome que especifique usarase sÃ³ para os efectos de vista."
 
-#: ../widgets/misc/e-signature-script-dialog.c:311
+#: ../widgets/misc/e-signature-script-dialog.c:315
 msgid "S_cript:"
 msgstr "_Script:"
 
-#: ../widgets/misc/e-signature-script-dialog.c:342
+#: ../widgets/misc/e-signature-script-dialog.c:346
 msgid "Script file must be executable."
 msgstr "O ficheiro de script debe existir e ser executÃ¡bel."
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-url-entry.c:78
 msgid "Click here to go to URL"
 msgstr "Prema aquÃ para ir ao URL"
 
-#: ../widgets/misc/e-web-view.c:352
+#: ../widgets/misc/e-web-view.c:374
 msgid "_Copy Link Location"
 msgstr "_Copiar a localizaciÃ³n da ligazÃ³n"
 
-#: ../widgets/misc/e-web-view.c:354
+#: ../widgets/misc/e-web-view.c:376
 msgid "Copy the link to the clipboard"
 msgstr "Copia obxectos no portapapeis."
 
-#: ../widgets/misc/e-web-view.c:362
+#: ../widgets/misc/e-web-view.c:384
 msgid "_Open Link in Browser"
 msgstr "_Abrir ligazÃ³n no navegador"
 
-#: ../widgets/misc/e-web-view.c:364
+#: ../widgets/misc/e-web-view.c:386
 msgid "Open the link in a web browser"
 msgstr "_Abrir ligazÃ³n no navegador"
 
-#: ../widgets/misc/e-web-view.c:372
+#: ../widgets/misc/e-web-view.c:394
 msgid "_Copy Email Address"
 msgstr "Copiar enderezo de _correo"
 
-#: ../widgets/misc/e-web-view.c:401 ../widgets/misc/e-web-view.c:981
+#: ../widgets/misc/e-web-view.c:423 ../widgets/misc/e-web-view.c:1078
 msgid "Select all text and images"
 msgstr "Seleccionar todo o texto dunha mensaxe"
 
-#: ../widgets/misc/e-web-view.c:756 ../widgets/misc/e-web-view.c:758
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:855 ../widgets/misc/e-web-view.c:857
+#: ../widgets/misc/e-web-view.c:859
 #, c-format
 msgid "Click to call %s"
 msgstr "Prema para chamar %s"
 
-#: ../widgets/misc/e-web-view.c:762
+#: ../widgets/misc/e-web-view.c:861
 msgid "Click to hide/unhide addresses"
 msgstr "Prema para ocultar ou mostrar os enderezos"
 
-#: ../widgets/misc/e-web-view.c:764
+#: ../widgets/misc/e-web-view.c:863
 #, c-format
 msgid "Click to open %s"
 msgstr "Prema para abrir %s"
@@ -22321,25 +21804,25 @@ msgstr "Calendario: desde %s atÃ© %s"
 msgid "evolution calendar item"
 msgstr "elemento de calendario do Evolution"
 
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:174
 msgid "popup list"
 msgstr "lista emerxente"
 
-#: ../widgets/table/e-cell-date-edit.c:303
+#: ../widgets/table/e-cell-date-edit.c:300
 msgid "Now"
 msgstr "Agora"
 
 #. Translators: "None" as a label of a button to unset date in a date table cell
-#: ../widgets/table/e-cell-date-edit.c:320
+#: ../widgets/table/e-cell-date-edit.c:317
 msgctxt "table-date"
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../widgets/table/e-cell-date-edit.c:328
+#: ../widgets/table/e-cell-date-edit.c:325
 msgid "OK"
 msgstr "Aceptar"
 
-#: ../widgets/table/e-cell-date-edit.c:878
+#: ../widgets/table/e-cell-date-edit.c:869
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "A data ten que ser introducida no formato: %s"
@@ -22348,70 +21831,34 @@ msgstr "A data ten que ser introducida no formato: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "A porcentaxe ten que ser un valor entre 0 e 100, incluÃdos"
 
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "Columna seleccionada"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "Columna enfocada"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "Columna non seleccionada"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "Riscar columna"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "SubliÃ±ar columna"
-
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "Columna en negra"
-
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "Cor da columna"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "Cor de fondo da columna"
-
-#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/e-table-click-to-add.c:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "prema para engadir"
 
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "Estado"
-
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(Ascendente)"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(Descendente)"
 
-#: ../widgets/table/e-table-config.c:388
+#: ../widgets/table/e-table-config.c:392
 msgid "Not sorted"
 msgstr "Sen ordenar"
 
-#: ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:433
 msgid "No grouping"
 msgstr "Sen agrupar"
 
-#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.c:654
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Mostrar os campos"
 
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:674
 msgid "Available Fields"
 msgstr "Campos dispoÃ±Ãbeis"
 
@@ -22420,7 +21867,7 @@ msgid "A_vailable Fields:"
 msgstr "Campos _dispoÃ±Ãbeis:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Ascending"
 msgstr "Ascendente"
 
@@ -22433,7 +21880,7 @@ msgid "Clear _All"
 msgstr "Limp_ar todo"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Descending"
 msgstr "Descendente"
 
@@ -22451,11 +21898,11 @@ msgstr "Mover _arriba"
 
 #: ../widgets/table/e-table-config.ui.h:12
 msgid "Show _field in View"
-msgstr "M_ostrar o campo na visualizaciÃ³n"
+msgstr "M_ostrar o campo na vista"
 
 #: ../widgets/table/e-table-config.ui.h:13
 msgid "Show field i_n View"
-msgstr "Mos_trar o campo na visualizaciÃ³n"
+msgstr "Mos_trar o campo na vista"
 
 #: ../widgets/table/e-table-config.ui.h:14
 msgid "Show field in _View"
@@ -22483,7 +21930,7 @@ msgstr "_Agrupar por..."
 
 #: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
-msgstr "Mo_strar o campo na visualizaciÃ³n"
+msgstr "Mo_strar o campo na vista"
 
 #: ../widgets/table/e-table-config.ui.h:23
 msgid "_Show these fields in order:"
@@ -22493,7 +21940,7 @@ msgstr "_Mostrar estes campos por orde:"
 msgid "_Sort..."
 msgstr "_Ordenar..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
 msgid "Add a Column"
 msgstr "Engadir unha c_olumna..."
 
@@ -22505,248 +21952,112 @@ msgstr ""
 "Para engadir unha columna Ã¡ sÃºa tÃ¡boa, arrÃ¡strea Ã¡\n"
 "localizaciÃ³n na que quere que apareza."
 
-#: ../widgets/table/e-table-group-container.c:342
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:351
 #, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
 msgstr[0] "%s : %s (%d elemento)"
 msgstr[1] "%s : %s (%d elementos)"
 
-#: ../widgets/table/e-table-group-container.c:348
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d elemento)"
 msgstr[1] "%s (%d elementos)"
 
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "Alternar as cores das filas"
-
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "Debuxar a grade horizontal"
-
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "Debuxar a grade vertical"
-
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "Debuxar o foco"
-
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "Modo de cursor"
-
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "Modelo de selecciÃ³n"
-
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "LÃmite de lonxitude"
-
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "Altura uniforme da fila"
-
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "Conxelado"
-
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1546
 msgid "Customize Current View"
-msgstr "Personalizar a visualizaciÃ³n actual"
+msgstr "Personalizar a vista actual"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1567
 msgid "Sort _Ascending"
 msgstr "Orde _ascendente"
 
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1570
 msgid "Sort _Descending"
 msgstr "Orde _descendente"
 
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1573
 msgid "_Unsort"
 msgstr "Sen ord_enar"
 
-#: ../widgets/table/e-table-header-item.c:1517
+#: ../widgets/table/e-table-header-item.c:1576
 msgid "Group By This _Field"
 msgstr "Agrupar por este ca_mpo"
 
-#: ../widgets/table/e-table-header-item.c:1520
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Group By _Box"
 msgstr "Agrupar por cai_xa"
 
-#: ../widgets/table/e-table-header-item.c:1524
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Remove This _Column"
 msgstr "Eliminar esta _columna"
 
-#: ../widgets/table/e-table-header-item.c:1527
+#: ../widgets/table/e-table-header-item.c:1586
 msgid "Add a C_olumn..."
 msgstr "Engadir unha c_olumna..."
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1590
 msgid "A_lignment"
 msgstr "A_liÃ±amento"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1593
 msgid "B_est Fit"
 msgstr "Axuste Ã³pt_imo"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1596
 msgid "Format Column_s..."
 msgstr "Formatar columna_s..."
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1600
 msgid "Custo_mize Current View..."
-msgstr "Perso_nalizar a visualizaciÃ³n actual..."
+msgstr "Perso_nalizar a vista actual..."
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1659
 msgid "_Sort By"
 msgstr "O_rdenar por"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1618
+#: ../widgets/table/e-table-header-item.c:1677
 msgid "_Custom"
 msgstr "_Personalizado"
 
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "Cabeceira da tÃ¡boa"
-
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "Modelo da tÃ¡boa"
-
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "Fila do cursor"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "Ordenar a informaciÃ³n"
-
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "Buscar sempre"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "Premer para engadir"
-
-#: ../widgets/table/e-table.c:3374
-msgid "Vertical Row Spacing"
-msgstr "Debuxar a grade vertical"
-
-#: ../widgets/table/e-table.c:3375
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr ""
-"Espazo vertical entre filas. EngÃ¡dese na parte superior e inferior dunha fila"
-
-#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "Adaptador de tÃ¡boa Etree"
-
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "Aparencia retro"
-
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "Debuxar liÃ±as e expansores +/-."
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "TamaÃ±o do expansor"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "TamaÃ±o da frecha do expansor"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "emerxente"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 msgid "popup a child"
 msgstr "emerxer un fillo"
 
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "editar"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
 msgid "begin editing this cell"
 msgstr "comezar a editar esta cela"
 
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "alternar o estado"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
 msgstr "alternar o estado da cela"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "expandir"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
 msgid "expands the row in the ETree containing this cell"
 msgstr "expande a fila no ETree que contÃ©n esta cela"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "contraer"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
 msgstr "contrae a fila no ETree que contÃ©n esta cela"
 
@@ -22762,130 +22073,10 @@ msgstr "premer"
 msgid "sort"
 msgstr "ordenar"
 
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2536
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ../widgets/text/e-text.c:2498
+#: ../widgets/text/e-text.c:2548
 msgid "Input Methods"
 msgstr "MÃ©todos de entrada"
-
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "Procesador de eventos"
-
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "Texto"
-
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "Negra"
-
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "Riscado"
-
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "Ã?ncora"
-
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "AliÃ±amento"
-
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "Largura do clip"
-
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "Altura do clip"
-
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "Clip"
-
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "Encher o rectÃ¡ngulo do clip"
-
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "Desprazamento X"
-
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "Desprazamento Y"
-
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "Largura do texto"
-
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "Altura do texto"
-
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "Usar a elipse"
-
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "Elipse"
-
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "Axuste de liÃ±a"
-
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "Caracteres de quebra"
-
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "MÃ¡ximo de liÃ±as"
-
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "Debuxar os bordos"
-
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "Permitir liÃ±as novas"
-
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "Debuxar o fondo"
-
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "Debuxar o botÃ³n"
-
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "PosiciÃ³n do cursor"
-
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "Contexto MI"
-
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "Tirador emerxente"
-
-#~ msgid "Check this to use system timezone in Evolution."
-#~ msgstr "Active isto para empregar o fuso horario do sistema en Evolution."
-
-#~ msgid "New Tab"
-#~ msgstr "Novo _separador"
-
-#~ msgid "Quit"
-#~ msgstr "SaÃr"
-
-#~ msgid "address card"
-#~ msgstr "tarxeta de enderezo"
-
-#~ msgid "calendar information"
-#~ msgstr "informaciÃ³n de calendario"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]