[evolution] Updated Galician translations. REVIEWD by Marcos Lans



commit 84a36f3dcfbee78aaaafe92f94bd5d02a94eb6ac
Author: Marcos Lans <marcoslansgarza gmail com>
Date:   Sat Nov 13 02:05:12 2010 +0100

    Updated Galician translations. REVIEWD by Marcos Lans

 po/gl.po |11127 +++++++++++++++++++++++++++++---------------------------------
 1 files changed, 5151 insertions(+), 5976 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index f7759af..5a331b2 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -15,17 +15,18 @@
 # Mancomún - Centro de Referencia e Servizos de Software Libre <g11n mancomun org>, 2009.
 # Antón Méixome <meixome mancomun org>, 2009.
 # Antón Méixome <meixome certima net>, 2010.
-# Fran Diéguez <frandieguez ubuntu com>, 2009, 2010.
 # Fran Dieguez <frandieguez ubuntu com>, 2010.
+# Fran Diéguez <frandieguez ubuntu com>, 2009, 2010.
 #
-#: ../shell/main.c:533
+#: ../shell/main.c:579
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-master-po-gl-53747.merged\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-13 10:35+0200\n"
-"PO-Revision-Date: 2010-09-13 10:38+0200\n"
-"Last-Translator: Fran Dieguez <frandieguez ubuntu com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution\n"
+"POT-Creation-Date: 2010-11-12 09:12+0000\n"
+"PO-Revision-Date: 2010-11-13 02:04+0100\n"
+"Last-Translator: Fran Diéguez <frandieguez ubuntu com>\n"
 "Language-Team: Galician <gnome-gl-list gnome org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,6 +34,7 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: KBabel 1.11.4\n"
+"X-Poedit-Language: Galician\n"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
@@ -40,16 +42,15 @@ 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 vista de "
-"Contactos.: %s"
+"«{0}» é unha axenda de enderezos só de lectura e non se pode modificar.  "
+"Seleccione unha axenda de enderezos diferente na barra lateral en Contactos."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
 msgstr ""
-"Xa existe un contacto con ese enderezo. Quere, aínda así, engadir unha "
+"Xa existe un contacto con ese enderezo. Quere, de todas formas, engadir unha "
 "tarxeta nova co mesmo enderezo?"
 
 #: ../addressbook/addressbook.error.xml.h:4
@@ -81,11 +82,11 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
-msgstr "Non é posíbel obter o esquema de información para o servidor LDAP."
+msgstr "Non foi posíbel obter a información do esquema para o servidor LDAP."
 
 #: ../addressbook/addressbook.error.xml.h:10
 msgid "Could not remove address book."
-msgstr "Non é posíbel eliminar a axenda de enderezos."
+msgstr "Non foi posíbel eliminar a axenda de enderezos."
 
 #: ../addressbook/addressbook.error.xml.h:11
 msgid ""
@@ -93,17 +94,17 @@ msgid ""
 "Evolution. Please use some other GroupWise mail client once to get your "
 "GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr ""
-"Actualmente vostede só pode acceder á axenda de enderezos do sistema "
-"GropuWise desde o Evolution. Empregue unha vez o seu cliente de Correo "
-"GroupWise para obter os seus contactos frecuentes do Groupwise e os seus "
-"cartafoles de contactos persoais do GroupWise."
+"Actualmente só pode acceder á axenda de enderezos do sistema GropuWise desde "
+"o Evolution. Empregue unha vez algún cliente de Correo GroupWise para obter "
+"os seus contactos frecuentes do Groupwise e os seus cartafoles de contactos "
+"persoais do GroupWise."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{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
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:46
 msgid "Do _Not Delete"
 msgstr "_Non eliminar"
 
@@ -127,7 +128,7 @@ msgstr "Creación da axenda de enderezos do GroupWise:"
 
 #: ../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."
+msgstr "O servidor LDAP non respondeu cunha información do esquema correcta."
 
 #: ../addressbook/addressbook.error.xml.h:19
 msgid "Some features may not work properly with your current server"
@@ -156,7 +157,7 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book could not be opened."
-msgstr "Non é posíbel abrir esta axenda de enderezos."
+msgstr "Non foi posíbel abrir esta axenda de enderezos."
 
 #: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book server does not have any suggested search bases."
@@ -168,9 +169,9 @@ msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
-"Este servidor de axenda de enderezos pode ser inatinxíbel ou o nome do "
-"servidor pode estar escrito incorrectamente, ou a súa conexión de rede pode "
-"estar caída."
+"Este servidor de axenda de enderezos pode ser inatinxíbel, o nome do "
+"servidor quizais estea escrito incorrectamente ou pode que caese a conexión "
+"de rede."
 
 #: ../addressbook/addressbook.error.xml.h:26
 msgid "This address book will be removed permanently."
@@ -178,7 +179,7 @@ msgstr "Esta axenda de enderezos eliminarase permanentemente."
 
 #: ../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."
+msgstr "Este servidor non é compatíbel co esquema de información LDAPv3."
 
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to open address book"
@@ -201,8 +202,8 @@ 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?"
 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?"
+"Está tentando mover un contacto dunha axenda de enderezos a outra, mais non "
+"é posíbel eliminalo da orixe. Quere gardar unha copia no seu lugar?"
 
 #: ../addressbook/addressbook.error.xml.h:33
 msgid ""
@@ -210,14 +211,13 @@ msgid ""
 "problems using Evolution. For best results the server should be upgraded to "
 "a supported version"
 msgstr ""
-"Está conectado cun servidor GroupWise non compatíbel e podería encontrar "
-"problemas ao usar o Evolution. Para ter os mellores resultados o servidor "
-"debería ser actualizado a unha versión compatíbel"
+"Está conectado con un servidor GroupWise non compatíbel e podería encontrar "
+"problemas ao usar o Evolution. Para ter os mellores resultados, o servidor "
+"debería actualizarse a unha versión compatíbel"
 
 #: ../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."
+msgstr "Non ten permisos para eliminar contactos desta axenda de enderezos."
 
 #: ../addressbook/addressbook.error.xml.h:35
 msgid ""
@@ -229,12 +229,12 @@ msgstr "Fixo modificacións neste contacto. Quere gardar esas modificacións?"
 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."
+"Os contactos para {0} non estarán dispoñíbeis até que se reinicie o "
+"Evolution."
 
-#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:525
+#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:603
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
-#: ../plugins/groupwise-features/properties.ui.h:10
+#: ../plugins/groupwise-features/properties.ui.h:9
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "Eng_adir"
@@ -257,7 +257,7 @@ msgstr "_Usar tal como está"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:2020
+#: ../calendar/gui/e-calendar-view.c:2087
 msgid "Anniversary"
 msgstr "Aniversario"
 
@@ -268,8 +268,8 @@ 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:2019 ../capplet/anjal-settings-main.c:117
-#: ../shell/main.c:122
+#: ../calendar/gui/e-calendar-view.c:2086 ../capplet/anjal-settings-main.c:123
+#: ../shell/main.c:133
 msgid "Birthday"
 msgstr "Aniversario"
 
@@ -279,7 +279,7 @@ msgid "Blog:"
 msgstr "Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegorías..."
@@ -294,21 +294,21 @@ msgid "Contact"
 msgstr "Contacto"
 
 #: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:592
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2585
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:295
+#: ../addressbook/gui/merging/eab-contact-merging.c:298
 #: ../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:832
+#: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:832
 msgid "Email"
-msgstr "Correo Electrónico"
+msgstr "Correo electrónico"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Free/Busy:"
@@ -319,14 +319,14 @@ msgid "Full _Name..."
 msgstr "_Nome completo..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
-msgstr "Enderezo"
+msgstr "Particular"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
-msgstr "Páxina de _inicio:"
+msgstr "Páxina web:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
@@ -334,7 +334,7 @@ msgstr "Imaxe"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
-msgstr "<b>Mensaxaría instantánea</b>"
+msgstr "Mensaxaría instantánea"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
@@ -354,7 +354,7 @@ msgid "Nic_kname:"
 msgstr "_Alcume:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:250
+#: ../modules/calendar/e-memo-shell-migrate.c:260
 #: ../plugins/groupwise-features/camel-gw-listener.c:423
 #: ../plugins/groupwise-features/camel-gw-listener.c:448
 #: ../plugins/groupwise-features/camel-gw-listener.c:563
@@ -362,10 +362,10 @@ msgid "Notes"
 msgstr "Notas"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1725
+#: ../calendar/gui/e-calendar-view.c:1792
 msgid "Other"
 msgstr "Outros"
 
@@ -383,14 +383,14 @@ msgstr "_Videoconferencia:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
-msgstr "<b>Enderezos Web</b>"
+msgstr "Enderezos web"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 msgid "Web addresses"
-msgstr "Enderezos Web"
+msgstr "Enderezos web"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
 msgid "Work"
@@ -417,9 +417,9 @@ 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:17
-#: ../plugins/itip-formatter/itip-view.c:1921
+#: ../calendar/gui/dialogs/event-page.c:887
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../plugins/itip-formatter/itip-view.c:1922
 msgid "_Calendar:"
 msgstr "_Calendario:"
 
@@ -449,11 +449,11 @@ msgstr "_Dispoñibilidade:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Home Page:"
-msgstr "Páxina de _inicio:"
+msgstr "Páxi_na web:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Manager:"
-msgstr "_Xestor:"
+msgstr "_Director:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Office:"
@@ -461,7 +461,7 @@ msgstr "_Oficina:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_PO Box:"
-msgstr "_Apdo. de correos:"
+msgstr "A_partado de correos:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Profession:"
@@ -473,7 +473,7 @@ msgstr "_Cónxuxe:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_State/Province:"
-msgstr "E_stado/Provincia:"
+msgstr "Provincia/E_stado:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
@@ -486,7 +486,7 @@ msgstr "_Videoconferencia:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Wants to receive HTML mail"
-msgstr "_Quere recibir correo en HTML"
+msgstr "_Quere recibir o correo en HTML"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
@@ -497,100 +497,100 @@ msgstr "_Onde:"
 msgid "_Zip/Postal Code:"
 msgstr "_Código Postal:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
 #: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
 #: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
 #: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:368
 msgid "Error adding contact"
 msgstr "Produciuse un erro ao engadir o contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:225
 msgid "Error modifying contact"
 msgstr "Produciuse un erro ao modificar o contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:239
 msgid "Error removing contact"
 msgstr "Produciuse un erro ao eliminar o contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:599
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2578
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:602
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2580
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de Contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3001
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3003
 msgid "Please select an image for this contact"
 msgstr "Escolla unha imaxe para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3002
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3004
 msgid "_No image"
 msgstr "_Sen imaxe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3275
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3277
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr ""
-"Os datos de contacto non son válidos:\n"
+"Os datos do contacto son incorrectos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3281
 #, c-format
 msgid "'%s' has an invalid format"
-msgstr "«%s» ten un formato non válido"
+msgstr "«%s» ten un formato incorrecto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3288
 #, c-format
 msgid "%s'%s' has an invalid format"
-msgstr "%s«%s» ten un formato non válido"
+msgstr "%s«%s» ten un formato incorrecto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3301
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3303
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3314
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» está baleiro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3326
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3328
 msgid "Invalid contact."
-msgstr "Contacto non válido."
+msgstr "Contacto incorrecto."
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
@@ -610,7 +610,7 @@ msgstr "Correo _electrónico"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
-msgstr "_Seleccione a axenda de enderezos"
+msgstr "_Seleccionar a axenda de enderezos"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
@@ -639,7 +639,7 @@ msgstr "III"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:7
 msgid "Jr."
-msgstr "Jr."
+msgstr "fillo"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:8
 msgid "Miss"
@@ -655,7 +655,7 @@ msgstr "Sra."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:11
 msgid "Ms."
-msgstr "Srta."
+msgstr "Sra. ou Srta."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:12
 msgid "Sr."
@@ -678,24 +678,24 @@ 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:657
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:659
 msgid "Contact List Editor"
 msgstr "Editor da lista de contactos"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
 msgid "Members"
-msgstr "_Integrantes"
+msgstr "Membros"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 msgid "_Hide addresses when sending mail to this list"
-msgstr "_Ocultar os enderezos cando se envíe correo a esta lista"
+msgstr "_Ocultar os enderezos cando se envíe un correo a esta lista"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "_List name:"
-msgstr "_Nome da lista:"
+msgstr "Nome da _lista:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:173
+#: ../mail/mail-config.ui.h:154
 msgid "_Select..."
 msgstr "_Seleccionar..."
 
@@ -704,24 +704,24 @@ 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:751
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
 msgid "Contact List Members"
 msgstr "Membros da lista de contactos"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:905
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1320
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:907
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1322
 msgid "_Members"
-msgstr "_Integrantes"
+msgstr "_Membros"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1160
 msgid "Error adding list"
 msgstr "Produciuse un erro ao engadir a lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1174
 msgid "Error modifying list"
 msgstr "Produciuse un erro ao modificar a lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1188
 msgid "Error removing list"
 msgstr "Produciuse un erro ao eliminar a lista"
 
@@ -763,27 +763,27 @@ 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:241
+#: ../addressbook/gui/merging/eab-contact-merging.c:244
 msgid "_Merge"
 msgstr "_Combinar"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:166
+#: ../addressbook/gui/merging/eab-contact-merging.c:169
 #: ../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
+#: ../addressbook/gui/merging/eab-contact-merging.c:227
 msgid "Merge Contact"
-msgstr "Combinar contacto"
+msgstr "Combinar o 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: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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1692
+#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Any field contains"
 msgstr "Calquera campo contén"
 
@@ -797,49 +797,49 @@ msgstr "O correo comeza por"
 msgid "Name contains"
 msgstr "O nome contén"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:143
+#: ../addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "No contacts"
 msgstr "Sen contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:147
+#: ../addressbook/gui/widgets/e-addressbook-model.c:153
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d contacto"
 msgstr[1] "%d contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:317
+#: ../addressbook/gui/widgets/e-addressbook-model.c:327
 msgid "Error getting book view"
-msgstr "Produciuse un erro ao obter a vista da axenda de enderezos"
+msgstr "Produciuse un erro ao obter a visualización da axenda de enderezos"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:716
+#: ../addressbook/gui/widgets/e-addressbook-model.c:740
 msgid "Search Interrupted"
-msgstr "Búsqueda interrompida"
+msgstr "Busca interrumpida"
 
 #: ../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:626
+#: ../addressbook/gui/widgets/e-addressbook-view.c:625
 msgid "Cut selected contacts to the clipboard"
-msgstr "Cortar o texto seleccionado para o portapapeis"
+msgstr "Cortar os contactos seleccionados ao portapapeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:632
+#: ../addressbook/gui/widgets/e-addressbook-view.c:631
 msgid "Copy selected contacts to the clipboard"
-msgstr "Copiar o texto seleccionado ao portapapeis"
+msgstr "Copiar os contactos seleccionados ao portapapeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:638
+#: ../addressbook/gui/widgets/e-addressbook-view.c:637
 msgid "Paste contacts from the clipboard"
 msgstr "Pegar os contactos desde o portapapeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:644
+#: ../addressbook/gui/widgets/e-addressbook-view.c:643
 #: ../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:650
+#: ../addressbook/gui/widgets/e-addressbook-view.c:649
 msgid "Select all visible contacts"
-msgstr "Seleccionar todos os contactos"
+msgstr "Seleccionar todos os contactos visíbeis"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1295
 msgid "Are you sure you want to delete these contact lists?"
@@ -847,12 +847,12 @@ msgstr "Está seguro de que quere eliminar estas listas de contactos?"
 
 #: ../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?"
+msgstr "Está seguro de que quere eliminar esta lista de contactos?"
 
 #: ../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)?"
+msgstr "Está seguro de que quere eliminar esta lista de contactos (%s)?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1309
 msgid "Are you sure you want to delete these contacts?"
@@ -860,12 +860,12 @@ msgstr "Está seguro de que quere eliminar estes contactos?"
 
 #: ../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?"
+msgstr "Está seguro de que quere eliminar este contacto?"
 
 #: ../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)?"
+msgstr "Está seguro de que quere eliminar este contacto (%s)?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1472
 #, c-format
@@ -873,8 +873,8 @@ msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
-"Ao abrir %d contacto abrirá tamén %d novas xanelas.\n"
-"Está seguro de que quere mostrar este contacto?"
+"Ao abrir %d contactos abrirá tamén %d novas xanelas.\n"
+"Está seguro de que quere visualizar todos estes contactos?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1477
 msgid "_Don't Display"
@@ -887,11 +887,11 @@ msgstr "Mostrar _todos os contactos"
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:560
 msgid "Assistant"
-msgstr "Axudante"
+msgstr "Asistente"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
-msgstr "Teléfono do axudante"
+msgstr "Teléfono do asistente"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
@@ -914,7 +914,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:11
+#: ../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
@@ -928,7 +928,7 @@ msgstr "Empresa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 msgid "Company Phone"
-msgstr "Teléfono de empresa"
+msgstr "Teléfono da empresa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email 2"
@@ -940,7 +940,7 @@ msgstr "Correo electrónico 3"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Family Name"
-msgstr "Apelido"
+msgstr "Apelidos"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
@@ -968,12 +968,12 @@ msgstr "Teléfono RDSI"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Journal"
-msgstr "Diario"
+msgstr "Xornal"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 #: ../addressbook/gui/widgets/eab-contact-display.c:559
 msgid "Manager"
-msgstr "Xestor"
+msgstr "Director"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 #: ../addressbook/gui/widgets/eab-contact-display.c:580
@@ -1004,7 +1004,7 @@ msgstr "Outro teléfono"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
-msgstr "Buscador"
+msgstr "Buscapersoas"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
@@ -1018,7 +1018,7 @@ msgstr "Radio"
 #: ../calendar/gui/e-meeting-list-view.c:569
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
-msgstr "Rol"
+msgstr "Función"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 #: ../addressbook/gui/widgets/eab-contact-display.c:584
@@ -1051,7 +1051,7 @@ msgstr "Unidade"
 msgid "Web Site"
 msgstr "Sitio Web"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1061,7 +1061,7 @@ msgstr ""
 "\n"
 "Buscando os contactos..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1075,7 +1075,7 @@ msgstr ""
 "\n"
 "ou prema dúas veces aquí para crear un contacto novo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1085,11 +1085,11 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Non hai elementos para mostrar nesta vista.\n"
+"Non hai elementos para mostrar nesta visualización.\n"
 "\n"
 "Prema aquí dúas veces para crear un contacto novo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:196
 msgid ""
 "\n"
 "\n"
@@ -1099,7 +1099,7 @@ msgstr ""
 "\n"
 "Buscar o contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:195
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1107,18 +1107,18 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Non hai elementos para mostrar nesta vista."
+"Non hai elementos para mostrar nesta visualización."
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Work Email"
 msgstr "Correo electrónico do traballo"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:102
 msgid "Home Email"
 msgstr "Correo electrónico particular"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:807
+#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:808
 msgid "Other Email"
 msgstr "Outro correo electrónico"
 
@@ -1140,8 +1140,8 @@ msgstr "Lista de contactos nova"
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "o cartafol de axendas de enderezos actual %s ten %d tarxeta"
-msgstr[1] "o cartafol de axendas de enderezos actual %s ten %d tarxetas"
+msgstr[0] "o cartafol das axendas de enderezos actual %s ten %d tarxeta"
+msgstr[1] "o cartafol das axendas de enderezos actual %s ten %d tarxetas"
 
 #: ../addressbook/gui/widgets/ea-minicard.c:31
 msgid "Open"
@@ -1161,22 +1161,22 @@ msgstr "minitarxeta do Evolution"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:174
 msgid "Copy _Email Address"
-msgstr "Copiar enderezo de _correo"
+msgstr "Copiar o enderezo de _correo"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:396
+#: ../widgets/misc/e-web-view.c:395
 msgid "Copy the email address to the clipboard"
-msgstr "Copia obxectos no portapapeis."
+msgstr "Copiar o enderezo de correo ao portapapeis"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:401
+#: ../widgets/misc/e-web-view.c:400
 msgid "_Send New Message To..."
-msgstr "_Enviar unha mensaxe nova a..."
+msgstr "Enviar unha men_saxe nova a..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:403
+#: ../widgets/misc/e-web-view.c:402
 msgid "Send a mail message to this address"
-msgstr "Converte unha mensaxe nunha tarefa."
+msgstr "Enviar unha mensaxe a este enderezo"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:258
 #: ../addressbook/gui/widgets/eab-contact-display.c:260
@@ -1191,7 +1191,7 @@ msgstr "mapa"
 #: ../addressbook/gui/widgets/eab-contact-display.c:415
 #: ../addressbook/gui/widgets/eab-contact-display.c:778
 msgid "List Members"
-msgstr "Listar integrantes"
+msgstr "Listar os membros"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Department"
@@ -1210,10 +1210,10 @@ msgid "Video Chat"
 msgstr "Videoconferencia"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/dialogs/calendar-setup.c:376
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:488
+#: ../modules/calendar/e-cal-shell-view.c:497
 #: ../plugins/groupwise-features/camel-gw-listener.c:421
 #: ../plugins/groupwise-features/camel-gw-listener.c:446
 #: ../plugins/groupwise-features/camel-gw-listener.c:561
@@ -1223,9 +1223,9 @@ 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:128
-#: ../calendar/gui/dialogs/event-editor.c:355
+#: ../calendar/gui/dialogs/event-editor.c:127
+#: ../calendar/gui/dialogs/event-editor.c:354
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Dispoñibilidade"
@@ -1250,23 +1250,23 @@ msgstr "Páxina persoal"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:577
 msgid "Web Log"
-msgstr "Blogue"
+msgstr "Blog"
 
 #. 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:350
+#: ../capplet/settings/mail-capplet-shell.c:360
 #: ../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:112
-#: ../modules/calendar/e-task-shell-migrate.c:121
-#: ../plugins/email-custom-header/email-custom-header.c:320
+#: ../modules/calendar/e-cal-shell-backend.c:132
+#: ../modules/calendar/e-cal-shell-migrate.c:158
+#: ../modules/calendar/e-memo-shell-backend.c:116
+#: ../modules/calendar/e-memo-shell-migrate.c:114
+#: ../modules/calendar/e-task-shell-backend.c:116
+#: ../modules/calendar/e-task-shell-migrate.c:123
+#: ../plugins/email-custom-header/email-custom-header.c:323
 msgid "Personal"
 msgstr "Persoal"
 
@@ -1276,14 +1276,14 @@ msgstr "Posto de traballo"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:833
 msgid "Home page"
-msgstr "Páxina de inicio"
+msgstr "Páxina web"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:842
 msgid "Blog"
-msgstr "Blogue"
+msgstr "Blog"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:1011
-#: ../widgets/misc/e-web-view.c:853
+#: ../widgets/misc/e-web-view.c:852
 #, c-format
 msgid "Click to mail %s"
 msgstr "Prema para enviar un correo a %s"
@@ -1299,25 +1299,25 @@ 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:80
+#: ../addressbook/gui/widgets/eab-gui-util.c:98
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
 "and that permissions are set to access it."
 msgstr ""
-"Non é posíbel abrir esta axenda de enderezos. Verifique que o camiño %s "
+"Non é posíbel abrir esta axenda de enderezos. Comprobe que o camiño %s "
 "existe e que están definidos os permisos para acceder a ela."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:92
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 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."
 msgstr ""
-"Esta versión do Evolution non é compatíbel con LDAP compilado nela. Para "
-"usar o LDAP no Evolution ten que ter instalado un paquete do Evolution con "
-"capacidades LDAP."
+"Esta versión do Evolution non ten compilada compatiblidade LDAP.  Para usar "
+"o LDAP no Evolution ten que instalar un paquete do Evolution con capacidades "
+"LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1325,11 +1325,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:109
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid "Detailed error message:"
 msgstr "Mensaxe de erro detallada:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:133
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1341,7 +1341,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:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
 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"
@@ -1355,60 +1355,60 @@ msgstr ""
 "de cartafoles para esta axenda de enderezos."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 #, 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"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 #, 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"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 #, c-format
 msgid "This query did not complete successfully. %s"
-msgstr "Esta consulta non terminou con éxito. %s"
+msgstr "Esta consulta non terminou correctamente. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:202
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
+#: ../addressbook/gui/widgets/eab-gui-util.c:242
 msgid "Select Address Book"
-msgstr "Seleccione a axenda de enderezos"
+msgstr "Seleccionar a axenda de enderezos"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:286
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:441
 msgid "Move contact to"
-msgstr "Mover contacto a"
+msgstr "Mover o contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:427
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Copy contact to"
-msgstr "Copiar contacto a"
+msgstr "Copiar o contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:430
+#: ../addressbook/gui/widgets/eab-gui-util.c:446
 msgid "Move contacts to"
-msgstr "Mover contactos a"
+msgstr "Mover os contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:432
+#: ../addressbook/gui/widgets/eab-gui-util.c:448
 msgid "Copy contacts to"
-msgstr "Copiar contactos a"
+msgstr "Copiar os contactos a"
 
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:39
 msgid "Card View"
 msgstr "Visualización de tarxeta"
 
 #: ../addressbook/importers/evolution-csv-importer.c:720
-#: ../addressbook/importers/evolution-ldif-importer.c:516
+#: ../addressbook/importers/evolution-ldif-importer.c:518
 #: ../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
@@ -1439,11 +1439,11 @@ msgstr "Evolution CSV ou Tab (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV e importador Tab"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:742
+#: ../addressbook/importers/evolution-ldif-importer.c:744
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato de intercambio de datos LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:743
+#: ../addressbook/importers/evolution-ldif-importer.c:745
 msgid "Evolution LDIF importer"
 msgstr "Importador de LDIF do Evolution"
 
@@ -1476,63 +1476,63 @@ msgstr "Non foi posíbel obter unha lista de axendas de enderezos"
 msgid "failed to open book"
 msgstr "produciuse un fallo ao abrir a axenda de enderezos"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:45
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Specify the output file instead of standard output"
-msgstr "Especifique o ficheiro de saída en vez da saída estándar"
+msgstr "Especificar o ficheiro de saída en vez da saída estándar"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:46
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "OUTPUTFILE"
 msgstr "FICHEIRO DE SAÃ?DA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "List local address book folders"
 msgstr "Listar os cartafoles de axendas de enderezos locais"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:66
 msgid "Show cards as vcard or csv file"
-msgstr "Mostrar tarxetas como un ficheiro vcard ou csv"
+msgstr "Mostrar as tarxetas como un ficheiro vcard ou csv"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:70
 msgid "Export in asynchronous mode"
 msgstr "Exportar en modo asíncrono"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:73
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr ""
-"Número de cartas nun ficheiro de saída en modo asíncrono. O tamaño "
+"Número de tarxetas nun ficheiro de saída en modo asíncrono. O tamaño "
 "predefinido é 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:75
 msgid "NUMBER"
 msgstr "NÃ?MERO"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
+#: ../addressbook/tools/evolution-addressbook-export.c:137
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Erro nos argumentos da liña de ordes. Use a opción --help para ver o uso."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:151
 msgid "Only support csv or vcard format."
 msgstr "Só permite os formatos csv ou vcard."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:160
 msgid "In async mode, output must be file."
 msgstr "En modo asíncrono a saída debe ser un ficheiro."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:168
 msgid "In normal mode, there is no need for the size option."
 msgstr "En modo normal non é necesaria a opción de tamaño."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:199
 msgid "Unhandled error"
-msgstr "Erro inmanexábel"
+msgstr "Erro non manipulado"
 
 #: ../addressbook/util/addressbook.c:103
 msgid "Accessing LDAP Server anonymously"
@@ -1552,8 +1552,8 @@ msgstr "Introduza o contrasinal para %s (usuario %s)"
 #: ../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
+#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/publish-calendar/publish-calendar.c:332
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Introduza o contrasinal"
@@ -1565,7 +1565,7 @@ msgid ""
 "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 vista de Calendario."
+"calendario diferente na barra lateral da visualización de Calendario."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
@@ -1589,18 +1589,18 @@ msgid ""
 "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 aos seus "
-"destinatarios sobre o contido."
+"Engadir un resumo significativo á súa tarefa daralle unha idea sobre o "
+"contido."
 
 #: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr ""
-"Vaise eliminar toda a información destas notas e non se poderá restaurar."
+"Vaise eliminar toda a información destas notas e non se poderá restabelecer."
 
 #: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
 msgstr ""
-"Vaise eliminar toda a información desta nota e non se poderá restaurar."
+"Vaise eliminar toda a información desta nota e non se poderá restabelecer."
 
 #: ../calendar/calendar.error.xml.h:9
 msgid ""
@@ -1624,7 +1624,7 @@ msgstr ""
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr ""
-"Vaise eliminar toda a información desta cita e non se poderá restaurar."
+"Vaise eliminar toda a información desta reunión e non se poderá restaurar."
 
 #: ../calendar/calendar.error.xml.h:13
 msgid "All information on this memo will be deleted and can not be restored."
@@ -1646,7 +1646,7 @@ 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 reunión titulada «{0}»?"
 
 #: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete the memo '{0}'?"
@@ -1669,19 +1669,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Está seguro de que quere eliminar esta cita?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:191
+#: ../calendar/gui/dialogs/delete-comp.c:187
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
-msgstr "Está seguro de que quere eliminar esta cita?"
+msgstr "Está seguro de que quere eliminar esta reunión?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:197
+#: ../calendar/gui/dialogs/delete-comp.c:193
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Está seguro de que quere eliminar esta nota?"
 
 #: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:194
+#: ../calendar/gui/dialogs/delete-comp.c:190
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Está seguro de que quere eliminar esta tarefa?"
@@ -1700,11 +1700,11 @@ msgstr "Está seguro de que quere gardar a tarefa sen un resumo?"
 
 #: ../calendar/calendar.error.xml.h:29
 msgid "Cannot create a new event"
-msgstr "Non é posíbel crear unha nova actividade"
+msgstr "Non é posíbel crear un novo evento"
 
 #: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
-msgstr "Non é posíbel gardar o actividade"
+msgstr "Non é posíbel gardar o evento"
 
 #: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
@@ -1747,7 +1747,7 @@ msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Enviaranse convites por correo electrónico a todos os participantes e "
-"permitiráselles confirmalos."
+"permitiráselles responder."
 
 #: ../calendar/calendar.error.xml.h:41
 msgid "Error loading calendar"
@@ -1767,7 +1767,7 @@ msgid ""
 "the meeting is canceled."
 msgstr ""
 "Se non envía unha notificación de cancelación, os outros participantes "
-"quizais non saiban que se cancelou a cita."
+"quizais non saiban que se cancelou a reunión."
 
 #: ../calendar/calendar.error.xml.h:45
 msgid ""
@@ -1845,7 +1845,7 @@ msgstr "O calendario non está marcado para o uso sen conexión."
 
 #: ../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."
+msgstr "A lista de notas non está marcada para o uso sen conexión."
 
 #: ../calendar/calendar.error.xml.h:58
 msgid "The task list is not marked for offline usage."
@@ -1857,11 +1857,11 @@ msgstr "Este calendario eliminarase permanentemente."
 
 #: ../calendar/calendar.error.xml.h:60
 msgid "This memo list will be removed permanently."
-msgstr "Esta lista de notas vaise eliminar permanentemente."
+msgstr "Esta lista de notas eliminarase permanentemente."
 
 #: ../calendar/calendar.error.xml.h:61
 msgid "This task list will be removed permanently."
-msgstr "Esta lista de tarefas vaise eliminar permanentemente."
+msgstr "Esta lista de tarefas eliminarase permanentemente."
 
 #: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to save your changes to this appointment?"
@@ -1869,7 +1869,7 @@ msgstr "Quere gardar as modificacións feitas nesta cita?"
 
 #: ../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?"
+msgstr "Quere gardar as modificacións feitas nesta reunión?"
 
 #: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
@@ -1890,7 +1890,7 @@ msgstr ""
 
 #: ../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?"
+msgstr "Quere enviar aos participantes convites para a reunión?"
 
 #: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
@@ -1898,7 +1898,7 @@ msgstr "Quere enviar esta tarefa aos participantes?"
 
 #: ../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?"
+msgstr "Quere enviar información actualizada da reunión aos participantes?"
 
 #: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
@@ -1911,8 +1911,8 @@ msgid ""
 "a supported version."
 msgstr ""
 "Está conectado cun servidor GroupWise non compatíbel e podería encontrar "
-"problemas ao usar o Evolution. Para os mellores resultados, o servidor "
-"debería actualizarse a unha versión compatíbel."
+"problemas ao usar o Evolution. Para mellores resultados, o servidor debería "
+"anovarse a unha versión compatíbel."
 
 #: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this appointment, but not yet saved it."
@@ -1920,7 +1920,7 @@ msgstr "Modificou esta cita, mais aínda non a gardou."
 
 #: ../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."
+msgstr "Modificou esta reunión, mais aínda non a gardou."
 
 #: ../calendar/calendar.error.xml.h:75
 msgid "You have changed this task, but not yet saved it."
@@ -1928,7 +1928,7 @@ msgstr "Modificou esta tarefa, mais aínda non a gardou."
 
 #: ../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."
+msgstr "Modificou esta nota, mais aínda non gardou os cambios."
 
 #: ../calendar/calendar.error.xml.h:77
 msgid "Your calendars will not be available until Evolution is restarted."
@@ -1944,7 +1944,7 @@ 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:80
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:28
 msgid "_Discard Changes"
 msgstr "_Rexeitar as modificacións"
 
@@ -1954,31 +1954,31 @@ msgstr "_Gardar"
 
 #: ../calendar/calendar.error.xml.h:82
 msgid "_Save Changes"
-msgstr "_Gardar modificacións"
+msgstr "_Gardar as modificacións"
 
 #: ../calendar/calendar.error.xml.h:83
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:141
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:152
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Enviar"
 
 #: ../calendar/calendar.error.xml.h:84
 msgid "_Send Notice"
-msgstr "_Enviar notificación"
+msgstr "_Enviar a notificación"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:286
 msgid "Start time"
 msgstr "Hora de comezo"
 
@@ -1995,8 +1995,7 @@ msgstr "Ignorar _todo"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
 #: ../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
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "Location:"
 msgstr "Localización:"
 
@@ -2004,7 +2003,8 @@ msgstr "Localización:"
 msgid "Snooze _time:"
 msgstr "Pospor o a_viso:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:879
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "_Ignorar"
 
@@ -2014,9 +2014,9 @@ msgstr "_Pospor"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:24 ../e-util/e-plugin-util.c:424
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:427
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:335
+#: ../plugins/google-account-setup/google-contacts-source.c:375
 msgid "hours"
 msgstr "horas"
 
@@ -2027,9 +2027,9 @@ msgstr "localización da cita"
 #. 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:25 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:426
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../plugins/google-account-setup/google-contacts-source.c:374
 msgid "minutes"
 msgstr "minutos"
 
@@ -2049,16 +2049,17 @@ msgstr "Non hai información da localización dispoñíbel."
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1519
 #, c-format
-msgid "You have %d alarms"
-msgstr "Ten %d alarmas"
+msgid "You have %d alarm"
+msgid_plural "You have %d alarms"
+msgstr[0] "Ten %d alarma"
+msgstr[1] "Ten %d alarmas"
 
-#: ../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
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2067,10 +2068,10 @@ msgid ""
 msgstr ""
 "O Evolution aínda non permite avisos de calendario\n"
 "con notificación por correo electrónico, mais este aviso foi\n"
-"configurado para enviar unha mensaxe de correo electrónico. No seu lugar\n"
+"configurouse 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:1733
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1737
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2080,20 +2081,20 @@ msgid ""
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Vaise activar un aviso de calendario do Evolution. Este aviso está "
-"configurado para executar o seguinte programa:\n"
+"Vaise activar un aviso de calendario do Evolution. Este aviso configurouse "
+"para executar o seguinte programa:\n"
 "\n"
 "        %s\n"
 "\n"
 "Está seguro de que quere executar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1748
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1752
 msgid "Do not ask me about this program again."
 msgstr "Non volver preguntar sobre este programa."
 
 #: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
-msgstr "hora non válida"
+msgstr "hora incorrecta"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
 #: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
@@ -2124,620 +2125,13 @@ msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
-msgid "Alarm programs"
-msgstr "Programas de alarma"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../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."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
-msgid "Ask for confirmation when deleting items"
-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»."
-
-#: ../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»."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
-msgid "Calendars to run alarms for"
-msgstr "Os calendarios nos que se activarán alarmas"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr ""
-"Cor para debuxar a liña de Marcus Bains na barra de tempo (baleiro para a "
-"predefinida)."
-
-#: ../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 Vista diaria."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
-msgid "Compress weekends in month view"
-msgstr "Comprimir as fins de semana na vista mensual"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
-msgid "Confirm expunge"
-msgstr "Confirmar a compactación"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
-msgid "Count of default recurrence for a new event. -1 means forever."
-msgstr ""
-"Conta de recorrencia predefinida para unha actividade nova. -1 significa "
-"sempre."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
-msgid "Days on which the start and end of work hours should be indicated."
-msgstr "Días nos que debe indicarse o inicio e fin das horas de traballo."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
-msgid "Default appointment reminder"
-msgstr "Aviso de cita predefinido"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
-msgid "Default recurrence count"
-msgstr "Conta de recorrencia predefinida"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
-msgid "Default reminder units"
-msgstr "Unidades de aviso predefinidas"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
-msgid "Default reminder value"
-msgstr "Valor de aviso predefinido"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
-msgid "Directory for saving alarm audio files"
-msgstr "Cartafol para gardar ficheiros de audio para alarmas"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
-msgid "Event Gradient"
-msgstr "Gradación de eventos"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
-msgid "Event Transparency"
-msgstr "Transparencia de actividade"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
-msgid "Free/busy server URLs"
-msgstr "Os URL do servidor de dispoñibilidade"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
-msgid "Free/busy template URL"
-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 vistas de calendario."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
-msgid "Hide completed tasks"
-msgstr "Ocultar as tarefas terminadas"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
-msgid "Hide task units"
-msgstr "Ocultar as unidades da tarefa"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
-msgid "Hide task value"
-msgstr "Ocultar o valor da tarefa"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
-msgid "Horizontal pane position"
-msgstr "Posición horizontal do panel"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr ""
-"Hora de fin da xornada laboral, en formato de vinte e catro horas, de 0 a 23."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
-msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr ""
-"Hora de comezo da xornada laboral, en formato de vinte e catro horas, de 0 a "
-"23."
-
-#: ../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."
-
-#: ../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 "
-"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 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: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 Vista "
-"diaria."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
-msgid "List of server URLs for free/busy publishing."
-msgstr "Lista dos URL do servidor para publicación de dispoñibilidade."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
-msgid "Marcus Bains Line"
-msgstr "Liña de Marcus Bains"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
-msgid "Marcus Bains Line Color - Day View"
-msgstr "Cor da liña de Marcus Bains - Visualización de día"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
-msgid "Marcus Bains Line Color - Time bar"
-msgstr "Cor da liña de Marcus Bains - Barra de tempo"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
-msgid ""
-"Maximum number of recently used timezones to remember in a "
-"'day_second_zones' list."
-msgstr ""
-"O número máximo de fusos horarios usados recentemente para recordar nunha "
-"listaxe 'day_second_zones'."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
-msgid "Maximum number of recently used timezones to remember."
-msgstr ""
-"O número máximo de fusos horarios usados recentemente que hai que recordar."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
-msgid "Memo layout style"
-msgstr "Estilo da _resposta:"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
-msgid "Memo preview pane position (horizontal)"
-msgstr "Posición do panel de previsualización de recordatorios (horizontal)"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
-msgid "Memo preview pane position (vertical)"
-msgstr "Posición do panel de previsualización de recordatorios (vertical)"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
-msgid "Minute the workday ends on, 0 to 59."
-msgstr "Minuto de finalización da xornada laboral, de 0 a 59."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
-msgid "Minute the workday starts on, 0 to 59."
-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 vista mensual"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
-msgid "Month view vertical pane position"
-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."
-msgstr "Número de unidades para determinar un aviso predefinido."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
-msgid "Number of units for determining when to hide tasks."
-msgstr "Número de unidades para determinar cando ocultar as tarefas."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
-msgid "Overdue tasks color"
-msgstr "Cor para as tarefas pendentes"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
-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 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 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."
-msgstr ""
-"Posición do panel de previsualización de recordatorios cando está horientado "
-"verticalmente."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-msgid "Position of the task preview pane when oriented horizontally."
-msgstr ""
-"Posición do panel de previsualización de recordatorios cando está horientado "
-"horizontalmente."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
-msgid "Position of the task preview pane when oriented vertically."
-msgstr ""
-"Posición do panel de previsualización de tarefas cando está horientado "
-"verticalmente."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr ""
-"Posición do panel vertical, entre as listas de calendario e o navegador de "
-"datas do calendario."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
-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 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 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"
-msgstr "Calendario primario"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-msgid "Primary memo list"
-msgstr "Lista de notas primaria"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
-msgid "Primary task list"
-msgstr "Lista de tarefas primaria"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
-msgid "Programs that are allowed to be run by alarms."
-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 Vista diaria"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for alarm audio"
-msgstr "Cartafol onde gardar a alarma de audio"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-msgid "Scroll Month View by a week"
-msgstr "Desprazar a vista de mes por semana"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
-msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "Mostrar o campo RSVP no editor de eventos/tarefas/reunións"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
-msgid "Show Role field in the event/task/meeting editor"
-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 vistas semanal e mensual"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
-msgid "Show categories field in the event/meeting/task editor"
-msgstr "Mostrar o campo categorías no editor de eventos/reunións/tarefas"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
-msgid "Show display alarms in notification tray"
-msgstr "Mostrar o visualizador da alarma nunha bandexa de notificación"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
-msgid "Show status field in the event/task/meeting editor"
-msgstr "Mostrar o campo de estado no editor de eventos/tarefas/reunións"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
-msgid "Show the memo preview pane"
-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»"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
-msgid "Show timezone field in the event/meeting editor"
-msgstr "Mostrar o campo de fuso horario no editor de eventos/reunións"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
-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 numbers in Day View, Work Week View, and Date Navigator"
-msgstr ""
-"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 ""
-"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 Vista diaria, se está "
-"estabelecido. O valor é semellante ao usado na chave 'timezone'."
-
-#: ../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:79
-msgid "Task preview pane position (horizontal)"
-msgstr "Posición do panel vertical de tarefas"
-
-#: ../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:81
-msgid "Tasks due today color"
-msgstr "Cor para as tarefas que vencen hoxe"
-
-#: ../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 "
-"user part of the mail address and %d is replaced by the domain."
-msgstr ""
-"O modelo URL para usar como modo de emerxencia de datos de dispoñibilidade: %"
-"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: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»."
-
-#: ../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"
-"\" (Visualización vertical) mostra o panel de previsualización ao lado da "
-"lista de recordatorios."
-
-#: ../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."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
-msgid "The second timezone for a Day View"
-msgstr "O segundo fuso horario dunha Vista diaria"
-
-#: ../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."
-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:89
-msgid "Time divisions"
-msgstr "Divisións horarias"
-
-#: ../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:91
-msgid "Timezone"
-msgstr "Fuso horario"
-
-#: ../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 vistas de calendario, un valor entre 0 "
-"(transparente) e 1 (opaco)."
-
-#: ../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:94
-msgid "URI of the highlighted (\"primary\") calendar"
-msgstr "URI do calendario realzado («primario»)"
-
-#: ../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»)"
-
-#: ../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»)"
-
-# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../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»."
-
-# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../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»."
-
-#: ../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: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:101
-msgid "Vertical pane position"
-msgstr "Posición vertical do panel"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
-msgid "Week start"
-msgstr "Comezo da semana"
-
-#: ../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: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: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: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:107
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
-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: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 vistas semanais e "
-"mensuais."
-
-#: ../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:110
-msgid "Whether to hide completed tasks in the tasks view."
-msgstr "Indica se se ocultan as tarefas terminadas na vista de tarefas."
-
-#: ../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: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: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: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: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: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: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: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: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: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:121
-msgid "Work days"
-msgstr "Días laborábeis"
-
-#: ../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:123
-msgid "Workday end minute"
-msgstr "Minuto de finalización da xornada laboral"
-
-#: ../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:125
-msgid "Workday start minute"
-msgstr "Minuto de comezo da xornada laboral"
-
 #: ../calendar/gui/cal-editor-utils.c:105
 msgid "Invalid object"
-msgstr "O obxecto non é válido"
+msgstr "O obxecto non é correcto"
 
 #: ../calendar/gui/calendar-view-factory.c:117
 msgid "Day View"
-msgstr "Vista diaria"
+msgstr "Visualización diaria"
 
 #: ../calendar/gui/calendar-view-factory.c:120
 msgid "Work Week View"
@@ -2745,11 +2139,11 @@ msgstr "Visualización de semana laboral"
 
 #: ../calendar/gui/calendar-view-factory.c:123
 msgid "Week View"
-msgstr "Vista semanal"
+msgstr "Visualización semanal"
 
 #: ../calendar/gui/calendar-view-factory.c:126
 msgid "Month View"
-msgstr "Vista mensual"
+msgstr "Visualización mensual"
 
 #: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:3
@@ -2776,17 +2170,17 @@ msgstr "Categoría"
 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:525 ../calendar/gui/e-task-table.c:490
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
+#: ../calendar/gui/e-cal-model.c:780 ../calendar/gui/e-task-table.c:495
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:323
+#: ../plugins/email-custom-header/email-custom-header.c:326
 #: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Confidencial"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
-#: ../plugins/plugin-manager/plugin-manager.c:60
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
 #: ../widgets/misc/e-attachment-tree-view.c:524
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
@@ -2809,7 +2203,7 @@ msgstr "Existe"
 
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:831
+#: ../plugins/publish-calendar/publish-calendar.c:835
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
 msgid "Location"
@@ -2820,21 +2214,21 @@ msgstr "Localización"
 msgid "Organizer"
 msgstr "Organizador"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
+#: ../calendar/gui/e-cal-model.c:778 ../calendar/gui/e-task-table.c:494
 #: ../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:514 ../calendar/gui/e-cal-model.c:521
-#: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:238
+#: ../calendar/gui/e-cal-model.c:769 ../calendar/gui/e-cal-model.c:776
+#: ../calendar/gui/e-task-table.c:493 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Público"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:322
-#: ../calendar/gui/dialogs/event-editor.c:343
+#: ../calendar/gui/dialogs/event-editor.c:321
+#: ../calendar/gui/dialogs/event-editor.c:342
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Recorrencia"
@@ -2880,7 +2274,7 @@ msgstr "Editar alarma"
 #: ../calendar/gui/dialogs/alarm-dialog.c:817
 #: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
-msgstr "Emerxer unha alerta"
+msgstr "Alerta emerxente"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:818
 #: ../calendar/gui/e-alarm-list.c:444
@@ -2899,12 +2293,12 @@ msgstr "Enviar un correo"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
 msgid "Add Alarm"
-msgstr "Engadir alarma"
+msgstr "Engadir unha alarma"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
+#: ../calendar/gui/dialogs/event-editor.c:364
 msgid "Alarm"
-msgstr "Alarmas"
+msgstr "Alarma"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
@@ -2916,15 +2310,15 @@ msgstr "Son de alarma personalizado"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 msgid "Mes_sage:"
-msgstr "Mensa_xes:"
+msgstr "Mensa_xe:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:81
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:70
 msgid "Options"
-msgstr "_Opcións"
+msgstr "Opcións"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
 msgid "Repeat"
-msgstr "<b>Repetición</b>"
+msgstr "Repetir"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 msgid "Select A File"
@@ -2952,49 +2346,45 @@ msgstr "_Son:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
 msgid "after"
-msgstr "Máis tarde"
+msgstr "despois"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
 msgid "before"
-msgstr "é anterior a"
+msgstr "antes"
 
-#. 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/alarm-dialog.ui.h:16
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgid "day(s)"
-msgstr "días"
+msgstr "día(s)"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:428
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:336
+#: ../plugins/google-account-setup/google-contacts-source.c:376
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:43
 msgid "days"
 msgstr "días"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
 msgid "end of appointment"
-msgstr "Cita nova"
+msgstr "fin da cita"
 
 #. 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"
+msgstr "veces adicionais cada"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
-msgstr "horas"
+msgstr "hora(s)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
-msgstr "minutos"
+msgstr "minuto(s)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
-msgstr "localización da cita"
+msgstr "comezo da cita"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
@@ -3005,395 +2395,97 @@ msgid "A_dd"
 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:7
+#: ../calendar/gui/dialogs/event-page.ui.h:1
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Alarms"
 msgstr "Alarmas"
 
-#. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:108
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
-#: ../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:184
-#: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:319
-msgid "Select..."
-msgstr "Seleccionar..."
-
-#: ../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:789
-msgid "Ti_me and date:"
-msgstr "_Hora e 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
-msgid "%u and %d will be replaced by user and domain from the email address."
-msgstr ""
-"<i>%u e %d serán substituídos polo usuario e o dominio do enderezo de correo "
-"electrónico.</i>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
-msgid "(Shown in a Day View)"
-msgstr "(Mostrar nunha Vista diaria)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
-msgid "05 minutes"
-msgstr "minutos"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:5
-msgid "10 minutes"
-msgstr "minutos"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:6
-msgid "15 minutes"
-msgstr "minutos"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:7
-msgid "30 minutes"
-msgstr "minutos"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:8
-msgid "60 minutes"
-msgstr "minutos"
-
-#: ../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:30
-#: ../modules/addressbook/autocompletion-config.c:156
-msgid "Date/Time Format"
-msgstr "Data/Formato de hora"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:12
-msgid "Day _ends:"
-msgstr "A xornada _finaliza ás:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:13
-msgid "Days"
-msgstr "Día"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:14
-msgid "Default Free/Busy Server"
-msgstr "<span weight=\"bold\">Servidor predefinido de dispoñibilidade</span>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:15
-msgid "Display"
-msgstr "Mostrar"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:16
-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: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: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:21
-msgid "General"
-msgstr "Xeral"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:20
-msgid "Hours"
-msgstr "horas"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:21
-msgid "Minutes"
-msgstr "minutos"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:734
-msgid "Monday"
-msgstr "Luns"
-
-#. Translators: "None" for not including threads;
-#. * part of "Include threads: None"
-#. Translators: Used in send options dialog
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../filter/e-filter-rule.c:749 ../widgets/misc/e-send-options.ui.h:12
-msgid "None"
-msgstr "Ningún"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:85
-msgid "Pick a color"
-msgstr "Seleccionar unha cor"
-
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-msgid "S_un"
-msgstr "_Dom"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
-#: ../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:28
-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:29
-msgid "Se_cond zone:"
-msgstr "Seg_undo fuso horario:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
-msgid "Select the calendars for alarm notification"
-msgstr "Seleccione os calendarios para a notificación de alarma"
-
-#. 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:32
-msgid "Sh_ow a reminder"
-msgstr "M_ostrar un aviso"
-
-#. 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:34
-msgid "Show a _reminder"
-msgstr "Mostrar un a_viso"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
-msgid "Show week _numbers"
-msgstr "Mostrar os _números das semanas no navegador de datas"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
-#: ../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:37
-msgid "T_asks due today:"
-msgstr "T_arefas que vencen hoxe:"
-
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-msgid "T_hu"
-msgstr "_Xov"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:381
-msgid "Task List"
-msgstr "Lista de tarefas"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-msgid "Template:"
-msgstr "Modelo:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
-#: ../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:43
-#: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:595
-msgid "Time"
-msgstr "Hora"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-msgid "Time _zone:"
-msgstr "Fuso _horario:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-msgid "Time format:"
-msgstr "Formato da hora:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
-#: ../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:47
-msgid "Use s_ystem time zone"
-msgstr "Empregar o fuso horario do s_istema"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:736
-msgid "Wednesday"
-msgstr "Mércores"
-
-#. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
-msgid "Wee_k starts on:"
-msgstr "A _semana comeza en:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
-#: ../modules/calendar/e-cal-shell-view-actions.c:1639
-msgid "Work Week"
-msgstr "Semana laboral"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
-msgid "Work days:"
-msgstr "Días laborábeis:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
-msgid "_12 hour (AM/PM)"
-msgstr "_12 horas (AM/PM)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
-msgid "_24 hour"
-msgstr "_24 horas"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
-msgid "_Ask for confirmation when deleting items"
-msgstr "_Pedir confirmación ao eliminar elementos"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
-msgid "_Compress weekends in month view"
-msgstr "_Comprimir as fins de semana na vista mensual"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
-msgid "_Day begins:"
-msgstr "A _xornada comeza ás:"
-
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
-msgid "_Fri"
-msgstr "_Ven"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
-msgid "_Hide completed tasks after"
-msgstr "_Ocultar as tarefas terminadas despois de"
-
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
-msgid "_Mon"
-msgstr "_Lun"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
-msgid "_Overdue tasks:"
-msgstr "Tarefas _atrasadas:"
-
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
-msgid "_Sat"
-msgstr "_Sáb"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
-msgid "_Show appointment end times in week and month view"
-msgstr "_Mostrar os prazos finais das citas nas vistas semanal e mensual"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
-msgid "_Time divisions:"
-msgstr "Di_visións horarias:"
-
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:69
-msgid "_Tue"
-msgstr "_Mar"
-
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:71
-msgid "_Wed"
-msgstr "Mé_r"
-
-#. 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:73
-msgid "before every anniversary/birthday"
-msgstr "antes de cada data especial ou aniversario"
-
-#. 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:75
-msgid "before every appointment"
-msgstr "antes de cada cita"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:153
+#: ../calendar/gui/dialogs/calendar-setup.c:159
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:510
+#: ../calendar/gui/dialogs/calendar-setup.c:175
+#: ../modules/addressbook/addressbook-config.c:513
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:165
+#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:147
 #: ../modules/addressbook/ldap-config.ui.h:26
-#: ../plugins/groupwise-features/properties.ui.h:11
+#: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:286
+#: ../widgets/misc/e-signature-script-dialog.c:285
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:270
+#: ../calendar/gui/dialogs/calendar-setup.c:276
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
 "Cop_iar localmente os contidos do calendario para unha operación sen conexión"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:278
 msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 "Cop_iar localmente os contidos da lista de tarefas para unha operación sen "
 "conexión"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:280
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 "Copia_r localmente os contidos da lista de notas para unha operación sen "
 "conexión"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
+#: ../calendar/gui/dialogs/calendar-setup.c:352
 msgid "Colo_r:"
 msgstr "Co_r:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:375
+#: ../calendar/gui/dialogs/calendar-setup.c:386
+#: ../calendar/gui/dialogs/calendar-setup.c:397
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:49
+#: ../modules/addressbook/addressbook-config.c:1015
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
+#: ../plugins/itip-formatter/itip-formatter.c:2818
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:21
+msgid "General"
+msgstr "Xeral"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:387
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
+msgid "Task List"
+msgstr "Lista de tarefas"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:398
 msgid "Memo List"
 msgstr "Lista de notas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:483
 msgid "Calendar Properties"
 msgstr "Propiedades do calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:483
 msgid "New Calendar"
 msgstr "Calendario novo"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:539
 msgid "Task List Properties"
 msgstr "Propiedades da lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:539
 msgid "New Task List"
 msgstr "Lista de tarefas nova"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:595
 msgid "Memo List Properties"
 msgstr "Propiedades da lista de notas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:595
 msgid "New Memo List"
 msgstr "Lista de notas nova"
 
 #: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
-msgstr "Eliminouse este actividade."
+msgstr "Eliminouse este evento."
 
 #: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
@@ -3417,7 +2509,7 @@ msgstr "%s Non realizou modificacións. Quere pechar o editor?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
-msgstr "Este actividade foi modificado."
+msgstr "Este evento foi modificado."
 
 #: ../calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
@@ -3444,239 +2536,239 @@ 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.c:246
+#: ../calendar/gui/dialogs/comp-editor.c:266
 msgid "Could not save attachments"
 msgstr "Non foi posíbel gardar os anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:522
+#: ../calendar/gui/dialogs/comp-editor.c:542
 msgid "Could not update object"
 msgstr "Non foi posíbel actualizar o obxecto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:637
+#: ../calendar/gui/dialogs/comp-editor.c:657
 msgid "Edit Appointment"
 msgstr "Editar cita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:644
+#: ../calendar/gui/dialogs/comp-editor.c:664
 #, c-format
 msgid "Meeting - %s"
 msgstr "Reunión - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:646
+#: ../calendar/gui/dialogs/comp-editor.c:666
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:652
+#: ../calendar/gui/dialogs/comp-editor.c:672
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarefa asignada - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:654
+#: ../calendar/gui/dialogs/comp-editor.c:674
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
+#: ../calendar/gui/dialogs/comp-editor.c:679
 #, c-format
 msgid "Memo - %s"
 msgstr "Nota - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:675
+#: ../calendar/gui/dialogs/comp-editor.c:695
 msgid "No Summary"
 msgstr "Sen resumo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:786
+#: ../calendar/gui/dialogs/comp-editor.c:816
 msgid "Keep original item?"
-msgstr "Quere gardar o elemento orixinal?"
+msgstr "Desexa gardar o elemento orixinal?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:983
+#: ../calendar/gui/dialogs/comp-editor.c:1012
 msgid "Click here to close the current window"
 msgstr "Prema aquí para pechar a xanela actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1454
+#: ../calendar/gui/dialogs/comp-editor.c:1019 ../mail/e-mail-browser.c:139
+#: ../shell/e-shell-window-actions.c:1452
 #: ../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
+#: ../widgets/misc/e-web-view.c:412 ../widgets/misc/e-web-view.c:1065
 msgid "Copy the selection"
 msgstr "Copiar a selección"
 
-#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1461
+#: ../calendar/gui/dialogs/comp-editor.c:1026 ../mail/e-mail-browser.c:146
+#: ../shell/e-shell-window-actions.c:1459
 #: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:547
-#: ../widgets/misc/e-web-view.c:1060
+#: ../widgets/misc/e-web-view.c:1059
 msgid "Cut the selection"
 msgstr "Cortar a selección"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1004
-#: ../shell/e-shell-window-actions.c:1468
+#: ../calendar/gui/dialogs/comp-editor.c:1033
+#: ../shell/e-shell-window-actions.c:1466
 #: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:562
 msgid "Delete the selection"
-msgstr "Cortar a selección"
+msgstr "Eliminar a selección"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1011
+#: ../calendar/gui/dialogs/comp-editor.c:1040
 msgid "Click here to view help available"
 msgstr "Prema aquí para ver a axuda dispoñíbel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1503
+#: ../calendar/gui/dialogs/comp-editor.c:1047 ../mail/e-mail-browser.c:153
+#: ../shell/e-shell-window-actions.c:1501
 #: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:557
-#: ../widgets/misc/e-web-view.c:1072
+#: ../widgets/misc/e-web-view.c:1071
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do portapapeis"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1039
+#: ../calendar/gui/dialogs/comp-editor.c:1068
 msgid "Click here to save the current window"
 msgstr "Prema aquí para gardar a xanela actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1573
+#: ../calendar/gui/dialogs/comp-editor.c:1075 ../mail/e-mail-browser.c:160
+#: ../shell/e-shell-window-actions.c:1571
 #: ../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:1053
+#: ../calendar/gui/dialogs/comp-editor.c:1082
 msgid "_Classification"
 msgstr "_Clasificación"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:174
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1608
+#: ../shell/e-shell-window-actions.c:1606
 #: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1096 ../mail/e-mail-browser.c:167
+#: ../shell/e-shell-window-actions.c:1613
+#: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1074
-#: ../shell/e-shell-window-actions.c:1622
+#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../shell/e-shell-window-actions.c:1620
 msgid "_Help"
 msgstr "A_xuda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1110
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
-#: ../composer/e-composer-actions.c:315
+#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../composer/e-composer-actions.c:301
 msgid "_Options"
 msgstr "_Opcións"
 
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1124 ../mail/e-mail-browser.c:181
+#: ../shell/e-shell-window-actions.c:1655 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
-msgstr "_Ver"
+msgstr "__Visualización"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1105
-#: ../composer/e-composer-actions.c:243
+#: ../calendar/gui/dialogs/comp-editor.c:1134
+#: ../composer/e-composer-actions.c:257
 msgid "_Attachment..."
 msgstr "_Anexo..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1107
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "Click here to attach a file"
 msgstr "Prema aquí para anexar un ficheiro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1144
 msgid "_Categories"
 msgstr "_Categorías"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:1146
 msgid "Toggles whether to display categories"
-msgstr "Alterna entre se se mostran as categorías ou non"
+msgstr "Alterna a visualización das categorías"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1152
 msgid "Time _Zone"
 msgstr "_Fuso horario"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1154
 msgid "Toggles whether the time zone is displayed"
-msgstr "Alterna entre se se mostra ou non o campo Fuso horario"
+msgstr "Alterna a visualización do fuso horario"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1134
+#: ../calendar/gui/dialogs/comp-editor.c:1163
 msgid "Pu_blic"
 msgstr "Pú_blico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1165
 msgid "Classify as public"
 msgstr "Clasificar como público"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1170
 msgid "_Private"
 msgstr "_Privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1172
 msgid "Classify as private"
 msgstr "Clasificar como privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1148
+#: ../calendar/gui/dialogs/comp-editor.c:1177
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1150
+#: ../calendar/gui/dialogs/comp-editor.c:1179
 msgid "Classify as confidential"
 msgstr "Clasificar como confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1158
+#: ../calendar/gui/dialogs/comp-editor.c:1187
 msgid "R_ole Field"
-msgstr "Campo de _rol"
+msgstr "Campo de _función"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1189
 msgid "Toggles whether the Role field is displayed"
-msgstr "Alterna entre se se mostra o campo Rol ou non"
+msgstr "Alterna a visualización do campo de función"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1166
+#: ../calendar/gui/dialogs/comp-editor.c:1195
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1168
+#: ../calendar/gui/dialogs/comp-editor.c:1197
 msgid "Toggles whether the RSVP field is displayed"
-msgstr "Alterna entre se se mostra o campo RSVP ou non"
+msgstr "Alterna a visualización do campo RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1174
+#: ../calendar/gui/dialogs/comp-editor.c:1203
 msgid "_Status Field"
 msgstr "Campo de e_stado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../calendar/gui/dialogs/comp-editor.c:1205
 msgid "Toggles whether the Status field is displayed"
-msgstr "Alterna entre se se mostra o campo Estado ou non"
+msgstr "Alterna a visualización do campo de estado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1182
+#: ../calendar/gui/dialogs/comp-editor.c:1211
 msgid "_Type Field"
 msgstr "Campo _tipo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1184
+#: ../calendar/gui/dialogs/comp-editor.c:1213
 msgid "Toggles whether the Attendee Type is displayed"
-msgstr "Alterna entre se mostrar o Tipo de participante ou non"
+msgstr "Alterna a visualización do campo de tipo de participante"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1208
+#: ../calendar/gui/dialogs/comp-editor.c:1237
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "_Documentos recentes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1743
-#: ../composer/e-composer-actions.c:431
+#: ../calendar/gui/dialogs/comp-editor.c:1911
+#: ../composer/e-composer-actions.c:461
 msgid "Attach"
 msgstr "Anexar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2072
-#: ../calendar/gui/dialogs/comp-editor.c:2121
-#: ../calendar/gui/dialogs/comp-editor.c:3086
+#: ../calendar/gui/dialogs/comp-editor.c:2240
+#: ../calendar/gui/dialogs/comp-editor.c:2403
+#: ../calendar/gui/dialogs/comp-editor.c:3370
 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:3050
+#: ../calendar/gui/dialogs/comp-editor.c:3334
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "anexo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3118
+#: ../calendar/gui/dialogs/comp-editor.c:3402
 msgid "Unable to use current version!"
 msgstr "Non é posíbel usar a versión actual!"
 
@@ -3692,39 +2784,39 @@ msgstr "Non foi posíbel abrir o destino"
 msgid "Destination is read only"
 msgstr "O destino é só de lectura"
 
-#: ../calendar/gui/dialogs/delete-comp.c:214
+#: ../calendar/gui/dialogs/delete-comp.c:210
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
-"Quere e_liminar este elemento das caixas de correo de todos os outros "
+"Quere eliminar este elemento _das caixas de correo de todos os outros "
 "destinatarios?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:217
+#: ../calendar/gui/dialogs/delete-comp.c:213
 msgid "_Retract comment"
-msgstr "_Retirar comentario"
+msgstr "_Retirar o comentario"
 
 #. 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"
+msgstr "Non foi posíbel eliminar o evento debido a un erro dbus: %s"
 
 #. 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"
+msgstr "Non foi posíbel eliminar a tarefa debido a un erro dbus: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
 #: ../calendar/gui/dialogs/delete-error.c:64
 #, 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"
+msgstr "Non foi posíbel eliminar a nota debido a un erro dbus: %s"
 
 #. 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"
+msgstr "Non foi posíbel eliminar o elemento debido a un erro dbus: %s"
 
 #: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The event could not be deleted because permission was denied"
@@ -3736,7 +2828,7 @@ msgstr "Non foi posíbel eliminar a tarefa porque se denegou o permiso"
 
 #: ../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"
+msgstr "Non foi posíbel eliminar a nota porque se denegou o permiso"
 
 #: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The item could not be deleted because permission was denied"
@@ -3758,7 +2850,7 @@ msgstr "Non foi posíbel eliminar a tarefa debido a un erro: %s"
 #: ../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"
+msgstr "Non foi posíbel eliminar a nota debido a un erro: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
 #: ../calendar/gui/dialogs/delete-error.c:104
@@ -3776,153 +2868,151 @@ msgstr "Delegar en:"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
 msgid "Enter Delegate"
-msgstr "Introducir delegado"
+msgstr "Introducir un delegado"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/event-editor.c:216
 msgid "_Alarms"
 msgstr "_Alarmas"
 
-#: ../calendar/gui/dialogs/event-editor.c:219
+#: ../calendar/gui/dialogs/event-editor.c:218
 msgid "Click here to set or unset alarms for this event"
-msgstr ""
-"Prema aquí para configurar ou desconfigurar as alarmas para este actividade"
+msgstr "Prema aquí para configurar as alarmas deste evento"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "Show Time as _Busy"
-msgstr "Mostrar hora como oc_upada"
+msgstr "Mostrar a hora como oc_upada"
 
-#: ../calendar/gui/dialogs/event-editor.c:229
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to show time as busy"
-msgstr "Alterna entre se se mostran as horas como ocupadas ou non"
+msgstr "Alterna a visualización das horas como ocupadas"
 
-#: ../calendar/gui/dialogs/event-editor.c:238
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "_Recurrence"
 msgstr "_Recorrencia"
 
-#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "Make this a recurring event"
-msgstr "Converter en actividade recorrente"
+msgstr "Converter en evento recorrente"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:244
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.ui.h:19
+#: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "Opcións de envío"
 
-#: ../calendar/gui/dialogs/event-editor.c:247
-#: ../calendar/gui/dialogs/task-editor.c:129
+#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/task-editor.c:128
 msgid "Insert advanced send options"
 msgstr "Inserir opcións avanzadas de envío"
 
-#: ../calendar/gui/dialogs/event-editor.c:255
+#: ../calendar/gui/dialogs/event-editor.c:254
 msgid "All _Day Event"
 msgstr "Evento de _día completo"
 
-#: ../calendar/gui/dialogs/event-editor.c:257
+#: ../calendar/gui/dialogs/event-editor.c:256
 msgid "Toggles whether to have All Day Event"
-msgstr "Alterna entre se se ten un actividade de día completo ou non"
+msgstr "Alterna a visualización do evento de día completo"
 
-#: ../calendar/gui/dialogs/event-editor.c:266
+#: ../calendar/gui/dialogs/event-editor.c:265
 msgid "_Free/Busy"
 msgstr "_Dispoñibilidade"
 
-#: ../calendar/gui/dialogs/event-editor.c:268
+#: ../calendar/gui/dialogs/event-editor.c:267
 msgid "Query free / busy information for the attendees"
-msgstr "Consultar información de dispoñibilidade para os participantes"
+msgstr "Consultar a información de dispoñibilidade para os participantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2610
+#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3140
 msgid "Appointment"
 msgstr "Cita"
 
-#: ../calendar/gui/dialogs/event-editor.c:385
-#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../calendar/gui/dialogs/event-editor.c:388
+#: ../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
+#: ../calendar/gui/dialogs/event-editor.c:582
 msgid "Print this event"
-msgstr "Imprimir esta evento"
+msgstr "Imprimir este evento"
 
-#: ../calendar/gui/dialogs/event-page.c:766
+#: ../calendar/gui/dialogs/event-page.c:771
 msgid "Event's start time is in the past"
-msgstr "A hora de inicio do evento está no pasado"
+msgstr "A hora de inicio do evento xa pasou"
 
-#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:812
 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"
+"O evento non se pode editar porque o calendario seleccionado é de só lectura"
 
-#: ../calendar/gui/dialogs/event-page.c:811
+#: ../calendar/gui/dialogs/event-page.c:816
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr ""
-"Incluso se non pode ser totalmente editada porque vostede é o organizador"
+"O evento non se pode editar totalmente porque vostede non é o organizador"
 
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.c:2775
+#: ../calendar/gui/dialogs/event-page.c:828
+#: ../calendar/gui/dialogs/event-page.c:2784
 msgid "This event has alarms"
-msgstr "Este actividade ten alarmas"
+msgstr "Este evento ten alarmas"
 
-#: ../calendar/gui/dialogs/event-page.c:890
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.c:895
+#: ../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:937
+#: ../calendar/gui/dialogs/event-page.c:942
 msgid "_Delegatees"
-msgstr "_Delegados"
+msgstr "_Representantes"
 
-#: ../calendar/gui/dialogs/event-page.c:939
+#: ../calendar/gui/dialogs/event-page.c:944
 msgid "Atte_ndees"
 msgstr "_Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:1154
+#: ../calendar/gui/dialogs/event-page.c:1159
 msgid "Event with no start date"
-msgstr "Actividade sen data de comezo"
+msgstr "Evento sen data de comezo"
 
-#: ../calendar/gui/dialogs/event-page.c:1157
+#: ../calendar/gui/dialogs/event-page.c:1162
 msgid "Event with no end date"
-msgstr "Actividade sen data de finalización"
+msgstr "Evento sen data de finalización"
 
-#: ../calendar/gui/dialogs/event-page.c:1328
-#: ../calendar/gui/dialogs/memo-page.c:686
-#: ../calendar/gui/dialogs/task-page.c:907
+#: ../calendar/gui/dialogs/event-page.c:1333
+#: ../calendar/gui/dialogs/memo-page.c:689
+#: ../calendar/gui/dialogs/task-page.c:909
 msgid "Start date is wrong"
 msgstr "A data de comezo é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1338
+#: ../calendar/gui/dialogs/event-page.c:1343
 msgid "End date is wrong"
 msgstr "A data de finalización é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1361
+#: ../calendar/gui/dialogs/event-page.c:1366
 msgid "Start time is wrong"
 msgstr "A hora de comezo é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1368
+#: ../calendar/gui/dialogs/event-page.c:1373
 msgid "End time is wrong"
 msgstr "A hora de finalización é incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1530
-#: ../calendar/gui/dialogs/memo-page.c:727
-#: ../calendar/gui/dialogs/task-page.c:967
+#: ../calendar/gui/dialogs/event-page.c:1537
+#: ../calendar/gui/dialogs/memo-page.c:730
+#: ../calendar/gui/dialogs/task-page.c:971
 msgid "The organizer selected no longer has an account."
 msgstr "O organizador seleccionado xa non ten unha conta."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/memo-page.c:733
-#: ../calendar/gui/dialogs/task-page.c:973
+#: ../calendar/gui/dialogs/event-page.c:1543
+#: ../calendar/gui/dialogs/memo-page.c:736
+#: ../calendar/gui/dialogs/task-page.c:977
 msgid "An organizer is required."
 msgstr "Requírese un organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1561
-#: ../calendar/gui/dialogs/task-page.c:997
+#: ../calendar/gui/dialogs/event-page.c:1568
+#: ../calendar/gui/dialogs/task-page.c:1001
 msgid "At least one attendee is required."
 msgstr "Requírese polo menos un participante."
 
-#: ../calendar/gui/dialogs/event-page.c:2649
+#: ../calendar/gui/dialogs/event-page.c:2658
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Non foi posíbel abrir o calendario «%s»."
@@ -3933,112 +3023,118 @@ 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:2693
-#: ../calendar/gui/dialogs/memo-page.c:946
-#: ../calendar/gui/dialogs/task-page.c:1787
+#: ../calendar/gui/dialogs/event-page.c:2702
+#: ../calendar/gui/dialogs/memo-page.c:949
+#: ../calendar/gui/dialogs/task-page.c:1791
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Está actuando no nome de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2994
+#: ../calendar/gui/dialogs/event-page.c:3011
 #, 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:3000
+#: ../calendar/gui/dialogs/event-page.c:3017
 #, 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:3006
+#: ../calendar/gui/dialogs/event-page.c:3023
 #, 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:3019
+#: ../calendar/gui/dialogs/event-page.c:3036
 msgid "Customize"
 msgstr "Personalizar"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3021
+#: ../calendar/gui/dialogs/event-page.c:3038
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Ningún"
 
-#. TRANSLATORS: Predefined alarm's description
 #: ../calendar/gui/dialogs/event-page.ui.h:2
-msgid "1 day before appointment"
-msgstr "1 día antes da cita"
-
-#. TRANSLATORS: Predefined alarm's description
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-msgid "1 hour before appointment"
-msgstr "1 hora antes da cita"
-
-#. TRANSLATORS: Predefined alarm's description
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "15 minutes before appointment"
-msgstr "15 minutos antes da cita"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:578
+#: ../calendar/gui/e-meeting-time-sel.c:566
 msgid "Atte_ndees..."
 msgstr "Participa_ntes..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "Custom Alarm:"
 msgstr "Alarma personalizada:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 msgid "Event Description"
-msgstr "Descrición da actividade"
+msgstr "Descrición do evento"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
+msgid "Time _zone:"
+msgstr "Fuso _horario:"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "_Alarm"
 msgstr "_Alarma"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../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:349
 msgid "_Description:"
 msgstr "_Descrición:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:19
-#: ../plugins/calendar-weather/calendar-weather.c:358
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../plugins/calendar-weather/calendar-weather.c:361
 msgid "_Location:"
 msgstr "_Localización:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:20
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Summary:"
 msgstr "_Resumo:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:21
+#: ../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
+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
+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
+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
-#. 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/event-page.ui.h:23
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+msgctxt "eventpage"
 msgid "for"
 msgstr "durante"
 
 #. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
-#. 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/event-page.ui.h:27
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+msgctxt "eventpage"
 msgid "until"
 msgstr "até"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2614
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3144
 msgid "Memo"
 msgstr "Nota"
 
@@ -4046,27 +3142,29 @@ msgstr "Nota"
 msgid "Print this memo"
 msgstr "Imprimir esta nota"
 
-#: ../calendar/gui/dialogs/memo-page.c:338
+#: ../calendar/gui/dialogs/memo-page.c:341
 msgid "Memo's start date is in the past"
-msgstr "A hora de inicio da nota non está no pasado"
+msgstr "A hora de inicio da nota xa pasou"
 
-#: ../calendar/gui/dialogs/memo-page.c:376
+#: ../calendar/gui/dialogs/memo-page.c:379
 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"
+msgstr ""
+"A nota non se pode editar porque a lista de notas solicitada é de só lectura"
 
-#: ../calendar/gui/dialogs/memo-page.c:380
+#: ../calendar/gui/dialogs/memo-page.c:383
 msgid "Memo cannot be fully edited, because you are not the organizer"
-msgstr "A nota non pode ser totalmente editada porque vostede é o organizador"
+msgstr ""
+"A nota non se pode editar totalmente porque vostede non é o organizador"
 
-#: ../calendar/gui/dialogs/memo-page.c:907
+#: ../calendar/gui/dialogs/memo-page.c:910
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Non é posíbel abrir as notas en «%s»."
 
-#: ../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
+#: ../calendar/gui/dialogs/memo-page.c:1081 ../em-format/em-format-quote.c:282
+#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2401
+#: ../mail/em-format-html.c:2460 ../mail/em-format-html.c:2484
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:75
 msgid "To"
 msgstr "Para"
 
@@ -4085,7 +3183,7 @@ msgid "T_o:"
 msgstr "_Para:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:426
+#: ../calendar/gui/dialogs/task-page.c:428
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_Grupo:"
@@ -4093,22 +3191,22 @@ msgstr "_Grupo:"
 #: ../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?"
+msgstr "Está modificando unha actividade recorrente. Que desexa modificar?"
 
 #: ../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?"
+msgstr "Está delegando unha actividade recorrente. Que desexa delegar?"
 
 #: ../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?"
+msgstr "Está modificando unha tarefa recorrente. Que desexa modificar?"
 
 #: ../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?"
+msgstr "Está modificando unha nota recorrente. Que desexa modificar?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
@@ -4126,22 +3224,22 @@ msgstr "Esta instancia e as futuras"
 msgid "All Instances"
 msgstr "Todas as instancias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:569
 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:892
+#: ../calendar/gui/dialogs/recurrence-page.c:901
 msgid "Recurrence date is invalid"
-msgstr "A data da recorrencia non é válida"
+msgstr "A data da recorrencia non é correcta"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:941
 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"
+"A hora de finalización da recorrencia era anterior á do comezo do evento"
 
 #. 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:961
+#: ../calendar/gui/dialogs/recurrence-page.c:971
 msgid "on"
 msgstr "en"
 
@@ -4149,7 +3247,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:1018
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "first"
 msgstr "primeiro"
 
@@ -4158,7 +3256,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:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1035
 msgid "second"
 msgstr "segundo"
 
@@ -4166,7 +3264,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:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1040
 msgid "third"
 msgstr "terceiro"
 
@@ -4174,7 +3272,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:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
 msgid "fourth"
 msgstr "cuarto"
 
@@ -4182,7 +3280,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:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
 msgid "fifth"
 msgstr "quinto"
 
@@ -4190,13 +3288,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:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1055
 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:1068
+#: ../calendar/gui/dialogs/recurrence-page.c:1079
 msgid "Other Date"
 msgstr "Outra data"
 
@@ -4204,7 +3302,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:1074
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 msgid "1st to 10th"
 msgstr "Do 1 ao 10"
 
@@ -4212,7 +3310,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:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
 msgid "11th to 20th"
 msgstr "do 11 ao 20"
 
@@ -4220,45 +3318,80 @@ 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:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
 msgid "21st to 31st"
 msgstr "Do 21 ao 31"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
 msgid "day"
 msgstr "día"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+msgid "Monday"
+msgstr "Luns"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1124
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
+msgid "Tuesday"
+msgstr "Martes"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1125
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
+msgid "Wednesday"
+msgstr "Mércores"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1126
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
+msgid "Thursday"
+msgstr "Xoves"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1127
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
+msgid "Friday"
+msgstr "Venres"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1128
+#: ../modules/calendar/e-calendar-preferences.ui.h:26
+msgid "Saturday"
+msgstr "Sábado"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1129
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
+msgid "Sunday"
+msgstr "Domingo"
+
 #. 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:1240
+#: ../calendar/gui/dialogs/recurrence-page.c:1251
 msgid "on the"
 msgstr "no"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1412
+#: ../calendar/gui/dialogs/recurrence-page.c:1425
 msgid "occurrences"
 msgstr "aparicións"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2119
+#: ../calendar/gui/dialogs/recurrence-page.c:2132
 msgid "Add exception"
-msgstr "Engadir excepción"
+msgstr "Engadir unha excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2160
+#: ../calendar/gui/dialogs/recurrence-page.c:2173
 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:2166
+#: ../calendar/gui/dialogs/recurrence-page.c:2179
 msgid "Modify exception"
-msgstr "Modificar excepción"
+msgstr "Modificar a excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2223
 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:2337
+#: ../calendar/gui/dialogs/recurrence-page.c:2357
 msgid "Date/Time"
 msgstr "Data e hora"
 
@@ -4268,121 +3401,142 @@ msgstr "Cada"
 
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:2
 msgid "Exceptions"
-msgstr "<b>Excepcións</b>"
+msgstr "Excepcións"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:89
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:77
 msgid "Preview"
-msgstr "_Previsualización"
+msgstr "Previsualización"
 
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:5
 msgid "This appointment rec_urs"
 msgstr "Esta cita r_epítese"
 
 #. 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
+msgctxt "recurrpage"
+msgid "for"
+msgstr "durante"
+
+#. 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
+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
+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
+msgctxt "recurrpage"
 msgid "week(s)"
 msgstr "semana(s)"
 
 #. 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
+msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "ano(s)"
 
 #: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
-msgstr "Enviar as miñas alarmas con este actividade"
+msgstr "Enviar as miñas alarmas con este evento"
 
 #: ../calendar/gui/dialogs/send-comp.c:164
 msgid "Notify new attendees _only"
-msgstr "Notificar mensaxes n_ovas"
+msgstr "Notificar só aos participantes n_ovos"
 
-#: ../calendar/gui/dialogs/task-details-page.c:350
-#: ../calendar/gui/dialogs/task-details-page.c:372
+#: ../calendar/gui/dialogs/task-details-page.c:356
+#: ../calendar/gui/dialogs/task-details-page.c:378
 msgid "Completed date is wrong"
 msgstr "A data de finalización é incorrecta"
 
-#: ../calendar/gui/dialogs/task-details-page.c:483
+#: ../calendar/gui/dialogs/task-details-page.c:489
 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
+#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-model-tasks.c:442
+#: ../calendar/gui/e-cal-model-tasks.c:716 ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:593
+#: ../calendar/gui/print.c:3230 ../mail/em-sync-stream.c:152
+#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
-msgstr "Cancelado"
+msgstr "Cancelada"
 
 #. 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: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
+#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-model-tasks.c:440
+#: ../calendar/gui/e-cal-model-tasks.c:714
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
+#: ../calendar/gui/e-task-table.c:212 ../calendar/gui/e-task-table.c:227
+#: ../calendar/gui/e-task-table.c:592 ../calendar/gui/print.c:3227
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
-msgstr "Terminada"
+msgstr "Completada"
 
 #. 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:511 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1183 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1226 ../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: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
+#: ../calendar/gui/e-cal-component-preview.c:292
+#: ../calendar/gui/e-cal-model-tasks.c:438
+#: ../calendar/gui/e-cal-model-tasks.c:712
+#: ../calendar/gui/e-cal-model-tasks.c:789 ../calendar/gui/e-task-table.c:210
+#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:591
+#: ../calendar/gui/print.c:3224
 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:513 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1181 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-task-table.c:518 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1224 ../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: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:13
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../calendar/gui/e-cal-model.c:1524 ../calendar/gui/e-task-table.c:517
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1225
+#: ../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: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
+#: ../calendar/gui/e-cal-component-preview.c:302
+#: ../calendar/gui/e-cal-model-tasks.c:436
+#: ../calendar/gui/e-cal-model-tasks.c:710 ../calendar/gui/e-task-table.c:208
+#: ../calendar/gui/e-task-table.c:223 ../calendar/gui/e-task-table.c:590
+#: ../calendar/gui/print.c:3221 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Non iniciada"
 
@@ -4398,7 +3552,7 @@ 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:1773
+#: ../calendar/gui/e-calendar-view.c:1840
 #: ../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
@@ -4408,17 +3562,17 @@ msgstr "Estado"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:24
-#: ../widgets/misc/e-send-options.ui.h:24
+#: ../calendar/gui/e-task-table.c:519 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
-msgstr "Indefinida"
+msgstr "Sen definir"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:21
 msgid "_Date completed:"
 msgstr "_Data completada:"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:36
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Priority:"
 msgstr "_Prioridade:"
 
@@ -4426,20 +3580,20 @@ msgstr "_Prioridade:"
 msgid "_Web Page:"
 msgstr "Páxina _Web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:117
+#: ../calendar/gui/dialogs/task-editor.c:116
 msgid "_Status Details"
 msgstr "Detalles do e_stado"
 
-#: ../calendar/gui/dialogs/task-editor.c:119
+#: ../calendar/gui/dialogs/task-editor.c:118
 msgid "Click to change or view the status details of the task"
-msgstr "Prema para cambiar ou ver os detalles da tarefa"
+msgstr "Prema para cambiar ou ver os detalles do estado da tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:127
+#: ../calendar/gui/dialogs/task-editor.c:126
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "Opción_s de envío"
 
-#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2612
+#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:3142
 #: ../widgets/misc/e-send-options.c:503
 msgid "Task"
 msgstr "Tarefa"
@@ -4452,34 +3606,35 @@ msgstr "Detalles da tarefa"
 msgid "Print this task"
 msgstr "Imprimir esta tarefa"
 
-#: ../calendar/gui/dialogs/task-page.c:343
+#: ../calendar/gui/dialogs/task-page.c:345
 msgid "Task's start date is in the past"
-msgstr "A hora de inicio da tarefa está no padado"
+msgstr "A data de inicio da tarefa xa pasou"
 
-#: ../calendar/gui/dialogs/task-page.c:344
+#: ../calendar/gui/dialogs/task-page.c:346
 msgid "Task's due date is in the past"
-msgstr "A data de vencemento da tarefa está no pasado"
+msgstr "A data de vencemento da tarefa xa pasou"
 
-#: ../calendar/gui/dialogs/task-page.c:379
+#: ../calendar/gui/dialogs/task-page.c:381
 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"
+"A tarefa non se pode editar porque a lista de tarefas seleccionada é de só "
+"lectura"
 
-#: ../calendar/gui/dialogs/task-page.c:383
+#: ../calendar/gui/dialogs/task-page.c:385
 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"
+"A tarefa non se pode editar totalmente porque vostede non é o organizador"
 
-#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.c:436
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zador:"
 
-#: ../calendar/gui/dialogs/task-page.c:880
+#: ../calendar/gui/dialogs/task-page.c:882
 msgid "Due date is wrong"
 msgstr "A data de vencemento é incorrecta"
 
-#: ../calendar/gui/dialogs/task-page.c:1744
+#: ../calendar/gui/dialogs/task-page.c:1748
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Non é posíbel abrir as tarefas en «%s»."
@@ -4514,7 +3669,7 @@ msgstr[1] "%d semanas"
 
 #: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
-msgstr "A acción para realizar é descoñecida"
+msgstr "A acción a realizar é descoñecida"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
@@ -4563,7 +3718,7 @@ msgstr "%s ao finalizar a cita"
 #: ../calendar/gui/e-alarm-list.c:535
 #, c-format
 msgid "%s at %s"
-msgstr "%s a %s"
+msgstr "%s ás %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
@@ -4572,46 +3727,42 @@ 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:668
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:672
 msgid "Untitled"
 msgstr "Sen título"
 
 #: ../calendar/gui/e-cal-component-preview.c:198
 msgid "Categories:"
-msgstr "Categorías"
+msgstr "Categorías:"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "Resumo:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:247
+#: ../calendar/gui/e-cal-component-preview.c:261
 msgid "Start Date:"
 msgstr "Data de inicio:"
 
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:275
 msgid "Due Date:"
 msgstr "Data de vencemento:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1189
-#: ../plugins/itip-formatter/itip-view.c:1074
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../plugins/itip-formatter/itip-view.c:1075
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Priority:"
 msgstr "Prioridade:"
 
-#: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:37
+#: ../calendar/gui/e-cal-component-preview.c:340 ../mail/mail-config.ui.h:34
 msgid "Description:"
 msgstr "Descrición:"
 
-#: ../calendar/gui/e-cal-component-preview.c:368
+#: ../calendar/gui/e-cal-component-preview.c:371
 msgid "Web Page:"
 msgstr "Páxina Web:"
 
@@ -4624,13 +3775,13 @@ msgstr "Creado"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
 msgid "End Date"
-msgstr "Data final"
+msgstr "Data de finalización"
 
 #: ../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"
+msgstr "�ltima modificación"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:5
@@ -4638,16 +3789,16 @@ msgid "Start Date"
 msgstr "Data de inicio"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:563
+#: ../calendar/gui/e-task-table.c:568
 msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:549 ../calendar/gui/e-task-table.c:569
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../calendar/gui/e-cal-model-tasks.c:659
+#: ../calendar/gui/e-cal-model-tasks.c:658
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4658,47 +3809,44 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:709
+#: ../calendar/gui/e-cal-model-tasks.c:708
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ningún"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
+#: ../calendar/gui/e-meeting-store.c:996
 msgid "Yes"
 msgstr "Si"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:181
+#: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "Non"
 
-#. This is the default filename used for temporary file creation
-#: ../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-cal-model.c:782 ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../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
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
+#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1073
+#: ../calendar/gui/print.c:1090 ../e-util/e-charset.c:52
+#: ../modules/plugin-manager/evolution-plugin-manager.c:98
 #: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2345
-#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../plugins/itip-formatter/itip-formatter.c:2485
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../calendar/gui/e-cal-model.c:1271
+#: ../calendar/gui/e-cal-model.c:1526
 msgid "Recurring"
 msgstr "Recorrencia"
 
-#: ../calendar/gui/e-cal-model.c:1273
+#: ../calendar/gui/e-cal-model.c:1528
 msgid "Assigned"
 msgstr "Asignada"
 
-#: ../calendar/gui/e-cal-model.c:2175
+#: ../calendar/gui/e-cal-model.c:2595
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
@@ -4706,7 +3854,7 @@ msgstr "Abrindo %s"
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
-msgstr "% Terminado"
+msgstr "% terminado"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
@@ -4742,90 +3890,88 @@ msgstr "Data de inicio"
 msgid "Type"
 msgstr "Tipo"
 
-#: ../calendar/gui/e-calendar-view.c:407
+#: ../calendar/gui/e-calendar-view.c:430
 msgid "Cut selected events to the clipboard"
-msgstr "Cortar o texto seleccionado para o portapapeis"
+msgstr "Cortar os eventos seleccionados para o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:413
+#: ../calendar/gui/e-calendar-view.c:436
 msgid "Copy selected events to the clipboard"
-msgstr "Copiar o texto seleccionado ao portapapeis"
+msgstr "Copiar os eventos seleccionados para o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:419
+#: ../calendar/gui/e-calendar-view.c:442
 msgid "Paste events from the clipboard"
-msgstr "Pegar eventos desde o portapapeis"
+msgstr "Pegar os eventos desde o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:425
+#: ../calendar/gui/e-calendar-view.c:448
 msgid "Delete selected events"
 msgstr "Eliminar os eventos seleccionados"
 
-#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:188
-#: ../calendar/gui/e-task-table.c:266
+#: ../calendar/gui/e-calendar-view.c:467 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
-msgstr "Eliminar os obxectos seleccionados"
+msgstr "Eliminando os obxectos seleccionados"
 
-#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:847
-#: ../calendar/gui/e-task-table.c:1070
+#: ../calendar/gui/e-calendar-view.c:661 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-task-table.c:1075
 msgid "Updating objects"
-msgstr "Actualizando obxectos"
+msgstr "Actualizando os obxectos"
 
-#: ../calendar/gui/e-calendar-view.c:1720
-#: ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-calendar-view.c:1787
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
-#: ../plugins/itip-formatter/itip-formatter.c:2333
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../plugins/itip-formatter/itip-formatter.c:2473
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: ../calendar/gui/e-calendar-view.c:1721
-#: ../calendar/gui/e-itip-control.c:1205
+#: ../calendar/gui/e-calendar-view.c:1788
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
-#: ../plugins/itip-formatter/itip-formatter.c:2339
+#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
+#: ../plugins/itip-formatter/itip-formatter.c:2479
 msgid "Declined"
 msgstr "Rexeitado"
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1789
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
+#: ../calendar/gui/e-meeting-time-sel.c:548
 msgid "Tentative"
 msgstr "Provisional"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1790
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../plugins/itip-formatter/itip-formatter.c:2342
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../plugins/itip-formatter/itip-formatter.c:2482
 msgid "Delegated"
 msgstr "Delegado"
 
-#: ../calendar/gui/e-calendar-view.c:1724
+#: ../calendar/gui/e-calendar-view.c:1791
 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:1868 ../calendar/gui/e-memo-table.c:530
-#: ../calendar/gui/e-task-table.c:745
+#: ../calendar/gui/e-calendar-view.c:1935 ../calendar/gui/e-memo-table.c:535
+#: ../calendar/gui/e-task-table.c:750
 #, 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:1872 ../calendar/gui/e-memo-table.c:535
-#: ../calendar/gui/e-task-table.c:748
+#: ../calendar/gui/e-calendar-view.c:1939 ../calendar/gui/e-memo-table.c:540
+#: ../calendar/gui/e-task-table.c:753
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1888 ../calendar/gui/print.c:2646
+#: ../calendar/gui/e-calendar-view.c:1955 ../calendar/gui/print.c:3176
 #, c-format
 msgid "Location: %s"
 msgstr "Localización: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1919
+#: ../calendar/gui/e-calendar-view.c:1986
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -4853,23 +3999,38 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:759
+#: ../calendar/gui/e-day-view-time-item.c:761
 #, c-format
 msgid "%02i minute divisions"
-msgstr "%02i divisións de minuto"
+msgstr "divisións de %02i minutos"
 
-#: ../calendar/gui/e-day-view-time-item.c:780
+#: ../calendar/gui/e-day-view-time-item.c:782
 msgid "Show the second time zone"
 msgstr "Mostrar o fuso horario secundario"
 
+#. Translators: "None" indicates no second time zone set for a day view
+#: ../calendar/gui/e-day-view-time-item.c:799
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.c:175
+#: ../modules/calendar/e-calendar-preferences.c:224
+msgctxt "cal-second-zone"
+msgid "None"
+msgstr "Ningunha"
+
+#: ../calendar/gui/e-day-view-time-item.c:826
+#: ../calendar/gui/e-timezone-entry.c:319
+#: ../modules/calendar/e-calendar-preferences.c:251
+msgid "Select..."
+msgstr "Seleccionar..."
+
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1878
-#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
+#: ../calendar/gui/e-day-view-top-item.c:877 ../calendar/gui/e-day-view.c:1802
+#: ../calendar/gui/e-week-view-main-item.c:214 ../calendar/gui/print.c:1847
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
@@ -4879,10 +4040,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: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
+#: ../calendar/gui/e-day-view-top-item.c:881 ../calendar/gui/e-day-view.c:1819
+#: ../calendar/gui/e-week-view-main-item.c:223
+#: ../calendar/gui/ea-gnome-calendar.c:203
+#: ../modules/calendar/e-cal-shell-view-private.c:1005
 msgid "%a %d %b"
 msgstr "%a, %d de %b"
 
@@ -4891,468 +4052,33 @@ 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: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
+#: ../calendar/gui/e-day-view-top-item.c:885 ../calendar/gui/e-day-view.c:1835
+#: ../calendar/gui/e-week-view-main-item.c:237
+#: ../calendar/gui/ea-gnome-calendar.c:233
+#: ../modules/calendar/e-cal-shell-view-private.c:1041
 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:1077 ../calendar/gui/e-week-view.c:749
-#: ../calendar/gui/print.c:819
+#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:760
+#: ../calendar/gui/print.c:904 ../calendar/gui/print.c:920
+#: ../calendar/gui/print.c:2341 ../calendar/gui/print.c:2358
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
-#: ../calendar/gui/print.c:821
+#: ../calendar/gui/e-day-view.c:1008 ../calendar/gui/e-week-view.c:763
+#: ../calendar/gui/print.c:906 ../calendar/gui/print.c:922
+#: ../calendar/gui/print.c:2343 ../calendar/gui/print.c:2360
 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:2646
+#: ../calendar/gui/e-day-view.c:2609
 #, 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)"
-
-# (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../calendar/gui/e-itip-control.c:782
-#, c-format
-msgid "Every day"
-msgid_plural "Every %d days"
-msgstr[0] "Cada día"
-msgstr[1] "Cada %d días"
-
-# (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../calendar/gui/e-itip-control.c:795
-#, c-format
-msgid "Every week"
-msgid_plural "Every %d weeks"
-msgstr[0] "Cada semana"
-msgstr[1] "Cada %d semanas"
-
-# (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../calendar/gui/e-itip-control.c:802
-#, c-format
-msgid "Every week on "
-msgid_plural "Every %d weeks on "
-msgstr[0] "Cada semana en "
-msgstr[1] "Cada %d semanas en "
-
-#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:813
-msgid " and "
-msgstr " e "
-
-#: ../calendar/gui/e-itip-control.c:822
-#, c-format
-msgid "The %s day of "
-msgstr "O %s día de "
-
-#: ../calendar/gui/e-itip-control.c:838
-#, c-format
-msgid "The %s %s of "
-msgstr "O %s %s de "
-
-# (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../calendar/gui/e-itip-control.c:849
-#, c-format
-msgid "every month"
-msgid_plural "every %d months"
-msgstr[0] "cada mes"
-msgstr[1] "cada %d meses"
-
-# (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../calendar/gui/e-itip-control.c:861
-#, c-format
-msgid "Every year"
-msgid_plural "Every %d years"
-msgstr[0] "Cada ano"
-msgstr[1] "Cada %d anos"
-
-#: ../calendar/gui/e-itip-control.c:874
-#, c-format
-msgid "a total of %d time"
-msgid_plural "a total of %d times"
-msgstr[0] " un total de %d vez"
-msgstr[1] " un total de %d veces"
-
-#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:885
-msgid ", ending on "
-msgstr ", finalizando en "
-
-#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
-#: ../calendar/gui/e-itip-control.c:906
-msgid "Starts"
-msgstr "Comeza"
-
-#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
-#: ../calendar/gui/e-itip-control.c:916
-msgid "Ends"
-msgstr "Finaliza"
-
-#: ../calendar/gui/e-itip-control.c:943
-#: ../plugins/save-calendar/csv-format.c:372
-msgid "Due"
-msgstr "Vence"
-
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
-msgid "iCalendar Information"
-msgstr "información de iCalendar"
-
-#. Title
-#: ../calendar/gui/e-itip-control.c:1008
-msgid "iCalendar Error"
-msgstr "Erro de iCalendar"
-
-#: ../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:1145
-msgid ""
-"Please review the following information, and then select an action from the "
-"menu below."
-msgstr ""
-"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:1160
-#: ../plugins/itip-formatter/itip-formatter.c:2320
-msgctxt "cal-itip"
-msgid "None"
-msgstr "Ningún"
-
-#: ../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: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: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:1369
-#, c-format
-msgid "%s has published meeting information."
-msgstr "%s publicou información sobre unha cita."
-
-#: ../calendar/gui/e-itip-control.c:1370
-msgid "Meeting Information"
-msgstr "Información da cita"
-
-#: ../calendar/gui/e-itip-control.c:1376
-#, c-format
-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:1378
-#, c-format
-msgid "%s requests your presence at a meeting."
-msgstr "%s require a súa presenza nunha cita."
-
-#: ../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:1385
-#, c-format
-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:1386
-msgid "Meeting Update"
-msgstr "Actualización da cita"
-
-#: ../calendar/gui/e-itip-control.c:1390
-#, c-format
-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:1391
-msgid "Meeting Update Request"
-msgstr "Solicitude de actualización da cita"
-
-#: ../calendar/gui/e-itip-control.c:1398
-#, c-format
-msgid "%s has replied to a meeting request."
-msgstr "%s respondeu a unha petición de cita."
-
-#: ../calendar/gui/e-itip-control.c:1399
-msgid "Meeting Reply"
-msgstr "Resposta de cita"
-
-#: ../calendar/gui/e-itip-control.c:1406
-#, c-format
-msgid "%s has canceled a meeting."
-msgstr "%s cancelou unha cita."
-
-#: ../calendar/gui/e-itip-control.c:1407
-msgid "Meeting Cancelation"
-msgstr "Cancelación da cita"
-
-#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
-#: ../calendar/gui/e-itip-control.c:1534
-#, c-format
-msgid "%s has sent an unintelligible message."
-msgstr "%s enviou unha mensaxe inintelixíbel."
-
-#: ../calendar/gui/e-itip-control.c:1418
-msgid "Bad Meeting Message"
-msgstr "Mensaxe de cita incorrecta"
-
-#: ../calendar/gui/e-itip-control.c:1445
-#, c-format
-msgid "%s has published task information."
-msgstr "%s publicou información da tarefa."
-
-#: ../calendar/gui/e-itip-control.c:1446
-msgid "Task Information"
-msgstr "Información da tarefa"
-
-#: ../calendar/gui/e-itip-control.c:1453
-#, c-format
-msgid "%s requests %s to perform a task."
-msgstr "%s require a %s que efectúe unha tarefa."
-
-#: ../calendar/gui/e-itip-control.c:1455
-#, c-format
-msgid "%s requests you perform a task."
-msgstr "%s require que efectúe unha tarefa."
-
-#: ../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:1462
-#, c-format
-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:1463
-msgid "Task Update"
-msgstr "Actualización de tarefa"
-
-#: ../calendar/gui/e-itip-control.c:1467
-#, c-format
-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:1468
-msgid "Task Update Request"
-msgstr "Solicitude de actualización de tarefa"
-
-#: ../calendar/gui/e-itip-control.c:1475
-#, c-format
-msgid "%s has replied to a task assignment."
-msgstr "%s respondeu a unha asignación de tarefa."
-
-#: ../calendar/gui/e-itip-control.c:1476
-msgid "Task Reply"
-msgstr "Resposta de tarefa"
-
-#: ../calendar/gui/e-itip-control.c:1483
-#, c-format
-msgid "%s has canceled a task."
-msgstr "%s cancelou unha tarefa."
-
-#: ../calendar/gui/e-itip-control.c:1484
-msgid "Task Cancelation"
-msgstr "Cancelación de tarefa"
-
-#: ../calendar/gui/e-itip-control.c:1495
-msgid "Bad Task Message"
-msgstr "Mensaxe de tarefa incorrecta"
-
-#: ../calendar/gui/e-itip-control.c:1519
-#, c-format
-msgid "%s has published free/busy information."
-msgstr "%s publicou información de dispoñibilidade."
-
-#: ../calendar/gui/e-itip-control.c:1520
-msgid "Free/Busy Information"
-msgstr "Información de dispoñibilidade"
-
-#: ../calendar/gui/e-itip-control.c:1524
-#, c-format
-msgid "%s requests your free/busy information."
-msgstr "%s require a súa información de dispoñibilidade."
-
-#: ../calendar/gui/e-itip-control.c:1525
-msgid "Free/Busy Request"
-msgstr "Solicitude de dispoñibilidade"
-
-#: ../calendar/gui/e-itip-control.c:1529
-#, c-format
-msgid "%s has replied to a free/busy request."
-msgstr "%s respondeu a unha solicitude de dispoñibilidade."
-
-#: ../calendar/gui/e-itip-control.c:1530
-msgid "Free/Busy Reply"
-msgstr "Resposta de dispoñibilidade"
-
-#: ../calendar/gui/e-itip-control.c:1535
-msgid "Bad Free/Busy Message"
-msgstr "Mensaxe incorrecta de dispoñibilidade"
-
-#: ../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:1670
-msgid "The message contains only unsupported requests."
-msgstr "Esta mensaxe só contén solicitudes non compatíbeis."
-
-#: ../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: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:1983
-msgid "Update complete\n"
-msgstr "Actualización terminada\n"
-
-#: ../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: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: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:2077
-msgid "Attendee status updated\n"
-msgstr "Estado do participante actualizado\n"
-
-#: ../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:2115 ../calendar/gui/e-itip-control.c:2172
-msgid "Item sent!\n"
-msgstr "Elemento enviado!\n"
-
-#: ../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:2273
-msgid "Choose an action:"
-msgstr "Seleccione unha acción:"
-
-#. To translators: RSVP means "please reply"
-#: ../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:2342
-msgid "Update"
-msgstr "Actualizar"
-
-#: ../calendar/gui/e-itip-control.c:2366
-#: ../plugins/groupwise-features/gw-ui.c:331
-msgid "Accept"
-msgstr "Aceptar"
-
-#: ../calendar/gui/e-itip-control.c:2367
-msgid "Tentatively accept"
-msgstr "Aceptar provisionalmente"
-
-#: ../calendar/gui/e-itip-control.c:2368
-#: ../plugins/groupwise-features/gw-ui.c:345
-msgid "Decline"
-msgstr "Rexeitar"
-
-#: ../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:2417
-msgid "Update respondent status"
-msgstr "Actualizar o estado do interlocutor"
-
-#: ../calendar/gui/e-itip-control.c:2441
-msgid "Send Latest Information"
-msgstr "Enviar a última información"
-
-#: ../calendar/gui/e-itip-control.c:2465
-#: ../modules/mail/e-mail-shell-view-actions.c:1036
-#: ../widgets/misc/e-activity-proxy.c:300
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../calendar/gui/e-itip-control.ui.h:1
-msgid "--to--"
-msgstr "--a--"
-
-#: ../calendar/gui/e-itip-control.ui.h:2
-msgid "Calendar Message"
-msgstr "Mensaxe do calendario"
-
-#: ../calendar/gui/e-itip-control.ui.h:3
-msgid "Date:"
-msgstr "Data:"
-
-#: ../calendar/gui/e-itip-control.ui.h:5
-msgid "Loading Calendar"
-msgstr "Cargando calendario"
-
-#: ../calendar/gui/e-itip-control.ui.h:6
-msgid "Loading calendar..."
-msgstr "Cargando calendario..."
-
-#: ../calendar/gui/e-itip-control.ui.h:7
-msgid "Organizer:"
-msgstr "Organizador:"
-
-#: ../calendar/gui/e-itip-control.ui.h:8
-msgid "Server Message:"
-msgstr "Mensaxe do servidor:"
-
 #: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "Presidentes"
@@ -5370,56 +4096,56 @@ msgid "Resources"
 msgstr "Recursos"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../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
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
+#: ../calendar/gui/e-meeting-store.c:990 ../calendar/gui/print.c:1069
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../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
+#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
+#: ../calendar/gui/print.c:1070 ../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:106 ../calendar/gui/e-meeting-store.c:123
-#: ../calendar/gui/print.c:970
+#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
+#: ../calendar/gui/print.c:1071
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
-#: ../calendar/gui/print.c:971
+#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
+#: ../calendar/gui/print.c:1072
 msgid "Room"
 msgstr "Sala"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/print.c:1086
 msgid "Chair"
 msgstr "Presidente"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../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
+#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-meeting-store.c:993 ../calendar/gui/print.c:1087
 msgid "Required Participant"
 msgstr "Participante requirido"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
-#: ../calendar/gui/print.c:987
+#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
+#: ../calendar/gui/print.c:1088
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/print.c:988
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/print.c:1089
 msgid "Non-Participant"
 msgstr "Non-participante"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:1003
 msgid "Needs Action"
 msgstr "Necesita acción"
 
@@ -5428,14 +4154,20 @@ msgstr "Necesita acción"
 msgid "Attendee                          "
 msgstr "Participante                          "
 
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:582
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
 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:2376
+#: ../calendar/gui/e-meeting-time-sel-item.c:434
+#: ../calendar/gui/e-meeting-time-sel.c:2397
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
@@ -5443,74 +4175,74 @@ msgstr "%A, %d de %B de %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2407
+#: ../calendar/gui/e-meeting-time-sel-item.c:438
+#: ../calendar/gui/e-meeting-time-sel.c:2428
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:466
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "Out of Office"
 msgstr "Fóra da oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "No Information"
 msgstr "Sen información"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:587
 msgid "O_ptions"
 msgstr "O_pcións"
 
-#: ../calendar/gui/e-meeting-time-sel.c:617
+#: ../calendar/gui/e-meeting-time-sel.c:605
 msgid "Show _only working hours"
 msgstr "Mostrar _só as horas de traballo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:628
+#: ../calendar/gui/e-meeting-time-sel.c:616
 msgid "Show _zoomed out"
 msgstr "Mostrar _reducido"
 
-#: ../calendar/gui/e-meeting-time-sel.c:644
+#: ../calendar/gui/e-meeting-time-sel.c:632
 msgid "_Update free/busy"
 msgstr "_Actualizar dispoñibilidade"
 
-#: ../calendar/gui/e-meeting-time-sel.c:659
+#: ../calendar/gui/e-meeting-time-sel.c:647
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:677
+#: ../calendar/gui/e-meeting-time-sel.c:665
 msgid "_Autopick"
 msgstr "Seleccionar _automaticamente"
 
-#: ../calendar/gui/e-meeting-time-sel.c:692
+#: ../calendar/gui/e-meeting-time-sel.c:680
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:710
+#: ../calendar/gui/e-meeting-time-sel.c:698
 msgid "_All people and resources"
 msgstr "_Todas as persoas e recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:720
+#: ../calendar/gui/e-meeting-time-sel.c:708
 msgid "All _people and one resource"
 msgstr "Todas as _persoas e un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:730
+#: ../calendar/gui/e-meeting-time-sel.c:718
 msgid "_Required people"
 msgstr "Persoas _requiridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:739
+#: ../calendar/gui/e-meeting-time-sel.c:727
 msgid "Required people and _one resource"
 msgstr "Persoas requiridas e _un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:785
+#: ../calendar/gui/e-meeting-time-sel.c:776
 msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:822
+#: ../calendar/gui/e-meeting-time-sel.c:816
 msgid "_End time:"
 msgstr "Hora de _finalización:"
 
@@ -5538,7 +4270,7 @@ msgstr "Idioma"
 msgid "Member"
 msgstr "Integrante"
 
-#: ../calendar/gui/e-memo-table.c:414
+#: ../calendar/gui/e-memo-table.c:419
 #: ../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
@@ -5547,38 +4279,38 @@ msgstr "Integrante"
 msgid "Memos"
 msgstr "Notas"
 
-#: ../calendar/gui/e-memo-table.c:492 ../calendar/gui/e-task-table.c:709
+#: ../calendar/gui/e-memo-table.c:497 ../calendar/gui/e-task-table.c:714
 msgid "* No Summary *"
 msgstr "* Sen resumo *"
 
 #. 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
+#: ../calendar/gui/e-memo-table.c:582 ../calendar/gui/e-task-table.c:794
 msgid "Start: "
 msgstr "Comezo: "
 
 #. 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
+#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:812
 msgid "Due: "
 msgstr "Pendente: "
 
-#: ../calendar/gui/e-memo-table.c:712
+#: ../calendar/gui/e-memo-table.c:717
 msgid "Cut selected memos to the clipboard"
 msgstr "Cortar as mensaxes seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:718
+#: ../calendar/gui/e-memo-table.c:723
 msgid "Copy selected memos to the clipboard"
 msgstr "Copiar as mensaxes seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:724
+#: ../calendar/gui/e-memo-table.c:729
 msgid "Paste memos from the clipboard"
 msgstr "Pegar recordatorios desde o portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:730
-#: ../modules/calendar/e-memo-shell-view-actions.c:566
+#: ../calendar/gui/e-memo-table.c:735
+#: ../modules/calendar/e-memo-shell-view-actions.c:572
 msgid "Delete selected memos"
 msgstr "Eliminar as notas seleccionadas"
 
-#: ../calendar/gui/e-memo-table.c:736
+#: ../calendar/gui/e-memo-table.c:741
 msgid "Select all visible memos"
 msgstr "Seleccionar todas as mensaxes visíbeis"
 
@@ -5590,18 +4322,18 @@ msgstr "Prema para engadir unha nota"
 #. %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
+#: ../calendar/gui/e-task-table.c:544
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:631 ../calendar/gui/print.c:2072
+#: ../calendar/gui/e-task-table.c:636 ../calendar/gui/print.c:2140
 #: ../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
+#: ../modules/calendar/e-task-shell-view.c:444
 #: ../plugins/caldav/caldav-browse-server.c:429
 #: ../plugins/groupwise-features/camel-gw-listener.c:422
 #: ../plugins/groupwise-features/camel-gw-listener.c:562
@@ -5609,24 +4341,24 @@ msgstr "%d%%"
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: ../calendar/gui/e-task-table.c:935
+#: ../calendar/gui/e-task-table.c:940
 msgid "Cut selected tasks to the clipboard"
 msgstr "Cortar o texto seleccionado para o portapapeis"
 
-#: ../calendar/gui/e-task-table.c:941
+#: ../calendar/gui/e-task-table.c:946
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copiar o texto seleccionado ao portapapeis"
 
-#: ../calendar/gui/e-task-table.c:947
+#: ../calendar/gui/e-task-table.c:952
 msgid "Paste tasks from the clipboard"
 msgstr "Pegar as tarefas desde o portapapeis"
 
-#: ../calendar/gui/e-task-table.c:953
-#: ../modules/calendar/e-task-shell-view-actions.c:690
+#: ../calendar/gui/e-task-table.c:958
+#: ../modules/calendar/e-task-shell-view-actions.c:696
 msgid "Delete selected tasks"
 msgstr "Eliminar as tarefas seleccionadas"
 
-#: ../calendar/gui/e-task-table.c:959
+#: ../calendar/gui/e-task-table.c:964
 msgid "Select all visible tasks"
 msgstr "Seleccionar todas as mensaxes visíbeis"
 
@@ -5638,7 +4370,7 @@ 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:235 ../calendar/gui/print.c:1725
+#: ../calendar/gui/e-week-view-main-item.c:231 ../calendar/gui/print.c:1828
 msgid "%d %B"
 msgstr "%d de %B"
 
@@ -5671,23 +4403,23 @@ msgstr "visualización de actividades de calendario"
 msgid "Grab Focus"
 msgstr "Obter o foco"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New Appointment"
 msgstr "Nova cita"
 
-#: ../calendar/gui/ea-cal-view.c:305
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "New All Day Event"
 msgstr "Novo actividade de día completo"
 
-#: ../calendar/gui/ea-cal-view.c:306
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "New Meeting"
 msgstr "Nova cita"
 
-#: ../calendar/gui/ea-cal-view.c:307
+#: ../calendar/gui/ea-cal-view.c:308
 msgid "Go to Today"
 msgstr "Ir a hoxe"
 
-#: ../calendar/gui/ea-cal-view.c:308
+#: ../calendar/gui/ea-cal-view.c:309
 msgid "Go to Date"
 msgstr "Ir á data"
 
@@ -5696,7 +4428,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:150 ../calendar/gui/ea-week-view.c:149
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5705,14 +4437,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:155 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:153
 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:162
+#: ../calendar/gui/ea-day-view.c:163
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Visualización de semana laboral: %s. %s"
@@ -5720,47 +4452,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:168
+#: ../calendar/gui/ea-day-view.c:169
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Vista diaria: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:202
+#: ../calendar/gui/ea-day-view.c:203
 msgid "calendar view for a work week"
 msgstr "visualización de calendario para unha semana laboral"
 
-#: ../calendar/gui/ea-day-view.c:204
+#: ../calendar/gui/ea-day-view.c:205
 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:48
-#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/gui/ea-gnome-calendar.c:49
+#: ../calendar/gui/ea-gnome-calendar.c:57
 #: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "Calendario do GNOME"
 
-#: ../calendar/gui/ea-gnome-calendar.c:199
-#: ../modules/calendar/e-cal-shell-view-private.c:1010
+#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../modules/calendar/e-cal-shell-view-private.c:1001
 msgid "%A %d %b %Y"
 msgstr "%A, %d de %b de %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../calendar/gui/ea-gnome-calendar.c:205
+#: ../calendar/gui/ea-gnome-calendar.c:210
+#: ../calendar/gui/ea-gnome-calendar.c:212
+#: ../modules/calendar/e-cal-shell-view-private.c:1008
+#: ../modules/calendar/e-cal-shell-view-private.c:1014
 #: ../modules/calendar/e-cal-shell-view-private.c:1017
-#: ../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:228
-#: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../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
+#: ../calendar/gui/ea-gnome-calendar.c:229
+#: ../calendar/gui/ea-gnome-calendar.c:235
+#: ../calendar/gui/ea-gnome-calendar.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:243
+#: ../modules/calendar/e-cal-shell-view-private.c:1034
+#: ../modules/calendar/e-cal-shell-view-private.c:1045
+#: ../modules/calendar/e-cal-shell-view-private.c:1052
+#: ../modules/calendar/e-cal-shell-view-private.c:1055
 msgid "%d %b %Y"
 msgstr "%d de %b de %Y"
 
@@ -5772,25 +4504,25 @@ msgstr "Botón de salto"
 msgid "Click here, you can find more events."
 msgstr "Prema aquí para localizar máis eventos."
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Vista mensual: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:161
+#: ../calendar/gui/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Vista semanal: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:195
+#: ../calendar/gui/ea-week-view.c:196
 msgid "calendar view for a month"
 msgstr "Visualización de calendario para un mes"
 
-#: ../calendar/gui/ea-week-view.c:197
+#: ../calendar/gui/ea-week-view.c:198
 msgid "calendar view for one or more weeks"
 msgstr "vista de calendario para unha ou máis semanas"
 
-#: ../calendar/gui/gnome-cal.c:2311
+#: ../calendar/gui/gnome-cal.c:2198
 msgid "Purging"
 msgstr "Limpando"
 
@@ -5843,7 +4575,7 @@ msgid "Select Date"
 msgstr "Seleccionar data"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../modules/calendar/e-cal-shell-view-actions.c:1317
 msgid "Select _Today"
 msgstr "Seleccionar _hoxe"
 
@@ -5851,32 +4583,32 @@ msgstr "Seleccionar _hoxe"
 msgid "September"
 msgstr "Setembro"
 
-#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
-#: ../calendar/gui/itip-utils.c:551
+#: ../calendar/gui/itip-utils.c:407 ../calendar/gui/itip-utils.c:458
+#: ../calendar/gui/itip-utils.c:550
 msgid "An organizer must be set."
 msgstr "Debe definirse un organizador."
 
-#: ../calendar/gui/itip-utils.c:451
+#: ../calendar/gui/itip-utils.c:450
 msgid "At least one attendee is necessary"
 msgstr "Ã? necesario polo menos un participante"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "Información do actividade"
 
-#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "Información da tarefa"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "Información da nota"
 
-#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
+#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "Información de dispoñibilidade"
 
-#: ../calendar/gui/itip-utils.c:644
+#: ../calendar/gui/itip-utils.c:643
 msgid "Calendar information"
 msgstr "Información do calendario"
 
@@ -5884,7 +4616,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:678
+#: ../calendar/gui/itip-utils.c:677
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Aceptado"
@@ -5893,7 +4625,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:685
+#: ../calendar/gui/itip-utils.c:684
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
@@ -5905,7 +4637,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:692 ../calendar/gui/itip-utils.c:740
+#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:739
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Rexeitado"
@@ -5914,7 +4646,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:699
+#: ../calendar/gui/itip-utils.c:698
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegado"
@@ -5922,7 +4654,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:712
+#: ../calendar/gui/itip-utils.c:711
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Actualizado"
@@ -5930,7 +4662,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:719
+#: ../calendar/gui/itip-utils.c:718
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancelar"
@@ -5938,7 +4670,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:726
+#: ../calendar/gui/itip-utils.c:725
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Actualizar"
@@ -5946,7 +4678,7 @@ 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:733
+#: ../calendar/gui/itip-utils.c:732
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contraproposta"
@@ -5974,225 +4706,213 @@ msgstr "Non foi posíbel almacenar un recurso, erro:"
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante no actividade."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:548
 msgid "31st"
 msgstr "31"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:605
 msgid "Su"
 msgstr "Do"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:605
 msgid "Mo"
 msgstr "Lu"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:605
 msgid "Tu"
 msgstr "Ma"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:605
 msgid "We"
 msgstr "Mé"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:606
 msgid "Th"
 msgstr "Xo"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:606
 msgid "Fr"
 msgstr "Ve"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:606
 msgid "Sa"
 msgstr "Sá"
 
-#. Translators: This is part of "START to END" text,
-#. * where START and END are date/times.
-#: ../calendar/gui/print.c:2449
+#: ../calendar/gui/print.c:2969
 msgid " to "
 msgstr " para "
 
-#. Translators: This is part of "START to END
-#. * (Completed COMPLETED)", where COMPLETED is a
-#. * completed date/time.
-#: ../calendar/gui/print.c:2457
+#: ../calendar/gui/print.c:2979
 msgid " (Completed "
 msgstr " (Terminada "
 
-#. Translators: This is part of "Completed COMPLETED",
-#. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:2461
+#: ../calendar/gui/print.c:2985
 msgid "Completed "
 msgstr "Terminada "
 
-#. Translators: This is part of "START (Due DUE)",
-#. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:2469
+#: ../calendar/gui/print.c:2995
 msgid " (Due "
 msgstr " (Pendente "
 
-#. Translators: This is part of "Due DUE",
-#. * where DUE is a date/time due the event
-#. * should be finished.
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:3002
 msgid "Due "
 msgstr "Pendente "
 
-#: ../calendar/gui/print.c:2637
+#: ../calendar/gui/print.c:3167
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
 
-#: ../calendar/gui/print.c:2661
+#: ../calendar/gui/print.c:3194
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:2704
+#: ../calendar/gui/print.c:3237
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2719
+#: ../calendar/gui/print.c:3252
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:2737
+#: ../calendar/gui/print.c:3270
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaxe completada: %i"
 
-#: ../calendar/gui/print.c:2748
+#: ../calendar/gui/print.c:3281
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2761
+#: ../calendar/gui/print.c:3294
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: ../calendar/gui/print.c:2772
+#: ../calendar/gui/print.c:3305
 msgid "Contacts: "
 msgstr "Contactos: "
 
@@ -6219,7 +4939,7 @@ msgstr "Citas e reunións"
 
 #: ../calendar/importers/icalendar-importer.c:350
 #: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1835
+#: ../plugins/itip-formatter/itip-formatter.c:1958
 msgid "Opening calendar"
 msgstr "Abrir calendario"
 
@@ -7953,28 +6673,20 @@ msgstr "Pacífico/Yap"
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: ../composer/e-composer-actions.c:245
-#: ../widgets/misc/e-attachment-view.c:379
+#: ../composer/e-composer-actions.c:259
+#: ../widgets/misc/e-attachment-view.c:380
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
 
-#: ../composer/e-composer-actions.c:250
-#: ../widgets/misc/e-signature-editor.c:206
+#: ../composer/e-composer-actions.c:264
+#: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
 msgstr "_Pechar"
 
-#: ../composer/e-composer-actions.c:252
+#: ../composer/e-composer-actions.c:266
 msgid "Close the current file"
 msgstr "Pechar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:257
-msgid "_Print..."
-msgstr "_Imprimir..."
-
-#: ../composer/e-composer-actions.c:264
-msgid "Print Pre_view"
-msgstr "Pre_visualización da impresión"
-
 #: ../composer/e-composer-actions.c:273
 msgid "Save the current file"
 msgstr "Gardar o ficheiro actual"
@@ -7988,118 +6700,126 @@ msgid "Save the current file with a different name"
 msgstr "Gardar o ficheiro actual cun nome diferente"
 
 #: ../composer/e-composer-actions.c:285
+msgid "New _Message"
+msgstr "_Mensaxe nova"
+
+#: ../composer/e-composer-actions.c:287
+msgid "Open New Message window"
+msgstr "Abrir unha xanela de Mensaxe nova"
+
+#: ../composer/e-composer-actions.c:294
+msgid "Character _Encoding"
+msgstr "C_odificación de caracteres"
+
+#: ../composer/e-composer-actions.c:311
+msgid "_Print..."
+msgstr "_Imprimir..."
+
+#: ../composer/e-composer-actions.c:318
+msgid "Print Pre_view"
+msgstr "Pre_visualización da impresión"
+
+#: ../composer/e-composer-actions.c:325
 msgid "Save as _Draft"
 msgstr "Gardar como borra_dor"
 
-#: ../composer/e-composer-actions.c:287
+#: ../composer/e-composer-actions.c:327
 msgid "Save as draft"
 msgstr "Gardar como borrador"
 
-#: ../composer/e-composer-actions.c:292 ../composer/e-composer-private.c:297
+#: ../composer/e-composer-actions.c:332 ../composer/e-composer-private.c:318
 msgid "S_end"
 msgstr "_Enviar"
 
-#: ../composer/e-composer-actions.c:294
+#: ../composer/e-composer-actions.c:334
 msgid "Send this message"
 msgstr "Enviar esta mensaxe"
 
-#: ../composer/e-composer-actions.c:299
-msgid "New _Message"
-msgstr "_Mensaxe nova"
-
-#: ../composer/e-composer-actions.c:301
-msgid "Open New Message window"
-msgstr "Abrir unha xanela de Mensaxe nova"
-
-#: ../composer/e-composer-actions.c:308
-msgid "Character _Encoding"
-msgstr "C_odificación de caracteres"
-
-#: ../composer/e-composer-actions.c:325
+#: ../composer/e-composer-actions.c:342
 msgid "PGP _Encrypt"
 msgstr "C_ifrar con PGP"
 
-#: ../composer/e-composer-actions.c:327
+#: ../composer/e-composer-actions.c:344
 msgid "Encrypt this message with PGP"
 msgstr "Cifrar esta mensaxe con PGP"
 
-#: ../composer/e-composer-actions.c:333
+#: ../composer/e-composer-actions.c:350
 msgid "PGP _Sign"
 msgstr "A_sinar con PGP"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:352
 msgid "Sign this message with your PGP key"
 msgstr "Asinar esta mensaxe coa súa chave PGP"
 
-#: ../composer/e-composer-actions.c:341
+#: ../composer/e-composer-actions.c:358
 msgid "_Prioritize Message"
 msgstr "_Mensaxe prioritaria"
 
-#: ../composer/e-composer-actions.c:343
+#: ../composer/e-composer-actions.c:360
 msgid "Set the message priority to high"
 msgstr "Definir a prioridade da mensaxe como alta"
 
-#: ../composer/e-composer-actions.c:349
+#: ../composer/e-composer-actions.c:366
 msgid "Re_quest Read Receipt"
 msgstr "_Requirir confirmación de lectura"
 
-#: ../composer/e-composer-actions.c:351
+#: ../composer/e-composer-actions.c:368
 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:357
+#: ../composer/e-composer-actions.c:374
 msgid "S/MIME En_crypt"
 msgstr "_Cifrar con S/MIME"
 
-#: ../composer/e-composer-actions.c:359
+#: ../composer/e-composer-actions.c:376
 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:365
+#: ../composer/e-composer-actions.c:382
 msgid "S/MIME Sig_n"
 msgstr "Si_natura S/MIME"
 
-#: ../composer/e-composer-actions.c:367
+#: ../composer/e-composer-actions.c:384
 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:373
+#: ../composer/e-composer-actions.c:390
 msgid "_Bcc Field"
 msgstr "Campo _Cco"
 
-#: ../composer/e-composer-actions.c:375
+#: ../composer/e-composer-actions.c:392
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo CCO"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:398
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ../composer/e-composer-actions.c:383
+#: ../composer/e-composer-actions.c:400
 msgid "Toggles whether the CC field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo CC"
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:406
 msgid "_Reply-To Field"
 msgstr "Campo _Responder a"
 
-#: ../composer/e-composer-actions.c:391
+#: ../composer/e-composer-actions.c:408
 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:434
+#: ../composer/e-composer-actions.c:464
 msgid "Save Draft"
 msgstr "Gardar borrador"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:40
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:42
 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:46
+#: ../composer/e-composer-header-table.c:45
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -8107,35 +6827,35 @@ 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:1005
+#: ../composer/e-composer-header-table.c:1006
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-composer-header-table.c:1014
+#: ../composer/e-composer-header-table.c:1015
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
-#: ../composer/e-composer-header-table.c:1018
+#: ../composer/e-composer-header-table.c:1019
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-composer-header-table.c:1023
+#: ../composer/e-composer-header-table.c:1024
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:1028
+#: ../composer/e-composer-header-table.c:1029
 msgid "_Bcc:"
 msgstr "_Cco:"
 
-#: ../composer/e-composer-header-table.c:1033
+#: ../composer/e-composer-header-table.c:1034
 msgid "_Post To:"
 msgstr "_Publicar en:"
 
-#: ../composer/e-composer-header-table.c:1037
+#: ../composer/e-composer-header-table.c:1038
 msgid "S_ubject:"
 msgstr "_Asunto:"
 
-#: ../composer/e-composer-header-table.c:1046
+#: ../composer/e-composer-header-table.c:1047
 msgid "Si_gnature:"
 msgstr "Si_natura:"
 
@@ -8147,33 +6867,27 @@ msgstr "Prema aquí para ir á axenda de enderezos"
 msgid "Click here to select folders to post to"
 msgstr "Prema aquí para seleccionar os cartafoles nos que publicar"
 
-#: ../composer/e-composer-private.c:215
+#: ../composer/e-composer-private.c:217
 msgid "Undo the last action"
 msgstr "Desfacer a última acción"
 
-#: ../composer/e-composer-private.c:219
+#: ../composer/e-composer-private.c:221
 msgid "Redo the last undone action"
 msgstr "Refacer a última acción desfeita"
 
-#: ../composer/e-composer-private.c:223
+#: ../composer/e-composer-private.c:225
 msgid "Search for text"
 msgstr "Buscar texto"
 
-#: ../composer/e-composer-private.c:227
+#: ../composer/e-composer-private.c:229
 msgid "Search for and replace text"
 msgstr "Buscar e substituír texto"
 
-#: ../composer/e-composer-private.c:317
+#: ../composer/e-composer-private.c:338
 msgid "Save draft"
 msgstr "Gardar borrador"
 
-#. Check buttons
-#: ../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:1030
+#: ../composer/e-msg-composer.c:784
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -8181,7 +6895,7 @@ msgstr ""
 "Non é posíbel asinar a mensaxe saínte: non hai un certificado de sinatura "
 "definido para esta conta"
 
-#: ../composer/e-msg-composer.c:1042
+#: ../composer/e-msg-composer.c:793
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -8190,17 +6904,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:1466 ../composer/e-msg-composer.c:1811
+#: ../composer/e-msg-composer.c:1675 ../composer/e-msg-composer.c:2014
 msgid "Compose Message"
 msgstr "Escribir unha mensaxe"
 
-#: ../composer/e-msg-composer.c:3477
+#: ../composer/e-msg-composer.c:4082
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "(O editor contén un corpo de mensaxe que non ten texto, polo que non se pode "
 "editar.)"
 
-#: ../composer/e-msg-composer.c:4085
+#: ../composer/e-msg-composer.c:4787
 msgid "Untitled Message"
 msgstr "Mensaxe sen título"
 
@@ -8217,6 +6931,18 @@ msgid "All accounts have been removed."
 msgstr "Elimináronse todas as contas."
 
 #: ../composer/mail-composer.error.xml.h:3
+msgid "An error occurred while saving to your Drafts folder."
+msgstr "Produciuse un erro ao gardar ao seu cartafol de Borradores."
+
+#: ../composer/mail-composer.error.xml.h:4
+msgid "An error occurred while saving to your Outbox folder."
+msgstr "Produciuse un erro ao gardar no seu cartafol Caixa de Saída."
+
+#: ../composer/mail-composer.error.xml.h:5
+msgid "An error occurred while sending. How do you want to proceed?"
+msgstr "Produciuse un erro ao enviar. Como desexa proceder?"
+
+#: ../composer/mail-composer.error.xml.h:6
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
@@ -8224,17 +6950,28 @@ msgstr ""
 "Está seguro de que quere rexeitar a mensaxe titulada «{0}», que está "
 "redactando?"
 
-#: ../composer/mail-composer.error.xml.h:4
+#: ../composer/mail-composer.error.xml.h:7
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr ""
 "Debido a &quot;{0}&quot;, quizais necesite seleccionar diferentes opcións de "
 "correo."
 
-#: ../composer/mail-composer.error.xml.h:5
+#: ../composer/mail-composer.error.xml.h:8
 msgid "Because &quot;{1}&quot;."
 msgstr "Debido a &quot;{1}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:6
+#: ../composer/mail-composer.error.xml.h:9
+msgid ""
+"Because you are working offline, the message will be saved to your local "
+"Outbox folder. When you are back online you can send the message by clicking "
+"the Send/Receive button in Evolution's toolbar."
+msgstr ""
+"Debido a que vostede está traballando en modo desconectado, a mensaxe "
+"gardarase no seu cartafol de Saída local. Cando volva a conectarse poderá "
+"enviar a mensaxe premendo no botón Enviar/Recibir na barra de ferramentas de "
+"Evolution."
+
+#: ../composer/mail-composer.error.xml.h:10
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -8244,41 +6981,37 @@ msgstr ""
 "non ser que escolla gardar a mensaxe no cartafol Borradores. Isto "
 "permitiralle continuar a mensaxe máis tarde."
 
-#: ../composer/mail-composer.error.xml.h:7
-msgid "Could not create composer window."
-msgstr "Non foi posíbel crear a xanela do editor."
-
-#: ../composer/mail-composer.error.xml.h:8
+#: ../composer/mail-composer.error.xml.h:11
 msgid "Could not create message."
 msgstr "Non foi posíbel crear a mensaxe."
 
-#: ../composer/mail-composer.error.xml.h:9
+#: ../composer/mail-composer.error.xml.h:12
 msgid "Could not read signature file &quot;{0}&quot;."
 msgstr "Non foi posíbel ler o ficheiro de sinatura &quot;{0}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:10
+#: ../composer/mail-composer.error.xml.h:13
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "Non foi posíbel obter as mensaxes para anexar desde {0}."
 
-#: ../composer/mail-composer.error.xml.h:11
+#: ../composer/mail-composer.error.xml.h:14
 msgid "Could not save to autosave file &quot;{0}&quot;."
 msgstr ""
 "Non foi posíbel gardar no ficheiro de gardado automático &quot;{0}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:12
+#: ../composer/mail-composer.error.xml.h:15
 msgid "Do you want to recover unfinished messages?"
 msgstr "Quere recuperar as mensaxes non finalizadas?"
 
-#: ../composer/mail-composer.error.xml.h:13
+#: ../composer/mail-composer.error.xml.h:16
 msgid "Download in progress. Do you want to send the mail?"
 msgstr "Hai unha descarga en progreso. Quere enviar o correo?"
 
-#: ../composer/mail-composer.error.xml.h:14
+#: ../composer/mail-composer.error.xml.h:17
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr ""
 "Produciuse un erro ao gardar no gardado automático debido a &quot;{1}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:18
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -8286,145 +7019,160 @@ msgstr ""
 "O Evolution saíu inesperadamente mentres estaba a redactar unha mensaxe "
 "nova. Recuperar a mensaxe permitiralle continuar onde a deixou."
 
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:19
+#| msgid "Saving message to folder '%s'"
+msgid "Saving message to Outbox."
+msgstr "Gardar as mensaxes na Caixa de saída."
+
+#: ../composer/mail-composer.error.xml.h:20
 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 "
 "mensaxe."
 
-#: ../composer/mail-composer.error.xml.h:17
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:113
+#, fuzzy
+msgid "The reported error was &quot;{0}&quot;."
+msgstr "Expresión regular incorrecta &quot;{0}&quot;."
+
+#: ../composer/mail-composer.error.xml.h:22
 msgid ""
-"Unable to activate the HTML editor control.\n"
-"\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
-"installed."
+"The reported error was &quot;{0}&quot;. The message has most likely not been "
+"saved."
 msgstr ""
-"Non é posíbel activar o compoñente do editor HTML.\n"
-"\n"
-"Asegúrese de que ten instalada a versión correcta de gtkhtml e libgtkhtml."
 
-#: ../composer/mail-composer.error.xml.h:20
-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:23
+msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
+msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:24
 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
+#: ../composer/mail-composer.error.xml.h:25
 msgid "You need to configure an account before you can compose mail."
 msgstr "Necesita configurar unha conta antes de poder escribir un correo."
 
-#: ../composer/mail-composer.error.xml.h:23
+#. Response codes were chosen somewhat arbitrarily.
+#: ../composer/mail-composer.error.xml.h:27
 msgid "_Continue Editing"
 msgstr "_Continuar editando"
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Do not Recover"
 msgstr "_Non recuperar"
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Recover"
 msgstr "_Recuperar"
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Save Draft"
 msgstr "_Gardar borrador"
 
-#: ../capplet/anjal-settings-main.c:198
+#: ../composer/mail-composer.error.xml.h:32
+#, fuzzy
+msgid "_Save to Outbox"
+msgstr "A mensaxe non é un correo non desexado"
+
+#: ../composer/mail-composer.error.xml.h:34
+msgid "_Try Again"
+msgstr ""
+
+#: ../capplet/anjal-settings-main.c:223
 msgid "Run Anjal in a window"
 msgstr "Executar Anjar nunha xanela"
 
-#: ../capplet/anjal-settings-main.c:199
+#: ../capplet/anjal-settings-main.c:224
 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:206
+#: ../capplet/anjal-settings-main.c:231
 msgid "ID of the socket to embed in"
 msgstr "ID do socket para incrustar"
 
-#: ../capplet/anjal-settings-main.c:207
+#: ../capplet/anjal-settings-main.c:232
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:220
+#: ../capplet/anjal-settings-main.c:245
 msgid "Anjal email client"
 msgstr "Cliente de correo Anjal"
 
-#: ../capplet/settings/mail-account-view.c:74
+#: ../capplet/settings/mail-account-view.c:73
 msgid "Please enter your full name."
 msgstr "Insira o seu nome completo."
 
-#: ../capplet/settings/mail-account-view.c:75
+#: ../capplet/settings/mail-account-view.c:74
 msgid "Please enter your email address."
 msgstr "Insira o seu enderezo de correo electrónico:"
 
-#: ../capplet/settings/mail-account-view.c:76
+#: ../capplet/settings/mail-account-view.c:75
 msgid "The email address you have entered is invalid."
 msgstr "O enderezo de correo electrónico inserido é incorrecto."
 
-#: ../capplet/settings/mail-account-view.c:77
+#: ../capplet/settings/mail-account-view.c:76
 msgid "Please enter your password."
 msgstr "Insira o seu enderezo de correo electrónico:"
 
-#: ../capplet/settings/mail-account-view.c:256
+#: ../capplet/settings/mail-account-view.c:255
 #: ../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
+#: ../capplet/settings/mail-account-view.c:359
+#: ../plugins/google-account-setup/google-contacts-source.c:56
 #: ../plugins/google-account-setup/google-source.c:81
 msgid "Google"
 msgstr "Google"
 
-#: ../capplet/settings/mail-account-view.c:464
+#: ../capplet/settings/mail-account-view.c:463
 msgid "Personal details:"
 msgstr "Información persoal:"
 
-#: ../capplet/settings/mail-account-view.c:471
+#: ../capplet/settings/mail-account-view.c:470
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../capplet/settings/mail-account-view.c:480
+#: ../capplet/settings/mail-account-view.c:479
 msgid "Email address:"
 msgstr "Enderezo de correo:"
 
-#: ../capplet/settings/mail-account-view.c:490
+#: ../capplet/settings/mail-account-view.c:489
 msgid "Details:"
 msgstr "Detalles:"
 
-#: ../capplet/settings/mail-account-view.c:498
+#: ../capplet/settings/mail-account-view.c:497
 msgid "Receiving"
 msgstr "Opcións de recepción"
 
-#: ../capplet/settings/mail-account-view.c:505
+#: ../capplet/settings/mail-account-view.c:504
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: ../capplet/settings/mail-account-view.c:514
+#: ../capplet/settings/mail-account-view.c:513
 msgid "Server address:"
 msgstr "Endrezo do servidor:"
 
-#: ../capplet/settings/mail-account-view.c:523
+#: ../capplet/settings/mail-account-view.c:522
 msgid "Username:"
 msgstr "Nome de usuario:"
 
-#: ../capplet/settings/mail-account-view.c:532
+#: ../capplet/settings/mail-account-view.c:531
 msgid "Use encryption:"
 msgstr "Usar cifrado:"
 
-#: ../capplet/settings/mail-account-view.c:537
-#: ../capplet/settings/mail-account-view.c:572
+#: ../capplet/settings/mail-account-view.c:536
+#: ../capplet/settings/mail-account-view.c:571
 msgid "never"
 msgstr "nunca"
 
-#: ../capplet/settings/mail-account-view.c:549
+#: ../capplet/settings/mail-account-view.c:548
 msgid "Sending"
 msgstr "Opcións de envío"
 
-#: ../capplet/settings/mail-account-view.c:591
+#: ../capplet/settings/mail-account-view.c:590
 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. "
@@ -8435,7 +7183,7 @@ msgstr ""
 "configurar as preferencias. Se non é posíbel facelo de forma automatica "
 "necesitará os detalles do seu servidor."
 
-#: ../capplet/settings/mail-account-view.c:593
+#: ../capplet/settings/mail-account-view.c:592
 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 "
@@ -8445,11 +7193,11 @@ msgstr ""
 "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:595
+#: ../capplet/settings/mail-account-view.c:594
 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:597
+#: ../capplet/settings/mail-account-view.c:596
 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."
@@ -8457,13 +7205,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:598
+#: ../capplet/settings/mail-account-view.c:597
 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:599
+#: ../capplet/settings/mail-account-view.c:598
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -8471,101 +7219,100 @@ 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:614
-#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2222
-#: ../mail/mail-config.ui.h:62
+#: ../capplet/settings/mail-account-view.c:613
+#: ../mail/em-account-editor.c:2088 ../mail/em-account-editor.c:2209
 msgid "Identity"
 msgstr "Identidade"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Next - Receiving mail"
 msgstr "Seguinte - Recepción o correo"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Receiving mail"
 msgstr "Recepción de correo"
 
+#: ../capplet/settings/mail-account-view.c:614
 #: ../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:615
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Back - Identity"
 msgstr "Anterior - Identidade"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Next - Receiving options"
 msgstr "Seguinte - Opcións de recepción"
 
-#: ../capplet/settings/mail-account-view.c:616
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Receiving options"
 msgstr "Opcións de recepción"
 
-#: ../capplet/settings/mail-account-view.c:616
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Back - Receiving mail"
 msgstr "Anterior - Recepción de correo"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Sending mail"
 msgstr "Envío de correo"
 
+#: ../capplet/settings/mail-account-view.c:617
 #: ../capplet/settings/mail-account-view.c:618
-#: ../capplet/settings/mail-account-view.c:619
 msgid "Next - Review account"
 msgstr "Seguinte - Revisar a conta"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Next - Defaults"
 msgstr "Seguinte - Predefinidos"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Back - Receiving options"
 msgstr "Anterior - Opcións de recepción"
 
-#: ../capplet/settings/mail-account-view.c:619
-#: ../mail/em-account-editor.c:2988 ../mail/mail-config.ui.h:34
+#: ../capplet/settings/mail-account-view.c:618
+#: ../mail/em-account-editor.c:3028
 msgid "Defaults"
 msgstr "Predefinidos"
 
-#: ../capplet/settings/mail-account-view.c:619
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Sending mail"
 msgstr "Anterior - Envío de correo"
 
-#: ../capplet/settings/mail-account-view.c:621
+#: ../capplet/settings/mail-account-view.c:620
 msgid "Review account"
 msgstr "Revisar a conta"
 
-#: ../capplet/settings/mail-account-view.c:621
+#: ../capplet/settings/mail-account-view.c:620
 msgid "Finish"
 msgstr "Rematar"
 
-#: ../capplet/settings/mail-account-view.c:621
+#: ../capplet/settings/mail-account-view.c:620
 msgid "Back - Sending"
 msgstr "Anterior - Envío"
 
-#: ../capplet/settings/mail-account-view.c:726
+#: ../capplet/settings/mail-account-view.c:725
 msgid "Setup Google contacts with Evolution"
 msgstr "Engadir contactos WebDAV ao Evolution."
 
-#: ../capplet/settings/mail-account-view.c:727
+#: ../capplet/settings/mail-account-view.c:726
 msgid "Setup Google calendar with Evolution"
 msgstr "Engadir calendario de Google a Evolution."
 
-#: ../capplet/settings/mail-account-view.c:732
+#: ../capplet/settings/mail-account-view.c:731
 msgid "You may need to enable IMAP access."
 msgstr "Pode que deba activar o acceso IMAP."
 
-#: ../capplet/settings/mail-account-view.c:740
+#: ../capplet/settings/mail-account-view.c:739
 msgid "Google account settings:"
 msgstr "Opcións de conta de Google:"
 
-#: ../capplet/settings/mail-account-view.c:767
+#: ../capplet/settings/mail-account-view.c:766
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "Engadir calendarios de metereoloxía a Evolution."
 
-#: ../capplet/settings/mail-account-view.c:771
+#: ../capplet/settings/mail-account-view.c:770
 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 "
@@ -8575,63 +7322,63 @@ msgstr ""
 "calendario. Confirme e volva a introducir o nome do calendario se non é "
 "correcto."
 
-#: ../capplet/settings/mail-account-view.c:778
+#: ../capplet/settings/mail-account-view.c:777
 msgid "Yahoo account settings:"
 msgstr "Opcións de conta de Yahoo:"
 
-#: ../capplet/settings/mail-account-view.c:792
+#: ../capplet/settings/mail-account-view.c:791
 msgid "Yahoo Calendar name:"
 msgstr "Escoller ficheiro de calendario"
 
-#: ../capplet/settings/mail-account-view.c:1061
+#: ../capplet/settings/mail-account-view.c:1063
 msgid "Password:"
 msgstr "Con_trasinal:"
 
-#: ../capplet/settings/mail-account-view.c:1129
-#: ../capplet/settings/mail-settings-view.c:267
+#: ../capplet/settings/mail-account-view.c:1132
+#: ../capplet/settings/mail-settings-view.c:266
 msgid "Close Tab"
 msgstr "Pechar separador"
 
-#: ../capplet/settings/mail-account-view.c:1139
+#: ../capplet/settings/mail-account-view.c:1142
 msgid "Account Wizard"
 msgstr "Asistente da conta"
 
-#: ../capplet/settings/mail-capplet-shell.c:208
+#: ../capplet/settings/mail-capplet-shell.c:212
 msgid "Evolution account assistant"
 msgstr "Asistente de contas do Evolution"
 
 #. create the local source group
-#: ../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
+#: ../capplet/settings/mail-capplet-shell.c:352 ../mail/e-mail-migrate.c:677
+#: ../mail/e-mail-store.c:225 ../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
+#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:218
+#: ../mail/message-list.c:1709
 #: ../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:92
-#: ../modules/calendar/e-task-shell-migrate.c:111
+#: ../modules/calendar/e-cal-shell-backend.c:107
+#: ../modules/calendar/e-cal-shell-migrate.c:147
+#: ../modules/calendar/e-memo-shell-backend.c:96
+#: ../modules/calendar/e-memo-shell-migrate.c:103
+#: ../modules/calendar/e-task-shell-backend.c:96
+#: ../modules/calendar/e-task-shell-migrate.c:112
 msgid "On This Computer"
 msgstr "Neste computador"
 
-#: ../capplet/settings/mail-settings-view.c:146
+#: ../capplet/settings/mail-settings-view.c:145
 #, c-format
 msgid "Modify %s..."
 msgstr "Modificar %s..."
 
-#: ../capplet/settings/mail-settings-view.c:148
+#: ../capplet/settings/mail-settings-view.c:147
 msgid "Add a new account"
 msgstr "Engadir unha nova conta"
 
-#: ../capplet/settings/mail-settings-view.c:184
+#: ../capplet/settings/mail-settings-view.c:183
 msgid "Account management"
 msgstr "Xestión de contas"
 
-#: ../capplet/settings/mail-settings-view.c:277
+#: ../capplet/settings/mail-settings-view.c:276
 msgid "Settings"
 msgstr "Configuracións"
 
@@ -8643,7 +7390,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:845
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:957
+#: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "Evolution"
@@ -8652,7 +7400,7 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Correo e calendario do Evolution"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:652
 msgid "Groupware Suite"
 msgstr "Suite de Groupware"
 
@@ -8669,41 +7417,39 @@ msgid "Email Settings"
 msgstr "Configuración de correo electrónico"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:228
+#: ../e-util/e-activity.c:226
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (Cancelado)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:231
+#: ../e-util/e-activity.c:229
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (completada)"
 
-#. Translators: This is an activity whose percent
-#. * complete is unknown.
-#: ../e-util/e-activity.c:235
+#. Translators: This is an activity waiting to run.
+#: ../e-util/e-activity.c:232
 #, c-format
-msgid "%s..."
-msgstr "%s (...)"
-
-#: ../e-util/e-activity.c:240
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% terminada)"
+msgid "%s (waiting)"
+msgstr ""
 
-#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
-msgid "Evolution Error"
-msgstr "Erro do Evolution"
+#. Translators: This is a running activity which
+#. *              the user has requested to cancel.
+#: ../e-util/e-activity.c:236
+#, fuzzy, c-format
+msgid "%s (cancelling)"
+msgstr "%s (Cancelado)"
 
-#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
-msgid "Evolution Warning"
-msgstr "Aviso do Evolution"
+#: ../e-util/e-activity.c:238
+#, c-format
+msgid "%s"
+msgstr "%s"
 
-#: ../e-util/e-alert.c:659
+#: ../e-util/e-activity.c:243
 #, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "Erro interno: requiriuse un erro descoñecido «%s»"
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% terminada)"
 
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
@@ -8783,134 +7529,69 @@ 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:1790
+#: ../e-util/e-datetime-format.c:199
+#: ../modules/calendar/e-cal-shell-view-actions.c:1795
 #: ../plugins/itip-formatter/itip-view.c:191
-#: ../widgets/table/e-cell-date-edit.c:308
+#: ../widgets/table/e-cell-date-edit.c:311
 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:219
+#: ../e-util/e-datetime-format.c:210 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Mañá"
 
-#: ../e-util/e-datetime-format.c:207
+#: ../e-util/e-datetime-format.c:212
 msgid "Yesterday"
 msgstr "Onte"
 
-#. 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 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',)
-#. 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 day ago"
-msgid_plural "%d days ago"
-msgstr[0] "Hai %d día"
-msgstr[1] "Hai %d días"
+#. Translators: %a is a strftime modifier, the abbreviated week day name, for example "Next Tue"
+#: ../e-util/e-datetime-format.c:216
+#, fuzzy, c-format
+msgid "Next %a"
+msgstr "Seguinte"
 
-#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
-#: ../e-util/e-datetime-format.c:308
+#: ../e-util/e-datetime-format.c:293 ../e-util/e-datetime-format.c:303
+#: ../e-util/e-datetime-format.c:312
 msgid "Use locale default"
 msgstr "Usar os locais predefinidos"
 
-#: ../e-util/e-datetime-format.c:502
+#: ../e-util/e-datetime-format.c:508
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../e-util/e-file-utils.c:136
+#: ../e-util/e-file-utils.c:152
 msgid "(Unknown Filename)"
 msgstr "Tipo descoñecido"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:140
+#: ../e-util/e-file-utils.c:156
 #, c-format
 msgid "Writing \"%s\""
 msgstr "Facendo ping a %s"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:145
+#: ../e-util/e-file-utils.c:161
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "Copiando `%s' a `%s'"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:194
-msgid "Debug Logs"
-msgstr "Rexistros de depuración"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:208
-msgid "Show _errors in the status bar for"
-msgstr "Mostrar _erros na barra de estado para"
-
-#. Translators: This is the second part of the sentence
-#. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:226
-msgid "second(s)."
-msgstr "segundos."
-
-#: ../e-util/e-non-intrusive-error-dialog.c:232
-msgid "Log Messages:"
-msgstr "Rexistro de mensaxes:"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:279
-msgid "Log Level"
-msgstr "Nivel de rexistro"
-
-#: ../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:1426
-#: ../shell/e-shell-window-actions.c:1433
-#: ../shell/e-shell-window-actions.c:1440
-msgid "Close this window"
-msgstr "Pechar esta xanela"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:38
-msgid "Error"
-msgstr "Erro"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:38
-msgid "Errors"
-msgstr "Erros"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:39
-msgid "Warnings and Errors"
-msgstr "Avisos e erros"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:40
-msgid "Debug"
-msgstr "Depuración"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:40
-msgid "Error, Warnings and Debug messages"
-msgstr "Erros, avisos e mensaxes de depuración"
-
-#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:337
+#: ../e-util/e-plugin-util.c:429 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:377
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "semanas"
 
-#: ../e-util/e-print.c:161
+#: ../e-util/e-print.c:157
 msgid "An error occurred while printing"
 msgstr "Produciuse un erro ao imprimir"
 
-#: ../e-util/e-print.c:168
+#: ../e-util/e-print.c:164
 msgid "The printing system reported the following details about the error:"
 msgstr "O sistema de impresión informou dos seguintes detalles sobre o erro:"
 
-#: ../e-util/e-print.c:174
+#: ../e-util/e-print.c:170
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr ""
@@ -8940,15 +7621,15 @@ msgstr "Quere sobrescribilo?"
 msgid "File exists \"{0}\"."
 msgstr "O ficheiro xa existe «{0}»."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:140
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:151
 msgid "_Overwrite"
 msgstr "S_obrescribir"
 
-#: ../e-util/e-util.c:146
+#: ../e-util/e-util.c:154
 msgid "Could not open the link."
 msgstr "Non foi posíbel abrir a ligazón."
 
-#: ../e-util/e-util.c:193
+#: ../e-util/e-util.c:201
 msgid "Could not display help for Evolution."
 msgstr "Non foi posíbel mostrar a axuda do Evolution."
 
@@ -8961,111 +7642,115 @@ msgstr "Erro do GConf: %s"
 msgid "All further errors shown only on terminal."
 msgstr "Todos os erros posteriores mostraranse só no terminal."
 
-#: ../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
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1050
+#: ../mail/e-mail-tag-editor.c:329 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "From"
 msgstr "De"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1039
-#: ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1051
+#: ../modules/mail/em-mailer-prefs.c:74
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: ../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
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1053
+#: ../mail/em-format-html.c:2402 ../mail/em-format-html.c:2464
+#: ../mail/em-format-html.c:2487 ../modules/mail/em-mailer-prefs.c:76
 msgid "Cc"
 msgstr "Cc"
 
-#: ../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
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1054
+#: ../mail/em-format-html.c:2403 ../mail/em-format-html.c:2468
+#: ../mail/em-format-html.c:2490 ../modules/mail/em-mailer-prefs.c:77
 msgid "Bcc"
 msgstr "Cco"
 
-#: ../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:77
-#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
+#: ../em-format/em-format-quote.c:426 ../em-format/em-format.c:1055
+#: ../mail/e-mail-tag-editor.c:334 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:78
+#: ../plugins/groupwise-features/notification.ui.h:2
+#: ../plugins/groupwise-features/properties.ui.h:5 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "Asunto"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:421 ../mail/em-format-html.c:2472
-#: ../modules/mail/em-mailer-prefs.c:1120
+#: ../em-format/em-format-quote.c:437 ../mail/em-format-html.c:2584
+#: ../modules/mail/em-mailer-prefs.c:1091
 msgid "Mailer"
 msgstr "Aplicativo de correo"
 
-#: ../em-format/em-format-quote.c:500 ../mail/em-composer-utils.c:1296
+#: ../em-format/em-format-quote.c:518 ../mail/em-composer-utils.c:1363
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensaxe reenviada --------"
 
-#: ../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
+#: ../em-format/em-format.c:1056 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:79 ../widgets/misc/e-dateedit.c:529
+#: ../widgets/misc/e-dateedit.c:551
 msgid "Date"
 msgstr "Data"
 
-#: ../em-format/em-format.c:1045 ../modules/mail/em-mailer-prefs.c:79
+#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:80
 msgid "Newsgroups"
 msgstr "Grupos de noticias"
 
-#: ../em-format/em-format.c:1046 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:81
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Cara"
 
-#: ../em-format/em-format.c:1431
+#: ../em-format/em-format.c:1455
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: ../em-format/em-format.c:1503
+#: ../em-format/em-format.c:1547
 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:1662 ../em-format/em-format.c:1846
+#: ../em-format/em-format.c:1729 ../em-format/em-format.c:1926
 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:1672
+#: ../em-format/em-format.c:1739
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de cifrado non compatíbel para multipart/encrypted"
 
-#: ../em-format/em-format.c:1688
+#: ../em-format/em-format.c:1759
 msgid "Could not parse PGP/MIME message"
 msgstr "Non foi posíbel analizar a mensaxe PGP/MIME"
 
-#: ../em-format/em-format.c:1689
+#: ../em-format/em-format.c:1760
 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:1871
+#: ../em-format/em-format.c:1951
 msgid "Unsupported signature format"
 msgstr "O formato da sinatura non é compatíbel"
 
-#: ../em-format/em-format.c:1881 ../em-format/em-format.c:2041
+#: ../em-format/em-format.c:1964 ../em-format/em-format.c:2137
 msgid "Error verifying signature"
 msgstr "Produciuse un erro ao verificar a sinatura"
 
-#: ../em-format/em-format.c:1882 ../em-format/em-format.c:2029
-#: ../em-format/em-format.c:2042
+#: ../em-format/em-format.c:1965 ../em-format/em-format.c:2124
+#: ../em-format/em-format.c:2138
 msgid "Unknown error verifying signature"
 msgstr "Produciuse un erro descoñecido ao verificar a sinatura"
 
-#: ../em-format/em-format.c:2129
+#: ../em-format/em-format.c:2229
 msgid "Could not parse PGP message: "
 msgstr "Non foi posíbel analizar a mensaxe PGP: "
 
-#: ../em-format/em-format.c:2135 ../plugins/caldav/caldav-browse-server.c:203
+#: ../em-format/em-format.c:2235 ../mail/mail-ops.c:624
+#: ../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:74
+#. Don't delete this code, since it is needed so that xgettext can extract the translations.
+#. * Please, keep these strings in sync with the strings in the timespans array
+#: ../filter/e-filter-datespec.c:70
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -9073,7 +7758,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:74
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
@@ -9081,7 +7766,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:75
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -9089,7 +7774,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:75
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
@@ -9097,7 +7782,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:76
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -9105,7 +7790,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:76
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
@@ -9113,7 +7798,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:77
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -9137,7 +7822,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:78
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
@@ -9145,7 +7830,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:79
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -9153,7 +7838,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:79
+#: ../filter/e-filter-datespec.c:81
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
@@ -9161,35 +7846,35 @@ 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:80
+#: ../filter/e-filter-datespec.c:82
 #, 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:80
+#: ../filter/e-filter-datespec.c:83
 #, 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:122
+#: ../filter/e-filter-datespec.c:133
 msgid "<click here to select a date>"
 msgstr "<prema aquí para seleccionar unha data>"
 
-#: ../filter/e-filter-datespec.c:125 ../filter/e-filter-datespec.c:136
-#: ../filter/e-filter-datespec.c:147
+#: ../filter/e-filter-datespec.c:136 ../filter/e-filter-datespec.c:147
+#: ../filter/e-filter-datespec.c:158
 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:132
+#: ../filter/e-filter-datespec.c:143
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:275
+#: ../filter/e-filter-datespec.c:286
 msgid "Select a time to compare against"
 msgstr "Seleccione unha hora coa que comparar"
 
@@ -9197,56 +7882,62 @@ msgstr "Seleccione unha hora coa que comparar"
 msgid "Choose a File"
 msgstr "Seleccione un ficheiro"
 
-#: ../filter/e-filter-rule.c:663
+#: ../filter/e-filter-rule.c:667
 msgid "R_ule name:"
 msgstr "Nome da r_egra:"
 
-#: ../filter/e-filter-rule.c:693
+#: ../filter/e-filter-rule.c:697
 msgid "Find items that meet the following conditions"
 msgstr "Encontrar os elementos que cumpran as seguintes condicións"
 
-#: ../filter/e-filter-rule.c:718
+#: ../filter/e-filter-rule.c:722
 msgid "If all conditions are met"
 msgstr "Se se cumpren todas as condicións"
 
-#: ../filter/e-filter-rule.c:719
+#: ../filter/e-filter-rule.c:723
 msgid "If any conditions are met"
 msgstr "Se se cumpre calquera condición"
 
-#: ../filter/e-filter-rule.c:722
+#: ../filter/e-filter-rule.c:726
 msgid "_Find items:"
 msgstr "_Buscar elementos:"
 
-#: ../filter/e-filter-rule.c:750
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#: ../filter/e-filter-rule.c:755
+msgid "None"
+msgstr "Ningún"
+
+#: ../filter/e-filter-rule.c:756
 msgid "All related"
 msgstr "Todos os relacionados"
 
-#: ../filter/e-filter-rule.c:751 ../widgets/misc/e-send-options.ui.h:16
+#: ../filter/e-filter-rule.c:757 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Respostas"
 
-#: ../filter/e-filter-rule.c:752
+#: ../filter/e-filter-rule.c:758
 msgid "Replies and parents"
 msgstr "Respostas e pais"
 
-#: ../filter/e-filter-rule.c:753
+#: ../filter/e-filter-rule.c:759
 msgid "No reply or parent"
 msgstr "Sen resposta nin pai"
 
-#: ../filter/e-filter-rule.c:756
+#: ../filter/e-filter-rule.c:762
 msgid "I_nclude threads"
 msgstr "I_ncluír fíos"
 
-#: ../filter/e-filter-rule.c:779
+#: ../filter/e-filter-rule.c:787
 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
+#: ../filter/e-filter-rule.c:1134 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:317
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/e-filter-rule.c:1128 ../mail/em-utils.c:305
+#: ../filter/e-filter-rule.c:1134 ../mail/em-utils.c:318
 msgid "Outgoing"
 msgstr "Saínte"
 
@@ -9278,7 +7969,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:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:79
 msgid "Missing name."
 msgstr "Falta o nome."
 
@@ -9334,7 +8025,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:189
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:193
 msgid "_Filter Rules"
 msgstr "Regras de _filtro"
 
@@ -9360,7 +8051,7 @@ msgstr ""
 msgid "months"
 msgstr "Mes"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:190
+#: ../filter/filter.ui.h:19
 msgid "seconds"
 msgstr "segundos"
 
@@ -9376,26 +8067,32 @@ msgstr "o tempo que especificou"
 msgid "years"
 msgstr "Cabeceiras"
 
-#: ../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
+#: ../mail/e-mail-attachment-bar.c:93 ../mail/e-mail-attachment-bar.c:98
+#: ../mail/em-format-html-display.c:1053 ../mail/mail-config.ui.h:13
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:131
+#: ../widgets/misc/e-attachment-paned.c:136
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Anexo"
 msgstr[1] "Anexos"
 
-#: ../mail/e-mail-attachment-bar.c:611
-#: ../widgets/misc/e-attachment-paned.c:599
+#: ../mail/e-mail-attachment-bar.c:630
+#: ../widgets/misc/e-attachment-paned.c:621
 msgid "Icon View"
 msgstr "Visualización en iconas"
 
-#: ../mail/e-mail-attachment-bar.c:612
-#: ../widgets/misc/e-attachment-paned.c:600
+#: ../mail/e-mail-attachment-bar.c:632
+#: ../widgets/misc/e-attachment-paned.c:623
 msgid "List View"
 msgstr "Visualización de lista"
 
-#: ../mail/e-mail-browser.c:265
+#: ../mail/e-mail-browser.c:132 ../shell/e-shell-window-actions.c:1424
+#: ../shell/e-shell-window-actions.c:1431
+#: ../shell/e-shell-window-actions.c:1438
+msgid "Close this window"
+msgstr "Pechar esta xanela"
+
+#: ../mail/e-mail-browser.c:287
 msgid "(No Subject)"
 msgstr "(Sen asunto)"
 
@@ -9415,6 +8112,11 @@ msgstr "_Desde este enderezo"
 msgid "Create Search _Folder"
 msgstr "Crear cartafol de _busca"
 
+#: ../mail/e-mail-folder-utils.c:88
+#, c-format
+msgid "Saving message to folder '%s'"
+msgstr "Gardando a mensaxe no cartafol «%s»"
+
 #: ../mail/e-mail-label-dialog.c:222
 msgid "_Label name:"
 msgstr "_Nome da etiqueta:"
@@ -9444,7 +8146,7 @@ msgid "_Later"
 msgstr "_Máis tarde"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:505
+#: ../modules/mail/e-mail-shell-view-actions.c:616
 msgid "Add Label"
 msgstr "Engadir etiqueta"
 
@@ -9465,35 +8167,35 @@ msgid "Color"
 msgstr "Cor"
 
 #: ../mail/e-mail-label-tree-view.c:96
+#: ../modules/plugin-manager/evolution-plugin-manager.c:66
 #: ../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
+#: ../mail/e-mail-local.c:35 ../mail/em-folder-properties.c:285
+#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree.c:2986
+#: ../modules/mail/e-mail-shell-view-private.c:1096
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:688
+#: ../mail/e-mail-local.c:36 ../mail/em-folder-tree-model.c:758
 msgid "Drafts"
 msgstr "Borradores"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:700
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:770
 msgid "Outbox"
 msgstr "Caixa de saída"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:702
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:772
 msgid "Sent"
 msgstr "Enviado"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:691
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:761
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:578
+#: ../plugins/templates/templates.c:581
 msgid "Templates"
 msgstr "Modelos"
 
@@ -9510,11 +8212,11 @@ msgstr "Migración"
 msgid "Migrating '%s':"
 msgstr "Migrando «%s»:"
 
-#: ../mail/e-mail-migrate.c:649
+#: ../mail/e-mail-migrate.c:657
 msgid "Migrating Folders"
 msgstr "Migración de cartafoles"
 
-#: ../mail/e-mail-migrate.c:650
+#: ../mail/e-mail-migrate.c:658
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9526,50 +8228,66 @@ msgstr ""
 "\n"
 "Sexa paciente mentres o Evolution migra os seus cartafoles..."
 
-#: ../mail/e-mail-migrate.c:796
+#: ../mail/e-mail-migrate.c:815
 #, 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"
 
-#: ../mail/e-mail-notebook-view.c:563
+#: ../mail/e-mail-notebook-view.c:565
 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:109
-#: ../modules/calendar/e-task-shell-view-actions.c:570
+#: ../mail/e-mail-reader-utils.c:111
+#: ../modules/calendar/e-task-shell-view-actions.c:576
 msgid "Do not ask me again"
 msgstr "Non preguntar de novo."
 
-#: ../mail/e-mail-reader.c:276 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:309 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copiar ao cartafol"
 
-#: ../mail/e-mail-reader.c:276 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:309 ../mail/em-folder-utils.c:421
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: ../mail/e-mail-reader.c:689 ../mail/em-filter-i18n.h:51
+#. Translators: %s is replaced with a folder name
+#. %d with count of duplicate messages.
+#: ../mail/e-mail-reader.c:510
+#, c-format
+msgid ""
+"Folder '%s' contains %d duplicate message. Are you sure you want to delete "
+"it?"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:511
+#, fuzzy, c-format
+msgid ""
+"Folder '%s' contains %d duplicate messages. Are you sure you want to delete "
+"them?"
+msgstr "Está seguro de que quere eliminar esta nota?"
+
+#: ../mail/e-mail-reader.c:969 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Mover ao cartafol"
 
-#: ../mail/e-mail-reader.c:689 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:969 ../mail/em-folder-utils.c:421
 msgid "_Move"
 msgstr "_Mover"
 
 #. Check buttons
-#: ../mail/e-mail-reader.c:954 ../mail/e-mail-reader.c:1070
-#: ../mail/e-mail-reader.c:1111
+#: ../mail/e-mail-reader.c:1248 ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1446
 msgid "_Do not ask me again."
 msgstr "_Non preguntarme de novo."
 
-#: ../mail/e-mail-reader.c:1116
+#: ../mail/e-mail-reader.c:1451
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Ignorar sempre «Responder a:» para as roldas de correo."
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1558
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Gardar mensaxe..."
@@ -9581,598 +8299,719 @@ 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:1227
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/e-mail-reader.c:1579
+#: ../plugins/groupwise-features/notification.ui.h:1
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Mensaxe"
 msgstr[1] "Mensaxe"
 
-#: ../mail/e-mail-reader.c:1492
+#: ../mail/e-mail-reader.c:1853
 msgid "A_dd Sender to Address Book"
 msgstr "_Engadir o remitente á axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1494
+#: ../mail/e-mail-reader.c:1855
 msgid "Add sender to address book"
 msgstr "Engadir o remitente á axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1499
+#: ../mail/e-mail-reader.c:1860
 msgid "Check for _Junk"
 msgstr "Verificar se hai correo non dese_xado"
 
-#: ../mail/e-mail-reader.c:1501
+#: ../mail/e-mail-reader.c:1862
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrar as mensaxes seleccionadas polo estado de correo non desexado"
 
-#: ../mail/e-mail-reader.c:1506
+#: ../mail/e-mail-reader.c:1867
 msgid "_Copy to Folder..."
 msgstr "_Copiar ao cartafol..."
 
-#: ../mail/e-mail-reader.c:1508
+#: ../mail/e-mail-reader.c:1869
 msgid "Copy selected messages to another folder"
 msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:1513
+#: ../mail/e-mail-reader.c:1874
 msgid "_Delete Message"
 msgstr "E_liminar mensaxe"
 
-#: ../mail/e-mail-reader.c:1515
+#: ../mail/e-mail-reader.c:1876
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar as mensaxes seleccionadas para eliminalas"
 
-#: ../mail/e-mail-reader.c:1520
+#: ../mail/e-mail-reader.c:1881
 msgid "Filter on Mailing _List..."
 msgstr "Filtrar por _rolda de correo..."
 
-#: ../mail/e-mail-reader.c:1522
+#: ../mail/e-mail-reader.c:1883
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Crear unha regra para filtrar mensaxes a esta rolda de correo"
 
-#: ../mail/e-mail-reader.c:1527
+#: ../mail/e-mail-reader.c:1888
 msgid "Filter on _Recipients..."
 msgstr "Filtrar por _destinatarios..."
 
-#: ../mail/e-mail-reader.c:1529
+#: ../mail/e-mail-reader.c:1890
 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:1534
+#: ../mail/e-mail-reader.c:1895
 msgid "Filter on Se_nder..."
 msgstr "Filtrar por re_mitente..."
 
-#: ../mail/e-mail-reader.c:1536
+#: ../mail/e-mail-reader.c:1897
 msgid "Create a rule to filter messages from this sender"
 msgstr "Crear unha regra para filtrar mensaxes deste remitente"
 
-#: ../mail/e-mail-reader.c:1541
+#: ../mail/e-mail-reader.c:1902
 msgid "Filter on _Subject..."
 msgstr "Filtrar por a_sunto..."
 
-#: ../mail/e-mail-reader.c:1543
+#: ../mail/e-mail-reader.c:1904
 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:1548
+#: ../mail/e-mail-reader.c:1909
 msgid "A_pply Filters"
 msgstr "_Aplicar filtros"
 
-#: ../mail/e-mail-reader.c:1550
+#: ../mail/e-mail-reader.c:1911
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplicar as regras de filtraxe ás mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:1555
+#: ../mail/e-mail-reader.c:1916
 msgid "_Find in Message..."
 msgstr "_Buscar na mensaxe..."
 
-#: ../mail/e-mail-reader.c:1557
+#: ../mail/e-mail-reader.c:1918
 msgid "Search for text in the body of the displayed message"
 msgstr "Buscar texto no corpo da mensaxe mostrada"
 
-#: ../mail/e-mail-reader.c:1562
+#: ../mail/e-mail-reader.c:1923
 msgid "_Clear Flag"
 msgstr "E_liminar marca"
 
-#: ../mail/e-mail-reader.c:1564
+#: ../mail/e-mail-reader.c:1925
 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:1569
+#: ../mail/e-mail-reader.c:1930
 msgid "_Flag Completed"
 msgstr "_Marcar como terminado"
 
-#: ../mail/e-mail-reader.c:1571
+#: ../mail/e-mail-reader.c:1932
 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:1576
+#: ../mail/e-mail-reader.c:1937
 msgid "Follow _Up..."
 msgstr "Seg_uimento..."
 
-#: ../mail/e-mail-reader.c:1578
+#: ../mail/e-mail-reader.c:1939
 msgid "Flag the selected messages for follow-up"
 msgstr "Marcar as mensaxes seleccionadas para o seguimento"
 
-#: ../mail/e-mail-reader.c:1583
+#: ../mail/e-mail-reader.c:1944
 msgid "_Attached"
 msgstr "_Anexada"
 
-#: ../mail/e-mail-reader.c:1585 ../mail/e-mail-reader.c:1592
+#: ../mail/e-mail-reader.c:1946 ../mail/e-mail-reader.c:1953
 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:1590
+#: ../mail/e-mail-reader.c:1951
 msgid "Forward As _Attached"
 msgstr "_Remitir como iCalendar"
 
-#: ../mail/e-mail-reader.c:1597
+#: ../mail/e-mail-reader.c:1958
 msgid "_Inline"
 msgstr "_En liña"
 
-#: ../mail/e-mail-reader.c:1599 ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1960 ../mail/e-mail-reader.c:1967
 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:1604
+#: ../mail/e-mail-reader.c:1965
 msgid "Forward As _Inline"
 msgstr "Estilo de _reenvío:"
 
-#: ../mail/e-mail-reader.c:1611
+#: ../mail/e-mail-reader.c:1972
 msgid "_Quoted"
 msgstr "_Citada"
 
-#: ../mail/e-mail-reader.c:1613 ../mail/e-mail-reader.c:1620
+#: ../mail/e-mail-reader.c:1974 ../mail/e-mail-reader.c:1981
 msgid "Forward the selected message quoted like a reply"
 msgstr "Reenviar a mensaxe seleccionada citada como unha resposta"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1979
 msgid "Forward As _Quoted"
 msgstr "Estilo de _reenvío:"
 
-#: ../mail/e-mail-reader.c:1625
+#: ../mail/e-mail-reader.c:1986
 msgid "_Load Images"
 msgstr "_Cargar imaxes"
 
-#: ../mail/e-mail-reader.c:1627
+#: ../mail/e-mail-reader.c:1988
 msgid "Force images in HTML mail to be loaded"
 msgstr "Forzar a carga de imaxes no correo HTML"
 
-#: ../mail/e-mail-reader.c:1632
+#: ../mail/e-mail-reader.c:1993
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../mail/e-mail-reader.c:1634
+#: ../mail/e-mail-reader.c:1995
 msgid "Mark the selected messages as important"
 msgstr "Marcar as mensaxes seleccionadas como importantes"
 
-#: ../mail/e-mail-reader.c:1639
+#: ../mail/e-mail-reader.c:2000
 msgid "_Junk"
 msgstr "_Correo non desexado"
 
-#: ../mail/e-mail-reader.c:1641
+#: ../mail/e-mail-reader.c:2002
 msgid "Mark the selected messages as junk"
 msgstr "Marcar as mensaxes seleccionadas como correo non desexado"
 
-#: ../mail/e-mail-reader.c:1646
+#: ../mail/e-mail-reader.c:2007
 msgid "_Not Junk"
 msgstr "_Non é correo non desexado"
 
-#: ../mail/e-mail-reader.c:1648
+#: ../mail/e-mail-reader.c:2009
 msgid "Mark the selected messages as not being junk"
 msgstr "Marcar as mensaxes seleccionadas como non lixo"
 
-#: ../mail/e-mail-reader.c:1653
+#: ../mail/e-mail-reader.c:2014
 msgid "_Read"
 msgstr "_Lida"
 
-#: ../mail/e-mail-reader.c:1655
+#: ../mail/e-mail-reader.c:2016
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar as mensaxes seleccionadas como lidas"
 
-#: ../mail/e-mail-reader.c:1660
+#: ../mail/e-mail-reader.c:2021
 msgid "Uni_mportant"
 msgstr "Non i_mportante"
 
-#: ../mail/e-mail-reader.c:1662
+#: ../mail/e-mail-reader.c:2023
 msgid "Mark the selected messages as unimportant"
 msgstr "Marcar as mensaxes seleccionadas como non importantes"
 
-#: ../mail/e-mail-reader.c:1667
+#: ../mail/e-mail-reader.c:2028
 msgid "_Unread"
 msgstr "_Non lida"
 
-#: ../mail/e-mail-reader.c:1669
+#: ../mail/e-mail-reader.c:2030
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar as mensaxes seleccionadas como non lidas"
 
-#: ../mail/e-mail-reader.c:1674
+#: ../mail/e-mail-reader.c:2035
 msgid "_Edit as New Message..."
 msgstr "_Editar como unha mensaxe nova..."
 
-#: ../mail/e-mail-reader.c:1676
+#: ../mail/e-mail-reader.c:2037
 msgid "Open the selected messages in the composer for editing"
 msgstr "Abrir as mensaxes seleccionadas no editor para editalas"
 
-#: ../mail/e-mail-reader.c:1681
+#: ../mail/e-mail-reader.c:2042
 msgid "Compose _New Message"
 msgstr "Redactar unha mensaxe _nova"
 
-#: ../mail/e-mail-reader.c:1683
+#: ../mail/e-mail-reader.c:2044
 msgid "Open a window for composing a mail message"
 msgstr "Abrir unha xanela para compor unha mensaxe de correo"
 
-#: ../mail/e-mail-reader.c:1688
+#: ../mail/e-mail-reader.c:2049
 msgid "_Open in New Window"
 msgstr "_Abrir nunha xanela nova"
 
-#: ../mail/e-mail-reader.c:1690
+#: ../mail/e-mail-reader.c:2051
 msgid "Open the selected messages in a new window"
 msgstr "Abrir as mensaxes seleccionadas nunha xanela nova"
 
-#: ../mail/e-mail-reader.c:1695
+#: ../mail/e-mail-reader.c:2056
 msgid "_Move to Folder..."
 msgstr "_Mover ao cartafol..."
 
-#: ../mail/e-mail-reader.c:1697
+#: ../mail/e-mail-reader.c:2058
 msgid "Move selected messages to another folder"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:1702
+#: ../mail/e-mail-reader.c:2063
 msgid "_Switch to Folder"
 msgstr "_Cambiar ao cartafol"
 
-#: ../mail/e-mail-reader.c:1704
+#: ../mail/e-mail-reader.c:2065
 msgid "Display the parent folder"
 msgstr "Mostrar o cartafol superior"
 
-#: ../mail/e-mail-reader.c:1709
+#: ../mail/e-mail-reader.c:2070
 msgid "Switch to _next tab"
 msgstr "Cambiar ao _seguinte separador"
 
-#: ../mail/e-mail-reader.c:1711
+#: ../mail/e-mail-reader.c:2072
 msgid "Switch to the next tab"
 msgstr "Cambiar ao seguinte separador"
 
-#: ../mail/e-mail-reader.c:1716
+#: ../mail/e-mail-reader.c:2077
 msgid "Switch to _previous tab"
 msgstr "Cambiar ao _anterior separador"
 
-#: ../mail/e-mail-reader.c:1718
+#: ../mail/e-mail-reader.c:2079
 msgid "Switch to the previous tab"
 msgstr "Cambiar ao separador anterior"
 
-#: ../mail/e-mail-reader.c:1723
+#: ../mail/e-mail-reader.c:2084
 msgid "Cl_ose current tab"
 msgstr "Pe_char o separador actual"
 
-#: ../mail/e-mail-reader.c:1725
+#: ../mail/e-mail-reader.c:2086
 msgid "Close current tab"
 msgstr "Pechar o separador actual"
 
-#: ../mail/e-mail-reader.c:1730
+#: ../mail/e-mail-reader.c:2091
 msgid "_Next Message"
 msgstr "_Seguinte mensaxe"
 
-#: ../mail/e-mail-reader.c:1732
+#: ../mail/e-mail-reader.c:2093
 msgid "Display the next message"
 msgstr "Mostrar a seguinte mensaxe"
 
-#: ../mail/e-mail-reader.c:1737
+#: ../mail/e-mail-reader.c:2098
 msgid "Next _Important Message"
 msgstr "Seguinte mensaxe _importante"
 
-#: ../mail/e-mail-reader.c:1739
+#: ../mail/e-mail-reader.c:2100
 msgid "Display the next important message"
 msgstr "Mostrar a seguinte mensaxe importante"
 
-#: ../mail/e-mail-reader.c:1744
+#: ../mail/e-mail-reader.c:2105
 msgid "Next _Thread"
 msgstr "Seguinte _fío"
 
-#: ../mail/e-mail-reader.c:1746
+#: ../mail/e-mail-reader.c:2107
 msgid "Display the next thread"
 msgstr "Mostrar o seguinte fío"
 
-#: ../mail/e-mail-reader.c:1751
+#: ../mail/e-mail-reader.c:2112
 msgid "Next _Unread Message"
 msgstr "Seguinte mensaxe _non lida"
 
-#: ../mail/e-mail-reader.c:1753
+#: ../mail/e-mail-reader.c:2114
 msgid "Display the next unread message"
 msgstr "Mostrar a seguinte mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:1758
+#: ../mail/e-mail-reader.c:2119
 msgid "_Previous Message"
 msgstr "_Mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:1760
+#: ../mail/e-mail-reader.c:2121
 msgid "Display the previous message"
 msgstr "Mostrar a mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:1765
+#: ../mail/e-mail-reader.c:2126
 msgid "Pr_evious Important Message"
 msgstr "Ant_erior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:1767
+#: ../mail/e-mail-reader.c:2128
 msgid "Display the previous important message"
 msgstr "Mostrar a anterior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:1772
+#: ../mail/e-mail-reader.c:2133
+#, fuzzy
+msgid "Previous T_hread"
+msgstr "_Mensaxe anterior"
+
+#: ../mail/e-mail-reader.c:2135
+#, fuzzy
+msgid "Display the previous thread"
+msgstr "Mostrar a mensaxe anterior"
+
+#: ../mail/e-mail-reader.c:2140
 msgid "P_revious Unread Message"
 msgstr "Ante_rior mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:1774
+#: ../mail/e-mail-reader.c:2142
 msgid "Display the previous unread message"
 msgstr "Mostrar a anterior mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:1781
+#: ../mail/e-mail-reader.c:2149
 msgid "Print this message"
 msgstr "Imprimir esta mensaxe"
 
-#: ../mail/e-mail-reader.c:1788
+#: ../mail/e-mail-reader.c:2156
 msgid "Preview the message to be printed"
 msgstr "Previsualizar a mensaxe que se vai imprimir"
 
-#: ../mail/e-mail-reader.c:1793
+#: ../mail/e-mail-reader.c:2161
 msgid "Re_direct"
 msgstr "Re_direccionar"
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:2163
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redireccionar a alguén (rebotar) a mensaxe seleccionada"
 
-#: ../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
+#: ../mail/e-mail-reader.c:2168
+#, fuzzy
+msgid "Remo_ve Attachments"
+msgstr "Gardar anexo"
+
+#: ../mail/e-mail-reader.c:2170
+#, fuzzy
+msgid "Remove attachments"
+msgstr "Gardar anexo"
+
+#: ../mail/e-mail-reader.c:2175
+#, fuzzy
+msgid "Remove Du_plicate Messages"
+msgstr "E_liminar mensaxe"
+
+#: ../mail/e-mail-reader.c:2177
+#, fuzzy
+#| msgid "Mark the selected messages for deletion"
+msgid "Checks selected messages for duplicates"
+msgstr "Marcar as mensaxes seleccionadas para eliminalas"
+
+#: ../mail/e-mail-reader.c:2182 ../mail/mail.error.xml.h:98
+#: ../modules/calendar/e-cal-shell-view-actions.c:1464
+#: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "Responder a t_odos"
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:2184
 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:1807 ../mail/mail.error.xml.h:92
+#: ../mail/e-mail-reader.c:2189 ../mail/mail.error.xml.h:99
 msgid "Reply to _List"
 msgstr "Responder á _lista"
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:2191
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Redactar unha resposta para a rolda de correo da mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:1814
-#: ../modules/mail/e-mail-attachment-handler.c:158
+#: ../mail/e-mail-reader.c:2196
+#: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "_Responder ao remitente"
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:2198
 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:1821
+#: ../mail/e-mail-reader.c:2203
 msgid "_Save as mbox..."
 msgstr "Gardar como..."
 
-#: ../mail/e-mail-reader.c:1823
+#: ../mail/e-mail-reader.c:2205
 msgid "Save selected messages as an mbox file"
 msgstr "Gardar as mensaxes como un ficheiro de texto"
 
-#: ../mail/e-mail-reader.c:1828
+#: ../mail/e-mail-reader.c:2210
 msgid "Search Folder from Mailing _List..."
 msgstr "Cartafol de busca por ro_lda de correo..."
 
-#: ../mail/e-mail-reader.c:1830
+#: ../mail/e-mail-reader.c:2212
 msgid "Create a search folder for this mailing list"
 msgstr "Crear un cartafol de busca para esta rolda de correo"
 
-#: ../mail/e-mail-reader.c:1835
+#: ../mail/e-mail-reader.c:2217
 msgid "Search Folder from Recipien_ts..."
 msgstr "Cartafol de busca por des_tinatarios..."
 
-#: ../mail/e-mail-reader.c:1837
+#: ../mail/e-mail-reader.c:2219
 msgid "Create a search folder for these recipients"
 msgstr "Crear un cartafol de busca para estes destinatarios"
 
-#: ../mail/e-mail-reader.c:1842
+#: ../mail/e-mail-reader.c:2224
 msgid "Search Folder from Sen_der..."
 msgstr "Cartafol de busca por _remitente..."
 
-#: ../mail/e-mail-reader.c:1844
+#: ../mail/e-mail-reader.c:2226
 msgid "Create a search folder for this sender"
 msgstr "Crear un cartafol de busca para este remitente"
 
-#: ../mail/e-mail-reader.c:1849
+#: ../mail/e-mail-reader.c:2231
 msgid "Search Folder from S_ubject..."
 msgstr "Cartafol de busca por as_unto..."
 
-#: ../mail/e-mail-reader.c:1851
+#: ../mail/e-mail-reader.c:2233
 msgid "Create a search folder for this subject"
 msgstr "Crear un cartafol de busca para este asunto"
 
-#: ../mail/e-mail-reader.c:1856
+#: ../mail/e-mail-reader.c:2238
 msgid "_Message Source"
 msgstr "Orixe da _mensaxe"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:2240
 msgid "Show the raw email source of the message"
 msgstr "Mostrar o código fonte da mensaxe"
 
-#: ../mail/e-mail-reader.c:1870
+#: ../mail/e-mail-reader.c:2252
 msgid "_Undelete Message"
 msgstr "_Recuperar a mensaxe"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:2254
 msgid "Undelete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:1877
+#: ../mail/e-mail-reader.c:2259
 msgid "_Normal Size"
 msgstr "Tamaño _normal"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:2261
 msgid "Reset the text to its original size"
 msgstr "Restabelecer o texto ao seu tamaño orixinal"
 
-#: ../mail/e-mail-reader.c:1884
+#: ../mail/e-mail-reader.c:2266
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:2268
 msgid "Increase the text size"
 msgstr "Aumentar o tamaño do texto"
 
-#: ../mail/e-mail-reader.c:1891
+#: ../mail/e-mail-reader.c:2273
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:2275
 msgid "Decrease the text size"
 msgstr "Diminuír o tamaño do texto"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:2282
 msgid "Create R_ule"
 msgstr "Crear r_egra"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:2289
 msgid "Ch_aracter Encoding"
 msgstr "Codificación de car_acteres"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:2296
 msgid "F_orward As"
 msgstr "Reen_viar como..."
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:2303
 msgid "_Group Reply"
 msgstr "_Responder ao grupo"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:2310
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:2317
 msgid "Mar_k As"
 msgstr "Mar_car como"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:2324
 msgid "_Message"
 msgstr "_Mensaxe"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:2331
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:2356
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para _seguimento..."
 
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:2364
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2368
 msgid "Mark as _Junk"
 msgstr "Marcar como correo _non desexado"
 
-#: ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:2372
 msgid "Mark as _Not Junk"
 msgstr "Desmarcar como correo non dese_xado"
 
-#: ../mail/e-mail-reader.c:1994
+#: ../mail/e-mail-reader.c:2376
 msgid "Mar_k as Read"
 msgstr "Marcar como _lida"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2380
 msgid "Mark as Uni_mportant"
 msgstr "Marcar como non im_portante"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2384
 msgid "Mark as _Unread"
 msgstr "Marcar como _non lida"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:2428
 msgid "_Caret Mode"
 msgstr "Activar _cursor"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2430
 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:2046
+#: ../mail/e-mail-reader.c:2436
 msgid "All Message _Headers"
 msgstr "Todas as ca_beceiras da mensaxe"
 
-#: ../mail/e-mail-reader.c:2048
+#: ../mail/e-mail-reader.c:2438
 msgid "Show messages with all email headers"
 msgstr "Mostrar as mensaxes con todas as cabeceiras de correo electrónico"
 
-#: ../mail/e-mail-reader.c:2269
+#: ../mail/e-mail-reader.c:2670
 msgid "Unable to retrieve message"
 msgstr "Non foi posíbel obter a mensaxe"
 
-#: ../mail/e-mail-reader.c:2329 ../mail/mail-ops.c:1891
+#: ../mail/e-mail-reader.c:2731 ../mail/mail-ops.c:2044
 #, 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: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
+#: ../mail/e-mail-reader.c:3319 ../mail/mail-config.ui.h:29
+#: ../plugins/google-account-setup/google-source.c:304
+#: ../plugins/google-account-setup/google-source.c:538
+#: ../plugins/google-account-setup/google-source.c:674
+#: ../widgets/misc/e-account-tree-view.c:253
 msgid "Default"
 msgstr "Predefinido"
 
-#: ../mail/e-mail-reader.c:3041
-#: ../modules/mail/e-mail-attachment-handler.c:144
+#: ../mail/e-mail-reader.c:3499
+#: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: ../mail/e-mail-reader.c:3042
+#: ../mail/e-mail-reader.c:3500
 msgid "Forward the selected message to someone"
 msgstr "Reenviar a alguén a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:3061
+#: ../mail/e-mail-reader.c:3519
 msgid "Group Reply"
 msgstr "Responder ao grupo"
 
-#: ../mail/e-mail-reader.c:3062
+#: ../mail/e-mail-reader.c:3520
 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
+#: ../mail/e-mail-reader.c:3565 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:744
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../mail/e-mail-reader.c:3140
-#: ../modules/calendar/e-cal-shell-view-actions.c:1305
+#: ../mail/e-mail-reader.c:3598
+#: ../modules/calendar/e-cal-shell-view-actions.c:1310
 #: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../mail/e-mail-reader.c:3144
-#: ../modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../mail/e-mail-reader.c:3602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1303
 #: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:3154 ../mail/mail-dialogs.ui.h:19
+#: ../mail/e-mail-reader.c:3612 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Responder"
 
-#: ../mail/e-mail-reader.c:3722
+#: ../mail/e-mail-reader.c:4249
 #, c-format
 msgid "Folder '%s'"
 msgstr "Cartafol «%s»"
 
-#: ../mail/e-mail-tag-editor.c:292
+#: ../mail/e-mail-session.c:644
+#, c-format
+msgid "Enter Passphrase for %s"
+msgstr "Introduza a frase de paso para %s"
+
+#: ../mail/e-mail-session.c:646
+msgid "Enter Passphrase"
+msgstr "Introduza a frase de paso"
+
+#: ../mail/e-mail-session.c:649
+#, c-format
+msgid "Enter Password for %s"
+msgstr "Introduza o contrasinal para %s"
+
+#: ../mail/e-mail-session.c:651
+msgid "Enter Password"
+msgstr "Introduza o contrasinal"
+
+#: ../mail/e-mail-session.c:696
+#, c-format
+msgid "User canceled operation."
+msgstr "O usuario cancelou a operación."
+
+#: ../mail/e-mail-session.c:864
+#, 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/e-mail-session.c:873
+#, 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/e-mail-session.c:1262 ../mail/mail-ops.c:1220
+#, c-format
+msgid "Opening folder '%s'"
+msgstr "Abrindo o cartafol «%s»"
+
+#: ../mail/e-mail-session.c:1278
+#, fuzzy, c-format
+msgid "Invalid folder: %s"
+msgstr "Cartafol non válido: «%s»"
+
+#: ../mail/e-mail-session-utils.c:477 ../mail/mail-ops.c:605
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Produciuse un fallo ao aplicar os filtros ao correo saínte: %s"
+
+#: ../mail/e-mail-session-utils.c:501 ../mail/e-mail-session-utils.c:535
+#: ../mail/mail-ops.c:622 ../mail/mail-ops.c:653
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+msgstr ""
+"Produciuse un fallo ao anexar a %s: %s\n"
+"No seu lugar anexaranse ao cartafol local «Enviados»."
+
+#: ../mail/e-mail-session-utils.c:555 ../mail/mail-ops.c:673
+#, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "Produciuse un fallo ao anexar ao cartafol local «Enviados»: %s"
+
+#: ../mail/e-mail-session-utils.c:761 ../mail/mail-ops.c:774
+#: ../mail/mail-ops.c:866
+msgid "Sending message"
+msgstr "Enviando a mensaxe"
+
+#: ../mail/e-mail-session-utils.c:832
+#, fuzzy, c-format
+#| msgid "Unsubscribing from folder \"%s\""
+msgid "Unsubscribing from folder '%s'"
+msgstr "Eliminando a subscrición do cartafol «%s»"
+
+#: ../mail/e-mail-store-utils.c:39
+#, c-format
+msgid "Disconnecting from '%s'"
+msgstr "Desconectando de «%s»"
+
+#: ../mail/e-mail-store-utils.c:130
+#, c-format
+msgid "Reconnecting to '%s'"
+msgstr "Conectando novamente con %s"
+
+#: ../mail/e-mail-tag-editor.c:295
 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:512 ../mail/mail-config.ui.h:77
+#: ../mail/em-account-editor.c:565 ../mail/mail-config.ui.h:67
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "Sen cifrado"
@@ -10180,7 +9019,7 @@ 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:516 ../mail/mail-config.ui.h:136
+#: ../mail/em-account-editor.c:569 ../mail/mail-config.ui.h:121
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
@@ -10188,58 +9027,40 @@ 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:520 ../mail/mail-config.ui.h:105
+#: ../mail/em-account-editor.c:573 ../mail/mail-config.ui.h:89
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
-#: ../mail/em-account-editor.c:607
-#, c-format
-msgid "%s License Agreement"
-msgstr "Acordo de licenza %s"
-
-#: ../mail/em-account-editor.c:614
-#, c-format
-msgid ""
-"\n"
-"Please read carefully the license agreement\n"
-"for %s displayed below\n"
-"and tick the check box for accepting it\n"
-msgstr ""
-"\n"
-"Lea atentamente o acordo de licenza\n"
-"para %s que se mostra abaixo\n"
-"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:901 ../widgets/misc/e-signature-combo-box.c:79
+#: ../mail/em-account-editor.c:841 ../widgets/misc/e-signature-combo-box.c:79
 msgctxt "mail-signature"
 msgid "None"
 msgstr "Ningún"
 
-#: ../mail/em-account-editor.c:985
+#: ../mail/em-account-editor.c:922
 msgid "Never"
 msgstr "Nunca"
 
-#: ../mail/em-account-editor.c:986
+#: ../mail/em-account-editor.c:923
 msgid "Always"
 msgstr "Sempre"
 
-#: ../mail/em-account-editor.c:987
+#: ../mail/em-account-editor.c:924
 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:1723 ../widgets/misc/e-account-tree-view.c:128
+#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:131
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Ningún"
 
-#: ../mail/em-account-editor.c:2098
+#: ../mail/em-account-editor.c:2085
 msgid "Mail Configuration"
 msgstr "Configuración do correo"
 
-#: ../mail/em-account-editor.c:2099
+#: ../mail/em-account-editor.c:2086
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10249,7 +9070,7 @@ msgstr ""
 "\n"
 "Prema en «Adiante» para comezar."
 
-#: ../mail/em-account-editor.c:2102
+#: ../mail/em-account-editor.c:2089
 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 "
@@ -10259,20 +9080,19 @@ msgstr ""
 "abaixo non necesitan encherse, a non ser que desexe incluír esta información "
 "no correo que envíe."
 
-#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2261
-#: ../mail/mail-config.ui.h:98
+#: ../mail/em-account-editor.c:2091 ../mail/em-account-editor.c:2253
 msgid "Receiving Email"
 msgstr "Recepción de correo"
 
-#: ../mail/em-account-editor.c:2105
+#: ../mail/em-account-editor.c:2092
 msgid "Please configure the following account settings."
 msgstr "Configure as seguintes opcións de conta."
 
-#: ../mail/em-account-editor.c:2107 ../mail/em-account-editor.c:2743
+#: ../mail/em-account-editor.c:2094 ../mail/em-account-editor.c:2743
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: ../mail/em-account-editor.c:2108
+#: ../mail/em-account-editor.c:2095
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10281,11 +9101,11 @@ msgstr ""
 "seguro, pregunte ao seu administrador do sistema ou provedor de acceso a "
 "Internet."
 
-#: ../mail/em-account-editor.c:2110
+#: ../mail/em-account-editor.c:2097
 msgid "Account Management"
 msgstr "Xestión de contas"
 
-#: ../mail/em-account-editor.c:2111
+#: ../mail/em-account-editor.c:2098
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10293,11 +9113,11 @@ msgstr ""
 "Introduza un nome descritivo para esta conta no espazo de abaixo.\n"
 "Este nome usarase só para os efectos de vista."
 
-#: ../mail/em-account-editor.c:2115
+#: ../mail/em-account-editor.c:2102
 msgid "Done"
 msgstr "Feito"
 
-#: ../mail/em-account-editor.c:2116
+#: ../mail/em-account-editor.c:2103
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10320,44 +9140,44 @@ msgstr "Verificar automaticamente se hai mensaxes _novas cada"
 msgid "minu_tes"
 msgstr "minu_tos"
 
-#: ../mail/em-account-editor.c:2841
+#: ../mail/em-account-editor.c:2847
 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
+#: ../mail/em-account-editor.c:3156 ../mail/mail-config.ui.h:96
 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:3156 ../mail/em-account-editor.c:3224
+#: ../mail/em-account-editor.c:3201 ../mail/em-account-editor.c:3269
 msgid "Receiving Options"
 msgstr "Opcións de recepción"
 
-#: ../mail/em-account-editor.c:3157 ../mail/em-account-editor.c:3225
+#: ../mail/em-account-editor.c:3202 ../mail/em-account-editor.c:3270
 msgid "Checking for New Messages"
 msgstr "Comprobando se hai mensaxes novas"
 
 #. 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:1729
+#: ../mail/em-composer-utils.c:1759
 #, 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."
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1777
+#: ../mail/em-composer-utils.c:1809
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "Notificación de envío para: «%s»"
 
-#: ../mail/em-composer-utils.c:2186
+#: ../mail/em-composer-utils.c:2227
 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:2233
+#: ../mail/em-composer-utils.c:2274
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10365,19 +9185,19 @@ msgstr ""
 "O ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} ás ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribiu:"
 
-#: ../mail/em-composer-utils.c:2377
+#: ../mail/em-composer-utils.c:2424
 msgid "-----Original Message-----"
 msgstr "-----Mensaxe orixinal-----"
 
-#: ../mail/em-composer-utils.c:2589
+#: ../mail/em-composer-utils.c:2652
 msgid "Posting destination"
 msgstr "Destino onde publicar"
 
-#: ../mail/em-composer-utils.c:2590
+#: ../mail/em-composer-utils.c:2653
 msgid "Choose folders to post the message to."
 msgstr "Escolla os cartafoles nos que publicar a mensaxe."
 
-#: ../mail/em-filter-folder-element.c:260
+#: ../mail/em-filter-folder-element.c:337
 msgid "Select Folder"
 msgstr "Seleccionar cartafol"
 
@@ -10494,7 +9314,7 @@ msgstr "non está definida"
 msgid "is set"
 msgstr "está definida"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:58
 msgid "Junk"
 msgstr "Correo non desexado"
 
@@ -10543,7 +9363,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:18
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:15
 msgid "Read"
 msgstr "Ler"
 
@@ -10624,16 +9444,16 @@ msgid "Unset Status"
 msgstr "Desfacer a definición de estado"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:533
+#: ../mail/em-filter-rule.c:537
 msgid "Then"
 msgstr "Entón"
 
-#: ../mail/em-filter-rule.c:564
+#: ../mail/em-filter-rule.c:568
 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:126
+#: ../mail/em-folder-properties.c:124
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Mensaxes non lidas:"
@@ -10641,36 +9461,35 @@ 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:130
+#: ../mail/em-folder-properties.c:128
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Mensaxes totais:"
 msgstr[1] "Mensaxes totais:"
 
-#: ../mail/em-folder-properties.c:148
+#: ../mail/em-folder-properties.c:146
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Cuota de uso (%s):"
 
-#: ../mail/em-folder-properties.c:150
+#: ../mail/em-folder-properties.c:148
 #, c-format
 msgid "Quota usage"
 msgstr "Cuota de uso"
 
-#: ../mail/em-folder-properties.c:288
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../mail/em-folder-properties.c:290
 msgid "Folder Properties"
 msgstr "Propiedades do cartafol"
 
-#: ../mail/em-folder-selection-button.c:75
+#: ../mail/em-folder-selection-button.c:81
 msgid "<click here to select a folder>"
 msgstr "<prema aquí para seleccionar un cartafol>"
 
-#: ../mail/em-folder-selector.c:264
+#: ../mail/em-folder-selector.c:262
 msgid "C_reate"
 msgstr "C_rear"
 
-#: ../mail/em-folder-selector.c:268
+#: ../mail/em-folder-selector.c:266
 msgid "Folder _name:"
 msgstr "_Nome do cartafol:"
 
@@ -10678,7 +9497,7 @@ msgstr "_Nome do cartafol:"
 #: ../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
+#: ../mail/mail-vfolder.c:1140 ../mail/mail-vfolder.c:1214
 msgid "Search Folders"
 msgstr "Cartafoles de busca"
 
@@ -10687,88 +9506,83 @@ msgstr "Cartafoles de busca"
 msgid "UNMATCHED"
 msgstr "SEN EQUIVALENCIA"
 
-#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree-model.c:1113
+#: ../mail/em-folder-tree-model.c:836 ../mail/em-folder-tree-model.c:1113
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: ../mail/em-folder-tree.c:191
+#: ../mail/em-folder-tree.c:201
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en «%s»"
 
-#: ../mail/em-folder-tree.c:611
+#: ../mail/em-folder-tree.c:629
 msgid "Folder names cannot contain '/'"
 msgstr "Os nomes dos cartafoles non poden conter o carácter '/'"
 
-#: ../mail/em-folder-tree.c:1100
+#: ../mail/em-folder-tree.c:1191
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1339
+#: ../mail/em-folder-tree.c:1427
 msgid "Mail Folder Tree"
 msgstr "Ã?rbore de cartafoles de correo"
 
-#: ../mail/em-folder-tree.c:1656 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:1788 ../mail/em-folder-utils.c:90
 #, c-format
 msgid "Moving folder %s"
 msgstr "Movendo o cartafol %s"
 
-#: ../mail/em-folder-tree.c:1660 ../mail/em-folder-utils.c:94
+#: ../mail/em-folder-tree.c:1792 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando cartafol %s"
 
-#: ../mail/em-folder-tree.c:1669 ../mail/message-list.c:2164
+#: ../mail/em-folder-tree.c:1801 ../mail/message-list.c:2214
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:1673 ../mail/message-list.c:2166
+#: ../mail/em-folder-tree.c:1805 ../mail/message-list.c:2216
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:1690
+#: ../mail/em-folder-tree.c:1824
 #, 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:403
+#: ../mail/em-folder-utils.c:422
 msgid "Move Folder To"
 msgstr "_Mover o cartafol a..."
 
-#: ../mail/em-folder-utils.c:403
+#: ../mail/em-folder-utils.c:422
 msgid "Copy Folder To"
 msgstr "_Copiar cartafol a..."
 
-#: ../mail/em-folder-utils.c:533
-#: ../plugins/groupwise-features/share-folder-common.c:137
+#: ../mail/em-folder-utils.c:571
+#: ../plugins/groupwise-features/share-folder-common.c:138
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "Creando o cartafol «%s»"
 
-#: ../mail/em-folder-utils.c:693
+#: ../mail/em-folder-utils.c:745
 msgid "Create Folder"
 msgstr "Crear cartafol"
 
-#: ../mail/em-folder-utils.c:694
-#: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:342
+#: ../mail/em-folder-utils.c:746
+#: ../plugins/groupwise-features/install-shared.c:178
+#: ../plugins/groupwise-features/share-folder-common.c:353
 msgid "Specify where to create the folder:"
 msgstr "Especificar onde crear o cartafol:"
 
-#: ../mail/em-folder-utils.c:714
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "Eliminando a subscrición do cartafol «%s»"
-
-#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1576
+#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1604
 msgid "Unsigned"
 msgstr "Non asinado"
 
-#: ../mail/em-format-html-display.c:90
+#: ../mail/em-format-html-display.c:88
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -10776,11 +9590,11 @@ msgstr ""
 "Esta mensaxe non está asinada. Non hai garantía de que a mensaxe sexa "
 "auténtica."
 
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1577
+#: ../mail/em-format-html-display.c:89 ../mail/em-format-html.c:1605
 msgid "Valid signature"
 msgstr "Sinatura válida"
 
-#: ../mail/em-format-html-display.c:91
+#: ../mail/em-format-html-display.c:89
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -10788,11 +9602,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:92 ../mail/em-format-html.c:1578
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1606
 msgid "Invalid signature"
 msgstr "Sinatura non válida"
 
-#: ../mail/em-format-html-display.c:92
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -10800,11 +9614,11 @@ msgstr ""
 "A sinatura desta mensaxe non se pode verificar, puido ser alterada en "
 "tránsito."
 
-#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1579
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1607
 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:93
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -10812,11 +9626,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:94 ../mail/em-format-html.c:1580
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1608
 msgid "Signature exists, but need public key"
 msgstr "A sinatura existe, mais precisa unha chave pública"
 
-#: ../mail/em-format-html-display.c:94
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -10824,11 +9638,11 @@ msgstr ""
 "Esta mensaxe está asinada cunha sinatura, mais non existe unha chave pública "
 "correspondente."
 
-#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1586
+#: ../mail/em-format-html-display.c:99 ../mail/em-format-html.c:1614
 msgid "Unencrypted"
 msgstr "Non cifrada"
 
-#: ../mail/em-format-html-display.c:101
+#: ../mail/em-format-html-display.c:99
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -10836,11 +9650,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:102 ../mail/em-format-html.c:1587
+#: ../mail/em-format-html-display.c:100 ../mail/em-format-html.c:1615
 msgid "Encrypted, weak"
 msgstr "Cifrada; débil"
 
-#: ../mail/em-format-html-display.c:102
+#: ../mail/em-format-html-display.c:100
 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 "
@@ -10850,11 +9664,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:103 ../mail/em-format-html.c:1588
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1616
 msgid "Encrypted"
 msgstr "Cifrada"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -10862,11 +9676,11 @@ msgstr ""
 "Esta mensaxe está cifrada. Sería difícil para un intruso ver o contido desta "
 "mensaxe."
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1589
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1617
 msgid "Encrypted, strong"
 msgstr "Cifrada; forte"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:102
 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 "
@@ -10875,15 +9689,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:235 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:238 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_Ver o certificado"
 
-#: ../mail/em-format-html-display.c:248
+#: ../mail/em-format-html-display.c:251
 msgid "This certificate is not viewable"
 msgstr "Este certificado non é visíbel"
 
-#: ../mail/em-format-html-display.c:497
+#: ../mail/em-format-html-display.c:506
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -10892,28 +9706,28 @@ msgstr ""
 "procesamento demora demasiado. Pode visualizalo sen formato ou ben cun "
 "editor de texto externo."
 
-#: ../mail/em-format-html-display.c:725
+#: ../mail/em-format-html-display.c:749
 msgid "Completed on"
 msgstr "Terminado o"
 
-#: ../mail/em-format-html-display.c:733
+#: ../mail/em-format-html-display.c:757
 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:737
+#: ../mail/em-format-html-display.c:761
 msgid "by"
 msgstr "por"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:978 ../mail/em-format-html-display.c:1025
 msgid "View _Unformatted"
 msgstr "Ver sen _formato"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:980
 msgid "Hide _Unformatted"
 msgstr "Ocultar sen _formato"
 
-#: ../mail/em-format-html-display.c:1016
+#: ../mail/em-format-html-display.c:1045
 msgid "O_pen With"
 msgstr "A_brir con"
 
@@ -10922,55 +9736,55 @@ msgstr "A_brir con"
 msgid "Page %d of %d"
 msgstr "Páxina %d de %d"
 
-#: ../mail/em-format-html.c:153
+#: ../mail/em-format-html.c:165
 msgid "Formatting message"
 msgstr "Formatando a mensaxe"
 
-#: ../mail/em-format-html.c:352
+#: ../mail/em-format-html.c:364
 msgid "Formatting Message..."
 msgstr "Formatando a mensaxe..."
 
-#: ../mail/em-format-html.c:1421 ../mail/em-format-html.c:1430
+#: ../mail/em-format-html.c:1448 ../mail/em-format-html.c:1458
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "Obtendo «%s»"
 
-#: ../mail/em-format-html.c:1901
+#: ../mail/em-format-html.c:1979
 msgid "Unknown external-body part."
 msgstr "Parte do corpo externo descoñecida."
 
-#: ../mail/em-format-html.c:1909
+#: ../mail/em-format-html.c:1987
 msgid "Malformed external-body part."
 msgstr "Parte do corpo externo formada incorrectamente."
 
-#: ../mail/em-format-html.c:1939
+#: ../mail/em-format-html.c:2017
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro ao sitio FTP (%s)"
 
-#: ../mail/em-format-html.c:1950
+#: ../mail/em-format-html.c:2028
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Punteiro ao ficheiro local (%s) válido no sitio «%s»"
 
-#: ../mail/em-format-html.c:1952
+#: ../mail/em-format-html.c:2030
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro ao ficheiro local (%s)"
 
-#: ../mail/em-format-html.c:1973
+#: ../mail/em-format-html.c:2051
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro aos datos remotos (%s)"
 
-#: ../mail/em-format-html.c:1984
+#: ../mail/em-format-html.c:2062
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 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:2647
+#: ../mail/em-format-html.c:2762
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Esta mensaxe foi enviada por %s no nome de %s"
@@ -10981,58 +9795,95 @@ msgstr "Esta mensaxe foi enviada por %s no nome de %s"
 msgid "No HTML stream available"
 msgstr "Non hai un fluxo HTML dispoñíbel"
 
-#: ../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-subscription-editor.c:1107
+msgid "Folder Subscriptions"
+msgstr "Subscricións de cartafoles"
 
-#: ../mail/em-subscribe-editor.c:728
-msgid "Subscribed"
-msgstr "Subscrito"
+#: ../mail/em-subscription-editor.c:1146
+msgid "_Account:"
+msgstr "Cont_a:"
 
-#: ../mail/em-subscribe-editor.c:732
-msgid "Folder"
-msgstr "Cartafol"
+#: ../mail/em-subscription-editor.c:1161
+msgid "Clear Search"
+msgstr "Limpar a busca"
 
-#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:1120
-msgid "Please select a server."
-msgstr "Seleccione un servidor."
+#: ../mail/em-subscription-editor.c:1179
+msgid "Sho_w items that contain:"
+msgstr "Most_rar os elementos que conteñan:"
 
-#: ../mail/em-subscribe-editor.c:1166
-msgid "No server has been selected"
-msgstr "Non se seleccionou un servidor"
+#: ../mail/em-subscription-editor.c:1218
+msgid "Subscribe to the selected folder"
+msgstr "Subscribir o cartafol seleccionado"
+
+#: ../mail/em-subscription-editor.c:1219
+msgid "Su_bscribe"
+msgstr "Su_bscribir"
+
+#: ../mail/em-subscription-editor.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
+msgid "Unsubscribe from the selected folder"
+msgstr "Renomear o cartafol seleccionado"
+
+#: ../mail/em-subscription-editor.c:1231
+#: ../modules/mail/e-mail-shell-view-actions.c:1141
+msgid "_Unsubscribe"
+msgstr "Eliminar s_ubscrición"
+
+#: ../mail/em-subscription-editor.c:1242
+msgid "Collapse all folders"
+msgstr "Pregar todos os cartafoles"
+
+#: ../mail/em-subscription-editor.c:1243
+msgid "C_ollapse All"
+msgstr "C_ontraer todo"
+
+#: ../mail/em-subscription-editor.c:1253
+msgid "Expand all folders"
+msgstr "Despregar todos os cartafoles"
+
+#: ../mail/em-subscription-editor.c:1254
+msgid "E_xpand All"
+msgstr "Pre_gar todo"
+
+#: ../mail/em-subscription-editor.c:1264
+#, fuzzy
+msgid "Refresh the folder list"
+msgstr "Actualizar a lista de cartafoles"
+
+#: ../mail/em-subscription-editor.c:1276
+msgid "Stop the current operation"
+msgstr "Cancelar a operación actual"
 
 #. 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
+#: ../mail/em-utils.c:101
 #, 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
+#: ../mail/em-utils.c:153
+#: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "_Non mostrar esta mensaxe outra vez"
 
-#: ../mail/em-utils.c:314
+#: ../mail/em-utils.c:327
 msgid "Message Filters"
 msgstr "Filtros de mensaxe"
 
-#: ../mail/em-utils.c:848
+#: ../mail/em-utils.c:883
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensaxes de %s"
 
-#: ../mail/em-vfolder-editor.c:126
+#: ../mail/em-vfolder-editor.c:108
 msgid "Search _Folders"
 msgstr "Carta_foles de busca"
 
-#: ../mail/em-vfolder-rule.c:525
+#: ../mail/em-vfolder-rule.c:603
 msgid "Add Folder"
 msgstr "Cartafol"
 
@@ -11049,70 +9900,97 @@ msgid "\"Filter Editor\" window width"
 msgstr "Largura predefinida da xanela"
 
 #: ../mail/evolution-mail.schemas.in.h:4
-msgid "\"Search Folder Editor\" window height"
+#, fuzzy
+msgid "\"Folder Subscriptions\" window height"
 msgstr "Altura predefinida da xanela"
 
 #: ../mail/evolution-mail.schemas.in.h:5
-msgid "\"Search Folder Editor\" window maximize state"
+#, fuzzy
+msgid "\"Folder Subscriptions\" window maximize state"
 msgstr "Estado maximizado da xanela «Enviar e recibir correo»"
 
 #: ../mail/evolution-mail.schemas.in.h:6
+#, fuzzy
+msgid "\"Folder Subscriptions\" window width"
+msgstr "Largura predefinida da xanela"
+
+#: ../mail/evolution-mail.schemas.in.h:7
+msgid "\"Search Folder Editor\" window height"
+msgstr "Altura predefinida da xanela"
+
+#: ../mail/evolution-mail.schemas.in.h:8
+msgid "\"Search Folder Editor\" window maximize state"
+msgstr "Estado maximizado da xanela «Enviar e recibir correo»"
+
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Search Folder Editor\" window width"
 msgstr "Cartafol de busca por _lista de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "\"Send and Receive Mail\" window height"
 msgstr "Altura da xanela «Enviar e recibir correo»"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "\"Send and Receive Mail\" window maximize state"
 msgstr "Estado maximizado da xanela «Enviar e recibir correo»"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "\"Send and Receive Mail\" window width"
 msgstr "Largura da xanela «Enviar e recibir correo»"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Always request read receipt"
 msgstr "Requirir sempre confirmación de lectura"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr ""
+"Tempo (en segundos) durante o que se mostrará o erro na barra de estado."
+
+#: ../mail/evolution-mail.schemas.in.h:15
+msgid ""
+"Asks whether to close the message window when the user forwards or replies "
+"to the message shown in the window"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Automatic emoticon recognition"
 msgstr "Recoñecemento automático de emoticonas"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Automatic link recognition"
 msgstr "Recoñecemento automático da ligazón"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Check incoming mail being junk"
 msgstr "Verificar se o correo entrante é correo non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Citation highlight color"
 msgstr "Cor de realce de citas"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Citation highlight color."
 msgstr "Cor de realce de citas."
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Composer Window default height"
 msgstr "Altura predefinida da xanela do editor"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Composer Window default width"
 msgstr "Largura predefinida da xanela do editor"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Composer load/attach directory"
 msgstr "Cartafol para cargar/anexar do editor"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Comprimir a vista de enderezos en A/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -11120,7 +9998,7 @@ msgstr ""
 "Comprime a vista de enderezos en A/CC/CCO co número especificado en "
 "address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11128,13 +10006,13 @@ 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:23
+#: ../mail/evolution-mail.schemas.in.h:27
 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:24
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -11142,63 +10020,55 @@ msgstr ""
 "As cabeceiras personalizadas para usar mentres se verifica o correo non "
 "desexado. A lista de elementos son cadeas no formato «headername=value»."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default charset in which to compose messages"
 msgstr "Conxunto de caracteres predefinido para escribir mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:30
 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:31
 msgid "Default charset in which to display messages"
 msgstr "Conxunto de caracteres predefinido para mostrar mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:32
 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:33
 msgid "Default forward style"
 msgstr "Estilo de reenvío predefinido"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default height of the Composer Window."
 msgstr "Altura predefinida da xanela do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default height of the mail browser window."
 msgstr "Altura predefinida da xanela do editor."
 
-#: ../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:33
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default maximized state of the mail browser window."
 msgstr "Largura predefinida da xanela do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default reply style"
 msgstr "Estilo de resposta predefinido"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default value for thread expand state"
 msgstr "Valor predefinido para o estado expandido do fío"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default width of the Composer Window."
 msgstr "Largura predefinida da xanela do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Default width of the mail browser window."
 msgstr "Largura predefinida da xanela do editor."
 
-#: ../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:39
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -11206,12 +10076,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:40
+#: ../mail/evolution-mail.schemas.in.h:42
 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:41
+#: ../mail/evolution-mail.schemas.in.h:43
 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 "
@@ -11224,13 +10094,13 @@ msgstr ""
 "axendas de enderezos remotas (LDAP, por exemplo) están marcadas para o "
 "completado automático."
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:44
 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:43
+#: ../mail/evolution-mail.schemas.in.h:45
 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 "
@@ -11240,7 +10110,7 @@ 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:44
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -11248,52 +10118,52 @@ msgstr ""
 "Determina se se debe usar o mesmo tipo de letra para as liñas De e Asunto na "
 "columna Mensaxes da vista vertical."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Directory for loading/attaching files to composer."
 msgstr "Cartafol onde cargar/anexar os ficheiros no editor."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Directory for saving mail component files."
 msgstr "Cartafol onde gardar os ficheiros enviados por correo."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:49
 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
+#: ../mail/evolution-mail.schemas.in.h:50
 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
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Do not add signature delimiter"
 msgstr "Non foi posíbel gardar o ficheiro de sinatura."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 "Debuxar os indicadores de erros de ortografía nas palabras mentres se "
 "escribe."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Empty Junk folders on exit"
 msgstr "Baleirar os cartafoles de correo non desexado ao saír"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Empty Trash folders on exit"
 msgstr "Baleirar os cartafoles de lixo ao saír"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr ""
 "Baleirar todos os cartafoles de correo non desexado ao saír do Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Baleirar todos os cartafoles de lixo ao saír do Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -11301,31 +10171,31 @@ msgstr ""
 "Activar imaxes animadas no correo HTML. Algúns usuarios encontran as imaxes "
 "animadas repunantes e polo contrario prefiren ver a mensaxe estática."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Activar o modo de cursor para poder ver un cursor ao ler un correo."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Enable or disable magic space bar"
 msgstr "Activar ou desactivar a barra de espazo máxica"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Activa ou desactiva a pregunta cando se marcan varias mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable or disable type ahead search feature"
 msgstr "Activar ou desactivar a característica de busca ao teclear"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable search folders"
 msgstr "Activar cartafoles de busca"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable search folders on startup."
 msgstr "Activar cartafoles de busca ao inicio."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -11333,7 +10203,7 @@ msgstr ""
 "Activar a barra de búsqueda lateral para permitirlle as búsquedas "
 "interactivas de nomes de cartafoles."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -11341,7 +10211,7 @@ 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:64
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
@@ -11349,27 +10219,27 @@ msgstr ""
 "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
+#: ../mail/evolution-mail.schemas.in.h:67
 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
+#: ../mail/evolution-mail.schemas.in.h:68
 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
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar o modo de cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
+#: ../mail/evolution-mail.schemas.in.h:70 ../mail/mail-config.ui.h:42
 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:69
+#: ../mail/evolution-mail.schemas.in.h:71
 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, "
@@ -11381,27 +10251,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:70
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Flush Outbox after filtering"
 msgstr "Limpar a Caixa de saída despois de flitrar"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Group Reply replies to list"
 msgstr "Responder ao grupo responde á rolda"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "Height of the message-list pane"
 msgstr "Altura do panel da lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "Height of the message-list pane."
 msgstr "Altura do panel da lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:76
 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:75
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -11409,7 +10279,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:76
+#: ../mail/evolution-mail.schemas.in.h:78
 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 "
@@ -11420,11 +10290,11 @@ 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:77
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Ignore list Reply-To:"
 msgstr "Ignorar «Responder a:» para as roldas:"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
@@ -11432,15 +10302,24 @@ msgstr ""
 "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:79
+#: ../mail/evolution-mail.schemas.in.h:81
+#, fuzzy
+msgid ""
+"Initial height of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"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:82
 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 «Editor do cartafol de busca». O valor actualízase "
-"a medida que o usuario redimensiona a xanela verticalmente."
+"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:80
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11448,7 +10327,7 @@ msgstr ""
 "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:81
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -11460,20 +10339,33 @@ msgstr ""
 "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:82
+#: ../mail/evolution-mail.schemas.in.h:85
+#, fuzzy
+msgid ""
+"Initial maximize state of the \"Folder Subscriptions\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Folder Subscriptions\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+"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:86
 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 «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 "
+"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:83
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11487,7 +10379,7 @@ msgstr ""
 "correo\" non pode ser maximizada. Esta chave só existe como un detalle de "
 "implementación."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
@@ -11495,7 +10387,16 @@ msgstr ""
 "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:85
+#: ../mail/evolution-mail.schemas.in.h:89
+#, fuzzy
+msgid ""
+"Initial width of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"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:90
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11503,7 +10404,7 @@ msgstr ""
 "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:86
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11511,7 +10412,7 @@ 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:87
+#: ../mail/evolution-mail.schemas.in.h:92
 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 "
@@ -11523,7 +10424,7 @@ msgstr ""
 "rolda de correo mediante a que vostede recibiu a copia da mensaxe que está "
 "respondendo."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:93
 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 "
@@ -11533,7 +10434,7 @@ msgstr ""
 "mensaxes dun cartafol de busca bórranse as mensaxes permanentemente, non só "
 "dos resultados da busca."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:94
 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."
@@ -11541,7 +10442,7 @@ 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
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
@@ -11549,7 +10450,7 @@ 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
+#: ../mail/evolution-mail.schemas.in.h:96
 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 "
@@ -11560,37 +10461,42 @@ msgstr ""
 "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
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Last time Empty Junk was run"
 msgstr "Ã?ltima vez que se baleirou o correo non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Last time Empty Trash was run"
 msgstr "Ã?ltima vez que se baleirou o lixo"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Layout style"
 msgstr "Disp_osición"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:100
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+msgid "Level beyond which the message should be logged."
+msgstr "Nivel a partir do que se debería rexistrar a mensaxe."
+
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas e as cores asociadas"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:102
 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:98
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "List of accepted licenses"
 msgstr "Lista de licenzas aceptadas"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "List of accounts"
 msgstr "Lista de contas"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -11599,17 +10505,17 @@ msgstr ""
 "contén cadeas que nomean subcartafoles relativos a /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:106
 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:102
+#: ../mail/evolution-mail.schemas.in.h:107
 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:103
+#: ../mail/evolution-mail.schemas.in.h:108
 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."
@@ -11618,142 +10524,151 @@ msgstr ""
 "lista contén cadeas que conteñen nome:cor, onde \"cor\" usa a codificación "
 "hexadecimal HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:109
 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:105
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Load images for HTML messages over HTTP"
 msgstr "Cargar as imaxes das mensaxes HTML sobre HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
 "contacts. \"2\" - Always load images off the net."
 msgstr ""
-"Cargar as imaxes das mensaxes HTML sobre HTTP. Os valores posíbeis son: \"0"
-"\" - Non cargar nunca as imaxes de fóra da rede. \"1\" - Cargar as imaxes "
+"Cargar as imaxes das mensaxes HTML sobre HTTP. Os valores posíbeis son: "
+"\"0\" - 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:107
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Log filter actions"
 msgstr "Rexistrar accións de filtraxe"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:113
 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:109
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Logfile to log filter actions"
 msgstr "Ficheiro de rexistro para rexistrar as accións de filtraxe"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Logfile to log filter actions."
 msgstr "Ficheiro de rexistro para rexistrar as accións de filtraxe."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Mail browser height"
 msgstr "Altura uniforme da fila"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Mail browser maximized"
 msgstr "Navegador de mail maximizado"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Mail browser width"
 msgstr "O correo comeza por"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como visto despois do tempo de espera especificado"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como visto despois do tempo de espera especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar as citas textuais na \"Previsualización\" da mensaxe"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar as citas textuais na \"Previsualización\" da mensaxe."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:123
 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:119
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Estilo de vista da mensaxe (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:125
 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:121
+#: ../mail/evolution-mail.schemas.in.h:126
 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:122
+#: ../mail/evolution-mail.schemas.in.h:127
 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:123
+#: ../mail/evolution-mail.schemas.in.h:128
 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:124
+#: ../mail/evolution-mail.schemas.in.h:129
 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:125
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid ""
+"Possible values are: never - to never close browser window always - to "
+"always close browser window ask - (or any other value) will ask user"
+msgstr ""
+"Os valores posíbeis son: nunca - non pechar a xanela do explorador nunca  "
+"sempre - pechar a xanela do explorador sempre  preguntar - (ou calquera "
+"valor) preguntar ao usuario"
+
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Prompt on empty subject"
 msgstr "Preguntar cando o asunto está baleiro"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:132
 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:127
+#: ../mail/evolution-mail.schemas.in.h:133
 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:128
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Prompt when deleting messages in search folder"
 msgstr "Preguntar cando se eliminen mensaxes nun cartafol de busca"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:135
 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
+#: ../mail/evolution-mail.schemas.in.h:136
 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
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Prompt when replying to many recipients"
 msgstr "Preguntar ao responder a moitos destinatarios"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Prompt when user expunges"
 msgstr "Preguntar cando o usuario compacta"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt when user only fills Bcc"
 msgstr "Preguntar cando o usuario só encha o campo Cco"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:140
 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:135
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11761,65 +10676,65 @@ msgstr ""
 "Preguntar ao enviar mensaxes en HTML a destinatarios que non desexen "
 "recibilas."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:142
 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:137
+#: ../mail/evolution-mail.schemas.in.h:143
 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:138
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt while marking multiple messages"
 msgstr "Preguntar cando se marquen varias mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Put personalized signatures at the top of replies"
 msgstr "Poñer sinaturas personalizadas no inicio das respostas"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Put the cursor at the bottom of replies"
 msgstr "Poñer o cursor ao fondo da resposta"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:147
 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:142
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Recognize links in text and replace them."
 msgstr "Recoñecer ligazóns no texto e substituílas."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Run junk test on incoming mail."
 msgstr "Realizar a proba de correo non desexado no correo entrante."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Save directory"
 msgstr "Cartafol onde gardar"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:151
 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:146
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Send HTML mail by default"
 msgstr "Enviar correo en HTML por omisión"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Send HTML mail by default."
 msgstr "Enviar correo en HTML por omisión."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:154
 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:149
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Server synchronization interval"
 msgstr "Intervalo de sincronización do servidor"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -11827,63 +10742,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:151
+#: ../mail/evolution-mail.schemas.in.h:157
 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:152
+#: ../mail/evolution-mail.schemas.in.h:158
 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:153
+#: ../mail/evolution-mail.schemas.in.h:159
 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:154
+#: ../mail/evolution-mail.schemas.in.h:160
 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:155
+#: ../mail/evolution-mail.schemas.in.h:161
 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:156
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show Animations"
 msgstr "Mostrar animacións"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show all message headers"
 msgstr "Contraer todos os fíos de mensaxe"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:164
 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:159
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Show animated images as animations."
 msgstr "Mostrar as imaxes animadas como animacións."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:166
 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:161
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar as mensaxes eliminadas na lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show image animations"
 msgstr "Mostrar as animacións de imaxe "
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show original \"Date\" header value."
 msgstr "Mostrar o valor da cabeceira \"Date\" orixinal"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show photo of the sender"
 msgstr "Mostrar a foto do remitente"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11891,7 +10806,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:166
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11899,7 +10814,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:167
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11907,7 +10822,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:168
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11915,7 +10830,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:169
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11923,14 +10838,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:170
+#: ../mail/evolution-mail.schemas.in.h:176
 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:171
+#: ../mail/evolution-mail.schemas.in.h:177
 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 "
@@ -11940,11 +10855,11 @@ 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:172
+#: ../mail/evolution-mail.schemas.in.h:178
 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:173
+#: ../mail/evolution-mail.schemas.in.h:179
 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. "
@@ -11957,55 +10872,47 @@ 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."
+"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
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Spell check inline"
 msgstr "Verificación ortográfica en liña"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Spell checking color"
 msgstr "Cor da verificación ortográfica"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid "Spell checking languages"
 msgstr "Idiomas da verificación ortográfica"
 
-#: ../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:178
-msgid "Subscribe dialog default width"
-msgstr "Largura predefinida do diálogo de subscrición"
-
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid "Terminal font"
 msgstr "Tipo de letra do terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:184
 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:181
+#: ../mail/evolution-mail.schemas.in.h:185
 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 o 1 de "
 "xaneiro de 1970 (Epoch)."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:186
 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:183
+#: ../mail/evolution-mail.schemas.in.h:187
 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 "
@@ -12017,23 +10924,23 @@ 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:184
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "The terminal font for mail display."
 msgstr "O tipo de letra do terminal para mostrar o correo."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:189
 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:186
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr ""
-"Isto pode ter tres valores posíbeis: \"0\" para erros; \"1\" para avisos; \"2"
-"\" para mensaxes de depuración."
+"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:187
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid ""
 "This decides the max size of the message text that will be displayed under "
 "Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
@@ -12043,7 +10950,7 @@ msgstr ""
 "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:188
+#: ../mail/evolution-mail.schemas.in.h:192
 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 "
@@ -12053,7 +10960,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:189
+#: ../mail/evolution-mail.schemas.in.h:193
 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."
@@ -12062,7 +10969,7 @@ msgstr ""
 "ler. Isto deselecciona o correo da lista e elimina a previsualización para "
 "ese cartafol."
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:194
 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;"
@@ -12074,7 +10981,7 @@ msgstr ""
 "estrutura XML é &lt;header enabled&gt; - defínao como activado se se debe "
 "mostrar a cabeceira na vista do correo."
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:195
 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 "
@@ -12085,11 +10992,11 @@ msgstr ""
 "para excluír os correos enviados por contactos coñecidos do filtro de correo "
 "non desexado."
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:196
 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:193
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -12097,7 +11004,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:194
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -12105,7 +11012,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:195
+#: ../mail/evolution-mail.schemas.in.h:199
 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 "
@@ -12115,53 +11022,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:196
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Thread the message-list based on Subject"
 msgstr "Lista de mensaxes por fíos baseadas no asunto"
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid "Timeout for marking message as seen"
 msgstr "Tempo de espera para marcar unha mensaxe como vista"
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Timeout for marking message as seen."
 msgstr "Tempo de espera para marcar unha mensaxe como vista."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "UID string of the default account."
 msgstr "Cadea UID para a conta predefinida."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:204
 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:201
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid "Use SpamAssassin daemon and client"
 msgstr "Usar o daemon e cliente SpamAssassin"
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Usar o daemon e cliente SpamAssassin (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid "Use custom fonts"
 msgstr "Usar tipos de letra personalizados"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid "Use custom fonts for displaying mail."
 msgstr "Usar tipos de letra personalizados para mostrar o correo."
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "Use only local spam tests."
 msgstr "Usar só probas locais de correo non desexado."
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:210
 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:207
+#: ../mail/evolution-mail.schemas.in.h:211
 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 "
@@ -12171,7 +11078,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:208
+#: ../mail/evolution-mail.schemas.in.h:212
 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 "
@@ -12181,23 +11088,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:209
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "Variable width font"
 msgstr "Tipo de letra de largura variábel"
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:214
 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:211
+#: ../mail/evolution-mail.schemas.in.h:215
 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:212
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12205,13 +11112,13 @@ 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:213
+#: ../mail/evolution-mail.schemas.in.h:217
 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:214
+#: ../mail/evolution-mail.schemas.in.h:218
 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 "
@@ -12222,100 +11129,100 @@ msgstr ""
 "filtrado «Reenviar a» e aproximadamente un minuto despois da invocación da "
 "última acción."
 
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:219
 msgid "Width of the message-list pane"
 msgstr "Largura do panel de lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid "Width of the message-list pane."
 msgstr "Largura do panel de lista de mensaxes."
 
-#: ../mail/importers/elm-importer.c:176
+#: ../mail/importers/elm-importer.c:178
 msgid "Importing Elm data"
 msgstr "Importando datos Elm"
 
-#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
-#: ../modules/mail/e-mail-shell-view.c:964
+#: ../mail/importers/elm-importer.c:339 ../mail/importers/pine-importer.c:415
+#: ../modules/mail/e-mail-shell-view.c:1041
 #: ../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:366
+#: ../mail/importers/elm-importer.c:380
 msgid "Evolution Elm importer"
 msgstr "Importador do Elm do Evolution"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:381
 msgid "Import mail from Elm."
 msgstr "Importar correo desde o Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:116
-#: ../plugins/dbx-import/dbx-importer.c:226
+#: ../mail/importers/evolution-mbox-importer.c:127
+#: ../plugins/dbx-import/dbx-importer.c:227
 msgid "_Destination folder:"
 msgstr "Cartafol de _destino:"
 
-#: ../mail/importers/evolution-mbox-importer.c:122
-#: ../plugins/dbx-import/dbx-importer.c:232
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../mail/importers/evolution-mbox-importer.c:133
+#: ../plugins/dbx-import/dbx-importer.c:233
+#: ../plugins/pst-import/pst-importer.c:316
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: ../mail/importers/evolution-mbox-importer.c:122
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../mail/importers/evolution-mbox-importer.c:134
+#: ../plugins/pst-import/pst-importer.c:316
 msgid "Select folder to import into"
 msgstr "Seleccionar un cartafol para o que importar"
 
-#: ../mail/importers/evolution-mbox-importer.c:382
+#: ../mail/importers/evolution-mbox-importer.c:403
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Asunto"
 
-#: ../mail/importers/evolution-mbox-importer.c:387
+#: ../mail/importers/evolution-mbox-importer.c:408
 msgctxt "mboxImp"
 msgid "From"
 msgstr "De"
 
-#: ../mail/importers/evolution-mbox-importer.c:431
-#: ../shell/e-shell-utils.c:251
+#: ../mail/importers/evolution-mbox-importer.c:452
+#: ../shell/e-shell-utils.c:253
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Caixa de correo Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:432
+#: ../mail/importers/evolution-mbox-importer.c:453
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de cartafoles no formato caixa de correo de Berkeley"
 
-#: ../mail/importers/mail-importer.c:64
+#: ../mail/importers/mail-importer.c:65
 msgid "Importing mailbox"
 msgstr "Importando caixa de correo"
 
 #. Destination folder, was set in our widget
-#: ../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
+#: ../mail/importers/mail-importer.c:149
+#: ../plugins/dbx-import/dbx-importer.c:568
+#: ../plugins/pst-import/pst-importer.c:478
+#: ../plugins/pst-import/pst-importer.c:587
 #, c-format
 msgid "Importing '%s'"
 msgstr "Importando «%s»"
 
-#: ../mail/importers/mail-importer.c:295
+#: ../mail/importers/mail-importer.c:308
 #, c-format
 msgid "Scanning %s"
 msgstr "Examinando %s"
 
-#: ../mail/importers/pine-importer.c:221
+#: ../mail/importers/pine-importer.c:223
 msgid "Importing Pine data"
 msgstr "Importando datos do Pine"
 
-#: ../mail/importers/pine-importer.c:405
-#: ../modules/addressbook/addressbook-config.c:1006
+#: ../mail/importers/pine-importer.c:420
+#: ../modules/addressbook/addressbook-config.c:1016
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
-#: ../mail/importers/pine-importer.c:447
+#: ../mail/importers/pine-importer.c:462
 msgid "Evolution Pine importer"
 msgstr "Importador do Pine do Evolution"
 
-#: ../mail/importers/pine-importer.c:448
+#: ../mail/importers/pine-importer.c:463
 msgid "Import mail from Pine."
 msgstr "Importar correo do Pine."
 
@@ -12339,7 +11246,7 @@ msgstr "O asunto é %s"
 msgid "%s mailing list"
 msgstr "rolda de correo %s"
 
-#: ../mail/mail-autofilter.c:363
+#: ../mail/mail-autofilter.c:382
 msgid "Add Filter Rule"
 msgstr "Engadir unha regra de filtraxe"
 
@@ -12348,7 +11255,7 @@ msgstr "Engadir unha regra de filtraxe"
 #. * 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
+#: ../mail/mail-autofilter.c:480
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -12366,492 +11273,454 @@ msgstr[1] ""
 "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 "(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
+#: ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "Sen información"
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:2
 msgid "Add Ne_w Signature..."
 msgstr "Engadir sinatura _nova..."
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:3
 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:8
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:5
+#, fuzzy
+msgid "Allowing a _mailing list to redirect a private reply to the list"
+msgstr ""
+"Preguntar cando unha rolda de correo redirixa as respostas privadas de novo "
+"á rolda"
+
+#: ../mail/mail-config.ui.h:6
 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:9
+#: ../mail/mail-config.ui.h:7
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Enviar sempre _copia de carbón (Cc) a:"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:8
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Enviar sempre copia de carbón _oculta (Cco) a:"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:9
 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:12
+#: ../mail/mail-config.ui.h:10
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Cifrar sempre para un _mesmo ao enviar correo cifrado"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:11
 msgid "Always request rea_d receipt"
 msgstr "Requirir sempre confirmación de lec_tura"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:12
 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
+#: ../mail/mail-config.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1023
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:15
 msgid "Automatically insert _emoticon images"
 msgstr "Inserir imaxes de _emoticonas automaticamente"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:16
 msgid "C_haracter set:"
 msgstr "Conxunto de ca_racteres:"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:17
 msgid "Ch_eck for Supported Types"
 msgstr "_Verificar os tipos compatíbeis"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:18
 msgid "Check cu_stom headers for junk"
 msgstr ""
 "Verificar as cabeceiras personalizada_s para detectar correo non desexado"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:19
 msgid "Check incoming _messages for junk"
 msgstr "Verificar as _mensaxes entrantes para detectar correo non desexado"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:20
 msgid "Check spelling while I _type"
 msgstr "Verificar a orto_grafía mentres se escribe"
 
-#: ../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:24
+#: ../mail/mail-config.ui.h:21
 msgid "Cle_ar"
 msgstr "Limp_ar"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:22
 msgid "Clea_r"
 msgstr "Limpa_r"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:23
 msgid "Color for _misspelled words:"
 msgstr "Cor para as palabras escritas _incorrectamente:"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:24
 msgid "Composing Messages"
 msgstr "Escribir unha mensaxe"
 
-#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:25
+#: ../modules/plugin-manager/evolution-plugin-manager.c:157
 msgid "Configuration"
 msgstr "Configuración"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:26
 msgid "Confirm _when expunging a folder"
 msgstr "Confirmar a_o compactar un cartafol"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:27
+#, fuzzy
+msgid "Confirmations"
+msgstr "Configuración"
+
+#: ../mail/mail-config.ui.h:28
+#: ../modules/addressbook/autocompletion-config.c:155
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
+msgid "Date/Time Format"
+msgstr "Formato de data/hora"
+
+#: ../mail/mail-config.ui.h:30
 msgid "Default Behavior"
 msgstr "Prioridade predefinida:"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:31
 msgid "Default character e_ncoding:"
 msgstr "Codificació_n de caracteres predefinida:"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:32
 msgid "Delete Mail"
 msgstr "Eliminar"
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:33
 msgid "Delete junk messages on e_xit"
 msgstr "Eliminar os correos non desexados ao saí_r"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:35
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Asinar dixitalmente as mensaxes saínt_es (por omisión)"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:36
 msgid "Displayed Message Headers"
 msgstr "Cabeceiras mostradas do mensaxe"
 
-#: ../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:41
+#: ../mail/mail-config.ui.h:37
 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:42
+#: ../mail/mail-config.ui.h:38
 msgid "Do not quote"
 msgstr "Non eliminar"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:39
 msgid "Drafts _Folder:"
 msgstr "Carta_fol de borradores:"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:40
 msgid "Email _Address:"
 msgstr "_Enderezo de correo:"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:41
 msgid "Empty trash folders on e_xit"
 msgstr "Baleirar os cartafoles de lixo ao _saír"
 
-#: ../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:47
-msgid "Enable Sea_rch Folders"
-msgstr "Activar cartafoles de _busca"
-
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:43
 msgid "Encry_ption certificate:"
 msgstr "Certificado de ci_frado:"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:44
 msgid "Encrypt out_going messages (by default)"
 msgstr "Cifrar as mensaxes saín_tes (por omisión)"
 
-#: ../mail/mail-config.ui.h:51
-msgid "Fi_xed-width:"
-msgstr "Largura fi_xa:"
+#: ../mail/mail-config.ui.h:45
+msgid "F_all back to threading messages by subject"
+msgstr "Volver a relacionar as mensaxes polo _asunto"
 
-#: ../mail/mail-config.ui.h:52
-msgid "Fix_ed width Font:"
+#: ../mail/mail-config.ui.h:46
+#, fuzzy
+msgid "Fix_ed Width Font:"
 msgstr "Tipo de letra de largura f_ixa:"
 
-#: ../mail/mail-config.ui.h:53
-msgid "Font Properties"
-msgstr "Propiedades do tipo de letra"
-
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:47
 msgid "Format messages in _HTML"
 msgstr "Formato das mensaxes en _HTML"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:48
 msgid "Full Nam_e:"
 msgstr "Nom_e completo:"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:50
 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
+#: ../mail/mail-config.ui.h:51
 msgid "HTML Messages"
 msgstr "Mensaxes HTML"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:52
 msgid "H_TTP Proxy:"
 msgstr "Proxy H_TTP:"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:53
 msgid "Headers"
 msgstr "Cabeceiras"
 
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:54
 msgid "Highlight _quotations with"
 msgstr "Realzar as _citas con"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:55
 msgid "Ignore Reply-To: for mailing lists"
 msgstr "Ignorar «Responder a:» para as roldas de correo"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:56
 msgid "Inline"
 msgstr "En liña"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:57
 msgid "Inline (Outlook style)"
 msgstr "En liña (estilo Outlook)"
 
-#: ../mail/mail-config.ui.h:67
-msgid "KB"
-msgstr "KB"
-
-#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:59 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:60
 msgid "Languages Table"
 msgstr "Táboa de idiomas"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:61
 msgid "Loading Images"
 msgstr "_Cargar imaxes"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:62
 msgid "Mail Headers Table"
 msgstr "Táboa de cabeceiras de correo"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:63
 msgid "Mailbox location"
 msgstr "Localización da caixa de correo"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:64
 msgid "Message Display"
 msgstr "Mensaxes"
 
-#: ../mail/mail-config.ui.h:74
-msgid "Message Fonts"
-msgstr "A mensaxe contén"
-
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:65
 msgid "Message Receipts"
 msgstr "Retirada de mensaxe"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:66
 msgid "No _Proxy for:"
 msgstr "Sen pro_xy para:"
 
-#: ../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:79
+#: ../mail/mail-config.ui.h:68
 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:80
+#: ../mail/mail-config.ui.h:69
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "Datos persoais"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:71
 msgid "Or_ganization:"
 msgstr "Organi_zación:"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:72
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da _Chave PGP/GPG:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:73
 msgid "Pass_word:"
 msgstr "Con_trasinal:"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:74
+#: ../modules/calendar/e-calendar-preferences.ui.h:23
+msgid "Pick a color"
+msgstr "Seleccionar unha cor"
+
+#: ../mail/mail-config.ui.h:75
 msgid "Port:"
 msgstr "Porto:"
 
-#: ../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:88
+#: ../mail/mail-config.ui.h:76
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "<span weight=\"bold\">Privacidade bastante boa (PGP/GPG)</span>"
 
-#: ../mail/mail-config.ui.h:90
-msgid "Printed Fonts"
-msgstr "Imprimir notas"
-
-#: ../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
+#: ../mail/mail-config.ui.h:78
 msgid "Proxy Settings"
 msgstr "Configuración de correo non desexado"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:79
 msgid "Quoted"
 msgstr "_Citada"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:80
 msgid "Re_member password"
 msgstr "Le_mbrar contrasinal"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:81
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:82
 msgid "Remember _password"
 msgstr "Lembrar _contrasinal"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:83
+#, fuzzy
+msgid "Replies and Forwards"
+msgstr "Respostas e pais"
+
+#: ../mail/mail-config.ui.h:84
 msgid "Required Information"
 msgstr "Información do servidor"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:85
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:86
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:87
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:88
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:90
 msgid "SSL is not supported in this build of Evolution"
 msgstr "SSL non é compatíbel con esta versión do Evolution"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:91
 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:108
+#: ../mail/mail-config.ui.h:92
 msgid "S_elect..."
 msgstr "S_eleccionar..."
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:93
 msgid "S_end message receipts:"
 msgstr "En_viar confirmacións de mensaxes:"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:94
 msgid "S_tandard Font:"
 msgstr "Tipo de letra es_tándar:"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:95
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME seguro (S/MIME)"
 
-#: ../mail/mail-config.ui.h:113
-msgid "Select Drafts Folder"
-msgstr "Seleccionar cartafol"
-
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:97
 msgid "Select HTML fixed width font"
 msgstr "Seleccione o tipo de letra de largura fixa para HTML"
 
-#: ../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:116
+#: ../mail/mail-config.ui.h:98
 msgid "Select HTML variable width font"
 msgstr "Seleccione o tipo de letra de largura variábel en HTML"
 
-#: ../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:118
-msgid "Select Junk Folder"
-msgstr "Seleccione o cartafol de correo non desexado"
+#: ../mail/mail-config.ui.h:99
+msgid "Sender Photograph"
+msgstr "<b>Fotografía do remitente</b>"
 
-#: ../mail/mail-config.ui.h:119
-msgid "Select Sent Folder"
-msgstr "Seleccionar cartafol"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:101
+#, fuzzy
+msgid "Sending a _private reply to a mailing list message"
+msgstr "Preguntar ao enviar respostas privadas a mensaxes da _rolda de correo"
 
-#: ../mail/mail-config.ui.h:120
-msgid "Select Trash Folder"
-msgstr "Seleccionar o cartafol de Lixo"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:103
+#, fuzzy
+msgid "Sending a message with an _empty subject line"
+msgstr "_Preguntar cando se envíen mensaxes cun asunto baleiro"
 
-#: ../mail/mail-config.ui.h:121
-msgid "Sender Photograph"
-msgstr "<b>Fotografía do remitente</b>"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:105
+#, fuzzy
+msgid "Sending a message with only _Bcc recipients defined"
+msgstr "Preg_untar cando se envíen mensaxes só con destinatarios Cco definidos"
 
-#: ../mail/mail-config.ui.h:122
-msgid "Sending Mail"
-msgstr "Enviando correo"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:107
+#, fuzzy
+msgid "Sending a reply to a large _number of recipients"
+msgstr "Desexa enviar a resposta a todos os destinatarios?"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:108
 msgid "Sent _Messages Folder:"
 msgstr "Cartafol de _mensaxes enviadas:"
 
-#: ../mail/mail-config.ui.h:124
-msgid "Sent and Draft Messages"
-msgstr "Mensaxes enviadas"
-
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:109
 msgid "Ser_ver requires authentication"
 msgstr "O ser_vidor require autenticación"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:110
 msgid "Server Configuration"
 msgstr "Información do servidor"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:111
 msgid "Server _Type:"
 msgstr "_Tipo de servidor:"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:112
 msgid "Si_gning algorithm:"
 msgstr "Algoritmo de si_natura:"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:113
 msgid "Sig_natures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:114
 msgid "Sig_ning certificate:"
 msgstr "Certificado de si_natura:"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:115
 msgid "Signat_ure:"
 msgstr "Sinat_ura:"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:116
 msgid "Signatures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:117
 msgid "Signing _algorithm:"
 msgstr "_Algoritmo de sinatura:"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:118
+#, fuzzy
+msgid "Special Folders"
+msgstr "Cartafoles locais"
+
+#: ../mail/mail-config.ui.h:119
 msgid "Spell Checking"
 msgstr "Verificación ortográfica"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:120
 msgid "Start _typing at the bottom on replying"
 msgstr "Comezar a escri_bir ao final da resposta"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:122
 msgid "T_ype:"
 msgstr "T_ipo:"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:123
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12859,7 +11728,7 @@ msgstr ""
 "Esta lista de idiomas reflicte unicamente os idiomas para os cales hai "
 "instalado un dicionario."
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:124
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12868,12 +11737,13 @@ 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."
 
-#. 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:127
+msgid ""
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
+msgstr ""
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:128
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12881,166 +11751,144 @@ msgstr ""
 "Teclee o nome polo que quere identificar a esta conta.\n"
 "Por exemplo: \"Traballo\" ou \"Persoal\""
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:130
 msgid "Us_ername:"
 msgstr "Nome de _usuario:"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:131
 msgid "Use Authe_ntication"
 msgstr "Usar aute_nticación"
 
-#: ../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:"
+#: ../mail/mail-config.ui.h:132
+msgid "User _Name:"
 msgstr "_Nome de usuario:"
 
-#: ../mail/mail-config.ui.h:149
-msgid "V_ariable-width:"
-msgstr "Largura v_ariábel:"
-
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:133
 msgid "_Add Signature"
 msgstr "_Engadir sinatura"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:134
 msgid "_Always load images from the Internet"
 msgstr "Cargar _sempre as imaxes desde Internet"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:135
 msgid "_Authentication Type"
 msgstr "Tipo de _autenticación"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:136
 msgid "_Default junk plugin:"
 msgstr "engadido por _omisión de correo non desexado:"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:137
 msgid "_Direct connection to the Internet"
 msgstr "Conexión _directa a Internet"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:138
 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:156
+#: ../mail/mail-config.ui.h:139
 msgid "_Forward style:"
 msgstr "Estilo de _reenvío:"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:140
 msgid "_Junk Folder:"
 msgstr "Cartafol de correo non _desexado:"
 
-#: ../mail/mail-config.ui.h:158
-msgid "_Keep Signature above the original message on replying"
+#: ../mail/mail-config.ui.h:141
+#, fuzzy
+msgid "_Keep signature above the original message on replying"
 msgstr "_Manter a sinatura sobre a mensaxe orixinal ao responder"
 
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:142
 msgid "_Languages"
 msgstr "Idioma"
 
-#: ../mail/mail-config.ui.h:160
-msgid "_Load images in messages from contacts"
+#: ../mail/mail-config.ui.h:143
+#, fuzzy
+msgid "_Load images only in messages from contacts"
 msgstr "Ca_rgar as imaxes nas mensaxes dos contactos"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:144
 msgid "_Lookup in local address book only"
 msgstr "_Buscar só nas axendas de enderezos locais"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:145
 msgid "_Make this my default account"
 msgstr "_Facer desta a miña conta predefinida"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:146
 msgid "_Manual proxy configuration:"
 msgstr "Configuración _manual do proxy:"
 
-#: ../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:166
+#: ../mail/mail-config.ui.h:148
 msgid "_Never load images from the Internet"
 msgstr "_Nunca cargar as imaxes desde Internet"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:149
 msgid "_Path:"
 msgstr "_Camiño:"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:150
 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: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:170
+#: ../mail/mail-config.ui.h:151
 msgid "_Reply style:"
 msgstr "Estilo da _resposta:"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:152
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:153
 msgid "_Secure HTTP Proxy:"
 msgstr "Proxy HTTP _seguro:"
 
-#: ../mail/mail-config.ui.h:174 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:155 ../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:176
-msgid "_Show image animations"
-msgstr "_Mostrar animacións de imaxes"
+#: ../mail/mail-config.ui.h:157
+#, fuzzy
+msgid "_Show animated images"
+msgstr "Mostrar as imaxes animadas como animacións."
 
-#: ../mail/mail-config.ui.h:177
+#: ../mail/mail-config.ui.h:158
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Mostrar a fotografía do remitente na previsualización da mensaxe"
 
-#. 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:180
+#: ../mail/mail-config.ui.h:159
 msgid "_Trash Folder:"
 msgstr "Cartafol de correo _lixo:"
 
-#: ../mail/mail-config.ui.h:181
+#: ../mail/mail-config.ui.h:160
 msgid "_Use Secure Connection:"
 msgstr "_Usar unha conexión segura:"
 
-#: ../mail/mail-config.ui.h:182
+#: ../mail/mail-config.ui.h:161
 msgid "_Use system defaults"
 msgstr "_Usar as configuracións predefinidas do sistema"
 
-#: ../mail/mail-config.ui.h:183
+#: ../mail/mail-config.ui.h:162
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar os mesmos tipos de letra que noutros aplicativos"
 
-#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "am"
 
-#. 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:187 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:164 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "por"
 
-#: ../mail/mail-config.ui.h:188
+#: ../mail/mail-config.ui.h:165
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.ui.h:189
+#: ../mail/mail-config.ui.h:166
 msgid "description"
 msgstr "descrición"
 
@@ -13065,78 +11913,58 @@ 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"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:7
 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
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: ../mail/mail-dialogs.ui.h:11
-msgid "Folder Subscriptions"
-msgstr "Subscricións de cartafoles"
-
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Follow-Up"
 msgstr "Seguimento"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:10
 msgid "For Your Information"
 msgstr "Para a súa información"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Forward"
 msgstr "Reenviar"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:12
 msgid "License Agreement"
 msgstr "Acordo de licenza"
 
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:13
 msgid "No Response Necessary"
 msgstr "Non é necesaria unha resposta"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:17
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Review"
 msgstr "Revisar"
 
-#: ../mail/mail-dialogs.ui.h:22
-msgid "S_erver:"
-msgstr "S_ervidor:"
-
-#: ../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
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Search Folder Sources"
 msgstr "Orixe do cartafol de busca"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Security Information"
 msgstr "Información de seguranza"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Specific folders"
 msgstr "Cartafoles específicos"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:22
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13144,308 +11972,221 @@ 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:29
+#: ../mail/mail-dialogs.ui.h:24
 msgid "_Accept License"
 msgstr "_Aceptar a licenza"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Due By:"
 msgstr "_Vence o:"
 
-#: ../mail/mail-dialogs.ui.h:31
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Flag:"
 msgstr "_Marca:"
 
-#: ../mail/mail-dialogs.ui.h:32
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Tick this to accept the license agreement"
 msgstr "Ma_rque isto para aceptar o acordo de licenza"
 
-#: ../mail/mail-folder-cache.c:783
+#: ../mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Facendo ping a %s"
 
-#: ../mail/mail-ops.c:84
+#: ../mail/mail-ops.c:85
 msgid "Filtering Selected Messages"
 msgstr "Filtrando as mensaxes seleccionadas"
 
-#: ../mail/mail-ops.c:245
+#: ../mail/mail-ops.c:226
 msgid "Fetching Mail"
 msgstr "Obtendo as mensaxes"
 
-#: ../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:608 ../mail/mail-ops.c:635
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
-"Produciuse un fallo ao anexar a %s: %s\n"
-"No seu lugar anexaranse ao cartafol local «Enviados»."
-
-#: ../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"
-
-#: ../mail/mail-ops.c:774 ../mail/mail-ops.c:866
-msgid "Sending message"
-msgstr "Enviando a mensaxe"
-
-#: ../mail/mail-ops.c:782
+#: ../mail/mail-ops.c:785
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: ../mail/mail-ops.c:826
+#: ../mail/mail-ops.c:831
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Produciuse un fallo ao enviar %d de %d mensaxes"
 
-#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:783
+#: ../mail/mail-ops.c:833 ../mail/mail-send-recv.c:787
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:785
+#: ../mail/mail-ops.c:835 ../mail/mail-send-recv.c:789
 msgid "Complete."
 msgstr "Terminado."
 
-#: ../mail/mail-ops.c:938
-#, c-format
-msgid "Saving message to folder '%s'"
-msgstr "Gardando a mensaxe no cartafol «%s»"
-
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:941
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Movendo as mensaxes a «%s»"
 
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:941
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copiando as mensaxes a «%s»"
 
-#: ../mail/mail-ops.c:1127
+#: ../mail/mail-ops.c:1062
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Examinando os cartafoles en «%s»"
 
-#: ../mail/mail-ops.c:1235
+#: ../mail/mail-ops.c:1178
 msgid "Forwarded messages"
 msgstr "Mensaxes reenviadas"
 
-#: ../mail/mail-ops.c:1276
-#, c-format
-msgid "Opening folder '%s'"
-msgstr "Abrindo o cartafol «%s»"
-
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1295
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "Obtendo a información da cuota do cartafol «%s»"
 
-#: ../mail/mail-ops.c:1414
+#: ../mail/mail-ops.c:1370
 #, c-format
 msgid "Opening store '%s'"
 msgstr "Abrindo o almacén «%s»"
 
-#: ../mail/mail-ops.c:1485
+#: ../mail/mail-ops.c:1446
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Eliminando o cartafol «%s»"
 
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1585
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Almacenando o cartafol «%s»"
 
-#: ../mail/mail-ops.c:1672
+#: ../mail/mail-ops.c:1654
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Compactando e almacenando a conta «%s»"
 
-#: ../mail/mail-ops.c:1673
+#: ../mail/mail-ops.c:1655
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Almacenando a conta «%s»"
 
-#: ../mail/mail-ops.c:1727
+#: ../mail/mail-ops.c:1713
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Actualizando o cartafol «%s»"
 
-#: ../mail/mail-ops.c:1767
+#: ../mail/mail-ops.c:1877
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Compactando o cartafol «%s»"
 
-#: ../mail/mail-ops.c:1812
+#: ../mail/mail-ops.c:1949
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Baleirando o lixo en «%s»"
 
-#: ../mail/mail-ops.c:1813
+#: ../mail/mail-ops.c:1950
 msgid "Local Folders"
 msgstr "Cartafoles locais"
 
-#: ../mail/mail-ops.c:2016
+#: ../mail/mail-ops.c:2123
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Descargando %d mensaxe"
 msgstr[1] "Descargando %d mensaxes"
 
-#: ../mail/mail-ops.c:2105
+#: ../mail/mail-ops.c:2216
 #, 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:2192
+#: ../mail/mail-ops.c:2312
 #, c-format
 msgid "Error saving messages to: %s:\n"
 msgstr "Produciuse un erro ao gardar as mensaxes en: %s:\n"
 
-#: ../mail/mail-ops.c:2265
-msgid "Saving attachment"
-msgstr "Gardando anexo"
-
-#: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
-#, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"Non é posíbel crear o ficheiro de saída: %s:\n"
-" %s"
-
-#: ../mail/mail-ops.c:2310
-msgid "Could not write data: "
-msgstr "Non é posíbel escribir os datos: "
-
-#: ../mail/mail-ops.c:2454
-#, c-format
-msgid "Disconnecting from '%s'"
-msgstr "Desconectando de «%s»"
-
-#: ../mail/mail-ops.c:2454
-#, c-format
-msgid "Reconnecting to '%s'"
-msgstr "Conectando novamente con %s"
-
-#: ../mail/mail-ops.c:2550
+#: ../mail/mail-ops.c:2387
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparando a conta «%s» para o modo sen conexión"
 
-#: ../mail/mail-ops.c:2636
+#: ../mail/mail-ops.c:2478
 msgid "Checking Service"
 msgstr "Verificando o servizo"
 
-#: ../mail/mail-send-recv.c:188
+#: ../mail/mail-ops.c:2558
+#, fuzzy, c-format
+#| msgid "Disconnecting from '%s'"
+msgid "Disconnecting %s"
+msgstr "Desconectando de «%s»"
+
+#: ../mail/mail-ops.c:2615
+#, fuzzy, c-format
+msgid "Removing attachments"
+msgstr "Gardar anexo"
+
+#: ../mail/mail-ops.c:2662
+#, fuzzy, c-format
+msgid "File \"%s\" has been removed."
+msgstr "Elimináronse todas as contas."
+
+#: ../mail/mail-send-recv.c:190
 msgid "Canceling..."
 msgstr "Cancelando..."
 
-#: ../mail/mail-send-recv.c:440
+#: ../mail/mail-send-recv.c:434
 msgid "Send & Receive Mail"
 msgstr "Enviar e recibir correo"
 
-#: ../mail/mail-send-recv.c:457
+#: ../mail/mail-send-recv.c:451
 msgid "Cancel _All"
 msgstr "Cancelar _todo"
 
-#: ../mail/mail-send-recv.c:569
+#: ../mail/mail-send-recv.c:568
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:649
+#: ../mail/mail-send-recv.c:568 ../mail/mail-send-recv.c:652
 msgid "Waiting..."
 msgstr "Agardando..."
 
-#: ../mail/mail-send-recv.c:896
+#: ../mail/mail-send-recv.c:902
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprobando o correo novo"
 
-#: ../mail/mail-session.c:225
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Introduza a frase de paso para %s"
-
-#: ../mail/mail-session.c:227
-msgid "Enter Passphrase"
-msgstr "Introduza a frase de paso"
-
-#: ../mail/mail-session.c:230
-#, c-format
-msgid "Enter Password for %s"
-msgstr "Introduza o contrasinal para %s"
-
-#: ../mail/mail-session.c:232
-msgid "Enter Password"
-msgstr "Introduza o contrasinal"
-
-#: ../mail/mail-session.c:277
-#, c-format
-msgid "User canceled operation."
-msgstr "O usuario cancelou a operación."
-
-#: ../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: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:128
+#: ../mail/mail-tools.c:69
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "Non foi posíbel crear o cartafol spool «%s»: %s"
 
-#: ../mail/mail-tools.c:161
+#: ../mail/mail-tools.c:102
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr ""
 "Tentando mover o correo desde unha orixe que non é unha caixa de correo «%s»"
 
-#: ../mail/mail-tools.c:273
+#: ../mail/mail-tools.c:214
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe reenviada - %s"
 
-#: ../mail/mail-tools.c:275
+#: ../mail/mail-tools.c:216
 msgid "Forwarded message"
 msgstr "Mensaxe reenviada"
 
-#: ../mail/mail-tools.c:318
-#, c-format
-msgid "Invalid folder: '%s'"
-msgstr "Cartafol non válido: «%s»"
-
-#: ../mail/mail-vfolder.c:85
+#: ../mail/mail-vfolder.c:86
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Configurando o cartafol de busca: %s"
 
-#: ../mail/mail-vfolder.c:224
+#: ../mail/mail-vfolder.c:235
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Actualizando os cartafoles de busca para '%s: %s'"
 
-#: ../mail/mail-vfolder.c:231
+#: ../mail/mail-vfolder.c:242
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Actualizando os cartafoles de busca para «%s»"
@@ -13455,7 +12196,7 @@ msgstr "Actualizando os cartafoles de busca para «%s»"
 #. * 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
+#: ../mail/mail-vfolder.c:709
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -13474,11 +12215,11 @@ msgstr[1] ""
 "«%s» foi actualizado debido a que se eliminou o cartafol\n"
 "«%s»."
 
-#: ../mail/mail-vfolder.c:1185
+#: ../mail/mail-vfolder.c:1271
 msgid "Edit Search Folder"
 msgstr "Editar cartafol de busca"
 
-#: ../mail/mail-vfolder.c:1290
+#: ../mail/mail-vfolder.c:1378
 msgid "New Search Folder"
 msgstr "Cartafol de busca novo"
 
@@ -13682,26 +12423,31 @@ msgstr ""
 "Maiús pode estar activada."
 
 #: ../mail/mail.error.xml.h:43
+#, fuzzy
+msgid "Close message window."
+msgstr "Pechar esta xanela"
+
+#: ../mail/mail.error.xml.h:44
 msgid "Could not save signature file."
 msgstr "Non foi posíbel gardar o ficheiro de sinatura."
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:45
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Quere eliminar as mensaxes no Cartafol de busca \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:47
 msgid "Do _Not Disable"
 msgstr "_Non desactivar"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Do _Not Send"
 msgstr "_Non enviar"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do _Not Synchronize"
 msgstr "_Non sincronizar"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -13709,46 +12455,58 @@ msgstr ""
 "Quere sincronizar localmente os cartafoles que están marcados para o uso sen "
 "conexión?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
 msgstr "Quere marcar todas as mensaxes como lidas?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:52
 msgid "Do you wish to save your changes?"
 msgstr "Quere gardar as modificacións?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:53
 msgid "Enter password."
 msgstr "Introduza o contrasinal."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:54
 msgid "Error loading filter definitions."
 msgstr "Produciuse un erro ao cargar as definicións dos filtros."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:55
 msgid "Error while performing operation."
 msgstr "Produciuse un erro ao efectuar a operación."
 
 #. 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
+#: ../mail/mail.error.xml.h:59
 msgid "Error while {0}."
 msgstr "Produciuse un erro ao {0}."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
+#, fuzzy
+#| msgid "Unsubscribing from folder \"%s\""
+msgid "Failed to unsubscribe from folder."
+msgstr "Eliminando a subscrición do cartafol «%s»"
+
+#: ../mail/mail.error.xml.h:61
 msgid "File exists but cannot overwrite it."
 msgstr "O ficheiro existe mais non é posíbel sobrescribilo."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:62
 msgid "File exists but is not a regular file."
 msgstr "O ficheiro existe mais non é un ficheiro normal."
 
-#: ../mail/mail.error.xml.h:61
+#. Translators: {0} is replaced with a folder name
+#: ../mail/mail.error.xml.h:64
+#, fuzzy
+msgid "Folder '{0}' doesn't contain any duplicate message."
+msgstr "O anexo non contén unha mensaxe de calendario válida"
+
+#: ../mail/mail.error.xml.h:65
 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:62
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -13756,16 +12514,16 @@ msgstr ""
 "Se elimina o cartafol todo o seu contido e o dos seus subcartafoles "
 "eliminarase permanentemente."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:67
 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:64
+#: ../mail/mail.error.xml.h:68
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Se procede, as contas proxy eliminaranse permanentemente."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:69
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13773,11 +12531,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:67
+#: ../mail/mail.error.xml.h:71
 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:68
+#: ../mail/mail.error.xml.h:72
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13785,23 +12543,23 @@ msgstr ""
 "Se sae, estas mensaxes non se enviarán até que o Evolution sexa iniciado de "
 "novo."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:73
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:74
 msgid "Invalid authentication"
 msgstr "Autenticación non válida"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:75
 msgid "Mail Deletion Failed"
 msgstr "Produciuse un fallo na eliminación de correo"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:76
 msgid "Mail filters automatically updated."
 msgstr "Filtros de correo actualizados automaticamente."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:77
 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 "
@@ -13813,27 +12571,36 @@ 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:74
+#: ../mail/mail.error.xml.h:78
 msgid "Missing folder."
 msgstr "Falta o cartafol."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:80
+msgid "N_ever"
+msgstr "N_unca"
+
+#: ../mail/mail.error.xml.h:81
+#, fuzzy
+msgid "No duplicate messages found."
+msgstr "Non foi posíbel crear a mensaxe."
+
+#: ../mail/mail.error.xml.h:82
 msgid "No sources selected."
 msgstr "Non se seleccionou ningunha orixe."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:83
 msgid "Opening too many messages at once may take a long time."
 msgstr "Abrir demasiadas mensaxes ao mesmo tempo pode levar moito tempo."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:84
 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:79
+#: ../mail/mail.error.xml.h:85
 msgid "Please enable the account or send using another account."
 msgstr "Active a conta ou envíe usando outra conta."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:86
 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."
@@ -13841,7 +12608,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:81
+#: ../mail/mail.error.xml.h:87
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13851,63 +12618,67 @@ msgstr ""
 "HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:89
 msgid "Please provide an unique name to identify this signature."
 msgstr "Introduza un nome único para identificar esta sinatura."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:90
 msgid "Please wait."
 msgstr "Agarde."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:91
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Produciuse un problema ao migrar o cartafol de correo antigo \"{0}\"."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:92
 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:87
+#: ../mail/mail.error.xml.h:93
 msgid "Read receipt requested."
 msgstr "Solicitouse unha confirmación de lectura."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:94
 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:89
+#: ../mail/mail.error.xml.h:95
 msgid "Really delete folder \"{0}\"?"
 msgstr "Confirma o borrado do cartafol \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:96
+msgid "Remove duplicate messages?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:97
 msgid "Reply _Privately"
 msgstr "Responder en pri_vado"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:100
 msgid "Search Folders automatically updated."
 msgstr "Os cartafoles de busca actualizáronse automaticamente."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:101
 msgid "Send private reply?"
 msgstr "Enviar a resposta privada?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:102
 msgid "Send reply to all recipients?"
 msgstr "Desexa enviar a resposta a todos os destinatarios?"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:103
 msgid "Signature Already Exists"
 msgstr "A sinatura xa existe"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:104
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Sincronizar os cartafoles localmente para o uso sen conexión?"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13915,7 +12686,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:99
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13932,7 +12703,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:102
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13941,7 +12712,7 @@ msgstr ""
 "electrónico correcto:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13950,11 +12721,11 @@ msgstr ""
 "electrónico correcto:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:114
 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:107
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13963,7 +12734,7 @@ msgstr ""
 "vaia ao editor de cartafoles de busca para engadilo explicitamente, se é "
 "necesario."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -13971,14 +12742,14 @@ msgstr ""
 "Esta mensaxe non pode ser enviada porque a conta que escolleu para enviala "
 "non está activada"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:118
 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:111
+#: ../mail/mail.error.xml.h:119
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13986,11 +12757,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:112
+#: ../mail/mail.error.xml.h:120
 msgid "This signature has been changed, but has not been saved."
 msgstr "Modificouse esta sinatura mais non foi gardada."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -13998,15 +12769,15 @@ msgstr ""
 "Isto marcará todas as mensaxes como lidas no cartafol seleccionado e nos "
 "seus subcartafoles."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:122
 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
+#: ../mail/mail.error.xml.h:123
 msgid "Unable to connect to the GroupWise server."
 msgstr "Non foi posíbel conectar co servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:124
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14014,19 +12785,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:117
+#: ../mail/mail.error.xml.h:125
 msgid "Unable to read license file."
 msgstr "Non é posíbel ler o ficheiro da licenza."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:126
 msgid "Use _Default"
 msgstr "Usar o pre_determinado"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:127
 msgid "Use default drafts folder?"
 msgstr "Quere usar o cartafol de borradores predefinidos?"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:128
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -14036,7 +12807,12 @@ msgstr ""
 "mensaxes reais dun dos seus cartafoles locais ou remotos.\n"
 "Está seguro de que quere facer isto?"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:130
+#, fuzzy
+msgid "Would you like to close the message window?"
+msgstr "Quere aceptala?"
+
+#: ../mail/mail.error.xml.h:131
 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 "
@@ -14046,7 +12822,7 @@ msgstr ""
 "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
+#: ../mail/mail.error.xml.h:132
 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 "
@@ -14056,7 +12832,7 @@ msgstr ""
 "correo, pero está respondendo de forma privada ao remitente, non á rolda. "
 "Ten certeza seguro que quere proceder?"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:133
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
@@ -14064,31 +12840,31 @@ 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
+#: ../mail/mail.error.xml.h:134
 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:126
+#: ../mail/mail.error.xml.h:135
 msgid "You have not filled in all of the required information."
 msgstr "Non encheu toda a información requirida."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:136
 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:128
+#: ../mail/mail.error.xml.h:137
 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:129
+#: ../mail/mail.error.xml.h:138
 msgid "You must name this Search Folder."
 msgstr "Debe dar un nome a este cartafol de busca."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:139
 msgid "You must specify a folder."
 msgstr "Debe especificar un cartafol."
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:140
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14098,125 +12874,142 @@ 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:133
+#: ../mail/mail.error.xml.h:142
 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:134
+#: ../mail/mail.error.xml.h:143
+#, fuzzy
+msgid "_Always"
+msgstr "Sempre"
+
+#: ../mail/mail.error.xml.h:144
 msgid "_Append"
 msgstr "_Engadir"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:145
 #: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:600
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:146
 msgid "_Discard changes"
 msgstr "_Rexeitar as modificacións"
 
-#: ../mail/mail.error.xml.h:137
-#: ../modules/mail/e-mail-shell-view-actions.c:887
+#: ../mail/mail.error.xml.h:147
+#: ../modules/mail/e-mail-shell-view-actions.c:1036
 msgid "_Empty Trash"
 msgstr "_Baleirar o lixo"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:148
 msgid "_Expunge"
 msgstr "_Compactar"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:149
+msgid "_No"
+msgstr "_Non"
+
+#: ../mail/mail.error.xml.h:150
 msgid "_Open Messages"
 msgstr "_Abrir mensaxes"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:153
 msgid "_Send Receipt"
 msgstr "_Enviar confirmación"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:154
 msgid "_Synchronize"
 msgstr "_Sincronizar"
 
-#: ../mail/message-list.c:1170
+#: ../mail/mail.error.xml.h:155
+msgid "_Yes"
+msgstr "_Si"
+
+#: ../mail/message-list.c:1213
 msgid "Unseen"
 msgstr "Non vista"
 
-#: ../mail/message-list.c:1171
+#: ../mail/message-list.c:1214
 msgid "Seen"
 msgstr "Vista"
 
-#: ../mail/message-list.c:1172
+#: ../mail/message-list.c:1215
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:1173
+#: ../mail/message-list.c:1216
 msgid "Forwarded"
 msgstr "Reenviada"
 
-#: ../mail/message-list.c:1174
+#: ../mail/message-list.c:1217
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensaxes non vistas"
 
-#: ../mail/message-list.c:1175
+#: ../mail/message-list.c:1218
 msgid "Multiple Messages"
 msgstr "Múltiples mensaxes"
 
-#: ../mail/message-list.c:1179
+#: ../mail/message-list.c:1222
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#: ../mail/message-list.c:1180
+#: ../mail/message-list.c:1223
 msgid "Lower"
 msgstr "Inferior"
 
-#: ../mail/message-list.c:1184
+#: ../mail/message-list.c:1227
 msgid "Higher"
 msgstr "Superior"
 
-#: ../mail/message-list.c:1185
+#: ../mail/message-list.c:1228
 msgid "Highest"
 msgstr "A máis alta"
 
-#: ../mail/message-list.c:1795 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1837 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1802 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1844 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Hoxe ás %l:%M %p"
 
-#: ../mail/message-list.c:1811
+#: ../mail/message-list.c:1853
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %l:%M %p"
 
 # (pofilter) variables: do not translate: %a, %l, %p
-#: ../mail/message-list.c:1823
+#: ../mail/message-list.c:1865
 msgid "%a %l:%M %p"
 msgstr "O %A ás %k:%M"
 
 # (pofilter) variables: do not translate: %b, %l, %p
-#: ../mail/message-list.c:1831
+#: ../mail/message-list.c:1873
 msgid "%b %d %l:%M %p"
 msgstr "O %d de %B ás %k:%M"
 
 # (pofilter) variables: do not translate: %b
-#: ../mail/message-list.c:1833
+#: ../mail/message-list.c:1875
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: ../mail/message-list.c:2598
+#: ../mail/message-list.c:2642
 msgid "Select all visible messages"
 msgstr "Seleccionar todas as mensaxes visíbeis"
 
+#: ../mail/message-list.c:2800 ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "Mensaxes"
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4412 ../mail/message-list.c:4820
+#: ../mail/message-list.c:4468 ../mail/message-list.c:4892
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
-#: ../mail/message-list.c:4643
+#: ../mail/message-list.c:4707
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14224,7 +13017,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:4645
+#: ../mail/message-list.c:4709
 msgid "There are no messages in this folder."
 msgstr "Non hai mensaxes neste cartafol."
 
@@ -14262,27 +13055,27 @@ msgid "Subject - Trimmed"
 msgstr "Asunto - Recortado"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
 msgid "Body contains"
 msgstr "O corpo contén"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1452
 msgid "Message contains"
 msgstr "A mensaxe contén"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
+#: ../modules/mail/e-mail-shell-view-actions.c:1459
 msgid "Recipients contain"
 msgstr "Os destinatarios conteñen"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1466
 msgid "Sender contains"
 msgstr "O remitente contén"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1473
 msgid "Subject contains"
 msgstr "O asunto contén"
 
@@ -14290,7 +13083,7 @@ msgstr "O asunto contén"
 msgid "Subject or Addresses contains"
 msgstr "O asunto ou os enderezos conteñen"
 
-#: ../modules/addressbook/addressbook-config.c:206
+#: ../modules/addressbook/addressbook-config.c:209
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -14298,7 +13091,7 @@ msgstr ""
 "Seleccionar esta opción significa que o Evolution só conectará co seu "
 "servidor LDAP se o seu servidor LDAP é compatíbel con SSL."
 
-#: ../modules/addressbook/addressbook-config.c:208
+#: ../modules/addressbook/addressbook-config.c:211
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -14306,7 +13099,7 @@ msgstr ""
 "Seleccionar esta opción significa que o Evolution só conectará co seu "
 "servidor LDAP se o seu servidor LDAP é compatíbel TLS."
 
-#: ../modules/addressbook/addressbook-config.c:210
+#: ../modules/addressbook/addressbook-config.c:213
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -14316,17 +13109,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:602
+#: ../modules/addressbook/addressbook-config.c:612
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "U_sar no calendario Cumpleanos e aniversarios"
 
-#: ../modules/addressbook/addressbook-config.c:638
+#: ../modules/addressbook/addressbook-config.c:648
 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:746
+#: ../modules/addressbook/addressbook-config.c:756
 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 "
@@ -14336,7 +13129,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:820
+#: ../modules/addressbook/addressbook-config.c:830
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -14346,7 +13139,7 @@ msgstr ""
 "definir isto como \"Enderezo de correo\" require o acceso anónimo ao "
 "servidor LDAP."
 
-#: ../modules/addressbook/addressbook-config.c:895
+#: ../modules/addressbook/addressbook-config.c:905
 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 "
@@ -14358,29 +13151,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:1011
+#: ../modules/addressbook/addressbook-config.c:1021
 msgid "Server Information"
 msgstr "Información do servidor"
 
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../modules/addressbook/addressbook-config.c:1026
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Detalles"
 
-#: ../modules/addressbook/addressbook-config.c:1017
+#: ../modules/addressbook/addressbook-config.c:1027
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "Buscando"
 
-#: ../modules/addressbook/addressbook-config.c:1019
+#: ../modules/addressbook/addressbook-config.c:1029
 msgid "Downloading"
 msgstr "Descargando"
 
-#: ../modules/addressbook/addressbook-config.c:1225
+#: ../modules/addressbook/addressbook-config.c:1235
 msgid "Address Book Properties"
 msgstr "Propiedades da axenda de enderezos"
 
-#: ../modules/addressbook/addressbook-config.c:1227
+#: ../modules/addressbook/addressbook-config.c:1237
 msgid "New Address Book"
 msgstr "Nova axenda de enderezos"
 
@@ -14421,14 +13214,26 @@ msgstr ""
 "verticalmente."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+#, fuzzy
+#| msgid "evolution address book"
+msgid "Primary address book"
+msgstr "axenda de enderezos do Evolution"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid "Show autocompleted name with an address"
 msgstr "Mostrar o nome completado automaticamente cun enderezo"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
 msgid "Show preview pane"
 msgstr "Mostrar o panel de previsualización"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+msgid ""
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. \"0\" (Classic View) places the preview pane below the "
@@ -14437,11 +13242,11 @@ msgid ""
 msgstr ""
 "O estilo de disposición determina onde dispoñer o panel de previsualización "
 "en relación coa lista de contactos. \"0\" (Visualización clásica) mostra o "
-"panel de previsualización debaixo da lista de contactos. \"1"
-"\" (Visualización vertical) mostra o panel de previsualización ao lado da "
+"panel de previsualización debaixo da lista de contactos. "
+"\"1\" (Visualización vertical) mostra o panel de previsualización ao lado da "
 "lista de contactos."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -14449,17 +13254,17 @@ msgstr ""
 "O número de caracteres que deben teclearse antes de que o Evolution tente "
 "completar automaticamente."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 "O URI para o cartafol usado por última vez no diálogo de selección de nomes"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "URI for the folder last used in the select names dialog."
 msgstr ""
 "O URI para o cartafol usado por última vez no diálogo de selección de nomes."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
@@ -14467,21 +13272,21 @@ msgstr ""
 "Se hai que forzar que se mostre o enderezo de correo co nome do contacto "
 "completado automaticamente na entrada."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid "Whether to show the preview pane."
 msgstr "Indica se se mostra o panel de previsualización."
 
 #. 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
+#: ../modules/addressbook/autocompletion-config.c:161
+#: ../modules/mail/em-mailer-prefs.c:1112
 msgid "_Table column:"
 msgstr "Columna da táboa:"
 
-#: ../modules/addressbook/autocompletion-config.c:165
+#: ../modules/addressbook/autocompletion-config.c:164
 msgid "Autocompletion"
 msgstr "Completado automático"
 
-#: ../modules/addressbook/autocompletion-config.c:168
+#: ../modules/addressbook/autocompletion-config.c:167
 msgid "Always _show address of the autocompleted contact"
 msgstr "Mo_strar sempre o enderezo do contacto completado automaticamente"
 
@@ -14524,8 +13329,8 @@ msgstr "Crear unha axenda de enderezos nova"
 #. Create the contacts group
 #: ../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
+#: ../modules/calendar/e-cal-shell-backend.c:109
+#: ../modules/calendar/e-cal-shell-migrate.c:58
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -14576,10 +13381,10 @@ msgid "Show properties of the selected address book"
 msgstr "Modificar as propiedades do cartafol seleccionado"
 
 #: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
+#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/mail/e-mail-shell-view-actions.c:1120
 msgid "_Rename..."
 msgstr "_Renomear..."
 
@@ -14660,22 +13465,22 @@ msgid "Send a message to the selected contacts"
 msgstr "Enviar unha mensaxe aos contactos seleccionados"
 
 #: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1501
+#: ../modules/calendar/e-task-shell-view-actions.c:808
 msgid "_Actions"
 msgstr "_Accións"
 
 #: ../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
+#: ../modules/calendar/e-memo-shell-view-actions.c:663
+#: ../modules/calendar/e-task-shell-view-actions.c:815
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
 msgid "_Preview"
 msgstr "_Previsualización"
 
 #: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1518
+#: ../modules/calendar/e-memo-shell-view-actions.c:676
+#: ../modules/calendar/e-task-shell-view-actions.c:828
 msgid "_Delete"
 msgstr "E_liminar"
 
@@ -14698,9 +13503,9 @@ msgid "Show contact preview window"
 msgstr "Mostrar a xanela de previsualización de contactos"
 
 #: ../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
+#: ../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:1355
 msgid "_Classic View"
 msgstr "Visualización _clásica"
 
@@ -14709,9 +13514,9 @@ 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: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
+#: ../modules/calendar/e-memo-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:904
+#: ../modules/mail/e-mail-shell-view-actions.c:1362
 msgid "_Vertical View"
 msgstr "Visualización _vertical"
 
@@ -14720,25 +13525,25 @@ 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: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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1661
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:921
 msgid "Any Category"
 msgstr "Calquera categoría"
 
 #: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1675
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:956
 msgid "Unmatched"
 msgstr "Sen equivalencia"
 
 #: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1685
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../modules/mail/e-mail-shell-view-actions.c:1438
+#: ../shell/e-shell-content.c:610
 msgid "Advanced Search"
 msgstr "Busca avanzada"
 
@@ -14899,6 +13704,849 @@ msgstr "_Usar unha conexión segura:"
 msgid "cards"
 msgstr "tarxetas"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
+#, no-c-format
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr ""
+"%u e %d substituiranse polo usuario e o dominio do enderezo de correo "
+"electrónico."
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
+msgid "(Shown in a Day View)"
+msgstr "(Mostrar nunha visualización diaria)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
+msgid "05 minutes"
+msgstr "05 minutos"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
+msgid "10 minutes"
+msgstr "10 minutos"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
+msgid "15 minutes"
+msgstr "15 minutos"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
+msgid "30 minutes"
+msgstr "30 minutos"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:8
+msgid "60 minutes"
+msgstr "60 minutos"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
+msgid "Alerts"
+msgstr "Alertas"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
+msgid "Day _ends:"
+msgstr "A xornada _finaliza ás:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
+msgid "Days"
+msgstr "Días"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
+msgid "Default Free/Busy Server"
+msgstr "Servidor predefinido de dispoñibilidade"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
+msgid "Display"
+msgstr "Mostrar"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
+msgid "Display alarms in _notification area only"
+msgstr "Mostrar as alarmas só na área de _notificación"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
+msgid "Hours"
+msgstr "Horas"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
+msgid "Minutes"
+msgstr "Minutos"
+
+#. Sunday
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+msgid "S_un"
+msgstr "_Dom"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
+msgid "Sc_roll Month View by a week"
+msgstr "Desp_razar a visualización mensual unha semana"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Se_cond zone:"
+msgstr "Fuso se_cundario:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
+msgid "Select the calendars for alarm notification"
+msgstr "Seleccionar os calendarios para a notificación de alarmas"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
+msgid "Sh_ow a reminder"
+msgstr "M_ostrar un aviso"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
+msgid "Show a _reminder"
+msgstr "Most_rar un aviso"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
+msgid "Show r_ecurring events in italic in bottom left calendar"
+msgstr ""
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:35
+msgid "Show week _numbers"
+msgstr "Mostrar os _números das semanas"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
+msgid "T_asks due today:"
+msgstr "T_arefas que vencen hoxe:"
+
+#. Thursday
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
+msgid "T_hu"
+msgstr "_Xov"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
+msgid "Template:"
+msgstr "Modelo:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../widgets/misc/e-dateedit.c:617
+msgid "Time"
+msgstr "Time"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
+msgid "Time format:"
+msgstr "Formato horario:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+msgid "Use s_ystem time zone"
+msgstr "Empregar o fuso horario do s_istema"
+
+#. A weekday like "Monday" follows
+#: ../modules/calendar/e-calendar-preferences.ui.h:50
+msgid "Wee_k starts on:"
+msgstr "A _semana comeza en:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
+#: ../modules/calendar/e-cal-shell-view-actions.c:1644
+msgid "Work Week"
+msgstr "Semana laboral"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+msgid "Work days:"
+msgstr "Días laborábeis:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
+msgid "_12 hour (AM/PM)"
+msgstr "_12 horas (AM/PM)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "_24 hour"
+msgstr "_24 horas"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "_Ask for confirmation when deleting items"
+msgstr "_Pedir confirmación ao eliminar elementos"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
+msgid "_Compress weekends in month view"
+msgstr "_Comprimir as fins de semana na visualización mensual"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
+msgid "_Day begins:"
+msgstr "A _xornada comeza ás:"
+
+#. Friday
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
+msgid "_Fri"
+msgstr "_Ven"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
+msgid "_Hide completed tasks after"
+msgstr "_Ocultar as tarefas terminadas despois de"
+
+#. Monday
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
+msgid "_Mon"
+msgstr "_Lun"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
+msgid "_Overdue tasks:"
+msgstr "Tarefas _atrasadas:"
+
+#. Saturday
+#: ../modules/calendar/e-calendar-preferences.ui.h:65
+msgid "_Sat"
+msgstr "_Sáb"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
+msgid "_Show appointment end times in week and month view"
+msgstr "_Mostrar horas finais das citas nas visualizacións semanal e mensual"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
+msgid "_Time divisions:"
+msgstr "Di_visións horarias:"
+
+#. Tuesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:69
+msgid "_Tue"
+msgstr "_Mar"
+
+#. Wednesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:71
+msgid "_Wed"
+msgstr "Mé_r"
+
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
+msgid "before every anniversary/birthday"
+msgstr "antes de cada aniversario"
+
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
+msgid "before every appointment"
+msgstr "antes de cada cita"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
+msgid "Alarm programs"
+msgstr "Programas de alarma"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+msgid "Ask for confirmation when deleting items"
+msgstr "Pedir confirmación ao eliminar elementos"
+
+#: ../modules/calendar/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»."
+
+#: ../modules/calendar/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»."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+#, fuzzy
+#| msgid "Birthdays & Anniversaries"
+msgid "Birthday and anniversary reminder"
+msgstr "Datas de nacementos e aniversarios"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+#, fuzzy
+#| msgid "Birthdays & Anniversaries"
+msgid "Birthday and anniversary reminder units"
+msgstr "Datas de nacementos e aniversarios"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+#, fuzzy
+#| msgid "Birthdays & Anniversaries"
+msgid "Birthday and anniversary reminder value"
+msgstr "Datas de nacementos e aniversarios"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
+msgid "Calendars to run alarms for"
+msgstr "Os calendarios nos que se activarán as alarmas"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr ""
+"Cor para debuxar a liña de Marcus Bains na barra de tempo (baleiro para a "
+"predefinida)."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+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."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+msgid "Compress weekends in month view"
+msgstr "Comprimir as fins de semana na visualización mensual"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+msgid "Confirm expunge"
+msgstr "Confirmar a compactación"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+msgid "Days on which the start and end of work hours should be indicated."
+msgstr "Días nos que debe indicarse o inicio e fin das horas de traballo."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+msgid "Default appointment reminder"
+msgstr "Aviso de cita predefinido"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+msgid "Default reminder units"
+msgstr "Unidades de aviso predefinidas"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+msgid "Default reminder value"
+msgstr "Valor de aviso predefinido"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
+msgid "Directory for saving alarm audio files"
+msgstr "Cartafol para gardar os ficheiros de son para alarmas"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+msgid "Free/busy server URLs"
+msgstr "Os URL do servidor de dispoñibilidade"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+msgid "Free/busy template URL"
+msgstr "URL do modelo de dispoñibilidade"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+msgid "Hide completed tasks"
+msgstr "Ocultar as tarefas terminadas"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+msgid "Hide task units"
+msgstr "Ocultar as unidades da tarefa"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+msgid "Hide task value"
+msgstr "Ocultar o valor da tarefa"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+msgid "Horizontal pane position"
+msgstr "Posición do panel horizontal"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+msgstr ""
+"Hora do fin da xornada laboral, en formato de vinte e catro horas, de 0 a 23."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr ""
+"Hora de comezo da xornada laboral, en formato de vinte e catro horas, de 0 a "
+"23."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+#, fuzzy
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr ""
+"Se é «true», móstrase o panel de previsualización das notas na xanela "
+"principal."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+#, fuzzy
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr ""
+"Se é «true», móstrase o panel de previsualización de tarasfas na xanela "
+"principal."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+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."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
+msgid "Last alarm time"
+msgstr "Hora da última alarma"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+msgid "List of recently used second time zones in a Day View."
+msgstr ""
+"Lista dos fusos horarios secundarios usados recentemente cunha visualización "
+"diaria."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+msgid "List of server URLs for free/busy publishing."
+msgstr "Lista dos URL do servidor para publicación de dispoñibilidade."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+msgid "Marcus Bains Line"
+msgstr "Liña de Marcus Bains"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+msgid "Marcus Bains Line Color - Day View"
+msgstr "Cor da liña de Marcus Bains - Visualización de día"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+msgid "Marcus Bains Line Color - Time bar"
+msgstr "Cor da liña de Marcus Bains - Barra de tempo"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr ""
+"O número máximo de fusos horarios usados recentemente para recordar nunha "
+"lista 'day_second_zones'."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+msgid "Maximum number of recently used timezones to remember."
+msgstr ""
+"O número máximo de fusos horarios usados recentemente que hai que recordar."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+msgid "Memo layout style"
+msgstr "Estilo da disposición das notas"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+msgid "Memo preview pane position (horizontal)"
+msgstr "Posición do panel de previsualización de notas (horizontal)"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+msgid "Memo preview pane position (vertical)"
+msgstr "Posición do panel de previsualización de notas (vertical)"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+msgid "Minute the workday ends on, 0 to 59."
+msgstr "Minuto de finalización da xornada laboral, de 0 a 59."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+msgid "Minute the workday starts on, 0 to 59."
+msgstr "Minuto de comezo da xornada laboral, de 0 a 59."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+msgid "Month view horizontal pane position"
+msgstr "Posición do panel horizontal da visualización mensual"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+msgid "Month view vertical pane position"
+msgstr "Posición do panel vertical na visualización mensual"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+#, fuzzy
+#| msgid "Number of units for determining a default reminder."
+msgid "Number of units for determining a birthday or anniversary reminder."
+msgstr "Número de unidades para determinar un aviso predefinido."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+msgid "Number of units for determining a default reminder."
+msgstr "Número de unidades para determinar un aviso predefinido."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+msgid "Number of units for determining when to hide tasks."
+msgstr "Número de unidades para determinar cando ocultar as tarefas."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+msgid "Overdue tasks color"
+msgstr "Cor para as tarefas pendentes"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+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 o navegador de datas do calendario e a "
+"lista de tarefas cando non está na visualización mensual, en píxeles."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+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."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr ""
+"Posición do panel de previsualización de notas cando está orientado "
+"verticalmente."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr ""
+"Posición do panel de previsualización de tarefas cando está orientado "
+"horizontalmente."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+msgid "Position of the task preview pane when oriented vertically."
+msgstr ""
+"Posición do panel de previsualización de tarefas cando está orientado "
+"verticalmente."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr ""
+"Posición do panel vertical entre as listas do calendario e o navegador de "
+"datas do calendario."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"Posición do panel vertical, entre a visualización, o navegador de datas do "
+"calendario e a lista de tarefas na visualización mensual, en píxeles."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+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, o navegador de datas do "
+"calendario e a lista de tarefas cando non está na visualización mensual, en "
+"píxeles."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+msgid "Primary calendar"
+msgstr "Calendario principal"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+msgid "Primary memo list"
+msgstr "Lista de notas principal"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+msgid "Primary task list"
+msgstr "Lista de tarefas principal"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
+msgid "Programs that are allowed to be run by alarms."
+msgstr "Programas que se poden executar polas alarmas."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+msgid "Recently used second time zones in a Day View"
+msgstr ""
+"Fusos horarios secundarios usados recentemente nunha visualización diaria"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+#, fuzzy
+#| msgid "Recurrence date is invalid"
+msgid "Recurrent Events in Italic"
+msgstr "A data da recorrencia non é correcta"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
+msgid "Save directory for alarm audio"
+msgstr "Cartafol onde gardar o son da alarma"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
+msgid "Scroll Month View by a week"
+msgstr "Desprazar a visualización mensual unha semana"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr "Mostrar o campo RSVP no editor de eventos/tarefas/reunións"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
+msgid "Show Role field in the event/task/meeting editor"
+msgstr "Mostrar o campo Rol no editor de eventos/tarefas/reunións"
+
+#: ../modules/calendar/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"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
+msgid "Show categories field in the event/meeting/task editor"
+msgstr "Mostrar o campo categorías no editor de eventos/reunións/tarefas"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
+msgid "Show days with recurrent events in italic font in bottom left calendar."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
+msgid "Show display alarms in notification tray"
+msgstr "Mostrar o visualizador da alarma nunha bandexa de notificación"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
+msgid "Show status field in the event/task/meeting editor"
+msgstr "Mostrar o campo de estado no editor de eventos/tarefas/reunións"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
+msgid "Show the memo preview pane"
+msgstr "Mostrar o panel de previsualización de notas"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
+msgid "Show the task preview pane"
+msgstr "Mostrar o panel de «Previsualización»"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
+msgid "Show timezone field in the event/meeting editor"
+msgstr "Mostrar o campo do fuso horario no editor de eventos/reunións"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
+msgid "Show type field in the event/task/meeting editor"
+msgstr "Mostrar o campo de tipo no editor de eventos/tarefas/reunións"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr ""
+"Mostrar os números das semanas na visualización diaria, semanal, de semana "
+"laboral e no navegador do calendario"
+
+#: ../modules/calendar/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á "
+"estabelecido. O valor é semellante ao usado na chave «timezone»."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
+msgid "Task layout style"
+msgstr "Estilo da disposición de tarefas"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
+msgid "Task preview pane position (horizontal)"
+msgstr "Posición do panel de previsualización de tarefas (horizontal)"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
+msgid "Task preview pane position (vertical)"
+msgstr "Posición do panel de previsualización de tarefas (vertical)"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
+msgid "Tasks due today color"
+msgstr "Cor para as tarefas que vencen hoxe"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
+msgid ""
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
+msgid ""
+"The UID of the selected (or \"primary\") memo list in the sidebar of the "
+"\"Memos\" view."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
+msgid ""
+"The UID of the selected (or \"primary\") task list in the sidebar of the "
+"\"Tasks\" view."
+msgstr ""
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
+#, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+"O modelo URL para usar como modo de recuperación de datos de "
+"dispoñibilidade: %u substitúese pola parte de usuario do enderezo de correo "
+"e %d substitúese polo dominio."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+"O fuso horario predefinido que se empregará nas datas e horas do calendario, "
+"como unha localización non traducida da base de datos de fusos horarios "
+"Olsen, como en «America/New York»."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
+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 notas. «0» (visualización clásica) mostra o panel "
+"de previsualización debaixo da lista de notas. «1» (visualización vertical) "
+"mostra o panel de previsualización ao lado da lista de notas."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
+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."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
+msgid "The second timezone for a Day View"
+msgstr "O fuso horario secundario para unha vista diaria"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+"Isto pode tomar tres valores diferentes: 0 para erros; 1 para avisos e 2 "
+"para as mensaxes de depuración."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
+msgid "Time divisions"
+msgstr "Divisións horarias"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
+msgid "Time the last alarm ran, in time_t."
+msgstr "A hora na que se executou a última alarma, en time_t."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
+msgid "Timezone"
+msgstr "Fuso horario"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
+msgid "Twenty four hour time format"
+msgstr "Formato de hora de vinte e catro horas"
+
+# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
+#, fuzzy
+#| msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\"."
+msgstr ""
+"Unidades para un aviso predefinido: \"minutes\", \"hours\" ou \"days\"."
+
+# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+"Unidades para un aviso predefinido: \"minutes\", \"hours\" ou \"days\"."
+
+# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+"Unidades para determinar cando ocultar as tarefas: \"minutes\", \"hours\" ou "
+"\"days\"."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
+msgid "Use system timezone"
+msgstr "Usar o fuso horario do sistema"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
+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."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
+msgid "Vertical pane position"
+msgstr "Posición vertical do panel"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
+msgid "Week start"
+msgstr "Comezo da semana"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
+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)."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
+msgid "Whether or not to use the notification tray for display alarms."
+msgstr ""
+"Indica se se debe usar a bandexa de notificación para mostrar as alarmas."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
+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."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr "Indica se se solicita confirmación ao expurgar citas ou tarefas."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr ""
+"Indica se se comprimen as fins de semana na visualización mensual. Isto pon "
+"o sábado e o domingo no mesmo espazo que un día laborábel."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
+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."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
+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."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
+msgid "Whether to hide completed tasks in the tasks view."
+msgstr ""
+"Indica se se ocultan as tarefas terminadas na visualización de tarefas."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr ""
+"Indica se se despraza a visualización mensual por semana e non por mes."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
+msgid "Whether to set a default reminder for appointments."
+msgstr "Indica se se estabelece un aviso predefinido para as citas."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
+#, fuzzy
+#| msgid "Whether to set a default reminder for appointments."
+msgid "Whether to set a reminder for birthdays and anniversaries."
+msgstr "Indica se se estabelece un aviso predefinido para as citas."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
+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"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
+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"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr ""
+"Indica se se mostra o campo de función no editor de eventos/tarefas/reunións"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
+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"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
+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."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
+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/reunións"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
+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/reunións"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr ""
+"Indica se se mostran os números de semana en varios lugares do calendario."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
+msgid "Work days"
+msgstr "Días laborábeis"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
+msgid "Workday end hour"
+msgstr "Hora de finalización da xornada laboral"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
+msgid "Workday end minute"
+msgstr "Minuto de finalización da xornada laboral"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
+msgid "Workday start hour"
+msgstr "Hora de comezo da xornada laboral"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
+msgid "Workday start minute"
+msgstr "Minuto de comezo da xornada laboral"
+
 #: ../modules/calendar/e-cal-attachment-handler.c:259
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
@@ -14921,93 +14569,91 @@ msgid "I_mport to Tasks"
 msgstr "_Importar ás tarefas"
 
 #. Create the Webcal source group
-#: ../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:94
-#: ../modules/calendar/e-task-shell-migrate.c:145
+#: ../modules/calendar/e-cal-shell-backend.c:111
+#: ../modules/calendar/e-cal-shell-migrate.c:191
+#: ../modules/calendar/e-memo-shell-backend.c:98
+#: ../modules/calendar/e-memo-shell-migrate.c:146
+#: ../modules/calendar/e-task-shell-backend.c:98
+#: ../modules/calendar/e-task-shell-migrate.c:155
 msgid "On The Web"
 msgstr "Na Web"
 
-#: ../modules/calendar/e-cal-shell-backend.c:108
-#: ../plugins/calendar-weather/calendar-weather.c:117
+#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../plugins/calendar-weather/calendar-weather.c:120
 msgid "Weather"
 msgstr "O tempo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:193
-#: ../modules/calendar/e-cal-shell-migrate.c:60
+#: ../modules/calendar/e-cal-shell-backend.c:200
+#: ../modules/calendar/e-cal-shell-migrate.c:61
 msgid "Birthdays & Anniversaries"
 msgstr "Datas de nacementos e aniversarios"
 
-#: ../modules/calendar/e-cal-shell-backend.c:406
+#: ../modules/calendar/e-cal-shell-backend.c:425
 msgctxt "New"
 msgid "_Appointment"
 msgstr "Cit_a"
 
-#: ../modules/calendar/e-cal-shell-backend.c:408
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-backend.c:427
+#: ../modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "Create a new appointment"
 msgstr "Crear unha cita nova"
 
-#: ../modules/calendar/e-cal-shell-backend.c:413
+#: ../modules/calendar/e-cal-shell-backend.c:432
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Ci_ta para todo o día"
 
-#: ../modules/calendar/e-cal-shell-backend.c:415
+#: ../modules/calendar/e-cal-shell-backend.c:434
 msgid "Create a new all-day appointment"
 msgstr "Crear nova cita nova para todo o día"
 
-#: ../modules/calendar/e-cal-shell-backend.c:420
+#: ../modules/calendar/e-cal-shell-backend.c:439
 msgctxt "New"
 msgid "M_eeting"
 msgstr "R_eunión"
 
-#: ../modules/calendar/e-cal-shell-backend.c:422
+#: ../modules/calendar/e-cal-shell-backend.c:441
 msgid "Create a new meeting request"
 msgstr "Crear unha solicitude de cita nova"
 
-#: ../modules/calendar/e-cal-shell-backend.c:430
+#: ../modules/calendar/e-cal-shell-backend.c:449
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
-#: ../modules/calendar/e-cal-shell-backend.c:432
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-backend.c:451
+#: ../modules/calendar/e-cal-shell-view-actions.c:1333
 msgid "Create a new calendar"
 msgstr "Crear un calendario novo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:717
-#: ../plugins/itip-formatter/itip-formatter.c:2669
+#: ../modules/calendar/e-cal-shell-backend.c:754
+#: ../plugins/itip-formatter/itip-formatter.c:2809
 msgid "Calendar and Tasks"
 msgstr "Calendario e tarefas"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-sidebar.c:170
+#, fuzzy, c-format
 msgid ""
-"Error on %s\n"
+"Error on %s: %s\n"
 "%s"
 msgstr ""
 "Erro en %s:\n"
 " %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:239
+#: ../modules/calendar/e-cal-shell-sidebar.c:238
 msgid "Loading calendars"
 msgstr "Cargando calendario"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:674
+#: ../modules/calendar/e-cal-shell-sidebar.c:662
 msgid "_New Calendar..."
 msgstr "Calendario _novo"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:691
+#: ../modules/calendar/e-cal-shell-sidebar.c:679
 msgid "Calendar Selector"
 msgstr "Selector de orixe do calendario"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1032
+#: ../modules/calendar/e-cal-shell-sidebar.c:1022
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Abrir calendario en %s"
@@ -15043,292 +14689,292 @@ 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:1126
+#: ../modules/calendar/e-cal-shell-view-actions.c:1131
 msgid "event"
 msgstr "Enviado"
 
-#: ../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:504
-#: ../modules/calendar/e-task-shell-view-actions.c:621
+#: ../modules/calendar/e-cal-shell-view-actions.c:1133
+#: ../modules/calendar/e-cal-shell-view-memopad.c:216
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:283
+#: ../modules/calendar/e-memo-shell-view-actions.c:510
+#: ../modules/calendar/e-task-shell-view-actions.c:627
 msgid "Save as iCalendar"
 msgstr "Seleccione un calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1284
-#: ../modules/calendar/e-memo-shell-view-actions.c:585
+#: ../modules/calendar/e-cal-shell-view-actions.c:1289
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1291
+#: ../modules/calendar/e-cal-shell-view-actions.c:1296
 msgid "D_elete Calendar"
 msgstr "_Eliminar o calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-cal-shell-view-actions.c:1298
 msgid "Delete the selected calendar"
 msgstr "Eliminar o calendario seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
 msgid "Go Back"
 msgstr "Atrás"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
 msgid "Go Forward"
 msgstr "Adiante"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Select today"
 msgstr "Seleccionar hoxe"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1319
+#: ../modules/calendar/e-cal-shell-view-actions.c:1324
 msgid "Select _Date"
 msgstr "Seleccionar _data"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "Select a specific date"
 msgstr "Seleccionar unha data específica"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1326
+#: ../modules/calendar/e-cal-shell-view-actions.c:1331
 msgid "_New Calendar"
 msgstr "Calendario _novo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1340
-#: ../modules/calendar/e-task-shell-view-actions.c:793
+#: ../modules/calendar/e-cal-shell-view-actions.c:1345
+#: ../modules/calendar/e-task-shell-view-actions.c:799
 msgid "Purg_e"
 msgstr "D_epurar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
 msgid "Purge old appointments and meetings"
 msgstr "Depurar as reunións e as citas antigas"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1352
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
+#: ../modules/calendar/e-task-shell-view-actions.c:743
 msgid "Re_fresh"
 msgstr "Ac_tualizar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1354
 msgid "Refresh the selected calendar"
 msgstr "Renomear o cartafol seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Rename the selected calendar"
 msgstr "Renomear o cartafol seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1361
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Show _Only This Calendar"
 msgstr "M_ostrar só este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1368
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar a un calendario..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1375
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "_Delegate Meeting..."
 msgstr "_Delegar cita..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1382
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
 msgid "_Delete Appointment"
 msgstr "_Eliminar esta cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Delete selected appointments"
 msgstr "Eliminar a cita seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1389
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "Delete This _Occurrence"
 msgstr "Eliminar esta _aparición"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Delete this occurrence"
 msgstr "Eliminar esta aparición"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../modules/calendar/e-cal-shell-view-actions.c:1401
 msgid "Delete All Occ_urrences"
 msgstr "Eliminar _todas as aparicións"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "Delete all occurrences"
 msgstr "Eliminar todas as aparicións"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 msgid "New All Day _Event..."
 msgstr "Novo _actividade de día completo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1410
 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: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:578
-#: ../modules/calendar/e-task-shell-view-actions.c:702
+#: ../modules/calendar/e-cal-shell-view-actions.c:1415
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-task-shell-view-actions.c:708
 msgid "_Forward as iCalendar..."
 msgstr "Remi_tir como iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../modules/calendar/e-cal-shell-view-actions.c:1422
 msgid "New _Meeting..."
 msgstr "_Reunión nova"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1424
 msgid "Create a new meeting"
 msgstr "Crear unha solicitude de cita nova"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1424
+#: ../modules/calendar/e-cal-shell-view-actions.c:1429
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver ao calendario..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1431
+#: ../modules/calendar/e-cal-shell-view-actions.c:1436
 msgid "New _Appointment..."
 msgstr "_Cita nova..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1438
+#: ../modules/calendar/e-cal-shell-view-actions.c:1443
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta aparición _movíbel"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1445
+#: ../modules/calendar/e-cal-shell-view-actions.c:1450
 msgid "_Open Appointment"
 msgstr "_Abrir cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1452
 msgid "View the current appointment"
 msgstr "Ver a cita actual"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/calendar/e-cal-shell-view-actions.c:1457
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1466
-#: ../modules/calendar/e-cal-shell-view-memopad.c:272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1471
+#: ../modules/calendar/e-cal-shell-view-memopad.c:278
 msgid "Save as iCalendar..."
 msgstr "Gardar como vCard..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1473
+#: ../modules/calendar/e-cal-shell-view-actions.c:1478
 msgid "_Schedule Meeting..."
 msgstr "_Programar cita..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1475
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
 msgid "Converts an appointment to a meeting"
 msgstr "Depurar as reunións e as citas antigas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1480
+#: ../modules/calendar/e-cal-shell-view-actions.c:1485
 msgid "Conv_ert to Appointment..."
 msgstr "_Cita nova..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../modules/calendar/e-cal-shell-view-actions.c:1487
 msgid "Converts a meeting to an appointment"
 msgstr "%s ao finalizar a cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+#: ../modules/calendar/e-cal-shell-view-actions.c:1492
 msgid "Quit"
 msgstr "Saír"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1611
+#: ../modules/calendar/e-cal-shell-view-actions.c:1616
 msgid "Day"
 msgstr "Día"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1613
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "Show one day"
 msgstr "Mostrar un día"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-cal-shell-view-actions.c:1623
 msgid "List"
 msgstr "Lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1620
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "Show as list"
 msgstr "Mostrar como unha lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-cal-shell-view-actions.c:1630
 msgid "Month"
 msgstr "Mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Show one month"
 msgstr "Mostrar un mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "Week"
 msgstr "Semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1634
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Show one week"
 msgstr "Mostrar unha semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1646
 msgid "Show one work week"
 msgstr "Mostrar unha semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1649
+#: ../modules/calendar/e-cal-shell-view-actions.c:1654
 msgid "Active Appointments"
 msgstr "Citas activas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1663
+#: ../modules/calendar/e-cal-shell-view-actions.c:1668
 msgid "Next 7 Days' Appointments"
 msgstr "Citas dos próximos sete días"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1699
+#: ../modules/calendar/e-memo-shell-view-actions.c:781
+#: ../modules/calendar/e-task-shell-view-actions.c:980
 msgid "Description contains"
 msgstr "A descrición contén"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1706
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:987
 msgid "Summary contains"
 msgstr "O resumo contén"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1713
+#: ../modules/calendar/e-cal-shell-view-actions.c:1718
 msgid "Print this calendar"
 msgstr "Imprimir este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../modules/calendar/e-cal-shell-view-actions.c:1725
 msgid "Preview the calendar to be printed"
 msgstr "Previsualiza o calendario que se vai imprimir"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1793
+#: ../modules/calendar/e-cal-shell-view-actions.c:1798
 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:208
-#: ../modules/calendar/e-memo-shell-view-actions.c:502
+#: ../modules/calendar/e-cal-shell-view-memopad.c:214
+#: ../modules/calendar/e-memo-shell-view-actions.c:508
 msgid "memo"
 msgstr "Nota"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:251
-#: ../modules/calendar/e-memo-shell-view-actions.c:634
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:640
 msgid "New _Memo"
 msgstr "Nota nova"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-backend.c:287
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Create a new memo"
 msgstr "Crear unha nota nova"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:258
-#: ../modules/calendar/e-memo-shell-view-actions.c:641
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
 msgid "_Open Memo"
 msgstr "_Abrir nota"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:260
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-cal-shell-view-memopad.c:266
+#: ../modules/calendar/e-memo-shell-view-actions.c:649
 msgid "View the selected memo"
 msgstr "Ver a nota seleccionada"
 
-#: ../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:648
-#: ../modules/calendar/e-task-shell-view-actions.c:786
+#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
+#: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "Open _Web Page"
 msgstr "Abrir páxina _web"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:284
-#: ../modules/calendar/e-memo-shell-view-actions.c:808
+#: ../modules/calendar/e-cal-shell-view-memopad.c:290
+#: ../modules/calendar/e-memo-shell-view-actions.c:814
 msgid "Print the selected memo"
 msgstr "Ver a nota seleccionada"
 
@@ -15336,101 +14982,123 @@ msgstr "Ver a nota seleccionada"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:619
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:281
+#: ../modules/calendar/e-task-shell-view-actions.c:625
 msgid "task"
 msgstr "Tarefa"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:681
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
+#: ../modules/calendar/e-task-shell-view-actions.c:687
 msgid "_Assign Task"
 msgstr "_Asignar Tarefa"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:758
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
+#: ../modules/calendar/e-task-shell-view-actions.c:764
 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:760
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
+#: ../modules/calendar/e-task-shell-view-actions.c:766
 msgid "Mark selected tasks as complete"
 msgstr "Marcar as tarefas seleccionadas como terminadas"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
 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:767
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
+#: ../modules/calendar/e-task-shell-view-actions.c:773
 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:772
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
+#: ../modules/calendar/e-task-shell-view-actions.c:778
 msgid "New _Task"
 msgstr "Nova _tarefa"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:280
-#: ../modules/calendar/e-task-shell-view-actions.c:774
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../modules/calendar/e-task-shell-backend.c:286
+#: ../modules/calendar/e-task-shell-view-actions.c:780
 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:779
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-task-shell-view-actions.c:785
 msgid "_Open Task"
 msgstr "_Abrir tarefa"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
+#: ../modules/calendar/e-task-shell-view-actions.c:787
 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:823
-#: ../modules/calendar/e-task-shell-view-actions.c:1022
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
+#: ../modules/calendar/e-memo-shell-view-actions.c:829
+#: ../modules/calendar/e-task-shell-view-actions.c:1028
 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:1007
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:377
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
 msgid "Print the selected task"
 msgstr "Ver a tarefa seleccionada"
 
-#: ../modules/calendar/e-memo-shell-backend.c:279
+#: ../modules/calendar/e-calendar-preferences.c:437
+msgid "Selected Calendars for Alarms"
+msgstr "Seleccionar calendarios para alarmas"
+
+#: ../modules/calendar/e-calendar-preferences.c:836
+msgid "Ti_me and date:"
+msgstr "_Hora e data:"
+
+#: ../modules/calendar/e-calendar-preferences.c:837
+msgid "_Date only:"
+msgstr "Só _data:"
+
+#: ../modules/calendar/e-memo-shell-backend.c:285
 msgctxt "New"
 msgid "Mem_o"
 msgstr "N_ota"
 
-#: ../modules/calendar/e-memo-shell-backend.c:286
+#: ../modules/calendar/e-memo-shell-backend.c:292
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "Nota _compartida"
 
-#: ../modules/calendar/e-memo-shell-backend.c:288
+#: ../modules/calendar/e-memo-shell-backend.c:294
 msgid "Create a new shared memo"
 msgstr "Crear unha nota compartida nova"
 
-#: ../modules/calendar/e-memo-shell-backend.c:296
+#: ../modules/calendar/e-memo-shell-backend.c:302
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Lista de notas"
 
-#: ../modules/calendar/e-memo-shell-backend.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-memo-shell-backend.c:304
+#: ../modules/calendar/e-memo-shell-view-actions.c:607
 msgid "Create a new memo list"
 msgstr "Crear unha lista de notas nova"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:233
+#: ../modules/calendar/e-memo-shell-sidebar.c:164
+#: ../modules/calendar/e-task-shell-sidebar.c:164
+#, c-format
+msgid ""
+"Error on %s\n"
+"%s"
+msgstr ""
+"Erro en %s:\n"
+" %s"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:232
 msgid "Loading memos"
 msgstr "Cargando notas"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:613
+#: ../modules/calendar/e-memo-shell-sidebar.c:601
 msgid "Memo List Selector"
 msgstr "Selector de orixe de notas"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:918
+#: ../modules/calendar/e-memo-shell-sidebar.c:906
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Abrindo notas en %s"
@@ -15440,75 +15108,75 @@ msgstr "Abrindo notas en %s"
 msgid "Print Memos"
 msgstr "Imprimir notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:564
+#: ../modules/calendar/e-memo-shell-view-actions.c:570
 msgid "_Delete Memo"
 msgstr "E_liminar mensaxe"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:571
+#: ../modules/calendar/e-memo-shell-view-actions.c:577
 msgid "_Find in Memo..."
 msgstr "_Buscar na cita..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:573
+#: ../modules/calendar/e-memo-shell-view-actions.c:579
 msgid "Search for text in the displayed memo"
 msgstr "Buscar texto no corpo da cita mostrada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:592
+#: ../modules/calendar/e-memo-shell-view-actions.c:598
 msgid "D_elete Memo List"
 msgstr "E_liminar a lista de citas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:594
+#: ../modules/calendar/e-memo-shell-view-actions.c:600
 msgid "Delete the selected memo list"
 msgstr "Eliminar a lista de citas seleccionadas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
 msgid "_New Memo List"
 msgstr "Lista de notas _nova"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:615
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
 msgid "Refresh the selected memo list"
 msgstr "Eliminar as notas seleccionadas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-memo-shell-view-actions.c:628
 msgid "Rename the selected memo list"
 msgstr "Renomear o cartafol seleccionado"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:627
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
 msgid "Show _Only This Memo List"
 msgstr "M_ostrar só esta lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:706
+#: ../modules/calendar/e-memo-shell-view-actions.c:712
 msgid "Memo _Preview"
 msgstr "_Previsualización"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:708
+#: ../modules/calendar/e-memo-shell-view-actions.c:714
 msgid "Show memo preview pane"
 msgstr "Mostrar o panel de previsualización"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:729
+#: ../modules/calendar/e-memo-shell-view-actions.c:735
 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:736
+#: ../modules/calendar/e-memo-shell-view-actions.c:742
 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:794
+#: ../modules/calendar/e-memo-shell-view-actions.c:800
 msgid "Print the list of memos"
 msgstr "Imprimir a lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:801
+#: ../modules/calendar/e-memo-shell-view-actions.c:807
 msgid "Preview the list of memos to be printed"
 msgstr "Previsualiza a lista de notas para imprimir"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:416
+#: ../modules/calendar/e-memo-shell-view-private.c:420
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d nota"
 msgstr[1] "%d notas"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:420
-#: ../modules/calendar/e-task-shell-view-private.c:569
+#: ../modules/calendar/e-memo-shell-view-private.c:424
+#: ../modules/calendar/e-task-shell-view-private.c:575
 #, c-format
 msgid "%d selected"
 msgstr ", %d seleccionada"
@@ -15521,40 +15189,40 @@ msgstr "E_liminar a mensaxe"
 msgid "Delete Memo"
 msgstr "Eliminar a cita"
 
-#: ../modules/calendar/e-task-shell-backend.c:278
+#: ../modules/calendar/e-task-shell-backend.c:284
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../modules/calendar/e-task-shell-backend.c:285
+#: ../modules/calendar/e-task-shell-backend.c:291
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tarefa asigna_da"
 
-#: ../modules/calendar/e-task-shell-backend.c:287
+#: ../modules/calendar/e-task-shell-backend.c:293
 msgid "Create a new assigned task"
 msgstr "Crear unha tarefa asignada nova"
 
-#: ../modules/calendar/e-task-shell-backend.c:295
+#: ../modules/calendar/e-task-shell-backend.c:301
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-backend.c:297
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-task-shell-backend.c:303
+#: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "Create a new task list"
 msgstr "Crear unha lista de tarefas nova"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:233
+#: ../modules/calendar/e-task-shell-sidebar.c:232
 msgid "Loading tasks"
 msgstr "Cargando tarefas"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:613
+#: ../modules/calendar/e-task-shell-sidebar.c:601
 msgid "Task List Selector"
 msgstr "Selector de orixe de tarefas"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:918
+#: ../modules/calendar/e-task-shell-sidebar.c:906
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo tarefas en %s"
@@ -15564,7 +15232,7 @@ msgstr "Abrindo tarefas en %s"
 msgid "Print Tasks"
 msgstr "Imprimir tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:563
+#: ../modules/calendar/e-task-shell-view-actions.c:569
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15576,583 +15244,586 @@ msgstr ""
 "\n"
 "Está seguro de que quere eliminar estas tarefas?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:688
+#: ../modules/calendar/e-task-shell-view-actions.c:694
 msgid "_Delete Task"
 msgstr "E_liminar"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:695
+#: ../modules/calendar/e-task-shell-view-actions.c:701
 msgid "_Find in Task..."
 msgstr "_Buscar na tarefa..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:697
+#: ../modules/calendar/e-task-shell-view-actions.c:703
 msgid "Search for text in the displayed task"
 msgstr "Buscar texto no corpo da tarefa mostrada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:709
+#: ../modules/calendar/e-task-shell-view-actions.c:715
 msgid "Copy..."
 msgstr "_Copiar..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:722
 msgid "D_elete Task List"
 msgstr "_Eliminar a lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:718
+#: ../modules/calendar/e-task-shell-view-actions.c:724
 msgid "Delete the selected task list"
 msgstr "Eliminar a lista de tarefas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:723
+#: ../modules/calendar/e-task-shell-view-actions.c:729
 msgid "_New Task List"
 msgstr "Lista de tarefas _nova"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:739
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "Refresh the selected task list"
 msgstr "Eliminar as tarefas seleccionadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-task-shell-view-actions.c:752
 msgid "Rename the selected task list"
 msgstr "Renomear o cartafol seleccionado"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:757
 msgid "Show _Only This Task List"
 msgstr "M_ostrar só esta lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:771
 msgid "Mar_k as Incomplete"
 msgstr "_Marcar como non terminada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:801
 msgid "Delete completed tasks"
 msgstr "Eliminar as tarefas terminadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:870
+#: ../modules/calendar/e-task-shell-view-actions.c:876
 msgid "Task _Preview"
 msgstr "_Previsualizar tarefa"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:872
+#: ../modules/calendar/e-task-shell-view-actions.c:878
 msgid "Show task preview pane"
 msgstr "Mostrar o panel de previsualización"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:893
+#: ../modules/calendar/e-task-shell-view-actions.c:899
 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:900
+#: ../modules/calendar/e-task-shell-view-actions.c:906
 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:908
+#: ../modules/calendar/e-task-shell-view-actions.c:914
 msgid "Active Tasks"
 msgstr "Tarefas activas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../modules/calendar/e-task-shell-view-actions.c:928
 msgid "Completed Tasks"
 msgstr "Tarefas terminadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:929
+#: ../modules/calendar/e-task-shell-view-actions.c:935
 msgid "Next 7 Days' Tasks"
 msgstr "Tarefas dos próximos sete días"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:936
+#: ../modules/calendar/e-task-shell-view-actions.c:942
 msgid "Overdue Tasks"
 msgstr "Tarefas atrasadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:943
+#: ../modules/calendar/e-task-shell-view-actions.c:949
 msgid "Tasks with Attachments"
 msgstr "Tarefas con anexos"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:993
+#: ../modules/calendar/e-task-shell-view-actions.c:999
 msgid "Print the list of tasks"
 msgstr "Imprimir a lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1000
+#: ../modules/calendar/e-task-shell-view-actions.c:1006
 msgid "Preview the list of tasks to be printed"
 msgstr "Previsualiza a lista de tarefas para imprimir"
 
-#: ../modules/calendar/e-task-shell-view-private.c:463
+#: ../modules/calendar/e-task-shell-view-private.c:468
 msgid "Expunging"
 msgstr "Compactando"
 
-#: ../modules/calendar/e-task-shell-view-private.c:565
+#: ../modules/calendar/e-task-shell-view-private.c:571
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tarefa"
 msgstr[1] "%d tarefas"
 
-#: ../modules/calendar/e-task-shell-view.c:351
+#: ../modules/calendar/e-task-shell-view.c:358
 msgid "Delete Tasks"
 msgstr "Tarefas terminadas"
 
-#: ../modules/calendar/e-task-shell-view.c:353
+#: ../modules/calendar/e-task-shell-view.c:360
 msgid "Delete Task"
 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:345
+#: ../modules/mail/e-mail-attachment-handler.c:380
 #, 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:89
+#: ../modules/mail/e-mail-junk-hook.c:94
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "Ningún"
 
-#: ../modules/mail/e-mail-shell-backend.c:171
+#: ../modules/mail/e-mail-shell-backend.c:170
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mensaxe de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:173
+#: ../modules/mail/e-mail-shell-backend.c:172
 msgid "Compose a new mail message"
 msgstr "Compor unha mensaxe de correo nova"
 
-#: ../modules/mail/e-mail-shell-backend.c:181
+#: ../modules/mail/e-mail-shell-backend.c:180
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Carta_fol de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:183
+#: ../modules/mail/e-mail-shell-backend.c:182
 msgid "Create a new mail folder"
 msgstr "Crear un cartafol novo de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:481
+#: ../modules/mail/e-mail-shell-backend.c:501
 msgid "Mail Accounts"
 msgstr "Contas de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:489
+#: ../modules/mail/e-mail-shell-backend.c:509
 msgid "Mail Preferences"
 msgstr "Preferencias de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:497
+#: ../modules/mail/e-mail-shell-backend.c:517
 msgid "Composer Preferences"
 msgstr "Preferencias do editor"
 
-#: ../modules/mail/e-mail-shell-backend.c:505
+#: ../modules/mail/e-mail-shell-backend.c:525
 msgid "Network Preferences"
 msgstr "Preferencias de rede"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:880
-#: ../modules/mail/e-mail-shell-view.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:1029
+#: ../modules/mail/e-mail-shell-view.c:954
 msgid "_Disable Account"
 msgstr "Desactivar conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:1031
 msgid "Disable this account"
 msgstr "Desactivar conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:889
+#: ../modules/mail/e-mail-shell-view-actions.c:1038
 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:894
+#: ../modules/mail/e-mail-shell-view-actions.c:1043
 msgid "C_reate Search Folder From Search..."
 msgstr "C_rear un cartafol de busca por busca..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:901
+#: ../modules/mail/e-mail-shell-view-actions.c:1050
 msgid "_Download Messages for Offline Usage"
 msgstr "_Descargar as mensaxes para o uso sen conexión"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:903
+#: ../modules/mail/e-mail-shell-view-actions.c:1052
 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:908
+#: ../modules/mail/e-mail-shell-view-actions.c:1057
 msgid "Fl_ush Outbox"
 msgstr "Lim_par a caixa de saída"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:915
+#: ../modules/mail/e-mail-shell-view-actions.c:1064
 msgid "_Copy Folder To..."
 msgstr "_Copiar cartafol a..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:917
+#: ../modules/mail/e-mail-shell-view-actions.c:1066
 msgid "Copy the selected folder into another folder"
 msgstr "Copiar o cartafol seleccionado noutro cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:924
+#: ../modules/mail/e-mail-shell-view-actions.c:1073
 msgid "Permanently remove this folder"
 msgstr "Eliminar permanentemente este cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:929
+#: ../modules/mail/e-mail-shell-view-actions.c:1078
 msgid "E_xpunge"
 msgstr "Com_pactar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:931
+#: ../modules/mail/e-mail-shell-view-actions.c:1080
 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:936
+#: ../modules/mail/e-mail-shell-view-actions.c:1085
 msgid "Mar_k All Messages as Read"
 msgstr "Ma_rcar todas as mensaxes como lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:938
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
 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:943
+#: ../modules/mail/e-mail-shell-view-actions.c:1092
 msgid "_Move Folder To..."
 msgstr "_Mover o cartafol a..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:945
+#: ../modules/mail/e-mail-shell-view-actions.c:1094
 msgid "Move the selected folder into another folder"
 msgstr "Mover o cartafol seleccionado a outro cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:950
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
 msgid "_New..."
 msgstr "_Novo..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:952
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
 msgid "Create a new folder for storing mail"
 msgstr "Crear un cartafol novo para almacenar correo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:959
+#: ../modules/mail/e-mail-shell-view-actions.c:1108
 msgid "Change the properties of this folder"
 msgstr "Modificar as propiedades deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:966
+#: ../modules/mail/e-mail-shell-view-actions.c:1115
 msgid "Refresh the folder"
 msgstr "Actualizar o cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:973
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "Change the name of this folder"
 msgstr "Modificar o nome deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:1127
 msgid "Select Message _Thread"
 msgstr "Seleccionar o _fío da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:980
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 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:985
+#: ../modules/mail/e-mail-shell-view-actions.c:1134
 msgid "Select Message S_ubthread"
 msgstr "Seleccionar o fío sec_undario da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:987
+#: ../modules/mail/e-mail-shell-view-actions.c:1136
 msgid "Select all replies to the currently selected message"
 msgstr "Seleccionar todas as respostas á mensaxe seleccionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:992
-msgid "_Unsubscribe"
-msgstr "Eliminar s_ubscrición"
-
-#: ../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:999
+#: ../modules/mail/e-mail-shell-view-actions.c:1148
 msgid "Empty _Trash"
 msgstr "Baleirar o _lixo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1001
+#: ../modules/mail/e-mail-shell-view-actions.c:1150
 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:1006
+#: ../modules/mail/e-mail-shell-view-actions.c:1155
 msgid "_New Label"
 msgstr "Etiqueta _nova"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1015
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
 msgid "N_one"
 msgstr "Ningún"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1038
+#: ../modules/mail/e-mail-shell-view-actions.c:1178
+#, fuzzy
+msgid "_Manage Subscriptions"
+msgstr "_Subscricións..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view-actions.c:1236
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
+"Subscribirse ou eliminar subscrición dos cartafoles en servidores remotos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1199
+#: ../widgets/misc/e-activity-proxy.c:314
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "Cancel the current mail operation"
 msgstr "Cancelar a operación de correo actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1043
+#: ../modules/mail/e-mail-shell-view-actions.c:1206
 msgid "Collapse All _Threads"
 msgstr "Contraer todos os _fíos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1045
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
 msgid "Collapse all message threads"
 msgstr "Contraer todos os fíos de mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1050
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
 msgid "E_xpand All Threads"
 msgstr "E_xpandir todos os fíos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1052
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
 msgid "Expand all message threads"
 msgstr "Expandir todos os fíos de mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1057
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
 msgid "_Message Filters"
 msgstr "Filtros de _mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1059
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
 msgid "Create or edit rules for filtering new mail"
 msgstr "Crear ou editar regras para a filtraxe do correo novo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1064
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
 msgid "Search F_olders"
 msgstr "Cartaf_oles de busca"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1066
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
 msgid "Create or edit search folder definitions"
 msgstr "Crear ou editar as definicións de cartafoles de busca"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1071
+#: ../modules/mail/e-mail-shell-view-actions.c:1234
 msgid "_Subscriptions..."
 msgstr "_Subscricións..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1073
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr ""
-"Subscribirse ou eliminar subscrición dos cartafoles en servidores remotos"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1080
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
 msgid "F_older"
 msgstr "Cartaf_ol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1250
 msgid "_Label"
 msgstr "_Etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1127
+#: ../modules/mail/e-mail-shell-view-actions.c:1290
 msgid "_New Folder..."
 msgstr "Cartafol _novo..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1151
+#: ../modules/mail/e-mail-shell-view-actions.c:1318
 msgid "Show Message _Preview"
 msgstr "Mostrar _previsualización da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
+#: ../modules/mail/e-mail-shell-view-actions.c:1320
 msgid "Show message preview pane"
 msgstr "Mostrar a xanela de previsualización da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1326
 msgid "Show _Deleted Messages"
 msgstr "Mostrar as mensaxes _eliminadas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1161
+#: ../modules/mail/e-mail-shell-view-actions.c:1328
 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
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
 msgid "_Group By Threads"
 msgstr "Agr_upar por fíos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1169
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
 msgid "Threaded message list"
 msgstr "Lista de mensaxes por fíos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1190
+#: ../modules/mail/e-mail-shell-view-actions.c:1357
 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:1197
+#: ../modules/mail/e-mail-shell-view-actions.c:1364
 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:1205
+#: ../modules/mail/e-mail-shell-view-actions.c:1372
 msgid "All Messages"
 msgstr "Todas as mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../modules/mail/e-mail-shell-view-actions.c:1379
 msgid "Important Messages"
 msgstr "Mensaxes importantes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1219
+#: ../modules/mail/e-mail-shell-view-actions.c:1386
 msgid "Last 5 Days' Messages"
 msgstr "Mensaxes dos últimos 5 días"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1226
+#: ../modules/mail/e-mail-shell-view-actions.c:1393
 msgid "Messages Not Junk"
 msgstr "Mensaxes que non son lixo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/mail/e-mail-shell-view-actions.c:1400
 msgid "Messages with Attachments"
 msgstr "Mensaxes con anexos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1240
+#: ../modules/mail/e-mail-shell-view-actions.c:1407
 msgid "No Label"
 msgstr "Sen etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1414
 msgid "Read Messages"
 msgstr "Mensaxes lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../modules/mail/e-mail-shell-view-actions.c:1421
 msgid "Recent Messages"
 msgstr "Mensaxes recentes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1428
 msgid "Unread Messages"
 msgstr "Mensaxes non lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1313
+#: ../modules/mail/e-mail-shell-view-actions.c:1480
 msgid "Subject or Addresses contain"
 msgstr "O asunto ou os enderezos conteñen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1323
+#: ../modules/mail/e-mail-shell-view-actions.c:1490
 msgid "All Accounts"
 msgstr "Todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1330
+#: ../modules/mail/e-mail-shell-view-actions.c:1497
 msgid "Current Account"
 msgstr "Conta actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1337
+#: ../modules/mail/e-mail-shell-view-actions.c:1504
 msgid "Current Folder"
 msgstr "Cartafol actual"
 
-#: ../modules/mail/e-mail-shell-view-private.c:990
+#: ../modules/mail/e-mail-shell-view-private.c:1024
 #, 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:1001
+#: ../modules/mail/e-mail-shell-view-private.c:1035
 #, 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:1007
-#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1041
+#: ../modules/mail/e-mail-shell-view-private.c:1048
 #, 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:1020
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, 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:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1060
 #, 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:1032
+#: ../modules/mail/e-mail-shell-view-private.c:1066
 #, 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:1044
+#: ../modules/mail/e-mail-shell-view-private.c:1078
 #, 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:1047
+#: ../modules/mail/e-mail-shell-view-private.c:1081
 #, 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:559
+#: ../modules/mail/e-mail-shell-view.c:564
 msgid "All Account Search"
 msgstr "Buscar en todas as contas"
 
-#: ../modules/mail/e-mail-shell-view.c:686
+#: ../modules/mail/e-mail-shell-view.c:747
 msgid "Account Search"
 msgstr "Buscar na conta"
 
-#: ../modules/mail/e-mail-shell-view.c:881
+#: ../modules/mail/e-mail-shell-view.c:952
 msgid "Proxy _Logout"
 msgstr "_Terminar a sesión proxy"
 
-#: ../modules/mail/em-account-prefs.c:133
+#: ../modules/mail/em-account-prefs.c:219
 msgid "Evolution Account Assistant"
 msgstr "Asistente de contas do Evolution"
 
-#: ../modules/mail/em-account-prefs.c:182
+#: ../modules/mail/em-account-prefs.c:268
 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
+#: ../modules/mail/em-composer-prefs.c:495
+#: ../modules/plugin-manager/evolution-plugin-manager.c:357
+#: ../plugins/publish-calendar/publish-calendar.c:831
+#: ../widgets/misc/e-account-tree-view.c:224
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../modules/mail/em-composer-prefs.c:509
+#: ../modules/mail/em-composer-prefs.c:499
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Every time"
 msgstr "Cada vez"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per day"
 msgstr "Unha vez ao día"
 
-#: ../modules/mail/em-mailer-prefs.c:93
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per week"
 msgstr "Unha vez á semana"
 
-#: ../modules/mail/em-mailer-prefs.c:94
+#: ../modules/mail/em-mailer-prefs.c:95
 msgid "Once per month"
 msgstr "Unha vez ao mes"
 
-#: ../modules/mail/em-mailer-prefs.c:201
+#: ../modules/mail/em-mailer-prefs.c:177
 msgid "Add Custom Junk Header"
 msgstr "Engadir unha cabeceira personalizada para o correo non desexado"
 
-#: ../modules/mail/em-mailer-prefs.c:209
+#: ../modules/mail/em-mailer-prefs.c:185
 msgid "Header Name:"
 msgstr "Nome da cabeceira:"
 
-#: ../modules/mail/em-mailer-prefs.c:210
+#: ../modules/mail/em-mailer-prefs.c:186
 msgid "Header Value Contains:"
 msgstr "O valor da cabeceira contén:"
 
-#: ../modules/mail/em-mailer-prefs.c:310
+#: ../modules/mail/em-mailer-prefs.c:286
 msgid "Header"
 msgstr "Cabeceira"
 
-#: ../modules/mail/em-mailer-prefs.c:314
+#: ../modules/mail/em-mailer-prefs.c:290
 msgid "Contains Value"
 msgstr "Contén o valor"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:707 ../modules/mail/em-mailer-prefs.c:778
+#: ../modules/mail/em-mailer-prefs.c:687 ../modules/mail/em-mailer-prefs.c:758
 #, 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:715 ../modules/mail/em-mailer-prefs.c:787
+#: ../modules/mail/em-mailer-prefs.c:695 ../modules/mail/em-mailer-prefs.c:767
 #, 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:751
+#: ../modules/mail/em-mailer-prefs.c:731
 msgid "No junk plugin available"
 msgstr "Non hai dispoñíbel un engadido de correo non desexado"
 
 #. 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:1143
+#: ../modules/mail/em-mailer-prefs.c:1114
 msgid "_Date header:"
 msgstr "Data da cabeceira:"
 
-#: ../modules/mail/em-mailer-prefs.c:1144
+#: ../modules/mail/em-mailer-prefs.c:1115
 msgid "Show _original header value"
 msgstr "Mostrar tamaño _orixinal"
 
@@ -16167,11 +15838,65 @@ 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
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
 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/offline-alert/evolution-offline-alert.error.xml.h:1
+msgid "Click 'Work Online' to return to online mode."
+msgstr ""
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
+#, fuzzy
+msgid "Evolution is currently offline due to a network outage."
+msgstr ""
+"O Evolution está actualmente desconectado.\n"
+"Prema neste botón para traballar conectado."
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
+#, fuzzy
+msgid "Evolution is currently offline."
+msgstr "Iniciar en modo sen conexión"
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
+#, fuzzy
+msgid ""
+"Evolution will return to online mode once a network connection is "
+"established."
+msgstr ""
+"O Evolution está actualmente desconectado.\n"
+"Prema neste botón para traballar conectado."
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+msgid "Author(s)"
+msgstr "Autoría"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:251
+msgid "Plugin Manager"
+msgstr "Xestor de engadidos"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:267
+msgid "Note: Some changes will not take effect until restart"
+msgstr "Nota: algunhas modificacións non serán efectivas até que reinicie"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:296
+msgid "Overview"
+msgstr "Visión xeral"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:365
+#: ../modules/plugin-manager/evolution-plugin-manager.c:448
+msgid "Plugin"
+msgstr "engadido"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:486
+msgid "_Plugins"
+msgstr "_Engadidos"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+msgid "Enable and disable plugins"
+msgstr "Activar e desactivar engadidos"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Ola Python"
@@ -16188,39 +15913,39 @@ 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
+#: ../modules/startup-wizard/evolution-startup-wizard.c:276
+#: ../widgets/misc/e-import-assistant.c:399
 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
+#: ../modules/startup-wizard/evolution-startup-wizard.c:308
+#: ../widgets/misc/e-import-assistant.c:555
 #, c-format
 msgid "From %s:"
 msgstr "De: %s:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:318
-#: ../modules/startup-wizard/evolution-startup-wizard.c:415
+#: ../modules/startup-wizard/evolution-startup-wizard.c:319
+#: ../modules/startup-wizard/evolution-startup-wizard.c:416
 msgid "Importing Files"
 msgstr "Importando ficheiros"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:393
+#: ../modules/startup-wizard/evolution-startup-wizard.c:394
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr "Cancelouse a importación. Prema «Adiante» para continuar."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:411
+#: ../modules/startup-wizard/evolution-startup-wizard.c:412
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr "A importación rematou. Prema «Adiante» para continuar."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:471
+#: ../modules/startup-wizard/evolution-startup-wizard.c:482
 msgid "Evolution Setup Assistant"
 msgstr "Asistente de configuración do Evolution"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+#: ../modules/startup-wizard/evolution-startup-wizard.c:488
 msgid "Welcome"
 msgstr "Benvido/a"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:482
+#: ../modules/startup-wizard/evolution-startup-wizard.c:493
 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"
@@ -16249,8 +15974,13 @@ msgstr ""
 "Lista de pistas do engadido de aviso de anexos para buscar no corpo dunha "
 "mensaxe"
 
+#. Check buttons
+#: ../plugins/attachment-reminder/attachment-reminder.c:117
+msgid "_Do not show this message again."
+msgstr "_Non mostrar esta mensaxe outra vez."
+
 #: ../plugins/attachment-reminder/attachment-reminder.c:451
-#: ../plugins/templates/templates.c:410
+#: ../plugins/templates/templates.c:411
 msgid "Keywords"
 msgstr "Palabras chave"
 
@@ -16290,27 +16020,31 @@ 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:160
-msgid "Select name of the Evolution backup file"
+#: ../plugins/backup-restore/backup-restore.c:183
+#, fuzzy
+msgid "Select name of the Evolution back up file"
 msgstr "Seleccione o nome do ficheiro de copia de seguranza do Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:191
-msgid "_Restart Evolution after backup"
+#: ../plugins/backup-restore/backup-restore.c:216
+#, fuzzy
+msgid "_Restart Evolution after back up"
 msgstr "_Reiniciar o Evolution despois de facer unha copia de seguranza"
 
-#: ../plugins/backup-restore/backup-restore.c:217
-msgid "Select name of the Evolution backup file to restore"
+#: ../plugins/backup-restore/backup-restore.c:242
+#, fuzzy
+msgid "Select name of the Evolution back up file to restore"
 msgstr ""
 "Seleccione o nome do ficheiro de copia de seguranza do Evolution que quere "
 "restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:230
+#: ../plugins/backup-restore/backup-restore.c:255
 msgid "_Restart Evolution after restore"
 msgstr "_Reiniciar o Evolution despois de restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:298
+#: ../plugins/backup-restore/backup-restore.c:323
+#, fuzzy
 msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
+"You can restore Evolution from your back up. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
 "settings, mail filters etc."
 msgstr ""
@@ -16318,144 +16052,147 @@ 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:305
-msgid "_Restore Evolution from the backup file"
+#: ../plugins/backup-restore/backup-restore.c:330
+#, fuzzy
+msgid "_Restore Evolution from the back up file"
 msgstr "_Restaurar o Evolution desde o ficheiro de copia de seguranza"
 
-#: ../plugins/backup-restore/backup-restore.c:312
+#: ../plugins/backup-restore/backup-restore.c:337
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Seleccione o arquivo do Evolution para restaurar:"
 
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:340
 msgid "Choose a file to restore"
 msgstr "Escolla un ficheiro para restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:323
-msgid "Restore from backup"
+#: ../plugins/backup-restore/backup-restore.c:348
+#, fuzzy
+msgid "Restore from back up"
 msgstr "Restaurar desde unha 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:386
+msgid "_Back up Evolution Data..."
+msgstr "Fa_cer unha copia de seguranza dos datos do Evolution..."
 
-#: ../plugins/backup-restore/backup-restore.c:363
-msgid "Backup Evolution data and settings to an archive file"
+#: ../plugins/backup-restore/backup-restore.c:388
+#, fuzzy
+msgid "Back up 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:368
-msgid "R_estore Evolution Settings..."
-msgstr "R_estaurar axustes de Evolutionâ?¦"
+#: ../plugins/backup-restore/backup-restore.c:393
+msgid "R_estore Evolution Data..."
+msgstr "R_estaurar os datos do Evolution..."
 
-#: ../plugins/backup-restore/backup-restore.c:370
+#: ../plugins/backup-restore/backup-restore.c:395
 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"
 
-#: ../plugins/backup-restore/backup.c:63
-msgid "Backup Evolution directory"
-msgstr "Facer unha copia de seguranza do cartafol do Evolution"
+#: ../plugins/backup-restore/backup.c:79
+msgid "Back up Evolution directory"
+msgstr "Facer unha copia de seguranza do directorio do Evolution"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:81
 msgid "Restore Evolution directory"
 msgstr "Restaurar o cartafol do Evolution"
 
-#: ../plugins/backup-restore/backup.c:67
-msgid "Check Evolution Backup"
+#: ../plugins/backup-restore/backup.c:83
+#, fuzzy
+msgid "Check Evolution Back up"
 msgstr "Verificar a copia de seguranza do Evolution"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:85
 msgid "Restart Evolution"
 msgstr "Reiniciar o Evolution"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:87
 msgid "With Graphical User Interface"
 msgstr "Con interface gráfica de usuario"
 
-#: ../plugins/backup-restore/backup.c:189
-#: ../plugins/backup-restore/backup.c:251
+#: ../plugins/backup-restore/backup.c:289
+#: ../plugins/backup-restore/backup.c:399
 msgid "Shutting down Evolution"
 msgstr "Pechando o Evolution"
 
-#: ../plugins/backup-restore/backup.c:196
+#: ../plugins/backup-restore/backup.c:296
 msgid "Backing Evolution accounts and settings"
 msgstr ""
 "Facendo unha copia de seguranza das contas e configuracións do Evolution"
 
-#: ../plugins/backup-restore/backup.c:202
+#: ../plugins/backup-restore/backup.c:304
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Facendo unha copia de seguranza dos datos do Evolution (correos, contactos, "
 "calendario, tarefas e notas)"
 
-#: ../plugins/backup-restore/backup.c:213
-msgid "Backup complete"
+#: ../plugins/backup-restore/backup.c:317
+msgid "Back up complete"
 msgstr "Terminou a copia de seguranza"
 
-#: ../plugins/backup-restore/backup.c:218
-#: ../plugins/backup-restore/backup.c:239
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:322
+#: ../plugins/backup-restore/backup.c:496
 msgid "Restarting Evolution"
 msgstr "Reiniciando o Evolution"
 
-#: ../plugins/backup-restore/backup.c:255
+#: ../plugins/backup-restore/backup.c:403
 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"
+#: ../plugins/backup-restore/backup.c:409
+msgid "Extracting files from back up"
 msgstr "Extraendo ficheiros da copia de seguranza"
 
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:466
 msgid "Loading Evolution settings"
 msgstr "Cargando a configuración do Evolution"
 
-#: ../plugins/backup-restore/backup.c:274
-msgid "Removing temporary backup files"
+#: ../plugins/backup-restore/backup.c:481
+msgid "Removing temporary back up files"
 msgstr "Eliminando os ficheiros temporais da copia de seguranza"
 
-#: ../plugins/backup-restore/backup.c:281
+#: ../plugins/backup-restore/backup.c:491
 msgid "Ensuring local sources"
 msgstr "Asegurando as orixes locais"
 
-#: ../plugins/backup-restore/backup.c:428
+#: ../plugins/backup-restore/backup.c:678
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Facendo a copia de seguranza no cartafol %s"
 
-#: ../plugins/backup-restore/backup.c:433
+#: ../plugins/backup-restore/backup.c:683
 #, c-format
 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:455
-msgid "Evolution Backup"
+#: ../plugins/backup-restore/backup.c:705
+msgid "Evolution Back up"
 msgstr "Copia de seguranza do Evolution"
 
-#: ../plugins/backup-restore/backup.c:455
+#: ../plugins/backup-restore/backup.c:705
 msgid "Evolution Restore"
 msgstr "Restauración do Evolution"
 
-#: ../plugins/backup-restore/backup.c:496
+#: ../plugins/backup-restore/backup.c:746
 msgid "Backing up Evolution Data"
 msgstr "Facendo unha copia de seguranza dos datos do Evolution"
 
-#: ../plugins/backup-restore/backup.c:497
+#: ../plugins/backup-restore/backup.c:747
 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:499
+#: ../plugins/backup-restore/backup.c:749
 msgid "Restoring Evolution Data"
 msgstr "Restaurando os datos do Evolution"
 
-#: ../plugins/backup-restore/backup.c:500
+#: ../plugins/backup-restore/backup.c:750
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Agarde mentres o Evolution restaura os seus datos."
 
-#: ../plugins/backup-restore/backup.c:518
+#: ../plugins/backup-restore/backup.c:768
 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 "
@@ -16463,11 +16200,13 @@ msgstr ""
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-msgid "Backup and Restore"
+#, fuzzy
+msgid "Back up and Restore"
 msgstr "Copia de seguranza e restaurar"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore your Evolution data and settings."
+#, fuzzy
+msgid "Back up and restore your Evolution data and settings."
 msgstr ""
 "Facer copia de seguranza e restaurar os datos e a configuración do Evolution."
 
@@ -16477,14 +16216,14 @@ msgstr "Está seguro de que quere pechar o Evolution?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
 msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
+"Are you sure you want to restore Evolution from the selected back up file?"
 msgstr ""
 "Está seguro de que quere restaurar o Evolution desde o ficheiro de copia de "
 "seguranza seleccionado?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid "Close and Backup Evolution"
-msgstr "Pechar e facer copia de seguranza de Evolution"
+msgid "Close and Back up Evolution"
+msgstr "Pechar e facer unha copia de seguranza do Evolution"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid "Close and Restore Evolution"
@@ -16495,11 +16234,11 @@ msgid "Insufficient Permissions"
 msgstr "Permisos insuficientes"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-msgid "Invalid Evolution backup file"
+msgid "Invalid Evolution back up file"
 msgstr "O ficheiro de copia de seguranza do Evolution non é válido"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "Please select a valid backup file to restore."
+msgid "Please select a valid back up 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:8
@@ -16507,8 +16246,9 @@ msgid "The selected folder is not writable."
 msgstr "O cartafol seleccionado non é escribíbel."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
+#, fuzzy
 msgid ""
-"To backup your data and settings, you must first close Evolution. Please "
+"To back up 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 "
@@ -16516,11 +16256,12 @@ msgstr ""
 "proceder."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
+#, fuzzy
 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."
+"all your current Evolution data and settings and restore them from your back "
+"up."
 msgstr ""
 "Para restaurar os seus datos e configuracións primeiro debe pechar "
 "Evolution. Asegúrese que garda calquera dato sen gardar antes de proceder. "
@@ -16581,34 +16322,34 @@ 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:154
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:163
 #, 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:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:167
 #, 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:187
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:196
 #, 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:189
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:198
 #, 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:212
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:221
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr ""
 "Produciuse un fallo na canalización co Bogofilter; o código de erro é: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:406
 msgid "Convert message text to _Unicode"
 msgstr "Converter o texto da mensaxe a _Unicode"
 
@@ -16736,20 +16477,27 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:223
-#: ../plugins/google-account-setup/google-contacts-source.c:308
+#: ../plugins/google-account-setup/google-contacts-source.c:348
 msgid "Use _SSL"
 msgstr "Usar _SSL"
 
+#: ../plugins/caldav/caldav-source.c:225
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:638
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
+msgid "User_name:"
+msgstr "_Nome de usuario:"
+
 #: ../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:251
-#: ../plugins/calendar-file/calendar-file.c:191
+#: ../plugins/calendar-file/calendar-file.c:194
 #: ../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
+#: ../plugins/calendar-weather/calendar-weather.c:398
+#: ../plugins/google-account-setup/google-contacts-source.c:366
+#: ../plugins/google-account-setup/google-source.c:645
 msgid "Re_fresh:"
 msgstr "Actuali_zar:"
 
@@ -16761,31 +16509,31 @@ msgstr "Engade a compatibilidade de CalDAV con Evolution."
 msgid "CalDAV Support"
 msgstr "Compatibilidade de CalDAV"
 
-#: ../plugins/calendar-file/calendar-file.c:125
+#: ../plugins/calendar-file/calendar-file.c:128
 msgid "_Customize options"
 msgstr "Personalizar as op_cións"
 
-#: ../plugins/calendar-file/calendar-file.c:144
+#: ../plugins/calendar-file/calendar-file.c:147
 msgid "File _name:"
 msgstr "Nome do f_icheiro:"
 
-#: ../plugins/calendar-file/calendar-file.c:148
+#: ../plugins/calendar-file/calendar-file.c:151
 msgid "Choose calendar file"
 msgstr "Escoller ficheiro de calendario"
 
-#: ../plugins/calendar-file/calendar-file.c:196
+#: ../plugins/calendar-file/calendar-file.c:199
 msgid "On open"
 msgstr "Ao abrir"
 
-#: ../plugins/calendar-file/calendar-file.c:197
+#: ../plugins/calendar-file/calendar-file.c:200
 msgid "On file change"
 msgstr "Cambio de ficheiro"
 
-#: ../plugins/calendar-file/calendar-file.c:198
+#: ../plugins/calendar-file/calendar-file.c:201
 msgid "Periodically"
 msgstr "Periodicamente"
 
-#: ../plugins/calendar-file/calendar-file.c:213
+#: ../plugins/calendar-file/calendar-file.c:216
 msgid "Force read _only"
 msgstr "Forzar s_ó lectura"
 
@@ -16813,62 +16561,62 @@ msgstr "Engadir calendarios web a Evolution."
 msgid "Web Calendars"
 msgstr "Calendarios web"
 
-#: ../plugins/calendar-weather/calendar-weather.c:60
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Fog"
 msgstr "Tempo: néboa"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Cloudy"
 msgstr "Tempo: anubrado"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Cloudy Night"
 msgstr "Tempo: noite anubrada"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Overcast"
 msgstr "Tempo: con nubes"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Showers"
 msgstr "Tempo: chuvascos"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Snow"
 msgstr "Tempo: neve"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Sunny"
 msgstr "Tempo: sol"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:70
 msgid "Weather: Clear Night"
 msgstr "Tempo: noite despexada"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:71
 msgid "Weather: Thunderstorms"
 msgstr "Tempo: treboadas"
 
-#: ../plugins/calendar-weather/calendar-weather.c:222
+#: ../plugins/calendar-weather/calendar-weather.c:225
 msgid "Select a location"
 msgstr "Seleccione unha localización"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:328
-#: ../plugins/calendar-weather/calendar-weather.c:373
+#: ../plugins/calendar-weather/calendar-weather.c:331
+#: ../plugins/calendar-weather/calendar-weather.c:376
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "Ningún"
 
-#: ../plugins/calendar-weather/calendar-weather.c:448
+#: ../plugins/calendar-weather/calendar-weather.c:451
 msgid "_Units:"
 msgstr "_Unidades:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:455
+#: ../plugins/calendar-weather/calendar-weather.c:460
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Métrico (Centígrados, cm etc.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:456
+#: ../plugins/calendar-weather/calendar-weather.c:463
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Non métrico (Fahrenheit, polgadas etc.)"
 
@@ -16898,11 +16646,11 @@ msgstr ""
 msgid "Map for contacts"
 msgstr "Sen contactos"
 
-#: ../plugins/dbx-import/dbx-importer.c:232
+#: ../plugins/dbx-import/dbx-importer.c:233
 msgid "Select folder to import OE folder into"
 msgstr "Seleccione un cartafol onde importar o cartafol de OE"
 
-#: ../plugins/dbx-import/dbx-importer.c:251
+#: ../plugins/dbx-import/dbx-importer.c:252
 msgid "Importing Outlook Express data"
 msgstr "Importando os datos do Outlook Express"
 
@@ -16961,40 +16709,38 @@ msgstr ""
 "de cabeceira é: Nome da cabeceira personalizada seguido de \"=\" e os "
 "valores separados por \";\""
 
-#: ../plugins/email-custom-header/email-custom-header.c:316
+#: ../plugins/email-custom-header/email-custom-header.c:319
 msgid "Security:"
 msgstr "Seguranza:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:321
+#: ../plugins/email-custom-header/email-custom-header.c:324
 msgid "Unclassified"
 msgstr "Sen clasificar"
 
-#: ../plugins/email-custom-header/email-custom-header.c:322
+#: ../plugins/email-custom-header/email-custom-header.c:325
 msgid "Protected"
 msgstr "Protexido"
 
-#: ../plugins/email-custom-header/email-custom-header.c:324
-#: ../widgets/misc/e-send-options.ui.h:18
+#: ../plugins/email-custom-header/email-custom-header.c:327
+#: ../widgets/misc/e-send-options.ui.h:21
 msgid "Secret"
 msgstr "Secreto"
 
-#: ../plugins/email-custom-header/email-custom-header.c:325
+#: ../plugins/email-custom-header/email-custom-header.c:328
 msgid "Top secret"
 msgstr "Alto secreto"
 
-#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer,
-#. indicating the header will not be added to a mail message
-#: ../plugins/email-custom-header/email-custom-header.c:379
+#: ../plugins/email-custom-header/email-custom-header.c:386
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "Ningún"
 
-#: ../plugins/email-custom-header/email-custom-header.c:571
+#: ../plugins/email-custom-header/email-custom-header.c:578
 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:830
+#: ../plugins/email-custom-header/email-custom-header.c:837
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -17004,12 +16750,12 @@ msgstr ""
 "Nome dos valores da chave para unha Cabeceira personalizada separados por \";"
 "\"."
 
-#: ../plugins/email-custom-header/email-custom-header.c:884
+#: ../plugins/email-custom-header/email-custom-header.c:891
 msgid "Key"
 msgstr "Chave"
 
-#: ../plugins/email-custom-header/email-custom-header.c:900
-#: ../plugins/templates/templates.c:416
+#: ../plugins/email-custom-header/email-custom-header.c:907
+#: ../plugins/templates/templates.c:417
 msgid "Values"
 msgstr "Valores"
 
@@ -17032,7 +16778,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:126
+#: ../plugins/external-editor/external-editor.c:128
 msgid "Automatically launch when a new mail is edited"
 msgstr "Lanzar automaticamente cando se edite un novo correo"
 
@@ -17044,11 +16790,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:115
+#: ../plugins/external-editor/external-editor.c:117
 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:116
+#: ../plugins/external-editor/external-editor.c:118
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -17056,8 +16802,8 @@ msgstr ""
 "Para o Emacs use \"xemacs\"\n"
 "Para o VI use \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:382
 #: ../plugins/external-editor/external-editor.c:384
+#: ../plugins/external-editor/external-editor.c:386
 msgid "Compose in External Editor"
 msgstr "Compoñer no editor externo"
 
@@ -17167,19 +16913,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:274
+#: ../plugins/google-account-setup/google-contacts-source.c:314
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
 msgid "Server"
 msgstr "Servidor"
 
-#: ../plugins/google-account-setup/google-source.c:437
+#: ../plugins/google-account-setup/google-source.c:438
 #, 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:548
+#: ../plugins/google-account-setup/google-source.c:549
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17188,17 +16934,17 @@ msgstr ""
 "Non é posíbel ler datos desde o servidor do Google.\n"
 "%s"
 
-#: ../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
+#: ../plugins/google-account-setup/google-source.c:549
+#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:955
 msgid "Unknown error."
 msgstr "Erro descoñecido."
 
-#: ../plugins/google-account-setup/google-source.c:634
+#: ../plugins/google-account-setup/google-source.c:649
 msgid "Cal_endar:"
 msgstr "Cal_endario:"
 
-#: ../plugins/google-account-setup/google-source.c:669
+#: ../plugins/google-account-setup/google-source.c:684
 msgid "Retrieve _List"
 msgstr "Obter a _lista"
 
@@ -17234,20 +16980,28 @@ msgstr "Seguir o estado da mensaxe..."
 msgid "Retract Mail"
 msgstr "Anular correo"
 
+#: ../plugins/groupwise-features/gw-ui.c:331
+msgid "Accept"
+msgstr "Aceptar"
+
 #: ../plugins/groupwise-features/gw-ui.c:338
 msgid "Accept Tentatively"
 msgstr "Aceptar provisionalmente"
 
+#: ../plugins/groupwise-features/gw-ui.c:345
+msgid "Decline"
+msgstr "Rexeitar"
+
 #: ../plugins/groupwise-features/gw-ui.c:352
 msgid "Rese_nd Meeting..."
 msgstr "Ree_nviar cita..."
 
-#: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:342
+#: ../plugins/groupwise-features/install-shared.c:178
+#: ../plugins/groupwise-features/share-folder-common.c:353
 msgid "Create folder"
 msgstr "Crear cartafol"
 
-#: ../plugins/groupwise-features/install-shared.c:217
+#: ../plugins/groupwise-features/install-shared.c:230
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17272,11 +17026,11 @@ msgstr ""
 "Prema en 'adiante' para instalar o cartafol compartido\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:229
+#: ../plugins/groupwise-features/install-shared.c:242
 msgid "Install the shared folder"
 msgstr "Instalar o cartafol compartido"
 
-#: ../plugins/groupwise-features/install-shared.c:233
+#: ../plugins/groupwise-features/install-shared.c:246
 msgid "Shared Folder Installation"
 msgstr "Instalación de cartafol compartido"
 
@@ -17306,7 +17060,7 @@ msgid "_Junk List"
 msgstr "Lista de correo non dese_xado"
 
 #: ../plugins/groupwise-features/junk-settings.ui.h:8
-#: ../plugins/groupwise-features/properties.ui.h:13
+#: ../plugins/groupwise-features/properties.ui.h:12
 #: ../widgets/table/e-table-config.ui.h:21
 msgid "_Remove"
 msgstr "E_liminar"
@@ -17331,6 +17085,11 @@ msgstr "Mensaxe anulada con éxito"
 msgid "Insert Send options"
 msgstr "Introducir opcións de envío"
 
+#: ../plugins/groupwise-features/notification.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:6
+msgid "The participants will receive the following notification.\n"
+msgstr "Os participantes recibirán a seguinte notificación.\n"
+
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to GroupWise messages"
 msgstr "Engadir as Opcións de envío ás mensaxes do GroupWise"
@@ -17455,30 +17214,22 @@ msgstr "Personali_zar a mensaxe de notificación"
 msgid "Con_tacts..."
 msgstr "Con_tactos..."
 
-#: ../plugins/groupwise-features/properties.ui.h:5
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Shared Folder Notification"
 msgstr "Notificación de cartafol compartido"
 
-#: ../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
+#: ../plugins/groupwise-features/properties.ui.h:8
 msgid "Users:"
 msgstr "Usuarios:"
 
-#: ../plugins/groupwise-features/properties.ui.h:12
+#: ../plugins/groupwise-features/properties.ui.h:11
 msgid "_Not Shared"
 msgstr "_Non compartido"
 
-#: ../plugins/groupwise-features/properties.ui.h:14
+#: ../plugins/groupwise-features/properties.ui.h:13
 msgid "_Shared With..."
 msgstr "_Compartido con..."
 
-#: ../plugins/groupwise-features/properties.ui.h:15
-msgid "_Sharing"
-msgstr "_Compartir"
-
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
 msgid "Access Rights"
 msgstr "Dereitos de acceso"
@@ -17524,7 +17275,7 @@ msgid "Proxy"
 msgstr "Proxy"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-#: ../widgets/misc/e-account-tree-view.c:230
+#: ../widgets/misc/e-account-tree-view.c:243
 msgid "Account Name"
 msgstr "Nome da conta"
 
@@ -17534,31 +17285,31 @@ msgstr "Iniciar sesión no proxy"
 
 #: ../plugins/groupwise-features/proxy-login.c:208
 #: ../plugins/groupwise-features/proxy-login.c:251
-#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/proxy.c:494
 #: ../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:689
+#: ../plugins/groupwise-features/proxy.c:698
 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:695
+#: ../plugins/groupwise-features/proxy.c:704
 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."
 
 #. 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
+#: ../plugins/groupwise-features/proxy.c:709
 msgctxt "GW"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../plugins/groupwise-features/proxy.c:926
-#: ../plugins/groupwise-features/share-folder.c:691
+#: ../plugins/groupwise-features/proxy.c:935
+#: ../plugins/groupwise-features/share-folder.c:692
 msgid "Add User"
 msgstr "Engadir usuario"
 
@@ -17566,77 +17317,77 @@ msgstr "Engadir usuario"
 msgid "Advanced send options"
 msgstr "Opcións de envío avanzadas"
 
-#: ../plugins/groupwise-features/share-folder-common.c:310
-#: ../plugins/groupwise-features/share-folder.c:726
+#: ../plugins/groupwise-features/share-folder-common.c:316
+#: ../plugins/groupwise-features/share-folder.c:727
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../plugins/groupwise-features/share-folder-common.c:311
+#: ../plugins/groupwise-features/share-folder-common.c:317
 msgid "Enter the users and set permissions"
 msgstr "Introduza os usuarios e defina os permisos"
 
-#: ../plugins/groupwise-features/share-folder-common.c:407
+#: ../plugins/groupwise-features/share-folder-common.c:418
 msgid "Sharing"
 msgstr "Compartir"
 
-#: ../plugins/groupwise-features/share-folder.c:529
+#: ../plugins/groupwise-features/share-folder.c:530
 msgid "Custom Notification"
 msgstr "Notificación personalizada"
 
-#: ../plugins/groupwise-features/share-folder.c:731
+#: ../plugins/groupwise-features/share-folder.c:732
 msgid "Add   "
 msgstr "Engadir   "
 
-#: ../plugins/groupwise-features/share-folder.c:737
+#: ../plugins/groupwise-features/share-folder.c:738
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../plugins/groupwise-features/status-track.c:123
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "Message Status"
 msgstr "Estado da mensaxe"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:137
+#: ../plugins/groupwise-features/status-track.c:139
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: ../plugins/groupwise-features/status-track.c:151
+#: ../plugins/groupwise-features/status-track.c:153
 msgid "From:"
 msgstr "De:"
 
-#: ../plugins/groupwise-features/status-track.c:166
+#: ../plugins/groupwise-features/status-track.c:168
 msgid "Creation date:"
 msgstr "Data de creación:"
 
-#: ../plugins/groupwise-features/status-track.c:206
+#: ../plugins/groupwise-features/status-track.c:208
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: ../plugins/groupwise-features/status-track.c:213
+#: ../plugins/groupwise-features/status-track.c:215
 msgid "Delivered: "
 msgstr "Entregada: "
 
-#: ../plugins/groupwise-features/status-track.c:219
+#: ../plugins/groupwise-features/status-track.c:221
 msgid "Opened: "
 msgstr "Aberta: "
 
-#: ../plugins/groupwise-features/status-track.c:224
+#: ../plugins/groupwise-features/status-track.c:226
 msgid "Accepted: "
 msgstr "Aceptada: "
 
-#: ../plugins/groupwise-features/status-track.c:229
+#: ../plugins/groupwise-features/status-track.c:231
 msgid "Deleted: "
 msgstr "Eliminada: "
 
-#: ../plugins/groupwise-features/status-track.c:234
+#: ../plugins/groupwise-features/status-track.c:236
 msgid "Declined: "
 msgstr "Rexeitada: "
 
-#: ../plugins/groupwise-features/status-track.c:239
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Completed: "
 msgstr "Terminada: "
 
-#: ../plugins/groupwise-features/status-track.c:244
+#: ../plugins/groupwise-features/status-track.c:246
 msgid "Undelivered: "
 msgstr "Sen entregar: "
 
@@ -17648,12 +17399,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:330
+#: ../plugins/imap-features/imap-headers.c:329
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "Cabeceiras personalizadas"
 
-#: ../plugins/imap-features/imap-headers.c:343
+#: ../plugins/imap-features/imap-headers.c:342
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "Cabeceiras IMAP"
@@ -17707,137 +17458,143 @@ msgstr "Características IMAP"
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Produciuse un fallo ao cargar o calendario «%s» (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:649
+#: ../plugins/itip-formatter/itip-formatter.c:654
 #, 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"
 
-#: ../plugins/itip-formatter/itip-formatter.c:685
+#: ../plugins/itip-formatter/itip-formatter.c:690
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Localizouse a cita no calendario «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:784
+#: ../plugins/itip-formatter/itip-formatter.c:789
 msgid "Unable to find any calendars"
 msgstr "Non é posíbel localizar ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:791
+#: ../plugins/itip-formatter/itip-formatter.c:796
 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:795
+#: ../plugins/itip-formatter/itip-formatter.c:800
 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:799
+#: ../plugins/itip-formatter/itip-formatter.c:804
 msgid "Unable to find this memo in any memo list"
 msgstr "Non é posíbel localizar esta nota en ningunha lista de notas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:880
 msgid "Opening the calendar. Please wait.."
 msgstr "Abrindo o calendario. Agarde..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:883
 msgid "Searching for an existing version of this appointment"
 msgstr "Buscando unha versión existente desta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1166
 msgid "Unable to parse item"
 msgstr "Non é posíbel analizar o elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1255
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Non é posíbel enviar o elemento ao calendario «%s». %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1267
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado ao calendario «%s» como aceptado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1271
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado ao calendario «%s» como provisional"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1276
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado ao calendario «%s» como rexeitado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado ao calendario «%s» como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1375
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "O organizador eliminou o delegado %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1382
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviouse unha notificación de cancelación ao delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1384
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Non foi posíbel enviar unha notificación de cancelación ao delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1495
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Non foi posíbel actualizar o estado de participación debido a que o estado "
 "non é válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1524
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Non é posíbel actualizar o participante. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1528
 msgid "Attendee status updated"
 msgstr "Estado de participación actualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1532
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+"Non foi posíbel actualizar o estado do participante porque xa non existe o "
+"elemento"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1554
 msgid "Meeting information sent"
 msgstr "Información da cita enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1557
 msgid "Task information sent"
 msgstr "Información da tarefa enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1560
 msgid "Memo information sent"
 msgstr "Información da nota enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1569
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Non é posíbel enviar información da cita: a cita non existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1572
 msgid "Unable to send task information, the task does not exist"
 msgstr "Non é posíbel enviar información da tarefa: a tarefa non existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1575
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Non é posíbel enviar información da nota: a nota non existe"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1640
 msgid "calendar.ics"
 msgstr "Calendarios"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Save Calendar"
 msgstr "Calendario novo"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1586
-#: ../plugins/itip-formatter/itip-formatter.c:1597
+#: ../plugins/itip-formatter/itip-formatter.c:1703
+#: ../plugins/itip-formatter/itip-formatter.c:1714
 msgid "The calendar attached is not valid"
 msgstr "O calendario anexo non é válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1704
+#: ../plugins/itip-formatter/itip-formatter.c:1715
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17845,15 +17602,15 @@ msgstr ""
 "A mensaxe di que contén un calendario mais o calendario non é un iCalendar "
 "válido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1638
-#: ../plugins/itip-formatter/itip-formatter.c:1666
-#: ../plugins/itip-formatter/itip-formatter.c:1775
+#: ../plugins/itip-formatter/itip-formatter.c:1755
+#: ../plugins/itip-formatter/itip-formatter.c:1783
+#: ../plugins/itip-formatter/itip-formatter.c:1892
 msgid "The item in the calendar is not valid"
 msgstr "O elemento no calendario non é válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1776
+#: ../plugins/itip-formatter/itip-formatter.c:1756
+#: ../plugins/itip-formatter/itip-formatter.c:1784
+#: ../plugins/itip-formatter/itip-formatter.c:1893
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17861,11 +17618,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:1680
+#: ../plugins/itip-formatter/itip-formatter.c:1797
 msgid "The calendar attached contains multiple items"
 msgstr "O calendario anexo contén múltiples elementos"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1798
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17873,31 +17630,40 @@ msgstr ""
 "Para procesar todos estes elementos, debería gardarse o ficheiro e "
 "importarse o calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2454
+#: ../plugins/itip-formatter/itip-formatter.c:2460
+msgctxt "cal-itip"
+msgid "None"
+msgstr "Ningún"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2476
+msgid "Tentatively Accepted"
+msgstr "Aceptado provisionalmente"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2594
 msgid "This meeting recurs"
 msgstr "Esta cita repítese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2457
+#: ../plugins/itip-formatter/itip-formatter.c:2597
 msgid "This task recurs"
 msgstr "Esta tarefa repítese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2460
+#: ../plugins/itip-formatter/itip-formatter.c:2600
 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:2694
+#: ../plugins/itip-formatter/itip-formatter.c:2834
 msgid "_Delete message after acting"
 msgstr "E_liminar a mensaxe despois de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2704
-#: ../plugins/itip-formatter/itip-formatter.c:2737
+#: ../plugins/itip-formatter/itip-formatter.c:2844
+#: ../plugins/itip-formatter/itip-formatter.c:2877
 msgid "Conflict Search"
 msgstr "Buscar conflito"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2719
+#: ../plugins/itip-formatter/itip-formatter.c:2859
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione os calendarios nos que buscar conflitos entre reunións"
 
@@ -18033,6 +17799,14 @@ msgstr "%A, %e de %B de %Y, %l:%M %p"
 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: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"
+
 #: ../plugins/itip-formatter/itip-view.c:367
 #: ../plugins/itip-formatter/itip-view.c:455
 #: ../plugins/itip-formatter/itip-view.c:542
@@ -18269,7 +18043,7 @@ msgstr "Data de _comezo:"
 
 #. Start time
 #: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1053
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Start time:"
 msgstr "Hora de comezo:"
 
@@ -18279,7 +18053,7 @@ msgstr "%d día"
 
 #. End time
 #: ../plugins/itip-formatter/itip-view.c:710
-#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1065
 msgid "End time:"
 msgstr "Hora de finalización:"
 
@@ -18338,41 +18112,41 @@ msgid "_Update"
 msgstr "Act_ualizar"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1084
-#: ../plugins/itip-formatter/itip-view.c:1138
+#: ../plugins/itip-formatter/itip-view.c:1085
+#: ../plugins/itip-formatter/itip-view.c:1139
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: ../plugins/itip-formatter/itip-view.c:1123
+#: ../plugins/itip-formatter/itip-view.c:1124
 msgid "Send _reply to sender"
 msgstr "_Responder ao remitente"
 
-#: ../plugins/itip-formatter/itip-view.c:1153
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "Send _updates to attendees"
 msgstr "Mandar as act_ualizacións aos participantes"
 
-#: ../plugins/itip-formatter/itip-view.c:1162
+#: ../plugins/itip-formatter/itip-view.c:1163
 msgid "_Apply to all instances"
 msgstr "_Aplicar en todos os casos"
 
-#: ../plugins/itip-formatter/itip-view.c:1171
+#: ../plugins/itip-formatter/itip-view.c:1172
 msgid "Show time as _free"
 msgstr "Mostrar a hora como _libre"
 
-#: ../plugins/itip-formatter/itip-view.c:1174
+#: ../plugins/itip-formatter/itip-view.c:1175
 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:1180
+#: ../plugins/itip-formatter/itip-view.c:1181
 msgid "_Inherit reminder"
 msgstr "_Herdar o aviso"
 
-#: ../plugins/itip-formatter/itip-view.c:1923
+#: ../plugins/itip-formatter/itip-view.c:1924
 msgid "_Tasks:"
 msgstr "_Tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:1925
+#: ../plugins/itip-formatter/itip-view.c:1926
 msgid "_Memos:"
 msgstr "_Notas:"
 
@@ -18476,15 +18250,7 @@ msgstr ""
 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:352
-msgid "Evolution's Mail Notification"
-msgstr "Notificación de correo do Evolution"
-
-#: ../plugins/mail-notification/mail-notification.c:374
-msgid "Mail Notification Properties"
-msgstr "Propiedades da notificación de correo"
-
-#: ../plugins/mail-notification/mail-notification.c:507
+#: ../plugins/mail-notification/mail-notification.c:390
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18501,64 +18267,65 @@ msgstr[1] ""
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:519
+#: ../plugins/mail-notification/mail-notification.c:402
 #, c-format
 msgid "From: %s"
 msgstr "De: %s:"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:532
+#: ../plugins/mail-notification/mail-notification.c:415
 #, c-format
 msgid "Subject: %s"
 msgstr "Asunto: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:542
+#: ../plugins/mail-notification/mail-notification.c:425
 #, 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:559
-#: ../plugins/mail-notification/mail-notification.c:566
+#: ../plugins/mail-notification/mail-notification.c:438
+#: ../plugins/mail-notification/mail-notification.c:446
+#: ../plugins/mail-notification/mail-notification.c:449
 msgid "New email"
 msgstr "Novo correo"
 
-#: ../plugins/mail-notification/mail-notification.c:627
+#: ../plugins/mail-notification/mail-notification.c:498
 msgid "Show icon in _notification area"
 msgstr "Mostrar a icona na área de _notificación"
 
-#: ../plugins/mail-notification/mail-notification.c:656
+#: ../plugins/mail-notification/mail-notification.c:528
 msgid "Popup _message together with the icon"
 msgstr "Facer emerxer a _mensaxe xunto coa icona"
 
-#: ../plugins/mail-notification/mail-notification.c:843
+#: ../plugins/mail-notification/mail-notification.c:715
 msgid "_Play sound when new messages arrive"
 msgstr "_Reproducir un son cando cheguen mensaxes novas"
 
-#: ../plugins/mail-notification/mail-notification.c:872
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "_Beep"
 msgstr "_Ton de aviso"
 
-#: ../plugins/mail-notification/mail-notification.c:885
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "Use sound _theme"
 msgstr "Usar _tema de sons"
 
-#: ../plugins/mail-notification/mail-notification.c:904
+#: ../plugins/mail-notification/mail-notification.c:777
 msgid "Play _file:"
 msgstr "Reproducir un ficheiro de _son"
 
-#: ../plugins/mail-notification/mail-notification.c:915
+#: ../plugins/mail-notification/mail-notification.c:788
 msgid "Select sound file"
 msgstr "Seleccionar un ficheiro de son"
 
-#: ../plugins/mail-notification/mail-notification.c:973
+#: ../plugins/mail-notification/mail-notification.c:846
 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:982
+#: ../plugins/mail-notification/mail-notification.c:855
 msgid "Generate a _D-Bus message"
 msgstr "Xerar unha mensaxe _D-Bus"
 
@@ -18571,12 +18338,12 @@ 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:158
+#: ../plugins/mail-to-task/mail-to-task.c:157
 #, 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:490
+#: ../plugins/mail-to-task/mail-to-task.c:489
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18585,7 +18352,7 @@ msgstr ""
 "O calendario seleccionado contén xa unha actividade «%s». Quere editar a  "
 "actividade vella?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:493
+#: ../plugins/mail-to-task/mail-to-task.c:492
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18594,7 +18361,7 @@ msgstr ""
 "A lista de tarefas seleccionadas contén xa unha tarefa «%s». Quere editar a "
 "actividade vella?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:495
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18606,7 +18373,7 @@ msgstr ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:516
+#: ../plugins/mail-to-task/mail-to-task.c:515
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18617,7 +18384,7 @@ msgstr ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#: ../plugins/mail-to-task/mail-to-task.c:521
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18628,7 +18395,7 @@ msgstr ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:528
+#: ../plugins/mail-to-task/mail-to-task.c:527
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18639,7 +18406,7 @@ msgstr ""
 #. 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
+#: ../plugins/mail-to-task/mail-to-task.c:548
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18656,7 +18423,7 @@ msgstr[1] ""
 #. 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
+#: ../plugins/mail-to-task/mail-to-task.c:557
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18673,7 +18440,7 @@ msgstr[1] ""
 #. 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
+#: ../plugins/mail-to-task/mail-to-task.c:566
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18687,25 +18454,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:626
+#: ../plugins/mail-to-task/mail-to-task.c:625
 msgid "[No Summary]"
 msgstr "[Sen resumo]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:637
+#: ../plugins/mail-to-task/mail-to-task.c:636
 msgid "Invalid object returned from a server"
 msgstr "O obxecto devolto polo servidor non é válido"
 
-#: ../plugins/mail-to-task/mail-to-task.c:708
+#: ../plugins/mail-to-task/mail-to-task.c:707
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Produciuse un erro no proceso: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:737
+#: ../plugins/mail-to-task/mail-to-task.c:736
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Non é posíbel abrir o calendario. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:744
+#: ../plugins/mail-to-task/mail-to-task.c:743
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18713,7 +18480,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:747
+#: ../plugins/mail-to-task/mail-to-task.c:746
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18721,7 +18488,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:750
+#: ../plugins/mail-to-task/mail-to-task.c:749
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18729,40 +18496,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:953
+#: ../plugins/mail-to-task/mail-to-task.c:955
 #, 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:1072
+#: ../plugins/mail-to-task/mail-to-task.c:1074
 msgid "Create an _Event"
 msgstr "Cr_ear unha actividade"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1076
 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:1079
+#: ../plugins/mail-to-task/mail-to-task.c:1081
 msgid "Create a Mem_o"
 msgstr "Crear unha n_ota"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1081
+#: ../plugins/mail-to-task/mail-to-task.c:1083
 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:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1088
 msgid "Create a _Task"
 msgstr "Crear unha _tarefa"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1088
+#: ../plugins/mail-to-task/mail-to-task.c:1090
 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:1096
+#: ../plugins/mail-to-task/mail-to-task.c:1098
 msgid "Create a _Meeting"
 msgstr "Crear unha _cita"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1098
+#: ../plugins/mail-to-task/mail-to-task.c:1100
 msgid "Create a new meeting from the selected message"
 msgstr "Crear unha cita nova a partir da mensaxe seleccionada"
 
@@ -18770,56 +18537,56 @@ 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:291
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:294
 msgid "Get List _Archive"
 msgstr "Obter _arquivo da lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:296
 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:298
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:301
 msgid "Get List _Usage Information"
 msgstr "Obter información do _uso da lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:303
 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:305
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:308
 msgid "Contact List _Owner"
 msgstr "Pr_opietario da lista de contactos"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:310
 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:312
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:315
 msgid "_Post Message to List"
 msgstr "_Publicar unha mensaxe na lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:317
 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:319
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:322
 msgid "_Subscribe to List"
 msgstr "_Subscribirse á lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:324
 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:326
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:329
 msgid "_Unsubscribe from List"
 msgstr "E_liminar subscrición da lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:328
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:331
 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:335
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:338
 msgid "Mailing _List"
 msgstr "_Lista de correo"
 
@@ -18935,7 +18702,7 @@ msgstr "No cartafol actual e _subcartafoles"
 msgid "In Current _Folder Only"
 msgstr "Só no carta_fol actual"
 
-#: ../plugins/mark-all-read/mark-all-read.c:439
+#: ../plugins/mark-all-read/mark-all-read.c:447
 msgid "Mark Me_ssages as Read"
 msgstr "Marcar as men_saxes como lidas"
 
@@ -18947,40 +18714,6 @@ msgstr "Marcar todo como lido"
 msgid "Mark all messages in a folder as read."
 msgstr "Marcar todas as mensaxes do cartafol como lidas."
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "Manage your Evolution plugins."
-msgstr "Xestione os seus engadidos de Evolution."
-
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:244
-msgid "Plugin Manager"
-msgstr "Xestor de engadidos"
-
-#: ../plugins/plugin-manager/plugin-manager.c:59
-msgid "Author(s)"
-msgstr "Autoría"
-
-#: ../plugins/plugin-manager/plugin-manager.c:259
-msgid "Note: Some changes will not take effect until restart"
-msgstr "Nota: algunhas modificacións non serán efectivas até que reinicie"
-
-#: ../plugins/plugin-manager/plugin-manager.c:285
-msgid "Overview"
-msgstr "Visión xeral"
-
-#: ../plugins/plugin-manager/plugin-manager.c:356
-#: ../plugins/plugin-manager/plugin-manager.c:418
-msgid "Plugin"
-msgstr "engadido"
-
-#: ../plugins/plugin-manager/plugin-manager.c:430
-msgid "_Plugins"
-msgstr "_Engadidos"
-
-#: ../plugins/plugin-manager/plugin-manager.c:432
-msgid "Enable and disable plugins"
-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"
@@ -18995,19 +18728,19 @@ msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr ""
 "Ver mensaxes de correo como texto simple aínda que conteñan contido HTML."
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:225
 msgid "Show HTML if present"
 msgstr "Mostrar HTML se está presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:225
 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:199
+#: ../plugins/prefer-plain/prefer-plain.c:226
 msgid "Show plain text if present"
 msgstr "Mostrar HTML se está presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:226
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -19015,21 +18748,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:200
+#: ../plugins/prefer-plain/prefer-plain.c:227
 msgid "Only ever show plain text"
 msgstr "Mostrar só PLANO"
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:227
 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:247
+#: ../plugins/prefer-plain/prefer-plain.c:274
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Mostra a parte HTML _suprimida como anexos"
 
-#: ../plugins/prefer-plain/prefer-plain.c:267
+#: ../plugins/prefer-plain/prefer-plain.c:294
 msgid "HTML _Mode"
 msgstr "_Modo HTML"
 
@@ -19053,41 +18786,42 @@ msgstr "Importación de PST do Outlook"
 msgid "Outlook personal folders (.pst)"
 msgstr "Cartafoles persoais do Outlook (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:295
+#: ../plugins/pst-import/pst-importer.c:311
 msgid "_Mail"
 msgstr "_Correo"
 
-#: ../plugins/pst-import/pst-importer.c:307
+#: ../plugins/pst-import/pst-importer.c:323
 msgid "Destination folder:"
 msgstr "Cartafol de destino:"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:313
+#: ../plugins/pst-import/pst-importer.c:329
 msgid "_Address Book"
 msgstr "_Axenda de enderezos"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:320
+#: ../plugins/pst-import/pst-importer.c:336
 msgid "A_ppointments"
 msgstr "Ci_tas"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:326 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:342 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tarefas"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:332
+#: ../plugins/pst-import/pst-importer.c:348
 msgid "_Journal entries"
 msgstr "Entradas de _diario"
 
-#: ../plugins/pst-import/pst-importer.c:347
+#: ../plugins/pst-import/pst-importer.c:363
 msgid "Importing Outlook data"
 msgstr "Importación de datos do Outlook"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 #: ../plugins/publish-calendar/publish-calendar.c:146
-#: ../plugins/publish-calendar/publish-calendar.c:153
+#: ../plugins/publish-calendar/publish-calendar.c:154
+#: ../plugins/publish-calendar/publish-calendar.c:156
 msgid "Calendar Publishing"
 msgstr "Publicación de calendarios"
 
@@ -19099,49 +18833,49 @@ msgstr "Localizacións"
 msgid "Publish calendars to the web."
 msgstr "Publicar calendarios na web."
 
-#: ../plugins/publish-calendar/publish-calendar.c:208
-#: ../plugins/publish-calendar/publish-calendar.c:449
+#: ../plugins/publish-calendar/publish-calendar.c:212
+#: ../plugins/publish-calendar/publish-calendar.c:453
 #, c-format
 msgid "Could not open %s:"
 msgstr "Non foi posíbel abrir %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:210
+#: ../plugins/publish-calendar/publish-calendar.c:214
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "Non foi posíbel abrir %s: erro descoñecido"
 
-#: ../plugins/publish-calendar/publish-calendar.c:230
+#: ../plugins/publish-calendar/publish-calendar.c:234
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "Produciuse un erro ao publicar cara %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:232
+#: ../plugins/publish-calendar/publish-calendar.c:236
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "Rematouse con éxito a publicación cara %s"
 
-#: ../plugins/publish-calendar/publish-calendar.c:276
+#: ../plugins/publish-calendar/publish-calendar.c:280
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Produciuse un fallo ao montar %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:600
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "E_nable"
 msgstr "A_ctivar"
 
-#: ../plugins/publish-calendar/publish-calendar.c:739
+#: ../plugins/publish-calendar/publish-calendar.c:743
 msgid "Are you sure you want to remove this location?"
 msgstr "Está seguro de que quere eliminar esta localización?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. where the publishing should be done, fails. Basically, this shouldn't
 #. ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1051
+#: ../plugins/publish-calendar/publish-calendar.c:1055
 msgid "Could not create publish thread."
 msgstr "Non foi posíbel crear o fío publicado."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1059
+#: ../plugins/publish-calendar/publish-calendar.c:1063
 msgid "_Publish Calendar Information"
 msgstr "_Publicar información do calendario"
 
@@ -19244,57 +18978,57 @@ msgstr ""
 "Non foi posíbel publicar o calendario: A infraestrutura Calendar xa non "
 "existe"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:481
 msgid "New Location"
 msgstr "Localización nova"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
 msgid "Edit Location"
 msgstr "Editar localización"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
 #, 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:129
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Produciuse un fallo ao crear a canalización: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Erro despois de facer fork: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
 #, 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:234
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, 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:243
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:252
 #, 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:506
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:519
 #, 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:927
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:940
 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:935
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:948
 msgid "I_nclude remote tests"
 msgstr "I_ncluír probas remotas"
 
@@ -19346,6 +19080,10 @@ msgstr "Comezar"
 msgid "End"
 msgstr "Finalizar"
 
+#: ../plugins/save-calendar/csv-format.c:372
+msgid "Due"
+msgstr "Vencemento"
+
 #: ../plugins/save-calendar/csv-format.c:373
 msgid "percent Done"
 msgstr "porcentaxe feita"
@@ -19431,23 +19169,6 @@ msgstr "Gardar as mensaxes como un ficheiro de texto"
 msgid "Save the selected task list to disk"
 msgstr "Garda un calendario ou unha lista de tarefas no disco."
 
-#: ../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."
-
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
-msgid "Subject Threading"
-msgstr "Encadeamento de asunto"
-
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
-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:63
-msgid "F_all back to threading messages by subject"
-msgstr "Volver a relacionar as mensaxes polo _asunto"
-
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
@@ -19460,15 +19181,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "engadido de modelo baseado en borradores"
 
-#: ../plugins/templates/templates.c:621
+#: ../plugins/templates/templates.c:626
 msgid "No Title"
 msgstr "Sen título"
 
-#: ../plugins/templates/templates.c:715
+#: ../plugins/templates/templates.c:736
 msgid "Save as _Template"
 msgstr "Gardar como _modelo"
 
-#: ../plugins/templates/templates.c:717
+#: ../plugins/templates/templates.c:738
 msgid "Save as Template"
 msgstr "Gardar como modelo"
 
@@ -19488,29 +19209,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:181
-#: ../plugins/vcard-inline/vcard-inline.c:266
+#: ../plugins/vcard-inline/vcard-inline.c:182
+#: ../plugins/vcard-inline/vcard-inline.c:267
 msgid "Show Full vCard"
 msgstr "Mostrar vCard completa"
 
-#: ../plugins/vcard-inline/vcard-inline.c:184
+#: ../plugins/vcard-inline/vcard-inline.c:185
 msgid "Show Compact vCard"
 msgstr "Mostrar vCard compacta"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:246
 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:254
+#: ../plugins/vcard-inline/vcard-inline.c:255
 #, 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:275
+#: ../plugins/vcard-inline/vcard-inline.c:276
 msgid "Save in Address Book"
 msgstr "Gardar na axenda de enderezos"
 
@@ -19634,8 +19355,8 @@ msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
 msgstr ""
-"Visión inicial da barra de widgets de anexos. \"0\" é Visión de iconas, \"1"
-"\" é Visión en lista."
+"Visión inicial da barra de widgets de anexos. \"0\" é Visión de iconas, "
+"\"1\" é Visión en lista."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Last upgraded configuration version"
@@ -19697,7 +19418,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:331
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:342
 msgid "Start in offline mode"
 msgstr "Iniciar en modo sen conexión"
 
@@ -19856,11 +19577,11 @@ 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:528 ../shell/e-shell-content.c:529
+#: ../shell/e-shell-content.c:671 ../shell/e-shell-content.c:672
 msgid "Searches"
 msgstr "Buscas"
 
-#: ../shell/e-shell-content.c:571
+#: ../shell/e-shell-content.c:714
 msgid "Save Search"
 msgstr "Gardar a busca"
 
@@ -19868,38 +19589,42 @@ msgstr "Gardar a busca"
 #. * 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:929
+#: ../shell/e-shell-searchbar.c:938
 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:960
+#: ../shell/e-shell-searchbar.c:971
 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:1021
+#: ../shell/e-shell-searchbar.c:1034
 msgid "i_n"
 msgstr " e_n "
 
-#: ../shell/e-shell-utils.c:253
+#: ../shell/e-shell-utils.c:255
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../shell/e-shell-utils.c:255
+#: ../shell/e-shell-utils.c:257
 msgid "iCalendar (.ics)"
 msgstr "Ficheiros iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:276
+#: ../shell/e-shell-utils.c:278
 msgid "All Files (*)"
 msgstr "Todos os ficheiros"
 
+#: ../shell/e-shell-view.c:297
+msgid "Saving user interface state"
+msgstr ""
+
 #. 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
+#: ../shell/e-shell-window-actions.c:643
 msgid "translator-credits"
 msgstr ""
 "Fran Diéguez <frandieguez ubuntu com>, 2009, 2010.\n"
@@ -19912,307 +19637,307 @@ msgstr ""
 "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
+#: ../shell/e-shell-window-actions.c:654
 msgid "Evolution Website"
 msgstr "Sitio web do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1236
+#: ../shell/e-shell-window-actions.c:1234
 msgid "Bug Buddy is not installed."
 msgstr "O Bug buddy non está instalado."
 
-#: ../shell/e-shell-window-actions.c:1238
+#: ../shell/e-shell-window-actions.c:1236
 msgid "Bug Buddy could not be run."
 msgstr "Non foi posíbel executar o Bug Buddy."
 
-#: ../shell/e-shell-window-actions.c:1419
+#: ../shell/e-shell-window-actions.c:1417
 msgid "Show information about Evolution"
 msgstr "Mostrar información sobre o Evolution"
 
-#: ../shell/e-shell-window-actions.c:1424
-#: ../shell/e-shell-window-actions.c:1438
+#: ../shell/e-shell-window-actions.c:1422
+#: ../shell/e-shell-window-actions.c:1436
 msgid "_Close Window"
 msgstr "_Pechar xanela"
 
-#: ../shell/e-shell-window-actions.c:1445
+#: ../shell/e-shell-window-actions.c:1443
 msgid "_Contents"
 msgstr "Ci_tas"
 
-#: ../shell/e-shell-window-actions.c:1447
+#: ../shell/e-shell-window-actions.c:1445
 msgid "Open the Evolution User Guide"
 msgstr "Abrir o cartafol doutro usuario"
 
-#: ../shell/e-shell-window-actions.c:1473
+#: ../shell/e-shell-window-actions.c:1471
 msgid "Evolution _FAQ"
 msgstr "_FAQ do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1475
+#: ../shell/e-shell-window-actions.c:1473
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Abrir a páxina web das Preguntas frecuentes (FAQ)"
 
-#: ../shell/e-shell-window-actions.c:1480
+#: ../shell/e-shell-window-actions.c:1478
 msgid "_Forget Passwords"
 msgstr "_Esquecer os contrasinais"
 
-#: ../shell/e-shell-window-actions.c:1482
+#: ../shell/e-shell-window-actions.c:1480
 msgid "Forget all remembered passwords"
 msgstr "Está seguro de que quere esquecer todos os contrasinais memorizados?"
 
-#: ../shell/e-shell-window-actions.c:1487
+#: ../shell/e-shell-window-actions.c:1485
 msgid "I_mport..."
 msgstr "I_mportar..."
 
-#: ../shell/e-shell-window-actions.c:1489
+#: ../shell/e-shell-window-actions.c:1487
 msgid "Import data from other programs"
 msgstr "Importar datos doutros programas"
 
-#: ../shell/e-shell-window-actions.c:1494
+#: ../shell/e-shell-window-actions.c:1492
 msgid "New _Window"
 msgstr "_Xanela nova"
 
-#: ../shell/e-shell-window-actions.c:1496
+#: ../shell/e-shell-window-actions.c:1494
 msgid "Create a new window displaying this view"
 msgstr "Crear unha xanela nova ao mostrar este cartafol"
 
-#: ../shell/e-shell-window-actions.c:1510
+#: ../shell/e-shell-window-actions.c:1508
 msgid "Configure Evolution"
 msgstr "Configuración"
 
-#: ../shell/e-shell-window-actions.c:1515
+#: ../shell/e-shell-window-actions.c:1513
 msgid "_Quick Reference"
 msgstr "_Referencia rápida"
 
-#: ../shell/e-shell-window-actions.c:1517
+#: ../shell/e-shell-window-actions.c:1515
 msgid "Show Evolution's shortcut keys"
 msgstr "Modificar a configuración do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1524
+#: ../shell/e-shell-window-actions.c:1522
 msgid "Exit the program"
 msgstr "Saír do programa"
 
-#: ../shell/e-shell-window-actions.c:1529
+#: ../shell/e-shell-window-actions.c:1527
 msgid "_Advanced Search..."
 msgstr "Busca _avanzada..."
 
-#: ../shell/e-shell-window-actions.c:1531
+#: ../shell/e-shell-window-actions.c:1529
 msgid "Construct a more advanced search"
 msgstr "Constrúe unha búsqueda máis avanzada"
 
-#: ../shell/e-shell-window-actions.c:1538
+#: ../shell/e-shell-window-actions.c:1536
 msgid "Clear the current search parameters"
 msgstr "Limpar búsqueda"
 
-#: ../shell/e-shell-window-actions.c:1543
+#: ../shell/e-shell-window-actions.c:1541
 msgid "_Edit Saved Searches..."
 msgstr "_Editar as buscas gardadas..."
 
-#: ../shell/e-shell-window-actions.c:1545
+#: ../shell/e-shell-window-actions.c:1543
 msgid "Manage your saved searches"
 msgstr "Xestionar o seu correo, contactos e calendario"
 
-#: ../shell/e-shell-window-actions.c:1552
+#: ../shell/e-shell-window-actions.c:1550
 msgid "Click here to change the search type"
 msgstr "Prema aquí para cambiar o tipo de busca"
 
-#: ../shell/e-shell-window-actions.c:1557
+#: ../shell/e-shell-window-actions.c:1555
 msgid "_Find Now"
 msgstr "_Buscar agora"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1559
+#: ../shell/e-shell-window-actions.c:1557
 msgid "Execute the current search parameters"
 msgstr "Cancelar a operación de correo actual"
 
-#: ../shell/e-shell-window-actions.c:1564
+#: ../shell/e-shell-window-actions.c:1562
 msgid "_Save Search..."
 msgstr "_Gardar a busca..."
 
-#: ../shell/e-shell-window-actions.c:1566
+#: ../shell/e-shell-window-actions.c:1564
 msgid "Save the current search parameters"
 msgstr "Gardar o ficheiro actual"
 
-#: ../shell/e-shell-window-actions.c:1578
+#: ../shell/e-shell-window-actions.c:1576
 msgid "Send / _Receive"
 msgstr "Enviar/_Recibir"
 
-#: ../shell/e-shell-window-actions.c:1580
+#: ../shell/e-shell-window-actions.c:1578
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar elementos da fila e obter elementos novos"
 
-#: ../shell/e-shell-window-actions.c:1585
+#: ../shell/e-shell-window-actions.c:1583
 msgid "Submit _Bug Report..."
 msgstr "Enviar un _informe de erro"
 
-#: ../shell/e-shell-window-actions.c:1587
+#: ../shell/e-shell-window-actions.c:1585
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1592
+#: ../shell/e-shell-window-actions.c:1590
 msgid "_Work Offline"
 msgstr "_Traballar sen conexión"
 
-#: ../shell/e-shell-window-actions.c:1594
+#: ../shell/e-shell-window-actions.c:1592
 msgid "Put Evolution into offline mode"
 msgstr "Iniciar en modo sen conexión"
 
-#: ../shell/e-shell-window-actions.c:1599
+#: ../shell/e-shell-window-actions.c:1597
 msgid "_Work Online"
 msgstr "_Traballar con conexión"
 
-#: ../shell/e-shell-window-actions.c:1601
+#: ../shell/e-shell-window-actions.c:1599
 msgid "Put Evolution into online mode"
 msgstr "Iniciar en modo con conexión"
 
-#: ../shell/e-shell-window-actions.c:1629
+#: ../shell/e-shell-window-actions.c:1627
 msgid "Lay_out"
 msgstr "Disp_osición"
 
-#: ../shell/e-shell-window-actions.c:1636
+#: ../shell/e-shell-window-actions.c:1634
 msgid "_New"
 msgstr "_Novo"
 
-#: ../shell/e-shell-window-actions.c:1643
+#: ../shell/e-shell-window-actions.c:1641
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../shell/e-shell-window-actions.c:1650
+#: ../shell/e-shell-window-actions.c:1648
 msgid "_Switcher Appearance"
 msgstr "Aparencia do _selector"
 
-#: ../shell/e-shell-window-actions.c:1664
+#: ../shell/e-shell-window-actions.c:1662
 msgid "_Window"
 msgstr "_Xanela"
 
-#: ../shell/e-shell-window-actions.c:1693
+#: ../shell/e-shell-window-actions.c:1691
 msgid "Show Side _Bar"
 msgstr "Mostrar _barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1695
+#: ../shell/e-shell-window-actions.c:1693
 msgid "Show the side bar"
 msgstr "Mostrar _barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1701
+#: ../shell/e-shell-window-actions.c:1699
 msgid "Show _Buttons"
 msgstr "Mostrar animacións"
 
-#: ../shell/e-shell-window-actions.c:1703
+#: ../shell/e-shell-window-actions.c:1701
 msgid "Show the switcher buttons"
 msgstr "Mostrar o fuso horario secundario"
 
-#: ../shell/e-shell-window-actions.c:1709
+#: ../shell/e-shell-window-actions.c:1707
 msgid "Show _Status Bar"
 msgstr "Mostrar _barra de estado"
 
-#: ../shell/e-shell-window-actions.c:1711
+#: ../shell/e-shell-window-actions.c:1709
 msgid "Show the status bar"
 msgstr "Mostrar _barra de estado"
 
-#: ../shell/e-shell-window-actions.c:1717
+#: ../shell/e-shell-window-actions.c:1715
 msgid "Show _Tool Bar"
 msgstr "Mostrar barra de _ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1719
+#: ../shell/e-shell-window-actions.c:1717
 msgid "Show the tool bar"
 msgstr "Mostrar barra de _ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1741
+#: ../shell/e-shell-window-actions.c:1739
 msgid "_Icons Only"
 msgstr "Só _iconas"
 
-#: ../shell/e-shell-window-actions.c:1743
+#: ../shell/e-shell-window-actions.c:1741
 msgid "Display window buttons with icons only"
 msgstr "Mostrar os botóns da xanela só con iconas"
 
-#: ../shell/e-shell-window-actions.c:1748
+#: ../shell/e-shell-window-actions.c:1746
 msgid "_Text Only"
 msgstr "Só _texto"
 
-#: ../shell/e-shell-window-actions.c:1750
+#: ../shell/e-shell-window-actions.c:1748
 msgid "Display window buttons with text only"
 msgstr "Mostrar os botóns da xanela só con texto"
 
-#: ../shell/e-shell-window-actions.c:1755
+#: ../shell/e-shell-window-actions.c:1753
 msgid "Icons _and Text"
 msgstr "Iconas _e texto"
 
-#: ../shell/e-shell-window-actions.c:1757
+#: ../shell/e-shell-window-actions.c:1755
 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:1762
+#: ../shell/e-shell-window-actions.c:1760
 msgid "Tool_bar Style"
 msgstr "Estilo da _barra de ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1764
+#: ../shell/e-shell-window-actions.c:1762
 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:1772
+#: ../shell/e-shell-window-actions.c:1770
 msgid "Define Views..."
 msgstr "Definir vistas..."
 
-#: ../shell/e-shell-window-actions.c:1774
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Create or edit views"
 msgstr "Crear ou editar vistas"
 
-#: ../shell/e-shell-window-actions.c:1779
+#: ../shell/e-shell-window-actions.c:1777
 msgid "Save Custom View..."
 msgstr "Gardar vista personalizada..."
 
-#: ../shell/e-shell-window-actions.c:1781
+#: ../shell/e-shell-window-actions.c:1779
 msgid "Save current custom view"
 msgstr "Gardar a vista personalizada actual"
 
-#: ../shell/e-shell-window-actions.c:1788
+#: ../shell/e-shell-window-actions.c:1786
 msgid "C_urrent View"
 msgstr "Visualización act_ual"
 
-#: ../shell/e-shell-window-actions.c:1798
+#: ../shell/e-shell-window-actions.c:1796
 msgid "Custom View"
 msgstr "Visualización personalizada"
 
-#: ../shell/e-shell-window-actions.c:1800
+#: ../shell/e-shell-window-actions.c:1798
 msgid "Current view is a customized view"
 msgstr "A vista actual é unha visualización personalizada"
 
-#: ../shell/e-shell-window-actions.c:1810
+#: ../shell/e-shell-window-actions.c:1808
 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:2183
+#: ../shell/e-shell-window-actions.c:2195
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
-#: ../shell/e-shell-window-actions.c:2396
+#: ../shell/e-shell-window-actions.c:2408
 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:576
+#: ../shell/e-shell-window-private.c:591
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:419
+#: ../shell/e-shell-window.c:431
 msgid "New"
 msgstr "Novo"
 
-#: ../shell/e-shell.c:244
+#: ../shell/e-shell.c:248
 msgid "Preparing to go offline..."
 msgstr "Preparando a conta «%s» para o modo sen conexión"
 
-#: ../shell/e-shell.c:294
+#: ../shell/e-shell.c:301
 msgid "Preparing to go online..."
 msgstr "Preparando a conta «%s» para o modo sen conexión"
 
-#: ../shell/e-shell.c:353
+#: ../shell/e-shell.c:363
 msgid "Preparing to quit..."
 msgstr "Preparándose para saír..."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:180
+#: ../shell/main.c:191
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20249,7 +19974,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:204
+#: ../shell/main.c:215
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20257,61 +19982,74 @@ msgstr ""
 "Grazas\n"
 "O equipo do Evolution\n"
 
-#: ../shell/main.c:211
+#: ../shell/main.c:222
 msgid "Do not tell me again"
 msgstr "Non preguntarme de novo"
 
-#: ../shell/main.c:327
+#: ../shell/main.c:338
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar o Evolution activando o compoñente especificado"
 
-#: ../shell/main.c:329
+#: ../shell/main.c:340
 msgid "Apply the given geometry to the main window"
 msgstr "Aplicar a xeometría fornecida á xanela principal"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:344
 msgid "Start in online mode"
 msgstr "Iniciar en modo con conexión"
 
-#: ../shell/main.c:335
+#: ../shell/main.c:346
+msgid "Ignore network availability"
+msgstr ""
+
+#: ../shell/main.c:348
 msgid "Start in \"express\" mode"
 msgstr "Iniciar en modo \"express\""
 
-#: ../shell/main.c:338
+#: ../shell/main.c:351
 msgid "Forcibly shut down Evolution"
 msgstr "Forzar o peche de todos os compoñentes do Evolution"
 
-#: ../shell/main.c:341
+#: ../shell/main.c:354
 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:343
+#: ../shell/main.c:356
 msgid "Disable loading of any plugins."
 msgstr "Desactivar a carga de calquera engadido."
 
-#: ../shell/main.c:345
+#: ../shell/main.c:358
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar o panel de previsualización de correo, contactos e tarefas."
 
-#: ../shell/main.c:349
+#: ../shell/main.c:362
 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:351
+#: ../shell/main.c:364
 msgid "Request a running Evolution process to quit"
 msgstr "Reiniciando o Evolution"
 
-#: ../shell/main.c:475 ../shell/main.c:483
+#: ../shell/main.c:517 ../shell/main.c:525
 msgid "- The Evolution PIM and Email Client"
 msgstr "- O cliente de correo e PIM do Evolution"
 
-#: ../shell/main.c:545
-#, c-format
+#: ../shell/main.c:591
+#, fuzzy, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
-"  Use %s --help for more information.\n"
+"  Run '%s --help' for more information.\n"
+msgstr ""
+"%s: --online e --offline non poden usarse á vez.\n"
+"  Use %s --help para máis información.\n"
+
+#: ../shell/main.c:597
+#, fuzzy, c-format
+msgid ""
+"%s: --force-online and --offline cannot be used together.\n"
+"  Run '%s --help' for more information.\n"
 msgstr ""
 "%s: --online e --offline non poden usarse á vez.\n"
 "  Use %s --help para máis información.\n"
@@ -20398,28 +20136,28 @@ msgstr "O ficeiro non é un ficheiro .desktop válido"
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Versión «%s» de ficheiro desktop non recoñecida"
 
-#: ../smclient/eggdesktopfile.c:958
+#: ../smclient/eggdesktopfile.c:957
 #, c-format
 msgid "Starting %s"
 msgstr "Examinando %s"
 
-#: ../smclient/eggdesktopfile.c:1100
+#: ../smclient/eggdesktopfile.c:1098
 #, c-format
 msgid "Application does not accept documents on command line"
 msgstr "O aplicativo non acepta documentos pola liña de ordes"
 
-#: ../smclient/eggdesktopfile.c:1168
+#: ../smclient/eggdesktopfile.c:1166
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Opción de lanzado non recoñecida: %d"
 
-#: ../smclient/eggdesktopfile.c:1373
+#: ../smclient/eggdesktopfile.c:1365
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr ""
 "Non é posíble pasar URIs de documento a unha entrada de desktop 'Type=Link'"
 
-#: ../smclient/eggdesktopfile.c:1394
+#: ../smclient/eggdesktopfile.c:1386
 #, c-format
 msgid "Not a launchable item"
 msgstr "O editor non é iniciábel"
@@ -20564,7 +20302,7 @@ msgid "Enter new password"
 msgstr "Introduza un contrasinal novo"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:116
+#: ../smime/gui/e-cert-selector.c:119
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20573,7 +20311,7 @@ msgstr ""
 "Emitido a:\n"
 "  Asunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:117
+#: ../smime/gui/e-cert-selector.c:120
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20582,7 +20320,7 @@ msgstr ""
 "Emitido por:\n"
 "  Asunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:170
 msgid "Select certificate"
 msgstr "Seleccione o certificado"
 
@@ -21106,11 +20844,11 @@ msgstr "Tipo de vista"
 msgid "Type of view:"
 msgstr "Tipo de vista:"
 
-#: ../widgets/misc/e-account-manager.c:351
+#: ../widgets/misc/e-account-manager.c:355
 msgid "De_fault"
 msgstr "Pre_determinado"
 
-#: ../widgets/misc/e-account-tree-view.c:261
+#: ../widgets/misc/e-account-tree-view.c:274
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -21127,7 +20865,7 @@ msgid "MIME Type:"
 msgstr "Tipo MIME:"
 
 #: ../widgets/misc/e-attachment-dialog.c:375
-#: ../widgets/misc/e-attachment-store.c:525
+#: ../widgets/misc/e-attachment-store.c:530
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suxerir mostrar o anexo automaticamente"
 
@@ -21163,65 +20901,65 @@ msgstr "Cargando"
 msgid "Saving"
 msgstr "Gargando"
 
-#: ../widgets/misc/e-attachment-paned.c:98
+#: ../widgets/misc/e-attachment-paned.c:100
 msgid "Hide Attachment _Bar"
 msgstr "Ocultar a _barra de anexos"
 
-#: ../widgets/misc/e-attachment-paned.c:100
-#: ../widgets/misc/e-attachment-paned.c:631
+#: ../widgets/misc/e-attachment-paned.c:102
+#: ../widgets/misc/e-attachment-paned.c:637
 msgid "Show Attachment _Bar"
 msgstr "Mostrar a _barra de anexos"
 
-#: ../widgets/misc/e-attachment-store.c:513
+#: ../widgets/misc/e-attachment-store.c:518
 msgid "Add Attachment"
 msgstr "Engadir anexo"
 
-#: ../widgets/misc/e-attachment-store.c:516
+#: ../widgets/misc/e-attachment-store.c:521
 msgid "A_ttach"
 msgstr "A_nexar"
 
-#: ../widgets/misc/e-attachment-store.c:579
+#: ../widgets/misc/e-attachment-store.c:584
 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:608
-#: ../widgets/misc/e-attachment.c:1785 ../widgets/misc/e-attachment.c:2327
+#: ../widgets/misc/e-attachment-store.c:613
+#: ../widgets/misc/e-attachment.c:1786 ../widgets/misc/e-attachment.c:2328
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:351
+#: ../widgets/misc/e-attachment-view.c:352
 msgid "S_ave All"
 msgstr "G_ardar todos"
 
-#: ../widgets/misc/e-attachment-view.c:377
+#: ../widgets/misc/e-attachment-view.c:378
 msgid "A_dd Attachment..."
 msgstr "_Engadir anexo..."
 
-#: ../widgets/misc/e-attachment-view.c:401
+#: ../widgets/misc/e-attachment-view.c:402
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../widgets/misc/e-attachment-view.c:408
+#: ../widgets/misc/e-attachment-view.c:409
 msgid "Hid_e All"
 msgstr "O_cultar todos"
 
-#: ../widgets/misc/e-attachment-view.c:415
+#: ../widgets/misc/e-attachment-view.c:416
 msgid "_View Inline"
 msgstr "_Ver en liña"
 
-#: ../widgets/misc/e-attachment-view.c:422
+#: ../widgets/misc/e-attachment-view.c:423
 msgid "Vie_w All Inline"
 msgstr "_Ver todos en liña"
 
-#: ../widgets/misc/e-attachment-view.c:739
+#: ../widgets/misc/e-attachment-view.c:740
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Abrir con «%s»"
 
-#: ../widgets/misc/e-attachment-view.c:742
+#: ../widgets/misc/e-attachment-view.c:743
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Abrir os anexos en %s"
@@ -21235,55 +20973,55 @@ msgstr "Abrir os anexos en %s"
 msgid "Attached message"
 msgstr "Mensaxe anexa"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2630
 msgid "A load operation is already in progress"
 msgstr "Xa se está a executar unha operación de cargado"
 
-#: ../widgets/misc/e-attachment.c:1836 ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:1837 ../widgets/misc/e-attachment.c:2638
 msgid "A save operation is already in progress"
 msgstr "Xa se está a executar unha operación de gardado"
 
-#: ../widgets/misc/e-attachment.c:1928
+#: ../widgets/misc/e-attachment.c:1929
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Non foi posíbel cargar «%s»"
 
-#: ../widgets/misc/e-attachment.c:1931
+#: ../widgets/misc/e-attachment.c:1932
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Non foi posíbel cargar o anexo"
 
-#: ../widgets/misc/e-attachment.c:2207
+#: ../widgets/misc/e-attachment.c:2208
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Non foi posíbel abrir «%s»"
 
-#: ../widgets/misc/e-attachment.c:2210
+#: ../widgets/misc/e-attachment.c:2211
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Non foi posíbel abrir o anexo"
 
-#: ../widgets/misc/e-attachment.c:2645
+#: ../widgets/misc/e-attachment.c:2646
 msgid "Attachment contents not loaded"
 msgstr "Os contidos dos anexos non foron cargados"
 
-#: ../widgets/misc/e-attachment.c:2721
+#: ../widgets/misc/e-attachment.c:2722
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Non foi posíbel gardar «%s»"
 
-#: ../widgets/misc/e-attachment.c:2724
+#: ../widgets/misc/e-attachment.c:2725
 #, 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:359
+#: ../widgets/misc/e-buffer-tagger.c:362
 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:1258
+#: ../widgets/misc/e-calendar-item.c:1259
 msgid "%B %Y"
 msgstr "%B de %Y"
 
@@ -21303,52 +21041,52 @@ msgstr "Introduza o conxunto de caracteres que se vai usar"
 msgid "Other..."
 msgstr "Outro..."
 
-#: ../widgets/misc/e-dateedit.c:505
+#: ../widgets/misc/e-dateedit.c:507
 msgid "Date and Time"
 msgstr "Data e hora"
 
-#: ../widgets/misc/e-dateedit.c:526
+#: ../widgets/misc/e-dateedit.c:528
 msgid "Text entry to input date"
 msgstr "Entrada de texto para introducir a data"
 
-#: ../widgets/misc/e-dateedit.c:548
+#: ../widgets/misc/e-dateedit.c:550
 msgid "Click this button to show a calendar"
 msgstr "Prema este botón para mostrar un calendario"
 
-#: ../widgets/misc/e-dateedit.c:594
+#: ../widgets/misc/e-dateedit.c:616
 msgid "Drop-down combination box to select time"
 msgstr "Caixa de combinación despregábel para seleccionar a hora"
 
-#: ../widgets/misc/e-dateedit.c:666
+#: ../widgets/misc/e-dateedit.c:688
 msgid "No_w"
 msgstr "Ago_ra"
 
-#: ../widgets/misc/e-dateedit.c:672
+#: ../widgets/misc/e-dateedit.c:694
 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:680
+#: ../widgets/misc/e-dateedit.c:702
 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:1685 ../widgets/misc/e-dateedit.c:1917
+#: ../widgets/misc/e-dateedit.c:1709 ../widgets/misc/e-dateedit.c:1941
 msgctxt "date"
 msgid "None"
 msgstr "Ningún"
 
-#: ../widgets/misc/e-dateedit.c:1812
+#: ../widgets/misc/e-dateedit.c:1836
 msgid "Invalid Date Value"
 msgstr "O valor da data non é válido"
 
-#: ../widgets/misc/e-dateedit.c:1856
+#: ../widgets/misc/e-dateedit.c:1880
 msgid "Invalid Time Value"
 msgstr "O valor da hora non é válido"
 
-#: ../widgets/misc/e-import-assistant.c:249
+#: ../widgets/misc/e-import-assistant.c:252
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -21356,37 +21094,37 @@ msgstr ""
 "Escolla o ficheiro que quere importar ao Evolution e seleccione que tipo de "
 "ficheiro é na listaxe."
 
-#: ../widgets/misc/e-import-assistant.c:266
+#: ../widgets/misc/e-import-assistant.c:269
 msgid "F_ilename:"
 msgstr "Nome do f_icheiro:"
 
-#: ../widgets/misc/e-import-assistant.c:276
+#: ../widgets/misc/e-import-assistant.c:279
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: ../widgets/misc/e-import-assistant.c:290
-#: ../widgets/misc/e-import-assistant.c:465
+#: ../widgets/misc/e-import-assistant.c:293
+#: ../widgets/misc/e-import-assistant.c:468
 msgid "File _type:"
 msgstr "_Tipo de ficheiro:"
 
-#: ../widgets/misc/e-import-assistant.c:333
-#: ../widgets/misc/e-import-assistant.c:916
+#: ../widgets/misc/e-import-assistant.c:336
+#: ../widgets/misc/e-import-assistant.c:912
 msgid "Choose the destination for this import"
 msgstr "Escolla o destino desta importación"
 
-#: ../widgets/misc/e-import-assistant.c:358
+#: ../widgets/misc/e-import-assistant.c:361
 msgid "Choose the type of importer to run:"
 msgstr "Seleccione o tipo de importador que se executará:"
 
-#: ../widgets/misc/e-import-assistant.c:366
+#: ../widgets/misc/e-import-assistant.c:369
 msgid "Import data and settings from _older programs"
 msgstr "Importar datos e configuración de programas _antigos"
 
-#: ../widgets/misc/e-import-assistant.c:374
+#: ../widgets/misc/e-import-assistant.c:377
 msgid "Import a _single file"
 msgstr "Importar un úni_co ficheiro"
 
-#: ../widgets/misc/e-import-assistant.c:526
+#: ../widgets/misc/e-import-assistant.c:529
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -21398,37 +21136,37 @@ msgstr ""
 "quere tentalo de novo, prema o botón \"Atrás\"."
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:773
+#: ../widgets/misc/e-import-assistant.c:769
 msgid "_Cancel Import"
 msgstr "Cancelar"
 
-#: ../widgets/misc/e-import-assistant.c:915
+#: ../widgets/misc/e-import-assistant.c:911
 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
+#: ../widgets/misc/e-import-assistant.c:917
+#: ../widgets/misc/e-import-assistant.c:930
+#: ../widgets/misc/e-import-assistant.c:1280
+#: ../widgets/misc/e-import-assistant.c:1346
+#: ../widgets/misc/e-import-assistant.c:1355
 msgid "Import Data"
 msgstr "Importante"
 
-#: ../widgets/misc/e-import-assistant.c:929
+#: ../widgets/misc/e-import-assistant.c:925
 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
+#: ../widgets/misc/e-import-assistant.c:1270
+#: ../widgets/misc/e-import-assistant.c:1304
 msgid "Evolution Import Assistant"
 msgstr "Asistente de importación do Evolution"
 
-#: ../widgets/misc/e-import-assistant.c:1291
-#: ../widgets/misc/e-import-assistant.c:1338
+#: ../widgets/misc/e-import-assistant.c:1287
+#: ../widgets/misc/e-import-assistant.c:1334
 msgid "Import Location"
 msgstr "Importar localización"
 
-#: ../widgets/misc/e-import-assistant.c:1302
+#: ../widgets/misc/e-import-assistant.c:1298
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21438,28 +21176,28 @@ msgstr ""
 "Este asistente guiarao no proceso de importación de\n"
 "ficheiros externos ao Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1316
+#: ../widgets/misc/e-import-assistant.c:1312
 msgid "Importer Type"
 msgstr "Tipo de importador"
 
-#: ../widgets/misc/e-import-assistant.c:1324
+#: ../widgets/misc/e-import-assistant.c:1320
 msgid "Select Information to Import"
 msgstr "Seleccione a información para importar"
 
-#: ../widgets/misc/e-import-assistant.c:1331
+#: ../widgets/misc/e-import-assistant.c:1327
 msgid "Select a File"
 msgstr "Seleccionar un ficheiro"
 
-#: ../widgets/misc/e-import-assistant.c:1345
+#: ../widgets/misc/e-import-assistant.c:1341
 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-map.c:557
+#: ../widgets/misc/e-map.c:752
 msgid "World Map"
 msgstr "Mapa do mundo"
 
-#: ../widgets/misc/e-map.c:559
+#: ../widgets/misc/e-map.c:754
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21486,52 +21224,52 @@ msgstr ""
 "O Evolution está actualmente desconectado.\n"
 "Prema neste botón para traballar conectado."
 
-#: ../widgets/misc/e-preferences-window.c:278
+#: ../widgets/misc/e-preferences-window.c:281
 msgid "Evolution Preferences"
 msgstr "Preferencias do Evolution"
 
-#: ../widgets/misc/e-search-bar.c:81
+#: ../widgets/misc/e-search-bar.c:82
 #, c-format
 msgid "Matches: %d"
 msgstr "Equivalencias: %d"
 
-#: ../widgets/misc/e-search-bar.c:557
+#: ../widgets/misc/e-search-bar.c:560
 msgid "Close the find bar"
 msgstr "Pechar esta barra de búsqueda"
 
-#: ../widgets/misc/e-search-bar.c:565
+#: ../widgets/misc/e-search-bar.c:568
 msgid "Fin_d:"
 msgstr "_Buscar:"
 
-#: ../widgets/misc/e-search-bar.c:577
+#: ../widgets/misc/e-search-bar.c:580
 msgid "Clear the search"
 msgstr "Limpar búsqueda"
 
-#: ../widgets/misc/e-search-bar.c:600
+#: ../widgets/misc/e-search-bar.c:604
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:610
 msgid "Find the previous occurrence of the phrase"
 msgstr "Buscar a anterior aparición na frase"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:623
 msgid "_Next"
 msgstr "_Seguinte"
 
-#: ../widgets/misc/e-search-bar.c:622
+#: ../widgets/misc/e-search-bar.c:629
 msgid "Find the next occurrence of the phrase"
 msgstr "Buscar a seguinte aparición na frase"
 
-#: ../widgets/misc/e-search-bar.c:632
+#: ../widgets/misc/e-search-bar.c:642
 msgid "Mat_ch case"
 msgstr "_Coincidir maiúsculas e minúsculas"
 
-#: ../widgets/misc/e-search-bar.c:660
+#: ../widgets/misc/e-search-bar.c:670
 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:682
+#: ../widgets/misc/e-search-bar.c:692
 msgid "Reached top of page, continued from bottom"
 msgstr "Atinxiuse a parte superior da páxina, continúase pola parte inferior"
 
@@ -21556,134 +21294,152 @@ msgid "Delivery Options"
 msgstr "<b>Opcións de entrega</b>"
 
 #: ../widgets/misc/e-send-options.ui.h:6
+#, fuzzy
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_Até"
+
+#: ../widgets/misc/e-send-options.ui.h:7
+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
+#, fuzzy
+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:14
+#: ../widgets/misc/e-send-options.ui.h:17
 msgid "Proprietary"
 msgstr "Prioridade"
 
-#: ../widgets/misc/e-send-options.ui.h:15
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "R_eply requested"
 msgstr "R_esposta requirida"
 
-#: ../widgets/misc/e-send-options.ui.h:17
+#: ../widgets/misc/e-send-options.ui.h:20
 msgid "Return Notification"
 msgstr "<b>Devolver notificación</b>"
 
-#: ../widgets/misc/e-send-options.ui.h:20
+#: ../widgets/misc/e-send-options.ui.h:23
 msgid "Sta_tus Tracking"
 msgstr "Seguimento de es_tado"
 
-#: ../widgets/misc/e-send-options.ui.h:21
+#: ../widgets/misc/e-send-options.ui.h:24
 msgid "Standard"
 msgstr "Tipo de letra es_tándar:"
 
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "Status Tracking"
 msgstr "Seguimento de es_tado"
 
-#: ../widgets/misc/e-send-options.ui.h:23
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "Top Secret"
 msgstr "Alto secreto"
 
-#: ../widgets/misc/e-send-options.ui.h:25
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "When acce_pted:"
 msgstr "Ao ace_ptar:"
 
-#: ../widgets/misc/e-send-options.ui.h:26
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "When co_mpleted:"
 msgstr "Ao co_mpletar:"
 
-#: ../widgets/misc/e-send-options.ui.h:27
+#: ../widgets/misc/e-send-options.ui.h:30
 msgid "When decli_ned:"
 msgstr "Ao _rexeitar:"
 
-#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "Wi_thin"
-msgstr "Den_tro"
-
-#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
 #: ../widgets/misc/e-send-options.ui.h:31
-msgid "_After"
-msgstr "_Despois"
-
-#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "_Toda a información"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Classification:"
 msgstr "_Clasificación:"
 
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../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:35
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delivered"
 msgstr "_Entregada"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Set expiration date"
 msgstr "_Definir a data de vencemento"
 
-#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
-#: ../widgets/misc/e-send-options.ui.h:39
-msgid "_Until"
-msgstr "_Até"
-
-#: ../widgets/misc/e-send-options.ui.h:40
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When convenient"
 msgstr "_Cando sexa conveniente"
 
-#: ../widgets/misc/e-send-options.ui.h:41
+#: ../widgets/misc/e-send-options.ui.h:38
 msgid "_When opened:"
 msgstr "_Ao abrir:"
 
-#: ../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
+#. Translators: Used in send options dialog
+#: ../widgets/misc/e-send-options.ui.h:40
+msgctxt "send-options"
+msgid "None"
+msgstr "Ningún"
+
+#: ../widgets/misc/e-signature-editor.c:138
+#: ../widgets/misc/e-signature-editor.c:563
+#: ../widgets/misc/e-signature-manager.c:355
+#: ../widgets/misc/e-signature-script-dialog.c:219
 msgid "Unnamed"
 msgstr "Sen nome"
 
-#: ../widgets/misc/e-signature-editor.c:213
+#: ../widgets/misc/e-signature-editor.c:214
 msgid "_Save and Close"
 msgstr "_Gardar e saír"
 
-#: ../widgets/misc/e-signature-editor.c:391
+#: ../widgets/misc/e-signature-editor.c:430
 msgid "Edit Signature"
 msgstr "Editar a sinatura"
 
-#: ../widgets/misc/e-signature-editor.c:406
+#: ../widgets/misc/e-signature-editor.c:445
 msgid "_Signature Name:"
 msgstr "Nome da _sinatura:"
 
-#: ../widgets/misc/e-signature-manager.c:298
+#: ../widgets/misc/e-signature-manager.c:300
 msgid "Add Signature Script"
 msgstr "Engadir script de sinatura"
 
-#: ../widgets/misc/e-signature-manager.c:363
+#: ../widgets/misc/e-signature-manager.c:365
 msgid "Edit Signature Script"
 msgstr "Editar a sinatura"
 
-#: ../widgets/misc/e-signature-manager.c:579
+#: ../widgets/misc/e-signature-manager.c:583
 msgid "Add _Script"
 msgstr "Engadir _script"
 
-#: ../widgets/misc/e-signature-script-dialog.c:270
+#: ../widgets/misc/e-signature-script-dialog.c:269
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -21692,11 +21448,11 @@ msgstr ""
 "A saída deste script usarase como a súa\n"
 "sinatura. O nome que especifique usarase só para os efectos de vista."
 
-#: ../widgets/misc/e-signature-script-dialog.c:315
+#: ../widgets/misc/e-signature-script-dialog.c:314
 msgid "S_cript:"
 msgstr "_Script:"
 
-#: ../widgets/misc/e-signature-script-dialog.c:346
+#: ../widgets/misc/e-signature-script-dialog.c:345
 msgid "Script file must be executable."
 msgstr "O ficheiro de script debe existir e ser executábel."
 
@@ -21704,41 +21460,41 @@ msgstr "O ficheiro de script debe existir e ser executábel."
 msgid "Click here to go to URL"
 msgstr "Prema aquí para ir ao URL"
 
-#: ../widgets/misc/e-web-view.c:374
+#: ../widgets/misc/e-web-view.c:373
 msgid "_Copy Link Location"
 msgstr "_Copiar a localización da ligazón"
 
-#: ../widgets/misc/e-web-view.c:376
+#: ../widgets/misc/e-web-view.c:375
 msgid "Copy the link to the clipboard"
 msgstr "Copia obxectos no portapapeis."
 
-#: ../widgets/misc/e-web-view.c:384
+#: ../widgets/misc/e-web-view.c:383
 msgid "_Open Link in Browser"
 msgstr "_Abrir ligazón no navegador"
 
-#: ../widgets/misc/e-web-view.c:386
+#: ../widgets/misc/e-web-view.c:385
 msgid "Open the link in a web browser"
 msgstr "_Abrir ligazón no navegador"
 
-#: ../widgets/misc/e-web-view.c:394
+#: ../widgets/misc/e-web-view.c:393
 msgid "_Copy Email Address"
 msgstr "Copiar enderezo de _correo"
 
-#: ../widgets/misc/e-web-view.c:423 ../widgets/misc/e-web-view.c:1078
+#: ../widgets/misc/e-web-view.c:422 ../widgets/misc/e-web-view.c:1077
 msgid "Select all text and images"
 msgstr "Seleccionar todo o texto dunha mensaxe"
 
-#: ../widgets/misc/e-web-view.c:855 ../widgets/misc/e-web-view.c:857
-#: ../widgets/misc/e-web-view.c:859
+#: ../widgets/misc/e-web-view.c:854 ../widgets/misc/e-web-view.c:856
+#: ../widgets/misc/e-web-view.c:858
 #, c-format
 msgid "Click to call %s"
 msgstr "Prema para chamar %s"
 
-#: ../widgets/misc/e-web-view.c:861
+#: ../widgets/misc/e-web-view.c:860
 msgid "Click to hide/unhide addresses"
 msgstr "Prema para ocultar ou mostrar os enderezos"
 
-#: ../widgets/misc/e-web-view.c:863
+#: ../widgets/misc/e-web-view.c:862
 #, c-format
 msgid "Click to open %s"
 msgstr "Prema para abrir %s"
@@ -21757,25 +21513,25 @@ msgstr "Calendario: desde %s até %s"
 msgid "evolution calendar item"
 msgstr "elemento de calendario do Evolution"
 
-#: ../widgets/table/e-cell-combo.c:174
+#: ../widgets/table/e-cell-combo.c:177
 msgid "popup list"
 msgstr "lista emerxente"
 
-#: ../widgets/table/e-cell-date-edit.c:300
+#: ../widgets/table/e-cell-date-edit.c:303
 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:317
+#: ../widgets/table/e-cell-date-edit.c:320
 msgctxt "table-date"
 msgid "None"
 msgstr "Ningún"
 
-#: ../widgets/table/e-cell-date-edit.c:325
+#: ../widgets/table/e-cell-date-edit.c:328
 msgid "OK"
 msgstr "Aceptar"
 
-#: ../widgets/table/e-cell-date-edit.c:869
+#: ../widgets/table/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "A data ten que ser introducida no formato: %s"
@@ -21820,7 +21576,7 @@ msgid "A_vailable Fields:"
 msgstr "Campos _dispoñíbeis:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1702
+#: ../widgets/table/e-table-header-item.c:1668
 msgid "Ascending"
 msgstr "Ascendente"
 
@@ -21833,7 +21589,7 @@ msgid "Clear _All"
 msgstr "Limp_ar todo"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1702
+#: ../widgets/table/e-table-header-item.c:1668
 msgid "Descending"
 msgstr "Descendente"
 
@@ -21912,7 +21668,7 @@ msgstr ""
 #. Finally the %d is replaced with count of items in this group.
 #. Example: "Family name: Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:354
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -21925,80 +21681,75 @@ msgstr[1] "%s : %s (%d elementos)"
 #. The %d is replaced with count of items in this group.
 #. Example: "Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:363
+#: ../widgets/table/e-table-group-container.c:366
 #, 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-header-item.c:1546
+#: ../widgets/table/e-table-header-item.c:1512
 msgid "Customize Current View"
 msgstr "Personalizar a vista actual"
 
-#: ../widgets/table/e-table-header-item.c:1567
+#: ../widgets/table/e-table-header-item.c:1533
 msgid "Sort _Ascending"
 msgstr "Orde _ascendente"
 
-#: ../widgets/table/e-table-header-item.c:1570
+#: ../widgets/table/e-table-header-item.c:1536
 msgid "Sort _Descending"
 msgstr "Orde _descendente"
 
-#: ../widgets/table/e-table-header-item.c:1573
+#: ../widgets/table/e-table-header-item.c:1539
 msgid "_Unsort"
 msgstr "Sen ord_enar"
 
-#: ../widgets/table/e-table-header-item.c:1576
+#: ../widgets/table/e-table-header-item.c:1542
 msgid "Group By This _Field"
 msgstr "Agrupar por este ca_mpo"
 
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-header-item.c:1545
 msgid "Group By _Box"
 msgstr "Agrupar por cai_xa"
 
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1549
 msgid "Remove This _Column"
 msgstr "Eliminar esta _columna"
 
-#: ../widgets/table/e-table-header-item.c:1586
+#: ../widgets/table/e-table-header-item.c:1552
 msgid "Add a C_olumn..."
 msgstr "Engadir unha c_olumna..."
 
-#: ../widgets/table/e-table-header-item.c:1590
+#: ../widgets/table/e-table-header-item.c:1556
 msgid "A_lignment"
 msgstr "A_liñamento"
 
-#: ../widgets/table/e-table-header-item.c:1593
+#: ../widgets/table/e-table-header-item.c:1559
 msgid "B_est Fit"
 msgstr "Axuste ópt_imo"
 
-#: ../widgets/table/e-table-header-item.c:1596
+#: ../widgets/table/e-table-header-item.c:1562
 msgid "Format Column_s..."
 msgstr "Formatar columna_s..."
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1566
 msgid "Custo_mize Current View..."
 msgstr "Perso_nalizar a vista actual..."
 
-#: ../widgets/table/e-table-header-item.c:1659
+#: ../widgets/table/e-table-header-item.c:1625
 msgid "_Sort By"
 msgstr "O_rdenar por"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1677
+#: ../widgets/table/e-table-header-item.c:1643
 msgid "_Custom"
 msgstr "_Personalizado"
 
 #. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:123
+#: ../widgets/table/gal-a11y-e-cell-popup.c:126
 msgid "popup a child"
 msgstr "emerxer un fillo"
 
-#. 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"
-
 #. Translators: description of a "toggle" action
 #: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
@@ -22026,37 +21777,560 @@ msgstr "premer"
 msgid "sort"
 msgstr "ordenar"
 
-#: ../widgets/text/e-text.c:2536
+#: ../widgets/text/e-text.c:2303
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ../widgets/text/e-text.c:2548
+#: ../widgets/text/e-text.c:2315
 msgid "Input Methods"
 msgstr "Métodos de entrada"
 
-#~ msgctxt "recurrpage"
-#~ msgid "day(s)"
-#~ msgstr "días()"
+#~ msgid "Count of default recurrence for a new event. -1 means forever."
+#~ msgstr ""
+#~ "Conta de recorrencia predefinida para un evento novo. -1 significa sempre."
+
+#~ msgid "Default recurrence count"
+#~ msgstr "Conta de recorrencia predefinida"
+
+#~ msgid "Event Gradient"
+#~ msgstr "Gradación de eventos"
+
+#~ msgid "Event Transparency"
+#~ msgstr "Transparencia do evento"
+
+#~ msgid "Gradient of the events in calendar views."
+#~ msgstr "Gradación de eventos nas visualizacións do calendario."
+
+#~ 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 (transparente) e 1 (opaco)."
+
+#~ msgid "URI of the highlighted (\"primary\") calendar"
+#~ msgstr "URI do calendario realzado («primario»)"
+
+#~ msgid "URI of the highlighted (\"primary\") memo list"
+#~ msgstr "URI da lista de memorización realzada («primaria»)"
+
+#~ msgid "URI of the highlighted (\"primary\") task list"
+#~ msgstr "URI da lista de tarefas realzada («primaria»)"
+
+#~ msgid "Recurring:"
+#~ msgstr "Repetición:"
+
+#~ msgid "Yes. (Complex Recurrence)"
+#~ msgstr "Sí. (Repetición complexa)"
+
+#~ msgid "Every day"
+#~ msgid_plural "Every %d days"
+#~ msgstr[0] "Todos os días"
+#~ msgstr[1] "Cada %d días"
+
+#~ msgid "Every week"
+#~ msgid_plural "Every %d weeks"
+#~ msgstr[0] "Todas as semanas"
+#~ msgstr[1] "Cada %d semanas"
+
+# (pofilter) variables: (u'translation contains variables not in original: %d',)
+#~ msgid "Every week on "
+#~ msgid_plural "Every %d weeks on "
+#~ msgstr[0] "Todas as semanas o "
+#~ msgstr[1] "Cada %d semanas o "
+
+#~ msgid " and "
+#~ msgstr " e o"
+
+#~ msgid "The %s day of "
+#~ msgstr "O %s día de "
+
+#~ msgid "The %s %s of "
+#~ msgstr "O %s %s de "
+
+# (pofilter) variables: (u'translation contains variables not in original: %d',)
+#~ msgid "every month"
+#~ msgid_plural "every %d months"
+#~ msgstr[0] "todos os meses"
+#~ msgstr[1] "cada %d meses"
+
+# (pofilter) variables: (u'translation contains variables not in original: %d',)
+#~ msgid "Every year"
+#~ msgid_plural "Every %d years"
+#~ msgstr[0] "Todos os anos"
+#~ msgstr[1] "Cada %d anos"
+
+#~ msgid "a total of %d time"
+#~ msgid_plural "a total of %d times"
+#~ msgstr[0] "un total de %d vez"
+#~ msgstr[1] "un total de %d veces"
+
+#~ msgid ", ending on "
+#~ msgstr ", finalizando o "
+
+#~ msgid "Starts"
+#~ msgstr "Comeza"
+
+#~ msgid "Ends"
+#~ msgstr "Finaliza"
+
+#~ msgid "iCalendar Information"
+#~ msgstr "información de iCalendar"
+
+#~ msgid "iCalendar Error"
+#~ msgstr "Erro de iCalendar"
+
+#~ msgid ""
+#~ "Please review the following information, and then select an action from "
+#~ "the menu below."
+#~ msgstr ""
+#~ "Revise a seguinte información e escolla unha acción do menú de debaixo."
+
+#~ msgid ""
+#~ "The meeting has been canceled, however it could not be found in your "
+#~ "calendars"
+#~ msgstr ""
+#~ "A reunión cancelouse, porén non foi posíbel encontrala nos seus "
+#~ "calendarios"
+
+#~ 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 encontrala nas súas listas de "
+#~ "tarefas"
+
+#~ msgid "%s has published meeting information."
+#~ msgstr "%s publicou información sobre unha reunión."
+
+#~ msgid "Meeting Information"
+#~ msgstr "Información da reunión"
+
+#~ msgid "%s requests the presence of %s at a meeting."
+#~ msgstr "%s solicita a presenza de %s nunha reunión."
+
+#~ msgid "%s requests your presence at a meeting."
+#~ msgstr "%s solicita a súa presenza nunha reunión."
+
+#~ msgid "Meeting Proposal"
+#~ msgstr "Proposta de reunión"
+
+#~ msgid "%s wishes to be added to an existing meeting."
+#~ msgstr "%s desexa que se lle engada a unha reunión existente."
+
+#~ msgid "Meeting Update"
+#~ msgstr "Actualización da reunión"
+
+#~ msgid "%s wishes to receive the latest meeting information."
+#~ msgstr "%s desexa recibir a última información sobre a reunión."
+
+#~ msgid "Meeting Update Request"
+#~ msgstr "Solicitude de actualización da reunión"
+
+#~ msgid "%s has replied to a meeting request."
+#~ msgstr "%s respondeu a unha petición de reunión."
+
+#~ msgid "Meeting Reply"
+#~ msgstr "Resposta a unha reunión"
+
+#~ msgid "%s has canceled a meeting."
+#~ msgstr "%s cancelou unha reunión."
+
+#~ msgid "Meeting Cancelation"
+#~ msgstr "Cancelación da reunión"
+
+#~ msgid "%s has sent an unintelligible message."
+#~ msgstr "%s enviou unha mensaxe inintelixíbel."
+
+#~ msgid "Bad Meeting Message"
+#~ msgstr "Mensaxe de reunión incorrecta"
+
+#~ msgid "%s has published task information."
+#~ msgstr "%s publicou información da tarefa."
+
+#~ msgid "Task Information"
+#~ msgstr "Información da tarefa"
+
+#~ msgid "%s requests %s to perform a task."
+#~ msgstr "%s solicita a %s que realice unha tarefa."
+
+#~ msgid "%s requests you perform a task."
+#~ msgstr "%s solicta que realice unha tarefa."
+
+#~ msgid "Task Proposal"
+#~ msgstr "Proposta de tarefa"
+
+#~ msgid "%s wishes to be added to an existing task."
+#~ msgstr "%s desexa que se lle engada a unha tarefa existente."
+
+#~ msgid "Task Update"
+#~ msgstr "Actualización de tarefa"
+
+#~ msgid "%s wishes to receive the latest task information."
+#~ msgstr "%s desexa recibir a última información sobre a tarefa."
+
+#~ msgid "Task Update Request"
+#~ msgstr "Solicitude de actualización de tarefa"
+
+#~ msgid "%s has replied to a task assignment."
+#~ msgstr "%s respondeu a unha asignación de tarefa."
+
+#~ msgid "Task Reply"
+#~ msgstr "Resposta a unha tarefa"
+
+#~ msgid "%s has canceled a task."
+#~ msgstr "%s cancelou unha tarefa."
+
+#~ msgid "Task Cancelation"
+#~ msgstr "Cancelación de tarefa"
+
+#~ msgid "Bad Task Message"
+#~ msgstr "Mensaxe de tarefa incorrecta"
+
+#~ msgid "%s has published free/busy information."
+#~ msgstr "%s publicou información de dispoñibilidade."
+
+#~ msgid "Free/Busy Information"
+#~ msgstr "Información de dispoñibilidade"
+
+#~ msgid "%s requests your free/busy information."
+#~ msgstr "%s solicita a súa información de dispoñibilidade."
+
+#~ msgid "Free/Busy Request"
+#~ msgstr "Solicitude de dispoñibilidade"
+
+#~ msgid "%s has replied to a free/busy request."
+#~ msgstr "%s respondeu a unha solicitude de dispoñibilidade."
+
+#~ msgid "Free/Busy Reply"
+#~ msgstr "Resposta de dispoñibilidade"
+
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "Mensaxe incorrecta de dispoñibilidade"
+
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "A mensaxe non parece estar construída apropiadamente"
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "Esta mensaxe só contén solicitudes non compatíbeis."
+
+#~ msgid "The attachment does not contain a valid calendar message"
+#~ msgstr "O anexo non contén unha mensaxe de calendario correcta"
 
-#~ msgctxt "recurrpage"
-#~ msgid "for"
-#~ msgstr "por"
+#~ msgid "The attachment has no viewable calendar items"
+#~ msgstr "O anexo non ten elementos de calendario visíbeis"
 
-#~ msgctxt "recurrpage"
-#~ msgid "until"
-#~ msgstr "até"
+#~ msgid "Update complete\n"
+#~ msgstr "Actualización terminada\n"
 
-#~ msgctxt "ESendOptionsAfter"
-#~ msgid "days"
-#~ msgstr "días"
+#~ msgid "Object is invalid and cannot be updated\n"
+#~ msgstr "O obxecto non é correcto e non se pode actualizar\n"
 
-#~ msgctxt "ESendOptionsWithin"
-#~ msgid "days"
-#~ msgstr "días"
+#~ msgid "This response is not from a current attendee.  Add as an attendee?"
+#~ msgstr ""
+#~ "Esta resposta non é dun participante actual. Desexa engadilo como "
+#~ "participante?"
+
+#~ 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 "
+#~ "incorrecto\n"
+
+#~ msgid "Attendee status updated\n"
+#~ msgstr "Estado do participante actualizado\n"
+
+#~ msgid "Item sent!\n"
+#~ msgstr "Elemento enviado\n"
+
+#~ msgid "The item could not be sent!\n"
+#~ msgstr "Non foi posíbel enviar o elemento\n"
+
+#~ msgid "Choose an action:"
+#~ msgstr "Seleccionar unha acción:"
+
+#~ msgid "Update"
+#~ msgstr "Actualizar"
+
+#~ msgid "Tentatively accept"
+#~ msgstr "Aceptar provisionalmente"
+
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "Enviar información de dispoñibilidade"
+
+#~ msgid "Update respondent status"
+#~ msgstr "Actualizar o estado do interlocutor"
+
+#~ msgid "Send Latest Information"
+#~ msgstr "Enviar a última información"
+
+#~ msgid "--to--"
+#~ msgstr "--a--"
+
+#~ msgid "Calendar Message"
+#~ msgstr "Mensaxe do calendario"
+
+#~ msgid "Date:"
+#~ msgstr "Data:"
+
+#~ msgid "Loading Calendar"
+#~ msgstr "Cargando calendario"
+
+#~ msgid "Loading calendar..."
+#~ msgstr "Cargando calendario..."
+
+#~ msgid "Organizer:"
+#~ msgstr "Organizador:"
+
+#~ msgid "Server Message:"
+#~ msgstr "Mensaxe do servidor:"
+
+#, fuzzy
+#~ msgid "An error occurred while sending."
+#~ msgstr "Produciuse un erro ao imprimir"
+
+#, fuzzy
+#~ msgid "Remove all duplicate messages"
+#~ msgstr "Seleccionar todas as mensaxes visíbeis"
+
+#~ msgid "begin editing this cell"
+#~ msgstr "comezar a editar esta cela"
+
+#~ 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',)
+#~ msgid "%d day ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "Hai %d día"
+#~ msgstr[1] "Hai %d días"
+
+#~ msgid "Evolution's Mail Notification"
+#~ msgstr "Notificación de correo do Evolution"
+
+#~ msgid "Mail Notification Properties"
+#~ msgstr "Propiedades da notificación de correo"
+
+#~ msgid "Could not create composer window."
+#~ msgstr "Non foi posíbel crear a xanela do editor."
+
+#~ msgid ""
+#~ "Unable to activate the HTML editor control.\n"
+#~ "\n"
+#~ "Please make sure that you have the correct version of gtkhtml and "
+#~ "libgtkhtml installed."
+#~ msgstr ""
+#~ "Non é posíbel activar o compoñente do editor HTML.\n"
+#~ "\n"
+#~ "Asegúrese de que ten instalada a versión correcta de gtkhtml e libgtkhtml."
+
+#~ msgid "Unable to activate the address selector control."
+#~ msgstr "Non é posíbel activar o control de selección de enderezos."
+
+#~ msgid "Debug Logs"
+#~ msgstr "Rexistros de depuración"
+
+#~ msgid "Show _errors in the status bar for"
+#~ msgstr "Mostrar _erros na barra de estado para"
+
+#~ msgid "second(s)."
+#~ msgstr "segundos."
+
+#~ msgid "Log Messages:"
+#~ msgstr "Rexistro de mensaxes:"
+
+#~ msgid "Log Level"
+#~ msgstr "Nivel de rexistro"
+
+#~ msgid "Error"
+#~ msgstr "Erro"
+
+#~ msgid "Errors"
+#~ msgstr "Erros"
+
+#~ msgid "Warnings and Errors"
+#~ msgstr "Avisos e erros"
+
+#~ msgid "Debug"
+#~ msgstr "Depuración"
+
+#~ msgid "Error, Warnings and Debug messages"
+#~ msgstr "Erros, avisos e mensaxes de depuración"
+
+#~ msgid "%s License Agreement"
+#~ msgstr "Acordo de licenza %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "Please read carefully the license agreement\n"
+#~ "for %s displayed below\n"
+#~ "and tick the check box for accepting it\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Lea atentamente o acordo de licenza\n"
+#~ "para %s que se mostra abaixo\n"
+#~ "e marque a caixa de verificación para aceptalo\n"
+
+#~ msgid "%s..."
+#~ msgstr "%s (...)"
+
+#~ msgid "Evolution Error"
+#~ msgstr "Erro do Evolution"
+
+#~ msgid "Evolution Warning"
+#~ msgstr "Aviso do Evolution"
+
+#~ msgid "Internal error, unknown error '%s' requested"
+#~ msgstr "Erro interno: requiriuse un erro descoñecido «%s»"
+
+#~ 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."
+
+#~ msgid "Folder"
+#~ msgstr "Cartafol"
+
+#~ msgid "Please select a server."
+#~ msgstr "Seleccione un servidor."
+
+#~ msgid "No server has been selected"
+#~ msgstr "Non se seleccionou un servidor"
+
+#~ msgid "Default height of the subscribe dialog."
+#~ msgstr "Altura predefinida do diálogo de subscrición."
 
-#~ msgctxt "send-options"
-#~ msgid "None"
-#~ msgstr "Ningún"
+#~ msgid "Default width of the subscribe dialog."
+#~ msgstr "Largura predefinida do diálogo de subscrición."
+
+#~ msgid "Subscribe dialog default height"
+#~ msgstr "Altura predefinida do diálogo de subscrición"
+
+#~ msgid "Subscribe dialog default width"
+#~ msgstr "Largura predefinida do diálogo de subscrición"
+
+#~ msgid "(Not Recommended)"
+#~ msgstr "(Non recomendado)"
+
+#~ msgid "(Note: Requires restart of the application)"
+#~ msgstr "(Nota: é preciso reiniciar o aplicativo)"
+
+#~ msgid "Checks incoming mail messages to be Junk"
+#~ msgstr "Verifica se o correo entrante é correo non desexado"
+
+#~ msgid "Do not display messages when text si_ze exceeds"
+#~ msgstr "Non mostrar mensaxes se o tama_ño do texto excede"
+
+#~ msgid "Enable Magic S_pacebar"
+#~ msgstr "Activar a barra de espa_zos máxica"
+
+#~ msgid "Enable Sea_rch Folders"
+#~ msgstr "Activar cartafoles de _busca"
+
+#~ msgid "Fi_xed-width:"
+#~ msgstr "Largura fi_xa:"
+
+#~ msgid "Font Properties"
+#~ msgstr "Propiedades do tipo de letra"
+
+#~ msgid "KB"
+#~ msgstr "KB"
+
+#~ msgid "Message Fonts"
+#~ msgstr "A mensaxe contén"
+
+#~ 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"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "Imprimir notas"
+
+#~ msgid "Prompt when sending replies to _many recipients"
+#~ msgstr "Preguntar ao enviar mensaxes con _moitos destinatarios"
+
+#~ msgid "Select Drafts Folder"
+#~ msgstr "Seleccionar cartafol"
+
+#~ msgid "Select HTML fixed width font for printing"
+#~ msgstr "Seleccione o tipo de letra de largura fixa en HTML para imprimir"
+
+#~ msgid "Select HTML variable width font for printing"
+#~ msgstr ""
+#~ "Seleccione o tipo de letra de largura variábel en HTML para imprimir"
+
+#~ msgid "Select Junk Folder"
+#~ msgstr "Seleccione o cartafol de correo non desexado"
+
+#~ msgid "Select Sent Folder"
+#~ msgstr "Seleccionar cartafol"
+
+#~ msgid "Select Trash Folder"
+#~ msgstr "Seleccionar o cartafol de Lixo"
+
+#~ msgid "Sending Mail"
+#~ msgstr "Enviando correo"
+
+#~ msgid "Sent and Draft Messages"
+#~ msgstr "Mensaxes enviadas"
+
+#~ msgid "Top Posting Option"
+#~ msgstr "Opción de publicar por enriba"
+
+#~ msgid "V_ariable-width:"
+#~ msgstr "Largura v_ariábel:"
+
+#~ msgid "_Mark messages as read after"
+#~ msgstr "_Marcar as mensaxes como lidas despois de"
+
+#~ msgid "_Show image animations"
+#~ msgstr "_Mostrar animacións de imaxes"
+
+#~ msgid "_Shrink To / Cc / Bcc headers to "
+#~ msgstr "_Reducir as cabeceiras Para/Cc/Cco como "
+
+#~ msgid "addresses"
+#~ msgstr "enderezos"
+
+#~ msgid "S_erver:"
+#~ msgstr "S_ervidor:"
+
+#~ msgid "Saving attachment"
+#~ msgstr "Gardando anexo"
+
+#~ msgid ""
+#~ "Cannot create output file: %s:\n"
+#~ " %s"
+#~ msgstr ""
+#~ "Non é posíbel crear o ficheiro de saída: %s:\n"
+#~ " %s"
+
+#~ msgid "Could not write data: "
+#~ msgstr "Non é posíbel escribir os datos: "
+
+#~ msgid "_Backup Evolution Settings..."
+#~ msgstr "_Respaldar axustes de Evolutionâ?¦"
+
+#~ msgid "R_estore Evolution Settings..."
+#~ msgstr "R_estaurar axustes de Evolutionâ?¦"
+
+#~ msgid "_Sharing"
+#~ msgstr "_Compartir"
+
+#~ msgid "Manage your Evolution plugins."
+#~ msgstr "Xestione os seus engadidos de Evolution."
+
+#~ msgid "Sort mail message threads by subject."
+#~ msgstr "Ordenar os fíos das mensaxes de correo por asunto."
+
+#~ msgid "Subject Threading"
+#~ msgstr "Encadeamento de asunto"
+
+#~ msgid "Thread messages by subject"
+#~ msgstr "Encadear mensaxes polo asunto"
 
 #~ msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
 #~ msgstr "<span size=\"large\" weight=\"bold\">Detalles de envío:</span>"
@@ -22450,1102 +22724,3 @@ msgstr "Métodos de entrada"
 
 #~ msgid "Antialiased"
 #~ msgstr "Antialias"
-
-# (pofilter) variables: (u'translation contains variables not in original: %d',)
-#~ msgid "The antialiasing mode of the canvas."
-#~ msgstr "O modo antialias do canvas."
-
-#~ msgid "Default Sync Address:"
-#~ msgstr "Enderezo de sincronización predefinido:"
-
-#~ msgid "Could not load address book"
-#~ msgstr "Non foi posíbel cargar a axenda de enderezos"
-
-#~ msgid "Could not read pilot's Address application block"
-#~ msgstr "Non foi posíbel ler o bloque de Aplicativo de enderezos do pilot"
-
-#~ msgid "Split Multi-Day Events:"
-#~ msgstr "Dividir eventos de días múltiples:"
-
-#~ msgid "Could not start evolution-data-server"
-#~ msgstr "Non foi posíbel iniciar o evolution-data-server"
-
-#~ msgid "Could not read pilot's Calendar application block"
-#~ msgstr "Non foi posíbel ler o bloque do Aplicativo de Calendario do pilot"
-
-#~ msgid "Could not read pilot's Memo application block"
-#~ msgstr "Non foi posíbel ler o bloque do Aplicativo Memo do pilot"
-
-#~ msgid "Could not write pilot's Memo application block"
-#~ msgstr "Non foi posíbel escribir o bloque do Aplicativo Memo do pilot"
-
-#~ msgid "Default Priority:"
-#~ msgstr "Prioridade predefinida:"
-
-#~ msgid "Could not read pilot's ToDo application block"
-#~ msgstr ""
-#~ "Non foi posíbel ler o bloque do Aplicativo Tarefas pendentes do pilot"
-
-#~ msgid "Could not write pilot's ToDo application block"
-#~ msgstr ""
-#~ "Non foi posíbel escribir o bloque do Aplicativo Tarefas pendentes do pilot"
-
-#~ msgid "GNOME Pilot is not installed."
-#~ msgstr "O Bug buddy non está instalado."
-
-#~ msgid "GNOME Pilot could not be run."
-#~ msgstr "Non foi posíbel executar o Bug Buddy."
-
-#~ msgid "GNOME Pilot _Synchronization..."
-#~ msgstr "_Sincronización con GNOME Pilot..."
-
-#~ msgid "Set up GNOME Pilot configuration"
-#~ msgstr "Definir a configuración do GNOME Pilot"
-
-#~ msgid "Sync with:"
-#~ msgstr "Sincronizar con:"
-
-#~ msgid "Sync Private Records:"
-#~ msgstr "Sincronizar rexistros privados:"
-
-#~ msgid "Sync Categories:"
-#~ msgstr "Sincronizar categorías:"
-
-#~ msgid "Guides you through your initial account setup."
-#~ msgstr "Guíao durante a configuración inicial da súa conta."
-
-#~ msgid "Setup Assistant"
-#~ msgstr "Asistente de configuración"
-
-#~ msgid "Importing data."
-#~ msgstr "Importando datos."
-
-#~ msgid "Please wait"
-#~ msgstr "Espere"
-
-#~ msgid "Do not d_elete"
-#~ msgstr "Non _eliminar"
-
-#~ msgid "Show week numbers in date navigator"
-#~ msgstr "Mostrar os números de semana no navegador de datas"
-
-#~ 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."
-
-#~ 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"
-
-#~ msgid "Appoint_ment"
-#~ msgstr "_Cita"
-
-#~ msgid "_Task"
-#~ msgstr "_Tarefa"
-
-#~ msgid "_From Field"
-#~ msgstr "Campo _De"
-
-#~ msgid "Toggles whether the From chooser is displayed"
-#~ msgstr "Alterna entre se se mostra ou non o selector do campo De"
-
-#~ msgid "Show"
-#~ msgstr "Mostrar"
-
-#~ msgid "Hide"
-#~ msgstr "Ocultar"
-
-#~ msgid "Receiving details:"
-#~ msgstr "Detalles de recepción:"
-
-#~ msgid "Sending details:"
-#~ msgstr "Detalles de envío"
-
-#~ msgid "Show \"From\" field when sending a mail message"
-#~ msgstr "Mostrar o campo \"De\" ao enviar unha mensaxe de correo"
-
-#~ 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."
-
-#~ msgid "address card"
-#~ msgstr "tarxeta de enderezo"
-
-#~ msgid "calendar information"
-#~ msgstr "información de calendario"
-
-#~ msgid "Check whether Evolution is the default mail client on startup."
-#~ msgstr ""
-#~ "Verificar se o Evolution é o cliente de correo predefinido ao iniciar."
-
-#~ msgid "Default Mail Client"
-#~ msgstr "Cliente de correo predefinido"
-
-#~ msgid "<b>Top Posting Option</b> (Not Recommended)"
-#~ msgstr "<b>Opción para responder por encima</b> (Non se recomenda)"
-
-#~ msgid "<b>Server</b>"
-#~ msgstr "<b>Servidor</b>"
-
-#~ msgid "<b>Users:</b>"
-#~ msgstr "<b>Usuarios:</b>"
-
-#~ msgid "<b>Account Name</b>"
-#~ msgstr "<b>Nome da conta</b>"
-
-#~ msgid "_Accept"
-#~ msgstr "_Aceptar"
-
-#~ msgid "Edit"
-#~ msgstr "Editar"
-
-#~ msgid "Import"
-#~ msgstr "Importar"
-
-#~ msgid "View"
-#~ msgstr "Ver"
-
-#~ msgid "{0}"
-#~ msgstr "{0}"
-
-#~ msgid "{1}"
-#~ msgstr "{1}"
-
-#~ msgid "Web Log:"
-#~ msgstr "Rexistro _web:"
-
-#~ msgid "_Web Log:"
-#~ msgstr "Rexistro _web:"
-
-#~ msgid "Source Book"
-#~ msgstr "Axenda de enderezos de orixe"
-
-#~ msgid "Target Book"
-#~ msgstr "Axenda de enderezos de destino"
-
-#~ msgid "Is New Contact"
-#~ msgstr "Ã? un contacto novo"
-
-#~ msgid "Writable Fields"
-#~ msgstr "Campos que se poden escribir"
-
-#~ msgid "Required Fields"
-#~ msgstr "Campos requiridos"
-
-#~ msgid "Changed"
-#~ msgstr "Modificado"
-
-#~ msgid "Shell"
-#~ msgstr "Terminal"
-
-#~ msgid "The EShell singleton"
-#~ msgstr "O singleton de EShell"
-
-#~ msgid "Book"
-#~ msgstr "Axenda de enderezos"
-
-#~ msgid "Is New List"
-#~ msgstr "Ã? unha lista nova"
-
-#~ msgid "Query"
-#~ msgstr "Consulta"
-
-#~ msgid "Model"
-#~ msgstr "Modelo"
-
-#~ msgid "Shell View"
-#~ msgstr "Visualización de terminal"
-
-#~ msgid "Source"
-#~ msgstr "Orixe"
-
-#~ msgid "Has Focus"
-#~ msgstr "Ten foco"
-
-#~ msgid "Field"
-#~ msgstr "Campo"
-
-#~ msgid "Field Name"
-#~ msgstr "Nome do campo"
-
-#~ msgid "Max field name length"
-#~ msgstr "Lonxitude máxima do campo"
-
-#~ msgid "Column Width"
-#~ msgstr "Largura da columna"
-
-#~ msgid "Adapter"
-#~ msgstr "Adaptador"
-
-#~ msgid "Selected"
-#~ msgstr "Seleccionado"
-
-#~ msgid "Has Cursor"
-#~ msgstr "Posúe cursor"
-
-#~ msgid "Calendar repository is offline."
-#~ msgstr "O repositorio de calendarios está desconectado."
-
-#~ msgid "Error on '{0}'"
-#~ msgstr "Erro en '{0}'"
-
-#~ msgid "No response from the server."
-#~ msgstr "Non hai resposta do servidor."
-
-#~ msgid "Unable to load the calendar"
-#~ msgstr "Non é posíbel cargar o calendario"
-
-#~ msgid "{0}."
-#~ msgstr "{0}."
-
-#~ msgid "Check this to use system timezone in Evolution."
-#~ msgstr "Active isto para empregar o fuso horario do sistema en Evolution."
-
-#~ msgid "Attendee_s..."
-#~ msgstr "Participante_s..."
-
-#~ msgid "Default Client"
-#~ msgstr "Cliente predefinido"
-
-#~ msgid "Shell Settings"
-#~ msgstr "Configuración do Exchange"
-
-#~ msgid "Application-wide settings"
-#~ msgstr "Configuración do completado automático"
-
-#~ msgid "A_ttendees..."
-#~ msgstr "Par_ticipantes..."
-
-#~ msgid "0%"
-#~ msgstr "0%"
-
-#~ msgid "10%"
-#~ msgstr "10%"
-
-#~ msgid "20%"
-#~ msgstr "20%"
-
-#~ msgid "30%"
-#~ msgstr "30%"
-
-#~ msgid "40%"
-#~ msgstr "40%"
-
-#~ msgid "50%"
-#~ msgstr "50%"
-
-#~ msgid "60%"
-#~ msgstr "60%"
-
-#~ msgid "70%"
-#~ msgstr "70%"
-
-#~ msgid "80%"
-#~ msgstr "80%"
-
-#~ msgid "90%"
-#~ msgstr "90%"
-
-#~ msgid "100%"
-#~ msgstr "100%"
-
-#~ msgid "_Select Today"
-#~ msgstr "_Seleccionar hoxe"
-
-#~ msgid "New Tab"
-#~ msgstr "Novo _separador"
-
-#~ msgid "Name of the logger"
-#~ msgstr "Nome do compoñente que se está rexistrando"
-
-#~ msgid "Filename"
-#~ msgstr "Nome do f_icheiro:"
-
-#~ msgid "The filename of the module"
-#~ msgstr "Modificar o nome deste cartafol"
-
-#~ msgid "Whether the plugin is enabled"
-#~ msgstr "Indica se o engadido está activado"
-
-#~ msgid "Focus Tracker"
-#~ msgstr "Enfocar o tracker"
-
-#~ msgid "Shell Module"
-#~ msgstr "Modo de selección"
-
-#~ msgid "The mail shell backend"
-#~ msgstr "A infraestrutura da terminal de mail"
-
-#~ msgid "Show Deleted"
-#~ msgstr "Eliminada"
-
-#~ msgid "To Do"
-#~ msgstr "Tarefas pendentes"
-
-#~ msgid "Later"
-#~ msgstr "Máis tarde"
-
-#~ msgid "Unable to create new folder `%s': %s"
-#~ msgstr "Non é posíbel crear un cartafol novo: `%s': %s"
-
-#~ msgid "Unable to copy folder `%s' to `%s': %s"
-#~ msgstr "Non é posíbel copiar o cartafol `%s' en `%s': %s"
-
-#~ msgid "Unable to scan for existing mailboxes at `%s': %s"
-#~ msgstr "Non é posíbel examinar as caixas de correo existentes en `%s': %s"
-
-#~ 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..."
-
-#~ 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"
-
-#~ 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"
-
-#~ msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-#~ msgstr "Non é posíbel copiar os datos POP3 keep-on-server `%s': %s"
-
-#~ msgid "Failed to create local mail storage `%s': %s"
-#~ msgstr ""
-#~ "Produciuse un fallo ao crear o almacenamento de correo local `%s': %s"
-
-#~ 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."
-
-#~ msgid "Allows Evolution to display text part of limited size"
-#~ msgstr ""
-#~ "Permite que o Evolution mostre unha parte de texto de tamaño limitado"
-
-#~ msgid "Enable to render message text part of limited size."
-#~ msgstr ""
-#~ "Active isto para renderizar a parte da mensaxe de texto de tamaño "
-#~ "limitado."
-
-#~ msgid "Text message part limit"
-#~ msgstr "Límite da parte de texto da mensaxe"
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid "Because \"{0}\"."
-#~ msgstr "Por causa de \"{0}\"."
-
-#~ msgid "Because \"{2}\"."
-#~ msgstr "Por causa de \"{2}\"."
-
-#~ 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."
-
-#~ 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."
-
-#~ msgid "Shell Backend"
-#~ msgstr "Infraestrutura shell"
-
-#~ 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."
-
-#~ msgid "Table column:"
-#~ msgstr "Columna da táboa:"
-
-#~ msgid "Source List"
-#~ msgstr "Orixe"
-
-#~ msgid "The registry of address books"
-#~ msgstr "Non foi posíbel obter unha lista de axendas de enderezos"
-
-#~ msgid "Current View"
-#~ msgstr "_Visualización actual"
-
-#~ msgid "The currently selected address book view"
-#~ msgstr "A visualización de axenda de enderezo seleccionada actualmente"
-
-#~ msgid "Previewed Contact"
-#~ msgstr "Contacto novo"
-
-#~ msgid "The contact being shown in the preview pane"
-#~ msgstr "Indica se se mostra o panel de previsualización."
-
-#~ msgid "Preview is Visible"
-#~ msgstr "A barra lateral é visíbel"
-
-#~ msgid "Whether the preview pane is visible"
-#~ msgstr "Indica se se mostra o panel de previsualización."
-
-#~ msgid "LDAP Servers"
-#~ msgstr "Servidores LDAP"
-
-#~ msgid "Autocompletion Settings"
-#~ msgstr "Configuración do completado automático"
-
-#~ 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..."
-
-#~ 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..."
-
-#~ 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..."
-
-#~ 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..."
-
-#~ msgid "Source Selector Widget"
-#~ msgstr "Selector de orixe de notas"
-
-#~ msgid "This widget displays groups of address books"
-#~ msgstr "Non foi posíbel obter unha lista de axendas de enderezos"
-
-#~ msgid "Save as vCard..."
-#~ msgstr "Gardar como vCard..."
-
-#~ msgid "3268"
-#~ msgstr "3268"
-
-#~ msgid "389"
-#~ msgstr "389"
-
-#~ msgid "636"
-#~ msgstr "636"
-
-#~ msgid "The registry of calendars"
-#~ msgstr "Calendario primario"
-
-#~ 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..."
-
-#~ msgid "Unable to migrate old settings from evolution/config.xmldb"
-#~ msgstr ""
-#~ "Non é posíbel migrar a configuración antiga desde evolution/config.xmldb"
-
-#~ msgid "Unable to migrate calendar `%s'"
-#~ msgstr "Non foi posíbel migrar o calendario `%s'"
-
-#~ msgid "Date Navigator Widget"
-#~ msgstr "Widget do navegador de datas"
-
-#~ msgid "This widget displays a miniature calendar"
-#~ msgstr "Este widget mostra unha calendario en miniatura"
-
-#~ msgid "Default Calendar Client"
-#~ msgstr "Cliente de correo predefinido"
-
-#~ msgid "Default client for calendar operations"
-#~ msgstr "O cliente predefinido para as operacións no calendario"
-
-#~ msgid "This widget displays groups of calendars"
-#~ msgstr "Este widget mostra grupos de calendarios"
-
-#~ msgid "The registry of memo lists"
-#~ msgstr "Lista de notas primaria"
-
-#~ msgid "The memo table model"
-#~ msgstr "Modelo da táboa"
-
-#~ msgid "Default Memo Client"
-#~ msgstr "Cliente de recordatorios predefinido"
-
-#~ msgid "Default client for memo operations"
-#~ msgstr "Cliente predefinido para as operacións nas citas"
-
-#~ msgid "This widget displays groups of memo lists"
-#~ msgstr "Este widget mostra os grupos de listas de recordatorios"
-
-#~ msgid "The registry of task lists"
-#~ msgstr "Lista de tarefas primaria"
-
-#~ msgid "The task table model"
-#~ msgstr "Modelo da táboa"
-
-#~ 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..."
-
-#~ msgid "Unable to migrate tasks `%s'"
-#~ msgstr "Non foi posíbel migrar as tarefas `%s'"
-
-#~ msgid "Default Task Client"
-#~ msgstr "Cliente de tarefas predefinido"
-
-#~ msgid "Default client for task operations"
-#~ msgstr "Cliente predefinido para a operación na tarefa"
-
-#~ msgid "This widget displays groups of task lists"
-#~ msgstr "Este widget mostra os grupos de listas de tarefas"
-
-#~ msgid "Group by Threads"
-#~ msgstr "Agr_upar por fíos"
-
-#~ msgid "Whether to group messages by threads"
-#~ msgstr "Indica se as mensaxes se agrupan por fíos"
-
-#~ msgid "Hide _Read Messages"
-#~ msgstr "Ocultar as mensaxes _lidas"
-
-#~ msgid "Temporarily hide all messages that have already been read"
-#~ msgstr "Ocultar temporalmente todas as mensaxes lidas"
-
-#~ msgid "Hide S_elected Messages"
-#~ msgstr "Ocultar as mensaxes s_eleccionadas"
-
-#~ msgid "Temporarily hide the selected messages"
-#~ msgstr "Ocultar temporalmente as mensaxes seleccionadas"
-
-#~ msgid "Show Hidde_n Messages"
-#~ msgstr "Mostrar as mensaxes o_cultas"
-
-#~ msgid "Show messages that have been temporarily hidden"
-#~ msgstr "Mostrar as mensaxes ocultas temporalmente"
-
-#~ msgid "Hide _Deleted Messages"
-#~ msgstr "Ocultar as mensaxes elimina_das"
-
-#~ msgid ""
-#~ "Hide deleted messages rather than displaying them with a line through them"
-#~ msgstr "Ocultar as mensaxes eliminadas en vez de mostralas riscadas"
-
-#~ 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."
-
-#~ msgid "Add Hula support to Evolution."
-#~ msgstr "Engade a compatibilidade de Hula con Evolution."
-
-#~ msgid "Hula Support"
-#~ msgstr "Compatibilidade con Hula"
-
-#~ msgid "%ld KB"
-#~ msgstr "%ld KB"
-
-#~ msgid "Toolbar Style"
-#~ msgstr "Estilo da _barra de ferramentas"
-
-#~ msgid "The switcher's toolbar style"
-#~ msgstr "O estilo da barra de ferramentas do alternador"
-
-#~ msgid "Whether the switcher is visible"
-#~ msgstr "Se a barra lateral debería ser visíbel."
-
-#~ msgid "Switcher Action"
-#~ msgstr "Cambiar a %s"
-
-#~ msgid "The switcher action for this shell view"
-#~ msgstr "A acción do alternador para esta visualización de terminal de ordes"
-
-#~ msgid "Page Number"
-#~ msgstr "Número de serie"
-
-#~ 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"
-
-#~ msgid "Search Rule"
-#~ msgstr "Filtro de busca"
-
-#~ msgid "Criteria for the current search results"
-#~ msgstr "Criterio para os resultados da búsqueda actual"
-
-#~ msgid "The EShellBackend for this shell view"
-#~ msgstr "O EShellBackend para esta visualizacion de terminal de ordes"
-
-#~ msgid "Shell Content Widget"
-#~ msgstr "Widget de contido de intérprete de ordes"
-
-#~ 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"
-
-#~ msgid "Shell Sidebar Widget"
-#~ msgstr "Largura predefinida da barra lateral"
-
-#~ 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"
-
-#~ msgid "Shell Taskbar Widget"
-#~ msgstr "Widget da barra de ferramentas da terminal de ordes"
-
-#~ 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"
-
-#~ msgid "Shell Window"
-#~ msgstr "_Xanela nova"
-
-#~ msgid "The window to which the shell view belongs"
-#~ msgstr "A xanela á que pertence a visualización da terminal de ordes"
-
-#~ msgid "The key file holding widget state data"
-#~ msgstr "O ficheiro chave que contén os datos de estado do wiget"
-
-#~ msgid "The title of the shell view"
-#~ msgstr "O título da visualización da terminal de sesión"
-
-#~ msgid "Current View ID"
-#~ msgstr "_Visualización actual"
-
-#~ msgid "The current GAL view ID"
-#~ msgstr "Gardar a visualización personalizada actual"
-
-#~ msgid "Active Shell View"
-#~ msgstr "Visualización da terminal de ordes activa"
-
-#~ msgid "Name of the active shell view"
-#~ msgstr "Nome da visualización nova:"
-
-#~ msgid "The shell window's EFocusTracker"
-#~ msgstr "O EFocusTracker da xanela da terminal de ordes"
-
-#~ msgid "Geometry"
-#~ msgstr "Xeometría"
-
-#~ msgid "Initial window geometry string"
-#~ msgstr "A cadea da xeometría inicial da xanela"
-
-#~ msgid "Whether the shell window is in safe mode"
-#~ msgstr "Indica se o engadido está activado"
-
-#~ msgid "Sidebar Visible"
-#~ msgstr "A barra lateral é visíbel"
-
-#~ msgid "Whether the shell window's side bar is visible"
-#~ msgstr "Se os botóns da xanela deberían ser visíbeis."
-
-#~ msgid "Switcher Visible"
-#~ msgstr "A barra lateral é visíbel"
-
-#~ msgid "Whether the shell window's switcher buttons are visible"
-#~ msgstr "Se os botóns da xanela deberían ser visíbeis."
-
-#~ msgid "Taskbar Visible"
-#~ msgstr "A barra de estado é visíbel"
-
-#~ msgid "Whether the shell window's task bar is visible"
-#~ msgstr "Se a barra de estado debería ser visíbel."
-
-#~ msgid "Whether the shell window's tool bar is visible"
-#~ msgstr "Se os botóns da xanela deberían ser visíbeis."
-
-#~ msgid "UI Manager"
-#~ msgstr "Xestor"
-
-#~ msgid "The shell window's GtkUIManager"
-#~ msgstr "O GtkUIManager da xanela da terminal de ordes"
-
-#~ msgid "Module Directory"
-#~ msgstr "Cartafol onde gardar"
-
-#~ msgid "The directory from which to load EModules"
-#~ msgstr "O cartafol desde o cal ler EModules"
-
-#~ msgid "Network Available"
-#~ msgstr "TLS non dispoñíbel"
-
-#~ msgid "Whether the network is available"
-#~ msgstr "Indica se o engadido está activado"
-
-#~ msgid "Online"
-#~ msgstr "Conectado"
-
-#~ msgid "Forcibly re-migrate from Evolution 1.4"
-#~ msgstr "Forza a remigración desde o Evolution 1.4"
-
-#~ msgid "Insufficient disk space for upgrade."
-#~ msgstr "Espazo en disco insuficiente para a actualización."
-
-#~ msgid "Really delete old data?"
-#~ msgstr "Está seguro de que quere eliminar os datos antigos?"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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."
-
-#~ msgid "_Keep Data"
-#~ msgstr "_Conservar os datos"
-
-#~ msgid "_Remind Me Later"
-#~ msgstr "_Avisarme máis tarde"
-
-#~ msgid "Collection"
-#~ msgstr "Colección"
-
-#~ msgid "Instance"
-#~ msgstr "Instancia"
-
-#~ msgid "Factory"
-#~ msgstr "Factoría"
-
-#~ msgid "Action"
-#~ msgstr "_Accións"
-
-#~ msgid "A GtkRadioAction"
-#~ msgstr "Un GtkRadioAction"
-
-#~ msgid "Show _Attachment Bar"
-#~ msgstr "Mostrar a _barra de anexos"
-
-#~ msgid "Fill color"
-#~ msgstr "Encher con cor"
-
-#~ msgid "GDK fill color"
-#~ msgstr "Encher con cor GDK"
-
-#~ msgid "Fill stipple"
-#~ msgstr "Encher con liña de puntos"
-
-#~ msgid "X2"
-#~ msgstr "X2"
-
-#~ msgid "Y2"
-#~ msgstr "Y2"
-
-#~ msgid "Minimum width"
-#~ msgstr "Largura mínima"
-
-#~ msgid "Minimum Width"
-#~ msgstr "Largura mínima"
-
-#~ msgid "Spacing"
-#~ msgstr "Espazamento"
-
-#~ msgid "The button state is online"
-#~ msgstr "O estado do botón é conectado"
-
-#~ msgid "Horizontal Position"
-#~ msgstr "Posición horizontal do panel"
-
-#~ msgid "Pane position when oriented horizontally"
-#~ msgstr "Posición do panel ao orientalo horizontalmente"
-
-#~ msgid "Vertical Position"
-#~ msgstr "Posición vertical do panel"
-
-#~ msgid "Pane position when oriented vertically"
-#~ msgstr "Posición do panel ao orientalo verticalmente"
-
-#~ msgid "Proportion"
-#~ msgstr "_Propiedades"
-
-#~ msgid "Proportion of the 2nd pane size"
-#~ msgstr "Proporción do tamaño do segundo panel"
-
-#~ msgid "Fixed Resize"
-#~ msgstr "_Redimensionar"
-
-#~ msgid "Keep the 2nd pane fixed during resize"
-#~ msgstr "Manter o segundo panel fixo durante o redimensionado"
-
-#~ msgid "Cursor Row"
-#~ msgstr "Fila de cursor"
-
-#~ msgid "Sorter"
-#~ msgstr "Clasificador"
-
-#~ msgid "Selection Mode"
-#~ msgstr "Modo de selección"
-
-#~ msgid "Cursor Mode"
-#~ msgstr "Modo do cursor"
-
-#~ msgid "Selected Column"
-#~ msgstr "Columna seleccionada"
-
-#~ msgid "Focused Column"
-#~ msgstr "Columna enfocada"
-
-#~ msgid "Unselected Column"
-#~ msgstr "Columna non seleccionada"
-
-#~ msgid "Strikeout Column"
-#~ msgstr "Riscar columna"
-
-#~ msgid "Bold Column"
-#~ msgstr "Columna en negra"
-
-#~ msgid "Color Column"
-#~ msgstr "Cor da columna"
-
-#~ msgid "BG Color Column"
-#~ msgstr "Cor de fondo da columna"
-
-#~ msgid "State"
-#~ msgstr "Estado"
-
-#~ msgid "Alternating Row Colors"
-#~ msgstr "Alternar as cores das filas"
-
-#~ msgid "Horizontal Draw Grid"
-#~ msgstr "Debuxar a grade horizontal"
-
-#~ msgid "Vertical Draw Grid"
-#~ msgstr "Debuxar a grade vertical"
-
-#~ msgid "Draw focus"
-#~ msgstr "Debuxar o foco"
-
-#~ msgid "Cursor mode"
-#~ msgstr "Modo de cursor"
-
-#~ msgid "Selection model"
-#~ msgstr "Modelo de selección"
-
-#~ msgid "Length Threshold"
-#~ msgstr "Límite de lonxitude"
-
-#~ msgid "Uniform row height"
-#~ msgstr "Altura uniforme da fila"
-
-#~ msgid "Frozen"
-#~ msgstr "Conxelado"
-
-#~ msgid "Table header"
-#~ msgstr "Cabeceira da táboa"
-
-#~ msgid "Table model"
-#~ msgstr "Modelo da táboa"
-
-#~ msgid "Cursor row"
-#~ msgstr "Fila do cursor"
-
-#~ msgid "Sort Info"
-#~ msgstr "Ordenar a información"
-
-#~ msgid "Always search"
-#~ msgstr "Buscar sempre"
-
-#~ msgid "Use click to add"
-#~ msgstr "Premer para engadir"
-
-#~ msgid "Vertical Row Spacing"
-#~ msgstr "Debuxar a grade vertical"
-
-#~ 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"
-
-#~ msgid "ETree table adapter"
-#~ msgstr "Adaptador de táboa Etree"
-
-#~ msgid "Retro Look"
-#~ msgstr "Aparencia retro"
-
-#~ msgid "Draw lines and +/- expanders."
-#~ msgstr "Debuxar liñas e expansores +/-."
-
-#~ msgid "Expander Size"
-#~ msgstr "Tamaño do expansor"
-
-#~ msgid "Size of the expander arrow"
-#~ msgstr "Tamaño da frecha do expansor"
-
-#~ msgid "popup"
-#~ msgstr "emerxente"
-
-#~ msgid "edit"
-#~ msgstr "editar"
-
-#~ msgid "toggle"
-#~ msgstr "alternar o estado"
-
-#~ msgid "expand"
-#~ msgstr "expandir"
-
-#~ msgid "Event Processor"
-#~ msgstr "Procesador de eventos"
-
-#~ msgid "Bold"
-#~ msgstr "Negra"
-
-#~ msgid "Clip Width"
-#~ msgstr "Largura do clip"
-
-#~ msgid "Clip Height"
-#~ msgstr "Altura do clip"
-
-#~ msgid "Clip"
-#~ msgstr "Clip"
-
-#~ msgid "Fill clip rectangle"
-#~ msgstr "Encher o rectángulo do clip"
-
-#~ msgid "X Offset"
-#~ msgstr "Desprazamento X"
-
-#~ msgid "Y Offset"
-#~ msgstr "Desprazamento Y"
-
-#~ msgid "Use ellipsis"
-#~ msgstr "Usar a elipse"
-
-#~ msgid "Ellipsis"
-#~ msgstr "Elipse"
-
-#~ msgid "Line wrap"
-#~ msgstr "Axuste de liña"
-
-#~ msgid "Break characters"
-#~ msgstr "Caracteres de quebra"
-
-#~ msgid "Max lines"
-#~ msgstr "Máximo de liñas"
-
-#~ msgid "Draw borders"
-#~ msgstr "Debuxar os bordos"
-
-#~ msgid "Allow newlines"
-#~ msgstr "Permitir liñas novas"
-
-#~ msgid "Draw background"
-#~ msgstr "Debuxar o fondo"
-
-#~ msgid "Draw button"
-#~ msgstr "Debuxar o botón"
-
-#~ msgid "Cursor position"
-#~ msgstr "Posición do cursor"
-
-#~ msgid "IM Context"
-#~ msgstr "Contexto MI"
-
-#~ msgid "Handle Popup"
-#~ msgstr "Tirador emerxente"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]