[evolution] Updated Galician translations

[Francisco DiÃguez Souto <frandieguez src gnome org>]

commit bc80904761c2a56f9beaa744554b51b79f934888
Author: Fran DiÃguez <fran dieguez mabishu com>
Date:   Tue Jun 5 01:24:42 2012 +0200

    Updated Galician translations

 po/gl.po | 8132 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 4138 insertions(+), 3994 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index 9fc251d..c557542 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -18,13 +18,13 @@
 # Fran DiÃguez <frandieguez gnome org>, 2009, 2010, 2011.
 # Fran Dieguez <frandieguez gnome org>, 2010, 2011, 2012.
 #
-#: ../shell/main.c:575
+#: ../shell/main.c:573
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-master-po-gl-53747.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-03 03:13+0200\n"
-"PO-Revision-Date: 2012-06-03 03:15+0200\n"
+"POT-Creation-Date: 2012-06-05 00:53+0200\n"
+"PO-Revision-Date: 2012-06-05 01:23+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
 "Language-Team: Galician <gnome-l10n-gl gnome org>\n"
 "Language: gl\n"
@@ -261,7 +261,7 @@ msgstr ""
 "contactos persoais."
 
 #: ../addressbook/addressbook.error.xml.h:44
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1258
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1266
 msgid "Failed to delete contact"
 msgstr "Produciuse un fallo ao eliminar o contacto"
 
@@ -283,9 +283,9 @@ msgstr ""
 "Seleccione unha axenda de enderezos diferente na barra lateral en Contactos."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:630
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:652
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2928
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:626
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:648
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2924
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
@@ -322,11 +322,11 @@ msgid "_Wants to receive HTML mail"
 msgstr "_Desexa recibir o correo en HTML"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:394
+#: ../addressbook/gui/merging/eab-contact-merging.c:396
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:617
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:972
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../smime/lib/e-cert.c:811
+#: ../smime/lib/e-cert.c:810
 msgid "Email"
 msgstr "Correo electrÃnico"
 
@@ -339,7 +339,7 @@ msgid "Instant Messaging"
 msgstr "MensaxarÃa instantÃnea"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/importers/evolution-vcard-importer.c:997
+#: ../addressbook/importers/evolution-vcard-importer.c:1002
 msgid "Contact"
 msgstr "Contacto"
 
@@ -348,9 +348,9 @@ msgid "_Home Page:"
 msgstr "PÃxi_na web:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../calendar/gui/dialogs/event-page.c:719
+#: ../calendar/gui/dialogs/event-page.c:722
 #: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../plugins/itip-formatter/itip-view.c:1530
+#: ../plugins/itip-formatter/itip-view.c:1791
 msgid "_Calendar:"
 msgstr "_Calendario:"
 
@@ -367,6 +367,7 @@ msgid "Home Page:"
 msgstr "PÃxina web:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../modules/cal-config-google/evolution-cal-config-google.c:98
 msgid "Calendar:"
 msgstr "_Calendario:"
 
@@ -442,7 +443,7 @@ msgstr "_Aniversario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:712
-#: ../calendar/gui/e-calendar-view.c:2124
+#: ../calendar/gui/e-calendar-view.c:2147
 msgid "Anniversary"
 msgstr "Aniversario"
 
@@ -453,8 +454,8 @@ msgstr "Aniversario"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:711
-#: ../calendar/gui/e-calendar-view.c:2123 ../capplet/anjal-settings-main.c:83
-#: ../shell/main.c:135
+#: ../calendar/gui/e-calendar-view.c:2146 ../capplet/anjal-settings-main.c:83
+#: ../shell/main.c:133
 msgid "Birthday"
 msgstr "Aniversario"
 
@@ -492,27 +493,27 @@ msgid "_Address:"
 msgstr "_Enderezo:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
 #: ../addressbook/gui/widgets/eab-contact-display.c:372
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:72
-#: ../widgets/misc/e-contact-map.c:300
+#: ../widgets/misc/e-contact-map.c:298
 msgid "Home"
 msgstr "Particular"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:369
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:71
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:693
-#: ../widgets/misc/e-contact-map.c:308
+#: ../widgets/misc/e-contact-map.c:306
 msgid "Work"
 msgstr "Traballo"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:73
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:391
-#: ../calendar/gui/e-cal-model.c:3472
+#: ../calendar/gui/e-cal-model.c:3536
 msgid "Other"
 msgstr "Outros"
 
@@ -524,79 +525,79 @@ msgstr "Enderezo de correo"
 msgid "Notes"
 msgstr "Notas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:620
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:623
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:625
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:626
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:624
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:622
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:621
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:627
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:628
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
-#: ../addressbook/gui/widgets/eab-gui-util.c:499
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:218
+#: ../addressbook/gui/widgets/eab-gui-util.c:497
 msgid "Error adding contact"
 msgstr "Produciuse un erro ao engadir o contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:233
 msgid "Error modifying contact"
 msgstr "Produciuse un erro ao modificar o contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:248
 msgid "Error removing contact"
 msgstr "Produciuse un erro ao eliminar o contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:646
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2922
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:642
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2918
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3408
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3400
 msgid "Please select an image for this contact"
 msgstr "Escolla unha imaxe para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3409
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3401
 msgid "_No image"
 msgstr "_Sen imaxe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3737
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3734
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -604,48 +605,48 @@ msgstr ""
 "Os datos do contacto son incorrectos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3743
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3740
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "Â%s ten un formato incorrecto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3750
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3747
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "Â%s non pode ser unha data no futuro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3758
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3755
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sÂ%s ten un formato incorrecto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3771
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3785
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3768
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3782
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sÂ%s està baleiro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3800
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3797
 msgid "Invalid contact."
 msgstr "Contacto incorrecto."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:443
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:438
 msgid "Contact Quick-Add"
 msgstr "AdiciÃn rÃpida de contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:446
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
 msgid "_Edit Full"
 msgstr "_Editar completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:497
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:491
 msgid "_Full name"
 msgstr "Nome _completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:508
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:502
 msgid "E_mail"
 msgstr "Correo _electrÃnico"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:519
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:513
 msgid "_Select Address Book"
 msgstr "_Seleccionar a axenda de enderezos"
 
@@ -715,7 +716,7 @@ msgid "_Suffix:"
 msgstr "_Sufixo:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:768
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:766
 msgid "Contact List Editor"
 msgstr "Editor da lista de contactos"
 
@@ -749,27 +750,26 @@ msgid "Insert email addresses from Address Book"
 msgstr "Insertar un enderezo de correo-e desde a axenda de enderezos"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
-#: ../mail/mail-config.ui.h:156
 msgid "_Select..."
 msgstr "_Seleccionarâ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:891
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:889
 msgid "Contact List Members"
 msgstr "Membros da lista de contactos"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1419
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1413
 msgid "_Members"
 msgstr "_Membros"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1533
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1532
 msgid "Error adding list"
 msgstr "Produciuse un erro ao engadir a lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1548
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1547
 msgid "Error modifying list"
 msgstr "Produciuse un erro ao modificar a lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1563
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1562
 msgid "Error removing list"
 msgstr "Produciuse un erro ao eliminar a lista"
 
@@ -796,7 +796,7 @@ msgid "Changed Contact:"
 msgstr "Contacto modificado:"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-#: ../addressbook/gui/merging/eab-contact-merging.c:340
+#: ../addressbook/gui/merging/eab-contact-merging.c:342
 msgid "_Merge"
 msgstr "_Combinar"
 
@@ -816,27 +816,27 @@ msgstr "Contacto orixinal:"
 msgid "New Contact:"
 msgstr "Contacto novo:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:322
+#: ../addressbook/gui/merging/eab-contact-merging.c:324
 msgid "Merge Contact"
 msgstr "Combinar o contacto"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1088
+#: ../modules/addressbook/e-book-shell-view-actions.c:1060
 msgid "Name contains"
 msgstr "O nome contÃn"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1081
+#: ../modules/addressbook/e-book-shell-view-actions.c:1053
 msgid "Email begins with"
 msgstr "O correo comeza por"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1074
-#: ../modules/calendar/e-cal-shell-view-actions.c:1791
-#: ../modules/calendar/e-memo-shell-view-actions.c:806
-#: ../modules/calendar/e-task-shell-view-actions.c:1005
+#: ../modules/addressbook/e-book-shell-view-actions.c:1046
+#: ../modules/calendar/e-cal-shell-view-actions.c:1797
+#: ../modules/calendar/e-memo-shell-view-actions.c:812
+#: ../modules/calendar/e-task-shell-view-actions.c:1011
 msgid "Any field contains"
 msgstr "Calquera campo contÃn"
 
@@ -851,22 +851,22 @@ msgid "Copy _Email Address"
 msgstr "Copiar o _enderezo de correo"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:161
-#: ../widgets/misc/e-web-view.c:301 ../widgets/misc/e-web-view-gtkhtml.c:431
+#: ../widgets/misc/e-web-view.c:301 ../widgets/misc/e-web-view-gtkhtml.c:430
 msgid "Copy the email address to the clipboard"
 msgstr "Copiar o enderezo de correo ao portapapeis"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:166
-#: ../widgets/misc/e-web-view.c:306 ../widgets/misc/e-web-view-gtkhtml.c:436
+#: ../widgets/misc/e-web-view.c:306 ../widgets/misc/e-web-view-gtkhtml.c:435
 msgid "_Send New Message To..."
 msgstr "Enviar unha men_saxe nova aâ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:168
-#: ../widgets/misc/e-web-view.c:308 ../widgets/misc/e-web-view-gtkhtml.c:438
+#: ../widgets/misc/e-web-view.c:308 ../widgets/misc/e-web-view-gtkhtml.c:437
 msgid "Send a mail message to this address"
 msgstr "Enviar unha mensaxe a este enderezo"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:307
-#: ../widgets/misc/e-web-view.c:1089 ../widgets/misc/e-web-view-gtkhtml.c:975
+#: ../widgets/misc/e-web-view.c:1089 ../widgets/misc/e-web-view-gtkhtml.c:974
 #, c-format
 msgid "Click to mail %s"
 msgstr "Prema para enviar un correo a %s"
@@ -916,11 +916,9 @@ msgid "Video Chat"
 msgstr "Videoconferencia"
 
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:679
-#: ../calendar/gui/dialogs/calendar-setup.c:469
-#: ../modules/calendar/e-cal-shell-view-actions.c:239
-#: ../modules/calendar/e-cal-shell-view-actions.c:268
-#: ../modules/calendar/e-cal-shell-view.c:606
-#: ../modules/online-accounts/e-online-accounts-google.c:309
+#: ../modules/calendar/e-cal-shell-view-actions.c:216
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view.c:621
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 #: ../widgets/misc/e-send-options.c:546
 msgid "Calendar"
@@ -965,20 +963,7 @@ msgstr "TelÃfono mÃbil"
 msgid "Spouse"
 msgstr "CÃnxuxe"
 
-#. 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-formatter.c:723
-#: ../capplet/settings/mail-capplet-shell.c:385
-#: ../modules/addressbook/e-book-shell-backend.c:126
-#: ../modules/addressbook/e-book-shell-migrate.c:144
-#: ../modules/calendar/e-cal-shell-backend.c:144
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-memo-shell-backend.c:132
-#: ../modules/calendar/e-memo-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-backend.c:128
-#: ../modules/calendar/e-task-shell-migrate.c:132
 msgid "Personal"
 msgstr "Persoal"
 
@@ -1003,7 +988,7 @@ msgstr "PÃxina web"
 msgid "Blog"
 msgstr "Blogue"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:120
+#: ../addressbook/gui/widgets/eab-gui-util.c:124
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1014,7 +999,7 @@ msgstr ""
 "descargada para o seu uso sen conexiÃn. Cargue unha vez a axenda de "
 "enderezos no modo conectado para descargar os seus contidos."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:143
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1023,7 +1008,7 @@ msgstr ""
 "Non à posÃbel abrir esta axenda de enderezos. Comprobe que a ruta %s existe "
 "e que estÃn estabelecidos os permisos para acceder a ela."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:161
+#: ../addressbook/gui/widgets/eab-gui-util.c:156
 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."
@@ -1032,7 +1017,7 @@ msgstr ""
 "usar o LDAP no Evolution ten que instalar un paquete coas capacidades LDAP "
 "activadas."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:165
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1040,11 +1025,11 @@ msgstr ""
 "Non à posÃbel abrir esta axenda de enderezos. Isto pode significar que se "
 "introduciu un URI incorrecto ou que o servidor non à accesÃbel."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#: ../addressbook/gui/widgets/eab-gui-util.c:173
 msgid "Detailed error message:"
 msgstr "Mensaxe de erro detallada:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:216
+#: ../addressbook/gui/widgets/eab-gui-util.c:210
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1057,7 +1042,7 @@ msgstr ""
 "Faga unha busca mÃis especÃfica ou eleve o lÃmite dos resultados\n"
 "nas preferencias do servidor de cartafoles para esta axenda de enderezos."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
+#: ../addressbook/gui/widgets/eab-gui-util.c:217
 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"
@@ -1071,7 +1056,7 @@ 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:231
+#: ../addressbook/gui/widgets/eab-gui-util.c:225
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr ""
@@ -1079,28 +1064,28 @@ msgstr ""
 "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:236
+#: ../addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "O backend desta axenda de enderezos rexeitou 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:236
 #: ../addressbook/gui/widgets/eab-gui-util.c:242
-#: ../addressbook/gui/widgets/eab-gui-util.c:248
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "Esta consulta non terminou correctamente. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:270
+#: ../addressbook/gui/widgets/eab-gui-util.c:264
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:321
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Select Address Book"
 msgstr "Seleccionar a axenda de enderezos"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:401
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
 msgid "list"
 msgstr "lista"
 
@@ -1120,22 +1105,22 @@ msgstr "Mover os contactos a"
 msgid "Copy contacts to"
 msgstr "Copiar os contactos a"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:165
 msgid "No contacts"
 msgstr "Sen contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:167
+#: ../addressbook/gui/widgets/e-addressbook-model.c:169
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d contacto"
 msgstr[1] "%d contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:370
+#: ../addressbook/gui/widgets/e-addressbook-model.c:372
 msgid "Error getting book view"
 msgstr "Produciuse un erro a vista da axenda"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:759
+#: ../addressbook/gui/widgets/e-addressbook-model.c:807
 msgid "Search Interrupted"
 msgstr "Busca interrumpida"
 
@@ -1143,55 +1128,55 @@ msgstr "Busca interrumpida"
 msgid "Error modifying card"
 msgstr "Produciuse un erro ao modificar a tarxeta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:645
 msgid "Cut selected contacts to the clipboard"
 msgstr "Cortar os contactos seleccionados ao portapapeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:646
+#: ../addressbook/gui/widgets/e-addressbook-view.c:651
 msgid "Copy selected contacts to the clipboard"
 msgstr "Copiar os contactos seleccionados ao portapapeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:652
+#: ../addressbook/gui/widgets/e-addressbook-view.c:657
 msgid "Paste contacts from the clipboard"
 msgstr "Pegar os contactos desde o portapapeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:658
-#: ../modules/addressbook/e-book-shell-view-actions.c:892
+#: ../addressbook/gui/widgets/e-addressbook-view.c:663
+#: ../modules/addressbook/e-book-shell-view-actions.c:864
 msgid "Delete selected contacts"
 msgstr "Eliminar os contactos seleccionados"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:664
+#: ../addressbook/gui/widgets/e-addressbook-view.c:669
 msgid "Select all visible contacts"
 msgstr "Seleccionar todos os contactos visÃbeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Està seguro de que desexa eliminar estas listas de contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1310
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1318
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Està seguro de que desexa eliminar esta lista de contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1322
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Està seguro de que desexa eliminar esta lista de contactos (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1328
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Està seguro de que desexa eliminar estes contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1324
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1332
 msgid "Are you sure you want to delete this contact?"
 msgstr "Està seguro de que desexa eliminar este contacto?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1328
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1336
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Està seguro de que desexa eliminar este contacto (%s)?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1492
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1206,11 +1191,11 @@ msgstr[1] ""
 "Ao abrir %d contactos, abrirà tamÃn %d novas xanelas.\n"
 "Està seguro de que desexa visualizar todos estes contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1492
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1500
 msgid "_Don't Display"
 msgstr "_Non mostrar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1493
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1501
 msgid "Display _All Contacts"
 msgstr "Mostrar _todos os contactos"
 
@@ -1325,7 +1310,7 @@ msgid "Title"
 msgstr "TÃtulo"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:653
+#: ../calendar/gui/e-meeting-list-view.c:657
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "FunciÃn"
@@ -1377,20 +1362,33 @@ msgid_plural "current address book folder %s has %d cards"
 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/e-minicard.c:98
+#: ../addressbook/gui/widgets/e-book-source-config.c:98
+msgid "Mark as default address book"
+msgstr "Marcar como axenda de enderezos predefinida"
+
+#: ../addressbook/gui/widgets/e-book-source-config.c:103
+msgid "Autocomplete with this address book"
+msgstr "Completar automaticamente con esta axenda de enderezos"
+
+#: ../addressbook/gui/widgets/e-book-source-config.c:244
+msgid "Copy book content locally for offline operation"
+msgstr ""
+"Copiar o contido da axenda de enderezos localmente para operar sen conexiÃn"
+
+#: ../addressbook/gui/widgets/e-minicard.c:97
 msgid "Work Email"
 msgstr "Correo electrÃnico do traballo"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:98
 msgid "Home Email"
 msgstr "Correo electrÃnico particular"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
-#: ../addressbook/gui/widgets/e-minicard.c:795
+#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:794
 msgid "Other Email"
 msgstr "Outro correo electrÃnico"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -1400,7 +1398,7 @@ msgstr ""
 "\n"
 "Buscando os contactosâ"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:196
+#: ../addressbook/gui/widgets/e-minicard-view.c:194
 msgid ""
 "\n"
 "\n"
@@ -1414,7 +1412,7 @@ msgstr ""
 "\n"
 "ou premer aquà dÃas veces para crear un contacto novo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:199
+#: ../addressbook/gui/widgets/e-minicard-view.c:197
 msgid ""
 "\n"
 "\n"
@@ -1428,7 +1426,7 @@ msgstr ""
 "\n"
 "Prema aquà dÃas veces para crear un contacto novo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:203
+#: ../addressbook/gui/widgets/e-minicard-view.c:201
 msgid ""
 "\n"
 "\n"
@@ -1438,7 +1436,7 @@ msgstr ""
 "\n"
 "Buscar o contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:205
+#: ../addressbook/gui/widgets/e-minicard-view.c:203
 msgid ""
 "\n"
 "\n"
@@ -1452,87 +1450,87 @@ msgstr ""
 msgid "Card View"
 msgstr "Vista de tarxetas"
 
-#: ../addressbook/importers/evolution-csv-importer.c:748
-#: ../addressbook/importers/evolution-ldif-importer.c:546
-#: ../addressbook/importers/evolution-vcard-importer.c:280
-#: ../calendar/importers/icalendar-importer.c:432
+#: ../addressbook/importers/evolution-csv-importer.c:746
+#: ../addressbook/importers/evolution-ldif-importer.c:544
+#: ../addressbook/importers/evolution-vcard-importer.c:279
+#: ../calendar/importers/icalendar-importer.c:446
 #: ../calendar/importers/icalendar-importer.c:939
 #: ../calendar/importers/icalendar-importer.c:978 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Importandoâ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1080
+#: ../addressbook/importers/evolution-csv-importer.c:1084
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "CSV ou Tab de contactos de Outlook (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1081
+#: ../addressbook/importers/evolution-csv-importer.c:1085
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Importador de CSV e Tab de contactos de Outlook"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1089
+#: ../addressbook/importers/evolution-csv-importer.c:1093
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "CSV ou Tab de contactos de Mozilla (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1090
+#: ../addressbook/importers/evolution-csv-importer.c:1094
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Importador de CSV e Tab de contactos de Mozilla"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1098
+#: ../addressbook/importers/evolution-csv-importer.c:1102
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "CSV ou Tab de contactos de Evolution (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1099
+#: ../addressbook/importers/evolution-csv-importer.c:1103
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Importador de CSV e Tab de contactos de Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:801
+#: ../addressbook/importers/evolution-ldif-importer.c:805
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato de intercambio de datos LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:802
+#: ../addressbook/importers/evolution-ldif-importer.c:806
 msgid "Evolution LDIF importer"
 msgstr "Importador LDIF do Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:662
+#: ../addressbook/importers/evolution-vcard-importer.c:667
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:663
+#: ../addressbook/importers/evolution-vcard-importer.c:668
 msgid "Evolution vCard Importer"
 msgstr "Importador de vCard do Evolution"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:723
+#: ../addressbook/printing/e-contact-print.c:717
 #, c-format
 msgid "Page %d"
 msgstr "PÃxina %d"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Specify the output file instead of standard output"
 msgstr "Indicar o ficheiro de saÃda en vez da saÃda estÃndar"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid "OUTPUTFILE"
 msgstr "FICHEIRO DE SAÃDA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:64
+#: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "List local address book folders"
 msgstr "Listar os cartafoles de axendas de enderezos locais"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:67
+#: ../addressbook/tools/evolution-addressbook-export.c:68
 msgid "Show cards as vcard or csv file"
 msgstr "Mostrar as tarxetas como un ficheiro vcard ou csv"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:68
+#: ../addressbook/tools/evolution-addressbook-export.c:69
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:71
+#: ../addressbook/tools/evolution-addressbook-export.c:72
 msgid "Export in asynchronous mode"
 msgstr "Exportar en modo asÃncrono"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:74
+#: ../addressbook/tools/evolution-addressbook-export.c:75
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
@@ -1540,68 +1538,51 @@ msgstr ""
 "NÃmero de tarxetas nun ficheiro de saÃda en modo asÃncrono. O tamaÃo "
 "predeterminado à 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:76
+#: ../addressbook/tools/evolution-addressbook-export.c:77
 msgid "NUMBER"
 msgstr "NÃMERO"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:139
+#: ../addressbook/tools/evolution-addressbook-export.c:149
 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 a "
 "utilizaciÃn."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Only support csv or vcard format."
 msgstr "SÃ Ã compatÃbel cos formatos csv ou vcard."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:162
+#: ../addressbook/tools/evolution-addressbook-export.c:172
 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:170
+#: ../addressbook/tools/evolution-addressbook-export.c:180
 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:201
+#: ../addressbook/tools/evolution-addressbook-export.c:213
 msgid "Unhandled error"
 msgstr "Erro non manipulado"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:654
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:653
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:688
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:46
 msgid "Can not open file"
 msgstr "Non foi posÃbel abrir o ficheiro"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-#, c-format
-msgid "Couldn't get list of address books: %s"
-msgstr "Non foi posÃbel obter unha lista das axendas de enderezos: %s"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
-#: ../calendar/gui/dialogs/memo-page.c:968 ../em-format/em-format.c:970
-#: ../libemail-engine/mail-ops.c:683 ../mail/e-mail-reader.c:1739
-#: ../mail/em-folder-tree.c:678 ../plugins/caldav/caldav-browse-server.c:221
-#: ../plugins/caldav/caldav-browse-server.c:1482 ../plugins/face/face.c:174
-#: ../plugins/itip-formatter/itip-formatter.c:1501
-#: ../plugins/itip-formatter/itip-formatter.c:1894
-#: ../smime/gui/certificate-manager.c:317
-msgid "Unknown error"
-msgstr "Erro descoÃecido"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:74
 #, c-format
 msgid "Failed to open client '%s': %s"
 msgstr "Produciuse un fallo ao abrir o cliente Â%s (%s)"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:109
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:108
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:122
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:121
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
@@ -1610,14 +1591,14 @@ msgstr[1] "horas"
 #. 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/alarm-notify/alarm-notify-dialog.c:135
-#: ../calendar/gui/dialogs/recurrence-page.c:1197
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:134
+#: ../calendar/gui/dialogs/recurrence-page.c:1195
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dÃa"
 msgstr[1] "dÃas"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:331
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:330
 msgid "Start time"
 msgstr "Hora de inicio"
 
@@ -1641,27 +1622,26 @@ msgstr "Tempo antes da repeticiÃn:"
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../e-util/e-plugin-util.c:454
-#: ../filter/filter.ui.h:8 ../modules/calendar/e-cal-shell-view-actions.c:359
-#: ../plugins/google-account-setup/google-contacts-source.c:390
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../filter/filter.ui.h:8
+#: ../modules/calendar/e-cal-shell-view-actions.c:352
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
+#: ../widgets/misc/e-interval-chooser.c:143
 msgid "days"
 msgstr "dÃas"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/e-plugin-util.c:453
-#: ../filter/filter.ui.h:7
-#: ../plugins/google-account-setup/google-contacts-source.c:388
+#: ../calendar/gui/dialogs/event-page.ui.h:18 ../filter/filter.ui.h:7
+#: ../widgets/misc/e-interval-chooser.c:141
 msgid "hours"
 msgstr "horas"
 
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/e-plugin-util.c:452
-#: ../filter/filter.ui.h:6 ../modules/addressbook/ldap-config.ui.h:29
-#: ../plugins/google-account-setup/google-contacts-source.c:386
+#: ../calendar/gui/dialogs/event-page.ui.h:19 ../filter/filter.ui.h:6
+#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../widgets/misc/e-interval-chooser.c:139
 msgid "minutes"
 msgstr "minutos"
 
@@ -1670,10 +1650,11 @@ msgid "location of appointment"
 msgstr "localizaciÃn da cita"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:9
-#: ../calendar/alarm-notify/alarm-queue.c:1758
-#: ../calendar/alarm-notify/alarm-queue.c:1768
-#: ../plugins/itip-formatter/itip-view.c:1154
-#: ../plugins/itip-formatter/itip-view.c:1254
+#: ../calendar/alarm-notify/alarm-queue.c:1754
+#: ../calendar/alarm-notify/alarm-queue.c:1764
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:216
+#: ../plugins/itip-formatter/itip-view.c:1398
+#: ../plugins/itip-formatter/itip-view.c:1498
 msgid "Location:"
 msgstr "LocalizaciÃn:"
 
@@ -1681,33 +1662,33 @@ msgstr "LocalizaciÃn:"
 msgid "Dismiss _All"
 msgstr "Ignorar _todo"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1607
-#: ../calendar/alarm-notify/alarm-queue.c:1739
+#: ../calendar/alarm-notify/alarm-queue.c:1603
+#: ../calendar/alarm-notify/alarm-queue.c:1735
 msgid "No summary available."
 msgstr "Non hai un resumo dispoÃÃbel."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1616
-#: ../calendar/alarm-notify/alarm-queue.c:1618
+#: ../calendar/alarm-notify/alarm-queue.c:1612
+#: ../calendar/alarm-notify/alarm-queue.c:1614
 msgid "No description available."
 msgstr "Non hai unha descriciÃn dispoÃÃbel."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1626
+#: ../calendar/alarm-notify/alarm-queue.c:1622
 msgid "No location information available."
 msgstr "Non hai informaciÃn da localizaciÃn dispoÃÃbel."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1672
+#: ../calendar/alarm-notify/alarm-queue.c:1668
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "Ten %d recordatorio"
 msgstr[1] "Ten %d recordatorios"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1872
-#: ../calendar/alarm-notify/alarm-queue.c:1907
+#: ../calendar/alarm-notify/alarm-queue.c:1868
+#: ../calendar/alarm-notify/alarm-queue.c:1903
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1876
+#: ../calendar/alarm-notify/alarm-queue.c:1872
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -1719,7 +1700,7 @@ msgstr ""
 "para enviar unha mensaxe de correo electrÃnico. No seu lugar\n"
 "O Evolution vai mostrar un diÃlogo de aviso normal."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1913
+#: ../calendar/alarm-notify/alarm-queue.c:1909
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1736,17 +1717,17 @@ msgstr ""
 "\n"
 "Està seguro de que desexa executar este programa?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1928
+#: ../calendar/alarm-notify/alarm-queue.c:1924
 msgid "Do not ask me about this program again."
 msgstr "Non volver preguntar sobre este programa."
 
-#: ../calendar/alarm-notify/util.c:45
+#: ../calendar/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "hora incorrecta"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:371
-#: ../calendar/gui/misc.c:116
+#: ../calendar/alarm-notify/util.c:70 ../calendar/gui/e-alarm-list.c:370
+#: ../calendar/gui/misc.c:96
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1754,8 +1735,8 @@ msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:377
-#: ../calendar/gui/misc.c:122
+#: ../calendar/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:376
+#: ../calendar/gui/misc.c:102
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1765,8 +1746,8 @@ msgstr[1] "%d minutos"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:81 ../calendar/gui/e-alarm-list.c:383
-#: ../calendar/gui/misc.c:126
+#: ../calendar/alarm-notify/util.c:80 ../calendar/gui/e-alarm-list.c:382
+#: ../calendar/gui/misc.c:106
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -2011,7 +1992,7 @@ msgstr ""
 "anexos."
 
 #: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:316
-#: ../plugins/itip-formatter/itip-view.c:2867
+#: ../plugins/itip-formatter/itip-view.c:3026
 msgid "_Save"
 msgstr "_Gardar"
 
@@ -2212,7 +2193,7 @@ msgstr ""
 msgid "Could not perform this operation."
 msgstr "Non foi posÃbel levar a cabo esta operaciÃn."
 
-#: ../calendar/calendar.error.xml.h:92 ../mail/mail.error.xml.h:175
+#: ../calendar/calendar.error.xml.h:92 ../mail/mail.error.xml.h:165
 msgid "You must be working online to complete this operation."
 msgstr "Debe estar traballando en liÃa para completar esta operaciÃn."
 
@@ -2236,7 +2217,7 @@ msgstr "Vista mensual"
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:383
+#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:372
 msgid "Summary"
 msgstr "Resumo"
 
@@ -2277,20 +2258,20 @@ msgstr "Ã"
 msgid "is not"
 msgstr "non Ã"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:800 ../calendar/gui/e-cal-model.c:807
-#: ../calendar/gui/e-task-table.c:558 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:240
+#: ../calendar/gui/e-cal-model.c:831 ../calendar/gui/e-cal-model.c:838
+#: ../calendar/gui/e-task-table.c:556 ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "PÃblico"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:809 ../calendar/gui/e-task-table.c:559
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:840 ../calendar/gui/e-task-table.c:557
 #: ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "Privado"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:243
-#: ../calendar/gui/e-cal-model.c:811 ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:842 ../calendar/gui/e-task-table.c:558
 #: ../calendar/gui/memotypes.xml.h:12 ../widgets/misc/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Confidencial"
@@ -2308,9 +2289,9 @@ msgstr "Participante"
 
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:861
+#: ../plugins/publish-calendar/publish-calendar.c:860
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Location"
 msgstr "LocalizaciÃn"
 
@@ -2373,22 +2354,22 @@ msgid "Edit Reminder"
 msgstr "Editar recordatorio"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:823
-#: ../calendar/gui/e-alarm-list.c:413
+#: ../calendar/gui/e-alarm-list.c:412
 msgid "Pop up an alert"
 msgstr "Alerta emerxente"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:824
-#: ../calendar/gui/e-alarm-list.c:409
+#: ../calendar/gui/e-alarm-list.c:408
 msgid "Play a sound"
 msgstr "Reproducir un son"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:825
-#: ../calendar/gui/e-alarm-list.c:421
+#: ../calendar/gui/e-alarm-list.c:420
 msgid "Run a program"
 msgstr "Executar un programa"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:826
-#: ../calendar/gui/e-alarm-list.c:417
+#: ../calendar/gui/e-alarm-list.c:416
 msgid "Send an email"
 msgstr "Enviar un correo"
 
@@ -2442,7 +2423,7 @@ msgstr "_Repetir o recordatorio"
 msgid "extra times every"
 msgstr "veces adicionais cada"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:32
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:25
 msgid "Options"
 msgstr "OpciÃns"
 
@@ -2478,7 +2459,7 @@ msgstr "_Argumentos:"
 msgid "Send To:"
 msgstr "Enviar a:"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:241
 msgid "Action/Trigger"
 msgstr "AcciÃn/Activador"
 
@@ -2492,93 +2473,6 @@ msgstr "Recordatorios"
 msgid "A_dd"
 msgstr "Enga_dir"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:169
-msgid "Type:"
-msgstr "Tipo:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:185
-#: ../modules/addressbook/addressbook-config.c:529
-msgid "_Type:"
-msgstr "_Tipo:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:264 ../mail/mail-config.ui.h:9
-#: ../modules/addressbook/ldap-config.ui.h:12
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:286
-msgid "_Name:"
-msgstr "_Nome:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:316
-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:318
-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:320
-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:368
-msgid "Sh_ow reminder notifications"
-msgstr "M_ostrar notificaciÃns de recordatorios"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:445
-msgid "Colo_r:"
-msgstr "Co_r:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:468
-#: ../calendar/gui/dialogs/calendar-setup.c:480
-#: ../calendar/gui/dialogs/calendar-setup.c:491
-#: ../mail/em-folder-properties.c:257 ../mail/mail-config.ui.h:25
-#: ../modules/addressbook/addressbook-config.c:1114
-#: ../modules/addressbook/autocompletion-config.c:238
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
-#: ../plugins/itip-formatter/itip-formatter.c:3401
-#: ../plugins/publish-calendar/publish-calendar.ui.h:16
-#: ../smime/gui/smime-ui.ui.h:21
-msgid "General"
-msgstr "Xeral"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:481
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
-msgid "Task List"
-msgstr "Lista de tarefas"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:492
-msgid "Memo List"
-msgstr "Lista de notas"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:584
-msgid "Calendar Properties"
-msgstr "Propiedades do calendario"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:584
-msgid "New Calendar"
-msgstr "Calendario novo"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:644
-msgid "Task List Properties"
-msgstr "Propiedades da lista de tarefas"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:644
-msgid "New Task List"
-msgstr "Lista de tarefas nova"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:704
-msgid "Memo List Properties"
-msgstr "Propiedades da lista de notas"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:704
-msgid "New Memo List"
-msgstr "Lista de notas nova"
-
 #: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Esta actividade eliminouse."
@@ -2627,246 +2521,246 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Non realizou modificaciÃns. Desexa actualizar o editor?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:281
+#: ../calendar/gui/dialogs/comp-editor.c:278
 msgid "Could not save attachments"
 msgstr "Non foi posÃbel gardar os anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:627
+#: ../calendar/gui/dialogs/comp-editor.c:629
 msgid "Could not update object"
 msgstr "Non foi posÃbel actualizar o obxecto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:755
+#: ../calendar/gui/dialogs/comp-editor.c:763
 msgid "Edit Appointment"
 msgstr "Editar a cita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:762
+#: ../calendar/gui/dialogs/comp-editor.c:770
 #, c-format
 msgid "Meeting - %s"
 msgstr "ReuniÃn - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:764
+#: ../calendar/gui/dialogs/comp-editor.c:772
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:770
+#: ../calendar/gui/dialogs/comp-editor.c:778
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarefa asignada - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:772
+#: ../calendar/gui/dialogs/comp-editor.c:780
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:777
+#: ../calendar/gui/dialogs/comp-editor.c:785
 #, c-format
 msgid "Memo - %s"
 msgstr "Nota - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:793
+#: ../calendar/gui/dialogs/comp-editor.c:801
 msgid "No Summary"
 msgstr "Sen resumo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:914
+#: ../calendar/gui/dialogs/comp-editor.c:922
 msgid "Keep original item?"
 msgstr "Desexa gardar o elemento orixinal?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1153
 msgid "Close the current window"
 msgstr "Pechar a xanela actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1152 ../mail/e-mail-browser.c:139
-#: ../shell/e-shell-window-actions.c:1468
+#: ../calendar/gui/dialogs/comp-editor.c:1160 ../mail/e-mail-browser.c:139
+#: ../shell/e-shell-window-actions.c:1446
 #: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:558
 #: ../widgets/misc/e-web-view.c:328 ../widgets/misc/e-web-view.c:1407
-#: ../widgets/misc/e-web-view-gtkhtml.c:458
-#: ../widgets/misc/e-web-view-gtkhtml.c:1301
+#: ../widgets/misc/e-web-view-gtkhtml.c:457
+#: ../widgets/misc/e-web-view-gtkhtml.c:1300
 msgid "Copy the selection"
 msgstr "Copiar a selecciÃn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1159 ../mail/e-mail-browser.c:146
-#: ../shell/e-shell-window-actions.c:1475
+#: ../calendar/gui/dialogs/comp-editor.c:1167 ../mail/e-mail-browser.c:146
+#: ../shell/e-shell-window-actions.c:1453
 #: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:553
-#: ../widgets/misc/e-web-view.c:1401 ../widgets/misc/e-web-view-gtkhtml.c:1295
+#: ../widgets/misc/e-web-view.c:1401 ../widgets/misc/e-web-view-gtkhtml.c:1294
 msgid "Cut the selection"
 msgstr "Cortar a selecciÃn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1166
-#: ../shell/e-shell-window-actions.c:1482
+#: ../calendar/gui/dialogs/comp-editor.c:1174
+#: ../shell/e-shell-window-actions.c:1460
 #: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:568
 msgid "Delete the selection"
 msgstr "Eliminar a selecciÃn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1173
+#: ../calendar/gui/dialogs/comp-editor.c:1181
 msgid "View help"
 msgstr "Ver a axuda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1180 ../mail/e-mail-browser.c:153
-#: ../shell/e-shell-window-actions.c:1510
+#: ../calendar/gui/dialogs/comp-editor.c:1188 ../mail/e-mail-browser.c:153
+#: ../shell/e-shell-window-actions.c:1481
 #: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:563
-#: ../widgets/misc/e-web-view.c:1413 ../widgets/misc/e-web-view-gtkhtml.c:1307
+#: ../widgets/misc/e-web-view.c:1413 ../widgets/misc/e-web-view-gtkhtml.c:1306
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do portapapeis"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1201
+#: ../calendar/gui/dialogs/comp-editor.c:1209
 msgid "Save current changes"
 msgstr "Gardar os cambios actuais"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1206
+#: ../calendar/gui/dialogs/comp-editor.c:1214
 msgid "Save and Close"
 msgstr "Gardar e pechar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1208
+#: ../calendar/gui/dialogs/comp-editor.c:1216
 msgid "Save current changes and close editor"
 msgstr "Gardar os cambios actuais e pechar o editor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1215 ../mail/e-mail-browser.c:160
-#: ../shell/e-shell-window-actions.c:1587
+#: ../calendar/gui/dialogs/comp-editor.c:1223 ../mail/e-mail-browser.c:160
+#: ../shell/e-shell-window-actions.c:1558
 #: ../widgets/misc/e-focus-tracker.c:142 ../widgets/misc/e-focus-tracker.c:573
 msgid "Select all text"
 msgstr "Seleccionar todo o texto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1222
+#: ../calendar/gui/dialogs/comp-editor.c:1230
 msgid "_Classification"
 msgstr "_ClasificaciÃn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1229
+#: ../calendar/gui/dialogs/comp-editor.c:1237
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
 #: ../mail/e-mail-browser.c:174
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1615
+#: ../shell/e-shell-window-actions.c:1586
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1236 ../mail/e-mail-browser.c:167
-#: ../shell/e-shell-window-actions.c:1622
-#: ../widgets/misc/e-signature-editor.c:227
+#: ../calendar/gui/dialogs/comp-editor.c:1244 ../mail/e-mail-browser.c:167
+#: ../shell/e-shell-window-actions.c:1593
+#: ../widgets/misc/e-mail-signature-editor.c:299
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1243
-#: ../shell/e-shell-window-actions.c:1629
+#: ../calendar/gui/dialogs/comp-editor.c:1251
+#: ../shell/e-shell-window-actions.c:1600
 msgid "_Help"
 msgstr "A_xuda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1250
+#: ../calendar/gui/dialogs/comp-editor.c:1258
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1257
+#: ../calendar/gui/dialogs/comp-editor.c:1265
 #: ../composer/e-composer-actions.c:339
 msgid "_Options"
 msgstr "_OpciÃns"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1264 ../mail/e-mail-browser.c:181
-#: ../shell/e-shell-window-actions.c:1664 ../smime/gui/smime-ui.ui.h:28
+#: ../calendar/gui/dialogs/comp-editor.c:1272 ../mail/e-mail-browser.c:181
+#: ../shell/e-shell-window-actions.c:1635 ../smime/gui/smime-ui.ui.h:28
 msgid "_View"
 msgstr "_Vista"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1274
+#: ../calendar/gui/dialogs/comp-editor.c:1282
 #: ../composer/e-composer-actions.c:288
 msgid "_Attachment..."
 msgstr "_Anexoâ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1284
 #: ../composer/e-composer-actions.c:290
 #: ../widgets/misc/e-attachment-view.c:414
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1284
+#: ../calendar/gui/dialogs/comp-editor.c:1292
 msgid "_Categories"
 msgstr "_CategorÃas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1286
+#: ../calendar/gui/dialogs/comp-editor.c:1294
 msgid "Toggles whether to display categories"
 msgstr "Alterna a vista das categorÃas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292
+#: ../calendar/gui/dialogs/comp-editor.c:1300
 msgid "Time _Zone"
 msgstr "_Fuso horario"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1294
+#: ../calendar/gui/dialogs/comp-editor.c:1302
 msgid "Toggles whether the time zone is displayed"
 msgstr "Alterna a vista do fuso horario"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1303
+#: ../calendar/gui/dialogs/comp-editor.c:1311
 msgid "Pu_blic"
 msgstr "PÃ_blico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1305
+#: ../calendar/gui/dialogs/comp-editor.c:1313
 msgid "Classify as public"
 msgstr "Clasificar como pÃblico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1310
+#: ../calendar/gui/dialogs/comp-editor.c:1318
 msgid "_Private"
 msgstr "_Privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1312
+#: ../calendar/gui/dialogs/comp-editor.c:1320
 msgid "Classify as private"
 msgstr "Clasificar como privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1317
+#: ../calendar/gui/dialogs/comp-editor.c:1325
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1319
+#: ../calendar/gui/dialogs/comp-editor.c:1327
 msgid "Classify as confidential"
 msgstr "Clasificar como confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1327
+#: ../calendar/gui/dialogs/comp-editor.c:1335
 msgid "R_ole Field"
 msgstr "Campo da _funciÃn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1329
+#: ../calendar/gui/dialogs/comp-editor.c:1337
 msgid "Toggles whether the Role field is displayed"
 msgstr "Alterna a vista do campo da funciÃn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1335
+#: ../calendar/gui/dialogs/comp-editor.c:1343
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1337
+#: ../calendar/gui/dialogs/comp-editor.c:1345
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Alterna a vista do campo RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1343
+#: ../calendar/gui/dialogs/comp-editor.c:1351
 msgid "_Status Field"
 msgstr "Campo de e_stado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../calendar/gui/dialogs/comp-editor.c:1353
 msgid "Toggles whether the Status field is displayed"
 msgstr "Alterna a vista do campo de estado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1351
+#: ../calendar/gui/dialogs/comp-editor.c:1359
 msgid "_Type Field"
 msgstr "Campo do _tipo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../calendar/gui/dialogs/comp-editor.c:1361
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Alterna a vista do campo de tipo de participante"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2101
+#: ../calendar/gui/dialogs/comp-editor.c:2110
 #: ../composer/e-composer-actions.c:507
 msgid "Attach"
 msgstr "Anexar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2447
-#: ../calendar/gui/dialogs/comp-editor.c:2610
-#: ../calendar/gui/dialogs/comp-editor.c:3602
+#: ../calendar/gui/dialogs/comp-editor.c:2456
+#: ../calendar/gui/dialogs/comp-editor.c:2619
+#: ../calendar/gui/dialogs/comp-editor.c:3617
 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:3566
+#: ../calendar/gui/dialogs/comp-editor.c:3581
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "anexo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3634
+#: ../calendar/gui/dialogs/comp-editor.c:3649
 msgid "Unable to use current version!"
 msgstr "Non à posÃbel usar a versiÃn actual!"
 
@@ -3026,13 +2920,13 @@ msgstr "_DispoÃibilidade"
 msgid "Query free / busy information for the attendees"
 msgstr "Consultar a informaciÃn de dispoÃibilidade para os participantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3327
+#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3324
 msgid "Appointment"
 msgstr "Cita"
 
 #: ../calendar/gui/dialogs/event-editor.c:388
 #: ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-list-view.c:166
 msgid "Attendees"
 msgstr "Participantes"
 
@@ -3040,122 +2934,109 @@ msgstr "Participantes"
 msgid "Print this event"
 msgstr "Imprimir esta actividade"
 
-#: ../calendar/gui/dialogs/event-page.c:567
+#: ../calendar/gui/dialogs/event-page.c:570
 msgid "Event's start time is in the past"
 msgstr "A hora de inicio da actividade xa pasou"
 
-#: ../calendar/gui/dialogs/event-page.c:644
+#: ../calendar/gui/dialogs/event-page.c:647
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr ""
 "Non à posÃbel editar a actividade porque o calendario seleccionado à de sà "
 "lectura"
 
-#: ../calendar/gui/dialogs/event-page.c:648
+#: ../calendar/gui/dialogs/event-page.c:651
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr ""
 "Non à posÃbel editar a actividade totalmente porque vostede non à o "
 "organizador"
 
-#: ../calendar/gui/dialogs/event-page.c:660
-#: ../calendar/gui/dialogs/event-page.c:3145
+#: ../calendar/gui/dialogs/event-page.c:663
+#: ../calendar/gui/dialogs/event-page.c:3138
 msgid "This event has reminders"
 msgstr "Esta actividade ten recordatorios"
 
-#: ../calendar/gui/dialogs/event-page.c:727
+#: ../calendar/gui/dialogs/event-page.c:730
 #: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
-#: ../calendar/gui/dialogs/event-page.c:1286
+#: ../calendar/gui/dialogs/event-page.c:1296
 msgid "Event with no start date"
 msgstr "Actividade sen data de inicio"
 
-#: ../calendar/gui/dialogs/event-page.c:1289
+#: ../calendar/gui/dialogs/event-page.c:1299
 msgid "Event with no end date"
 msgstr "Actividade sen data de finalizaciÃn"
 
-#: ../calendar/gui/dialogs/event-page.c:1462
-#: ../calendar/gui/dialogs/memo-page.c:724
-#: ../calendar/gui/dialogs/task-page.c:841
+#: ../calendar/gui/dialogs/event-page.c:1472
+#: ../calendar/gui/dialogs/memo-page.c:732
+#: ../calendar/gui/dialogs/task-page.c:852
 msgid "Start date is wrong"
 msgstr "A data de inicio à incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1472
+#: ../calendar/gui/dialogs/event-page.c:1482
 msgid "End date is wrong"
 msgstr "A data de finalizaciÃn à incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1495
+#: ../calendar/gui/dialogs/event-page.c:1505
 msgid "Start time is wrong"
 msgstr "A hora de inicio à incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1502
+#: ../calendar/gui/dialogs/event-page.c:1512
 msgid "End time is wrong"
 msgstr "A hora de finalizaciÃn à incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1665
-#: ../calendar/gui/dialogs/memo-page.c:763
-#: ../calendar/gui/dialogs/task-page.c:894
+#: ../calendar/gui/dialogs/event-page.c:1675
+#: ../calendar/gui/dialogs/memo-page.c:771
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "An organizer is required."
 msgstr "RequÃrese un organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1699
-#: ../calendar/gui/dialogs/task-page.c:928
+#: ../calendar/gui/dialogs/event-page.c:1709
+#: ../calendar/gui/dialogs/task-page.c:939
 msgid "At least one attendee is required."
 msgstr "RequÃrese polo menos un participante."
 
-#: ../calendar/gui/dialogs/event-page.c:1906
+#: ../calendar/gui/dialogs/event-page.c:1916
 msgid "_Delegatees"
 msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:1908
+#: ../calendar/gui/dialogs/event-page.c:1918
 msgid "Atte_ndees"
 msgstr "_Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:2981
+#: ../calendar/gui/dialogs/event-page.c:2993
 #, c-format
 msgid "Unable to open the calendar '%s': %s"
 msgstr "Non foi posÃbel abrir o calendario Â%sÂ: %s"
 
-#. Translators: This string is used when we are creating an Event
-#. * (meeting or appointment)  on behalf of some other user
-#. Translators: This string is used when we are creating a Memo
-#. * on behalf of some other user
-#. Translators: This string is used when we are creating a Task
-#. * on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:3063
-#: ../calendar/gui/dialogs/memo-page.c:1046
-#: ../calendar/gui/dialogs/task-page.c:1877
-#, c-format
-msgid "You are acting on behalf of %s"
-msgstr "Està actuando no nome de %s"
-
-#: ../calendar/gui/dialogs/event-page.c:3410
+#: ../calendar/gui/dialogs/event-page.c:3409
 #, 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:3416
+#: ../calendar/gui/dialogs/event-page.c:3415
 #, 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:3422
+#: ../calendar/gui/dialogs/event-page.c:3421
 #, 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:3441
+#: ../calendar/gui/dialogs/event-page.c:3440
 msgid "Customize"
 msgstr "Personalizar"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3447
+#: ../calendar/gui/dialogs/event-page.c:3446
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ningunha"
@@ -3191,7 +3072,6 @@ msgid "1 day before appointment"
 msgstr "1 dÃa antes da cita"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../plugins/calendar-weather/calendar-weather.c:381
 msgid "_Location:"
 msgstr "_LocalizaciÃn:"
 
@@ -3286,11 +3166,11 @@ msgid "Select Date"
 msgstr "Seleccionar unha data"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1399
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
 msgid "Select _Today"
 msgstr "Seleccionar o dÃa de _hoxe"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3331
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3328
 msgid "Memo"
 msgstr "Nota"
 
@@ -3298,42 +3178,51 @@ msgstr "Nota"
 msgid "Print this memo"
 msgstr "Imprimir esta nota"
 
-#: ../calendar/gui/dialogs/memo-page.c:424
+#: ../calendar/gui/dialogs/memo-page.c:429
 msgid "Memo's start date is in the past"
 msgstr "A hora de inicio da nota xa pasou"
 
-#: ../calendar/gui/dialogs/memo-page.c:461
+#: ../calendar/gui/dialogs/memo-page.c:465
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr ""
 "Non à posÃbel editar a nota porque a lista de notas solicitada à de sà "
 "lectura"
 
-#: ../calendar/gui/dialogs/memo-page.c:465
+#: ../calendar/gui/dialogs/memo-page.c:469
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr ""
 "Non à posÃbel editar a nota na sÃa totalidade porque vostede non à o "
 "organizador"
 
-#: ../calendar/gui/dialogs/memo-page.c:966
+#: ../calendar/gui/dialogs/memo-page.c:981
 #, c-format
 msgid "Unable to open memos in '%s': %s"
 msgstr "Non à posÃbel abrir as notas en Â%sÂ: %s"
 
-#: ../calendar/gui/dialogs/memo-page.c:1177 ../em-format/em-format.c:1233
+#: ../calendar/gui/dialogs/memo-page.c:983 ../em-format/em-format.c:970
+#: ../libemail-engine/mail-ops.c:715 ../mail/e-mail-reader.c:1745
+#: ../mail/em-folder-tree.c:678 ../plugins/face/face.c:174
+#: ../plugins/itip-formatter/itip-formatter.c:1550
+#: ../plugins/itip-formatter/itip-formatter.c:1948
+#: ../smime/gui/certificate-manager.c:317
+msgid "Unknown error"
+msgstr "Erro descoÃecido"
+
+#: ../calendar/gui/dialogs/memo-page.c:1173 ../em-format/em-format.c:1233
 #: ../em-format/em-format-quote.c:154 ../mail/em-filter-i18n.h:77
-#: ../mail/em-format-html.c:2294 ../mail/em-format-html.c:2317
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:72
+#: ../mail/em-format-html.c:2297 ../mail/em-format-html.c:2320
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:70
 msgid "To"
 msgstr "Para"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:343
+#: ../calendar/gui/dialogs/task-page.c:346
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_List:"
 msgstr "_Lista:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.c:351
+#: ../calendar/gui/dialogs/task-page.c:354
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Organi_zer:"
 msgstr "Organi_zador:"
@@ -3388,22 +3277,22 @@ msgstr "Esta instancia e as futuras"
 msgid "All Instances"
 msgstr "Todas as instancias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:576
+#: ../calendar/gui/dialogs/recurrence-page.c:574
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita contÃn repeticiÃns que o Evolution non pode editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:971
+#: ../calendar/gui/dialogs/recurrence-page.c:969
 msgid "Recurrence date is invalid"
 msgstr "A data da repeticiÃn non à correcta"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1011
+#: ../calendar/gui/dialogs/recurrence-page.c:1009
 msgid "End time of the recurrence was before event's start"
 msgstr ""
 "A hora de finalizaciÃn da repeticiÃn era anterior à do inicio da actividade"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "on"
 msgstr "en"
 
@@ -3411,7 +3300,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:1104
+#: ../calendar/gui/dialogs/recurrence-page.c:1102
 msgid "first"
 msgstr "primeiro"
 
@@ -3420,7 +3309,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:1110
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
 msgid "second"
 msgstr "segundo"
 
@@ -3428,7 +3317,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:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 msgid "third"
 msgstr "terceiro"
 
@@ -3436,7 +3325,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:1120
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 msgid "fourth"
 msgstr "cuarto"
 
@@ -3444,7 +3333,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:1125
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
 msgid "fifth"
 msgstr "quinto"
 
@@ -3452,13 +3341,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:1130
+#: ../calendar/gui/dialogs/recurrence-page.c:1128
 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:1154
+#: ../calendar/gui/dialogs/recurrence-page.c:1152
 msgid "Other Date"
 msgstr "Outra data"
 
@@ -3466,7 +3355,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:1160
+#: ../calendar/gui/dialogs/recurrence-page.c:1158
 msgid "1st to 10th"
 msgstr "Do 1 ao 10"
 
@@ -3474,7 +3363,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:1166
+#: ../calendar/gui/dialogs/recurrence-page.c:1164
 msgid "11th to 20th"
 msgstr "do 11 ao 20"
 
@@ -3482,41 +3371,41 @@ 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:1172
+#: ../calendar/gui/dialogs/recurrence-page.c:1170
 msgid "21st to 31st"
 msgstr "Do 21 ao 31"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1198
+#: ../calendar/gui/dialogs/recurrence-page.c:1196
 #: ../modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Monday"
 msgstr "Luns"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1199
+#: ../calendar/gui/dialogs/recurrence-page.c:1197
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Tuesday"
 msgstr "Martes"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1200
+#: ../calendar/gui/dialogs/recurrence-page.c:1198
 #: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Wednesday"
 msgstr "MÃrcores"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1201
+#: ../calendar/gui/dialogs/recurrence-page.c:1199
 #: ../modules/calendar/e-calendar-preferences.ui.h:4
 msgid "Thursday"
 msgstr "Xoves"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1202
+#: ../calendar/gui/dialogs/recurrence-page.c:1200
 #: ../modules/calendar/e-calendar-preferences.ui.h:5
 msgid "Friday"
 msgstr "Venres"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1203
+#: ../calendar/gui/dialogs/recurrence-page.c:1201
 #: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "Saturday"
 msgstr "SÃbado"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1204
+#: ../calendar/gui/dialogs/recurrence-page.c:1202
 #: ../modules/calendar/e-calendar-preferences.ui.h:7
 msgid "Sunday"
 msgstr "Domingo"
@@ -3524,31 +3413,31 @@ 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:1328
+#: ../calendar/gui/dialogs/recurrence-page.c:1326
 msgid "on the"
 msgstr "no"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1507
+#: ../calendar/gui/dialogs/recurrence-page.c:1505
 msgid "occurrences"
 msgstr "apariciÃns"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2223
+#: ../calendar/gui/dialogs/recurrence-page.c:2221
 msgid "Add exception"
 msgstr "Engadir unha excepciÃn"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2264
+#: ../calendar/gui/dialogs/recurrence-page.c:2262
 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:2270
+#: ../calendar/gui/dialogs/recurrence-page.c:2268
 msgid "Modify exception"
 msgstr "Modificar a excepciÃn"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2314
+#: ../calendar/gui/dialogs/recurrence-page.c:2312
 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:2453
+#: ../calendar/gui/dialogs/recurrence-page.c:2451
 msgid "Date/Time"
 msgstr "Data e hora"
 
@@ -3606,7 +3495,7 @@ msgstr "Cada"
 msgid "Exceptions"
 msgstr "ExcepciÃns"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20 ../mail/mail-config.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
 msgid "Preview"
 msgstr "Vista previa"
 
@@ -3629,16 +3518,16 @@ msgstr "PÃxina web"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-task-table.c:582 ../calendar/gui/tasktypes.xml.h:19
+#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-task-table.c:580 ../calendar/gui/tasktypes.xml.h:19
 #: ../mail/message-list.c:1285 ../widgets/misc/e-send-options.ui.h:2
 msgid "High"
 msgstr "Alta"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-cal-model.c:1623 ../calendar/gui/e-task-table.c:583
+#: ../calendar/gui/e-cal-component-preview.c:316
+#: ../calendar/gui/e-cal-model.c:1657 ../calendar/gui/e-task-table.c:581
 #: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1284
 #: ../widgets/misc/e-send-options.ui.h:5
 msgid "Normal"
@@ -3646,60 +3535,60 @@ msgstr "Normal"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:320
-#: ../calendar/gui/e-task-table.c:584 ../calendar/gui/tasktypes.xml.h:21
+#: ../calendar/gui/e-cal-component-preview.c:318
+#: ../calendar/gui/e-task-table.c:582 ../calendar/gui/tasktypes.xml.h:21
 #: ../mail/message-list.c:1283 ../widgets/misc/e-send-options.ui.h:4
 msgid "Low"
 msgstr "Baixa"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-task-table.c:585 ../calendar/gui/tasktypes.xml.h:22
+#: ../calendar/gui/e-task-table.c:583 ../calendar/gui/tasktypes.xml.h:22
 #: ../widgets/misc/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "Sen definir"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:302
-#: ../calendar/gui/e-cal-model-tasks.c:490
-#: ../calendar/gui/e-cal-model-tasks.c:775 ../calendar/gui/e-task-table.c:230
-#: ../calendar/gui/e-task-table.c:245 ../calendar/gui/e-task-table.c:659
-#: ../calendar/gui/print.c:3408 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/e-cal-component-preview.c:300
+#: ../calendar/gui/e-cal-model-tasks.c:489
+#: ../calendar/gui/e-cal-model-tasks.c:774 ../calendar/gui/e-task-table.c:228
+#: ../calendar/gui/e-task-table.c:243 ../calendar/gui/e-task-table.c:657
+#: ../calendar/gui/print.c:3405 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "Non iniciada"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:492
-#: ../calendar/gui/e-cal-model-tasks.c:777
-#: ../calendar/gui/e-cal-model-tasks.c:855 ../calendar/gui/e-task-table.c:232
-#: ../calendar/gui/e-task-table.c:247 ../calendar/gui/e-task-table.c:660
-#: ../calendar/gui/print.c:3411
+#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../calendar/gui/e-cal-model-tasks.c:491
+#: ../calendar/gui/e-cal-model-tasks.c:776
+#: ../calendar/gui/e-cal-model-tasks.c:854 ../calendar/gui/e-task-table.c:230
+#: ../calendar/gui/e-task-table.c:245 ../calendar/gui/e-task-table.c:658
+#: ../calendar/gui/print.c:3408
 msgid "In Progress"
 msgstr "En progreso"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:14
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:494
-#: ../calendar/gui/e-cal-model-tasks.c:779
-#: ../calendar/gui/e-meeting-store.c:214 ../calendar/gui/e-meeting-store.c:237
-#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:249
-#: ../calendar/gui/e-task-table.c:661 ../calendar/gui/print.c:3414
+#: ../calendar/gui/e-cal-component-preview.c:293
+#: ../calendar/gui/e-cal-model-tasks.c:493
+#: ../calendar/gui/e-cal-model-tasks.c:778
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/e-meeting-store.c:232
+#: ../calendar/gui/e-task-table.c:232 ../calendar/gui/e-task-table.c:247
+#: ../calendar/gui/e-task-table.c:659 ../calendar/gui/print.c:3411
 #: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Completed"
 msgstr "Completada"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:298
-#: ../calendar/gui/e-cal-model-tasks.c:496
-#: ../calendar/gui/e-cal-model-tasks.c:781 ../calendar/gui/e-task-table.c:236
-#: ../calendar/gui/e-task-table.c:251 ../calendar/gui/e-task-table.c:662
-#: ../calendar/gui/print.c:3417
+#: ../calendar/gui/e-cal-component-preview.c:296
+#: ../calendar/gui/e-cal-model-tasks.c:495
+#: ../calendar/gui/e-cal-model-tasks.c:780 ../calendar/gui/e-task-table.c:234
+#: ../calendar/gui/e-task-table.c:249 ../calendar/gui/e-task-table.c:660
+#: ../calendar/gui/print.c:3414
 msgid "Canceled"
 msgstr "Cancelada"
 
@@ -3707,8 +3596,8 @@ msgstr "Cancelada"
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:17
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:3523
-#: ../calendar/gui/e-meeting-list-view.c:680
+#: ../calendar/gui/e-cal-model.c:3590
+#: ../calendar/gui/e-meeting-list-view.c:684
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:1
@@ -3748,40 +3637,40 @@ msgstr "Prema para cambiar ou ver a informaciÃn do estado da tarefa"
 msgid "_Send Options"
 msgstr "OpciÃn_s de envÃo"
 
-#: ../calendar/gui/dialogs/task-editor.c:168 ../calendar/gui/print.c:3329
+#: ../calendar/gui/dialogs/task-editor.c:186 ../calendar/gui/print.c:3326
 #: ../widgets/misc/e-send-options.c:553
 msgid "Task"
 msgstr "Tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:171
+#: ../calendar/gui/dialogs/task-editor.c:307
 msgid "Task Details"
 msgstr "InformaciÃn da tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:368
+#: ../calendar/gui/dialogs/task-editor.c:351
 msgid "Print this task"
 msgstr "Imprimir esta tarefa"
 
-#: ../calendar/gui/dialogs/task-page.c:255
+#: ../calendar/gui/dialogs/task-page.c:259
 msgid "Task's start date is in the past"
 msgstr "A data de inicio da tarefa xa pasou"
 
-#: ../calendar/gui/dialogs/task-page.c:256
+#: ../calendar/gui/dialogs/task-page.c:260
 msgid "Task's due date is in the past"
 msgstr "A data de vencemento da tarefa xa pasou"
 
-#: ../calendar/gui/dialogs/task-page.c:290
+#: ../calendar/gui/dialogs/task-page.c:293
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr ""
 "Non à posÃbel editar a tarefa porque a lista de tarefas seleccionada à de sà "
 "lectura"
 
-#: ../calendar/gui/dialogs/task-page.c:294
+#: ../calendar/gui/dialogs/task-page.c:297
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr ""
 "Non à posÃbel editar a tarefa na sÃa totalidade porque vostede non à o "
 "organizador"
 
-#: ../calendar/gui/dialogs/task-page.c:298
+#: ../calendar/gui/dialogs/task-page.c:301
 msgid ""
 "Task cannot be edited, because the selected task list does not support "
 "assigned tasks"
@@ -3789,11 +3678,11 @@ msgstr ""
 "Non à posÃbel editar a tarefa porque a lista de tarefas seleccionada non "
 "admite asignaciÃn de tarefas"
 
-#: ../calendar/gui/dialogs/task-page.c:823
+#: ../calendar/gui/dialogs/task-page.c:834
 msgid "Due date is wrong"
 msgstr "A data de vencemento à incorrecta"
 
-#: ../calendar/gui/dialogs/task-page.c:1794
+#: ../calendar/gui/dialogs/task-page.c:1813
 #, c-format
 msgid "Unable to open tasks in '%s': %s"
 msgstr "Non à posÃbel abrir as tarefas en Â%sÂ: %s"
@@ -3897,14 +3786,14 @@ msgstr "vista de calendario para un ou mÃis dÃas"
 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-gnome-calendar.c:50
-#: ../calendar/gui/ea-gnome-calendar.c:58
+#: ../calendar/gui/ea-gnome-calendar.c:48
+#: ../calendar/gui/ea-gnome-calendar.c:56
 #: ../calendar/importers/icalendar-importer.c:1118
 msgid "Gnome Calendar"
 msgstr "Calendario do GNOME"
 
-#: ../calendar/gui/ea-gnome-calendar.c:201
-#: ../modules/calendar/e-cal-shell-view-private.c:1095
+#: ../calendar/gui/ea-gnome-calendar.c:199
+#: ../modules/calendar/e-cal-shell-view-private.c:1086
 msgid "%A %d %b %Y"
 msgstr "%A, %d de %b de %Y"
 
@@ -3914,30 +3803,30 @@ msgstr "%A, %d de %b de %Y"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:204 ../calendar/gui/e-day-view.c:1850
-#: ../calendar/gui/e-day-view-top-item.c:837
+#: ../calendar/gui/ea-gnome-calendar.c:202 ../calendar/gui/e-day-view.c:1854
+#: ../calendar/gui/e-day-view-top-item.c:835
 #: ../calendar/gui/e-week-view-main-item.c:231
-#: ../modules/calendar/e-cal-shell-view-private.c:1099
+#: ../modules/calendar/e-cal-shell-view-private.c:1090
 msgid "%a %d %b"
 msgstr "%a, %d de %b"
 
-#: ../calendar/gui/ea-gnome-calendar.c:206
+#: ../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:213
+#: ../modules/calendar/e-cal-shell-view-private.c:1093
+#: ../modules/calendar/e-cal-shell-view-private.c:1099
 #: ../modules/calendar/e-cal-shell-view-private.c:1102
-#: ../modules/calendar/e-cal-shell-view-private.c:1108
-#: ../modules/calendar/e-cal-shell-view-private.c:1111
 msgid "%a %d %b %Y"
 msgstr "%a, %d de %b de %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../calendar/gui/ea-gnome-calendar.c:236
+#: ../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
-#: ../calendar/gui/ea-gnome-calendar.c:244
-#: ../modules/calendar/e-cal-shell-view-private.c:1128
-#: ../modules/calendar/e-cal-shell-view-private.c:1139
-#: ../modules/calendar/e-cal-shell-view-private.c:1146
-#: ../modules/calendar/e-cal-shell-view-private.c:1149
+#: ../modules/calendar/e-cal-shell-view-private.c:1119
+#: ../modules/calendar/e-cal-shell-view-private.c:1130
+#: ../modules/calendar/e-cal-shell-view-private.c:1137
+#: ../modules/calendar/e-cal-shell-view-private.c:1140
 msgid "%d %b %Y"
 msgstr "%d de %b de %Y"
 
@@ -3946,10 +3835,10 @@ msgstr "%d de %b de %Y"
 #. 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/ea-gnome-calendar.c:234 ../calendar/gui/e-day-view.c:1866
-#: ../calendar/gui/e-day-view-top-item.c:841
+#: ../calendar/gui/ea-gnome-calendar.c:232 ../calendar/gui/e-day-view.c:1870
+#: ../calendar/gui/e-day-view-top-item.c:839
 #: ../calendar/gui/e-week-view-main-item.c:245
-#: ../modules/calendar/e-cal-shell-view-private.c:1135
+#: ../modules/calendar/e-cal-shell-view-private.c:1126
 msgid "%d %b"
 msgstr "%d de %b"
 
@@ -3962,7 +3851,7 @@ msgid "Click here, you can find more events."
 msgstr "Premer aquà para buscar mÃis actividades."
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:359
+#: ../calendar/gui/e-alarm-list.c:358
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3970,69 +3859,69 @@ msgstr[0] "%d dÃa"
 msgstr[1] "%d dÃas"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:365
+#: ../calendar/gui/e-alarm-list.c:364
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: ../calendar/gui/e-alarm-list.c:427
+#: ../calendar/gui/e-alarm-list.c:426
 msgid "Unknown action to be performed"
 msgstr "DescoÃÃcese a acciÃn a realizar"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:441
+#: ../calendar/gui/e-alarm-list.c:440
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s antes do inicio da cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:445
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s despois do inicio da cita"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:453
+#: ../calendar/gui/e-alarm-list.c:452
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s ao inicio da cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:463
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s antes de finalizar a cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:469
+#: ../calendar/gui/e-alarm-list.c:468
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s despois de finalizar a cita"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:476
+#: ../calendar/gui/e-alarm-list.c:475
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s ao finalizar a cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:500
+#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at %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
-#: ../calendar/gui/e-alarm-list.c:508
+#: ../calendar/gui/e-alarm-list.c:507
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador descoÃecido"
@@ -4055,45 +3944,47 @@ msgstr "vista de calendario para un mes"
 msgid "calendar view for one or more weeks"
 msgstr "vista de calendario para unha ou mÃis semanas"
 
-#: ../calendar/gui/e-cal-component-preview.c:208 ../filter/e-filter-rule.c:691
+#: ../calendar/gui/e-cal-component-preview.c:206 ../filter/e-filter-rule.c:691
+#: ../mail/e-mail-config-page.c:65
 msgid "Untitled"
 msgstr "Sen tÃtulo"
 
-#: ../calendar/gui/e-cal-component-preview.c:216
+#: ../calendar/gui/e-cal-component-preview.c:214
 msgid "Categories:"
 msgstr "CategorÃas:"
 
-#: ../calendar/gui/e-cal-component-preview.c:247
+#: ../calendar/gui/e-cal-component-preview.c:245
 msgid "Summary:"
 msgstr "Resumo:"
 
-#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../calendar/gui/e-cal-component-preview.c:253
 msgid "Start Date:"
 msgstr "Data de inicio:"
 
-#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "End Date:"
 msgstr "Data de finalizaciÃn:"
 
-#: ../calendar/gui/e-cal-component-preview.c:277
+#: ../calendar/gui/e-cal-component-preview.c:275
 msgid "Due Date:"
 msgstr "Data de vencemento:"
 
-#: ../calendar/gui/e-cal-component-preview.c:288
-#: ../plugins/itip-formatter/itip-view.c:1157
-#: ../plugins/itip-formatter/itip-view.c:1263
+#: ../calendar/gui/e-cal-component-preview.c:286
+#: ../plugins/itip-formatter/itip-view.c:1401
+#: ../plugins/itip-formatter/itip-view.c:1507
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-cal-component-preview.c:312
 msgid "Priority:"
 msgstr "Prioridade:"
 
-#: ../calendar/gui/e-cal-component-preview.c:338 ../mail/mail-config.ui.h:159
+#: ../calendar/gui/e-cal-component-preview.c:336
+#: ../mail/e-mail-config-service-page.c:713
 msgid "Description:"
 msgstr "DescriciÃn:"
 
-#: ../calendar/gui/e-cal-component-preview.c:368
+#: ../calendar/gui/e-cal-component-preview.c:366
 msgid "Web Page:"
 msgstr "PÃxina Web:"
 
@@ -4106,7 +3997,7 @@ msgid "Start date"
 msgstr "Data de inicio"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:640
+#: ../calendar/gui/e-meeting-list-view.c:644
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
 #: ../mail/e-mail-account-tree-view.c:139
@@ -4133,14 +4024,14 @@ msgstr "% completado"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Priority"
 msgstr "Prioridade"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Created"
 msgstr "Creado"
 
@@ -4166,21 +4057,21 @@ msgstr "Pegar as actividades desde o portapapeis"
 msgid "Delete selected events"
 msgstr "Eliminar as actividades seleccionadas"
 
-#: ../calendar/gui/e-calendar-view.c:472 ../calendar/gui/e-memo-table.c:198
-#: ../calendar/gui/e-task-table.c:286
+#: ../calendar/gui/e-calendar-view.c:472 ../calendar/gui/e-memo-table.c:196
+#: ../calendar/gui/e-task-table.c:284
 msgid "Deleting selected objects"
 msgstr "Eliminando os obxectos seleccionados"
 
-#: ../calendar/gui/e-calendar-view.c:631 ../calendar/gui/e-memo-table.c:878
-#: ../calendar/gui/e-task-table.c:1161
+#: ../calendar/gui/e-calendar-view.c:631 ../calendar/gui/e-memo-table.c:876
+#: ../calendar/gui/e-task-table.c:1159
 msgid "Updating objects"
 msgstr "Actualizando os obxectos"
 
 #. 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:1966 ../calendar/gui/e-memo-table.c:555
-#: ../calendar/gui/e-task-table.c:827
+#: ../calendar/gui/e-calendar-view.c:1989 ../calendar/gui/e-memo-table.c:553
+#: ../calendar/gui/e-task-table.c:825
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizador: %s <%s>"
@@ -4188,20 +4079,20 @@ msgstr "Organizador: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1970 ../calendar/gui/e-memo-table.c:560
-#: ../calendar/gui/e-task-table.c:831
+#: ../calendar/gui/e-calendar-view.c:1993 ../calendar/gui/e-memo-table.c:558
+#: ../calendar/gui/e-task-table.c:829
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1986 ../calendar/gui/print.c:3363
+#: ../calendar/gui/e-calendar-view.c:2009 ../calendar/gui/print.c:3360
 #, c-format
 msgid "Location: %s"
 msgstr "LocalizaciÃn: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2017
+#: ../calendar/gui/e-calendar-view.c:2040
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -4215,86 +4106,86 @@ msgstr "Data de inicio"
 msgid "End Date"
 msgstr "Data de finalizaciÃn"
 
-#: ../calendar/gui/e-cal-model.c:813 ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-list-view.c:196
-#: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:179
-#: ../calendar/gui/e-meeting-store.c:242 ../calendar/gui/print.c:1162
-#: ../calendar/gui/print.c:1179 ../e-util/e-charset.c:52
+#: ../calendar/gui/e-cal-model.c:844 ../calendar/gui/e-meeting-list-view.c:186
+#: ../calendar/gui/e-meeting-list-view.c:200
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1159
+#: ../calendar/gui/print.c:1176 ../e-util/e-charset.c:52
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
-#: ../plugins/itip-formatter/itip-formatter.c:472
-#: ../plugins/itip-formatter/itip-formatter.c:2947
+#: ../plugins/itip-formatter/itip-formatter.c:498
+#: ../plugins/itip-formatter/itip-formatter.c:3025
 msgid "Unknown"
 msgstr "DescoÃecido"
 
-#: ../calendar/gui/e-cal-model.c:1625
+#: ../calendar/gui/e-cal-model.c:1659
 msgid "Recurring"
 msgstr "RepeticiÃn"
 
-#: ../calendar/gui/e-cal-model.c:1627
+#: ../calendar/gui/e-cal-model.c:1661
 msgid "Assigned"
 msgstr "Asignada"
 
-#: ../calendar/gui/e-cal-model.c:1629 ../calendar/gui/e-cal-model-tasks.c:1146
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/e-meeting-store.c:1062
+#: ../calendar/gui/e-cal-model.c:1663 ../calendar/gui/e-cal-model-tasks.c:1145
+#: ../calendar/gui/e-meeting-list-view.c:210
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:191
+#: ../calendar/gui/e-meeting-store.c:1057
 msgid "Yes"
 msgstr "Si"
 
-#: ../calendar/gui/e-cal-model.c:1629 ../calendar/gui/e-cal-model-tasks.c:1146
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-cal-model.c:1663 ../calendar/gui/e-cal-model-tasks.c:1145
+#: ../calendar/gui/e-meeting-list-view.c:211
+#: ../calendar/gui/e-meeting-store.c:193
 msgid "No"
 msgstr "Non"
 
-#: ../calendar/gui/e-cal-model.c:3022
+#: ../calendar/gui/e-cal-model.c:3086
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
 
-#: ../calendar/gui/e-cal-model.c:3467
-#: ../calendar/gui/e-meeting-list-view.c:218
-#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
-#: ../plugins/itip-formatter/itip-formatter.c:2935
+#: ../calendar/gui/e-cal-model.c:3531
+#: ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../plugins/itip-formatter/itip-formatter.c:3013
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: ../calendar/gui/e-cal-model.c:3468
-#: ../calendar/gui/e-meeting-list-view.c:219
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
-#: ../plugins/itip-formatter/itip-formatter.c:2941
+#: ../calendar/gui/e-cal-model.c:3532
+#: ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
+#: ../plugins/itip-formatter/itip-formatter.c:3019
 msgid "Declined"
 msgstr "Rexeitado"
 
-#: ../calendar/gui/e-cal-model.c:3469
-#: ../calendar/gui/e-meeting-list-view.c:220
-#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/e-meeting-store.c:233
+#: ../calendar/gui/e-cal-model.c:3533
+#: ../calendar/gui/e-meeting-list-view.c:224
+#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
 #: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "Tentative"
 msgstr "Provisional"
 
-#: ../calendar/gui/e-cal-model.c:3470
-#: ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/e-meeting-store.c:235
-#: ../plugins/itip-formatter/itip-formatter.c:2944
+#: ../calendar/gui/e-cal-model.c:3534
+#: ../calendar/gui/e-meeting-list-view.c:225
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../plugins/itip-formatter/itip-formatter.c:3022
 msgid "Delegated"
 msgstr "Delegado"
 
-#: ../calendar/gui/e-cal-model.c:3471
+#: ../calendar/gui/e-cal-model.c:3535
 msgid "Needs action"
 msgstr "Necesita unha acciÃn"
 
 #: ../calendar/gui/e-cal-model-calendar.c:157
-#: ../calendar/gui/e-task-table.c:636
+#: ../calendar/gui/e-task-table.c:634
 msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:160
-#: ../calendar/gui/e-meeting-time-sel.c:562 ../calendar/gui/e-task-table.c:637
+#: ../calendar/gui/e-meeting-time-sel.c:562 ../calendar/gui/e-task-table.c:635
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../calendar/gui/e-cal-model-tasks.c:721
+#: ../calendar/gui/e-cal-model-tasks.c:720
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4305,22 +4196,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:773
+#: ../calendar/gui/e-cal-model-tasks.c:772
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "NingÃn"
 
+#: ../calendar/gui/e-cal-source-config.c:170
+msgid "Mark as default calendar"
+msgstr "Marcar como calendario predefinido"
+
+#: ../calendar/gui/e-cal-source-config.c:173
+msgid "Mark as default task list"
+msgstr "Marcar como lista de tarefas predefinida"
+
+#: ../calendar/gui/e-cal-source-config.c:176
+msgid "Mark as default memo list"
+msgstr "Marcar como a lista de notas predefinida"
+
+#: ../calendar/gui/e-cal-source-config.c:201
+msgid "Color:"
+msgstr "Cor:"
+
+#: ../calendar/gui/e-cal-source-config.c:373
+msgid "Copy calendar contents locally for offline operation"
+msgstr ""
+"Copiar localmente os contidos do calendario para unha operaciÃn sen conexiÃn"
+
+#: ../calendar/gui/e-cal-source-config.c:377
+msgid "Copy task list contents locally for offline operation"
+msgstr ""
+"Copiar localmente os contidos da lista de tarefas para unha operaciÃn sen "
+"conexiÃn"
+
+#: ../calendar/gui/e-cal-source-config.c:381
+msgid "Copy memo list contents locally for offline operation"
+msgstr ""
+"Copiar localmente os contidos da lista de notas para unha operaciÃn sen "
+"conexiÃn"
+
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:163
+#: ../calendar/gui/e-cell-date-edit-text.c:162
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:166
+#: ../calendar/gui/e-cell-date-edit-text.c:165
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:174
+#: ../calendar/gui/e-cell-date-edit-text.c:173
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4330,16 +4254,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1022 ../calendar/gui/e-week-view.c:774
-#: ../calendar/gui/print.c:988 ../calendar/gui/print.c:1007
-#: ../calendar/gui/print.c:2498 ../calendar/gui/print.c:2518
+#: ../calendar/gui/e-day-view.c:1026 ../calendar/gui/e-week-view.c:773
+#: ../calendar/gui/print.c:985 ../calendar/gui/print.c:1004
+#: ../calendar/gui/print.c:2495 ../calendar/gui/print.c:2515
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1025 ../calendar/gui/e-week-view.c:777
-#: ../calendar/gui/print.c:993 ../calendar/gui/print.c:1009
-#: ../calendar/gui/print.c:2503 ../calendar/gui/print.c:2520
+#: ../calendar/gui/e-day-view.c:1029 ../calendar/gui/e-week-view.c:776
+#: ../calendar/gui/print.c:990 ../calendar/gui/print.c:1006
+#: ../calendar/gui/print.c:2500 ../calendar/gui/print.c:2517
 msgid "pm"
 msgstr "pm"
 
@@ -4349,13 +4273,13 @@ msgstr "pm"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:1833 ../calendar/gui/e-day-view-top-item.c:833
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1982
+#: ../calendar/gui/e-day-view.c:1837 ../calendar/gui/e-day-view-top-item.c:831
+#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1979
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2653
+#: ../calendar/gui/e-day-view.c:2672
 #, c-format
 msgid "Week %d"
 msgstr "Semana %d"
@@ -4366,131 +4290,129 @@ msgstr "Semana %d"
 #. * 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:791
+#: ../calendar/gui/e-day-view-time-item.c:790
 #, c-format
 msgid "%02i minute divisions"
 msgstr "divisiÃns de %02i minutos"
 
-#: ../calendar/gui/e-day-view-time-item.c:816
+#: ../calendar/gui/e-day-view-time-item.c:815
 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:833
-#: ../modules/calendar/e-calendar-preferences.c:179
-#: ../modules/calendar/e-calendar-preferences.c:231
+#: ../calendar/gui/e-day-view-time-item.c:832
+#: ../modules/calendar/e-calendar-preferences.c:185
+#: ../modules/calendar/e-calendar-preferences.c:237
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ningunha"
 
-#: ../calendar/gui/e-day-view-time-item.c:867
+#: ../calendar/gui/e-day-view-time-item.c:866
 #: ../calendar/gui/e-timezone-entry.c:322
-#: ../modules/calendar/e-calendar-preferences.c:262
+#: ../modules/calendar/e-calendar-preferences.c:268
 msgid "Select..."
 msgstr "Seleccionarâ"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Chair Persons"
 msgstr "Presidentes"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Required Participants"
 msgstr "Participantes necesarios"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Optional Participants"
 msgstr "Participantes opcionais"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Resources"
 msgstr "Recursos"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
-#: ../calendar/gui/e-meeting-store.c:1056 ../calendar/gui/print.c:1158
+#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
+#: ../calendar/gui/e-meeting-store.c:1051 ../calendar/gui/print.c:1155
 msgid "Individual"
 msgstr "Individual"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/print.c:1159 ../widgets/table/e-table-config.ui.h:8
+#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/print.c:1156 ../widgets/table/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Grupo"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/print.c:1160
+#: ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-meeting-store.c:118 ../calendar/gui/e-meeting-store.c:135
+#: ../calendar/gui/print.c:1157
 msgid "Resource"
 msgstr "Recurso"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:1161
+#: ../calendar/gui/e-meeting-list-view.c:185
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/print.c:1158
 msgid "Room"
 msgstr "Sala"
 
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:154 ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/print.c:1175
+#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/print.c:1172
 msgid "Chair"
 msgstr "Presidente"
 
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:173
-#: ../calendar/gui/e-meeting-store.c:1059 ../calendar/gui/print.c:1176
+#: ../calendar/gui/e-meeting-list-view.c:197
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-store.c:1054 ../calendar/gui/print.c:1173
 msgid "Required Participant"
 msgstr "Participante necesario"
 
-#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:158 ../calendar/gui/e-meeting-store.c:175
-#: ../calendar/gui/print.c:1177
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/print.c:1174
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
-#: ../calendar/gui/e-meeting-list-view.c:195
-#: ../calendar/gui/e-meeting-store.c:160 ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/print.c:1178
+#: ../calendar/gui/e-meeting-list-view.c:199
+#: ../calendar/gui/e-meeting-store.c:155 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/print.c:1175
 msgid "Non-Participant"
 msgstr "Non-participante"
 
-#: ../calendar/gui/e-meeting-list-view.c:217
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-meeting-store.c:1069
+#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#: ../calendar/gui/e-meeting-store.c:1064
 msgid "Needs Action"
 msgstr "Necesita unha acciÃn"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:615
+#: ../calendar/gui/e-meeting-list-view.c:619
 msgid "Attendee                          "
 msgstr "Participante                          "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:667
+#: ../calendar/gui/e-meeting-list-view.c:671
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:216 ../calendar/gui/e-meeting-store.c:239
+#: ../calendar/gui/e-meeting-store.c:211 ../calendar/gui/e-meeting-store.c:234
 msgid "In Process"
 msgstr "En progreso"
 
-#: ../calendar/gui/e-meeting-store.c:1887
+#: ../calendar/gui/e-meeting-store.c:1888
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "Introducir o contrasinal para acceder à informaciÃn de dispoÃibilidade no "
 "servidor %s como usuario %s"
 
-#: ../calendar/gui/e-meeting-store.c:1897
+#: ../calendar/gui/e-meeting-store.c:1898
 #, c-format
 msgid "Failure reason: %s"
 msgstr "RazÃn do fallo: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1902
-#: ../plugins/caldav/caldav-browse-server.c:958
-#: ../plugins/google-account-setup/google-source.c:453
-#: ../plugins/publish-calendar/publish-calendar.c:339
+#: ../calendar/gui/e-meeting-store.c:1903
+#: ../plugins/publish-calendar/publish-calendar.c:338
 #: ../smime/gui/component.c:54
 msgid "Enter password"
 msgstr "Introduza o contrasinal"
@@ -4579,47 +4501,46 @@ msgstr "Nome comÃn"
 msgid "Language"
 msgstr "Idioma"
 
-#: ../calendar/gui/e-memo-table.c:436
-#: ../modules/calendar/e-cal-shell-content.c:474
-#: ../modules/calendar/e-memo-shell-view-actions.c:241
-#: ../modules/calendar/e-memo-shell-view-actions.c:256
-#: ../modules/calendar/e-memo-shell-view.c:293
-#: ../plugins/caldav/caldav-browse-server.c:459
+#: ../calendar/gui/e-memo-table.c:434
+#: ../modules/calendar/e-cal-shell-content.c:476
+#: ../modules/calendar/e-memo-shell-view-actions.c:232
+#: ../modules/calendar/e-memo-shell-view-actions.c:247
+#: ../modules/calendar/e-memo-shell-view.c:296
 msgid "Memos"
 msgstr "Notas"
 
-#: ../calendar/gui/e-memo-table.c:517 ../calendar/gui/e-task-table.c:790
+#: ../calendar/gui/e-memo-table.c:515 ../calendar/gui/e-task-table.c:788
 msgid "* No Summary *"
 msgstr "* Sen resumo *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:604 ../calendar/gui/e-task-table.c:874
+#: ../calendar/gui/e-memo-table.c:602 ../calendar/gui/e-task-table.c:872
 msgid "Start: "
 msgstr "Inicio: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:623 ../calendar/gui/e-task-table.c:892
+#: ../calendar/gui/e-memo-table.c:621 ../calendar/gui/e-task-table.c:890
 msgid "Due: "
 msgstr "Vencemento: "
 
-#: ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-memo-table.c:740
 msgid "Cut selected memos to the clipboard"
 msgstr "Cortar as notas seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:748
+#: ../calendar/gui/e-memo-table.c:746
 msgid "Copy selected memos to the clipboard"
 msgstr "Copiar as notas seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:754
+#: ../calendar/gui/e-memo-table.c:752
 msgid "Paste memos from the clipboard"
 msgstr "Pegar as notas desde o portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:760
-#: ../modules/calendar/e-memo-shell-view-actions.c:604
+#: ../calendar/gui/e-memo-table.c:758
+#: ../modules/calendar/e-memo-shell-view-actions.c:610
 msgid "Delete selected memos"
 msgstr "Eliminar as notas seleccionadas"
 
-#: ../calendar/gui/e-memo-table.c:766
+#: ../calendar/gui/e-memo-table.c:764
 msgid "Select all visible memos"
 msgstr "Seleccionar todas as notas visÃbeis"
 
@@ -4631,41 +4552,40 @@ 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:611
+#: ../calendar/gui/e-task-table.c:609
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:708 ../calendar/gui/print.c:2287
-#: ../calendar/importers/icalendar-importer.c:85
+#: ../calendar/gui/e-task-table.c:706 ../calendar/gui/print.c:2284
+#: ../calendar/importers/icalendar-importer.c:84
 #: ../calendar/importers/icalendar-importer.c:1082
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:435
-#: ../modules/calendar/e-task-shell-view-actions.c:264
-#: ../modules/calendar/e-task-shell-view-actions.c:279
-#: ../modules/calendar/e-task-shell-view.c:448
-#: ../plugins/caldav/caldav-browse-server.c:457
+#: ../modules/calendar/e-cal-shell-content.c:437
+#: ../modules/calendar/e-task-shell-view-actions.c:255
+#: ../modules/calendar/e-task-shell-view-actions.c:270
+#: ../modules/calendar/e-task-shell-view.c:451
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: ../calendar/gui/e-task-table.c:1025
+#: ../calendar/gui/e-task-table.c:1023
 msgid "Cut selected tasks to the clipboard"
 msgstr "Cortar as tarefas seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-task-table.c:1031
+#: ../calendar/gui/e-task-table.c:1029
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copiar as tarefas seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-task-table.c:1037
+#: ../calendar/gui/e-task-table.c:1035
 msgid "Paste tasks from the clipboard"
 msgstr "Pegar as tarefas desde o portapapeis"
 
-#: ../calendar/gui/e-task-table.c:1043
-#: ../modules/calendar/e-task-shell-view-actions.c:728
+#: ../calendar/gui/e-task-table.c:1041
+#: ../modules/calendar/e-task-shell-view-actions.c:734
 msgid "Delete selected tasks"
 msgstr "Eliminar as tarefas seleccionadas"
 
-#: ../calendar/gui/e-task-table.c:1049
+#: ../calendar/gui/e-task-table.c:1047
 msgid "Select all visible tasks"
 msgstr "Seleccionar todas as tarefas visÃbeis"
 
@@ -4677,40 +4597,40 @@ msgstr "Seleccionar un fuso horario"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1963
+#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1960
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2252
+#: ../calendar/gui/gnome-cal.c:2303
 msgid "Purging"
 msgstr "Purgando"
 
-#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:571
-#: ../calendar/gui/itip-utils.c:684
+#: ../calendar/gui/itip-utils.c:650 ../calendar/gui/itip-utils.c:706
+#: ../calendar/gui/itip-utils.c:819
 msgid "An organizer must be set."
 msgstr "Debe estabelecerse un organizador."
 
-#: ../calendar/gui/itip-utils.c:563
+#: ../calendar/gui/itip-utils.c:698
 msgid "At least one attendee is necessary"
 msgstr "Ã necesario polo menos un participante"
 
-#: ../calendar/gui/itip-utils.c:770 ../calendar/gui/itip-utils.c:931
+#: ../calendar/gui/itip-utils.c:906 ../calendar/gui/itip-utils.c:1067
 msgid "Event information"
 msgstr "InformaciÃn da actividade"
 
-#: ../calendar/gui/itip-utils.c:773 ../calendar/gui/itip-utils.c:934
+#: ../calendar/gui/itip-utils.c:909 ../calendar/gui/itip-utils.c:1070
 msgid "Task information"
 msgstr "InformaciÃn da tarefa"
 
-#: ../calendar/gui/itip-utils.c:776 ../calendar/gui/itip-utils.c:937
+#: ../calendar/gui/itip-utils.c:912 ../calendar/gui/itip-utils.c:1073
 msgid "Memo information"
 msgstr "InformaciÃn da nota"
 
-#: ../calendar/gui/itip-utils.c:779 ../calendar/gui/itip-utils.c:955
+#: ../calendar/gui/itip-utils.c:915 ../calendar/gui/itip-utils.c:1091
 msgid "Free/Busy information"
 msgstr "InformaciÃn de dispoÃibilidade"
 
-#: ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:918
 msgid "Calendar information"
 msgstr "InformaciÃn do calendario"
 
@@ -4718,7 +4638,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:819
+#: ../calendar/gui/itip-utils.c:955
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Aceptado"
@@ -4727,7 +4647,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:826
+#: ../calendar/gui/itip-utils.c:962
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
@@ -4739,7 +4659,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:833 ../calendar/gui/itip-utils.c:881
+#: ../calendar/gui/itip-utils.c:969 ../calendar/gui/itip-utils.c:1017
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Rexeitado"
@@ -4748,7 +4668,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:840
+#: ../calendar/gui/itip-utils.c:976
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegado"
@@ -4756,7 +4676,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:853
+#: ../calendar/gui/itip-utils.c:989
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Actualizado"
@@ -4764,7 +4684,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:860
+#: ../calendar/gui/itip-utils.c:996
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancelar"
@@ -4772,7 +4692,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:867
+#: ../calendar/gui/itip-utils.c:1003
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Actualizar"
@@ -4780,254 +4700,254 @@ 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:874
+#: ../calendar/gui/itip-utils.c:1010
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contraproposta"
 
-#: ../calendar/gui/itip-utils.c:952
+#: ../calendar/gui/itip-utils.c:1088
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "InformaciÃn de dispoÃibilidade (de %s a %s)"
 
-#: ../calendar/gui/itip-utils.c:960
+#: ../calendar/gui/itip-utils.c:1096
 msgid "iCalendar information"
 msgstr "InformaciÃn de iCalendar"
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:1123
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "Non foi posÃbel reservar un recurso, a nova actividade colisiona con algunha "
 "outra."
 
-#: ../calendar/gui/itip-utils.c:991
+#: ../calendar/gui/itip-utils.c:1127
 msgid "Unable to book a resource, error: "
 msgstr "Non foi posÃbel reservar un recurso, erro: "
 
-#: ../calendar/gui/itip-utils.c:1156
+#: ../calendar/gui/itip-utils.c:1306
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante na actividade."
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:589
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:589
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:589
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:589
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:589
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:590
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:591
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:592
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:593
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:597
+#: ../calendar/gui/print.c:594
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:598
+#: ../calendar/gui/print.c:595
 msgid "31st"
 msgstr "31"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:652
 msgid "Su"
 msgstr "Do"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:652
 msgid "Mo"
 msgstr "Lu"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:652
 msgid "Tu"
 msgstr "Ma"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:652
 msgid "We"
 msgstr "MÃ"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:653
 msgid "Th"
 msgstr "Xo"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:653
 msgid "Fr"
 msgstr "Ve"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:653
 msgid "Sa"
 msgstr "SÃ"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3156
+#: ../calendar/gui/print.c:3153
 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:3166
+#: ../calendar/gui/print.c:3163
 msgid " (Completed "
 msgstr " (Completado "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3172
+#: ../calendar/gui/print.c:3169
 msgid "Completed "
 msgstr "Completado "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3182
+#: ../calendar/gui/print.c:3179
 msgid " (Due "
 msgstr " (Vencemento "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3189
+#: ../calendar/gui/print.c:3186
 msgid "Due "
 msgstr "Vencemento "
 
-#: ../calendar/gui/print.c:3354
+#: ../calendar/gui/print.c:3351
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
 
-#: ../calendar/gui/print.c:3381
+#: ../calendar/gui/print.c:3378
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:3424
+#: ../calendar/gui/print.c:3421
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:3439
+#: ../calendar/gui/print.c:3436
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:3457
+#: ../calendar/gui/print.c:3454
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaxe completada: %i"
 
-#: ../calendar/gui/print.c:3468
+#: ../calendar/gui/print.c:3465
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3481
+#: ../calendar/gui/print.c:3478
 #, c-format
 msgid "Categories: %s"
 msgstr "CategorÃas: %s"
 
-#: ../calendar/gui/print.c:3492
+#: ../calendar/gui/print.c:3489
 msgid "Contacts: "
 msgstr "Contactos: "
 
@@ -5052,33 +4972,33 @@ msgstr "Ã maior que"
 msgid "is less than"
 msgstr "Ã menor que"
 
-#: ../calendar/importers/icalendar-importer.c:84
+#: ../calendar/importers/icalendar-importer.c:83
 msgid "Appointments and Meetings"
 msgstr "Citas e reuniÃns"
 
-#: ../calendar/importers/icalendar-importer.c:454
-#: ../calendar/importers/icalendar-importer.c:904
-#: ../plugins/itip-formatter/itip-formatter.c:2557
+#: ../calendar/importers/icalendar-importer.c:468
+#: ../calendar/importers/icalendar-importer.c:905
+#: ../plugins/itip-formatter/itip-formatter.c:2626
 msgid "Opening calendar"
 msgstr "Abrindo o calendario"
 
-#: ../calendar/importers/icalendar-importer.c:604
+#: ../calendar/importers/icalendar-importer.c:616
 msgid "iCalendar files (.ics)"
 msgstr "Ficheiros iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:605
+#: ../calendar/importers/icalendar-importer.c:617
 msgid "Evolution iCalendar importer"
 msgstr "Importador de iCalendar do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:695
+#: ../calendar/importers/icalendar-importer.c:707
 msgid "Reminder!"
 msgstr "Aviso"
 
-#: ../calendar/importers/icalendar-importer.c:779
+#: ../calendar/importers/icalendar-importer.c:791
 msgid "vCalendar files (.vcs)"
 msgstr "Ficheiros vCalendar (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/importers/icalendar-importer.c:792
 msgid "Evolution vCalendar importer"
 msgstr "Importador de vCalendar do Evolution"
 
@@ -6796,97 +6716,93 @@ msgstr "ID do socket para encaixar"
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/settings/mail-account-view.c:77
+#: ../capplet/settings/mail-account-view.c:74
 msgid "Please enter your full name."
 msgstr "Introduza o seu nome completo."
 
-#: ../capplet/settings/mail-account-view.c:78
+#: ../capplet/settings/mail-account-view.c:75
 msgid "Please enter your email address."
 msgstr "Introduza o seu enderezo de correo electrÃnico:"
 
-#: ../capplet/settings/mail-account-view.c:79
+#: ../capplet/settings/mail-account-view.c:76
 msgid "The email address you have entered is invalid."
 msgstr "O enderezo de correo electrÃnico introducido à incorrecto."
 
-#: ../capplet/settings/mail-account-view.c:80
+#: ../capplet/settings/mail-account-view.c:77
 msgid "Please enter your password."
 msgstr "Introduza o seu contrasinal."
 
-#: ../capplet/settings/mail-account-view.c:282
-#: ../mail/em-account-editor.c:5510 ../plugins/caldav/caldav-source.c:68
+#: ../capplet/settings/mail-account-view.c:246
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../capplet/settings/mail-account-view.c:376
-#: ../capplet/settings/mail-account-view.c:421
-#: ../mail/em-account-editor.c:5370 ../mail/em-account-editor.c:5432
-#: ../modules/online-accounts/e-online-accounts-google.c:302
-#: ../modules/online-accounts/e-online-accounts-google.c:378
-#: ../plugins/google-account-setup/google-contacts-source.c:55
-#: ../plugins/google-account-setup/google-source.c:83
+#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:379
 msgid "Google"
 msgstr "Google"
 
-#: ../capplet/settings/mail-account-view.c:497
-#: ../capplet/settings/mail-account-view.c:601
-#: ../mail/em-account-editor.c:4872 ../mail/em-account-editor.c:4907
+#: ../capplet/settings/mail-account-view.c:455
+#: ../capplet/settings/mail-account-view.c:559
 msgid "Always (SSL)"
 msgstr "Sempre (SSL)"
 
-#: ../capplet/settings/mail-account-view.c:500
-#: ../capplet/settings/mail-account-view.c:604
-#: ../mail/em-account-editor.c:4875 ../mail/em-account-editor.c:4910
+#: ../capplet/settings/mail-account-view.c:458
+#: ../capplet/settings/mail-account-view.c:562
 msgid "When possible (TLS)"
 msgstr "Cando sexa posÃbel (TLS)"
 
-#: ../capplet/settings/mail-account-view.c:503
-#: ../capplet/settings/mail-account-view.c:607
-#: ../mail/em-account-editor.c:1754 ../mail/em-account-editor.c:4878
-#: ../mail/em-account-editor.c:4913
+#: ../capplet/settings/mail-account-view.c:461
+#: ../capplet/settings/mail-account-view.c:565
+#: ../mail/e-mail-config-defaults-page.c:729
 msgid "Never"
 msgstr "Nunca"
 
-#: ../capplet/settings/mail-account-view.c:511
+#: ../capplet/settings/mail-account-view.c:469
 msgid "Personal details:"
 msgstr "InformaciÃn persoal:"
 
-#: ../capplet/settings/mail-account-view.c:518 ../mail/mail-config.ui.h:180
+#: ../capplet/settings/mail-account-view.c:476
+#: ../widgets/misc/e-source-config.c:478
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../capplet/settings/mail-account-view.c:527 ../mail/mail-config.ui.h:181
+#: ../capplet/settings/mail-account-view.c:485
 msgid "Email address:"
 msgstr "Enderezo de correo:"
 
-#: ../capplet/settings/mail-account-view.c:537 ../mail/mail-config.ui.h:182
+#: ../capplet/settings/mail-account-view.c:495
 msgid "Details:"
 msgstr "InformaciÃn:"
 
-#: ../capplet/settings/mail-account-view.c:545 ../mail/mail-config.ui.h:183
+#: ../capplet/settings/mail-account-view.c:503
+#: ../mail/e-mail-config-summary-page.c:444
 msgid "Receiving"
 msgstr "Recibindo"
 
-#: ../capplet/settings/mail-account-view.c:552 ../mail/mail-config.ui.h:185
+#: ../capplet/settings/mail-account-view.c:510
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: ../capplet/settings/mail-account-view.c:561 ../mail/mail-config.ui.h:186
+#: ../capplet/settings/mail-account-view.c:519
 msgid "Server address:"
 msgstr "Endrezo do servidor:"
 
-#: ../capplet/settings/mail-account-view.c:570 ../mail/mail-config.ui.h:187
+#: ../capplet/settings/mail-account-view.c:528
+#: ../mail/e-mail-config-summary-page.c:510
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
 msgid "Username:"
 msgstr "Nome do usuario:"
 
-#: ../capplet/settings/mail-account-view.c:579
+#: ../capplet/settings/mail-account-view.c:537
 msgid "Use encryption:"
 msgstr "Usar cifrado:"
 
-#: ../capplet/settings/mail-account-view.c:612 ../mail/mail-config.ui.h:184
+#: ../capplet/settings/mail-account-view.c:570
+#: ../mail/e-mail-config-summary-page.c:456
 msgid "Sending"
 msgstr "Enviando"
 
-#: ../capplet/settings/mail-account-view.c:655
+#: ../capplet/settings/mail-account-view.c:616
 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. "
@@ -6897,7 +6813,7 @@ msgstr ""
 "configurar automaticamente os axustes. Se non à posÃbel facelo de forma "
 "automatica necesitarà a informaciÃn do seu servidor."
 
-#: ../capplet/settings/mail-account-view.c:657
+#: ../capplet/settings/mail-account-view.c:618
 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 "
@@ -6907,11 +6823,11 @@ msgstr ""
 "electrÃnico. IntrodÃzaos embaixo. Tentouse iniciar o proceso coa informaciÃn "
 "que inseriu pero posÃbelmente teÃa que cambiala."
 
-#: ../capplet/settings/mail-account-view.c:659
+#: ../capplet/settings/mail-account-view.c:620
 msgid "You can specify more options to configure the account."
 msgstr "Pode indicar mÃis opciÃns para configurar a conta."
 
-#: ../capplet/settings/mail-account-view.c:661
+#: ../capplet/settings/mail-account-view.c:622
 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."
@@ -6919,11 +6835,11 @@ msgstr ""
 "Agora necesÃtanse os seus axustes para enviar o correo. Tentouse detectalos "
 "automaticamente pero deberÃa comprobalos para asegurar a sÃa correcciÃn."
 
-#: ../capplet/settings/mail-account-view.c:662
+#: ../capplet/settings/mail-account-view.c:623
 msgid "You can specify your default settings for your account."
 msgstr "Pode indicar os axustes predeterminados para a conta."
 
-#: ../capplet/settings/mail-account-view.c:663
+#: ../capplet/settings/mail-account-view.c:624
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -6931,102 +6847,100 @@ msgstr ""
 "Tempo para comprobar os axustes antes de tentar conectar co servidor e obter "
 "o seu correo electrÃnico"
 
-#: ../capplet/settings/mail-account-view.c:678
-#: ../mail/em-account-editor.c:2987 ../mail/em-account-editor.c:3126
+#: ../capplet/settings/mail-account-view.c:639
+#: ../mail/e-mail-config-identity-page.c:640
 msgid "Identity"
 msgstr "Identidade"
 
-#: ../capplet/settings/mail-account-view.c:678
+#: ../capplet/settings/mail-account-view.c:639
 msgid "Next - Receiving mail"
 msgstr "Seguinte - RecepciÃn do correo"
 
-#: ../capplet/settings/mail-account-view.c:679
+#: ../capplet/settings/mail-account-view.c:640
 msgid "Receiving mail"
 msgstr "RecepciÃn do correo"
 
-#: ../capplet/settings/mail-account-view.c:679
-#: ../capplet/settings/mail-account-view.c:680
+#: ../capplet/settings/mail-account-view.c:640
+#: ../capplet/settings/mail-account-view.c:641
 msgid "Next - Sending mail"
 msgstr "Seguinte - EnvÃo do correo"
 
-#: ../capplet/settings/mail-account-view.c:679
+#: ../capplet/settings/mail-account-view.c:640
 msgid "Back - Identity"
 msgstr "Anterior - Identidade"
 
-#: ../capplet/settings/mail-account-view.c:679
+#: ../capplet/settings/mail-account-view.c:640
 msgid "Next - Receiving options"
 msgstr "Seguinte - OpciÃns de recepciÃn"
 
-#: ../capplet/settings/mail-account-view.c:680
+#: ../capplet/settings/mail-account-view.c:641
 msgid "Receiving options"
 msgstr "OpciÃns de recepciÃn"
 
-#: ../capplet/settings/mail-account-view.c:680
-#: ../capplet/settings/mail-account-view.c:682
+#: ../capplet/settings/mail-account-view.c:641
+#: ../capplet/settings/mail-account-view.c:643
 msgid "Back - Receiving mail"
 msgstr "Anterior - RecepciÃn do correo"
 
-#: ../capplet/settings/mail-account-view.c:682
+#: ../capplet/settings/mail-account-view.c:643
 msgid "Sending mail"
 msgstr "EnvÃo do correo"
 
-#: ../capplet/settings/mail-account-view.c:682
-#: ../capplet/settings/mail-account-view.c:683
+#: ../capplet/settings/mail-account-view.c:643
+#: ../capplet/settings/mail-account-view.c:644
 msgid "Next - Review account"
 msgstr "Seguinte - Revisar a conta"
 
-#: ../capplet/settings/mail-account-view.c:682
+#: ../capplet/settings/mail-account-view.c:643
 msgid "Next - Defaults"
 msgstr "Seguinte - PredefiniciÃns"
 
-#: ../capplet/settings/mail-account-view.c:682
+#: ../capplet/settings/mail-account-view.c:643
 msgid "Back - Receiving options"
 msgstr "Anterior - OpciÃns de recepciÃn"
 
-#: ../capplet/settings/mail-account-view.c:683
-#: ../mail/em-account-editor.c:4139
+#: ../capplet/settings/mail-account-view.c:644
+#: ../mail/e-mail-config-defaults-page.c:812
 msgid "Defaults"
 msgstr "PredefiniciÃns"
 
-#: ../capplet/settings/mail-account-view.c:683
+#: ../capplet/settings/mail-account-view.c:644
 msgid "Back - Sending mail"
 msgstr "Anterior - EnvÃo do correo"
 
-#: ../capplet/settings/mail-account-view.c:685
+#: ../capplet/settings/mail-account-view.c:646
 msgid "Review account"
 msgstr "Revisar a conta"
 
-#: ../capplet/settings/mail-account-view.c:685
+#: ../capplet/settings/mail-account-view.c:646
 msgid "Finish"
 msgstr "Finalizar"
 
-#: ../capplet/settings/mail-account-view.c:685
+#: ../capplet/settings/mail-account-view.c:646
 msgid "Back - Sending"
 msgstr "Anterior - EnvÃo"
 
-#: ../capplet/settings/mail-account-view.c:855
+#: ../capplet/settings/mail-account-view.c:823
 msgid "Setup Google contacts with Evolution"
 msgstr "Configurar os contactos WebDAV co Evolution."
 
-#: ../capplet/settings/mail-account-view.c:856
+#: ../capplet/settings/mail-account-view.c:824
 msgid "Setup Google calendar with Evolution"
 msgstr "Configurar o calendario de Google co Evolution."
 
-#: ../capplet/settings/mail-account-view.c:861
-#: ../mail/em-account-editor.c:4973
+#: ../capplet/settings/mail-account-view.c:829
 msgid "You may need to enable IMAP access."
 msgstr "Pode que deba activar o acceso IMAP."
 
-#: ../capplet/settings/mail-account-view.c:869
-#: ../mail/em-account-editor.c:4950
+#: ../capplet/settings/mail-account-view.c:837
 msgid "Google account settings:"
 msgstr "Axustes da conta de Google:"
 
-#: ../capplet/settings/mail-account-view.c:895
+#: ../capplet/settings/mail-account-view.c:863
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "Configurar o calendario Yahoo co Evolution"
 
-#: ../capplet/settings/mail-account-view.c:899
+#: ../capplet/settings/mail-account-view.c:867
 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 "
@@ -7035,59 +6949,45 @@ msgstr ""
 "Os calendarios de Yahoo nomÃanse con nome_apelido. Tentouse formar o nome do "
 "calendario. Se non à vÃlido confirme ou reintroduza o nome do calendario."
 
-#: ../capplet/settings/mail-account-view.c:908
+#: ../capplet/settings/mail-account-view.c:876
 msgid "Yahoo account settings:"
 msgstr "Axustes da conta de Yahoo:"
 
-#: ../capplet/settings/mail-account-view.c:922
+#: ../capplet/settings/mail-account-view.c:890
 msgid "Yahoo Calendar name:"
 msgstr "Nome do calendario de Yahoo:"
 
-#: ../capplet/settings/mail-account-view.c:1119
+#: ../capplet/settings/mail-account-view.c:1089
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: ../capplet/settings/mail-account-view.c:1173
-#: ../capplet/settings/mail-settings-view.c:262
+#: ../capplet/settings/mail-account-view.c:1144
+#: ../capplet/settings/mail-settings-view.c:272
 msgid "Close Tab"
 msgstr "Pechar a lapela"
 
-#: ../capplet/settings/mail-account-view.c:1185
+#: ../capplet/settings/mail-account-view.c:1156
 msgid "Account Wizard"
 msgstr "Asistente da conta"
 
-#: ../capplet/settings/mail-capplet-shell.c:212
+#: ../capplet/settings/mail-capplet-shell.c:210
 msgid "Evolution account assistant"
 msgstr "Asistente de contas do Evolution"
 
-#. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:377
-#: ../libemail-engine/e-mail-session.c:536
-#: ../modules/addressbook/e-book-shell-backend.c:106
-#: ../modules/addressbook/e-book-shell-migrate.c:136
-#: ../modules/calendar/e-cal-shell-backend.c:119
-#: ../modules/calendar/e-cal-shell-migrate.c:154
-#: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:108
-#: ../modules/calendar/e-task-shell-migrate.c:121
-msgid "On This Computer"
-msgstr "Neste computador"
-
-#: ../capplet/settings/mail-settings-view.c:152
+#: ../capplet/settings/mail-settings-view.c:157
 #, c-format
 msgid "Modify %s..."
 msgstr "Modificar %sâ"
 
-#: ../capplet/settings/mail-settings-view.c:154
+#: ../capplet/settings/mail-settings-view.c:159
 msgid "Add a new account"
 msgstr "Engadir unha nova conta"
 
-#: ../capplet/settings/mail-settings-view.c:194
+#: ../capplet/settings/mail-settings-view.c:201
 msgid "Account management"
 msgstr "XestiÃn de contas"
 
-#: ../capplet/settings/mail-settings-view.c:274
+#: ../capplet/settings/mail-settings-view.c:284
 msgid "Settings"
 msgstr "Axustes"
 
@@ -7096,7 +6996,7 @@ msgid "Save as..."
 msgstr "Gardar comoâ"
 
 #: ../composer/e-composer-actions.c:295
-#: ../widgets/misc/e-signature-editor.c:213
+#: ../widgets/misc/e-mail-signature-editor.c:285
 msgid "_Close"
 msgstr "_Pechar"
 
@@ -7112,7 +7012,7 @@ msgstr "_Mensaxe nova"
 msgid "Open New Message window"
 msgstr "Abrir unha xanela de mensaxe nova"
 
-#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1524
+#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1495
 msgid "Configure Evolution"
 msgstr "Configurar o Evolution"
 
@@ -7148,7 +7048,7 @@ msgstr "Gardar como borra_dor"
 msgid "Save as draft"
 msgstr "Gardar como borrador"
 
-#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:340
+#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:342
 msgid "S_end"
 msgstr "_Enviar"
 
@@ -7256,67 +7156,68 @@ msgstr ""
 "Introducir os enderezos que recibirÃn unha copia da mensaxe sen aparecerer "
 "na lista de destinatarios"
 
-#: ../composer/e-composer-header-table.c:780
+#: ../composer/e-composer-header-table.c:849
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-composer-header-table.c:789
+#: ../composer/e-composer-header-table.c:856
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
-#: ../composer/e-composer-header-table.c:793
+#: ../composer/e-composer-header-table.c:861
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-composer-header-table.c:798
+#: ../composer/e-composer-header-table.c:867
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:803
+#: ../composer/e-composer-header-table.c:873
 msgid "_Bcc:"
 msgstr "_Cco:"
 
-#: ../composer/e-composer-header-table.c:808
+#: ../composer/e-composer-header-table.c:878
 msgid "_Post To:"
 msgstr "_Publicar en:"
 
-#: ../composer/e-composer-header-table.c:812
+#: ../composer/e-composer-header-table.c:882
 msgid "S_ubject:"
 msgstr "_Asunto:"
 
-#: ../composer/e-composer-header-table.c:821
+#: ../composer/e-composer-header-table.c:890
+#: ../mail/e-mail-config-identity-page.c:466
 msgid "Si_gnature:"
 msgstr "Si_natura:"
 
-#: ../composer/e-composer-name-header.c:145
+#: ../composer/e-composer-name-header.c:215
 msgid "Click here for the address book"
 msgstr "Premer aquà para ir à axenda de enderezos"
 
-#: ../composer/e-composer-post-header.c:135
+#: ../composer/e-composer-post-header.c:184
 msgid "Click here to select folders to post to"
 msgstr "Premer aquà para seleccionar os cartafoles de destino"
 
-#: ../composer/e-composer-private.c:228
+#: ../composer/e-composer-private.c:230
 msgid "Undo the last action"
 msgstr "Desfacer a Ãltima acciÃn"
 
-#: ../composer/e-composer-private.c:232
+#: ../composer/e-composer-private.c:234
 msgid "Redo the last undone action"
 msgstr "Refacer a Ãltima acciÃn desfeita"
 
-#: ../composer/e-composer-private.c:236
+#: ../composer/e-composer-private.c:238
 msgid "Search for text"
 msgstr "Busca de texto"
 
-#: ../composer/e-composer-private.c:240
+#: ../composer/e-composer-private.c:242
 msgid "Search for and replace text"
 msgstr "Buscar e substituÃr un texto"
 
-#: ../composer/e-composer-private.c:360
+#: ../composer/e-composer-private.c:362
 msgid "Save draft"
 msgstr "Gardar o borrador"
 
-#: ../composer/e-msg-composer.c:823
+#: ../composer/e-msg-composer.c:851
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -7324,7 +7225,7 @@ msgstr ""
 "Non à posÃbel asinar a mensaxe saÃnte: non hai un certificado de sinatura "
 "estabelecido para esta conta"
 
-#: ../composer/e-msg-composer.c:832
+#: ../composer/e-msg-composer.c:860
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7333,17 +7234,17 @@ msgstr ""
 "Non à posÃbel cifrar a mensaxe saÃnte: non hai un certificado de cifrado "
 "estabelecido para esta conta"
 
-#: ../composer/e-msg-composer.c:1621 ../composer/e-msg-composer.c:2008
+#: ../composer/e-msg-composer.c:1540 ../composer/e-msg-composer.c:1949
 msgid "Compose Message"
 msgstr "Escribir unha mensaxe"
 
-#: ../composer/e-msg-composer.c:4211
+#: ../composer/e-msg-composer.c:4162
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "O editor contÃn un corpo de mensaxe sen texto, polo que non à posÃbel a "
 "ediciÃn."
 
-#: ../composer/e-msg-composer.c:4921
+#: ../composer/e-msg-composer.c:4834
 msgid "Untitled Message"
 msgstr "Mensaxe sen tÃtulo"
 
@@ -7474,7 +7375,7 @@ msgstr "O erro devolto foi Â{0}Â. Ã moi posÃbel que non se gardase a mensaxe
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Produciuse un erro durante o envÃo. Que desexa facer?"
 
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:161
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:151
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "O informe de erro foi Â{0}Â."
 
@@ -7519,7 +7420,7 @@ msgstr "NotificaciÃns de actividades do calendario"
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:652
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:651
 msgid "Groupware Suite"
 msgstr "Suite de Groupware"
 
@@ -8172,95 +8073,71 @@ msgstr ""
 "predeterminado son 10 anos"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
-msgid "List of selected calendars"
-msgstr "Lista dos calendarios seleccionados"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
-msgid "List of calendars to load"
-msgstr "Lista de calendarios a cargar"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
-msgid "List of selected memo lists"
-msgstr "Lista dos recordatorios seleccionados"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
-msgid "List of memo lists to load"
-msgstr "Lista de listados de recordatorios a cargar"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
-msgid "List of selected task lists"
-msgstr "Lista das listas de tarefas seleccionadas"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
-msgid "List of task lists to load"
-msgstr "Lista das listas de tarefas a cargar"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
 msgid "Show appointment end times in week and month views"
 msgstr "Mostrar as horas finais das citas nas vista semanal e mensual"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
 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 das actividades nas vistas "
 "semanais e mensuais"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
 msgid "Show the memo preview pane"
 msgstr "Mostrar o panel de vista previa de notas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
 msgid "If \"true\", show the memo preview pane in the main window"
 msgstr ""
 "Se à verdadeiro, mÃstrase o panel de vista previa das notas na xanela "
 "principal"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Show the task preview pane"
 msgstr "Mostrar o panel de vista previa de tarefas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
 msgid "If \"true\", show the task preview pane in the main window"
 msgstr ""
 "Se à verdadeiro, mÃstrase o panel de vista previa de tarefas na xanela "
 "principal"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr ""
 "Mostrar os nÃmeros das semanas na vista diaria, de semana laboral e no "
 "navegador de datas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr ""
 "Indica se se mostran os nÃmeros de semana en diferentes lugares do calendario"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 msgid "Vertical position for the tag pane"
 msgstr "PosiciÃn vertical do panel de etiquetas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 msgid "Highlight tasks due today"
 msgstr "Realce das tarefas que vencen hoxe"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 msgid ""
 "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr ""
 "Indica se realzar as tarefas que vencen hoxe con unha cor especial (task-"
 "overdue-color)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
 msgid "Tasks due today color"
 msgstr "Cor para as tarefas que vencen hoxe"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 msgid ""
 "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
 "together with task-due-today-highlight"
@@ -8268,17 +8145,17 @@ msgstr ""
 "Cor de fondo para as tarefas que vencen hoxe, no formato Â#rrggbbÂ. Usado "
 "xunto ao resaltado de tarefas que vencen hoxe."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
 msgid "Task preview pane position (horizontal)"
 msgstr "PosiciÃn do panel de vista previa de tarefas (horizontal)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
 msgid "Task layout style"
 msgstr "Estilo da disposiciÃn de tarefas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 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 "
@@ -8289,34 +8166,34 @@ msgstr ""
 "previa embaixo da lista de tarefas. Â1Â (vista vertical) mostra o panel de "
 "vista previa ao lado da lista de tarefas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
 msgid "Task preview pane position (vertical)"
 msgstr "PosiciÃn do panel de vista previa de tarefas (vertical)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 msgid "Position of the task preview pane when oriented vertically"
 msgstr ""
 "PosiciÃn do panel de vista previa de tarefas cando està orientado "
 "verticalmente"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 msgid "Highlight overdue tasks"
 msgstr "Realce das tarefas vencidas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 msgid ""
 "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
 "Indica se realzar as tarefas vencidas con unha cor especial (task-overdue-"
 "color)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
 msgid "Overdue tasks color"
 msgstr "Cor para as tarefas atrasadas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 msgid ""
 "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
 "together with task-overdue-highlight."
@@ -8324,23 +8201,23 @@ msgstr ""
 "Cor de fondo para as tarefas fÃra de prazo, no formato Â#rrggbbÂ. Usado "
 "xunto ao realzado de tarefas fÃra de prazo."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
 msgid "Time divisions"
 msgstr "DivisiÃns horarias"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 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"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
 msgid "Timezone"
 msgstr "Fuso horario"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like \"America/New York\""
@@ -8349,61 +8226,61 @@ msgstr ""
 "unha localizaciÃn sen traducir da base de datos de fusos horarios Olsen, p."
 "ex:ÂAmerica/New YorkÂ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
 msgid "Twenty four hour time format"
 msgstr "Formato de hora de vinte e catro horas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.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"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
 msgid "Birthday and anniversary reminder"
 msgstr "Avisos de aniversarios"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "Indica se se estabelece un aviso para os aniversarios"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
 msgid "Default appointment reminder"
 msgstr "Aviso de cita predeterminado"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 msgid "Whether to set a default reminder for appointments"
 msgstr "Indica se se estabelece un aviso predeterminado para as citas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
 msgid "Use system timezone"
 msgstr "Usar o fuso horario do sistema"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr ""
 "Usar o fuso horario do sistema en vez do fuso horario seleccionado no "
 "Evolution"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
 msgid "Week start"
 msgstr "inicio da semana"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 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) ata o sÃbado (6)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
 msgid "Work days"
 msgstr "DÃas laborÃbeis"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 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"
 
@@ -10160,7 +10037,7 @@ msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Cartafol inicial para os diÃlogos GtkFileChooser."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
-#: ../shell/apps_evolution_shell.schemas.in.h:9 ../shell/main.c:318
+#: ../shell/apps_evolution_shell.schemas.in.h:9 ../shell/main.c:316
 msgid "Start in offline mode"
 msgstr "Iniciar en modo sen conexiÃn"
 
@@ -10339,45 +10216,45 @@ msgstr "Non à posÃbel procesar a parte MIME que non à texto"
 
 #: ../em-format/em-format.c:1231 ../em-format/em-format-quote.c:154
 #: ../mail/e-mail-tag-editor.c:327 ../mail/message-list.etspec.h:5
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../modules/mail/em-mailer-prefs.c:68
 msgid "From"
 msgstr "De"
 
 #: ../em-format/em-format.c:1232 ../em-format/em-format-quote.c:154
-#: ../modules/mail/em-mailer-prefs.c:71
+#: ../modules/mail/em-mailer-prefs.c:69
 msgid "Reply-To"
 msgstr "Responder a"
 
 #: ../em-format/em-format.c:1234 ../em-format/em-format-quote.c:154
-#: ../mail/em-format-html.c:2296 ../mail/em-format-html.c:2319
-#: ../modules/mail/em-mailer-prefs.c:73
+#: ../mail/em-format-html.c:2299 ../mail/em-format-html.c:2322
+#: ../modules/mail/em-mailer-prefs.c:71
 msgid "Cc"
 msgstr "Cc"
 
 #: ../em-format/em-format.c:1235 ../em-format/em-format-quote.c:154
-#: ../mail/em-format-html.c:2298 ../mail/em-format-html.c:2321
-#: ../modules/mail/em-mailer-prefs.c:74
+#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2324
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "Bcc"
 msgstr "Cco"
 
 #: ../em-format/em-format.c:1236 ../em-format/em-format-quote.c:301
 #: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:76
-#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:75
-#: ../smime/lib/e-cert.c:1126
+#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:73
+#: ../smime/lib/e-cert.c:1125
 msgid "Subject"
 msgstr "Titular"
 
 #: ../em-format/em-format.c:1237 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:526
+#: ../modules/mail/em-mailer-prefs.c:74 ../widgets/misc/e-dateedit.c:526
 #: ../widgets/misc/e-dateedit.c:548
 msgid "Date"
 msgstr "Data"
 
-#: ../em-format/em-format.c:1238 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format.c:1238 ../modules/mail/em-mailer-prefs.c:75
 msgid "Newsgroups"
 msgstr "Grupos de discusiÃn"
 
-#: ../em-format/em-format.c:1239 ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format.c:1239 ../modules/mail/em-mailer-prefs.c:76
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Cara"
@@ -10388,8 +10265,8 @@ msgid "%s attachment"
 msgstr "%s anexo"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:312 ../mail/em-format-html.c:2429
-#: ../modules/mail/em-mailer-prefs.c:1053
+#: ../em-format/em-format-quote.c:312 ../mail/em-format-html.c:2432
+#: ../modules/mail/em-mailer-prefs.c:1051
 msgid "Mailer"
 msgstr "Aplicativo de correo"
 
@@ -10507,14 +10384,14 @@ msgstr "Visual"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:206
-#: ../modules/calendar/e-cal-shell-view-actions.c:1920
-#: ../plugins/itip-formatter/itip-view.c:211
+#: ../modules/calendar/e-cal-shell-view-actions.c:1926
+#: ../plugins/itip-formatter/itip-view.c:216
 #: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
 msgstr "Hoxe"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:239
+#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:244
 msgid "Tomorrow"
 msgstr "MaÃÃ"
 
@@ -10604,12 +10481,6 @@ msgstr "Escribindo Â%sÂ"
 msgid "Writing \"%s\" to %s"
 msgstr "Escribindo Â%s a Â%sÂ"
 
-#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:9
-#: ../plugins/google-account-setup/google-contacts-source.c:392
-#: ../plugins/publish-calendar/publish-calendar.ui.h:7
-msgid "weeks"
-msgstr "semanas"
-
 #: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "Produciuse un erro ao imprimir"
@@ -10651,11 +10522,11 @@ msgstr "Debido a Â{1}Â."
 msgid "Cannot open file \"{0}\"."
 msgstr "Non à posÃbel abrir o ficheiro Â{0}Â."
 
-#: ../e-util/e-util.c:245
+#: ../e-util/e-util.c:243
 msgid "Could not open the link."
 msgstr "Non foi posÃbel abrir a ligazÃn."
 
-#: ../e-util/e-util.c:292
+#: ../e-util/e-util.c:290
 msgid "Could not display help for Evolution."
 msgstr "Non foi posÃbel mostrar a axuda do Evolution."
 
@@ -10819,6 +10690,9 @@ msgstr "_Buscar os elementos:"
 #. protocol:
 #. name:
 #: ../filter/e-filter-rule.c:776 ../libemail-engine/camel-null-store.c:28
+#: ../mail/e-mail-config-summary-page.c:141
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
+#: ../widgets/misc/e-mail-signature-combo-box.c:318
 msgid "None"
 msgstr "Ningunha"
 
@@ -10847,11 +10721,11 @@ msgid "A_dd Condition"
 msgstr "Enga_dir unha condiciÃn"
 
 #: ../filter/e-filter-rule.c:1162 ../filter/filter.ui.h:1
-#: ../mail/em-utils.c:308
+#: ../mail/em-utils.c:301
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/e-filter-rule.c:1162 ../mail/em-utils.c:309
+#: ../filter/e-filter-rule.c:1162 ../mail/em-utils.c:302
 msgid "Outgoing"
 msgstr "SaÃnte"
 
@@ -10891,7 +10765,7 @@ msgstr "ExpresiÃn regular incorrecta Â{0}Â."
 msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "Non foi posÃbel compilar a expresiÃn regular Â{1}Â."
 
-#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:103
+#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:97
 msgid "Missing name."
 msgstr "Falta o nome."
 
@@ -10923,6 +10797,10 @@ msgstr "unha hora relativa à hora actual"
 msgid "seconds"
 msgstr "segundos"
 
+#: ../filter/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "weeks"
+msgstr "semanas"
+
 #: ../filter/filter.ui.h:10
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 msgid "months"
@@ -10976,6 +10854,11 @@ msgstr ""
 "A data da mensaxe compararase co\n"
 "instante relativo no que se produce o filtrado."
 
+#: ../libemail-engine/e-mail-authenticator.c:182
+#, c-format
+msgid "Invalid authentication result code (%d)"
+msgstr "CÃdigo de resposta (%d) de autenticaciÃn non vÃlido"
+
 #: ../libemail-engine/e-mail-folder-utils.c:109
 #, c-format
 msgid "Saving message to folder '%s'"
@@ -11027,88 +10910,68 @@ msgstr[1] "Gardando %d mensaxes"
 msgid "Invalid folder URI '%s'"
 msgstr "O URI do cartafol Â%s non à vÃlido"
 
-#: ../libemail-engine/e-mail-session.c:108 ../mail/em-folder-properties.c:333
-#: ../mail/em-folder-tree-model.c:703
-#: ../modules/mail/e-mail-shell-view-private.c:1026
-#: ../modules/mail/e-mail-shell-view-private.c:1037
+#: ../libemail-engine/e-mail-session.c:111 ../mail/em-folder-properties.c:333
+#: ../mail/em-folder-tree-model.c:760
+#: ../modules/mail/e-mail-shell-view-private.c:1033
+#: ../modules/mail/e-mail-shell-view-private.c:1044
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:109 ../mail/em-folder-tree-model.c:696
-#: ../modules/mail/e-mail-shell-view-private.c:1024
+#: ../libemail-engine/e-mail-session.c:112 ../mail/em-folder-tree-model.c:753
+#: ../modules/mail/e-mail-shell-view-private.c:1031
 msgid "Drafts"
 msgstr "Borradores"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:110 ../mail/em-folder-tree-model.c:707
-#: ../modules/mail/e-mail-shell-view-private.c:1028
+#: ../libemail-engine/e-mail-session.c:113 ../mail/em-folder-tree-model.c:764
+#: ../modules/mail/e-mail-shell-view-private.c:1035
 msgid "Outbox"
 msgstr "Caixa de saÃda"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:111 ../mail/em-folder-tree-model.c:711
-#: ../modules/mail/e-mail-shell-view-private.c:1030
+#: ../libemail-engine/e-mail-session.c:114 ../mail/em-folder-tree-model.c:768
+#: ../modules/mail/e-mail-shell-view-private.c:1037
 msgid "Sent"
 msgstr "Enviados"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:112 ../mail/em-folder-tree-model.c:699
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../libemail-engine/e-mail-session.c:115 ../mail/em-folder-tree-model.c:756
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 #: ../plugins/templates/templates.c:1049 ../plugins/templates/templates.c:1349
 #: ../plugins/templates/templates.c:1359
 msgid "Templates"
 msgstr "Modelos"
 
-#: ../libemail-engine/e-mail-session.c:697 ../mail/mail-vfolder-ui.c:79
-msgid "Search Folders"
-msgstr "Cartafoles de busca"
-
-#: ../libemail-engine/e-mail-session.c:987
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Introducir a frase de paso para %s"
-
-#: ../libemail-engine/e-mail-session.c:991
-msgid "Enter Passphrase"
-msgstr "Introducir a frase de paso"
-
-#: ../libemail-engine/e-mail-session.c:995
+#: ../libemail-engine/e-mail-session.c:1243
 #, c-format
-msgid "Enter Password for %s"
-msgstr "Introducir o contrasinal para %s"
+msgid "User cancelled operation"
+msgstr "O usuario cancelou a operaciÃn"
 
-#: ../libemail-engine/e-mail-session.c:999
-msgid "Enter Password"
-msgstr "Introducir o contrasinal"
-
-#: ../libemail-engine/e-mail-session.c:1050
-#, c-format
-msgid "User canceled operation."
-msgstr "O usuario cancelou a operaciÃn."
-
-#: ../libemail-engine/e-mail-session.c:1169
+#: ../libemail-engine/e-mail-session.c:1368
 #, c-format
 msgid ""
-"No destination address provided, forward of the message has been cancelled."
+"No destination address provided, forwarding of the message has been "
+"cancelled."
 msgstr ""
-"Non se proporcionou ningÃn enderezo de destino, o reencamiÃamento cancelouse."
+"Non se forneceu ningÃn enderezo de destino, cancelouse o reenvÃo do mensaxe."
 
-#: ../libemail-engine/e-mail-session.c:1178
+#: ../libemail-engine/e-mail-session.c:1381
 #, c-format
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr "Non se atopou ningunha conta que usar, o reencamiÃamento cancelouse."
+msgid "No identity found to use, forwarding of the message has been cancelled."
+msgstr ""
+"Non se atopou ningunha identidade que usar, cancelouse o reenvÃo do mensaxe."
 
-#: ../libemail-engine/e-mail-session.c:1332
+#: ../libemail-engine/e-mail-session.c:1543
 #, c-format
 msgid "%s authentication failed"
 msgstr "A autenticaciÃn %s fallou"
 
-#: ../libemail-engine/e-mail-session.c:1406
+#: ../libemail-engine/e-mail-session.c:1588
 #, c-format
-msgid "No password was provided"
-msgstr "Non se forneceu ningÃn contrasinal"
+msgid "No data source found for UID '%s'"
+msgstr "Non foi posÃbel atopar os datos para o UID Â%sÂ"
 
 #: ../libemail-engine/e-mail-session-utils.c:420
 #, c-format
@@ -11116,14 +10979,14 @@ msgid "Cannot get transport for account '%s'"
 msgstr "Non à posÃbel obter o servizo de transporte para a conta Â%sÂ"
 
 #: ../libemail-engine/e-mail-session-utils.c:508
-#: ../libemail-engine/mail-ops.c:659
+#: ../libemail-engine/mail-ops.c:693
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Produciuse un fallo ao aplicar os filtros ao correo saÃnte: %s"
 
 #: ../libemail-engine/e-mail-session-utils.c:537
 #: ../libemail-engine/e-mail-session-utils.c:571
-#: ../libemail-engine/mail-ops.c:678 ../libemail-engine/mail-ops.c:714
+#: ../libemail-engine/mail-ops.c:710 ../libemail-engine/mail-ops.c:746
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -11133,17 +10996,17 @@ msgstr ""
 "No seu lugar anexaranse ao cartafol local ÂEnviadosÂ."
 
 #: ../libemail-engine/e-mail-session-utils.c:591
-#: ../libemail-engine/mail-ops.c:736
+#: ../libemail-engine/mail-ops.c:768
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Produciuse un fallo ao anexar ao cartafol local ÂEnviadosÂ: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:819
-#: ../libemail-engine/mail-ops.c:864 ../libemail-engine/mail-ops.c:965
+#: ../libemail-engine/e-mail-session-utils.c:821
+#: ../libemail-engine/mail-ops.c:896 ../libemail-engine/mail-ops.c:997
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
-#: ../libemail-engine/e-mail-session-utils.c:895
+#: ../libemail-engine/e-mail-session-utils.c:897
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "Eliminando a subscriciÃn do cartafol Â%sÂ"
@@ -11163,20 +11026,20 @@ msgstr "Conectando novamente con %s"
 msgid "Preparing account '%s' for offline"
 msgstr "Preparando a conta Â%s para o modo sen conexiÃn"
 
-#: ../libemail-engine/mail-folder-cache.c:882
+#: ../libemail-engine/mail-folder-cache.c:887
 #, c-format
 msgid "Pinging %s"
 msgstr "Facendo ping a %s"
 
-#: ../libemail-engine/mail-ops.c:94
+#: ../libemail-engine/mail-ops.c:93
 msgid "Filtering Selected Messages"
 msgstr "Filtrando as mensaxes seleccionadas"
 
-#: ../libemail-engine/mail-ops.c:216
+#: ../libemail-engine/mail-ops.c:215
 msgid "Fetching Mail"
 msgstr "Recibindo o correo"
 
-#: ../libemail-engine/mail-ops.c:875
+#: ../libemail-engine/mail-ops.c:907
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
@@ -11184,62 +11047,62 @@ msgstr "Enviando a mensaxe %d de %d"
 #. Translators: The string is distinguished by total
 #. * count of messages to be sent.  Failed messages is
 #. * always more than zero.
-#: ../libemail-engine/mail-ops.c:926
+#: ../libemail-engine/mail-ops.c:958
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "Produciuse un fallo ao enviar unha mensaxe"
 msgstr[1] "Produciuse un fallo ao enviar %d de %d mensaxes"
 
-#: ../libemail-engine/mail-ops.c:932 ../mail/mail-send-recv.c:872
+#: ../libemail-engine/mail-ops.c:964 ../mail/mail-send-recv.c:857
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../libemail-engine/mail-ops.c:934 ../mail/mail-send-recv.c:874
+#: ../libemail-engine/mail-ops.c:966 ../mail/mail-send-recv.c:859
 msgid "Complete."
 msgstr "Completado."
 
-#: ../libemail-engine/mail-ops.c:1046
+#: ../libemail-engine/mail-ops.c:1078
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Movendo as mensaxes a Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1047
+#: ../libemail-engine/mail-ops.c:1079
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copiando as mensaxes a Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1164
+#: ../libemail-engine/mail-ops.c:1196
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Gardando o cartafol Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1237
+#: ../libemail-engine/mail-ops.c:1269
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expurgando e gardando a conta Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1238
+#: ../libemail-engine/mail-ops.c:1270
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Gardando a conta Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1300
+#: ../libemail-engine/mail-ops.c:1332
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Actualizando o cartafol Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1518
+#: ../libemail-engine/mail-ops.c:1562
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Expurgando o cartafol Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1611
+#: ../libemail-engine/mail-ops.c:1655
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Baleirando o lixo de Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1707
+#: ../libemail-engine/mail-ops.c:1751
 #, c-format
 msgid "Disconnecting %s"
 msgstr "Desconectando %s"
@@ -11296,181 +11159,22 @@ msgstr[1] ""
 "Â%s modificÃronse debido a que se eliminou o cartafol\n"
 "Â%sÂ."
 
-#: ../libemail-utils/e-signature.c:710
-msgid "Autogenerated"
-msgstr "Xerado automaticamente"
-
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:1662 ../widgets/misc/e-signature-combo-box.c:79
-msgctxt "mail-signature"
-msgid "None"
-msgstr "NingÃn"
-
-#: ../mail/em-account-editor.c:1755
-msgid "Always"
-msgstr "Sempre"
-
-#: ../mail/em-account-editor.c:1756
-msgid "Ask for each message"
-msgstr "Preguntar para cada mensaxe"
-
-#: ../mail/em-account-editor.c:2936 ../mail/mail-config.ui.h:164
-msgid "_Path:"
-msgstr "_Ruta:"
-
-#: ../mail/em-account-editor.c:2939
-msgid "Fil_e:"
-msgstr "Fich_eiro:"
-
-#: ../mail/em-account-editor.c:2984
-msgid "Mail Configuration"
-msgstr "ConfiguraciÃn do correo"
-
-#: ../mail/em-account-editor.c:2985
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Continue\" to begin."
-msgstr ""
-"DÃmoslle a benvida ao Asistente de ConfiguraciÃn de Correo do Evolution.\n"
-"\n"
-"Prema en ÂContinuar para comezar."
-
-#: ../mail/em-account-editor.c:2988
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"Introduza o seu nome e enderezo de correo. Os campos Âopcionais non "
-"necesitan encherse, a non ser que desexe incluÃr esta informaciÃn no correo "
-"que envÃe."
-
-#: ../mail/em-account-editor.c:2990 ../mail/em-account-editor.c:3199
-msgid "Receiving Email"
-msgstr "RecepciÃn de correo"
-
-#: ../mail/em-account-editor.c:2991
-msgid "Please configure the following account settings."
-msgstr "Configurar os seguintes axustes da conta."
-
-#: ../mail/em-account-editor.c:2993 ../mail/em-account-editor.c:3818
-msgid "Sending Email"
-msgstr "EnvÃo de correo"
-
-#: ../mail/em-account-editor.c:2994
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Introduza a informaciÃn sobre a forma na que enviarà o correo. Se non està "
-"seguro, pregunte ao administrador do sistema ou provedor de acceso a "
-"Internet."
-
-#: ../mail/em-account-editor.c:2996
-msgid "Account Summary"
-msgstr "Resumo da conta"
-
-#: ../mail/em-account-editor.c:2997
-msgid ""
-"This is a summary of the settings which will be used to access your mail."
-msgstr ""
-"Este à un resumo da configuraciÃn que se empregarÃn para acceder ao seu "
-"correo."
-
-#: ../mail/em-account-editor.c:3001
-msgid "Done"
-msgstr "Feito"
-
-#: ../mail/em-account-editor.c:3002
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"ParabÃns, concluÃu a configuraciÃn do correo.\n"
-"\n"
-"Agora està preparado para enviar e recibir correo \n"
-"usando o Evolution. \n"
-"\n"
-"Prema en ÂAplicar para gardar os axustes."
-
-#: ../mail/em-account-editor.c:3565
-msgid "Check for _new messages every"
-msgstr "Comprobar automaticamente se hai mensaxes _novas cada"
-
-#: ../mail/em-account-editor.c:3573
-msgid "minu_tes"
-msgstr "minu_tos"
-
-#. Add encryption/signature header
-#: ../mail/em-account-editor.c:4291 ../mail/em-format-html-print.c:187
-#: ../mail/mail-config.ui.h:166
-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:4346 ../mail/em-account-editor.c:4448
-msgid "Receiving Options"
-msgstr "OpciÃns de recepciÃn"
-
-#: ../mail/em-account-editor.c:4347 ../mail/em-account-editor.c:4449
-msgid "Checking for New Messages"
-msgstr "Comprobando se hai mensaxes novas"
-
-#: ../mail/em-account-editor.c:4958
-msgid "Setup Google con_tacts with Evolution"
-msgstr "Configurar os con_tactos de Google con Evolution"
-
-#: ../mail/em-account-editor.c:4965
-msgid "Setup Google ca_lendar with Evolution"
-msgstr "Configurar o ca_lendario de Google con Evolution"
-
-#: ../mail/em-account-editor.c:5016
-msgid "Yahoo! account settings:"
-msgstr "ConfiguraciÃn da conta de Yahoo!:"
-
-#: ../mail/em-account-editor.c:5024
-msgid "Setup _Yahoo! calendar with Evolution"
-msgstr "Configurar o calendario de _Yahoo! con Evolution"
-
-#: ../mail/em-account-editor.c:5031
-msgid "Setup Yahoo! _tasks with Evolution"
-msgstr "Configurar as tarefas de Yahoo! co Evolution"
-
-#: ../mail/em-account-editor.c:5038
-msgid ""
-"Yahoo! calendars are named as firstname_lastname. We have tried to form the "
-"calendar name. Please confirm and re-enter the calendar name, if it is not "
-"correct, or change it later in calendar Properties."
-msgstr ""
-"Os calendarios de Yahoo! nomÃanse con nome_apelido. Tentouse formar o nome "
-"do calendario. Confirme e volva a introducir o nome do calendario se non à "
-"correcto, ou cÃmbieo mÃis tarde nas propiedades do calendario."
-
-#: ../mail/em-account-editor.c:5057
-msgid "Yahoo! Calen_dar name:"
-msgstr "Nome do calen_dario de Yahoo!"
-
-#: ../mail/e-mail-account-manager.c:405
+#: ../mail/e-mail-account-manager.c:446
 msgid "_Restore Default"
 msgstr "_Restaurar predeterminada"
 
-#: ../mail/e-mail-account-manager.c:418
+#: ../mail/e-mail-account-manager.c:459
 msgid "You can drag and drop account names to reorder them."
 msgstr "Pode arrastrar e soltar nomes de contas para reordenalas."
 
-#: ../mail/e-mail-account-manager.c:463
+#: ../mail/e-mail-account-manager.c:504
 msgid "De_fault"
 msgstr "Prede_finido"
 
 #: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:509
+#: ../modules/mail/em-composer-prefs.c:505
 #: ../modules/plugin-manager/evolution-plugin-manager.c:360
-#: ../plugins/publish-calendar/publish-calendar.c:855
+#: ../plugins/publish-calendar/publish-calendar.c:854
 msgid "Enabled"
 msgstr "Activado"
 
@@ -11478,13 +11182,10 @@ msgstr "Activado"
 msgid "Account Name"
 msgstr "Nome da conta"
 
-#. we changed user, thus reset the chosen calendar combo too, because
-#. * other user means other calendars subscribed
-#: ../mail/e-mail-account-tree-view.c:116 ../mail/e-mail-reader.c:3711
-#: ../mail/mail-config.ui.h:51
-#: ../plugins/google-account-setup/google-source.c:311
-#: ../plugins/google-account-setup/google-source.c:553
-#: ../plugins/google-account-setup/google-source.c:690
+#: ../mail/e-mail-account-tree-view.c:116
+#: ../mail/e-mail-config-security-page.c:333
+#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3720
+#: ../mail/mail-config.ui.h:44
 msgid "Default"
 msgstr "predeterminado"
 
@@ -11506,13 +11207,41 @@ msgstr "Vista de iconas"
 msgid "List View"
 msgstr "Vista de lista"
 
-#: ../mail/e-mail-backend.c:661
+#: ../mail/e-mail-autoconfig.c:194
+#, c-format
+msgid "No mail exchanger record for '%s'"
+msgstr ""
+
+#: ../mail/e-mail-autoconfig.c:201
+#, c-format
+msgid "Temporarily unable to resolve '%s'"
+msgstr "Foi incapaz de resolver temporalmente Â%sÂ"
+
+#: ../mail/e-mail-autoconfig.c:208
+#, c-format
+msgid "Error resolving '%s'"
+msgstr "Produciuse un erro ao resolver: Â%sÂ"
+
+#: ../mail/e-mail-autoconfig.c:264
+#, c-format
+msgid "No authoritative name server for '%s'"
+msgstr "Non hai ningÃn servidor autoritativo para Â%sÂ"
+
+#: ../mail/e-mail-autoconfig.c:661
+msgid "No email address provided"
+msgstr "Non se forneceu ningÃn enderezo de correo"
+
+#: ../mail/e-mail-autoconfig.c:670
+msgid "Missing domain in email address"
+msgstr "Falta o dominio no enderezo de correo"
+
+#: ../mail/e-mail-backend.c:716
 msgid "Unknown background operation"
 msgstr "OperaciÃn en segundo plano descoÃecida"
 
-#: ../mail/e-mail-browser.c:132 ../shell/e-shell-window-actions.c:1440
-#: ../shell/e-shell-window-actions.c:1447
-#: ../shell/e-shell-window-actions.c:1454
+#: ../mail/e-mail-browser.c:132 ../shell/e-shell-window-actions.c:1418
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1432
 msgid "Close this window"
 msgstr "Pechar esta xanela"
 
@@ -11520,102 +11249,450 @@ msgstr "Pechar esta xanela"
 msgid "(No Subject)"
 msgstr "(Sen asunto)"
 
-#: ../mail/e-mail-display.c:112
-msgid "_Add to Address Book..."
-msgstr "Eng_adir à axenda de enderezosâ"
+#: ../mail/e-mail-config-assistant.c:502
+msgid "Evolution Account Assistant"
+msgstr "Asistente de contas do Evolution"
 
-#: ../mail/e-mail-display.c:119
-msgid "_To This Address"
-msgstr "A es_te enderezo"
+#: ../mail/e-mail-config-auth-check.c:346
+msgid "Check for Supported Types"
+msgstr "Comprobar tipos admitidos"
 
-#: ../mail/e-mail-display.c:126
-msgid "_From This Address"
-msgstr "_Desde este enderezo"
+#: ../mail/e-mail-config-confirm-page.c:157
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"ParabÃns, concluÃu a configuraciÃn do correo.\n"
+"\n"
+"Agora està preparado para enviar e recibir correo \n"
+"usando o Evolution. \n"
+"\n"
+"Prema en ÂAplicar para gardar os axustes."
 
-#: ../mail/e-mail-display.c:133
-msgid "Send _Reply To..."
-msgstr "Enviar _resposta aâ"
+#: ../mail/e-mail-config-confirm-page.c:169
+msgid "Done"
+msgstr "Feito"
 
-#: ../mail/e-mail-display.c:135
-msgid "Send a reply message to this address"
-msgstr "Enviar unha mensaxe de resposta a este enderezo"
+#: ../mail/e-mail-config-defaults-page.c:527
+msgid "Special Folders"
+msgstr "Cartafoles especiais"
 
-#: ../mail/e-mail-display.c:142
-msgid "Create Search _Folder"
-msgstr "Crear un carta_fol de busca"
+#: ../mail/e-mail-config-defaults-page.c:536
+msgid "Draft Messages _Folder:"
+msgstr "Cartafol das _mensaxes enviadas:"
 
-#: ../mail/e-mail-display.c:152
-msgid "Save _Image..."
-msgstr "Gardar _imaxeâ"
+#: ../mail/e-mail-config-defaults-page.c:546
+msgid "Choose a folder for saving draft messages."
+msgstr "Seleccione un cartafol no que gardar os borradores."
 
-#: ../mail/e-mail-display.c:154
-msgid "Save the image to a file"
-msgstr "Gardar a imaxe a un ficheiro"
+#: ../mail/e-mail-config-defaults-page.c:560
+msgid "Sent _Messages Folder:"
+msgstr "Cartafol das _mensaxes enviadas:"
 
-#. Label + combo box has a 12px left margin so it's
-#. * aligned with the junk mail options above it.
-#: ../mail/e-mail-junk-options.c:252
-msgid "Junk filtering software:"
-msgstr "Software de filtrado de SPAM:"
+#: ../mail/e-mail-config-defaults-page.c:570
+msgid "Choose a folder for saving sent messages."
+msgstr "Seleccione un cartafol no que gardar os mensaxes enviados."
 
-#: ../mail/e-mail-label-dialog.c:225
-msgid "_Label name:"
-msgstr "_Nome da etiqueta:"
+#: ../mail/e-mail-config-defaults-page.c:584
+msgid "_Restore Defaults"
+msgstr "_Restaurar valores predeterminados"
 
-#: ../mail/e-mail-label-list-store.c:49
-msgid "I_mportant"
-msgstr "I_mportante"
+#: ../mail/e-mail-config-defaults-page.c:598
+msgid "Use a Real Folder for _Trash:"
+msgstr "Usar un cartafol real para o _Lixo:"
 
-#. red
-#: ../mail/e-mail-label-list-store.c:50
-msgid "_Work"
-msgstr "_Traballo"
+#: ../mail/e-mail-config-defaults-page.c:599
+msgid "Choose a folder for deleted messages."
+msgstr "Seleccione un cartafol no que gardar as mensaxes eliminadas."
 
-#. orange
-#: ../mail/e-mail-label-list-store.c:51
-msgid "_Personal"
-msgstr "_Persoal"
+#: ../mail/e-mail-config-defaults-page.c:608
+msgid "Use a Real Folder for _Junk:"
+msgstr "Usar un cartafol real para o _lixo:"
 
-#. green
-#: ../mail/e-mail-label-list-store.c:52
-msgid "_To Do"
-msgstr "_Tarefas pendentes"
+#: ../mail/e-mail-config-defaults-page.c:609
+msgid "Choose a folder for junk messages."
+msgstr "Seleccione un cartafol para o spam."
 
-#. blue
-#: ../mail/e-mail-label-list-store.c:53
-msgid "_Later"
-msgstr "_MÃis tarde"
+#: ../mail/e-mail-config-defaults-page.c:626
+msgid "Composing Messages"
+msgstr "Escribir unha mensaxe"
 
-#: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:737
-msgid "Add Label"
-msgstr "Engadir unha etiqueta"
+#: ../mail/e-mail-config-defaults-page.c:635
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Enviar _sempre unha copia de carbÃn (Cc) a:"
 
-#: ../mail/e-mail-label-manager.c:221
-msgid "Edit Label"
-msgstr "Editar a etiqueta"
+#: ../mail/e-mail-config-defaults-page.c:660
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Enviar sempre unha copia de carbÃn _oculta (Cco) a:"
 
-#: ../mail/e-mail-label-manager.c:353
-msgid ""
-"Note: Underscore in the label name is used\n"
-"as mnemonic identifier in menu."
-msgstr ""
-"Nota: o subliÃado do nome da etiqueta emprÃgase\n"
-"como identificador mnemotÃcnico no menÃ."
+#: ../mail/e-mail-config-defaults-page.c:695
+msgid "Message Receipts"
+msgstr "ConfirmaciÃns de lectura das mensaxes"
 
-#: ../mail/e-mail-label-tree-view.c:89
+#: ../mail/e-mail-config-defaults-page.c:704
+msgid "S_end message receipts:"
+msgstr "_Enviar as confirmaciÃns de lectura das mensaxes:"
+
+#: ../mail/e-mail-config-defaults-page.c:735
+msgid "Always"
+msgstr "Sempre"
+
+#: ../mail/e-mail-config-defaults-page.c:741
+msgid "Ask for each message"
+msgstr "Preguntar para cada mensaxe"
+
+#: ../mail/e-mail-config-identity-page.c:254
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"Introduza o seu nome e enderezo de correo. Os campos Âopcionais non "
+"necesitan encherse, a non ser que desexe incluÃr esta informaciÃn no correo "
+"que envÃe."
+
+#: ../mail/e-mail-config-identity-page.c:282
+#: ../mail/e-mail-config-summary-page.c:353
+msgid "Account Information"
+msgstr "InformaciÃn da conta"
+
+#: ../mail/e-mail-config-identity-page.c:291
+#: ../mail/e-mail-config-summary-page.c:362
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example, \"Work\" or \"Personal\"."
+msgstr ""
+"Escriba o nome polo que quere identificar esta conta.\n"
+"Por exemplo: ÂTraballo ou ÂPersoalÂ"
+
+#: ../mail/e-mail-config-identity-page.c:299
+#: ../mail/e-mail-config-summary-page.c:370
+#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
+#: ../widgets/misc/e-mail-signature-script-dialog.c:417
+msgid "_Name:"
+msgstr "_Nome:"
+
+#: ../mail/e-mail-config-identity-page.c:336
+msgid "Required Information"
+msgstr "InformaciÃn solicitada"
+
+#: ../mail/e-mail-config-identity-page.c:345
+msgid "Full Nam_e:"
+msgstr "Nom_e completo:"
+
+#: ../mail/e-mail-config-identity-page.c:372
+msgid "Email _Address:"
+msgstr "_Enderezo de correo:"
+
+#: ../mail/e-mail-config-identity-page.c:409
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
+msgid "Optional Information"
+msgstr "InformaciÃn opcional"
+
+#: ../mail/e-mail-config-identity-page.c:417
+msgid "Re_ply-To:"
+msgstr "Res_ponder a:"
+
+#: ../mail/e-mail-config-identity-page.c:444
+msgid "Or_ganization:"
+msgstr "Organi_zaciÃn:"
+
+#: ../mail/e-mail-config-identity-page.c:499
+msgid "Add Ne_w Signature..."
+msgstr "Engadir unha sinatura _novaâ"
+
+#: ../mail/e-mail-config-lookup-page.c:68
+#, fuzzy
+msgid "Looking up account details..."
+msgstr "Cargando contasâ"
+
+#: ../mail/e-mail-config-provider-page.c:712
+msgid "Receiving Options"
+msgstr "OpciÃns de recepciÃn"
+
+#: ../mail/e-mail-config-receiving-page.c:50
+msgid "Receiving Email"
+msgstr "RecepciÃn de correo"
+
+#: ../mail/e-mail-config-security-page.c:260
+#: ../mail/em-folder-properties.c:257 ../mail/mail-config.ui.h:19
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../plugins/itip-formatter/itip-formatter.c:3438
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+#: ../smime/gui/smime-ui.ui.h:21
+msgid "General"
+msgstr "Xeral"
+
+#: ../mail/e-mail-config-security-page.c:268
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr ""
+"Non asinar as solicitudes _de reuniÃn (para a compatibilidade co Outlook)"
+
+#: ../mail/e-mail-config-security-page.c:290
+#, fuzzy
+msgid "Pretty Good Privacy (OpenPGP)"
+msgstr "Pretty Good Privacy (PGP/GPG)"
+
+#: ../mail/e-mail-config-security-page.c:298
+#, fuzzy
+msgid "OpenPGP _Key ID:"
+msgstr "ID da _chave PGP/GPG:"
+
+#: ../mail/e-mail-config-security-page.c:320
+msgid "Si_gning algorithm:"
+msgstr "Algoritmo da si_natura:"
+
+#: ../mail/e-mail-config-security-page.c:336
+#: ../mail/e-mail-config-security-page.c:475 ../mail/mail-config.ui.h:45
+msgid "SHA1"
+msgstr "SHA1"
+
+#: ../mail/e-mail-config-security-page.c:339
+#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:46
+msgid "SHA256"
+msgstr "SHA256"
+
+#: ../mail/e-mail-config-security-page.c:342
+#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:47
+msgid "SHA384"
+msgstr "SHA384"
+
+#: ../mail/e-mail-config-security-page.c:345
+#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:48
+msgid "SHA512"
+msgstr "SHA512"
+
+#: ../mail/e-mail-config-security-page.c:361
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr "Asinar sem_pre as mensaxes saÃntes cando se use esta conta"
+
+#: ../mail/e-mail-config-security-page.c:373
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr "Cifrar sempre para min _mesmo ao enviar correo cifrado"
+
+#: ../mail/e-mail-config-security-page.c:385
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr "Confia_r sempre nas chaves do meu anel de chaves ao cifrar"
+
+#: ../mail/e-mail-config-security-page.c:409
+msgid "Secure MIME (S/MIME)"
+msgstr "MIME seguro (S/MIME)"
+
+#: ../mail/e-mail-config-security-page.c:417
+msgid "Sig_ning certificate:"
+msgstr "Certificado de si_natura:"
+
+#: ../mail/e-mail-config-security-page.c:441
+#: ../mail/e-mail-config-security-page.c:547
+#, fuzzy
+msgid "Select"
+msgstr "Seleccionarâ"
+
+#: ../mail/e-mail-config-security-page.c:459
+msgid "Signing _algorithm:"
+msgstr "_Algoritmo da sinatura:"
+
+#: ../mail/e-mail-config-security-page.c:500
+#, fuzzy
+msgid "Always sign outgoing messages when using this account"
+msgstr "Asinar sem_pre as mensaxes saÃntes cando se use esta conta"
+
+#: ../mail/e-mail-config-security-page.c:523
+#, fuzzy
+msgid "Encryption certificate:"
+msgstr "Certificado de ci_frado:"
+
+#: ../mail/e-mail-config-security-page.c:565
+#, fuzzy
+msgid "Always encrypt outgoing messages when using this account"
+msgstr "Asinar sem_pre as mensaxes saÃntes cando se use esta conta"
+
+#: ../mail/e-mail-config-security-page.c:585
+#, fuzzy
+msgid "Always encrypt to myself when sending encrypted messages"
+msgstr "Cifrar sempre para min _mesmo ao enviar correo cifrado"
+
+#. Add encryption/signature header
+#: ../mail/e-mail-config-security-page.c:642
+#: ../mail/em-format-html-print.c:187
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:207
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:130
+msgid "Security"
+msgstr "Seguranza"
+
+#: ../mail/e-mail-config-sending-page.c:50
+msgid "Sending Email"
+msgstr "EnvÃo de correo"
+
+#: ../mail/e-mail-config-service-page.c:681
+msgid "Server _Type:"
+msgstr "_Tipo de servidor:"
+
+#: ../mail/e-mail-config-summary-page.c:144
+msgid "SSL"
+msgstr "SSL"
+
+#: ../mail/e-mail-config-summary-page.c:147
+msgid "TLS"
+msgstr "TLS"
+
+#: ../mail/e-mail-config-summary-page.c:336
+msgid ""
+"This is a summary of the settings which will be used to access your mail."
+msgstr ""
+"Este à un resumo da configuraciÃn que se empregarÃn para acceder ao seu "
+"correo."
+
+#: ../mail/e-mail-config-summary-page.c:407
+msgid "Personal Details"
+msgstr "Detalles persoais"
+
+#: ../mail/e-mail-config-summary-page.c:416
+msgid "Full Name:"
+msgstr "Nome completo"
+
+#: ../mail/e-mail-config-summary-page.c:430
+msgid "Email Address:"
+msgstr "Enderezo de correo"
+
+#: ../mail/e-mail-config-summary-page.c:468
+msgid "Server Type:"
+msgstr "Tipo de servidor:"
+
+#: ../mail/e-mail-config-summary-page.c:489
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:602
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:237
+msgid "Server:"
+msgstr "Servidor:"
+
+#: ../mail/e-mail-config-summary-page.c:531
+msgid "Security:"
+msgstr "Seguranza:"
+
+#: ../mail/e-mail-config-summary-page.c:835
+msgid "Account Summary"
+msgstr "Resumo da conta"
+
+#: ../mail/e-mail-config-welcome-page.c:157
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+"DÃmoslle a benvida ao Asistente de ConfiguraciÃn de Correo do Evolution.\n"
+"\n"
+"Prema en ÂContinuar para comezar."
+
+#: ../mail/e-mail-config-welcome-page.c:167
+#: ../modules/startup-wizard/e-startup-assistant.c:150
+msgid "Welcome"
+msgstr "Benvido/a"
+
+#: ../mail/e-mail-config-window.c:321
+msgid "Account Editor"
+msgstr "Editor de contas"
+
+#: ../mail/e-mail-display.c:112
+msgid "_Add to Address Book..."
+msgstr "Eng_adir à axenda de enderezosâ"
+
+#: ../mail/e-mail-display.c:119
+msgid "_To This Address"
+msgstr "A es_te enderezo"
+
+#: ../mail/e-mail-display.c:126
+msgid "_From This Address"
+msgstr "_Desde este enderezo"
+
+#: ../mail/e-mail-display.c:133
+msgid "Send _Reply To..."
+msgstr "Enviar _resposta aâ"
+
+#: ../mail/e-mail-display.c:135
+msgid "Send a reply message to this address"
+msgstr "Enviar unha mensaxe de resposta a este enderezo"
+
+#: ../mail/e-mail-display.c:142
+msgid "Create Search _Folder"
+msgstr "Crear un carta_fol de busca"
+
+#: ../mail/e-mail-display.c:152
+msgid "Save _Image..."
+msgstr "Gardar _imaxeâ"
+
+#: ../mail/e-mail-display.c:154
+msgid "Save the image to a file"
+msgstr "Gardar a imaxe a un ficheiro"
+
+#. Label + combo box has a 12px left margin so it's
+#. * aligned with the junk mail options above it.
+#: ../mail/e-mail-junk-options.c:252
+msgid "Junk filtering software:"
+msgstr "Software de filtrado de SPAM:"
+
+#: ../mail/e-mail-label-dialog.c:225
+msgid "_Label name:"
+msgstr "_Nome da etiqueta:"
+
+#: ../mail/e-mail-label-list-store.c:49
+msgid "I_mportant"
+msgstr "I_mportante"
+
+#. red
+#: ../mail/e-mail-label-list-store.c:50
+msgid "_Work"
+msgstr "_Traballo"
+
+#. orange
+#: ../mail/e-mail-label-list-store.c:51
+msgid "_Personal"
+msgstr "_Persoal"
+
+#. green
+#: ../mail/e-mail-label-list-store.c:52
+msgid "_To Do"
+msgstr "_Tarefas pendentes"
+
+#. blue
+#: ../mail/e-mail-label-list-store.c:53
+msgid "_Later"
+msgstr "_MÃis tarde"
+
+#: ../mail/e-mail-label-manager.c:170
+#: ../modules/mail/e-mail-shell-view-actions.c:745
+msgid "Add Label"
+msgstr "Engadir unha etiqueta"
+
+#: ../mail/e-mail-label-manager.c:221
+msgid "Edit Label"
+msgstr "Editar a etiqueta"
+
+#: ../mail/e-mail-label-manager.c:353
+msgid ""
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
+msgstr ""
+"Nota: o subliÃado do nome da etiqueta emprÃgase\n"
+"como identificador mnemotÃcnico no menÃ."
+
+#: ../mail/e-mail-label-tree-view.c:89
 msgid "Color"
 msgstr "Cor"
 
 #: ../mail/e-mail-label-tree-view.c:99 ../mail/em-format-html-print.c:83
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1236
+#: ../modules/cal-config-google/e-google-chooser.c:209
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../plugins/caldav/caldav-browse-server.c:1360
 #: ../widgets/menus/gal-define-views-dialog.c:352
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
 msgid "Name"
 msgstr "Nome"
 
-#: ../mail/e-mail-migrate.c:1272
+#: ../mail/e-mail-migrate.c:854
 #, 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"
@@ -11630,8 +11707,8 @@ msgid "Page %d of %d"
 msgstr "PÃxina %d de %d"
 
 #: ../mail/e-mail-printer.c:530
-#: ../modules/calendar/e-cal-shell-view-actions.c:239
-#: ../modules/calendar/e-cal-shell-view-actions.c:268
+#: ../modules/calendar/e-cal-shell-view-actions.c:216
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
 msgid "Print"
 msgstr "Imprimir"
 
@@ -11643,648 +11720,648 @@ msgstr "Nome da cabeceira:"
 msgid "Header Value"
 msgstr "Valor da cabecera"
 
-#: ../mail/e-mail-printer.c:590 ../mail/mail-config.ui.h:107
+#: ../mail/e-mail-printer.c:590 ../mail/mail-config.ui.h:100
 msgid "Headers"
 msgstr "Cabeceiras"
 
-#: ../mail/e-mail-reader.c:353
+#: ../mail/e-mail-reader.c:352
 msgid "Save Image"
 msgstr "Gardar imaxe"
 
-#: ../mail/e-mail-reader.c:438 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:437 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copiar ao cartafol"
 
-#: ../mail/e-mail-reader.c:438 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:437 ../mail/em-folder-utils.c:488
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: ../mail/e-mail-reader.c:965 ../mail/em-filter-i18n.h:53
+#: ../mail/e-mail-reader.c:971 ../mail/em-filter-i18n.h:53
 msgid "Move to Folder"
 msgstr "Mover ao cartafol"
 
-#: ../mail/e-mail-reader.c:965 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:971 ../mail/em-folder-utils.c:488
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../mail/e-mail-reader.c:1326 ../mail/e-mail-reader.c:1508
-#: ../mail/e-mail-reader.c:1548
+#: ../mail/e-mail-reader.c:1332 ../mail/e-mail-reader.c:1514
+#: ../mail/e-mail-reader.c:1554
 msgid "_Do not ask me again."
 msgstr "_Non preguntar de novo."
 
-#: ../mail/e-mail-reader.c:1554
+#: ../mail/e-mail-reader.c:1560
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Ignorar sempre ÂResponder a:Â para as listas de correo."
 
-#: ../mail/e-mail-reader.c:1738
+#: ../mail/e-mail-reader.c:1744
 msgid "Failed to retrieve message:"
 msgstr "Produciuse un fallo ao obter a mensaxe:"
 
-#: ../mail/e-mail-reader.c:1784 ../mail/e-mail-reader.c:2873
+#: ../mail/e-mail-reader.c:1790 ../mail/e-mail-reader.c:2879
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Recuperando a mensaxe Â%sÂ"
 
-#: ../mail/e-mail-reader.c:1960
+#: ../mail/e-mail-reader.c:1966
 msgid "A_dd Sender to Address Book"
 msgstr "Enga_dir o remitente à axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1962
+#: ../mail/e-mail-reader.c:1968
 msgid "Add sender to address book"
 msgstr "Engadir o remitente à axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:1973
 msgid "Check for _Junk"
 msgstr "Comprobar se hai correo li_xo"
 
-#: ../mail/e-mail-reader.c:1969
+#: ../mail/e-mail-reader.c:1975
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrar as mensaxes seleccionadas polo estado de correo lixo"
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:1980
 msgid "_Copy to Folder..."
 msgstr "_Copiar ao cartafolâ"
 
-#: ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:1982
 msgid "Copy selected messages to another folder"
 msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:1987
 msgid "_Delete Message"
 msgstr "E_liminar a mensaxe"
 
-#: ../mail/e-mail-reader.c:1983
+#: ../mail/e-mail-reader.c:1989
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar as mensaxes seleccionadas para eliminalas"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:1994
 msgid "Filter on Mailing _List..."
 msgstr "Filtrar pola _lista de correoâ"
 
-#: ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:1996
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Crear unha regra para filtrar as mensaxes a esta lista de correo"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:2001
 msgid "Filter on _Recipients..."
 msgstr "Filtrar polos _destinatariosâ"
 
-#: ../mail/e-mail-reader.c:1997
+#: ../mail/e-mail-reader.c:2003
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Crear unha regra para filtrar as mensaxes a estes destinatarios"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2008
 msgid "Filter on Se_nder..."
 msgstr "Filtrar polo re_mitenteâ"
 
-#: ../mail/e-mail-reader.c:2004
+#: ../mail/e-mail-reader.c:2010
 msgid "Create a rule to filter messages from this sender"
 msgstr "Crear unha regra para filtrar as mensaxes deste remitente"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:2015
 msgid "Filter on _Subject..."
 msgstr "Filtrar polo a_suntoâ"
 
-#: ../mail/e-mail-reader.c:2011
+#: ../mail/e-mail-reader.c:2017
 msgid "Create a rule to filter messages with this subject"
 msgstr "Crear unha regra para filtrar as mensaxes con este asunto"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:2022
 msgid "A_pply Filters"
 msgstr "_Aplicar os filtros"
 
-#: ../mail/e-mail-reader.c:2018
+#: ../mail/e-mail-reader.c:2024
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplicar as regras de filtrado Ãs mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:2029
 msgid "_Find in Message..."
 msgstr "_Buscar na mensaxeâ"
 
-#: ../mail/e-mail-reader.c:2025
+#: ../mail/e-mail-reader.c:2031
 msgid "Search for text in the body of the displayed message"
 msgstr "Buscar un texto no corpo da mensaxe mostrada"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:2036
 msgid "_Clear Flag"
 msgstr "E_liminar a marca"
 
-#: ../mail/e-mail-reader.c:2032
+#: ../mail/e-mail-reader.c:2038
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Eliminar as marcas de seguimento das mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2043
 msgid "_Flag Completed"
 msgstr "_Marcar como completado"
 
-#: ../mail/e-mail-reader.c:2039
+#: ../mail/e-mail-reader.c:2045
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr ""
 "Estabelecer a marca de seguimento como completada nas mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2050
 msgid "Follow _Up..."
 msgstr "Seguimentoâ"
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:2052
 msgid "Flag the selected messages for follow-up"
 msgstr "Marcar as mensaxes seleccionadas para o seguimento"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:2057
 msgid "_Attached"
 msgstr "_Anexada"
 
-#: ../mail/e-mail-reader.c:2053 ../mail/e-mail-reader.c:2060
+#: ../mail/e-mail-reader.c:2059 ../mail/e-mail-reader.c:2066
 msgid "Forward the selected message to someone as an attachment"
 msgstr "ReencamiÃar a mensaxe seleccionada como un anexo"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2064
 msgid "Forward As _Attached"
 msgstr "ReencamiÃar como un _anexo"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2071
 msgid "_Inline"
 msgstr "_Inserida"
 
-#: ../mail/e-mail-reader.c:2067 ../mail/e-mail-reader.c:2074
+#: ../mail/e-mail-reader.c:2073 ../mail/e-mail-reader.c:2080
 msgid "Forward the selected message in the body of a new message"
 msgstr "ReencamiÃar a mensaxe seleccionada no corpo dunha mensaxe nova"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2078
 msgid "Forward As _Inline"
 msgstr "ReencamiÃar _inserida"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2085
 msgid "_Quoted"
 msgstr "_Citada"
 
-#: ../mail/e-mail-reader.c:2081 ../mail/e-mail-reader.c:2088
+#: ../mail/e-mail-reader.c:2087 ../mail/e-mail-reader.c:2094
 msgid "Forward the selected message quoted like a reply"
 msgstr "ReencamiÃar a mensaxe seleccionada citada como unha resposta"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:2092
 msgid "Forward As _Quoted"
 msgstr "ReencamiÃar _citada"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2099
 msgid "_Load Images"
 msgstr "_Cargar as imaxes"
 
-#: ../mail/e-mail-reader.c:2095
+#: ../mail/e-mail-reader.c:2101
 msgid "Force images in HTML mail to be loaded"
 msgstr "Forzar a carga de imaxes no correo HTML"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:2106
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../mail/e-mail-reader.c:2102
+#: ../mail/e-mail-reader.c:2108
 msgid "Mark the selected messages as important"
 msgstr "Marcar as mensaxes seleccionadas como importantes"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2113
 msgid "_Junk"
 msgstr "_Correo lixo"
 
-#: ../mail/e-mail-reader.c:2109
+#: ../mail/e-mail-reader.c:2115
 msgid "Mark the selected messages as junk"
 msgstr "Marcar as mensaxes seleccionadas como correo lixo"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2120
 msgid "_Not Junk"
 msgstr "_Non à correo lixo"
 
-#: ../mail/e-mail-reader.c:2116
+#: ../mail/e-mail-reader.c:2122
 msgid "Mark the selected messages as not being junk"
 msgstr "Marcar as mensaxes seleccionadas como non lixo"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2127
 msgid "_Read"
 msgstr "_Lida"
 
-#: ../mail/e-mail-reader.c:2123
+#: ../mail/e-mail-reader.c:2129
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar as mensaxes seleccionadas como lidas"
 
-#: ../mail/e-mail-reader.c:2128
+#: ../mail/e-mail-reader.c:2134
 msgid "Uni_mportant"
 msgstr "Non i_mportante"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../mail/e-mail-reader.c:2136
 msgid "Mark the selected messages as unimportant"
 msgstr "Marcar as mensaxes seleccionadas como non importantes"
 
-#: ../mail/e-mail-reader.c:2135
+#: ../mail/e-mail-reader.c:2141
 msgid "_Unread"
 msgstr "_Sen ler"
 
-#: ../mail/e-mail-reader.c:2137
+#: ../mail/e-mail-reader.c:2143
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar as mensaxes seleccionadas como non lidas"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2148
 msgid "_Edit as New Message..."
 msgstr "_Editar como unha mensaxe novaâ"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2150
 msgid "Open the selected messages in the composer for editing"
 msgstr "Abrir as mensaxes seleccionadas no editor para editalas"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2155
 msgid "Compose _New Message"
 msgstr "Redactar unha mensaxe _nova"
 
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2157
 msgid "Open a window for composing a mail message"
 msgstr "Abrir unha xanela para escribir unha mensaxe de correo"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2162
 msgid "_Open in New Window"
 msgstr "Abrir nunha xanela n_ova"
 
-#: ../mail/e-mail-reader.c:2158
+#: ../mail/e-mail-reader.c:2164
 msgid "Open the selected messages in a new window"
 msgstr "Abrir as mensaxes seleccionadas nunha xanela nova"
 
-#: ../mail/e-mail-reader.c:2163
+#: ../mail/e-mail-reader.c:2169
 msgid "_Move to Folder..."
 msgstr "_Mover ao cartafolâ"
 
-#: ../mail/e-mail-reader.c:2165
+#: ../mail/e-mail-reader.c:2171
 msgid "Move selected messages to another folder"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:2170
+#: ../mail/e-mail-reader.c:2176
 msgid "_Switch to Folder"
 msgstr "_Cambiar ao cartafol"
 
-#: ../mail/e-mail-reader.c:2172
+#: ../mail/e-mail-reader.c:2178
 msgid "Display the parent folder"
 msgstr "Mostrar o cartafol pai"
 
-#: ../mail/e-mail-reader.c:2177
+#: ../mail/e-mail-reader.c:2183
 msgid "Switch to _next tab"
 msgstr "Cambiar à lapela segui_nte"
 
-#: ../mail/e-mail-reader.c:2179
+#: ../mail/e-mail-reader.c:2185
 msgid "Switch to the next tab"
 msgstr "Cambiar à lapela seguinte"
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2190
 msgid "Switch to _previous tab"
 msgstr "Cambiar à lapela a_nterior"
 
-#: ../mail/e-mail-reader.c:2186
+#: ../mail/e-mail-reader.c:2192
 msgid "Switch to the previous tab"
 msgstr "Cambiar à lapela anterior"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2197
 msgid "Cl_ose current tab"
 msgstr "Pe_char a lapela actual"
 
-#: ../mail/e-mail-reader.c:2193
+#: ../mail/e-mail-reader.c:2199
 msgid "Close current tab"
 msgstr "Pechar a lapela actual"
 
-#: ../mail/e-mail-reader.c:2198
+#: ../mail/e-mail-reader.c:2204
 msgid "_Next Message"
 msgstr "Segui_nte mensaxe"
 
-#: ../mail/e-mail-reader.c:2200
+#: ../mail/e-mail-reader.c:2206
 msgid "Display the next message"
 msgstr "Mostrar a seguinte mensaxe"
 
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2211
 msgid "Next _Important Message"
 msgstr "Seguinte mensaxe _importante"
 
-#: ../mail/e-mail-reader.c:2207
+#: ../mail/e-mail-reader.c:2213
 msgid "Display the next important message"
 msgstr "Mostrar a seguinte mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2212
+#: ../mail/e-mail-reader.c:2218
 msgid "Next _Thread"
 msgstr "Seguin_te conversa"
 
-#: ../mail/e-mail-reader.c:2214
+#: ../mail/e-mail-reader.c:2220
 msgid "Display the next thread"
 msgstr "Mostrar a seguinte conversa"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2225
 msgid "Next _Unread Message"
 msgstr "Seguinte mensaxe _sen ler"
 
-#: ../mail/e-mail-reader.c:2221
+#: ../mail/e-mail-reader.c:2227
 msgid "Display the next unread message"
 msgstr "Mostrar a seguinte mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:2226
+#: ../mail/e-mail-reader.c:2232
 msgid "_Previous Message"
 msgstr "_Mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:2228
+#: ../mail/e-mail-reader.c:2234
 msgid "Display the previous message"
 msgstr "Mostrar a mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:2233
+#: ../mail/e-mail-reader.c:2239
 msgid "Pr_evious Important Message"
 msgstr "Ant_erior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2235
+#: ../mail/e-mail-reader.c:2241
 msgid "Display the previous important message"
 msgstr "Mostrar a anterior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2240
+#: ../mail/e-mail-reader.c:2246
 msgid "Previous T_hread"
 msgstr "_Conversa anterior"
 
-#: ../mail/e-mail-reader.c:2242
+#: ../mail/e-mail-reader.c:2248
 msgid "Display the previous thread"
 msgstr "Mostrar a conversa anterior"
 
-#: ../mail/e-mail-reader.c:2247
+#: ../mail/e-mail-reader.c:2253
 msgid "P_revious Unread Message"
 msgstr "Ante_rior mensaxe sen ler"
 
-#: ../mail/e-mail-reader.c:2249
+#: ../mail/e-mail-reader.c:2255
 msgid "Display the previous unread message"
 msgstr "Mostrar a anterior mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:2256
+#: ../mail/e-mail-reader.c:2262
 msgid "Print this message"
 msgstr "Imprimir esta mensaxe"
 
-#: ../mail/e-mail-reader.c:2263
+#: ../mail/e-mail-reader.c:2269
 msgid "Preview the message to be printed"
 msgstr "Previsualizar a mensaxe que se vai imprimir"
 
-#: ../mail/e-mail-reader.c:2268
+#: ../mail/e-mail-reader.c:2274
 msgid "Re_direct"
 msgstr "Re_direccionar"
 
-#: ../mail/e-mail-reader.c:2270
+#: ../mail/e-mail-reader.c:2276
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redireccionar a alguÃn a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2275
+#: ../mail/e-mail-reader.c:2281
 msgid "Remo_ve Attachments"
 msgstr "Eliminar os _anexos"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../mail/e-mail-reader.c:2283
 msgid "Remove attachments"
 msgstr "Eliminar os anexos"
 
-#: ../mail/e-mail-reader.c:2282
+#: ../mail/e-mail-reader.c:2288
 msgid "Remove Du_plicate Messages"
 msgstr "Eliminar as mensaxes du_plicadas"
 
-#: ../mail/e-mail-reader.c:2284
+#: ../mail/e-mail-reader.c:2290
 msgid "Checks selected messages for duplicates"
 msgstr "Comprobar se hai mensaxes seleccionadas que estean duplicadas"
 
-#: ../mail/e-mail-reader.c:2289 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1567
+#: ../mail/e-mail-reader.c:2295 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
 #: ../modules/mail/e-mail-attachment-handler.c:182
 msgid "Reply to _All"
 msgstr "Responder a t_odos"
 
-#: ../mail/e-mail-reader.c:2291
+#: ../mail/e-mail-reader.c:2297
 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:2296 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2302 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Responder à _lista"
 
-#: ../mail/e-mail-reader.c:2298
+#: ../mail/e-mail-reader.c:2304
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Responder à rolda de correo remitente da mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2303
+#: ../mail/e-mail-reader.c:2309
 #: ../modules/mail/e-mail-attachment-handler.c:189
 msgid "_Reply to Sender"
 msgstr "_Responder ao remitente"
 
-#: ../mail/e-mail-reader.c:2305
+#: ../mail/e-mail-reader.c:2311
 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:2310
+#: ../mail/e-mail-reader.c:2316
 msgid "_Save as mbox..."
 msgstr "Gardar como mboxâ"
 
-#: ../mail/e-mail-reader.c:2312
+#: ../mail/e-mail-reader.c:2318
 msgid "Save selected messages as an mbox file"
 msgstr "Gardar as mensaxes seleccionadas como un ficheiro mbox"
 
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2323
 msgid "_Message Source"
 msgstr "Fonte da _mensaxe"
 
-#: ../mail/e-mail-reader.c:2319
+#: ../mail/e-mail-reader.c:2325
 msgid "Show the raw email source of the message"
 msgstr "Mostrar a fonte en bruto da mensaxe"
 
-#: ../mail/e-mail-reader.c:2331
+#: ../mail/e-mail-reader.c:2337
 msgid "_Undelete Message"
 msgstr "_Recuperar a mensaxe"
 
-#: ../mail/e-mail-reader.c:2333
+#: ../mail/e-mail-reader.c:2339
 msgid "Undelete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:2338
+#: ../mail/e-mail-reader.c:2344
 msgid "_Normal Size"
 msgstr "TamaÃo _normal"
 
-#: ../mail/e-mail-reader.c:2340
+#: ../mail/e-mail-reader.c:2346
 msgid "Reset the text to its original size"
 msgstr "Restabelecer o texto ao seu tamaÃo orixinal"
 
-#: ../mail/e-mail-reader.c:2345
+#: ../mail/e-mail-reader.c:2351
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:2347
+#: ../mail/e-mail-reader.c:2353
 msgid "Increase the text size"
 msgstr "Aumentar o tamaÃo do texto"
 
-#: ../mail/e-mail-reader.c:2352
+#: ../mail/e-mail-reader.c:2358
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
-#: ../mail/e-mail-reader.c:2354
+#: ../mail/e-mail-reader.c:2360
 msgid "Decrease the text size"
 msgstr "DiminuÃr o tamaÃo do texto"
 
-#: ../mail/e-mail-reader.c:2361
+#: ../mail/e-mail-reader.c:2367
 msgid "Create R_ule"
 msgstr "Crear unha r_egra"
 
-#: ../mail/e-mail-reader.c:2368
+#: ../mail/e-mail-reader.c:2374
 msgid "Ch_aracter Encoding"
 msgstr "CodificaciÃn de car_acteres"
 
-#: ../mail/e-mail-reader.c:2375
+#: ../mail/e-mail-reader.c:2381
 msgid "F_orward As"
 msgstr "ReencamiÃar c_omoâ"
 
-#: ../mail/e-mail-reader.c:2382
+#: ../mail/e-mail-reader.c:2388
 msgid "_Group Reply"
 msgstr "_Responder ao grupo"
 
-#: ../mail/e-mail-reader.c:2389
+#: ../mail/e-mail-reader.c:2395
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ../mail/e-mail-reader.c:2396
+#: ../mail/e-mail-reader.c:2402
 msgid "Mar_k As"
 msgstr "Mar_car como"
 
-#: ../mail/e-mail-reader.c:2403
+#: ../mail/e-mail-reader.c:2409
 msgid "_Message"
 msgstr "_Mensaxe"
 
-#: ../mail/e-mail-reader.c:2410
+#: ../mail/e-mail-reader.c:2416
 msgid "_Zoom"
 msgstr "A_mpliar"
 
-#: ../mail/e-mail-reader.c:2420
+#: ../mail/e-mail-reader.c:2426
 msgid "Search Folder from Mailing _List..."
 msgstr "Cartafol de busca por _lista de correoâ"
 
-#: ../mail/e-mail-reader.c:2422
+#: ../mail/e-mail-reader.c:2428
 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:2427
+#: ../mail/e-mail-reader.c:2433
 msgid "Search Folder from Recipien_ts..."
 msgstr "Cartafol de busca por des_tinatariosâ"
 
-#: ../mail/e-mail-reader.c:2429
+#: ../mail/e-mail-reader.c:2435
 msgid "Create a search folder for these recipients"
 msgstr "Crear un cartafol de busca para estes destinatarios"
 
-#: ../mail/e-mail-reader.c:2434
+#: ../mail/e-mail-reader.c:2440
 msgid "Search Folder from Sen_der..."
 msgstr "Cartafol de busca por _remitenteâ"
 
-#: ../mail/e-mail-reader.c:2436
+#: ../mail/e-mail-reader.c:2442
 msgid "Create a search folder for this sender"
 msgstr "Crear un cartafol de busca para este remitente"
 
-#: ../mail/e-mail-reader.c:2441
+#: ../mail/e-mail-reader.c:2447
 msgid "Search Folder from S_ubject..."
 msgstr "Cartafol de busca por as_untoâ"
 
-#: ../mail/e-mail-reader.c:2443
+#: ../mail/e-mail-reader.c:2449
 msgid "Create a search folder for this subject"
 msgstr "Crear un cartafol de busca para este asunto"
 
-#: ../mail/e-mail-reader.c:2466
+#: ../mail/e-mail-reader.c:2472
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para _seguimentoâ"
 
-#: ../mail/e-mail-reader.c:2474
+#: ../mail/e-mail-reader.c:2480
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/e-mail-reader.c:2478
+#: ../mail/e-mail-reader.c:2484
 msgid "Mark as _Junk"
 msgstr "Marcar como correo l_ixo"
 
-#: ../mail/e-mail-reader.c:2482
+#: ../mail/e-mail-reader.c:2488
 msgid "Mark as _Not Junk"
 msgstr "Desmarcar como correo lixo"
 
-#: ../mail/e-mail-reader.c:2486
+#: ../mail/e-mail-reader.c:2492
 msgid "Mar_k as Read"
 msgstr "Marcar como _lida"
 
-#: ../mail/e-mail-reader.c:2490
+#: ../mail/e-mail-reader.c:2496
 msgid "Mark as Uni_mportant"
 msgstr "Marcar como non im_portante"
 
-#: ../mail/e-mail-reader.c:2494
+#: ../mail/e-mail-reader.c:2500
 msgid "Mark as _Unread"
 msgstr "Marcar como _non lida"
 
-#: ../mail/e-mail-reader.c:2538
+#: ../mail/e-mail-reader.c:2544
 msgid "_Caret Mode"
 msgstr "Activar o _cursor"
 
-#: ../mail/e-mail-reader.c:2540
+#: ../mail/e-mail-reader.c:2546
 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:2546
+#: ../mail/e-mail-reader.c:2552
 msgid "All Message _Headers"
 msgstr "Todas as ca_beceiras da mensaxe"
 
-#: ../mail/e-mail-reader.c:2548
+#: ../mail/e-mail-reader.c:2554
 msgid "Show messages with all email headers"
 msgstr "Mostrar as mensaxes con todas as cabeceiras de correo electrÃnico"
 
-#: ../mail/e-mail-reader.c:2879
+#: ../mail/e-mail-reader.c:2885
 msgid "Retrieving message"
 msgstr "Descargando mensaxe"
 
-#: ../mail/e-mail-reader.c:3196
+#: ../mail/e-mail-reader.c:3205
 msgid "Parsing message"
 msgstr "Analizando mensaxe"
 
-#: ../mail/e-mail-reader.c:3901
+#: ../mail/e-mail-reader.c:3910
 #: ../modules/mail/e-mail-attachment-handler.c:175
 msgid "_Forward"
 msgstr "_ReencamiÃar"
 
-#: ../mail/e-mail-reader.c:3902
+#: ../mail/e-mail-reader.c:3911
 msgid "Forward the selected message to someone"
 msgstr "ReencamiÃar a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:3921
+#: ../mail/e-mail-reader.c:3930
 msgid "Group Reply"
 msgstr "Responder ao grupo"
 
-#: ../mail/e-mail-reader.c:3922
+#: ../mail/e-mail-reader.c:3931
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Responder à lista de correo ou a todos os destinatarios"
 
-#: ../mail/e-mail-reader.c:3979 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3988 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../mail/e-mail-reader.c:4012
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../mail/e-mail-reader.c:4021
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../mail/e-mail-reader.c:4016
-#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#: ../mail/e-mail-reader.c:4025
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:4025 ../mail/mail-dialogs.ui.h:20
+#: ../mail/e-mail-reader.c:4034 ../mail/mail-dialogs.ui.h:20
 msgid "Reply"
 msgstr "Responder"
 
-#: ../mail/e-mail-reader.c:4734
+#: ../mail/e-mail-reader.c:4767
 #, c-format
 msgid "Folder '%s'"
 msgstr "Cartafol Â%sÂ"
 
-#: ../mail/e-mail-reader-utils.c:147
+#: ../mail/e-mail-reader-utils.c:148
 msgid "Do not warn me again"
 msgstr "Non avisarme de novo."
 
-#: ../mail/e-mail-reader-utils.c:521
+#: ../mail/e-mail-reader-utils.c:527
 msgid "Printing"
 msgstr "Imprimindo"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:650
+#: ../mail/e-mail-reader-utils.c:656
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -12299,7 +12376,7 @@ msgstr[1] ""
 "O cartafol Â%s contÃn %u mensaxes duplicadas. Ten certeza de que quere "
 "eliminalas?"
 
-#: ../mail/e-mail-reader-utils.c:1033
+#: ../mail/e-mail-reader-utils.c:1039
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Gardar mensaxe"
@@ -12310,7 +12387,7 @@ msgstr[1] "Gardar mensaxes"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1054
+#: ../mail/e-mail-reader-utils.c:1060
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Mensaxe"
@@ -12329,7 +12406,7 @@ msgstr "Marcar para facer seguimento"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1255
+#: ../mail/em-composer-utils.c:1289
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -12337,23 +12414,23 @@ msgstr ""
 "O ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} Ãs ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribiu:"
 
-#: ../mail/em-composer-utils.c:1261
+#: ../mail/em-composer-utils.c:1295
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensaxe reencamiÃada --------"
 
-#: ../mail/em-composer-utils.c:1266
+#: ../mail/em-composer-utils.c:1300
 msgid "-----Original Message-----"
 msgstr "-----Mensaxe orixinal-----"
 
-#: ../mail/em-composer-utils.c:2500
+#: ../mail/em-composer-utils.c:2580
 msgid "an unknown sender"
 msgstr "un remitente descoÃecido"
 
-#: ../mail/em-composer-utils.c:2905
+#: ../mail/em-composer-utils.c:2998
 msgid "Posting destination"
 msgstr "Destino da publicaciÃn"
 
-#: ../mail/em-composer-utils.c:2906
+#: ../mail/em-composer-utils.c:2999
 msgid "Choose folders to post the message to."
 msgstr "Escolla os cartafoles nos que publicar a mensaxe."
 
@@ -12482,7 +12559,7 @@ msgstr "non està estabelecido"
 msgid "is set"
 msgstr "està estabelecido"
 
-#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:114
+#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:107
 msgid "Junk"
 msgstr "Correo lixo"
 
@@ -12702,11 +12779,11 @@ msgid "Cannot drop message(s) into toplevel store"
 msgstr "Non à posÃbel soltar as mensaxe(s) no almacenamento do nivel superior"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:157 ../mail/em-folder-tree-model.c:159
 msgid "UNMATCHED"
 msgstr "SEN COINCIDENCIAS"
 
-#: ../mail/em-folder-tree-model.c:775 ../mail/em-folder-tree-model.c:1060
+#: ../mail/em-folder-tree-model.c:844 ../mail/em-folder-tree-model.c:1129
 msgid "Loading..."
 msgstr "Cargandoâ"
 
@@ -12726,57 +12803,57 @@ msgstr "Crear un cartafol"
 msgid "Specify where to create the folder:"
 msgstr "Indicar onde crear o cartafol:"
 
-#: ../mail/em-format-html.c:385
+#: ../mail/em-format-html.c:383
 msgid "Malformed external-body part"
 msgstr "Parte externa ao corpo do mensaxe mal formado"
 
-#: ../mail/em-format-html.c:417
+#: ../mail/em-format-html.c:415
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro ao sitio FTP (%s)"
 
-#: ../mail/em-format-html.c:428
+#: ../mail/em-format-html.c:426
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Punteiro ao ficheiro local (%s) correcto no sitio Â%sÂ"
 
-#: ../mail/em-format-html.c:430
+#: ../mail/em-format-html.c:428
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro ao ficheiro local (%s)"
 
-#: ../mail/em-format-html.c:449
+#: ../mail/em-format-html.c:447
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro aos datos remotos (%s)"
 
-#: ../mail/em-format-html.c:462
+#: ../mail/em-format-html.c:460
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro aos datos externos descoÃecidos (tipo Â%sÂ)"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../mail/em-format-html.c:2571
+#: ../mail/em-format-html.c:2574
 #: ../plugins/mail-notification/mail-notification.c:395
 #, c-format
 msgid "From: %s"
 msgstr "De: %s:"
 
-#: ../mail/em-format-html.c:2591 ../mail/em-format-html.c:2596
+#: ../mail/em-format-html.c:2594 ../mail/em-format-html.c:2599
 msgid "(no subject)"
 msgstr "(Sen asunto)"
 
-#: ../mail/em-format-html.c:2764
+#: ../mail/em-format-html.c:2772
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Esta mensaxe enviouse por %s no nome de %s"
 
-#: ../mail/em-format-html-display.c:91
+#: ../mail/em-format-html-display.c:89
 msgid "Unsigned"
 msgstr "Sen asinar"
 
-#: ../mail/em-format-html-display.c:91
+#: ../mail/em-format-html-display.c:89
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12784,11 +12861,11 @@ msgstr ""
 "Esta mensaxe non està asinada. Non hai garantÃa de que a mensaxe sexa "
 "autÃntica."
 
-#: ../mail/em-format-html-display.c:92
+#: ../mail/em-format-html-display.c:90
 msgid "Valid signature"
 msgstr "A sinatura à correcta"
 
-#: ../mail/em-format-html-display.c:92
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12796,11 +12873,11 @@ msgstr ""
 "Esta mensaxe està asinada e à correcta, o que significa que à moi probÃbel "
 "que a mensaxe sexa autÃntica."
 
-#: ../mail/em-format-html-display.c:93
+#: ../mail/em-format-html-display.c:91
 msgid "Invalid signature"
 msgstr "A sinatura à incorrecta"
 
-#: ../mail/em-format-html-display.c:93
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12808,11 +12885,11 @@ msgstr ""
 "Non à posÃbel comprobar a sinatura desta mensaxe, puido alterarse no "
 "trÃnsito."
 
-#: ../mail/em-format-html-display.c:94
+#: ../mail/em-format-html-display.c:92
 msgid "Valid signature, but cannot verify sender"
 msgstr "A sinatura à correcta, pero non à posÃbel comprobar o remitente"
 
-#: ../mail/em-format-html-display.c:94
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12820,22 +12897,22 @@ msgstr ""
 "Esta mensaxe està asinada cunha sinatura correcta, pero non foi posÃbel "
 "comprobar o remitente da mensaxe."
 
-#: ../mail/em-format-html-display.c:95
+#: ../mail/em-format-html-display.c:93
 msgid "Signature exists, but need public key"
 msgstr "A sinatura existe, pero precisa unha chave pÃblica"
 
-#: ../mail/em-format-html-display.c:95
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr ""
 "Esta mensaxe està asinada pero non existe a correspondete chave pÃblica."
 
-#: ../mail/em-format-html-display.c:102
+#: ../mail/em-format-html-display.c:100
 msgid "Unencrypted"
 msgstr "Sen cifrar"
 
-#: ../mail/em-format-html-display.c:102
+#: ../mail/em-format-html-display.c:100
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12843,11 +12920,11 @@ msgstr ""
 "Esta mensaxe non està cifrada. O seu contido pode verse no seu trÃnsito a "
 "travÃs de Internet."
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:101
 msgid "Encrypted, weak"
 msgstr "Cifrada, dÃbil"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12857,11 +12934,11 @@ msgstr ""
 "ser difÃcil, pero non imposÃbel para un intruso ver o contido desta mensaxe "
 "nun tempo razoÃbel."
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:102
 msgid "Encrypted"
 msgstr "Cifrada"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:102
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12869,11 +12946,11 @@ msgstr ""
 "Esta mensaxe està cifrada. SerÃa difÃcil para un intruso ver o contido desta "
 "mensaxe."
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:103
 msgid "Encrypted, strong"
 msgstr "Cifrada, forte"
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12883,23 +12960,23 @@ msgstr ""
 "difÃcil para un intruso ver o contido desta mensaxe dentro dun perÃodo de "
 "tempo razoÃbel."
 
-#: ../mail/em-format-html-display.c:273 ../smime/gui/smime-ui.ui.h:43
+#: ../mail/em-format-html-display.c:271 ../smime/gui/smime-ui.ui.h:43
 msgid "_View Certificate"
 msgstr "_Visualizar o certificado"
 
-#: ../mail/em-format-html-display.c:288
+#: ../mail/em-format-html-display.c:286
 msgid "This certificate is not viewable"
 msgstr "Este certificado non à visÃbel"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:947
 msgid "Completed on"
 msgstr "Completado o"
 
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:959
 msgid "Overdue:"
 msgstr "Atrasada:"
 
-#: ../mail/em-format-html-display.c:969
+#: ../mail/em-format-html-display.c:967
 msgid "by"
 msgstr "por"
 
@@ -12924,81 +13001,81 @@ msgstr "Cifrado S/MIME"
 msgid "S/MIME encrpyted"
 msgstr "Cifrado con S/MIME"
 
-#: ../mail/em-subscription-editor.c:870
+#: ../mail/em-subscription-editor.c:869
 msgid "_Subscribe"
 msgstr "Su_bscribir"
 
-#: ../mail/em-subscription-editor.c:879
+#: ../mail/em-subscription-editor.c:878
 msgid "Su_bscribe To Shown"
 msgstr "Su_bscribirse aos mostrados"
 
-#: ../mail/em-subscription-editor.c:887
+#: ../mail/em-subscription-editor.c:886
 msgid "Subscribe To _All"
 msgstr "Subscribirse a _todos"
 
-#: ../mail/em-subscription-editor.c:987 ../mail/em-subscription-editor.c:1840
-#: ../modules/mail/e-mail-shell-view-actions.c:1321
+#: ../mail/em-subscription-editor.c:986 ../mail/em-subscription-editor.c:1844
+#: ../modules/mail/e-mail-shell-view-actions.c:1363
 msgid "_Unsubscribe"
 msgstr "Cancelar a s_ubscriciÃn"
 
-#: ../mail/em-subscription-editor.c:996
+#: ../mail/em-subscription-editor.c:995
 msgid "Unsu_bscribe From Hidden"
 msgstr "Des_ubscribirse dos ocultos"
 
-#: ../mail/em-subscription-editor.c:1004
+#: ../mail/em-subscription-editor.c:1003
 msgid "Unsubscribe From _All"
 msgstr "Desubscribirse de _todo"
 
-#: ../mail/em-subscription-editor.c:1675
+#: ../mail/em-subscription-editor.c:1679
 msgid "Folder Subscriptions"
 msgstr "SubscriciÃns de cartafoles"
 
-#: ../mail/em-subscription-editor.c:1715
+#: ../mail/em-subscription-editor.c:1719
 msgid "_Account:"
 msgstr "Cont_a:"
 
-#: ../mail/em-subscription-editor.c:1730
+#: ../mail/em-subscription-editor.c:1734
 msgid "Clear Search"
 msgstr "Limpar a busca"
 
-#: ../mail/em-subscription-editor.c:1748
+#: ../mail/em-subscription-editor.c:1752
 msgid "Sho_w items that contain:"
 msgstr "Most_rar os elementos que conteÃan:"
 
-#: ../mail/em-subscription-editor.c:1793
+#: ../mail/em-subscription-editor.c:1797
 msgid "Subscribe to the selected folder"
 msgstr "Subscribir o cartafol seleccionado"
 
-#: ../mail/em-subscription-editor.c:1794
+#: ../mail/em-subscription-editor.c:1798
 msgid "Su_bscribe"
 msgstr "Su_bscribir"
 
-#: ../mail/em-subscription-editor.c:1839
-#: ../modules/mail/e-mail-shell-view-actions.c:1323
+#: ../mail/em-subscription-editor.c:1843
+#: ../modules/mail/e-mail-shell-view-actions.c:1365
 msgid "Unsubscribe from the selected folder"
 msgstr "Cancelar a subscriciÃn ao cartafol seleccionado"
 
-#: ../mail/em-subscription-editor.c:1879
+#: ../mail/em-subscription-editor.c:1883
 msgid "Collapse all folders"
 msgstr "Pregar todos os cartafoles"
 
-#: ../mail/em-subscription-editor.c:1880
+#: ../mail/em-subscription-editor.c:1884
 msgid "C_ollapse All"
 msgstr "Pregar t_odo"
 
-#: ../mail/em-subscription-editor.c:1890
+#: ../mail/em-subscription-editor.c:1894
 msgid "Expand all folders"
 msgstr "Despregar todos os cartafoles"
 
-#: ../mail/em-subscription-editor.c:1891
+#: ../mail/em-subscription-editor.c:1895
 msgid "E_xpand All"
 msgstr "Despre_gar todo"
 
-#: ../mail/em-subscription-editor.c:1901
+#: ../mail/em-subscription-editor.c:1905
 msgid "Refresh the folder list"
 msgstr "Actualizar a lista de cartafoles"
 
-#: ../mail/em-subscription-editor.c:1913
+#: ../mail/em-subscription-editor.c:1917
 msgid "Stop the current operation"
 msgstr "Deter a operaciÃn actual"
 
@@ -13006,23 +13083,23 @@ msgstr "Deter a operaciÃn actual"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:112
+#: ../mail/em-utils.c:105
 #, 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 desexa abrir %d mensaxe à vez?"
 msgstr[1] "Està seguro de que desexa abrir %d mensaxes à vez?"
 
-#: ../mail/em-utils.c:168
+#: ../mail/em-utils.c:161
 #: ../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:320
+#: ../mail/em-utils.c:313
 msgid "Message Filters"
 msgstr "Filtros de mensaxe"
 
-#: ../mail/em-utils.c:1004
+#: ../mail/em-utils.c:997
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensaxes de %s"
@@ -13433,8 +13510,8 @@ msgstr ""
 msgid "Importing Elm data"
 msgstr "Importando datos Elm"
 
-#: ../mail/importers/elm-importer.c:353 ../mail/importers/pine-importer.c:460
-#: ../modules/mail/e-mail-shell-view.c:1048
+#: ../mail/importers/elm-importer.c:353 ../mail/importers/pine-importer.c:451
+#: ../modules/mail/e-mail-shell-view.c:1067
 #: ../widgets/misc/e-send-options.c:538
 msgid "Mail"
 msgstr "Correo"
@@ -13448,19 +13525,19 @@ msgid "Import mail from Elm."
 msgstr "Importar correo desde o Elm."
 
 #: ../mail/importers/evolution-mbox-importer.c:142
-#: ../plugins/dbx-import/dbx-importer.c:260
+#: ../plugins/dbx-import/dbx-importer.c:255
 msgid "_Destination folder:"
 msgstr "Cartafol de _destino:"
 
 #: ../mail/importers/evolution-mbox-importer.c:148
-#: ../plugins/dbx-import/dbx-importer.c:266
-#: ../plugins/pst-import/pst-importer.c:557
+#: ../plugins/dbx-import/dbx-importer.c:261
+#: ../plugins/pst-import/pst-importer.c:570
 msgid "Select folder"
 msgstr "Seleccionar un cartafol"
 
 #: ../mail/importers/evolution-mbox-importer.c:149
-#: ../plugins/dbx-import/dbx-importer.c:267
-#: ../plugins/pst-import/pst-importer.c:558
+#: ../plugins/dbx-import/dbx-importer.c:262
+#: ../plugins/pst-import/pst-importer.c:571
 msgid "Select folder to import into"
 msgstr "Seleccionar un cartafol ao que importar"
 
@@ -13489,8 +13566,8 @@ msgstr "Importando a caixa de correo"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:621
-#: ../plugins/pst-import/pst-importer.c:772
+#: ../plugins/dbx-import/dbx-importer.c:616
+#: ../plugins/pst-import/pst-importer.c:784
 #, c-format
 msgid "Importing '%s'"
 msgstr "Importando Â%sÂ"
@@ -13500,20 +13577,19 @@ msgstr "Importando Â%sÂ"
 msgid "Scanning %s"
 msgstr "Examinando %s"
 
-#: ../mail/importers/pine-importer.c:262
+#: ../mail/importers/pine-importer.c:253
 msgid "Importing Pine data"
 msgstr "Importando datos do Pine"
 
-#: ../mail/importers/pine-importer.c:467
-#: ../modules/addressbook/addressbook-config.c:1115
+#: ../mail/importers/pine-importer.c:458
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
-#: ../mail/importers/pine-importer.c:515
+#: ../mail/importers/pine-importer.c:506
 msgid "Evolution Pine importer"
 msgstr "Importador Pine do Evolution"
 
-#: ../mail/importers/pine-importer.c:516
+#: ../mail/importers/pine-importer.c:507
 msgid "Import mail from Pine."
 msgstr "Importar correo do Pine."
 
@@ -13584,94 +13660,76 @@ msgid "Header content"
 msgstr "Contido da cabeceira"
 
 #: ../mail/mail-config.ui.h:5
-msgid "_Add Signature"
-msgstr "_Engadir unha sinatura"
-
-#: ../mail/mail-config.ui.h:6
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
-msgstr ""
-"A saÃda deste script usarase como a sÃa\n"
-"sinatura. O nome que indique usarase\n"
-"sà a efectos de vista. "
-
-#: ../mail/mail-config.ui.h:10
-msgid "_Script:"
-msgstr "_Script:"
-
-#: ../mail/mail-config.ui.h:11
 msgid "Default Behavior"
 msgstr "Comportamento predeterminado:"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:6
 msgid "For_mat messages in HTML"
 msgstr "For_matar as mensaxes en HTML"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:7
 msgid "Automatically insert _emoticon images"
 msgstr "Inserir imaxes de _emoticonas automaticamente"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:8
 msgid "Always request rea_d receipt"
 msgstr "Requirir sempre a confirmaciÃn de lec_tura"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:9
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Codificar nomes de ficheiro à forma de _Outlook/GMail\""
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:10
 msgid "Ch_aracter encoding:"
 msgstr "CodificaciÃn de car_acteres:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:11
 msgid "Replies and Forwards"
 msgstr "Respostas e reencamiÃamentos"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:12
 msgid "_Reply style:"
 msgstr "Estilo da _resposta:"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:13
 msgid "_Forward style:"
 msgstr "Estilo do _reencamiÃamento:"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:14
 msgid "Start _typing at the bottom on replying"
 msgstr "Comezar a escribir ao final da respos_ta"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:15
 msgid "_Keep signature above the original message on replying"
 msgstr "Ao responder _manter a sinatura por riba da mensaxe orixinal"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:16
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "Ig_norar ÂResponder a:Â para as listas de correo"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:17
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "A resposta ao gr_upo vai unicamente à lista de correo, se à posÃbel"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:18
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr ""
 "_Firmar mensaxes digitalmente cando a mensaxe orixinal estea firmada (PGP ou "
 "S/MIME)"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:20
 msgid "Sig_natures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:21
 msgid "Signatures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:22
 msgid "_Languages"
 msgstr "I_diomas"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:23
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -13679,28 +13737,28 @@ msgstr ""
 "Esta lista de idiomas mostra unicamente os idiomas para os cales hai "
 "instalado un dicionario."
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:24
 msgid "Languages Table"
 msgstr "TÃboa de idiomas"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:26
 msgid "Check spelling while I _type"
 msgstr "Comprobar a ortografÃa men_tres escribe"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:27
 msgid "Color for _misspelled words:"
 msgstr "Cor para as palabras escritas incorrecta_mente:"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:28
 #: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Pick a color"
 msgstr "Seleccionar unha cor"
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:29
 msgid "Spell Checking"
 msgstr "ComprobaciÃn ortogrÃfica"
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:30
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -13709,606 +13767,341 @@ msgstr ""
 "antes de realizar as seguintes acciÃns marcadas:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:32
 msgid "Sending a message with an _empty subject line"
 msgstr "Enviar unha m_ensaxe co asunto baleiro"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:34
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Enviar unha mensaxe sà con destinatarios _Bcc definidos"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:36
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Enviar unha resposta _privada à mensaxes da lista de correo"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:38
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Enviar unha resposta a un grande _nÃmero de destinatarios"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:40
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr ""
 "Per_mitir que unha lista de correo redirixa as respostas privadas de novo à "
 "lista"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:42
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 "Enviar unha mensaxe con _destinatarios non inseridos como enderezos de correo"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:43
 msgid "Confirmations"
 msgstr "ConfirmaciÃns"
 
-#: ../mail/mail-config.ui.h:52
-msgid "SHA1"
-msgstr "SHA1"
-
-#: ../mail/mail-config.ui.h:53
-msgid "SHA256"
-msgstr "SHA256"
-
-#: ../mail/mail-config.ui.h:54
-msgid "SHA384"
-msgstr "SHA384"
-
-#: ../mail/mail-config.ui.h:55
-msgid "SHA512"
-msgstr "SHA512"
-
-#: ../mail/mail-config.ui.h:56 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:49 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:57 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:50 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:51
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Anexo"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:52
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "En liÃa (estilo Outlook)"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:53
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Citado"
 
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:54
 msgctxt "ReplyForward"
 msgid "Do not quote"
 msgstr "Non citar"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:55
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "En liÃa"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:56
 msgid "Proxy Settings"
 msgstr "Axustes da proxy"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:57
 msgid "_Use system defaults"
 msgstr "_Usar as predefiniciÃns do sistema"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:58
 msgid "_Direct connection to the Internet"
 msgstr "ConexiÃn _directa a Internet"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:59
 msgid "_Manual proxy configuration:"
 msgstr "ConfiguraciÃn _manual do proxy:"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:60
 msgid "H_TTP Proxy:"
 msgstr "Proxy H_TTP:"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:61
 msgid "_Secure HTTP Proxy:"
 msgstr "Proxy HTTP _segura:"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:62
 msgid "SOC_KS Proxy:"
 msgstr "Proxy SOC_KS:"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:63
 msgid "No _Proxy for:"
 msgstr "Sen pro_xy para:"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:64
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
 msgid "Port:"
 msgstr "Porto:"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:65
 msgid "Use Authe_ntication"
 msgstr "Usar aute_nticaciÃn"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:66
 msgid "Us_ername:"
 msgstr "Nom_e do usuario:"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:67
 msgid "Pass_word:"
 msgstr "Con_trasinal:"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:68
 msgid "Start up"
 msgstr "Iniciar"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:69
 msgid "Check for new _messages on start"
 msgstr "Comprobar se hai _mensaxes novas ao iniciar"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:70
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Comprobar se hai mensa_xes novas nas contas activas"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:71
 msgid "Message Display"
 msgstr "Vista das mensaxes"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:72
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar os mesmos tipos de letra que outros aplicativos"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:73
 msgid "S_tandard Font:"
 msgstr "Tipo de letra es_tÃndar:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:74
 msgid "Select HTML fixed width font"
 msgstr "Seleccionar o tipo de letra de largura fixa para HTML"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:75
 msgid "Select HTML variable width font"
 msgstr "Seleccionar o tipo de letra de largura variÃbel para HTML"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:76
 msgid "Fix_ed Width Font:"
 msgstr "Tipo de l_etra de largura fixa:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:77
 msgid "Highlight _quotations with"
 msgstr "Realzar as _citas con"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:78
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:79
 msgid "Default character e_ncoding:"
 msgstr "CodificaciÃ_n de caracteres predeterminada:"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:80
 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:88
+#: ../mail/mail-config.ui.h:81
 msgid "F_all back to threading messages by subject"
 msgstr "Volver agrupar as mensaxes polo _asunto"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:82
 msgid "Delete Mail"
 msgstr "Eliminar o correo"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:83
 msgid "Empty trash folders on e_xit"
 msgstr "Baleirar os cartafoles do lixo ao _saÃr"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:84
 msgid "Confirm _when expunging a folder"
 msgstr "Confirmar antes de e_xpurgar un cartafol"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:86
 msgid "_Show animated images"
 msgstr "Mo_strar as imaxes animadas"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:87
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Avisar antes de enviar correo HTML aos contactos que non o desexan"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:88
 msgid "Loading Images"
 msgstr "Cargando as imaxes"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:89
 msgid "_Never load images from the Internet"
 msgstr "_Non cargar nunca as imaxes desde Internet"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:90
 msgid "_Load images only in messages from contacts"
 msgstr "Ca_rgar as imaxes sà nas mensaxes dos contactos"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:91
 msgid "_Always load images from the Internet"
 msgstr "C_argar sempre as imaxes desde Internet"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:92
 msgid "HTML Messages"
 msgstr "Mensaxes HTML"
 
-#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:93 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:94
 msgid "Sender Photograph"
 msgstr "FotografÃa do remitente"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:95
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Mostrar a fotografÃa do remitente na vista previa das mensaxes"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:96
 msgid "S_earch for sender photograph only in local address books"
 msgstr "B_uscar a fotografÃa do remitente sà nas axendas de enderezos locais"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:97
 msgid "Displayed Message Headers"
 msgstr "Mostrar as cabeceiras da mensaxe"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:98
 msgid "Mail Headers Table"
 msgstr "TÃboa de cabeceiras de correo"
 
-#: ../mail/mail-config.ui.h:106
-#: ../modules/addressbook/autocompletion-config.c:186
+#: ../mail/mail-config.ui.h:99
+#: ../modules/addressbook/autocompletion-config.c:90
 #: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Date/Time Format"
 msgstr "Formato da data e da hora"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:101
 msgid "Check incoming _messages for junk"
 msgstr "Comprobar as _mensaxes entrantes para detectar correo lixo"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:102
 msgid "Delete junk messages on e_xit"
 msgstr "Eliminar o correo lixo ao saÃ_r"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:103
 msgid "Check cu_stom headers for junk"
 msgstr "Comprobar as cabeceiras personalizada_s para detectar correo lixo"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:104
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "Non ma_rcar as mensaxes como correo lixo se o remitente està na miÃa axenda "
 "de enderezos"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:105
 msgid "_Lookup in local address book only"
 msgstr "Buscar sà nas axendas de enderezos _locais"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:106
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Ignorarase a opciÃn se se atopa algunha coincidencia para as cabeceiras "
 "personalizadas do correo lixo."
 
-#: ../mail/mail-config.ui.h:115 ../modules/addressbook/ldap-config.ui.h:3
+#: ../mail/mail-config.ui.h:108 ../modules/addressbook/ldap-config.ui.h:3
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:237
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:160
 msgid "No encryption"
 msgstr "Sen cifrado"
 
-#: ../mail/mail-config.ui.h:116 ../modules/addressbook/ldap-config.ui.h:1
+#: ../mail/mail-config.ui.h:109 ../modules/addressbook/ldap-config.ui.h:1
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
 
-#: ../mail/mail-config.ui.h:117 ../modules/addressbook/ldap-config.ui.h:2
+#: ../mail/mail-config.ui.h:110 ../modules/addressbook/ldap-config.ui.h:2
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
-#: ../mail/mail-config.ui.h:118
-msgid "Special Folders"
-msgstr "Cartafoles especiais"
-
-#: ../mail/mail-config.ui.h:119
-msgid "Drafts _Folder:"
-msgstr "Carta_fol dos borradores:"
-
-#: ../mail/mail-config.ui.h:120
-msgid "Sent _Messages Folder:"
-msgstr "Cartafol das _mensaxes enviadas:"
-
-#: ../mail/mail-config.ui.h:121
-msgid "_Trash Folder:"
-msgstr "Cartafo_l do lixo:"
-
-#: ../mail/mail-config.ui.h:122
-msgid "_Junk Folder:"
-msgstr "Cartafol do coreo _lixo:"
-
-#: ../mail/mail-config.ui.h:123
-msgid "Composing Messages"
-msgstr "Escribir unha mensaxe"
-
-#: ../mail/mail-config.ui.h:124
-msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "Enviar sempre unha copia de carbÃn _oculta (Cco) a:"
+#: ../mail/mail-dialogs.ui.h:1
+msgid "Search Folder Sources"
+msgstr "Fontes do cartafol de busca"
 
-#: ../mail/mail-config.ui.h:125
-msgid "Alway_s carbon-copy (cc) to:"
-msgstr "Enviar _sempre unha copia de carbÃn (Cc) a:"
+#: ../mail/mail-dialogs.ui.h:2
+msgid "All local folders"
+msgstr "Todos os cartafoles locais"
 
-#: ../mail/mail-config.ui.h:126
-msgid "Message Receipts"
-msgstr "ConfirmaciÃns de lectura das mensaxes"
+#: ../mail/mail-dialogs.ui.h:3
+msgid "All active remote folders"
+msgstr "Todos os cartafoles remotos activos"
 
-#: ../mail/mail-config.ui.h:127
-msgid "S_end message receipts:"
-msgstr "_Enviar as confirmaciÃns de lectura das mensaxes:"
+#: ../mail/mail-dialogs.ui.h:4
+msgid "All local and active remote folders"
+msgstr "Todos os cartafoles locais e remotos activos"
 
-#: ../mail/mail-config.ui.h:128
-msgid "Account Information"
-msgstr "InformaciÃn da conta"
+#: ../mail/mail-dialogs.ui.h:5
+msgid "Specific folders"
+msgstr "Cartafoles especÃficos"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-dialogs.ui.h:6
 msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example: \"Work\" or \"Personal\""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
 msgstr ""
-"Indique o nome polo que desexa identificar esta conta.\n"
-"Por exemplo: ÂTraballo ou ÂPersoalÂ"
+"As mensaxes que seleccionou para o seguimento lÃstanse embaixo.\n"
+"Seleccione unha acciÃn de seguimento no menà ÂMarcarÂ."
 
-#: ../mail/mail-config.ui.h:131
-msgid "Required Information"
-msgstr "InformaciÃn solicitada"
+#: ../mail/mail-dialogs.ui.h:8
+msgid "_Flag:"
+msgstr "_Marca:"
 
-#: ../mail/mail-config.ui.h:132
-msgid "Email _Address:"
-msgstr "_Enderezo de correo:"
+#: ../mail/mail-dialogs.ui.h:9
+msgid "_Due By:"
+msgstr "Vencemento po_r:"
 
-#: ../mail/mail-config.ui.h:133
-msgid "Full Nam_e:"
-msgstr "Nom_e completo:"
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:11
+msgid "Co_mpleted"
+msgstr "Ter_minado"
 
-#: ../mail/mail-config.ui.h:134
-#: ../plugins/publish-calendar/publish-calendar.ui.h:26
-msgid "Optional Information"
-msgstr "InformaciÃn opcional"
+#: ../mail/mail-dialogs.ui.h:12
+msgid "Call"
+msgstr "Chamar"
 
-#: ../mail/mail-config.ui.h:135
-msgid "Signat_ure:"
-msgstr "Sinat_ura:"
-
-#: ../mail/mail-config.ui.h:136
-msgid "Add Ne_w Signature..."
-msgstr "Engadir unha sinatura _novaâ"
-
-#: ../mail/mail-config.ui.h:137
-msgid "Or_ganization:"
-msgstr "Organi_zaciÃn:"
-
-#: ../mail/mail-config.ui.h:138
-msgid "Re_ply-To:"
-msgstr "Res_ponder a:"
-
-#: ../mail/mail-config.ui.h:139
-msgid "_Make this my default account"
-msgstr "Facer desta a _miÃa conta predeterminada"
-
-#: ../mail/mail-config.ui.h:140
-msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr ""
-"Non asinar as solicitudes _de reuniÃn (para a compatibilidade co Outlook)"
-
-#: ../mail/mail-config.ui.h:141
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "Pretty Good Privacy (PGP/GPG)"
-
-#: ../mail/mail-config.ui.h:142
-msgid "PGP/GPG _Key ID:"
-msgstr "ID da _chave PGP/GPG:"
-
-#: ../mail/mail-config.ui.h:143
-msgid "Si_gning algorithm:"
-msgstr "Algoritmo da si_natura:"
-
-#: ../mail/mail-config.ui.h:144
-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:145
-msgid "Always encrypt to _myself when sending encrypted messages"
-msgstr "Cifrar sempre para min _mesmo ao enviar correo cifrado"
-
-#: ../mail/mail-config.ui.h:146
-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:147
-msgid "Secure MIME (S/MIME)"
-msgstr "MIME seguro (S/MIME)"
-
-#: ../mail/mail-config.ui.h:148
-msgid "Also encrypt to sel_f when sending encrypted messages"
-msgstr "Ci_frar tamÃn para min mesmo cando envÃe correo cifrado"
-
-#: ../mail/mail-config.ui.h:149
-msgid "Encrypt out_going messages (by default)"
-msgstr "Cifrar as mensaxes saÃn_tes (predeterminado)"
-
-#: ../mail/mail-config.ui.h:150
-msgid "Digitally sign o_utgoing messages (by default)"
-msgstr "Asinar dixitalmente as mensaxes saÃnt_es (predeterminado)"
-
-#: ../mail/mail-config.ui.h:151
-msgid "Encry_ption certificate:"
-msgstr "Certificado de ci_frado:"
-
-#: ../mail/mail-config.ui.h:152
-msgid "Sig_ning certificate:"
-msgstr "Certificado de si_natura:"
-
-#: ../mail/mail-config.ui.h:153
-msgid "S_elect..."
-msgstr "S_eleccionarâ"
-
-#: ../mail/mail-config.ui.h:154
-msgid "Clea_r"
-msgstr "Limpa_r"
-
-#: ../mail/mail-config.ui.h:155
-msgid "Signing _algorithm:"
-msgstr "_Algoritmo da sinatura:"
-
-#: ../mail/mail-config.ui.h:157
-msgid "Cle_ar"
-msgstr "Limp_ar"
-
-#: ../mail/mail-config.ui.h:158
-msgid "Server _Type:"
-msgstr "_Tipo de servidor:"
-
-#: ../mail/mail-config.ui.h:160
-msgid "description"
-msgstr "descriciÃn"
-
-#: ../mail/mail-config.ui.h:161
-#: ../modules/plugin-manager/evolution-plugin-manager.c:160
-msgid "Configuration"
-msgstr "ConfiguraciÃn"
-
-#: ../mail/mail-config.ui.h:162
-#: ../plugins/publish-calendar/publish-calendar.ui.h:24
-msgid "_Server:"
-msgstr "_Servidor:"
-
-#: ../mail/mail-config.ui.h:163 ../plugins/caldav/caldav-source.c:260
-#: ../plugins/google-account-setup/google-contacts-source.c:337
-#: ../plugins/google-account-setup/google-source.c:655
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
-msgid "User_name:"
-msgstr "_Nome do usuario:"
-
-#: ../mail/mail-config.ui.h:165
-msgid "Mailbox location"
-msgstr "LocalizaciÃn da caixa de correo"
-
-#: ../mail/mail-config.ui.h:167
-msgid "_Use secure connection:"
-msgstr "_Usar unha conexiÃn segura:"
-
-#: ../mail/mail-config.ui.h:168
-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:169
-msgid "_Authentication Type"
-msgstr "Tipo de _autenticaciÃn"
-
-#: ../mail/mail-config.ui.h:170
-msgid "Ch_eck for Supported Types"
-msgstr "Comprobar os tipos compatÃb_eis"
-
-#: ../mail/mail-config.ui.h:171
-msgid "Re_member password"
-msgstr "Le_mbrar o contrasinal"
-
-#: ../mail/mail-config.ui.h:172
-msgid "Server Configuration"
-msgstr "ConfiguraciÃn do servidor"
-
-#: ../mail/mail-config.ui.h:173 ../modules/addressbook/ldap-config.ui.h:13
-msgid "_Port:"
-msgstr "_Porto:"
-
-#: ../mail/mail-config.ui.h:174
-msgid "Ser_ver requires authentication"
-msgstr "O ser_vidor solicita autenticaciÃn"
-
-#: ../mail/mail-config.ui.h:175
-#: ../modules/addressbook/addressbook-config.c:1122
-msgid "Authentication"
-msgstr "AutenticaciÃn"
-
-#: ../mail/mail-config.ui.h:176
-msgid "T_ype:"
-msgstr "T_ipo:"
-
-#: ../mail/mail-config.ui.h:177
-msgid "User _Name:"
-msgstr "_Nome do usuario:"
-
-#: ../mail/mail-config.ui.h:178
-msgid "Remember _password"
-msgstr "Lembrar o _contrasinal"
-
-#: ../mail/mail-config.ui.h:179
-msgid "Personal Details:"
-msgstr "Detalles persoais:"
-
-#: ../mail/mail-config.ui.h:188
-msgid "Encryption:"
-msgstr "Cifrado:"
-
-#: ../mail/mail-config.ui.h:189
-msgid "none"
-msgstr "ningunha"
-
-#: ../mail/mail-config.ui.h:190
-msgid "label"
-msgstr "etiqueta"
-
-#: ../mail/mail-dialogs.ui.h:1
-msgid "Search Folder Sources"
-msgstr "Fontes do cartafol de busca"
-
-#: ../mail/mail-dialogs.ui.h:2
-msgid "All local folders"
-msgstr "Todos os cartafoles locais"
-
-#: ../mail/mail-dialogs.ui.h:3
-msgid "All active remote folders"
-msgstr "Todos os cartafoles remotos activos"
-
-#: ../mail/mail-dialogs.ui.h:4
-msgid "All local and active remote folders"
-msgstr "Todos os cartafoles locais e remotos activos"
-
-#: ../mail/mail-dialogs.ui.h:5
-msgid "Specific folders"
-msgstr "Cartafoles especÃficos"
-
-#: ../mail/mail-dialogs.ui.h:6
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"As mensaxes que seleccionou para o seguimento lÃstanse embaixo.\n"
-"Seleccione unha acciÃn de seguimento no menà ÂMarcarÂ."
-
-#: ../mail/mail-dialogs.ui.h:8
-msgid "_Flag:"
-msgstr "_Marca:"
-
-#: ../mail/mail-dialogs.ui.h:9
-msgid "_Due By:"
-msgstr "Vencemento po_r:"
-
-#. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:11
-msgid "Co_mpleted"
-msgstr "Ter_minado"
-
-#: ../mail/mail-dialogs.ui.h:12
-msgid "Call"
-msgstr "Chamar"
-
-#: ../mail/mail-dialogs.ui.h:13
-msgid "Do Not Forward"
-msgstr "Non reencamiÃar"
+#: ../mail/mail-dialogs.ui.h:13
+msgid "Do Not Forward"
+msgstr "Non reencamiÃar"
 
 #: ../mail/mail-dialogs.ui.h:14
 msgid "Follow-Up"
@@ -14566,7 +14359,7 @@ msgstr ""
 "eliminadas de todos os cartafoles?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1216
+#: ../modules/mail/e-mail-shell-view-actions.c:1258
 msgid "_Empty Trash"
 msgstr "_Baleirar o lixo"
 
@@ -14771,39 +14564,15 @@ msgid "Do _Not Disable"
 msgstr "_Non desactivar"
 
 #: ../mail/mail.error.xml.h:87
-#: ../plugins/publish-calendar/publish-calendar.c:617
+#: ../plugins/publish-calendar/publish-calendar.c:616
 msgid "_Disable"
 msgstr "_Desactivar"
 
 #: ../mail/mail.error.xml.h:88
-msgid "Could not save signature file."
-msgstr "Non foi posÃbel gardar o ficheiro da sinatura."
-
-#: ../mail/mail.error.xml.h:89
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Non à posÃbel estabelecer o script de sinatura Â{0}Â."
-
-#: ../mail/mail.error.xml.h:90
-msgid "The script file must exist and be executable."
-msgstr "O ficheiro do script debe existir e ser executÃbel."
-
-#: ../mail/mail.error.xml.h:91
-msgid "Do you wish to save your changes?"
-msgstr "Desexa gardar as modificaciÃns?"
-
-#: ../mail/mail.error.xml.h:92
-msgid "This signature has been changed, but has not been saved."
-msgstr "Modificouse esta sinatura pero non se gardou."
-
-#: ../mail/mail.error.xml.h:93
-msgid "_Discard changes"
-msgstr "_Rexeitar as modificaciÃns"
-
-#: ../mail/mail.error.xml.h:94
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Non à posÃbel editar o cartafol de busca Â{0} porque non existe."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:89
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14812,39 +14581,39 @@ msgstr ""
 "se à necesario, vaia ao editor de cartafoles de busca para engadilo "
 "explicitamente."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:91
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Non à posÃbel engadir o cartafol de busca Â{0}Â."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:92
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "Xa existe un cartafol co nome Â{0}Â. Use un nome diferente."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:93
 msgid "Search Folders automatically updated."
 msgstr "Os cartafoles de busca actualizÃronse automaticamente."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:94
 msgid "Mail filters automatically updated."
 msgstr "Filtros de correo actualizados automaticamente."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:95
 msgid "Missing folder."
 msgstr "Falta o cartafol."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:96
 msgid "You must specify a folder."
 msgstr "Debe indicar un cartafol."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:98
 msgid "You must name this Search Folder."
 msgstr "Debe dar un nome a este cartafol de busca."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:99
 msgid "No sources selected."
 msgstr "Non se seleccionou ningunha fonte."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14854,11 +14623,11 @@ msgstr ""
 "FÃgao seleccionando os cartafoles individualmente, ou seleccionando todos os "
 "cartafoles locais, todos os cartafoles remotos ou ambos."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:102
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Produciuse un problema ao migrar o cartafol de correo antigo Â{0}Â."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:103
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -14870,23 +14639,23 @@ msgstr ""
 "Pode escoller entre ignorar este cartafol, sobrescribilo, anexar os seus "
 "contidos ou saÃr."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:106
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:107
 msgid "_Overwrite"
 msgstr "S_obrescribir"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:108
 msgid "_Append"
 msgstr "_Anexar"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:109
 msgid "Evolution's local mail format has changed."
 msgstr "O formato de correo electrÃnico local de Evolution cambiou."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "Evolution's local mail format has changed from mbox to Maildir. Your local "
 "mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -14905,19 +14674,19 @@ msgstr ""
 "Se escolle a migraciÃn comprobe con anterioridade que haxa suficiente espazo "
 "libre no seu disco."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:113
 msgid "_Exit Evolution"
 msgstr "_SaÃr do Evolution"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:114
 msgid "_Migrate Now"
 msgstr "_Migrar agora"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:115
 msgid "Unable to read license file."
 msgstr "Non à posÃbel ler o ficheiro da licenza."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -14925,36 +14694,36 @@ msgstr ""
 "Non à posÃbel ler o ficheiro de licenza Â{0} debido a un problema de "
 "instalaciÃn. Non poderà usar este provedor atà que acepte a sÃa licenza."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:117
 msgid "Please wait."
 msgstr "Agarde."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:118
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Estase solicitando do servidor unha lista de mecanismos de autenticaciÃn "
 "compatÃbeis."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:119
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
 msgstr ""
 "Produciuse un fallo ao solicitar a lista de mecanismos de autenticaciÃn "
 "admitidos polo servidor."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:120
 msgid "Unable to connect to the GroupWise server."
 msgstr "Non foi posÃbel conectar co servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:121
 msgid "Please check your account settings and try again."
 msgstr "Comprobe os axustes da conta e tÃnteo outra vez."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:122
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Desxa sincronizar os cartafoles localmente para o uso sen conexiÃn?"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -14962,23 +14731,23 @@ msgstr ""
 "Desexa sincronizar localmente os cartafoles que estÃn marcados para o uso "
 "sen conexiÃn?"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:124
 msgid "Do _Not Synchronize"
 msgstr "_Non sincronizar"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:125
 msgid "_Synchronize"
 msgstr "_Sincronizar"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:126
 msgid "Do you want to mark all messages as read?"
 msgstr "Desexa marcar todas as mensaxes como lidas?"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:127
 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:134
+#: ../mail/mail.error.xml.h:128
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14986,65 +14755,47 @@ msgstr ""
 "Isto marcarà todas as mensaxes como lidas no cartafol seleccionado e nos "
 "seus subcartafoles."
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:129
 msgid "Close message window."
 msgstr "Pechar a xanela da mensaxe."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:130
 msgid "Would you like to close the message window?"
 msgstr "Desexa pechar a xanela da mensaxe?"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:131
 msgid "_Yes"
 msgstr "_Si"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:132
 msgid "_No"
 msgstr "_Non"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:133
 msgid "_Always"
 msgstr "_Sempre"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:134
 msgid "N_ever"
 msgstr "N_unca"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:135
 msgid "Copy folder in folder tree."
 msgstr "Copiar cartafol no Ãrbore de cartafois."
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:136
 msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr "Ten certeza que quere copiar o cartafol Â{0}Â a Â{1}Â?"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:137
 msgid "Move folder in folder tree."
 msgstr "Mover cartafol no Ãrbore de cartafois."
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:138
 msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr "Està seguro de que desexa mover o cartafol Â{0} a Â{1}Â?"
 
-#: ../mail/mail.error.xml.h:145
-msgid "Signature Already Exists"
-msgstr "A sinatura xa existe"
-
-#: ../mail/mail.error.xml.h:146
-msgid ""
-"A signature already exists with the name \"{0}\". Please specify a different "
-"name."
-msgstr "Xa existe unha sinatura co nome Â{0}Â. Use un nome diferente."
-
-#: ../mail/mail.error.xml.h:147
-msgid "Blank Signature"
-msgstr "Sinatura en branco"
-
-#: ../mail/mail.error.xml.h:148
-msgid "Please provide an unique name to identify this signature."
-msgstr "Introduza un nome Ãnico para identificar esta sinatura."
-
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:139
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -15052,85 +14803,85 @@ msgstr ""
 "Non à posÃbel enviar esta mensaxe porque a conta que escolleu para enviala "
 "non està activada"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:140
 msgid "Please enable the account or send using another account."
 msgstr "Active a conta ou faga o envÃo usando outra conta."
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:141
 msgid "Mail Deletion Failed"
 msgstr "Produciuse un fallo na eliminaciÃn do correo"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:142
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Non ten os permisos suficientes para eliminar este correo."
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:143
 msgid "\"Check Junk\" Failed"
 msgstr "Produciuse un fallo na comprobaciÃn do correo lixo"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:144
 msgid "\"Report Junk\" Failed"
 msgstr "Produciuse un fallo ao informar do correo lixo"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:145
 msgid "\"Report Not Junk\" Failed"
 msgstr "Produciuse un fallo ao informar do que non à correo lixo"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:146
 msgid "Remove duplicate messages?"
 msgstr "Desexa eliminar as mensaxes duplicadas?"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:147
 msgid "No duplicate messages found."
 msgstr "Non se atoparon mensaxes duplicadas."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:149
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "O cartafol Â{0}Â non contÃn ningunha mensaxe duplicada."
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:150
 msgid "Failed to unsubscribe from folder."
 msgstr "Produciuse un fallo ao eliminar a subscriciÃn do cartafol."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:152
 msgid "Unable to retrieve message."
 msgstr "Non foi posÃbel obter a mensaxe."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:153
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:154
 msgid "Failed to open folder."
 msgstr "Produciuse un erro ao abrir o cartafol."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:155
 msgid "Failed to find duplicate messages."
 msgstr "Produciuse un fallo ao buscar as mensaxes duplicadas."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:156
 msgid "Failed to retrieve messages."
 msgstr "Produciuse un fallo ao obter as mensaxes."
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:157
 msgid "Failed to remove attachments from messages."
 msgstr "Produciuse un fallo ao quitar os anexos das mensaxes."
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:158
 msgid "Failed to download messages for offline viewing."
 msgstr ""
 "Produciuse un fallo ao descargar as mensaxes para traballar sen conexiÃn"
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:159
 msgid "Failed to save messages to disk."
 msgstr "Produciuse un fallo ao gardar as mensaxes ao disco."
 
-#: ../mail/mail.error.xml.h:170
+#: ../mail/mail.error.xml.h:160
 msgid "Hidden file is attached."
 msgstr "Existe un ficheiro oculto adxunto."
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:161
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -15138,43 +14889,47 @@ msgstr ""
 "O anexo co nome {0} Ã un ficheiro oculto e pode conter datos sensÃbeis. "
 "RevÃseo antes de envialo."
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:162
 msgid "Printing failed."
 msgstr "Produciuse un fallo ao imprimir."
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:163
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "A impresora respondeu &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:174
+#: ../mail/mail.error.xml.h:164
 msgid "Could not perform this operation on {0}."
 msgstr "Non à posÃbel realizar esta operaciÃn en {0}."
 
-#: ../mail/mail-send-recv.c:208
+#: ../mail/mail-send-recv.c:205
 msgid "Canceling..."
 msgstr "Cancelandoâ"
 
-#: ../mail/mail-send-recv.c:536
+#: ../mail/mail-send-recv.c:521
 msgid "Send & Receive Mail"
 msgstr "Enviar e recibir o correo"
 
-#: ../mail/mail-send-recv.c:552
+#: ../mail/mail-send-recv.c:537
 msgid "Cancel _All"
 msgstr "Cancel_ar todo"
 
-#: ../mail/mail-send-recv.c:644 ../mail/mail-send-recv.c:1021
+#: ../mail/mail-send-recv.c:629 ../mail/mail-send-recv.c:1006
 msgid "Updating..."
 msgstr "Actualizandoâ"
 
-#: ../mail/mail-send-recv.c:644 ../mail/mail-send-recv.c:726
+#: ../mail/mail-send-recv.c:629 ../mail/mail-send-recv.c:711
 msgid "Waiting..."
 msgstr "Agardandoâ"
 
-#: ../mail/mail-send-recv.c:1001
+#: ../mail/mail-send-recv.c:986
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprobando se hai correo novo"
 
+#: ../mail/mail-vfolder-ui.c:79
+msgid "Search Folders"
+msgstr "Cartafoles de busca"
+
 #: ../mail/mail-vfolder-ui.c:159
 msgid "Edit Search Folder"
 msgstr "Editar o cartafol de busca"
@@ -15229,7 +14984,7 @@ msgstr "?"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:225
+#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:230
 msgid "Today %l:%M %p"
 msgstr "Hoxe Ãs %l:%M %p"
 
@@ -15319,122 +15074,30 @@ msgid "Subject or Addresses contains"
 msgstr "O asunto ou os enderezos conteÃen"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1688
+#: ../modules/mail/e-mail-shell-view-actions.c:1730
 msgid "Recipients contain"
 msgstr "Os destinatarios conteÃen"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1681
+#: ../modules/mail/e-mail-shell-view-actions.c:1723
 msgid "Message contains"
 msgstr "A mensaxe contÃn"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1702
+#: ../modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Subject contains"
 msgstr "O asunto contÃn"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1695
+#: ../modules/mail/e-mail-shell-view-actions.c:1737
 msgid "Sender contains"
 msgstr "O remitente contÃn"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1674
+#: ../modules/mail/e-mail-shell-view-actions.c:1716
 msgid "Body contains"
 msgstr "O corpo contÃn"
 
-#: ../modules/addressbook/addressbook-config.c:204
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"Seleccionar esta opciÃn significa que o Evolution sà conectarà co servidor "
-"LDAP se o servidor LDAP Ã compatÃbel con SSL."
-
-#: ../modules/addressbook/addressbook-config.c:206
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"Seleccionar esta opciÃn significa que o Evolution sà conectarà co servidor "
-"LDAP se o servidor LDAP Ã compatÃbel co TLS."
-
-#: ../modules/addressbook/addressbook-config.c:208
-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 "
-"vulnerable to security exploits."
-msgstr ""
-"Seleccionar esta opciÃn significa que o servidor non permite nin SSL nin "
-"TLS. Isto significa que a conexiÃn serà insegura e que vostede serà "
-"vulnerÃbel aos fallos de seguranza."
-
-#: ../modules/addressbook/addressbook-config.c:649
-msgid "U_se in Birthday & Anniversaries calendar"
-msgstr "U_sar no calendario de aniversarios"
-
-#: ../modules/addressbook/addressbook-config.c:693
-msgid "Copy _book content locally for offline operation"
-msgstr ""
-"Copiar o contido da a_xenda de enderezos localmente para operar sen conexiÃn"
-
-#: ../modules/addressbook/addressbook-config.c:812
-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 "
-"port you should specify."
-msgstr ""
-"Este à o porto do servidor LDAP ao que o Evolution tentarà conectarse. "
-"Proporcionouse unha lista de portos estÃndar. Pregunte ao administrador do "
-"sistema que porto deberÃa indicar."
-
-#: ../modules/addressbook/addressbook-config.c:898
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
-msgstr ""
-"Este à o mÃtodo que o Evolution usarà para autenticalo a vostede. Definir "
-"isto como ÂEnderezo de correo require o acceso anÃnimo ao servidor LDAP."
-
-#: ../modules/addressbook/addressbook-config.c:987
-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 "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"O Ãmbito de busca define atà que profundidade desexa que a busca se estenda "
-"ao longo dunha Ãrbore de cartafoles. Un Ãmbito de busca de Âsub incluirà "
-"todas as entradas por embaixo da sÃa base de busca. Un Ãmbito Âun sà "
-"incluirà as entradas un nivel por embaixo da sÃa base."
-
-#: ../modules/addressbook/addressbook-config.c:1120
-msgid "Server Information"
-msgstr "InformaciÃn do servidor"
-
-#: ../modules/addressbook/addressbook-config.c:1125
-#: ../smime/gui/smime-ui.ui.h:25
-msgid "Details"
-msgstr "InformaciÃn"
-
-#: ../modules/addressbook/addressbook-config.c:1126
-#: ../modules/mail/e-mail-shell-view.c:58
-msgid "Searching"
-msgstr "Buscando"
-
-#: ../modules/addressbook/addressbook-config.c:1128
-msgid "Downloading"
-msgstr "Descargando"
-
-#: ../modules/addressbook/addressbook-config.c:1346
-msgid "Address Book Properties"
-msgstr "Propiedades da axenda de enderezos"
-
-#: ../modules/addressbook/addressbook-config.c:1348
-msgid "New Address Book"
-msgstr "Nova axenda de enderezos"
-
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
 msgid "EFolderList XML for the list of completion URIs"
 msgstr "EFolderList XML para a lista de completado dos URIs"
@@ -15464,361 +15127,360 @@ msgstr ""
 "destino."
 
 #. 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:192
-#: ../modules/mail/em-mailer-prefs.c:1074
+#: ../modules/addressbook/autocompletion-config.c:96
+#: ../modules/mail/em-mailer-prefs.c:1072
 msgid "_Table column:"
 msgstr "Columna da _tÃboa:"
 
-#: ../modules/addressbook/autocompletion-config.c:195
+#: ../modules/addressbook/autocompletion-config.c:99
 msgid "Address formatting"
 msgstr "Formatado de enderezos"
 
-#: ../modules/addressbook/autocompletion-config.c:198
+#: ../modules/addressbook/autocompletion-config.c:102
 msgid "_Format address according to standard of its destination country"
 msgstr "_Formatar enderezos segundo o estÃndar do paÃs de destino"
 
-#: ../modules/addressbook/autocompletion-config.c:207
+#: ../modules/addressbook/autocompletion-config.c:111
 msgid "Autocompletion"
 msgstr "Completado automÃtico"
 
-#: ../modules/addressbook/autocompletion-config.c:210
+#: ../modules/addressbook/autocompletion-config.c:114
 msgid "Always _show address of the autocompleted contact"
 msgstr "Mo_strar sempre o enderezo do contacto completado automaticamente"
 
-#: ../modules/addressbook/eab-composer-util.c:149
+#: ../modules/addressbook/eab-composer-util.c:148
 msgid "Multiple vCards"
 msgstr "MÃltiples vCards"
 
-#: ../modules/addressbook/eab-composer-util.c:157
+#: ../modules/addressbook/eab-composer-util.c:156
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard para %s"
 
-#: ../modules/addressbook/eab-composer-util.c:169
-#: ../modules/addressbook/eab-composer-util.c:196
+#: ../modules/addressbook/eab-composer-util.c:168
+#: ../modules/addressbook/eab-composer-util.c:195
 #, c-format
 msgid "Contact information"
 msgstr "InformaciÃn do contacto"
 
-#: ../modules/addressbook/eab-composer-util.c:198
+#: ../modules/addressbook/eab-composer-util.c:197
 #, c-format
 msgid "Contact information for %s"
 msgstr "InformaciÃn do contacto %s"
 
-#. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:108
-#: ../modules/addressbook/e-book-shell-migrate.c:154
-msgid "On LDAP Servers"
-msgstr "En servidores LDAP"
+#: ../modules/addressbook/e-book-shell-backend.c:229
+#: ../modules/addressbook/e-book-shell-view-actions.c:119
+msgid "New Address Book"
+msgstr "Nova axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-backend.c:313
+#: ../modules/addressbook/e-book-shell-backend.c:238
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: ../modules/addressbook/e-book-shell-backend.c:315
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
+#: ../modules/addressbook/e-book-shell-backend.c:240
+#: ../modules/addressbook/e-book-shell-view-actions.c:892
 msgid "Create a new contact"
 msgstr "Crear un contacto novo"
 
-#: ../modules/addressbook/e-book-shell-backend.c:320
+#: ../modules/addressbook/e-book-shell-backend.c:245
 msgctxt "New"
 msgid "Contact _List"
 msgstr "_Lista de contactos"
 
-#: ../modules/addressbook/e-book-shell-backend.c:322
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-backend.c:247
+#: ../modules/addressbook/e-book-shell-view-actions.c:899
 msgid "Create a new contact list"
 msgstr "Crear unha lista de contactos nova"
 
-#: ../modules/addressbook/e-book-shell-backend.c:330
+#: ../modules/addressbook/e-book-shell-backend.c:255
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-backend.c:332
-#: ../modules/addressbook/e-book-shell-view-actions.c:850
+#: ../modules/addressbook/e-book-shell-backend.c:257
+#: ../modules/addressbook/e-book-shell-view-actions.c:822
 msgid "Create a new address book"
 msgstr "Crear unha axenda de enderezos nova"
 
-#. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view.c:402
-#: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:63
-#: ../modules/online-accounts/e-online-accounts-google.c:385
+#: ../modules/addressbook/e-book-shell-backend.c:274
+#: ../modules/addressbook/e-book-shell-view.c:346
 msgid "Contacts"
 msgstr "Contactos"
 
-#: ../modules/addressbook/e-book-shell-backend.c:360
+#: ../modules/addressbook/e-book-shell-backend.c:285
 msgid "Certificates"
 msgstr "Certificados"
 
+#: ../modules/addressbook/e-book-shell-view-actions.c:192
+msgid "Address Book Properties"
+msgstr "Propiedades da axenda de enderezos"
+
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:402
-#: ../modules/addressbook/e-book-shell-view-actions.c:698
+#: ../modules/addressbook/e-book-shell-view-actions.c:374
+#: ../modules/addressbook/e-book-shell-view-actions.c:670
 msgid "Save as vCard"
 msgstr "Gardar como vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:827
+#: ../modules/addressbook/e-book-shell-view-actions.c:799
 msgid "Co_py All Contacts To..."
 msgstr "Co_piar todos os contactos aâ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:829
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Copiar os contactos da axenda de enderezos seleccionada a outra"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:834
+#: ../modules/addressbook/e-book-shell-view-actions.c:806
 msgid "D_elete Address Book"
 msgstr "_Eliminar a axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:836
+#: ../modules/addressbook/e-book-shell-view-actions.c:808
 msgid "Delete the selected address book"
 msgstr "Eliminar a axenda seleccionada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:813
 msgid "Mo_ve All Contacts To..."
 msgstr "Mo_ver todos os contactos aâ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:843
+#: ../modules/addressbook/e-book-shell-view-actions.c:815
 msgid "Move the contacts of the selected address book to another"
 msgstr "Mover os contactos da axenda de enderezos seleccionada a outra"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:848
+#: ../modules/addressbook/e-book-shell-view-actions.c:820
 msgid "_New Address Book"
 msgstr "_Nova axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:855
+#: ../modules/addressbook/e-book-shell-view-actions.c:827
 msgid "Address _Book Properties"
 msgstr "Propiedades da a_xenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:857
+#: ../modules/addressbook/e-book-shell-view-actions.c:829
 msgid "Show properties of the selected address book"
 msgstr "Mostrar as propiedades da axenda de enderezos seleccionada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:834
 msgid "Address Book _Map"
 msgstr "_Mapa do caderno de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:864
+#: ../modules/addressbook/e-book-shell-view-actions.c:836
 msgid "Show map with all contacts from selected address book"
 msgstr ""
 "Mostrar o mapa con tÃdolos contactos do caderno de enderezos seleccionado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
-#: ../modules/calendar/e-memo-shell-view-actions.c:658
-#: ../modules/calendar/e-task-shell-view-actions.c:782
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-memo-shell-view-actions.c:664
+#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/mail/e-mail-shell-view-actions.c:1342
 msgid "_Rename..."
 msgstr "_Renomearâ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:871
+#: ../modules/addressbook/e-book-shell-view-actions.c:843
 msgid "Rename the selected address book"
 msgstr "Renomear a axenda de enderezos seleccionada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:878
+#: ../modules/addressbook/e-book-shell-view-actions.c:850
 msgid "Stop loading"
 msgstr "Deter a carga"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:883
+#: ../modules/addressbook/e-book-shell-view-actions.c:855
 msgid "_Copy Contact To..."
 msgstr "_Copiar o contacto aâ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:885
+#: ../modules/addressbook/e-book-shell-view-actions.c:857
 msgid "Copy selected contacts to another address book"
 msgstr "Copiar os contactos seleccionados a outra axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:890
+#: ../modules/addressbook/e-book-shell-view-actions.c:862
 msgid "_Delete Contact"
 msgstr "E_liminar o contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/addressbook/e-book-shell-view-actions.c:869
 msgid "_Find in Contact..."
 msgstr "_Buscar no contactoâ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:899
+#: ../modules/addressbook/e-book-shell-view-actions.c:871
 msgid "Search for text in the displayed contact"
 msgstr "Buscar un texto no contacto mostrado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/addressbook/e-book-shell-view-actions.c:876
 msgid "_Forward Contact..."
 msgstr "_ReencamiÃar o contactoâ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:906
+#: ../modules/addressbook/e-book-shell-view-actions.c:878
 msgid "Send selected contacts to another person"
 msgstr "Enviar os contactos seleccionados a outra persoa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:911
+#: ../modules/addressbook/e-book-shell-view-actions.c:883
 msgid "_Move Contact To..."
 msgstr "_Mover o contacto aâ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:913
+#: ../modules/addressbook/e-book-shell-view-actions.c:885
 msgid "Move selected contacts to another address book"
 msgstr "Mover os contactos seleccionados a outra axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:918
+#: ../modules/addressbook/e-book-shell-view-actions.c:890
 msgid "_New Contact..."
 msgstr "Contacto _novoâ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:925
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
 msgid "New Contact _List..."
 msgstr "_Lista de contactos novaâ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:932
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
 msgid "_Open Contact"
 msgstr "Abrir _o contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:906
 msgid "View the current contact"
 msgstr "Ver o contacto actual"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:939
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "_Send Message to Contact..."
 msgstr "_Enviar unha mensaxe ao contactoâ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:913
 msgid "Send a message to the selected contacts"
 msgstr "Enviar unha mensaxe aos contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:948
-#: ../modules/calendar/e-cal-shell-view-actions.c:1597
-#: ../modules/calendar/e-task-shell-view-actions.c:840
+#: ../modules/addressbook/e-book-shell-view-actions.c:920
+#: ../modules/calendar/e-cal-shell-view-actions.c:1603
+#: ../modules/calendar/e-task-shell-view-actions.c:846
 msgid "_Actions"
 msgstr "_AcciÃns"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:955
-#: ../modules/calendar/e-memo-shell-view-actions.c:695
-#: ../modules/calendar/e-task-shell-view-actions.c:847
-#: ../modules/mail/e-mail-shell-view-actions.c:1458
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/calendar/e-memo-shell-view-actions.c:701
+#: ../modules/calendar/e-task-shell-view-actions.c:853
+#: ../modules/mail/e-mail-shell-view-actions.c:1500
 msgid "_Preview"
 msgstr "Vista _previa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:964
-#: ../modules/calendar/e-cal-shell-view-actions.c:1614
-#: ../modules/calendar/e-memo-shell-view-actions.c:708
-#: ../modules/calendar/e-task-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:936
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
+#: ../modules/calendar/e-memo-shell-view-actions.c:714
+#: ../modules/calendar/e-task-shell-view-actions.c:866
 msgid "_Delete"
 msgstr "E_liminar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:968
-#: ../modules/mail/e-mail-shell-view-actions.c:1223
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
+#: ../modules/mail/e-mail-shell-view-actions.c:1265
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:972
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Address Book Map"
 msgstr "Mapa do caderno de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1004
+#: ../modules/addressbook/e-book-shell-view-actions.c:976
 msgid "Contact _Preview"
 msgstr "Vista _previa de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1006
+#: ../modules/addressbook/e-book-shell-view-actions.c:978
 msgid "Show contact preview window"
 msgstr "Mostrar a xanela de vista previa de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1012
+#: ../modules/addressbook/e-book-shell-view-actions.c:984
 msgid "Show _Maps"
 msgstr "Mostrar _mapas"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1014
+#: ../modules/addressbook/e-book-shell-view-actions.c:986
 msgid "Show maps in contact preview window"
 msgstr "Mostrar mapas na xanela de vista previa de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1033
-#: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:929
-#: ../modules/mail/e-mail-shell-view-actions.c:1584
+#: ../modules/addressbook/e-book-shell-view-actions.c:1005
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:935
+#: ../modules/mail/e-mail-shell-view-actions.c:1626
 msgid "_Classic View"
 msgstr "Vista _clÃsica"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../modules/addressbook/e-book-shell-view-actions.c:1007
 msgid "Show contact preview below the contact list"
 msgstr "Mostrar a vista previa do contacto embaixo da lista de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1040
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:936
-#: ../modules/mail/e-mail-shell-view-actions.c:1591
+#: ../modules/addressbook/e-book-shell-view-actions.c:1012
+#: ../modules/calendar/e-memo-shell-view-actions.c:778
+#: ../modules/calendar/e-task-shell-view-actions.c:942
+#: ../modules/mail/e-mail-shell-view-actions.c:1633
 msgid "_Vertical View"
 msgstr "Vista _vertical"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1042
+#: ../modules/addressbook/e-book-shell-view-actions.c:1014
 msgid "Show contact preview alongside the contact list"
 msgstr "Mostrar a vista previa do contacto ao carÃn da lista de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1050
-#: ../modules/calendar/e-cal-shell-view-actions.c:1753
-#: ../modules/calendar/e-memo-shell-view-actions.c:782
-#: ../modules/calendar/e-task-shell-view-actions.c:953
+#: ../modules/addressbook/e-book-shell-view-actions.c:1022
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:959
 msgid "Any Category"
 msgstr "Calquera categorÃa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1057
-#: ../modules/calendar/e-cal-shell-view-actions.c:1774
-#: ../modules/calendar/e-memo-shell-view-actions.c:789
-#: ../modules/calendar/e-task-shell-view-actions.c:988
+#: ../modules/addressbook/e-book-shell-view-actions.c:1029
+#: ../modules/calendar/e-cal-shell-view-actions.c:1780
+#: ../modules/calendar/e-memo-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:994
 msgid "Unmatched"
 msgstr "Sen coincidencias"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1067
-#: ../modules/calendar/e-cal-shell-view-actions.c:1784
-#: ../modules/calendar/e-memo-shell-view-actions.c:799
-#: ../modules/calendar/e-task-shell-view-actions.c:998
-#: ../modules/mail/e-mail-shell-view-actions.c:1667
+#: ../modules/addressbook/e-book-shell-view-actions.c:1039
+#: ../modules/calendar/e-cal-shell-view-actions.c:1790
+#: ../modules/calendar/e-memo-shell-view-actions.c:805
+#: ../modules/calendar/e-task-shell-view-actions.c:1004
+#: ../modules/mail/e-mail-shell-view-actions.c:1709
 #: ../shell/e-shell-content.c:664
 msgid "Advanced Search"
 msgstr "Busca avanzada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1100
+#: ../modules/addressbook/e-book-shell-view-actions.c:1072
 msgid "Print all shown contacts"
 msgstr "Imprimir os contactos mostrados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1107
+#: ../modules/addressbook/e-book-shell-view-actions.c:1079
 msgid "Preview the contacts to be printed"
 msgstr "Previsualizar os contactos que se van imprimir"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1114
+#: ../modules/addressbook/e-book-shell-view-actions.c:1086
 msgid "Print selected contacts"
 msgstr "Imprimir os contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1129
+#: ../modules/addressbook/e-book-shell-view-actions.c:1101
 msgid "S_ave Address Book as vCard"
 msgstr "G_ardar a axenda de enderezos como VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1131
+#: ../modules/addressbook/e-book-shell-view-actions.c:1103
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr ""
 "Gardar os contactos da axenda de enderezos seleccionada como unha VCard"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1137
-#: ../modules/addressbook/e-book-shell-view-actions.c:1147
+#: ../modules/addressbook/e-book-shell-view-actions.c:1109
+#: ../modules/addressbook/e-book-shell-view-actions.c:1119
 msgid "_Save as vCard..."
 msgstr "_Gardar como vCardâ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1139
+#: ../modules/addressbook/e-book-shell-view-actions.c:1111
 msgid "Save selected contacts as a vCard"
 msgstr "Gardar os contactos seleccionados como unha VCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:346
+#: ../modules/addressbook/e-book-shell-view.c:290
 msgid "_Forward Contacts"
 msgstr "_ReencamiÃar os contactos"
 
-#: ../modules/addressbook/e-book-shell-view.c:348
+#: ../modules/addressbook/e-book-shell-view.c:292
 msgid "_Forward Contact"
 msgstr "_ReencamiÃar o contacto"
 
-#: ../modules/addressbook/e-book-shell-view.c:379
+#: ../modules/addressbook/e-book-shell-view.c:323
 msgid "_Send Message to Contacts"
 msgstr "Enviar unha _mensaxe aos contactos"
 
-#: ../modules/addressbook/e-book-shell-view.c:381
+#: ../modules/addressbook/e-book-shell-view.c:325
 msgid "_Send Message to List"
 msgstr "Enviar unha _mensaxe à lista"
 
-#: ../modules/addressbook/e-book-shell-view.c:383
+#: ../modules/addressbook/e-book-shell-view.c:327
 msgid "_Send Message to Contact"
 msgstr "Enviar unha _mensaxe ao contacto"
 
@@ -15827,10 +15489,12 @@ msgid "Anonymously"
 msgstr "Anonimamente"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
 msgid "Using email address"
 msgstr "Usando enderezo de correo"
 
 #: ../modules/addressbook/ldap-config.ui.h:6
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
 msgid "Using distinguished name (DN)"
 msgstr "Empregar o nome distintivo (DN)"
 
@@ -15848,6 +15512,12 @@ msgstr "Do"
 msgid "Supported Search Bases"
 msgstr "Bases de busca compatÃbeis"
 
+#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:112
+msgid "_Port:"
+msgstr "_Porto:"
+
 #: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Ser_ver:"
 msgstr "Ser_vidor:"
@@ -15903,6 +15573,7 @@ msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:30
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
 msgid "contacts"
 msgstr "contactos"
 
@@ -15919,108 +15590,567 @@ msgstr "LÃmite de _descarga:"
 msgid "B_rowse this book until limit reached"
 msgstr "Examina_r esta axenda de enderezos atà alcanzar o lÃmite"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:145
-#, c-format
-msgid "Failed to spawn Bogofilter (%s): "
-msgstr "Produciuse un fallo ao iniciar Bogofilter (%s): "
-
-#: ../modules/bogofilter/evolution-bogofilter.c:163
-msgid "Failed to stream mail message content to Bogofilter: "
+#: ../modules/backup-restore/e-mail-config-restore-page.c:167
+msgid ""
+"You can restore Evolution from a backup file.\n"
+"\n"
+"This will restore all your personal data, settings mail filters, etc."
 msgstr ""
-"Produciuse un fallo ao enviar o fluxo do contido dos correos a Bogofilter: "
+"Pode restabelecer o Evolution desde un ficheiro de respaldo.\n"
+"\n"
+"Isto restabelecerà todas as configuraciÃns persoais, filtros de correo, etc."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:212
-msgid "Bogofilter either crashed or failed to process a mail message"
-msgstr "Bogofilter colgouse ou fallou ao procesar unha mensaxe de correo"
+#: ../modules/backup-restore/e-mail-config-restore-page.c:182
+msgid "_Restore from a backup file:"
+msgstr "_Restabelecer desde un ficheiro de respaldo:"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:311
-msgid "Bogofilter Options"
-msgstr "OpciÃns do Bogofilter"
+#: ../modules/backup-restore/e-mail-config-restore-page.c:193
+msgid "Choose a backup file to restore"
+msgstr "Seleccionar un ficheiro de respaldo a restaurar"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:320
-msgid "Convert message text to _Unicode"
-msgstr "Converter o texto da mensaxe a _Unicode"
+#. Keep the title identical to EMailConfigRestorePage
+#. * so it's only shown once in the assistant sidebar.
+#: ../modules/backup-restore/e-mail-config-restore-page.c:313
+#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:57
+msgid "Restore from Backup"
+msgstr "Restaurar desde un respaldo"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:476
-msgid "Bogofilter"
-msgstr "Bogofilter"
+#: ../modules/backup-restore/evolution-backup-restore.c:217
+msgid "Select name of the Evolution backup file"
+msgstr "Seleccionar o nome do ficheiro de copia de seguranza do Evolution"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
-msgid ""
-"The UID of the selected (or \"primary\") calendar in the sidebar of the "
-"\"Calendar\" view."
-msgstr ""
-"UID do calendario seleccionado ou primario na barra lateral da vista de "
-"ÂCalendariosÂ."
+#: ../modules/backup-restore/evolution-backup-restore.c:250
+msgid "_Restart Evolution after backup"
+msgstr "_Reiniciar o Evolution despois de facer unha copia de seguranza"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
+#: ../modules/backup-restore/evolution-backup-restore.c:277
+msgid "Select name of the Evolution backup file to restore"
 msgstr ""
-"Fuso horario predeterminado para usar nas datas e horas do calendario, como "
-"unha localizaciÃn sen traducir da base de datos de fusos horarios Olsen, p."
-"e:ÂAmerica/New YorkÂ."
+"Seleccionar o nome do ficheiro da copia de seguranza do Evolution para "
+"restaurar"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
-msgid "Use the system timezone instead of the timezone selected in Evolution."
-msgstr ""
-"Usar o fuso horario do sistema en vez do fuso horario seleccionado no "
-"Evolution."
+#: ../modules/backup-restore/evolution-backup-restore.c:290
+msgid "_Restart Evolution after restore"
+msgstr "_Reiniciar o Evolution despois de restabelecer"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
-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Â."
+#: ../modules/backup-restore/evolution-backup-restore.c:308
+msgid "_Back up Evolution Data..."
+msgstr "Fa_cer unha copia de seguranza dos datos do Evolutionâ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
-msgid "List of recently used second time zones in a Day View."
-msgstr ""
-"Lista dos fusos horarios secundarios usados recentemente cunha vista diaria."
+#: ../modules/backup-restore/evolution-backup-restore.c:310
+msgid "Back up Evolution data and settings to an archive file"
+msgstr "Facer unha copia de seguranza dos datos e os axustes do Evolution"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
-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/backup-restore/evolution-backup-restore.c:315
+msgid "R_estore Evolution Data..."
+msgstr "R_estabelecer os datos do Evolutionâ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
-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/backup-restore/evolution-backup-restore.c:317
+msgid "Restore Evolution data and settings from an archive file"
+msgstr "Restabelecer os datos e os axustes do Evolution desde un ficheiro"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
-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/backup-restore/evolution-backup-tool.c:75
+msgid "Back up Evolution directory"
+msgstr "Facer unha copia de seguranza do directorio do Evolution"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
-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) ata o sÃbado (6)."
+#: ../modules/backup-restore/evolution-backup-tool.c:77
+msgid "Restore Evolution directory"
+msgstr "Restabelecer o directorio do Evolution"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
-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/backup-restore/evolution-backup-tool.c:79
+msgid "Check Evolution Back up"
+msgstr "Comprobar a copia de seguranza do Evolution"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
-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."
+#: ../modules/backup-restore/evolution-backup-tool.c:81
+msgid "Restart Evolution"
+msgstr "Reiniciar o Evolution"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
-msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels."
-msgstr ""
+#: ../modules/backup-restore/evolution-backup-tool.c:83
+msgid "With Graphical User Interface"
+msgstr "Con interface grÃfica de usuario"
+
+#. FIXME Will the versioned setting always work?
+#: ../modules/backup-restore/evolution-backup-tool.c:306
+#: ../modules/backup-restore/evolution-backup-tool.c:430
+msgid "Shutting down Evolution"
+msgstr "Pechando o Evolution"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:315
+msgid "Backing Evolution accounts and settings"
+msgstr "Facendo unha copia de seguranza das contas e axustes do Evolution"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:327
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr ""
+"Facendo unha copia de seguranza dos datos do Evolution (correos, contactos, "
+"calendarios, tarefas e notas)"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:343
+msgid "Back up complete"
+msgstr "Copia de seguranza completada"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:350
+#: ../modules/backup-restore/evolution-backup-tool.c:579
+msgid "Restarting Evolution"
+msgstr "Reiniciando o Evolution"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:436
+msgid "Back up current Evolution data"
+msgstr "Facer unha copia de seguranza dos datos actuais do Evolution"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:444
+msgid "Extracting files from back up"
+msgstr "Extraendo os ficheiros desde a copia de seguranza"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:513
+msgid "Loading Evolution settings"
+msgstr "Cargando os axustes do Evolution"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:549
+msgid "Removing temporary back up files"
+msgstr "Eliminando os ficheiros temporais da copia de seguranza"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:561
+msgid "Reloading registry service"
+msgstr "Recargando o servizo de rexistro"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:776
+msgid "Evolution Back Up"
+msgstr "Respaldo de Evolution"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:777
+#, c-format
+msgid "Backing up to the folder %s"
+msgstr "Facendo a copia de seguranza no cartafol %s"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:781
+msgid "Evolution Restore"
+msgstr "Restabelecemento do Evolution"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:782
+#, c-format
+msgid "Restoring from the folder %s"
+msgstr "Restabelecendo desde o cartafol %s"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:850
+msgid "Backing up Evolution Data"
+msgstr "Facendo unha copia de seguranza dos datos do Evolution"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:851
+msgid "Please wait while Evolution is backing up your data."
+msgstr "Agarde mentres o Evolution fai unha copia de seguranza dos datos."
+
+#: ../modules/backup-restore/evolution-backup-tool.c:853
+msgid "Restoring Evolution Data"
+msgstr "Restabelecendo os datos do Evolution"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:854
+msgid "Please wait while Evolution is restoring your data."
+msgstr "Agarde mentres o Evolution restabelece os datos."
+
+#: ../modules/backup-restore/evolution-backup-tool.c:872
+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 conta."
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:1
+msgid "Invalid Evolution backup file"
+msgstr "Ficheiro de respaldo de Evolution non vÃlido"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
+msgid "Please select a valid backup file to restore."
+msgstr "Seleccione un ficheiro de respaldo vÃlido que restaurar."
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid "Are you sure you want to close Evolution?"
+msgstr "Està seguro de que desexa pechar o Evolution?"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid ""
+"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 axustes, primeiro debe "
+"pechar o Evolution. AsegÃrese de gardar todos os datos antes de continuar."
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Close and Back up Evolution"
+msgstr "Pechar e facer unha copia de seguranza do Evolution"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr ""
+"Ten certeza de que quere restaurar Evolution desde o ficheiro de respaldo "
+"seleccionado?"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid ""
+"To restore your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding. This will delete "
+"all your current Evolution data and settings and restore them from your "
+"backup."
+msgstr ""
+"Para restaurar os datos e a sÃa configuraciÃn, primeiro debe pechar "
+"Evolution. AsegÃrese de gardar todos os datos antes de continuar. Isto "
+"eliminarà todos os datos e axustes actuais do Evolution e restaurarÃos desde "
+"o seu respaldo."
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
+msgid "Close and Restore Evolution"
+msgstr "Pechar e restabelecer o Evolution"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid "Insufficient Permissions"
+msgstr "Permisos insuficientes"
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:10
+msgid "The selected folder is not writable."
+msgstr "O cartafol seleccionado non à escribÃbel."
+
+#: ../modules/bogofilter/evolution-bogofilter.c:145
+#, c-format
+msgid "Failed to spawn Bogofilter (%s): "
+msgstr "Produciuse un fallo ao iniciar Bogofilter (%s): "
+
+#: ../modules/bogofilter/evolution-bogofilter.c:163
+msgid "Failed to stream mail message content to Bogofilter: "
+msgstr ""
+"Produciuse un fallo ao enviar o fluxo do contido dos correos a Bogofilter: "
+
+#: ../modules/bogofilter/evolution-bogofilter.c:212
+msgid "Bogofilter either crashed or failed to process a mail message"
+msgstr "Bogofilter colgouse ou fallou ao procesar unha mensaxe de correo"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:311
+msgid "Bogofilter Options"
+msgstr "OpciÃns do Bogofilter"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:320
+msgid "Convert message text to _Unicode"
+msgstr "Converter o texto da mensaxe a _Unicode"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:476
+msgid "Bogofilter"
+msgstr "Bogofilter"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:442
+msgid "Standard LDAP Port"
+msgstr "Porto LDAP estÃndar"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:448
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
+msgid "LDAP over SSL (deprecated)"
+msgstr "LDAP sobre SSL (obsoleto)"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:454
+msgid "Microsoft Global Catalog"
+msgstr "CatÃlogo global de Microsoft"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:460
+msgid "Microsoft Global Catalog over SSL"
+msgstr "CatÃlogo global de Microsoft sobre SSL"
+
+#. Page 1
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
+msgid "Connecting to LDAP"
+msgstr "Conecando a LDAP"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
+msgid "Server Information"
+msgstr "InformaciÃn do servidor"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
+msgid "StartTLS (recommended)"
+msgstr "StartTLS (recomendado)"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+msgid "Encryption:"
+msgstr "Cifrado:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:648
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:258
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:181
+msgid "Authentication"
+msgstr "AutenticaciÃn"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
+msgid "Anonymous"
+msgstr "Anonimamente"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+msgid "Method:"
+msgstr "MÃtodo:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Using email address\" requires anonymous access to your "
+"LDAP server."
+msgstr ""
+"Este à o mÃtodo que o Evolution usarà para autenticalo a vostede. TeÃa en "
+"conta que ao definir isto a ÂUsar enderezo de correo require o acceso "
+"anÃnimo ao servidor LDAP."
+
+#. Page 2
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
+msgid "Using LDAP"
+msgstr "Usando LDAP"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../modules/mail/e-mail-shell-view.c:58
+msgid "Searching"
+msgstr "Buscando"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
+msgid "Search Base:"
+msgstr "Base de busca:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
+msgid "Find Possible Search Bases"
+msgstr "Buscar bases de busca posÃbeis"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
+msgid "One Level"
+msgstr "Un nivel"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:770
+msgid "Subtree"
+msgstr "SubÃrbore"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
+msgid "Search Scope:"
+msgstr "Ãmbito da busca:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:777
+#, fuzzy
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree.  A search scope of \"Subtree\" will include all entries "
+"below your search base.  A search scope of \"One Level\" will only include "
+"the entries one level beneath your search base."
+msgstr ""
+"O Ãmbito de busca define atà que profundidade desexa que a busca se estenda "
+"ao longo dunha Ãrbore de cartafoles. Un Ãmbito de busca de Âsub incluirà "
+"todas as entradas por embaixo da sÃa base de busca. Un Ãmbito Âun sà "
+"incluirà as entradas un nivel por embaixo da sÃa base."
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:786
+msgid "Search Filter:"
+msgstr "Filtro de busca:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:798
+msgid "Downloading"
+msgstr "Descargando"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:819
+msgid "Limit:"
+msgstr "LÃmite:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:835
+msgid "Browse until limit is reached"
+msgstr "Examinar atà chegar ao final"
+
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:134
+#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:133
+msgid "URL:"
+msgstr "URL:"
+
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:144
+msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
+msgstr "Evitar o IfMatch (necesario no Apache < 2.2.8)"
+
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:264
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:200
+msgid "Choose a Calendar"
+msgstr "Elixir un calendario"
+
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:267
+msgid "Choose a Memo List"
+msgstr "Elixir unha lista de notas"
+
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:270
+msgid "Choose a Task List"
+msgstr "Elixir unha lista de tarefas"
+
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:398
+#, c-format
+msgid "HTTP Error: %s"
+msgstr "Erro HTTP: %s"
+
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:428
+msgid "Could not parse response"
+msgstr "Non foi posÃbel analizar a resposta"
+
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:437
+msgid "Empty response"
+msgstr "Resposta baleira"
+
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:445
+msgid "Unexpected reply from server"
+msgstr "Resposta non agardada do servidor"
+
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1032
+msgid "Could not locate user's calendars"
+msgstr "Non foi posÃbel atopar ningÃn calendario do usuario."
+
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1256
+msgid "Path"
+msgstr "Ruta"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:259
+msgid "Find Calendars"
+msgstr "Buscar calendarios"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:262
+msgid "Find Memo Lists"
+msgstr "Buscar lista de notas"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:265
+msgid "Find Task Lists"
+msgstr "Buscar listas de tarefas"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:283
+msgid "Path:"
+msgstr "Ruta:"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:289
+msgid "Email:"
+msgstr "Correo electrÃnico:"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:294
+msgid "Server handles meeting invitations"
+msgstr "O servidor xestiona os convites a reuniÃns"
+
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:73
+msgid "Choose which address books to use."
+msgstr "Seleccione a axenda de enderezos a usar."
+
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
+msgid "Use in Birthdays & Anniversaries calendar"
+msgstr "Usar no cartafol Cumpreanos e aniversarios"
+
+#: ../modules/cal-config-google/e-google-chooser-button.c:127
+msgid "Default User Calendar"
+msgstr "Calendario do usuario por omisiÃn"
+
+#: ../modules/cal-config-google/e-google-chooser.c:508
+#, c-format
+msgid "Enter Google password for user '%s'."
+msgstr "Escriba o contrasinal de Google para o usuario Â%sÂ."
+
+#: ../modules/cal-config-google/e-google-chooser.c:525
+msgid "User declined to provide a password"
+msgstr "O usuario rexeitou fornecer un contrasinal"
+
+#: ../modules/cal-config-local/evolution-cal-config-local.c:161
+msgid "Use an existing iCalendar (ics) file"
+msgstr "Usar un ficheiro iCalendar existente (ics)"
+
+#: ../modules/cal-config-local/evolution-cal-config-local.c:186
+msgid "iCalendar File"
+msgstr "Ficheiro iCalendar"
+
+#: ../modules/cal-config-local/evolution-cal-config-local.c:198
+msgid "Choose an iCalendar file"
+msgstr "Seleccione un ficheiro iCalendar"
+
+#: ../modules/cal-config-local/evolution-cal-config-local.c:201
+msgid "File:"
+msgstr "Ficheiro:"
+
+#: ../modules/cal-config-local/evolution-cal-config-local.c:216
+msgid "Allow Evolution to update the file"
+msgstr "Permitir a Evolution actualizar o ficheiro"
+
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:224
+msgid "Metric (Celsius, cm, etc)"
+msgstr "MÃtrico (CentÃgrados, cm, etc.)"
+
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:227
+msgid "Imperial (Fahrenheit, inches, etc)"
+msgstr "Anglo-saxÃn (Fahrenheit, polgadas etc.)"
+
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:229
+msgid "Units:"
+msgstr "Unidades:"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+msgid ""
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view."
+msgstr ""
+"UID do calendario seleccionado ou primario na barra lateral da vista de "
+"ÂCalendariosÂ."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+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 ""
+"Fuso horario predeterminado para usar nas datas e horas do calendario, como "
+"unha localizaciÃn sen traducir da base de datos de fusos horarios Olsen, p."
+"e:ÂAmerica/New YorkÂ."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr ""
+"Usar o fuso horario do sistema en vez do fuso horario seleccionado no "
+"Evolution."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+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Â."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+msgid "List of recently used second time zones in a Day View."
+msgstr ""
+"Lista dos fusos horarios secundarios usados recentemente cunha vista diaria."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+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:12
+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:14
+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:28
+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) ata o sÃbado (6)."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+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:38
+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."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+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 vista mensual, en pÃxeles."
 
@@ -16288,36 +16418,36 @@ msgstr ""
 "Isto pode ter tres valores diferentes: 0 para erros, 1 para avisos e 2 para "
 "as mensaxes de depuraciÃn."
 
-#: ../modules/calendar/e-cal-attachment-handler.c:320
+#: ../modules/calendar/e-cal-attachment-handler.c:323
 #: ../smime/gui/smime-ui.ui.h:32
 msgid "I_mport"
 msgstr "I_mportar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:407
+#: ../modules/calendar/e-cal-attachment-handler.c:409
 msgid "Select a Calendar"
 msgstr "Seleccionar un calendario"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:434
+#: ../modules/calendar/e-cal-attachment-handler.c:436
 msgid "Select a Task List"
 msgstr "Seleccionar unha lista de tarefas"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:444
+#: ../modules/calendar/e-cal-attachment-handler.c:446
 msgid "I_mport to Calendar"
 msgstr "I_mportar ao calendario"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:451
+#: ../modules/calendar/e-cal-attachment-handler.c:453
 msgid "I_mport to Tasks"
 msgstr "_Importar Ãs tarefas"
 
-#: ../modules/calendar/e-calendar-preferences.c:467
-msgid "Selected Calendars for Reminders"
-msgstr "Calendarios seleccionados para os recordatorios"
+#: ../modules/calendar/e-calendar-preferences.c:406
+msgid "Selected Calendars for Alarms"
+msgstr "Seleccionar calendario para alarmas"
 
-#: ../modules/calendar/e-calendar-preferences.c:891
+#: ../modules/calendar/e-calendar-preferences.c:828
 msgid "Ti_me and date:"
 msgstr "_Hora e data:"
 
-#: ../modules/calendar/e-calendar-preferences.c:892
+#: ../modules/calendar/e-calendar-preferences.c:829
 msgid "_Date only:"
 msgstr "SÃ a _data:"
 
@@ -16383,7 +16513,7 @@ msgid "_24 hour"
 msgstr "_24 horas"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
-#: ../modules/calendar/e-cal-shell-view-actions.c:1736
+#: ../modules/calendar/e-cal-shell-view-actions.c:1742
 msgid "Work Week"
 msgstr "Semana laboral"
 
@@ -16477,6 +16607,10 @@ msgstr "Desp_razar a vista mensual unha semana"
 msgid "Display"
 msgstr "Mostrar"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
+msgid "Task List"
+msgstr "Lista de tarefas"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Highlight t_asks due today"
 msgstr "Realzar tarefas que _vencen hoxe"
@@ -16536,87 +16670,71 @@ msgstr ""
 msgid "Publishing Information"
 msgstr "InformaciÃn de publicaciÃn"
 
-#. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:198
-#: ../modules/calendar/e-memo-shell-backend.c:114
-#: ../modules/calendar/e-memo-shell-migrate.c:155
-#: ../modules/calendar/e-task-shell-backend.c:110
-#: ../modules/calendar/e-task-shell-migrate.c:164
-msgid "On The Web"
-msgstr "Na Web"
-
-#: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../plugins/calendar-weather/calendar-weather.c:127
-msgid "Weather"
-msgstr "O tempo"
-
-#: ../modules/calendar/e-cal-shell-backend.c:212
-#: ../modules/calendar/e-cal-shell-migrate.c:66
-msgid "Birthdays & Anniversaries"
-msgstr "Aniversarios"
-
-#: ../modules/calendar/e-cal-shell-backend.c:457
+#: ../modules/calendar/e-cal-shell-backend.c:278
+#: ../modules/calendar/e-cal-shell-view-actions.c:191
+msgid "New Calendar"
+msgstr "Calendario novo"
+
+#: ../modules/calendar/e-cal-shell-backend.c:287
 msgctxt "New"
 msgid "_Appointment"
 msgstr "Cit_a"
 
-#: ../modules/calendar/e-cal-shell-backend.c:459
-#: ../modules/calendar/e-cal-shell-view-actions.c:1541
+#: ../modules/calendar/e-cal-shell-backend.c:289
+#: ../modules/calendar/e-cal-shell-view-actions.c:1547
 msgid "Create a new appointment"
 msgstr "Crear unha cita nova"
 
-#: ../modules/calendar/e-cal-shell-backend.c:464
+#: ../modules/calendar/e-cal-shell-backend.c:294
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Ci_ta para todo o dÃa"
 
-#: ../modules/calendar/e-cal-shell-backend.c:466
+#: ../modules/calendar/e-cal-shell-backend.c:296
 msgid "Create a new all-day appointment"
 msgstr "Crear unha cita nova para todo o dÃa"
 
-#: ../modules/calendar/e-cal-shell-backend.c:471
+#: ../modules/calendar/e-cal-shell-backend.c:301
 msgctxt "New"
 msgid "M_eeting"
 msgstr "R_euniÃn"
 
-#: ../modules/calendar/e-cal-shell-backend.c:473
+#: ../modules/calendar/e-cal-shell-backend.c:303
 msgid "Create a new meeting request"
 msgstr "Crear unha solicitude de nova xuntanza"
 
-#: ../modules/calendar/e-cal-shell-backend.c:481
+#: ../modules/calendar/e-cal-shell-backend.c:311
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
-#: ../modules/calendar/e-cal-shell-backend.c:483
-#: ../modules/calendar/e-cal-shell-view-actions.c:1415
+#: ../modules/calendar/e-cal-shell-backend.c:313
+#: ../modules/calendar/e-cal-shell-view-actions.c:1421
 msgid "Create a new calendar"
 msgstr "Crear un calendario novo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:806
+#: ../modules/calendar/e-cal-shell-backend.c:593
 msgid "Calendar and Tasks"
 msgstr "Calendario e tarefas"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:190
+#: ../modules/calendar/e-cal-shell-sidebar.c:209
 msgid "Loading calendars"
 msgstr "Cargando os calendarios"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:765
-msgid "_New Calendar..."
-msgstr "Calendario _novoâ"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:782
+#: ../modules/calendar/e-cal-shell-sidebar.c:715
 msgid "Calendar Selector"
 msgstr "Selector de calendario"
 
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1122
-#, c-format
-msgid "Opening calendar at %s"
+#: ../modules/calendar/e-cal-shell-sidebar.c:1054
+#, fuzzy, c-format
+msgid "Opening calendar '%s'"
 msgstr "Abrindo o calendario en %s"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:329
+#: ../modules/calendar/e-cal-shell-view-actions.c:291
+msgid "Calendar Properties"
+msgstr "Propiedades do calendario"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:322
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -16628,11 +16746,11 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:346
+#: ../modules/calendar/e-cal-shell-view-actions.c:339
 msgid "Purge events older than"
 msgstr "Purgar as actividades anteriores a"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:600
+#: ../modules/calendar/e-cal-shell-view-actions.c:590
 msgid "Copying Items"
 msgstr "Copiando os elementos"
 
@@ -16642,349 +16760,349 @@ msgstr "Movendo os 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:1211
+#: ../modules/calendar/e-cal-shell-view-actions.c:1217
 msgid "event"
 msgstr "actividade"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1213
-#: ../modules/calendar/e-cal-shell-view-memopad.c:221
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:288
-#: ../modules/calendar/e-memo-shell-view-actions.c:542
-#: ../modules/calendar/e-task-shell-view-actions.c:659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1219
+#: ../modules/calendar/e-cal-shell-view-memopad.c:231
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:298
+#: ../modules/calendar/e-memo-shell-view-actions.c:548
+#: ../modules/calendar/e-task-shell-view-actions.c:665
 msgid "Save as iCalendar"
 msgstr "Gardar como iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1371
-#: ../modules/calendar/e-memo-shell-view-actions.c:623
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-memo-shell-view-actions.c:629
 msgid "_Copy..."
 msgstr "_Copiarâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "D_elete Calendar"
 msgstr "_Eliminar o calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1380
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "Delete the selected calendar"
 msgstr "Eliminar o calendario seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "Go Back"
 msgstr "AtrÃs"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "Go Forward"
 msgstr "Adiante"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1401
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "Select today"
 msgstr "Seleccionar o dÃa de hoxe"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1406
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
 msgid "Select _Date"
 msgstr "Seleccionar unha _data"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1414
 msgid "Select a specific date"
 msgstr "Seleccionar unha data determinada"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1413
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "_New Calendar"
 msgstr "Calendario _novo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1427
-#: ../modules/calendar/e-task-shell-view-actions.c:831
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-task-shell-view-actions.c:837
 msgid "Purg_e"
 msgstr "P_urgar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1429
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
 msgid "Purge old appointments and meetings"
 msgstr "Purgar as citas e reuniÃns antigas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
-#: ../modules/calendar/e-memo-shell-view-actions.c:651
-#: ../modules/calendar/e-task-shell-view-actions.c:775
+#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "Re_fresh"
 msgstr "Ac_tualizar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1436
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Refresh the selected calendar"
 msgstr "Actualizar o calendario seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1443
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "Rename the selected calendar"
 msgstr "Renomear o calendario seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1454
 msgid "Find _next"
 msgstr "Buscar segui_nte"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1450
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Find next occurrence of the current search string"
 msgstr "Buscar a seguinte coincidencia da frase de busca actual"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1455
+#: ../modules/calendar/e-cal-shell-view-actions.c:1461
 msgid "Find _previous"
 msgstr "_Buscar _anterior"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1457
+#: ../modules/calendar/e-cal-shell-view-actions.c:1463
 msgid "Find previous occurrence of the current search string"
 msgstr "Buscar a coincidencia anterior da frase de busca actual"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-cal-shell-view-actions.c:1468
 msgid "Stop _running search"
 msgstr "Dete_r a busca en execuciÃn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1464
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
 msgid "Stop currently running search"
 msgstr "Deter a busca actual en execuciÃn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1469
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Show _Only This Calendar"
 msgstr "M_ostrar sà este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1476
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar ao calendarioâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1483
+#: ../modules/calendar/e-cal-shell-view-actions.c:1489
 msgid "_Delegate Meeting..."
 msgstr "_Delegar a reuniÃnâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1490
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
 msgid "_Delete Appointment"
 msgstr "_Eliminar esta cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1492
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "Delete selected appointments"
 msgstr "Eliminar as citas seleccionadas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1497
+#: ../modules/calendar/e-cal-shell-view-actions.c:1503
 msgid "Delete This _Occurrence"
 msgstr "Eliminar esta _apariciÃn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1499
+#: ../modules/calendar/e-cal-shell-view-actions.c:1505
 msgid "Delete this occurrence"
 msgstr "Eliminar esta apariciÃn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1504
+#: ../modules/calendar/e-cal-shell-view-actions.c:1510
 msgid "Delete All Occ_urrences"
 msgstr "Eliminar _todas as apariciÃns"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1506
+#: ../modules/calendar/e-cal-shell-view-actions.c:1512
 msgid "Delete all occurrences"
 msgstr "Eliminar todas as apariciÃns"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
 msgid "New All Day _Event..."
 msgstr "Nova _actividade de dÃa completoâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
 msgid "Create a new all day event"
 msgstr "Crear unha actividade nova de dÃa completo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1518
-#: ../modules/calendar/e-cal-shell-view-memopad.c:255
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:328
-#: ../modules/calendar/e-memo-shell-view-actions.c:616
-#: ../modules/calendar/e-task-shell-view-actions.c:740
+#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+#: ../modules/calendar/e-cal-shell-view-memopad.c:265
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "_Forward as iCalendar..."
 msgstr "ReemcamiÃa_r como iCalendarâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+#: ../modules/calendar/e-cal-shell-view-actions.c:1531
 msgid "New _Meeting..."
 msgstr "_ReuniÃn novaâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1527
+#: ../modules/calendar/e-cal-shell-view-actions.c:1533
 msgid "Create a new meeting"
 msgstr "Crear unha reuniÃn nova"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1532
+#: ../modules/calendar/e-cal-shell-view-actions.c:1538
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver ao calendarioâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1539
+#: ../modules/calendar/e-cal-shell-view-actions.c:1545
 msgid "New _Appointment..."
 msgstr "Cit_a novaâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1546
+#: ../modules/calendar/e-cal-shell-view-actions.c:1552
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta apariciÃn _desprazÃbel"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1553
+#: ../modules/calendar/e-cal-shell-view-actions.c:1559
 msgid "_Open Appointment"
 msgstr "_Abrir unha cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1555
+#: ../modules/calendar/e-cal-shell-view-actions.c:1561
 msgid "View the current appointment"
 msgstr "Ver a cita actual"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1560
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1574
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
 msgid "_Schedule Meeting..."
 msgstr "_Programar unha reuniÃnâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1576
+#: ../modules/calendar/e-cal-shell-view-actions.c:1582
 msgid "Converts an appointment to a meeting"
 msgstr "Converte una cita nunha reuniÃn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1581
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
 msgid "Conv_ert to Appointment..."
 msgstr "Conv_erter en citaâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1583
+#: ../modules/calendar/e-cal-shell-view-actions.c:1589
 msgid "Converts a meeting to an appointment"
 msgstr "Converte unha reuniÃn nunha cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1594
 msgid "Quit"
 msgstr "SaÃr"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1708
+#: ../modules/calendar/e-cal-shell-view-actions.c:1714
 msgid "Day"
 msgstr "DÃa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-cal-shell-view-actions.c:1716
 msgid "Show one day"
 msgstr "Mostrar un dÃa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1715
+#: ../modules/calendar/e-cal-shell-view-actions.c:1721
 msgid "List"
 msgstr "Lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../modules/calendar/e-cal-shell-view-actions.c:1723
 msgid "Show as list"
 msgstr "Mostrar como unha lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1722
+#: ../modules/calendar/e-cal-shell-view-actions.c:1728
 msgid "Month"
 msgstr "Mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1724
+#: ../modules/calendar/e-cal-shell-view-actions.c:1730
 msgid "Show one month"
 msgstr "Mostrar un mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1729
+#: ../modules/calendar/e-cal-shell-view-actions.c:1735
 msgid "Week"
 msgstr "Semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1737
 msgid "Show one week"
 msgstr "Mostrar unha semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1738
+#: ../modules/calendar/e-cal-shell-view-actions.c:1744
 msgid "Show one work week"
 msgstr "Mostrar unha semana laboral"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1746
+#: ../modules/calendar/e-cal-shell-view-actions.c:1752
 msgid "Active Appointments"
 msgstr "Citas activas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1760
+#: ../modules/calendar/e-cal-shell-view-actions.c:1766
 msgid "Next 7 Days' Appointments"
 msgstr "Citas dos prÃximos sete dÃas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1767
+#: ../modules/calendar/e-cal-shell-view-actions.c:1773
 msgid "Occurs Less Than 5 Times"
 msgstr "Acontece menos de 5 veces"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1798
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/calendar/e-cal-shell-view-actions.c:1804
+#: ../modules/calendar/e-memo-shell-view-actions.c:819
+#: ../modules/calendar/e-task-shell-view-actions.c:1018
 msgid "Description contains"
 msgstr "A descriciÃn contÃn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1805
-#: ../modules/calendar/e-memo-shell-view-actions.c:820
-#: ../modules/calendar/e-task-shell-view-actions.c:1019
+#: ../modules/calendar/e-cal-shell-view-actions.c:1811
+#: ../modules/calendar/e-memo-shell-view-actions.c:826
+#: ../modules/calendar/e-task-shell-view-actions.c:1025
 msgid "Summary contains"
 msgstr "O resumo contÃn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1817
+#: ../modules/calendar/e-cal-shell-view-actions.c:1823
 msgid "Print this calendar"
 msgstr "Imprimir este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1824
+#: ../modules/calendar/e-cal-shell-view-actions.c:1830
 msgid "Preview the calendar to be printed"
 msgstr "Previsualizar o calendario que se vai imprimir"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1846
-#: ../modules/calendar/e-cal-shell-view-memopad.c:296
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:383
-#: ../modules/calendar/e-memo-shell-view-actions.c:861
-#: ../modules/calendar/e-task-shell-view-actions.c:1060
+#: ../modules/calendar/e-cal-shell-view-actions.c:1852
+#: ../modules/calendar/e-cal-shell-view-memopad.c:306
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:393
+#: ../modules/calendar/e-memo-shell-view-actions.c:867
+#: ../modules/calendar/e-task-shell-view-actions.c:1066
 msgid "_Save as iCalendar..."
 msgstr "Gardar como iCalendarâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1923
+#: ../modules/calendar/e-cal-shell-view-actions.c:1929
 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:219
-#: ../modules/calendar/e-memo-shell-view-actions.c:540
+#: ../modules/calendar/e-cal-shell-view-memopad.c:229
+#: ../modules/calendar/e-memo-shell-view-actions.c:546
 msgid "memo"
 msgstr "nota"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:262
-#: ../modules/calendar/e-memo-shell-view-actions.c:672
+#: ../modules/calendar/e-cal-shell-view-memopad.c:272
+#: ../modules/calendar/e-memo-shell-view-actions.c:678
 msgid "New _Memo"
 msgstr "Nota _nova"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
-#: ../modules/calendar/e-memo-shell-backend.c:314
-#: ../modules/calendar/e-memo-shell-view-actions.c:674
+#: ../modules/calendar/e-cal-shell-view-memopad.c:274
+#: ../modules/calendar/e-memo-shell-backend.c:204
+#: ../modules/calendar/e-memo-shell-view-actions.c:680
 msgid "Create a new memo"
 msgstr "Crear unha nota nova"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:269
-#: ../modules/calendar/e-memo-shell-view-actions.c:679
+#: ../modules/calendar/e-cal-shell-view-memopad.c:279
+#: ../modules/calendar/e-memo-shell-view-actions.c:685
 msgid "_Open Memo"
 msgstr "_Abrir a nota"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
-#: ../modules/calendar/e-memo-shell-view-actions.c:681
+#: ../modules/calendar/e-cal-shell-view-memopad.c:281
+#: ../modules/calendar/e-memo-shell-view-actions.c:687
 msgid "View the selected memo"
 msgstr "Ver a nota seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:276
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:363
-#: ../modules/calendar/e-memo-shell-view-actions.c:686
-#: ../modules/calendar/e-task-shell-view-actions.c:824
+#: ../modules/calendar/e-cal-shell-view-memopad.c:286
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../modules/calendar/e-memo-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:830
 msgid "Open _Web Page"
 msgstr "Abrir a pÃxina _web"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:288
-#: ../modules/calendar/e-memo-shell-view-actions.c:846
+#: ../modules/calendar/e-cal-shell-view-memopad.c:298
+#: ../modules/calendar/e-memo-shell-view-actions.c:852
 msgid "Print the selected memo"
 msgstr "Imprimir a nota seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1466
+#: ../modules/calendar/e-cal-shell-view-private.c:1457
 msgid "Searching next matching event"
 msgstr "Buscando o seguinte evento coincidente"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1467
+#: ../modules/calendar/e-cal-shell-view-private.c:1458
 msgid "Searching previous matching event"
 msgstr "Buscando o anterior evento coincidente"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1485
+#: ../modules/calendar/e-cal-shell-view-private.c:1476
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "Non à posÃbel atopar un evento coincidente dentro de %d ano"
 msgstr[1] "Non à posÃbel atopar un evento coincidente dentro de %d anos"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1488
+#: ../modules/calendar/e-cal-shell-view-private.c:1479
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "Non à posÃbel atopar un evento coincidente fai %d ano"
 msgstr[1] "Non à posÃbel atopar un evento coincidente fai %d anos"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1509
+#: ../modules/calendar/e-cal-shell-view-private.c:1500
 msgid "Cannot search with no active calendar"
 msgstr "Non à posÃbel buscar sen un calendario activo"
 
@@ -16992,229 +17110,245 @@ msgstr "Non à posÃbel buscar sen un calendario activo"
 #. * 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:286
-#: ../modules/calendar/e-task-shell-view-actions.c:657
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:296
+#: ../modules/calendar/e-task-shell-view-actions.c:663
 msgid "task"
 msgstr "tarefa"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:321
-#: ../modules/calendar/e-task-shell-view-actions.c:719
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "_Assign Task"
 msgstr "_Asignar unha tarefa"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:335
-#: ../modules/calendar/e-task-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Mark as Complete"
 msgstr "_Marcar como terminada"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
-#: ../modules/calendar/e-task-shell-view-actions.c:798
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:804
 msgid "Mark selected tasks as complete"
 msgstr "Marcar as tarefas seleccionadas como terminadas"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:342
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
 msgid "_Mark as Incomplete"
 msgstr "_Marcar como non terminada"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:805
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
+#: ../modules/calendar/e-task-shell-view-actions.c:811
 msgid "Mark selected tasks as incomplete"
 msgstr "Marcar as tarefas seleccionadas como non terminadas"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:349
-#: ../modules/calendar/e-task-shell-view-actions.c:810
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
+#: ../modules/calendar/e-task-shell-view-actions.c:816
 msgid "New _Task"
 msgstr "_Tarefa nova"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
-#: ../modules/calendar/e-task-shell-backend.c:309
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-task-shell-backend.c:201
+#: ../modules/calendar/e-task-shell-view-actions.c:818
 msgid "Create a new task"
 msgstr "Crear unha tarefa nova"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
-#: ../modules/calendar/e-task-shell-view-actions.c:817
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:366
+#: ../modules/calendar/e-task-shell-view-actions.c:823
 msgid "_Open Task"
 msgstr "_Abrir unha tarefa"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
-#: ../modules/calendar/e-task-shell-view-actions.c:819
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:368
+#: ../modules/calendar/e-task-shell-view-actions.c:825
 msgid "View the selected task"
 msgstr "Ver a tarefa seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:375
-#: ../modules/calendar/e-task-shell-view-actions.c:1045
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:385
+#: ../modules/calendar/e-task-shell-view-actions.c:1051
 msgid "Print the selected task"
 msgstr "Imprimir a tarefa seleccionada"
 
-#: ../modules/calendar/e-memo-shell-backend.c:312
+#: ../modules/calendar/e-memo-shell-backend.c:193
+#: ../modules/calendar/e-memo-shell-view-actions.c:216
+msgid "New Memo List"
+msgstr "Lista de notas nova"
+
+#: ../modules/calendar/e-memo-shell-backend.c:202
 msgctxt "New"
 msgid "Mem_o"
 msgstr "N_ota"
 
-#: ../modules/calendar/e-memo-shell-backend.c:319
+#: ../modules/calendar/e-memo-shell-backend.c:209
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "Nota _compartida"
 
-#: ../modules/calendar/e-memo-shell-backend.c:321
+#: ../modules/calendar/e-memo-shell-backend.c:211
 msgid "Create a new shared memo"
 msgstr "Crear unha nota compartida nova"
 
-#: ../modules/calendar/e-memo-shell-backend.c:329
+#: ../modules/calendar/e-memo-shell-backend.c:219
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Li_sta de notas"
 
-#: ../modules/calendar/e-memo-shell-backend.c:331
-#: ../modules/calendar/e-memo-shell-view-actions.c:639
+#: ../modules/calendar/e-memo-shell-backend.c:221
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
 msgid "Create a new memo list"
 msgstr "Crear unha lista de notas nova"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:186
+#: ../modules/calendar/e-memo-shell-sidebar.c:204
 msgid "Loading memos"
 msgstr "Cargando as notas"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:707
+#: ../modules/calendar/e-memo-shell-sidebar.c:647
 msgid "Memo List Selector"
 msgstr "Selector de lista de notas"
 
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:1009
-#, c-format
-msgid "Opening memos at %s"
+#: ../modules/calendar/e-memo-shell-sidebar.c:939
+#, fuzzy, c-format
+msgid "Opening memo list '%s'"
 msgstr "Abrindo as notas en %s"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:241
-#: ../modules/calendar/e-memo-shell-view-actions.c:256
+#: ../modules/calendar/e-memo-shell-view-actions.c:232
+#: ../modules/calendar/e-memo-shell-view-actions.c:247
 msgid "Print Memos"
 msgstr "Imprimir as notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:602
+#: ../modules/calendar/e-memo-shell-view-actions.c:288
+msgid "Memo List Properties"
+msgstr "Propiedades da lista de notas"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "_Delete Memo"
 msgstr "E_liminar a nota"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:609
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "_Find in Memo..."
 msgstr "_Buscar na notaâ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:611
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
 msgid "Search for text in the displayed memo"
 msgstr "Buscar un texto na nota mostrada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:630
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "D_elete Memo List"
 msgstr "_Eliminar a lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:632
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
 msgid "Delete the selected memo list"
 msgstr "Eliminar a lista de notas seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:637
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "_New Memo List"
 msgstr "Lista de notas _nova"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:653
+#: ../modules/calendar/e-memo-shell-view-actions.c:659
 msgid "Refresh the selected memo list"
 msgstr "Actualizar a lista de notas seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
+#: ../modules/calendar/e-memo-shell-view-actions.c:666
 msgid "Rename the selected memo list"
 msgstr "Renomear a lista de notas seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:665
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
 msgid "Show _Only This Memo List"
 msgstr "M_ostrar sà esta lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:744
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
 msgid "Memo _Preview"
 msgstr "Vista _previa de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:746
+#: ../modules/calendar/e-memo-shell-view-actions.c:752
 msgid "Show memo preview pane"
 msgstr "Mostrar o panel de vista previa de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-memo-shell-view-actions.c:773
 msgid "Show memo preview below the memo list"
 msgstr "Mostrar a vista previa da nota embaxio da lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-memo-shell-view-actions.c:780
 msgid "Show memo preview alongside the memo list"
 msgstr "Mostrar a vista previa da nota a carÃn da lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:832
+#: ../modules/calendar/e-memo-shell-view-actions.c:838
 msgid "Print the list of memos"
 msgstr "Imprimir a lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:839
+#: ../modules/calendar/e-memo-shell-view-actions.c:845
 msgid "Preview the list of memos to be printed"
 msgstr "Previsualizar a lista de notas para imprimir"
 
-#: ../modules/calendar/e-memo-shell-view.c:227
+#: ../modules/calendar/e-memo-shell-view.c:230
 msgid "Delete Memos"
 msgstr "Eliminar as notas"
 
-#: ../modules/calendar/e-memo-shell-view.c:229
+#: ../modules/calendar/e-memo-shell-view.c:232
 msgid "Delete Memo"
 msgstr "Eliminar a nota"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:424
+#: ../modules/calendar/e-memo-shell-view-private.c:427
 #, 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:428
-#: ../modules/calendar/e-task-shell-view-private.c:609
+#: ../modules/calendar/e-memo-shell-view-private.c:431
+#: ../modules/calendar/e-task-shell-view-private.c:612
 #, c-format
 msgid "%d selected"
 msgstr "%d seleccionada"
 
-#: ../modules/calendar/e-task-shell-backend.c:307
+#: ../modules/calendar/e-task-shell-backend.c:190
+#: ../modules/calendar/e-task-shell-view-actions.c:239
+msgid "New Task List"
+msgstr "Lista de tarefas nova"
+
+#: ../modules/calendar/e-task-shell-backend.c:199
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../modules/calendar/e-task-shell-backend.c:314
+#: ../modules/calendar/e-task-shell-backend.c:206
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tarefa asigna_da"
 
-#: ../modules/calendar/e-task-shell-backend.c:316
+#: ../modules/calendar/e-task-shell-backend.c:208
 msgid "Create a new assigned task"
 msgstr "Crear unha tarefa asignada nova"
 
-#: ../modules/calendar/e-task-shell-backend.c:324
+#: ../modules/calendar/e-task-shell-backend.c:216
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Lista de tare_fas"
 
-#: ../modules/calendar/e-task-shell-backend.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:763
+#: ../modules/calendar/e-task-shell-backend.c:218
+#: ../modules/calendar/e-task-shell-view-actions.c:769
 msgid "Create a new task list"
 msgstr "Crear unha lista de tarefas nova"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:186
+#: ../modules/calendar/e-task-shell-sidebar.c:204
 msgid "Loading tasks"
 msgstr "Cargando as tarefas"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:707
+#: ../modules/calendar/e-task-shell-sidebar.c:647
 msgid "Task List Selector"
 msgstr "Selector de lista de tarefas"
 
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:1011
-#, c-format
-msgid "Opening tasks at %s"
+#: ../modules/calendar/e-task-shell-sidebar.c:939
+#, fuzzy, c-format
+msgid "Opening task list '%s'"
 msgstr "Abrindo as tarefas en %s"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:264
-#: ../modules/calendar/e-task-shell-view-actions.c:279
+#: ../modules/calendar/e-task-shell-view-actions.c:255
+#: ../modules/calendar/e-task-shell-view-actions.c:270
 msgid "Print Tasks"
 msgstr "Imprimir as tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:601
+#: ../modules/calendar/e-task-shell-view-actions.c:311
+msgid "Task List Properties"
+msgstr "Propiedades da lista de tarefas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:607
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -17226,121 +17360,163 @@ msgstr ""
 "\n"
 "Està seguro de que desexa eliminalas?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:608
+#: ../modules/calendar/e-task-shell-view-actions.c:614
 msgid "Do not ask me again"
 msgstr "Non preguntar de novo."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:726
+#: ../modules/calendar/e-task-shell-view-actions.c:732
 msgid "_Delete Task"
 msgstr "E_liminar a tarefa"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "_Find in Task..."
 msgstr "Buscar na tare_faâ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:735
+#: ../modules/calendar/e-task-shell-view-actions.c:741
 msgid "Search for text in the displayed task"
 msgstr "Buscar un texto na tarefa mostrada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-view-actions.c:753
 msgid "Copy..."
 msgstr "Copiarâ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:754
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "D_elete Task List"
 msgstr "_Eliminar a lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:756
+#: ../modules/calendar/e-task-shell-view-actions.c:762
 msgid "Delete the selected task list"
 msgstr "Eliminar a lista de tarefas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "_New Task List"
 msgstr "Lista de tarefas _nova"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:777
+#: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "Refresh the selected task list"
 msgstr "Actualizar a lista de tarefas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:784
+#: ../modules/calendar/e-task-shell-view-actions.c:790
 msgid "Rename the selected task list"
 msgstr "Renomear a lista de tarefas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:789
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Show _Only This Task List"
 msgstr "M_ostrar sà esta lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:803
+#: ../modules/calendar/e-task-shell-view-actions.c:809
 msgid "Mar_k as Incomplete"
 msgstr "_Marcar como non terminada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:833
+#: ../modules/calendar/e-task-shell-view-actions.c:839
 msgid "Delete completed tasks"
 msgstr "Eliminar as tarefas terminadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:908
+#: ../modules/calendar/e-task-shell-view-actions.c:914
 msgid "Task _Preview"
 msgstr "_Previsualizar a tarefa"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:910
+#: ../modules/calendar/e-task-shell-view-actions.c:916
 msgid "Show task preview pane"
 msgstr "Mostrar o panel de vista previa de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:931
+#: ../modules/calendar/e-task-shell-view-actions.c:937
 msgid "Show task preview below the task list"
 msgstr "Mostrar a vista previa da tarefa embaixo da lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:938
+#: ../modules/calendar/e-task-shell-view-actions.c:944
 msgid "Show task preview alongside the task list"
 msgstr "Mostrar a vista previa da tarefa a carÃn da lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:946
+#: ../modules/calendar/e-task-shell-view-actions.c:952
 msgid "Active Tasks"
 msgstr "Tarefas activas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:960
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Completed Tasks"
 msgstr "Tarefas terminadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:967
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Next 7 Days' Tasks"
 msgstr "Tarefas dos prÃximos sete dÃas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:974
+#: ../modules/calendar/e-task-shell-view-actions.c:980
 msgid "Overdue Tasks"
 msgstr "Tarefas atrasadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:981
+#: ../modules/calendar/e-task-shell-view-actions.c:987
 msgid "Tasks with Attachments"
 msgstr "Tarefas con anexos"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1031
+#: ../modules/calendar/e-task-shell-view-actions.c:1037
 msgid "Print the list of tasks"
 msgstr "Imprimir a lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1038
+#: ../modules/calendar/e-task-shell-view-actions.c:1044
 msgid "Preview the list of tasks to be printed"
 msgstr "Previsualizar a lista de tarefas para imprimir"
 
-#: ../modules/calendar/e-task-shell-view.c:362
+#: ../modules/calendar/e-task-shell-view.c:365
 msgid "Delete Tasks"
 msgstr "Eliminar as tarefas"
 
-#: ../modules/calendar/e-task-shell-view.c:364
+#: ../modules/calendar/e-task-shell-view.c:367
 msgid "Delete Task"
 msgstr "Eliminar a tarefa"
 
-#: ../modules/calendar/e-task-shell-view-private.c:498
+#: ../modules/calendar/e-task-shell-view-private.c:501
 msgid "Expunging"
 msgstr "Compactando"
 
-#: ../modules/calendar/e-task-shell-view-private.c:605
+#: ../modules/calendar/e-task-shell-view-private.c:608
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tarefa"
 msgstr[1] "%d tarefas"
 
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:225
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:395
+msgid "IMAP Headers"
+msgstr "Cabeceiras IMAP"
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:233
+msgid ""
+"Select a predefined set of IMAP headers to fetch.\n"
+"Note, larger sets of headers take longer to download."
+msgstr ""
+"Seleccione un conxunto predefinido das cabeceiras IMAP para obter.\n"
+"TeÃa en conta que os conxuntos de cabeceiras grandes tardan mÃis en "
+"descargarse."
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:243
+msgid "_Fetch All Headers"
+msgstr "Obter to_das as cabeceiras"
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:257
+msgid "_Basic Headers (fastest)"
+msgstr "Cabeceiras _bÃsicas (mÃis rÃpido)"
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:271
+msgid "Use this if you are not filtering any mailing lists."
+msgstr "Use este se non ten filtros baseados en roldas de correo."
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:281
+msgid "Basic and _Mailing List Headers (default)"
+msgstr "Cabeceiras bÃsicas e de _roldas de correo (predeterminado)"
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:330
+msgid "Custom Headers"
+msgstr "Cabeceiras personalizadas"
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:338
+msgid ""
+"Specify any extra headers to fetch in addition to the predefined set of "
+"headers selected above."
+msgstr ""
+"Especifique algunha das cabeceiras adicionais para obter ademais do conxunto "
+"por omisiÃn seleccionadas arriba."
+
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
 #: ../modules/mail/e-mail-attachment-handler.c:390
 #, c-format
@@ -17349,480 +17525,573 @@ msgid_plural "%d attached messages"
 msgstr[0] "%d mensaxe anexada"
 msgstr[1] "%d mensaxes anexadas"
 
-#: ../modules/mail/e-mail-shell-backend.c:233
+#: ../modules/mail/e-mail-shell-backend.c:246
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mensaxe de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:235
+#: ../modules/mail/e-mail-shell-backend.c:248
 msgid "Compose a new mail message"
 msgstr "Escribir unha mensaxe de correo nova"
 
-#: ../modules/mail/e-mail-shell-backend.c:243
+#: ../modules/mail/e-mail-shell-backend.c:256
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "Conta de _correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:245
+#: ../modules/mail/e-mail-shell-backend.c:258
 msgid "Create a new mail account"
 msgstr "Crear unha nova conta de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:250
+#: ../modules/mail/e-mail-shell-backend.c:263
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Carta_fol de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:252
+#: ../modules/mail/e-mail-shell-backend.c:265
 msgid "Create a new mail folder"
 msgstr "Crear un novo cartafol de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:475
+#: ../modules/mail/e-mail-shell-backend.c:484
 msgid "Mail Accounts"
 msgstr "Contas de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:484
+#: ../modules/mail/e-mail-shell-backend.c:493
 msgid "Mail Preferences"
 msgstr "Preferencias de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:493
+#: ../modules/mail/e-mail-shell-backend.c:502
 msgid "Composer Preferences"
 msgstr "Preferencias do editor"
 
-#: ../modules/mail/e-mail-shell-backend.c:502
+#: ../modules/mail/e-mail-shell-backend.c:511
 msgid "Network Preferences"
 msgstr "Preferencias de rede"
 
-#: ../modules/mail/e-mail-shell-backend.c:754
-msgid "Evolution Account Assistant"
-msgstr "Asistente de contas do Evolution"
-
-#: ../modules/mail/e-mail-shell-backend.c:798
-msgid "Account Editor"
-msgstr "Editor de contas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1209
-#: ../modules/mail/e-mail-shell-view.c:950
+#: ../modules/mail/e-mail-shell-view-actions.c:1251
+#: ../modules/mail/e-mail-shell-view.c:969
 msgid "_Disable Account"
 msgstr "_Desactivar a conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1211
+#: ../modules/mail/e-mail-shell-view-actions.c:1253
 msgid "Disable this account"
 msgstr "Desactivar esta conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1218
+#: ../modules/mail/e-mail-shell-view-actions.c:1260
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr ""
 "Eliminar permanentemente todas as mensaxes eliminadas de todos os cartafoles"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1225
+#: ../modules/mail/e-mail-shell-view-actions.c:1267
 msgid "Edit properties of this account"
 msgstr "Modificar as propiedades desta conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1272
 msgid "_Download Messages for Offline Usage"
 msgstr "_Descargar as mensaxes para o uso sen conexiÃn"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1232
+#: ../modules/mail/e-mail-shell-view-actions.c:1274
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Descargar as mensaxes das contas e cartafoles marcados para uso sen conexiÃn"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1237
+#: ../modules/mail/e-mail-shell-view-actions.c:1279
 msgid "Fl_ush Outbox"
 msgstr "Lim_par a caixa de saÃda"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#: ../modules/mail/e-mail-shell-view-actions.c:1286
 msgid "_Copy Folder To..."
 msgstr "_Copiar o cartafol aâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1246
+#: ../modules/mail/e-mail-shell-view-actions.c:1288
 msgid "Copy the selected folder into another folder"
 msgstr "Copiar o cartafol seleccionado noutro cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1253
+#: ../modules/mail/e-mail-shell-view-actions.c:1295
 msgid "Permanently remove this folder"
 msgstr "Eliminar permanentemente este cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1300
 msgid "E_xpunge"
 msgstr "Com_pactar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1260
+#: ../modules/mail/e-mail-shell-view-actions.c:1302
 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:1265
+#: ../modules/mail/e-mail-shell-view-actions.c:1307
 msgid "Mar_k All Messages as Read"
 msgstr "Ma_rcar todas as mensaxes como lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1267
+#: ../modules/mail/e-mail-shell-view-actions.c:1309
 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:1272
+#: ../modules/mail/e-mail-shell-view-actions.c:1314
 msgid "_Move Folder To..."
 msgstr "_Mover o cartafol aâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1274
+#: ../modules/mail/e-mail-shell-view-actions.c:1316
 msgid "Move the selected folder into another folder"
 msgstr "Mover o cartafol seleccionado a outro cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:1321
 msgid "_New..."
 msgstr "_Novoâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1281
+#: ../modules/mail/e-mail-shell-view-actions.c:1323
 msgid "Create a new folder for storing mail"
 msgstr "Crear un cartafol novo para gardar o correo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1288
+#: ../modules/mail/e-mail-shell-view-actions.c:1330
 msgid "Change the properties of this folder"
 msgstr "Modificar as propiedades deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1295
+#: ../modules/mail/e-mail-shell-view-actions.c:1337
 msgid "Refresh the folder"
 msgstr "Actualizar o cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1302
+#: ../modules/mail/e-mail-shell-view-actions.c:1344
 msgid "Change the name of this folder"
 msgstr "Modificar o nome deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1349
 msgid "Select Message _Thread"
 msgstr "Seleccionar a _conversa desta mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1309
+#: ../modules/mail/e-mail-shell-view-actions.c:1351
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 "Seleccionar todas as mensaxes da mesma conversa que a mensaxe seleccionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1356
 msgid "Select Message S_ubthread"
 msgstr "Seleccionar a conversa sec_undaria desta mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1316
+#: ../modules/mail/e-mail-shell-view-actions.c:1358
 msgid "Select all replies to the currently selected message"
 msgstr "Seleccionar todas as respostas à mensaxe seleccionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1328
+#: ../modules/mail/e-mail-shell-view-actions.c:1370
 msgid "Empty _Trash"
 msgstr "Baleirar o _lixo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1330
+#: ../modules/mail/e-mail-shell-view-actions.c:1372
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr ""
 "Eliminar permanentemente todas as mensaxes eliminadas de todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1335
+#: ../modules/mail/e-mail-shell-view-actions.c:1377
 msgid "_New Label"
 msgstr "Etiqueta _nova"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1344
+#: ../modules/mail/e-mail-shell-view-actions.c:1386
 msgid "N_one"
 msgstr "Nin_gÃn"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1358
+#: ../modules/mail/e-mail-shell-view-actions.c:1400
 msgid "_Manage Subscriptions"
 msgstr "Xestionar as _subscriciÃns"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1360
-#: ../modules/mail/e-mail-shell-view-actions.c:1437
+#: ../modules/mail/e-mail-shell-view-actions.c:1402
+#: ../modules/mail/e-mail-shell-view-actions.c:1479
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 "Subscribir ou eliminar as subscriciÃns a cartafoles en servidores remotos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1365
-#: ../modules/mail/e-mail-shell-view-actions.c:1386
+#: ../modules/mail/e-mail-shell-view-actions.c:1407
+#: ../modules/mail/e-mail-shell-view-actions.c:1428
 msgid "Send / _Receive"
 msgstr "Enviar / _Recibir"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1367
+#: ../modules/mail/e-mail-shell-view-actions.c:1409
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar os elementos da cola e obter os elementos novos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1372
+#: ../modules/mail/e-mail-shell-view-actions.c:1414
 msgid "R_eceive All"
 msgstr "R_ecibir todos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1374
+#: ../modules/mail/e-mail-shell-view-actions.c:1416
 msgid "Receive new items from all accounts"
 msgstr "Recibir os elementos novos de todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1379
+#: ../modules/mail/e-mail-shell-view-actions.c:1421
 msgid "_Send All"
 msgstr "_Enviar todos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1381
+#: ../modules/mail/e-mail-shell-view-actions.c:1423
 msgid "Send queued items in all accounts"
 msgstr "Enviar os elementos da cola de todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1407
+#: ../modules/mail/e-mail-shell-view-actions.c:1449
 #: ../widgets/misc/e-activity-proxy.c:313
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1409
+#: ../modules/mail/e-mail-shell-view-actions.c:1451
 msgid "Cancel the current mail operation"
 msgstr "Cancelar a operaciÃn de correo actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1414
+#: ../modules/mail/e-mail-shell-view-actions.c:1456
 msgid "Collapse All _Threads"
 msgstr "Pregar todos as _conversas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1416
+#: ../modules/mail/e-mail-shell-view-actions.c:1458
 msgid "Collapse all message threads"
 msgstr "Pregar todos as conversas da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1421
+#: ../modules/mail/e-mail-shell-view-actions.c:1463
 msgid "E_xpand All Threads"
 msgstr "D_espregar todas as conversas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1423
+#: ../modules/mail/e-mail-shell-view-actions.c:1465
 msgid "Expand all message threads"
 msgstr "Despregar todas as conversas da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1428
+#: ../modules/mail/e-mail-shell-view-actions.c:1470
 msgid "_Message Filters"
 msgstr "Filtros de _mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1430
+#: ../modules/mail/e-mail-shell-view-actions.c:1472
 msgid "Create or edit rules for filtering new mail"
 msgstr "Crear ou editar regras para o filtrado do correo novo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1435
+#: ../modules/mail/e-mail-shell-view-actions.c:1477
 msgid "_Subscriptions..."
 msgstr "_SubscriciÃnsâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1444
+#: ../modules/mail/e-mail-shell-view-actions.c:1486
 msgid "F_older"
 msgstr "Cartaf_ol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1451
+#: ../modules/mail/e-mail-shell-view-actions.c:1493
 msgid "_Label"
 msgstr "_Etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1468
+#: ../modules/mail/e-mail-shell-view-actions.c:1510
 msgid "C_reate Search Folder From Search..."
 msgstr "C_rear un cartafol de busca a partir da buscaâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1475
+#: ../modules/mail/e-mail-shell-view-actions.c:1517
 msgid "Search F_olders"
 msgstr "Cartaf_oles de busca"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1477
+#: ../modules/mail/e-mail-shell-view-actions.c:1519
 msgid "Create or edit search folder definitions"
 msgstr "Crear ou editar as definiciÃns dos cartafoles de busca"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1554
 msgid "_New Folder..."
 msgstr "Cartafol _novoâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1540
+#: ../modules/mail/e-mail-shell-view-actions.c:1582
 msgid "Show Message _Preview"
 msgstr "Mostrar a vista _previa da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1542
+#: ../modules/mail/e-mail-shell-view-actions.c:1584
 msgid "Show message preview pane"
 msgstr "Mostrar o panel de vista previa das mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1548
+#: ../modules/mail/e-mail-shell-view-actions.c:1590
 msgid "Show _Deleted Messages"
 msgstr "Mostrar as mensaxes _eliminadas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1550
+#: ../modules/mail/e-mail-shell-view-actions.c:1592
 msgid "Show deleted messages with a line through them"
 msgstr "Mostrar as mensaxes eliminadas riscÃndoas."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1556
+#: ../modules/mail/e-mail-shell-view-actions.c:1598
 msgid "_Group By Threads"
 msgstr "A_grupar por conversas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1558
+#: ../modules/mail/e-mail-shell-view-actions.c:1600
 msgid "Threaded message list"
 msgstr "Lista de mensaxes por conversas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1564
+#: ../modules/mail/e-mail-shell-view-actions.c:1606
 msgid "_Unmatched Folder Enabled"
 msgstr "Cartafol non _coincidente activado"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1566
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Conmutador que indica se o cartafol non coincidente està activado"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1586
+#: ../modules/mail/e-mail-shell-view-actions.c:1628
 msgid "Show message preview below the message list"
 msgstr "Mostrar a vista previa da mensaxe embaixo da lista de mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1593
+#: ../modules/mail/e-mail-shell-view-actions.c:1635
 msgid "Show message preview alongside the message list"
 msgstr "Mostrar a vista previa da mensaxe a carÃn da lista de mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1601
+#: ../modules/mail/e-mail-shell-view-actions.c:1643
 msgid "All Messages"
 msgstr "Todas as mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1608
+#: ../modules/mail/e-mail-shell-view-actions.c:1650
 msgid "Important Messages"
 msgstr "Mensaxes importantes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1615
+#: ../modules/mail/e-mail-shell-view-actions.c:1657
 msgid "Last 5 Days' Messages"
 msgstr "Mensaxes dos Ãltimos 5 dÃas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1622
+#: ../modules/mail/e-mail-shell-view-actions.c:1664
 msgid "Messages Not Junk"
 msgstr "Mensaxes que non son lixo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1629
+#: ../modules/mail/e-mail-shell-view-actions.c:1671
 msgid "Messages with Attachments"
 msgstr "Mensaxes con anexos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1636
+#: ../modules/mail/e-mail-shell-view-actions.c:1678
 msgid "No Label"
 msgstr "Sen etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1643
+#: ../modules/mail/e-mail-shell-view-actions.c:1685
 msgid "Read Messages"
 msgstr "Mensaxes lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1650
+#: ../modules/mail/e-mail-shell-view-actions.c:1692
 msgid "Recent Messages"
 msgstr "Mensaxes recentes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1657
+#: ../modules/mail/e-mail-shell-view-actions.c:1699
 msgid "Unread Messages"
 msgstr "Mensaxes sen ler"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1709
+#: ../modules/mail/e-mail-shell-view-actions.c:1751
 msgid "Subject or Addresses contain"
 msgstr "O asunto ou os enderezos conteÃen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1719
+#: ../modules/mail/e-mail-shell-view-actions.c:1761
 msgid "All Accounts"
 msgstr "Todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1726
+#: ../modules/mail/e-mail-shell-view-actions.c:1768
 msgid "Current Account"
 msgstr "Conta actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1733
+#: ../modules/mail/e-mail-shell-view-actions.c:1775
 msgid "Current Folder"
 msgstr "Cartafol actual"
 
-#: ../modules/mail/e-mail-shell-view.c:560
+#: ../modules/mail/e-mail-shell-view.c:562
 msgid "All Account Search"
 msgstr "Buscar en todas as contas"
 
-#: ../modules/mail/e-mail-shell-view.c:721
+#: ../modules/mail/e-mail-shell-view.c:723
 msgid "Account Search"
 msgstr "Buscar na conta"
 
-#: ../modules/mail/e-mail-shell-view.c:948
+#: ../modules/mail/e-mail-shell-view.c:967
 msgid "Proxy _Logout"
 msgstr "_Terminar a sesiÃn proxy"
 
-#: ../modules/mail/e-mail-shell-view-private.c:954
+#: ../modules/mail/e-mail-shell-view-private.c:961
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionada, "
 msgstr[1] "%d seleccionadas, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:965
+#: ../modules/mail/e-mail-shell-view-private.c:972
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d eliminada"
 msgstr[1] "%d eliminadas"
 
-#: ../modules/mail/e-mail-shell-view-private.c:971
 #: ../modules/mail/e-mail-shell-view-private.c:978
+#: ../modules/mail/e-mail-shell-view-private.c:985
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d correo lixo"
 msgstr[1] "%d correos lixo"
 
-#: ../modules/mail/e-mail-shell-view-private.c:984
+#: ../modules/mail/e-mail-shell-view-private.c:991
 #, 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:990
+#: ../modules/mail/e-mail-shell-view-private.c:997
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d sen enviar"
 msgstr[1] "%d sen enviar"
 
-#: ../modules/mail/e-mail-shell-view-private.c:996
+#: ../modules/mail/e-mail-shell-view-private.c:1003
 #, 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:1008
+#: ../modules/mail/e-mail-shell-view-private.c:1015
 #, 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:1011
+#: ../modules/mail/e-mail-shell-view-private.c:1018
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d en total"
 msgstr[1] "%d en total"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1034
+#: ../modules/mail/e-mail-shell-view-private.c:1041
 msgid "Trash"
 msgstr "Lixo"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1510
+#: ../modules/mail/e-mail-shell-view-private.c:1386
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ../modules/mail/em-composer-prefs.c:513
+#: ../modules/mail/em-composer-prefs.c:509
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
-#: ../modules/mail/em-mailer-prefs.c:89
+#: ../modules/mail/em-mailer-prefs.c:87
 msgid "Every time"
 msgstr "Cada vez"
 
-#: ../modules/mail/em-mailer-prefs.c:90
+#: ../modules/mail/em-mailer-prefs.c:88
 msgid "Once per day"
 msgstr "Unha vez ao dÃa"
 
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:89
 msgid "Once per week"
 msgstr "Unha vez à semana"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:90
 msgid "Once per month"
 msgstr "Unha vez ao mes"
 
-#: ../modules/mail/em-mailer-prefs.c:293
+#: ../modules/mail/em-mailer-prefs.c:291
 msgid "Header"
 msgstr "Cabeceira"
 
-#: ../modules/mail/em-mailer-prefs.c:297
+#: ../modules/mail/em-mailer-prefs.c:295
 msgid "Contains Value"
 msgstr "ContÃn o valor"
 
 #. 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:1076
+#: ../modules/mail/em-mailer-prefs.c:1074
 msgid "_Date header:"
 msgstr "_Cabeceira da data:"
 
-#: ../modules/mail/em-mailer-prefs.c:1077
+#: ../modules/mail/em-mailer-prefs.c:1075
 msgid "Show _original header value"
 msgstr "Mostrar o valor _orixinal da cabeceira"
 
+#: ../modules/mail-config/e-mail-config-google-summary.c:247
+msgid "Google Features"
+msgstr "CaracterÃsticas de Google"
+
+#: ../modules/mail-config/e-mail-config-google-summary.c:256
+msgid "Add Google Ca_lendar to this account"
+msgstr "Engadir un ca_lendario de Google a esta conta"
+
+#: ../modules/mail-config/e-mail-config-google-summary.c:264
+msgid "Add Google Con_tacts to this account"
+msgstr "Engadir un con_tacto de Google a esta conta"
+
+#: ../modules/mail-config/e-mail-config-google-summary.c:272
+msgid "You may need to enable IMAP access"
+msgstr "Pode que deba activar o acceso IMAP"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:246
+#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+msgid "Mail _Directory:"
+msgstr "_Directorio de correo:"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:247
+msgid "Choose a MH mail directory"
+msgstr "Seleccione un directorio de correo MH"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+msgid "Local Delivery _File:"
+msgstr "_Ficheiro de envÃo local:"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+msgid "Choose a local delivery file"
+msgstr "Seleccione un ficheiro de envÃo local"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:293
+msgid "Choose a Maildir mail directory"
+msgstr "Seleccione un cartafol de correo Maildir"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+msgid "Spool _File:"
+msgstr "_Ficheiro Spool:"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:316
+msgid "Choose a mbox spool file"
+msgstr "Seleccione un ficheiro spool de mbox"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+msgid "Spool _Directory:"
+msgstr "_Cartafol Spool"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:339
+msgid "Choose a mbox spool directory"
+msgstr "Seleccione un cartafol spool de mbox"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:149
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:81
+#: ../modules/plugin-manager/evolution-plugin-manager.c:160
+msgid "Configuration"
+msgstr "ConfiguraciÃn"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:167
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:99
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+msgid "_Server:"
+msgstr "_Servidor:"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:193
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:228
+msgid "User_name:"
+msgstr "_Nome do usuario:"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:226
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:149
+msgid "Encryption _method:"
+msgstr "_MÃtodo de cifrado:"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:241
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:164
+msgid "STARTTLS after connecting"
+msgstr "STARTTLS despois de conectarse"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:168
+msgid "SSL on a dedicated port"
+msgstr "SSL nun porto adicado"
+
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:124
+msgid "Ser_ver requires authentication"
+msgstr "O ser_vidor solicita autenticaciÃn"
+
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:210
+msgid "T_ype:"
+msgstr "T_ipo:"
+
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:242
+msgid "Yahoo! Features"
+msgstr "CaracterÃsticas de Yahoo!"
+
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:251
+msgid "Add Yahoo! Ca_lendar and Tasks to this account"
+msgstr "Engadir Ca_lendario e Tarefas de Yahoo! a esta conta"
+
 #: ../modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "Do you want to make Evolution your default email client?"
 msgstr ""
@@ -17831,24 +18100,24 @@ msgstr ""
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:291
+#: ../modules/mdn/evolution-mdn.c:318
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "A mensaxe a %s sobre Â%s o %s leuse."
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:357
+#: ../modules/mdn/evolution-mdn.c:385
 #, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "NotificaciÃn de recepciÃn para Â%sÂ"
 
-#: ../modules/mdn/evolution-mdn.c:499
+#: ../modules/mdn/evolution-mdn.c:540
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "Enviar unha confirmaciÃn de recepciÃn a Â%sÂ"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:504
+#: ../modules/mdn/evolution-mdn.c:545
 msgid "_Notify Sender"
 msgstr "_Notificar ao emisor"
 
@@ -17879,7 +18148,7 @@ msgid ""
 msgstr ""
 "O Evolution conectarase de novo cando se estabeleza a conexiÃn coa rede"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:387
+#: ../modules/online-accounts/camel-sasl-xoauth.c:417
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain an authentication token."
@@ -17887,11 +18156,11 @@ msgstr ""
 "Non foi posÃbel atopar a conta correspondente no servizo org.gnome."
 "OnlineAccounts desde a que obter un token de autenticaciÃn."
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:474
+#: ../modules/online-accounts/camel-sasl-xoauth.c:504
 msgid "OAuth"
 msgstr "OAuth"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:476
+#: ../modules/online-accounts/camel-sasl-xoauth.c:506
 msgid ""
 "This option will connect to the server by way of the GNOME Online Accounts "
 "service"
@@ -17980,52 +18249,49 @@ msgstr "I_ncluÃr probas remotas"
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "Isto farà que SpamAssassin sexa mÃis fiÃbel, pero tamÃn mÃis lento"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:1072
-msgid "SpamAssassin"
-msgstr "SpamAssassin"
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:138
-msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications."
-msgstr ""
-"Benvido/a ao Evolution. As seguintes pantallas permitiranlle conectar "
-"Evolution coas sÃas contas de correo e importar ficheiros desde outros "
-"aplicativos."
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:299
+#: ../modules/spamassassin/evolution-spamassassin.c:1072
+msgid "SpamAssassin"
+msgstr "SpamAssassin"
+
+#: ../modules/startup-wizard/e-mail-config-import-page.c:204
 #: ../widgets/misc/e-import-assistant.c:403
 msgid "Please select the information that you would like to import:"
 msgstr "Seleccione a informaciÃn que desexa importar:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:331
+#: ../modules/startup-wizard/e-mail-config-import-page.c:233
 #: ../widgets/misc/e-import-assistant.c:559
 #, c-format
 msgid "From %s:"
 msgstr "De: %s:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:342
-#: ../modules/startup-wizard/evolution-startup-wizard.c:440
+#. Keep the title identical to EMailConfigImportPage
+#. * so it's only shown once in the assistant sidebar.
+#: ../modules/startup-wizard/e-mail-config-import-page.c:264
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:342
 msgid "Importing Files"
 msgstr "Importando os ficheiros"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:418
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:261
 msgid "Import cancelled."
 msgstr "ImportaciÃn cancelada."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:436
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:278
 msgid "Import complete."
 msgstr "ImportaciÃn rematada."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:510
-msgid "Evolution Setup Assistant"
-msgstr "Asistente de configuraciÃn do Evolution"
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:516
-msgid "Welcome"
-msgstr "Benvido/a"
+#: ../modules/startup-wizard/e-startup-assistant.c:154
+#, fuzzy
+msgid ""
+"Welcome to Evolution.\n"
+"\n"
+"The next few screens will allow Evolution to connect to your email accounts, "
+"and to import files from other applications."
+msgstr ""
+"Benvido/a ao Evolution. As seguintes pantallas permitiranlle conectar "
+"Evolution coas sÃas contas de correo e importar ficheiros desde outros "
+"aplicativos."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:633
+#: ../modules/startup-wizard/evolution-startup-wizard.c:259
 msgid "Loading accounts..."
 msgstr "Cargando contasâ"
 
@@ -18041,14 +18307,6 @@ msgstr "Inspeccionar o contido HTML (caracterÃstica de depurado)"
 msgid "Evolution Web Inspector"
 msgstr "Inspector web de Evolution"
 
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "Axendas de enderezos locais"
-
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Add local address books to Evolution."
-msgstr "Engadir axendas de enderezos locais ao Evolution."
-
 #: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "_Non mostrar esta mensaxe outra vez."
@@ -18094,552 +18352,59 @@ msgstr "Son inserido"
 msgid "Play audio attachments directly in mail messages."
 msgstr "Reproducir os anexos de son directamente nas mensaxes de correo."
 
-#: ../plugins/backup-restore/backup.c:77
-msgid "Back up Evolution directory"
-msgstr "Facer unha copia de seguranza do directorio do Evolution"
-
-#: ../plugins/backup-restore/backup.c:79
-msgid "Restore Evolution directory"
-msgstr "Restabelecer o directorio do Evolution"
-
-#: ../plugins/backup-restore/backup.c:81
-msgid "Check Evolution Back up"
-msgstr "Comprobar a copia de seguranza do Evolution"
-
-#: ../plugins/backup-restore/backup.c:83
-msgid "Restart Evolution"
-msgstr "Reiniciar o Evolution"
-
-#: ../plugins/backup-restore/backup.c:85
-msgid "With Graphical User Interface"
-msgstr "Con interface grÃfica de usuario"
-
-#. FIXME Will the versioned setting always work?
-#: ../plugins/backup-restore/backup.c:308
-#: ../plugins/backup-restore/backup.c:432
-msgid "Shutting down Evolution"
-msgstr "Pechando o Evolution"
-
-#: ../plugins/backup-restore/backup.c:317
-msgid "Backing Evolution accounts and settings"
-msgstr "Facendo unha copia de seguranza das contas e axustes do Evolution"
-
-#: ../plugins/backup-restore/backup.c:329
-msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr ""
-"Facendo unha copia de seguranza dos datos do Evolution (correos, contactos, "
-"calendarios, tarefas e notas)"
-
-#: ../plugins/backup-restore/backup.c:345
-msgid "Back up complete"
-msgstr "Copia de seguranza completada"
-
-#: ../plugins/backup-restore/backup.c:352
-#: ../plugins/backup-restore/backup.c:570
-msgid "Restarting Evolution"
-msgstr "Reiniciando o Evolution"
-
-#: ../plugins/backup-restore/backup.c:438
-msgid "Back up current Evolution data"
-msgstr "Facer unha copia de seguranza dos datos actuais do Evolution"
-
-#: ../plugins/backup-restore/backup.c:446
-msgid "Extracting files from back up"
-msgstr "Extraendo os ficheiros desde a copia de seguranza"
-
-#: ../plugins/backup-restore/backup.c:515
-msgid "Loading Evolution settings"
-msgstr "Cargando os axustes do Evolution"
-
-#: ../plugins/backup-restore/backup.c:551
-msgid "Removing temporary back up files"
-msgstr "Eliminando os ficheiros temporais da copia de seguranza"
-
-#: ../plugins/backup-restore/backup.c:563
-msgid "Ensuring local sources"
-msgstr "Asegurando as fontes locais"
-
-#: ../plugins/backup-restore/backup.c:767
-msgid "Evolution Back Up"
-msgstr "Respaldo de Evolution"
-
-#: ../plugins/backup-restore/backup.c:768
-#, c-format
-msgid "Backing up to the folder %s"
-msgstr "Facendo a copia de seguranza no cartafol %s"
-
-#: ../plugins/backup-restore/backup.c:772
-msgid "Evolution Restore"
-msgstr "Restabelecemento do Evolution"
-
-#: ../plugins/backup-restore/backup.c:773
-#, c-format
-msgid "Restoring from the folder %s"
-msgstr "Restabelecendo desde o cartafol %s"
-
-#: ../plugins/backup-restore/backup.c:841
-msgid "Backing up Evolution Data"
-msgstr "Facendo unha copia de seguranza dos datos do Evolution"
-
-#: ../plugins/backup-restore/backup.c:842
-msgid "Please wait while Evolution is backing up your data."
-msgstr "Agarde mentres o Evolution fai unha copia de seguranza dos datos."
-
-#: ../plugins/backup-restore/backup.c:844
-msgid "Restoring Evolution Data"
-msgstr "Restabelecendo os datos do Evolution"
-
-#: ../plugins/backup-restore/backup.c:845
-msgid "Please wait while Evolution is restoring your data."
-msgstr "Agarde mentres o Evolution restabelece os datos."
-
-#: ../plugins/backup-restore/backup.c:863
-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 conta."
-
-#: ../plugins/backup-restore/backup-restore.c:225
-msgid "Select name of the Evolution backup file"
-msgstr "Seleccionar o nome do ficheiro de copia de seguranza do Evolution"
-
-#: ../plugins/backup-restore/backup-restore.c:258
-msgid "_Restart Evolution after backup"
-msgstr "_Reiniciar o Evolution despois de facer unha copia de seguranza"
-
-#: ../plugins/backup-restore/backup-restore.c:285
-msgid "Select name of the Evolution backup file to restore"
-msgstr ""
-"Seleccionar o nome do ficheiro da copia de seguranza do Evolution para "
-"restaurar"
-
-#: ../plugins/backup-restore/backup-restore.c:298
-msgid "_Restart Evolution after restore"
-msgstr "_Reiniciar o Evolution despois de restabelecer"
-
-#: ../plugins/backup-restore/backup-restore.c:385
-msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
-"settings, mail filters etc."
-msgstr ""
-"Pode restabelecer o Evolution desde unha copia de seguranza sÃa. Isto pode "
-"restaurar todos os correos, calendarios, tarefas, notas e contactos. TamÃn "
-"restabelecerà todas as configuraciÃns persoais, filtros de correo, etc."
-
-#: ../plugins/backup-restore/backup-restore.c:395
-msgid "_Restore Evolution from the backup file"
-msgstr "_Restaurar Evolution desde a copia de seguranza"
-
-#: ../plugins/backup-restore/backup-restore.c:405
-msgid "Please select an Evolution Archive to restore:"
-msgstr "Seleccionar o arquivo do Evolution para restabelecer:"
-
-#: ../plugins/backup-restore/backup-restore.c:409
-msgid "Choose a file to restore"
-msgstr "Escoller un ficheiro para restabelecer"
-
-#: ../plugins/backup-restore/backup-restore.c:423
-msgid "Restore from backup"
-msgstr "Restabelecer desde unha copia de seguranza"
-
-#: ../plugins/backup-restore/backup-restore.c:470
-msgid "_Back up Evolution Data..."
-msgstr "Fa_cer unha copia de seguranza dos datos do Evolutionâ"
-
-#: ../plugins/backup-restore/backup-restore.c:472
-msgid "Back up Evolution data and settings to an archive file"
-msgstr "Facer unha copia de seguranza dos datos e os axustes do Evolution"
-
-#: ../plugins/backup-restore/backup-restore.c:477
-msgid "R_estore Evolution Data..."
-msgstr "R_estabelecer os datos do Evolutionâ"
-
-#: ../plugins/backup-restore/backup-restore.c:479
-msgid "Restore Evolution data and settings from an archive file"
-msgstr "Restabelecer os datos e os axustes do Evolution desde un ficheiro"
-
-#. the path to the shared library
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-msgid "Back up and Restore"
-msgstr "Facer unha copia de seguranza e restabelecer"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Back up and restore your Evolution data and settings."
-msgstr ""
-"Facer unha copia de seguranza e restabelecer os datos e os axustes do "
-"Evolution."
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
-msgid "Invalid Evolution backup file"
-msgstr "Ficheiro de respaldo de Evolution non vÃlido"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Please select a valid backup file to restore."
-msgstr "Seleccione un ficheiro de respaldo vÃlido que restaurar."
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid "Are you sure you want to close Evolution?"
-msgstr "Està seguro de que desexa pechar o Evolution?"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-msgid ""
-"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 axustes, primeiro debe "
-"pechar o Evolution. AsegÃrese de gardar todos os datos antes de continuar."
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
-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:6
-msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
-msgstr ""
-"Ten certeza de que quere restaurar Evolution desde o ficheiro de respaldo "
-"seleccionado?"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid ""
-"To restore your data and settings, you must first close Evolution. Please "
-"make sure that you save any unsaved data before proceeding. This will delete "
-"all your current Evolution data and settings and restore them from your "
-"backup."
-msgstr ""
-"Para restaurar os datos e a sÃa configuraciÃn, primeiro debe pechar "
-"Evolution. AsegÃrese de gardar todos os datos antes de continuar. Isto "
-"eliminarà todos os datos e axustes actuais do Evolution e restaurarÃos desde "
-"o seu respaldo."
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "Close and Restore Evolution"
-msgstr "Pechar e restabelecer o Evolution"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
-msgid "Insufficient Permissions"
-msgstr "Permisos insuficientes"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
-msgid "The selected folder is not writable."
-msgstr "O cartafol seleccionado non à escribÃbel."
-
-#: ../plugins/bbdb/bbdb.c:690 ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:650 ../plugins/bbdb/bbdb.c:659
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contactos automÃticos"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:714
-msgid "Create _address book entries when sending mails"
-msgstr "Crear _as entradas da axenda de enderezos ao enviar as mensaxes"
-
-#: ../plugins/bbdb/bbdb.c:722
-msgid "Select Address book for Automatic Contacts"
-msgstr "Seleccionar a axenda de enderezos para contactos automÃticos"
-
-#: ../plugins/bbdb/bbdb.c:739
-msgid "Instant Messaging Contacts"
-msgstr "Contactos de mensaxerÃa instantÃnea"
-
-#. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:754
-msgid "_Synchronize contact info and images from Pidgin buddy list"
-msgstr ""
-"_Sincronizar a informaciÃn e as imaxes de contactos desde a lista de amigos "
-"do Pidgin"
-
-#: ../plugins/bbdb/bbdb.c:762
-msgid "Select Address book for Pidgin buddy list"
-msgstr "Seleccionar a axenda de enderezos para a lista de amigos do Pidgin"
-
-#. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:775
-msgid "Synchronize with _buddy list now"
-msgstr "Sincronizar coa lista de _amigos agora"
-
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
-msgid "BBDB"
-msgstr "BBDB"
-
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-msgid ""
-"Takes the gruntwork out of managing your address book.\n"
-"\n"
-"Automatically fills your address book with names and email addresses as you "
-"reply to messages.  Also fills in IM contact information from your buddy "
-"lists."
-msgstr ""
-"EvÃtalle o traballo duro de xestionar a sÃa axenda de enderezos.\n"
-"\n"
-"Enche automaticamente a sÃa axenda de enderezos cos nomes e enderezos de "
-"correo-e mentres responde as mensaxes. TamÃn enche a informaciÃn de contacto "
-"de MI desde a sÃa lista de amigos."
-
-#: ../plugins/caldav/caldav-browse-server.c:215
-msgid "Authentication failed. Server requires correct login."
-msgstr ""
-"Produciuse un fallo na autenticaciÃn. O servidor solicita un inicio de "
-"sesiÃn correcto."
-
-#: ../plugins/caldav/caldav-browse-server.c:217
-msgid "Given URL cannot be found."
-msgstr "Non à posÃbel atopar o URL fornecido."
-
-#: ../plugins/caldav/caldav-browse-server.c:221
-#, c-format
-msgid ""
-"Server returned unexpected data.\n"
-"%d - %s"
-msgstr ""
-"O servidor devolveu datos non esperados.\n"
-"%d - %s"
-
-#: ../plugins/caldav/caldav-browse-server.c:361
-#: ../plugins/caldav/caldav-browse-server.c:695
-msgid "Failed to parse server response."
-msgstr "Produciuse un fallo ao analizar a resposta do servidor:"
-
-#: ../plugins/caldav/caldav-browse-server.c:455
-msgid "Events"
-msgstr "Actividades"
-
-#: ../plugins/caldav/caldav-browse-server.c:477
-msgid "User's calendars"
-msgstr "Calendarios do usuario"
-
-#: ../plugins/caldav/caldav-browse-server.c:589
-#: ../plugins/caldav/caldav-browse-server.c:764
-msgid "Failed to get server URL."
-msgstr "Produciuse un fallo ao obter o servidor LDAP."
-
-#: ../plugins/caldav/caldav-browse-server.c:762
-#: ../plugins/caldav/caldav-browse-server.c:803
-#: ../plugins/caldav/caldav-browse-server.c:1506
-msgid "Searching for user's calendars..."
-msgstr "Buscando os calendarios do usuarioâ"
-
-#: ../plugins/caldav/caldav-browse-server.c:801
-msgid "Could not find any user calendar."
-msgstr "Non foi posÃbel atopar ningÃn calendario do usuario."
-
-#: ../plugins/caldav/caldav-browse-server.c:939
-#, c-format
-msgid "Previous attempt failed: %s"
-msgstr "Produciuse un fallo no intento anterior: %s"
-
-#: ../plugins/caldav/caldav-browse-server.c:941
-#, c-format
-msgid "Previous attempt failed with code %d"
-msgstr "Produciuse un fallo no intento anterior co cÃdigo %d"
-
-#: ../plugins/caldav/caldav-browse-server.c:946
-#, c-format
-msgid "Enter password for user %s on server %s"
-msgstr "Introducir o contrasinal para %s no servidor %s"
-
-#: ../plugins/caldav/caldav-browse-server.c:1009
-#, c-format
-msgid "Cannot create soup message for URL '%s'"
-msgstr "Non à posÃbel crear a mensaxe Âsoup para o URL Â%sÂ"
-
-#. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1267
-msgid "Searching folder content..."
-msgstr "Buscando nos contidos do cartafolâ"
-
-#: ../plugins/caldav/caldav-browse-server.c:1327
-#: ../plugins/caldav/caldav-source.c:272
-msgid "Server _handles meeting invitations"
-msgstr "O servidor ma_nexa as invitaciÃns à reuniÃn"
-
-#: ../plugins/caldav/caldav-browse-server.c:1334
-msgid "List of available calendars:"
-msgstr "Lista de calendarios dispoÃÃbeis:"
-
-#: ../plugins/caldav/caldav-browse-server.c:1372
-msgid "Supports"
-msgstr "Admite"
-
-#: ../plugins/caldav/caldav-browse-server.c:1403
-#: ../plugins/caldav/caldav-source.c:270
-msgid "User e_mail:"
-msgstr "Corro-_e do usuario:"
-
-#: ../plugins/caldav/caldav-browse-server.c:1482
-#, c-format
-msgid "Failed to create thread: %s"
-msgstr "Produciuse un fallo ao crear a conversa: %s"
-
-#: ../plugins/caldav/caldav-browse-server.c:1604
-#, c-format
-msgid "Server URL '%s' is not a valid URL"
-msgstr "O URL do servidor Â%s non à un URL correcto"
-
-#: ../plugins/caldav/caldav-browse-server.c:1614
-msgid "Browse for a CalDAV calendar"
-msgstr "Buscar un calendario CalDAV"
-
-#: ../plugins/caldav/caldav-source.c:245
-#: ../plugins/calendar-http/calendar-http.c:109
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:262
-msgid "_URL:"
-msgstr "_URL:"
-
-#: ../plugins/caldav/caldav-source.c:252
-#: ../plugins/calendar-http/calendar-http.c:149
-#: ../plugins/google-account-setup/google-contacts-source.c:359
-msgid "Use _secure connection"
-msgstr "Usar conexiÃn _segura"
-
-#: ../plugins/caldav/caldav-source.c:253
-#: ../plugins/calendar-http/calendar-http.c:157
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:298
-msgid "_Ignore invalid SSL certificate"
-msgstr "_Ignorar certificado SSL non vÃlido"
-
-#: ../plugins/caldav/caldav-source.c:275
-msgid "Brows_e server for a calendar"
-msgstr "Busca un cal_endario no servidor"
-
-#: ../plugins/caldav/caldav-source.c:294
-#: ../plugins/calendar-file/calendar-file.c:207
-#: ../plugins/calendar-http/calendar-http.c:132
-#: ../plugins/calendar-weather/calendar-weather.c:421
-#: ../plugins/google-account-setup/google-contacts-source.c:377
-#: ../plugins/google-account-setup/google-source.c:661
-msgid "Re_fresh:"
-msgstr "Actuali_zar:"
-
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Support"
-msgstr "Compatibilidade de CalDAV"
-
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "Add CalDAV support to Evolution."
-msgstr "Engadir a compatibilidade de CalDAV con Evolution."
-
-#: ../plugins/calendar-file/calendar-file.c:136
-msgid "C_ustomize options"
-msgstr "OpciÃns de personali_zaciÃn"
+#: ../plugins/bbdb/bbdb.c:674
+msgid "Create _address book entries when sending mails"
+msgstr "Crear _as entradas da axenda de enderezos ao enviar as mensaxes"
 
-#: ../plugins/calendar-file/calendar-file.c:155
-#: ../widgets/misc/e-attachment-dialog.c:333
-#: ../widgets/misc/e-import-assistant.c:273
-msgid "F_ilename:"
-msgstr "Nome do f_icheiro:"
+#: ../plugins/bbdb/bbdb.c:682
+msgid "Select Address book for Automatic Contacts"
+msgstr "Seleccionar a axenda de enderezos para contactos automÃticos"
 
-#: ../plugins/calendar-file/calendar-file.c:160
-msgid "Choose calendar file"
-msgstr "Escoller un ficheiro de calendario"
-
-#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
-#: ../plugins/calendar-file/calendar-file.c:213
-msgid "On open"
-msgstr "Ao abrir"
-
-#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
-#: ../plugins/calendar-file/calendar-file.c:215
-msgid "On file change"
-msgstr "Ao modificar o ficheiro"
-
-#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
-#: ../plugins/calendar-file/calendar-file.c:217
-msgid "Periodically"
-msgstr "Periodicamente"
-
-#: ../plugins/calendar-file/calendar-file.c:238
-msgid "Force read _only"
-msgstr "Forzar s_Ã lectura"
-
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "Calendarios locais"
-
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Add local calendars to Evolution."
-msgstr "Engadir calendarios locais ao Evolution."
-
-#: ../plugins/calendar-http/calendar-http.c:236
-msgid "Userna_me:"
-msgstr "No_me do usuario:"
-
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "Web Calendars"
-msgstr "Calendarios web"
-
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Add web calendars to Evolution."
-msgstr "Engadir calendarios web ao Evolution."
-
-#: ../plugins/calendar-weather/calendar-weather.c:65
-msgid "Weather: Fog"
-msgstr "Tempo: nÃboa"
-
-#: ../plugins/calendar-weather/calendar-weather.c:66
-msgid "Weather: Cloudy"
-msgstr "Tempo: anubrado"
-
-#: ../plugins/calendar-weather/calendar-weather.c:67
-msgid "Weather: Cloudy Night"
-msgstr "Tempo: noite anubrada"
-
-#: ../plugins/calendar-weather/calendar-weather.c:68
-msgid "Weather: Overcast"
-msgstr "Tempo: ceo cuberto"
-
-#: ../plugins/calendar-weather/calendar-weather.c:69
-msgid "Weather: Showers"
-msgstr "Tempo: chuvascos"
-
-#: ../plugins/calendar-weather/calendar-weather.c:70
-msgid "Weather: Snow"
-msgstr "Tempo: neve"
-
-#: ../plugins/calendar-weather/calendar-weather.c:71
-msgid "Weather: Sunny"
-msgstr "Tempo: sol"
-
-#: ../plugins/calendar-weather/calendar-weather.c:72
-msgid "Weather: Clear Night"
-msgstr "Tempo: noite despexada"
-
-#: ../plugins/calendar-weather/calendar-weather.c:73
-msgid "Weather: Thunderstorms"
-msgstr "Tempo: treboadas"
-
-#: ../plugins/calendar-weather/calendar-weather.c:239
-msgid "Select a location"
-msgstr "Seleccionar unha localizaciÃn"
-
-#. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:350
-#: ../plugins/calendar-weather/calendar-weather.c:398
-msgctxt "weather-cal-location"
-msgid "None"
-msgstr "NingÃn"
+#: ../plugins/bbdb/bbdb.c:699
+msgid "Instant Messaging Contacts"
+msgstr "Contactos de mensaxerÃa instantÃnea"
 
-#: ../plugins/calendar-weather/calendar-weather.c:477
-msgid "_Units:"
-msgstr "_Unidades:"
+#. Enable Gaim Checkbox
+#: ../plugins/bbdb/bbdb.c:714
+msgid "_Synchronize contact info and images from Pidgin buddy list"
+msgstr ""
+"_Sincronizar a informaciÃn e as imaxes de contactos desde a lista de amigos "
+"do Pidgin"
 
-#: ../plugins/calendar-weather/calendar-weather.c:486
-msgid "Metric (Celsius, cm, etc)"
-msgstr "MÃtrico (CentÃgrados, cm, etc.)"
+#: ../plugins/bbdb/bbdb.c:722
+msgid "Select Address book for Pidgin buddy list"
+msgstr "Seleccionar a axenda de enderezos para a lista de amigos do Pidgin"
 
-#: ../plugins/calendar-weather/calendar-weather.c:489
-msgid "Imperial (Fahrenheit, inches, etc)"
-msgstr "Anglo-saxÃn (Fahrenheit, polgadas etc.)"
+#. Synchronize now button.
+#: ../plugins/bbdb/bbdb.c:735
+msgid "Synchronize with _buddy list now"
+msgstr "Sincronizar coa lista de _amigos agora"
 
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Weather Calendars"
-msgstr "Calendarios meteorolÃxicos"
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
 
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
-msgid "Add weather calendars to Evolution."
-msgstr "Engadir calendarios meteorolÃxicos ao Evolution."
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+msgid ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
+"Automatically fills your address book with names and email addresses as you "
+"reply to messages.  Also fills in IM contact information from your buddy "
+"lists."
+msgstr ""
+"EvÃtalle o traballo duro de xestionar a sÃa axenda de enderezos.\n"
+"\n"
+"Enche automaticamente a sÃa axenda de enderezos cos nomes e enderezos de "
+"correo-e mentres responde as mensaxes. TamÃn enche a informaciÃn de contacto "
+"de MI desde a sÃa lista de amigos."
 
-#: ../plugins/dbx-import/dbx-importer.c:292
+#: ../plugins/dbx-import/dbx-importer.c:287
 msgid "Importing Outlook Express data"
 msgstr "Importando os datos do Outlook Express"
 
@@ -18655,81 +18420,52 @@ msgstr "Cartafol persoal do Outlook Express 5/6 (.dbx)"
 msgid "Import Outlook Express messages from DBX file"
 msgstr "Importar as mensaxes do Outlook desde un ficheiro DBX"
 
-#: ../plugins/default-source/default-source.c:169
-msgid "Mark as _default address book"
-msgstr "Marcar como axenda de enderezos pre_definida"
-
-#: ../plugins/default-source/default-source.c:183
-msgid "A_utocomplete with this address book"
-msgstr "Completar a_utomaticamente con esta axenda de enderezos"
-
-#: ../plugins/default-source/default-source.c:192
-msgid "Mark as _default calendar"
-msgstr "Marcar como calendario pre_definido"
-
-#: ../plugins/default-source/default-source.c:193
-msgid "Mark as _default task list"
-msgstr "Marcar como lista de tarefas pre_definida"
-
-#: ../plugins/default-source/default-source.c:194
-msgid "Mark as _default memo list"
-msgstr "Marcar como a lista de notas pre_definida"
-
-#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
-msgid "Default Sources"
-msgstr "Fontes predeterminadas"
-
-#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid "Mark your preferred address book and calendar as default."
-msgstr ""
-"Marcar a axenda de enderezos e calendario preferidos como predeterminados."
-
-#: ../plugins/email-custom-header/email-custom-header.c:301
+#: ../plugins/email-custom-header/email-custom-header.c:300
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Seguranza:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:305
+#: ../plugins/email-custom-header/email-custom-header.c:304
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Persoal"
 
-#: ../plugins/email-custom-header/email-custom-header.c:306
+#: ../plugins/email-custom-header/email-custom-header.c:305
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Sen clasificar"
 
-#: ../plugins/email-custom-header/email-custom-header.c:307
+#: ../plugins/email-custom-header/email-custom-header.c:306
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Protexido"
 
-#: ../plugins/email-custom-header/email-custom-header.c:308
+#: ../plugins/email-custom-header/email-custom-header.c:307
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: ../plugins/email-custom-header/email-custom-header.c:309
+#: ../plugins/email-custom-header/email-custom-header.c:308
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Secreto"
 
-#: ../plugins/email-custom-header/email-custom-header.c:310
+#: ../plugins/email-custom-header/email-custom-header.c:309
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Alto secreto"
 
-#: ../plugins/email-custom-header/email-custom-header.c:367
+#: ../plugins/email-custom-header/email-custom-header.c:366
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "NingÃn"
 
-#: ../plugins/email-custom-header/email-custom-header.c:540
+#: ../plugins/email-custom-header/email-custom-header.c:539
 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:803
+#: ../plugins/email-custom-header/email-custom-header.c:802
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -18737,11 +18473,11 @@ msgstr ""
 "O formato para indicar un valor de chave de cabeceira personalizada Ã:\n"
 "nome dos valores da chave da cabeceira personalizada separados por Â;Â."
 
-#: ../plugins/email-custom-header/email-custom-header.c:857
+#: ../plugins/email-custom-header/email-custom-header.c:856
 msgid "Key"
 msgstr "Chave"
 
-#: ../plugins/email-custom-header/email-custom-header.c:873
+#: ../plugins/email-custom-header/email-custom-header.c:872
 #: ../plugins/templates/templates.c:478
 msgid "Values"
 msgstr "Valores"
@@ -18876,49 +18612,6 @@ msgstr ""
 "O ficheiro que seleccionou non semella ser unha imaxe .png correcta. Erro: "
 "{0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:325
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:250
-msgid "Server"
-msgstr "Servidor"
-
-#: ../plugins/google-account-setup/google-source.c:452
-#, c-format
-msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr ""
-"Introduza o contrasinal para que o usuario %s acceda à lista de calendarios "
-"subscritos."
-
-#: ../plugins/google-account-setup/google-source.c:564
-#, c-format
-msgid ""
-"Cannot read data from Google server.\n"
-"%s"
-msgstr ""
-"Non à posÃbel ler os datos desde o servidor do Google.\n"
-"%s"
-
-#: ../plugins/google-account-setup/google-source.c:564
-#: ../plugins/mail-to-task/mail-to-task.c:839
-#: ../plugins/mail-to-task/mail-to-task.c:1100
-msgid "Unknown error."
-msgstr "Erro descoÃecido."
-
-#: ../plugins/google-account-setup/google-source.c:665
-msgid "Cal_endar:"
-msgstr "Cal_endario:"
-
-#: ../plugins/google-account-setup/google-source.c:702
-msgid "Retrieve _List"
-msgstr "Obter a _lista"
-
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "Google Calendars"
-msgstr "Calendarios de Google"
-
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Add Google Calendars to Evolution."
-msgstr "Engadir calendarios de Google ao Evolution."
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "Imaxe inserida"
@@ -18927,213 +18620,161 @@ msgstr "Imaxe inserida"
 msgid "View image attachments directly in mail messages."
 msgstr "Mostrar as imaxes anexadas directamente nas mensaxes de correo."
 
-#: ../plugins/imap-features/imap-headers.c:336
-#: ../plugins/imap-features/imap-headers.ui.h:10
-msgid "Custom Headers"
-msgstr "Cabeceiras personalizadas"
-
-#: ../plugins/imap-features/imap-headers.c:358
-#: ../plugins/imap-features/imap-headers.ui.h:7
-msgid "IMAP Headers"
-msgstr "Cabeceiras IMAP"
-
-#: ../plugins/imap-features/imap-headers.ui.h:1
-msgid ""
-"Select your IMAP Header Preferences. \n"
-"The more headers you have the more time it will take to download."
-msgstr ""
-"Seleccione as preferencias da cabeceira IMAP. \n"
-"Cantas mÃis cabeceiras teÃa mÃis tempo levarà descargalas."
-
-#: ../plugins/imap-features/imap-headers.ui.h:3
-msgid "_Fetch All Headers"
-msgstr "Obter to_das as cabeceiras"
-
-#: ../plugins/imap-features/imap-headers.ui.h:4
-msgid ""
-"_Basic Headers (Fastest) \n"
-"Use this if you do not have filters based on mailing lists"
-msgstr ""
-"Cabeceiras _bÃsicas - (rÃpido) \n"
-"Use isto se non ten filtros baseados en roldas de correo"
-
-#: ../plugins/imap-features/imap-headers.ui.h:6
-msgid "Basic and _Mailing List Headers (Default)"
-msgstr "Cabeceiras bÃsicas e de lista de _correo (predeterminada)"
-
-#: ../plugins/imap-features/imap-headers.ui.h:8
-msgid ""
-"Give the extra headers that you need to fetch in addition to the above "
-"standard headers. \n"
-"You can ignore this if you choose \"All Headers\"."
-msgstr ""
-"Indique as cabeceiras adicionais que necesita obter ademais das cabeceiras "
-"estÃndar superiores. \n"
-"Pode ignorar isto se selecciona ÂTodas as cabeceirasÂ."
-
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "IMAP Features"
-msgstr "CaracterÃsticas IMAP"
-
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
-msgid "Fine-tune your IMAP accounts."
-msgstr "Axuste fino das sÃas contas IMAP."
-
 #. Translators: The first '%s' is replaced with a calendar name,
 #. * the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:503
+#: ../plugins/itip-formatter/itip-formatter.c:529
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Produciuse un fallo ao cargar o calendario Â%s (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:664
+#: ../plugins/itip-formatter/itip-formatter.c:686
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Unha cita no calendario Â%s entra en conflito con esta reuniÃn"
 
-#: ../plugins/itip-formatter/itip-formatter.c:688
+#: ../plugins/itip-formatter/itip-formatter.c:710
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Localizouse a cita no calendario Â%sÂ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:805
 msgid "Unable to find any calendars"
 msgstr "Non à posÃbel atopar ningÃn calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:810
+#: ../plugins/itip-formatter/itip-formatter.c:813
 msgid "Unable to find this meeting in any calendar"
 msgstr "Non à posÃbel atopar esta reuniÃn en ningÃn calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:815
+#: ../plugins/itip-formatter/itip-formatter.c:818
 msgid "Unable to find this task in any task list"
 msgstr "Non à posÃbel atopar esta tarefa en ningunha lista de tarefas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:820
+#: ../plugins/itip-formatter/itip-formatter.c:823
 msgid "Unable to find this memo in any memo list"
 msgstr "Non à posÃbel atopar esta nota en ningunha lista de notas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1126
+#: ../plugins/itip-formatter/itip-formatter.c:1162
 msgid "Opening the calendar. Please wait..."
 msgstr "Abrindo o calendario. Agardeâ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1130
+#: ../plugins/itip-formatter/itip-formatter.c:1167
 msgid "Searching for an existing version of this appointment"
 msgstr "Buscando unha versiÃn existente desta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1500
+#: ../plugins/itip-formatter/itip-formatter.c:1549
 #, 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:1515
+#: ../plugins/itip-formatter/itip-formatter.c:1564
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado ao calendario Â%s como aceptado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1520
+#: ../plugins/itip-formatter/itip-formatter.c:1569
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado ao calendario Â%s como provisional"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1526
+#: ../plugins/itip-formatter/itip-formatter.c:1575
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado ao calendario Â%s como rexeitado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1532
+#: ../plugins/itip-formatter/itip-formatter.c:1581
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado ao calendario Â%s como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1602
-#: ../plugins/itip-formatter/itip-formatter.c:2019
-#: ../plugins/itip-formatter/itip-formatter.c:2126
+#: ../plugins/itip-formatter/itip-formatter.c:1651
+#: ../plugins/itip-formatter/itip-formatter.c:2084
+#: ../plugins/itip-formatter/itip-formatter.c:2191
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Gardando os cambios no calendario. Agardeâ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1641
+#: ../plugins/itip-formatter/itip-formatter.c:1690
 msgid "Unable to parse item"
 msgstr "Non à posÃbel analizar o elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1827
+#: ../plugins/itip-formatter/itip-formatter.c:1879
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "O organizador eliminou o delegado %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1840
+#: ../plugins/itip-formatter/itip-formatter.c:1894
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviouse unha notificaciÃn de cancelaciÃn ao delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1844
+#: ../plugins/itip-formatter/itip-formatter.c:1898
 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:1893
+#: ../plugins/itip-formatter/itip-formatter.c:1947
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Non à posÃbel actualizar o participante. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1900
+#: ../plugins/itip-formatter/itip-formatter.c:1954
 msgid "Attendee status updated"
 msgstr "Actualizouse o estado de participante"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1923
+#: ../plugins/itip-formatter/itip-formatter.c:1977
 msgid "The meeting is invalid and cannot be updated"
 msgstr "A reuniÃn no à vÃlida e non pode actualizarse"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1992
+#: ../plugins/itip-formatter/itip-formatter.c:2050
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Non foi posÃbel actualizar o estado de participante debido a que o estado "
 "non à vÃlido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2056
-#: ../plugins/itip-formatter/itip-formatter.c:2096
+#: ../plugins/itip-formatter/itip-formatter.c:2121
+#: ../plugins/itip-formatter/itip-formatter.c:2161
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Non foi posÃbel actualizar o estado de participante porque xa non existe o "
 "elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2155
+#: ../plugins/itip-formatter/itip-formatter.c:2224
 msgid "Meeting information sent"
 msgstr "Enviouse a informaciÃn da reuniÃn"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2160
+#: ../plugins/itip-formatter/itip-formatter.c:2229
 msgid "Task information sent"
 msgstr "Enviouse a informaciÃn da tarefa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2165
+#: ../plugins/itip-formatter/itip-formatter.c:2234
 msgid "Memo information sent"
 msgstr "Enviouse a informaciÃn da nota"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2176
+#: ../plugins/itip-formatter/itip-formatter.c:2245
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Non à posÃbel enviar a informaciÃn da reuniÃn, a reuniÃn non existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2181
+#: ../plugins/itip-formatter/itip-formatter.c:2250
 msgid "Unable to send task information, the task does not exist"
 msgstr "Non à posÃbel enviar a informaciÃn da tarefa, a tarefa non existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2186
+#: ../plugins/itip-formatter/itip-formatter.c:2255
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Non à posÃbel enviar a informaciÃn da nota, a nota non existe"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:2251
+#: ../plugins/itip-formatter/itip-formatter.c:2320
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2256
+#: ../plugins/itip-formatter/itip-formatter.c:2325
 msgid "Save Calendar"
 msgstr "Gardar o calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2308
-#: ../plugins/itip-formatter/itip-formatter.c:2320
+#: ../plugins/itip-formatter/itip-formatter.c:2377
+#: ../plugins/itip-formatter/itip-formatter.c:2389
 msgid "The calendar attached is not valid"
 msgstr "O calendario anexado non à vÃlido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2309
-#: ../plugins/itip-formatter/itip-formatter.c:2321
+#: ../plugins/itip-formatter/itip-formatter.c:2378
+#: ../plugins/itip-formatter/itip-formatter.c:2390
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -19141,15 +18782,15 @@ msgstr ""
 "A mensaxe di que contÃn un calendario pero o calendario non à un iCalendar "
 "correcto."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2362
-#: ../plugins/itip-formatter/itip-formatter.c:2391
-#: ../plugins/itip-formatter/itip-formatter.c:2489
+#: ../plugins/itip-formatter/itip-formatter.c:2431
+#: ../plugins/itip-formatter/itip-formatter.c:2460
+#: ../plugins/itip-formatter/itip-formatter.c:2558
 msgid "The item in the calendar is not valid"
 msgstr "O elemento do calendario non à vÃlido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2363
-#: ../plugins/itip-formatter/itip-formatter.c:2392
-#: ../plugins/itip-formatter/itip-formatter.c:2490
+#: ../plugins/itip-formatter/itip-formatter.c:2432
+#: ../plugins/itip-formatter/itip-formatter.c:2461
+#: ../plugins/itip-formatter/itip-formatter.c:2559
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -19157,11 +18798,11 @@ msgstr ""
 "A mensaxe contÃn un calendario pero o calendario non contÃn actividades, "
 "tarefas nin informaciÃn de dispoÃibilidade"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2406
+#: ../plugins/itip-formatter/itip-formatter.c:2475
 msgid "The calendar attached contains multiple items"
 msgstr "O calendario anexado contÃn mÃltiples elementos"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2407
+#: ../plugins/itip-formatter/itip-formatter.c:2476
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -19169,235 +18810,235 @@ msgstr ""
 "Para procesar todos estes elementos, deberÃa gardarse o ficheiro e "
 "importarse o calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2922
+#: ../plugins/itip-formatter/itip-formatter.c:3000
 msgctxt "cal-itip"
 msgid "None"
 msgstr "NingÃn"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2938
+#: ../plugins/itip-formatter/itip-formatter.c:3016
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3081
+#: ../plugins/itip-formatter/itip-formatter.c:3159
 msgid "This meeting recurs"
 msgstr "Esta cita repÃtese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3084
+#: ../plugins/itip-formatter/itip-formatter.c:3162
 msgid "This task recurs"
 msgstr "Esta tarefa repÃtese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3087
+#: ../plugins/itip-formatter/itip-formatter.c:3165
 msgid "This memo recurs"
 msgstr "Esta nota repÃtese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3392
+#: ../plugins/itip-formatter/itip-formatter.c:3429
 msgid "Meeting Invitations"
 msgstr "Convites a reuniÃns"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3418
+#: ../plugins/itip-formatter/itip-formatter.c:3455
 msgid "_Delete message after acting"
 msgstr "E_liminar a mensaxe despois da acciÃn"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3432
-#: ../plugins/itip-formatter/itip-formatter.c:3465
+#: ../plugins/itip-formatter/itip-formatter.c:3469
+#: ../plugins/itip-formatter/itip-formatter.c:3498
 msgid "Conflict Search"
 msgstr "Busca de conflitos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:3447
+#: ../plugins/itip-formatter/itip-formatter.c:3484
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccionar os calendarios nos que buscar conflitos entre reuniÃns"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:216
+#: ../plugins/itip-formatter/itip-view.c:221
 msgid "Today %H:%M"
 msgstr "Hoxe Ãs %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:225
 msgid "Today %H:%M:%S"
 msgstr "Hoxe Ãs %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:229
+#: ../plugins/itip-formatter/itip-view.c:234
 msgid "Today %l:%M:%S %p"
 msgstr "Hoxe Ãs %l:%M:%S %p"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:244
+#: ../plugins/itip-formatter/itip-view.c:249
 msgid "Tomorrow %H:%M"
 msgstr "MaÃÃ Ãs %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:248
+#: ../plugins/itip-formatter/itip-view.c:253
 msgid "Tomorrow %H:%M:%S"
 msgstr "MaÃÃ Ãs %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:253
+#: ../plugins/itip-formatter/itip-view.c:258
 msgid "Tomorrow %l:%M %p"
 msgstr "MaÃÃ Ãs %l:%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:257
+#: ../plugins/itip-formatter/itip-view.c:262
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "MaÃÃ Ãs %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:276
+#: ../plugins/itip-formatter/itip-view.c:281
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:281
+#: ../plugins/itip-formatter/itip-view.c:286
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:285
+#: ../plugins/itip-formatter/itip-view.c:290
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:295
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:294
+#: ../plugins/itip-formatter/itip-view.c:299
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../plugins/itip-formatter/itip-view.c:303
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e"
 msgstr "%A, %e de %B"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:309
+#: ../plugins/itip-formatter/itip-view.c:314
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e de %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:313
+#: ../plugins/itip-formatter/itip-view.c:318
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e de %B %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:318
+#: ../plugins/itip-formatter/itip-view.c:323
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e de %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:322
+#: ../plugins/itip-formatter/itip-view.c:327
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e de %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:328
+#: ../plugins/itip-formatter/itip-view.c:333
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e de %B de %Y"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:333
+#: ../plugins/itip-formatter/itip-view.c:338
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e de %B de %Y, %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:337
+#: ../plugins/itip-formatter/itip-view.c:342
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e de %B de %Y, %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:342
+#: ../plugins/itip-formatter/itip-view.c:347
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e de %B de %Y, %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:351
 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:384
-#: ../plugins/itip-formatter/itip-view.c:385
-#: ../plugins/itip-formatter/itip-view.c:470
-#: ../plugins/itip-formatter/itip-view.c:471
-#: ../plugins/itip-formatter/itip-view.c:556
+#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:390
+#: ../plugins/itip-formatter/itip-view.c:475
+#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:561
 msgid "An unknown person"
 msgstr "Unha persoa descoÃecida"
 
-#: ../plugins/itip-formatter/itip-view.c:389
-#: ../plugins/itip-formatter/itip-view.c:475
-#: ../plugins/itip-formatter/itip-view.c:560
+#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:565
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Responda de parte de %s"
 
-#: ../plugins/itip-formatter/itip-view.c:391
-#: ../plugins/itip-formatter/itip-view.c:477
-#: ../plugins/itip-formatter/itip-view.c:562
+#: ../plugins/itip-formatter/itip-view.c:396
+#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:567
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Recibido de parte de %s"
 
-#: ../plugins/itip-formatter/itip-view.c:396
+#: ../plugins/itip-formatter/itip-view.c:401
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s publicou a seguinte informaciÃn da reuniÃn a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:403
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s publicou a seguinte informaciÃn da reuniÃn:"
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s delegoulle a reuniÃn seguinte:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:411
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s solicita a sÃa presenza na seguinte reuniÃn a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:408
+#: ../plugins/itip-formatter/itip-view.c:413
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s solicita a sÃa presenza na seguinte reuniÃn:"
 
-#: ../plugins/itip-formatter/itip-view.c:414
+#: ../plugins/itip-formatter/itip-view.c:419
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s desexa apuntarse a unha reuniÃn existente a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:421
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s desexa apuntarse a unha reuniÃn existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:420
+#: ../plugins/itip-formatter/itip-view.c:425
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -19406,87 +19047,87 @@ msgstr ""
 "%s desexa recibir a Ãltima informaciÃn sobre a prÃxima reuniÃn a travÃs de "
 "%s:"
 
-#: ../plugins/itip-formatter/itip-view.c:422
+#: ../plugins/itip-formatter/itip-view.c:427
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s desexa recibir a Ãltima informaciÃn da seguinte reuniÃn:"
 
-#: ../plugins/itip-formatter/itip-view.c:426
+#: ../plugins/itip-formatter/itip-view.c:431
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s enviou a seguinte resposta à reuniÃn a travÃs de %s :"
 
-#: ../plugins/itip-formatter/itip-view.c:428
+#: ../plugins/itip-formatter/itip-view.c:433
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s enviou a seguinte resposta à reuniÃn:"
 
-#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:437
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s cancelou a seguinte reuniÃn a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:439
 #, c-format
 msgid "%s has canceled the following meeting:"
 msgstr "%s cancelou a seguinte reuniÃn:"
 
-#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:443
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s propuxo as seguintes modificaciÃns para a reuniÃn a travÃs de %s."
 
-#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:445
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s propuxo os seguintes cambios para a reuniÃn:"
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:449
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s rexeitou as seguintes modificaciÃns para a reuniÃn a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s rexeitou os seguintes cambios para a reuniÃn:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:487
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s publicou a seguinte tarefa a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:489
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s publicou a seguinte tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:489
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s solicita a asignaciÃn de %s para a seguinte tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:497
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s asignoulle unha tarefa a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:499
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s asignoulle unha tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:500
+#: ../plugins/itip-formatter/itip-view.c:505
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s desexa apuntarse a unha tarefa existente a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:502
+#: ../plugins/itip-formatter/itip-view.c:507
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s desexa apuntarse a unha tarefa existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:506
+#: ../plugins/itip-formatter/itip-view.c:511
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -19495,185 +19136,185 @@ msgstr ""
 "%s desexa recibir a Ãltima informaciÃn para a seguinte tarefa asignada a "
 "travÃs de %s :"
 
-#: ../plugins/itip-formatter/itip-view.c:508
+#: ../plugins/itip-formatter/itip-view.c:513
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr ""
 "%s desexa recibir a Ãltima informaciÃn para a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:512
+#: ../plugins/itip-formatter/itip-view.c:517
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s enviou a seguinte resposta para a tarefa asignada a travÃs de %s :"
 
-#: ../plugins/itip-formatter/itip-view.c:514
+#: ../plugins/itip-formatter/itip-view.c:519
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s enviou a seguinte resposta à tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:518
+#: ../plugins/itip-formatter/itip-view.c:523
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s cancelou a seguinte tarefa asignada a travÃs de %s :"
 
-#: ../plugins/itip-formatter/itip-view.c:520
+#: ../plugins/itip-formatter/itip-view.c:525
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s cancelou a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:524
+#: ../plugins/itip-formatter/itip-view.c:529
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr ""
 "%s propuxo as seguintes modificaciÃns na asignaciÃn de tarefas a travÃs de "
 "%s :"
 
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../plugins/itip-formatter/itip-view.c:531
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s propuxo as seguintes modificaciÃns na asignaciÃn de tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s rexeitou a seguinte tarefa asignada a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:537
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s rexeitou a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:567
+#: ../plugins/itip-formatter/itip-view.c:572
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s publicou a seguinte nota a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:569
+#: ../plugins/itip-formatter/itip-view.c:574
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s publicou a seguinte nota:"
 
-#: ../plugins/itip-formatter/itip-view.c:574
+#: ../plugins/itip-formatter/itip-view.c:579
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s desexa apuntarse a unha nota existente a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:576
+#: ../plugins/itip-formatter/itip-view.c:581
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s desexa apuntarse a unha nota existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:580
+#: ../plugins/itip-formatter/itip-view.c:585
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s cancelou a seguinte nota compartida a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:582
+#: ../plugins/itip-formatter/itip-view.c:587
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s cancelou a seguinte nota compartida:"
 
-#: ../plugins/itip-formatter/itip-view.c:652
+#: ../plugins/itip-formatter/itip-view.c:657
 msgid "All day:"
 msgstr "Todo o dÃa:"
 
-#: ../plugins/itip-formatter/itip-view.c:658
+#: ../plugins/itip-formatter/itip-view.c:663
 msgid "Start day:"
 msgstr "DÃa de inicio:"
 
-#: ../plugins/itip-formatter/itip-view.c:658
-#: ../plugins/itip-formatter/itip-view.c:1155
+#: ../plugins/itip-formatter/itip-view.c:663
+#: ../plugins/itip-formatter/itip-view.c:1399
 msgid "Start time:"
 msgstr "Hora de inicio:"
 
-#: ../plugins/itip-formatter/itip-view.c:667
+#: ../plugins/itip-formatter/itip-view.c:672
 msgid "End day:"
 msgstr "DÃa de finalizaciÃn:"
 
-#: ../plugins/itip-formatter/itip-view.c:667
-#: ../plugins/itip-formatter/itip-view.c:1156
+#: ../plugins/itip-formatter/itip-view.c:672
+#: ../plugins/itip-formatter/itip-view.c:1400
 msgid "End time:"
 msgstr "Hora de finalizaciÃn:"
 
-#: ../plugins/itip-formatter/itip-view.c:1090
+#: ../plugins/itip-formatter/itip-view.c:1018
 msgid "_Open Calendar"
 msgstr "_Abrir calendario"
 
-#: ../plugins/itip-formatter/itip-view.c:1093
+#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "_Decline all"
 msgstr "_Rexeitar todo"
 
-#: ../plugins/itip-formatter/itip-view.c:1096
+#: ../plugins/itip-formatter/itip-view.c:1024
 msgid "_Decline"
 msgstr "_Rexeitar"
 
-#: ../plugins/itip-formatter/itip-view.c:1099
+#: ../plugins/itip-formatter/itip-view.c:1027
 msgid "_Tentative all"
 msgstr "_Provisional todo"
 
-#: ../plugins/itip-formatter/itip-view.c:1102
+#: ../plugins/itip-formatter/itip-view.c:1030
 msgid "_Tentative"
 msgstr "_Provisional"
 
-#: ../plugins/itip-formatter/itip-view.c:1105
+#: ../plugins/itip-formatter/itip-view.c:1033
 msgid "A_ccept all"
 msgstr "A_ceptar todo"
 
-#: ../plugins/itip-formatter/itip-view.c:1108
+#: ../plugins/itip-formatter/itip-view.c:1036
 msgid "A_ccept"
 msgstr "A_ceptar"
 
-#: ../plugins/itip-formatter/itip-view.c:1111
+#: ../plugins/itip-formatter/itip-view.c:1039
 msgid "_Send Information"
 msgstr "_Enviar informaciÃn"
 
-#: ../plugins/itip-formatter/itip-view.c:1114
+#: ../plugins/itip-formatter/itip-view.c:1042
 msgid "_Update Attendee Status"
 msgstr "_Actualizar o estado do participante"
 
-#: ../plugins/itip-formatter/itip-view.c:1117
+#: ../plugins/itip-formatter/itip-view.c:1045
 msgid "_Update"
 msgstr "_Actualizar"
 
-#: ../plugins/itip-formatter/itip-view.c:1158
-#: ../plugins/itip-formatter/itip-view.c:1200
-#: ../plugins/itip-formatter/itip-view.c:1266
+#: ../plugins/itip-formatter/itip-view.c:1402
+#: ../plugins/itip-formatter/itip-view.c:1444
+#: ../plugins/itip-formatter/itip-view.c:1510
 msgid "Comment:"
 msgstr "Comentario:"
 
 #. RSVP area
-#: ../plugins/itip-formatter/itip-view.c:1189
+#: ../plugins/itip-formatter/itip-view.c:1433
 msgid "Send reply to sender"
 msgstr "Responder ao remitente"
 
 #. Updates
-#: ../plugins/itip-formatter/itip-view.c:1203
+#: ../plugins/itip-formatter/itip-view.c:1447
 msgid "Send _updates to attendees"
 msgstr "Enviar _actualizaciÃns aos participantes"
 
 #. The recurrence check button
-#: ../plugins/itip-formatter/itip-view.c:1206
+#: ../plugins/itip-formatter/itip-view.c:1450
 msgid "_Apply to all instances"
 msgstr "_Aplicar a todas as instancias"
 
-#: ../plugins/itip-formatter/itip-view.c:1207
+#: ../plugins/itip-formatter/itip-view.c:1451
 msgid "Show time as _free"
 msgstr "Mostrar hora como _libre"
 
-#: ../plugins/itip-formatter/itip-view.c:1208
+#: ../plugins/itip-formatter/itip-view.c:1452
 msgid "_Preserve my reminder"
 msgstr "_Conservar o meu recordatorio"
 
-#: ../plugins/itip-formatter/itip-view.c:1209
+#: ../plugins/itip-formatter/itip-view.c:1453
 msgid "_Inherit reminder"
 msgstr "_Herdar recordatorio"
 
-#: ../plugins/itip-formatter/itip-view.c:1533
+#: ../plugins/itip-formatter/itip-view.c:1794
 msgid "_Tasks:"
 msgstr "_Tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:1536
+#: ../plugins/itip-formatter/itip-view.c:1797
 msgid "_Memos:"
 msgstr "_Notas:"
 
@@ -19700,56 +19341,56 @@ msgstr "Esta xuntanza foi delegada"
 msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr "Â{0}Â delegou a reuniÃn. Desexa engadir o delegado Â{1}Â?"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:350
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
 msgid "Get List _Archive"
 msgstr "Obter o _arquivo da lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:352
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:368
 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:357
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
 msgid "Get List _Usage Information"
 msgstr "Obter a informaciÃn sobre o _uso da lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:359
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:375
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Obter a informaciÃn sobre o uso da lista à que pertence esta mensaxe"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:364
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
 msgid "Contact List _Owner"
 msgstr "Pr_opietario da lista de contactos"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
 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:371
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
 msgid "_Post Message to List"
 msgstr "_Publicar unha mensaxe na lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
 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:378
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
 msgid "_Subscribe to List"
 msgstr "_Subscribirse à lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:396
 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:385
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
 msgid "_Unsubscribe from List"
 msgstr "Eliminar a s_ubscriciÃn da lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:403
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Eliminar a subscriciÃn da lista de correo à que pertence esta mensaxe"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:410
 msgid "Mailing _List"
 msgstr "_Lista de correo"
 
@@ -19951,12 +19592,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Notificar a chegada de 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:242
+#: ../plugins/mail-to-task/mail-to-task.c:240
 #, 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:617
+#: ../plugins/mail-to-task/mail-to-task.c:623
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -19965,7 +19606,7 @@ msgstr ""
 "O calendario seleccionado xa contÃn unha actividade Â%sÂ. Desexa editar a "
 "actividade antiga?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:620
+#: ../plugins/mail-to-task/mail-to-task.c:626
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -19974,7 +19615,7 @@ msgstr ""
 "A lista de tarefas seleccionadas xa contÃn unha tarefa Â%sÂ. Desexa editar a "
 "tarefa antiga?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:623
+#: ../plugins/mail-to-task/mail-to-task.c:629
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -19984,7 +19625,7 @@ msgstr ""
 "nota antiga?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:642
+#: ../plugins/mail-to-task/mail-to-task.c:648
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -20000,7 +19641,7 @@ msgstr[1] ""
 "todos?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:648
+#: ../plugins/mail-to-task/mail-to-task.c:654
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -20014,7 +19655,7 @@ msgstr[1] ""
 "Seleccionou %d correos para convertelos en tarefas. Desexa engadilos todos?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:654
+#: ../plugins/mail-to-task/mail-to-task.c:660
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -20027,29 +19668,33 @@ msgstr[0] ""
 msgstr[1] ""
 "Seleccionou %d correos para convertelos en notas. Desexa engadilos todos?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:675
+#: ../plugins/mail-to-task/mail-to-task.c:681
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Desexa continuar convertendo os correos restantes?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:750
+#: ../plugins/mail-to-task/mail-to-task.c:756
 msgid "[No Summary]"
 msgstr "[Sen resumo]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:762
+#: ../plugins/mail-to-task/mail-to-task.c:768
 msgid "Invalid object returned from a server"
 msgstr "O obxecto devolto por un servidor non à vÃlido"
 
-#: ../plugins/mail-to-task/mail-to-task.c:814
+#: ../plugins/mail-to-task/mail-to-task.c:820
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Produciuse un erro no proceso: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:839
+#: ../plugins/mail-to-task/mail-to-task.c:845
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Non à posÃbel abrir o calendario. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:846
+#: ../plugins/mail-to-task/mail-to-task.c:845
+msgid "Unknown error."
+msgstr "Erro descoÃecido."
+
+#: ../plugins/mail-to-task/mail-to-task.c:852
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -20057,7 +19702,7 @@ msgstr ""
 "A fonte seleccionada à sà de lectura polo que non à posÃbel crear "
 "actividades nela. Seleccione outra fonte."
 
-#: ../plugins/mail-to-task/mail-to-task.c:849
+#: ../plugins/mail-to-task/mail-to-task.c:855
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -20065,7 +19710,7 @@ msgstr ""
 "A fonte seleccionada à sà de lectura polo que non à posÃbel crear tarefas "
 "nela. Seleccione outra fonte."
 
-#: ../plugins/mail-to-task/mail-to-task.c:852
+#: ../plugins/mail-to-task/mail-to-task.c:858
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -20073,44 +19718,39 @@ msgstr ""
 "A fonte seleccionada à sà de lectura polo que non à posÃbel crear notas "
 "nela. Seleccione outra fonte."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1100
-#, c-format
-msgid "Cannot get source list. %s"
-msgstr "Non à posÃbel obter a lista fonte. %s"
-
-#: ../plugins/mail-to-task/mail-to-task.c:1161
+#: ../plugins/mail-to-task/mail-to-task.c:1188
 msgid "No writable calendar is available."
 msgstr "Non hai ningÃn calendario escribÃbel dispoÃÃbel."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1255
+#: ../plugins/mail-to-task/mail-to-task.c:1272
 msgid "Create an _Event"
 msgstr "Cr_ear unha actividade"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1257
+#: ../plugins/mail-to-task/mail-to-task.c:1274
 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:1262
+#: ../plugins/mail-to-task/mail-to-task.c:1279
 msgid "Create a Mem_o"
 msgstr "Crear unha n_ota"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1264
+#: ../plugins/mail-to-task/mail-to-task.c:1281
 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:1269
+#: ../plugins/mail-to-task/mail-to-task.c:1286
 msgid "Create a _Task"
 msgstr "Crear unha _tarefa"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1271
+#: ../plugins/mail-to-task/mail-to-task.c:1288
 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:1279
+#: ../plugins/mail-to-task/mail-to-task.c:1296
 msgid "Create a _Meeting"
 msgstr "Crear unha _reuniÃn"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1281
+#: ../plugins/mail-to-task/mail-to-task.c:1298
 msgid "Create a new meeting from the selected message"
 msgstr "Crear unha reuniÃn nova a partir da mensaxe seleccionada"
 
@@ -20215,38 +19855,38 @@ msgstr "Cartafoles persoais do Outlook (.pst)"
 msgid "Import Outlook messages from PST file"
 msgstr "Importar as mensaxes do Outlook desde un ficheiro PST"
 
-#: ../plugins/pst-import/pst-importer.c:543
+#: ../plugins/pst-import/pst-importer.c:555
 msgid "_Mail"
 msgstr "_Correo"
 
-#: ../plugins/pst-import/pst-importer.c:571
+#: ../plugins/pst-import/pst-importer.c:584
 msgid "Destination folder:"
 msgstr "Cartafol de destino:"
 
-#: ../plugins/pst-import/pst-importer.c:581
+#: ../plugins/pst-import/pst-importer.c:594
 msgid "_Address Book"
 msgstr "_Axenda de enderezos"
 
-#: ../plugins/pst-import/pst-importer.c:586
+#: ../plugins/pst-import/pst-importer.c:599
 msgid "A_ppointments"
 msgstr "Ci_tas"
 
-#: ../plugins/pst-import/pst-importer.c:591 ../views/tasks/galview.xml.h:1
+#: ../plugins/pst-import/pst-importer.c:604 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "_Tarefas"
 
-#: ../plugins/pst-import/pst-importer.c:596
+#: ../plugins/pst-import/pst-importer.c:609
 msgid "_Journal entries"
 msgstr "Entradas do _xornal"
 
-#: ../plugins/pst-import/pst-importer.c:709
+#: ../plugins/pst-import/pst-importer.c:721
 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:147
-#: ../plugins/publish-calendar/publish-calendar.c:155
-#: ../plugins/publish-calendar/publish-calendar.c:157
+#: ../plugins/publish-calendar/publish-calendar.c:146
+#: ../plugins/publish-calendar/publish-calendar.c:154
+#: ../plugins/publish-calendar/publish-calendar.c:156
 msgid "Calendar Publishing"
 msgstr "PublicaciÃn de calendarios"
 
@@ -20258,49 +19898,49 @@ msgstr "LocalizaciÃns"
 msgid "Publish calendars to the web."
 msgstr "Publicar calendarios na web."
 
-#: ../plugins/publish-calendar/publish-calendar.c:218
-#: ../plugins/publish-calendar/publish-calendar.c:469
+#: ../plugins/publish-calendar/publish-calendar.c:217
+#: ../plugins/publish-calendar/publish-calendar.c:468
 #, c-format
 msgid "Could not open %s:"
 msgstr "Non foi posÃbel abrir %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:220
+#: ../plugins/publish-calendar/publish-calendar.c:219
 #, 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:240
+#: ../plugins/publish-calendar/publish-calendar.c:239
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "Produciuse un erro ao publicar en %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:242
+#: ../plugins/publish-calendar/publish-calendar.c:241
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "Rematouse con Ãxito a publicaciÃn en %s"
 
-#: ../plugins/publish-calendar/publish-calendar.c:286
+#: ../plugins/publish-calendar/publish-calendar.c:285
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Produciuse un fallo ao montar %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:617
+#: ../plugins/publish-calendar/publish-calendar.c:616
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "E_nable"
 msgstr "A_ctivar"
 
-#: ../plugins/publish-calendar/publish-calendar.c:765
+#: ../plugins/publish-calendar/publish-calendar.c:764
 msgid "Are you sure you want to remove this location?"
 msgstr "Està seguro de que desexa 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:1099
+#: ../plugins/publish-calendar/publish-calendar.c:1098
 msgid "Could not create publish thread."
 msgstr "Non foi posÃbel crear a conversa para publicar."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1107
+#: ../plugins/publish-calendar/publish-calendar.c:1106
 msgid "_Publish Calendar Information"
 msgstr "_Publicar a informaciÃn do calendario"
 
@@ -20392,101 +20032,101 @@ msgstr "_Lembrar o contrasinal"
 msgid "Publishing Location"
 msgstr "LocalizaciÃn da publicaciÃn"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:94
-#: ../plugins/publish-calendar/publish-format-ical.c:91
+#: ../plugins/publish-calendar/publish-format-fb.c:97
+#: ../plugins/publish-calendar/publish-format-ical.c:95
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr ""
 "Non foi posÃbel publicar o calendario: o backend do calendario xa non existe"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:524
+#: ../plugins/publish-calendar/url-editor-dialog.c:526
 msgid "New Location"
 msgstr "LocalizaciÃn nova"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:526
+#: ../plugins/publish-calendar/url-editor-dialog.c:528
 msgid "Edit Location"
 msgstr "Editar a localizaciÃn"
 
 #. Translators: the %F %T is the third argument for a
 #. * strftime function.  It lets you define the formatting
 #. * of the date in the csv-file.
-#: ../plugins/save-calendar/csv-format.c:168
+#: ../plugins/save-calendar/csv-format.c:161
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Description List"
 msgstr "Lista de descriciÃns"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Categories List"
 msgstr "Lista de categorÃas"
 
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Comment List"
 msgstr "Lista de comentarios"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Contact List"
 msgstr "Lista de contactos"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Start"
 msgstr "Iniciar"
 
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:380
 msgid "End"
 msgstr "Finalizar"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Due"
 msgstr "Vencemento"
 
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "percent Done"
 msgstr "porcentaxe feita"
 
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Attendees List"
 msgstr "Lista de participantes"
 
-#: ../plugins/save-calendar/csv-format.c:398
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "Modified"
 msgstr "Modificado"
 
-#: ../plugins/save-calendar/csv-format.c:573
+#: ../plugins/save-calendar/csv-format.c:562
 msgid "A_dvanced options for the CSV format"
 msgstr "OpciÃns avanza_das para o formato CSV"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:570
 msgid "Prepend a _header"
 msgstr "Antepor unha ca_beceira"
 
-#: ../plugins/save-calendar/csv-format.c:590
+#: ../plugins/save-calendar/csv-format.c:579
 msgid "_Value delimiter:"
 msgstr "Delimitador de _valor:"
 
-#: ../plugins/save-calendar/csv-format.c:601
+#: ../plugins/save-calendar/csv-format.c:590
 msgid "_Record delimiter:"
 msgstr "Delimitador de _rexistro:"
 
-#: ../plugins/save-calendar/csv-format.c:612
+#: ../plugins/save-calendar/csv-format.c:601
 msgid "_Encapsulate values with:"
 msgstr "_Encapsular valores con:"
 
-#: ../plugins/save-calendar/csv-format.c:638
+#: ../plugins/save-calendar/csv-format.c:627
 msgid "Comma separated values (.csv)"
 msgstr "Valores separados por comas (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:175 ../shell/e-shell-utils.c:199
+#: ../plugins/save-calendar/ical-format.c:165 ../shell/e-shell-utils.c:199
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -20503,31 +20143,31 @@ msgstr "Garda un calendario ou unha lista de tarefas no disco."
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:153
+#: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:388
+#: ../plugins/save-calendar/rdf-format.c:378
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:127
+#: ../plugins/save-calendar/save-calendar.c:123
 msgid "_Format:"
 msgstr "_Formato:"
 
-#: ../plugins/save-calendar/save-calendar.c:189
+#: ../plugins/save-calendar/save-calendar.c:185
 msgid "Select destination file"
 msgstr "Seleccionar un ficheiro de destino"
 
-#: ../plugins/save-calendar/save-calendar.c:344
+#: ../plugins/save-calendar/save-calendar.c:340
 msgid "Save the selected calendar to disk"
 msgstr "Gardar o calendario seleccionado no disco"
 
-#: ../plugins/save-calendar/save-calendar.c:375
+#: ../plugins/save-calendar/save-calendar.c:371
 msgid "Save the selected memo list to disk"
 msgstr "Gardar a lista de notas seleccionada no disco"
 
-#: ../plugins/save-calendar/save-calendar.c:406
+#: ../plugins/save-calendar/save-calendar.c:402
 msgid "Save the selected task list to disk"
 msgstr "Gardar a lista de tarefas seleccionada no disco"
 
@@ -20569,49 +20209,33 @@ msgstr "vCards inseridas"
 msgid "Show vCards directly in mail messages."
 msgstr "Mostrar as vCards directamente nas mensaxes de correo."
 
-#: ../plugins/vcard-inline/vcard-inline.c:236
-#: ../plugins/vcard-inline/vcard-inline.c:356
+#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:365
 msgid "Show Full vCard"
 msgstr "Mostrar vCard completa"
 
-#: ../plugins/vcard-inline/vcard-inline.c:243
-#: ../plugins/vcard-inline/vcard-inline.c:359
+#: ../plugins/vcard-inline/vcard-inline.c:252
+#: ../plugins/vcard-inline/vcard-inline.c:368
 msgid "Show Compact vCard"
 msgstr "Mostrar vCard compacta"
 
-#: ../plugins/vcard-inline/vcard-inline.c:377
+#: ../plugins/vcard-inline/vcard-inline.c:386
 msgid "Save To Addressbook"
 msgstr "Gardar na axenda de enderezos"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../plugins/vcard-inline/vcard-inline.c:386
+#: ../plugins/vcard-inline/vcard-inline.c:395
 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:392
+#: ../plugins/vcard-inline/vcard-inline.c:401
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Hai %d contacto mÃis."
 msgstr[1] "Hai %d contactos mÃis."
 
-#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "WebDAV contacts"
-msgstr "Contactos WebDAV"
-
-#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
-msgid "Add WebDAV contacts to Evolution."
-msgstr "Engadir contactos WebDAV ao Evolution."
-
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:70
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:288
-msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr "Evit_ar o IfMatch (necesario no Apache < 2.2.8)"
-
 #: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
@@ -20801,15 +20425,15 @@ msgstr "URL de configuraciÃn automÃtica do proxy"
 msgid "URL that provides proxy configuration values."
 msgstr "O URL que proporciona os valores de configuraciÃn de proxy."
 
-#: ../shell/e-shell.c:312
+#: ../shell/e-shell.c:313
 msgid "Preparing to go offline..."
 msgstr "Preparando a desconexiÃnâ"
 
-#: ../shell/e-shell.c:365
+#: ../shell/e-shell.c:366
 msgid "Preparing to go online..."
 msgstr "Preparando a conexiÃnâ"
 
-#: ../shell/e-shell.c:436
+#: ../shell/e-shell.c:437
 msgid "Preparing to quit..."
 msgstr "Preparando a saÃdaâ"
 
@@ -20849,14 +20473,14 @@ msgstr "vCard (.vcf)"
 msgid "All Files (*)"
 msgstr "Todos os ficheiros (*)"
 
-#: ../shell/e-shell-view.c:303
+#: ../shell/e-shell-view.c:304
 msgid "Saving user interface state"
 msgstr "Gardando o estado da interface do usuario"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:643
+#: ../shell/e-shell-window-actions.c:642
 msgid "translator-credits"
 msgstr ""
 "Suso Baleato <suso baleato xunta es>, 2009;\n"
@@ -20866,277 +20490,269 @@ msgstr ""
 "  Fran DiÃguez https://launchpad.net/~frandieguez\n";
 "  Miguel Anxo Bouzada https://launchpad.net/~mbouzada";
 
-#: ../shell/e-shell-window-actions.c:654
+#: ../shell/e-shell-window-actions.c:653
 msgid "Evolution Website"
 msgstr "Sitio web do Evolution"
 
-#: ../shell/e-shell-window-actions.c:913
+#: ../shell/e-shell-window-actions.c:891
 msgid "Categories Editor"
 msgstr "Editor de categorÃas"
 
-#: ../shell/e-shell-window-actions.c:1250
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Bug Buddy is not installed."
 msgstr "O Bug buddy non està instalado."
 
-#: ../shell/e-shell-window-actions.c:1252
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Bug Buddy could not be run."
 msgstr "Non foi posÃbel executar o Bug Buddy."
 
-#: ../shell/e-shell-window-actions.c:1433
+#: ../shell/e-shell-window-actions.c:1411
 msgid "Show information about Evolution"
 msgstr "Mostrar informaciÃn sobre o Evolution"
 
-#: ../shell/e-shell-window-actions.c:1438
-#: ../shell/e-shell-window-actions.c:1452
+#: ../shell/e-shell-window-actions.c:1416
+#: ../shell/e-shell-window-actions.c:1430
 msgid "_Close Window"
 msgstr "Pe_char a xanela"
 
-#: ../shell/e-shell-window-actions.c:1459
+#: ../shell/e-shell-window-actions.c:1437
 msgid "_Contents"
 msgstr "_Contidos"
 
-#: ../shell/e-shell-window-actions.c:1461
+#: ../shell/e-shell-window-actions.c:1439
 msgid "Open the Evolution User Guide"
 msgstr "Abrir a guÃa de usuario do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1487
-msgid "_Forget Passwords"
-msgstr "_Esquecer os contrasinais"
-
-#: ../shell/e-shell-window-actions.c:1489
-msgid "Forget all remembered passwords"
-msgstr "Esquecer todos os contrasinais gardados"
-
-#: ../shell/e-shell-window-actions.c:1494
+#: ../shell/e-shell-window-actions.c:1465
 msgid "I_mport..."
 msgstr "I_mportarâ"
 
-#: ../shell/e-shell-window-actions.c:1496
+#: ../shell/e-shell-window-actions.c:1467
 msgid "Import data from other programs"
 msgstr "Importar os datos doutros programas"
 
-#: ../shell/e-shell-window-actions.c:1501
+#: ../shell/e-shell-window-actions.c:1472
 msgid "New _Window"
 msgstr "_Xanela nova"
 
-#: ../shell/e-shell-window-actions.c:1503
+#: ../shell/e-shell-window-actions.c:1474
 msgid "Create a new window displaying this view"
 msgstr "Crear unha xanela nova mostrando esta vista"
 
-#: ../shell/e-shell-window-actions.c:1515
+#: ../shell/e-shell-window-actions.c:1486
 msgid "Available Cate_gories"
 msgstr "Cate_gorias dispoÃÃbeis"
 
-#: ../shell/e-shell-window-actions.c:1517
+#: ../shell/e-shell-window-actions.c:1488
 msgid "Manage available categories"
 msgstr "Xestionar as categorÃas dispoÃÃbeis"
 
-#: ../shell/e-shell-window-actions.c:1529
+#: ../shell/e-shell-window-actions.c:1500
 msgid "_Quick Reference"
 msgstr "_Referencia rÃpida"
 
-#: ../shell/e-shell-window-actions.c:1531
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Show Evolution's shortcut keys"
 msgstr "Mostrar as teclas dos atallos do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1538
+#: ../shell/e-shell-window-actions.c:1509
 msgid "Exit the program"
 msgstr "SaÃr do programa"
 
-#: ../shell/e-shell-window-actions.c:1543
+#: ../shell/e-shell-window-actions.c:1514
 msgid "_Advanced Search..."
 msgstr "Busca _avanzadaâ"
 
-#: ../shell/e-shell-window-actions.c:1545
+#: ../shell/e-shell-window-actions.c:1516
 msgid "Construct a more advanced search"
 msgstr "ConstruÃr unha busca mÃis avanzada"
 
-#: ../shell/e-shell-window-actions.c:1552
+#: ../shell/e-shell-window-actions.c:1523
 msgid "Clear the current search parameters"
 msgstr "Limpar os parÃmetros da busca actual"
 
-#: ../shell/e-shell-window-actions.c:1557
+#: ../shell/e-shell-window-actions.c:1528
 msgid "_Edit Saved Searches..."
 msgstr "_Editar as buscas gardadasâ"
 
-#: ../shell/e-shell-window-actions.c:1559
+#: ../shell/e-shell-window-actions.c:1530
 msgid "Manage your saved searches"
 msgstr "Xestionar as buscas gardadas"
 
-#: ../shell/e-shell-window-actions.c:1566
+#: ../shell/e-shell-window-actions.c:1537
 msgid "Click here to change the search type"
 msgstr "Prema aquà para cambiar o tipo de busca"
 
-#: ../shell/e-shell-window-actions.c:1571
+#: ../shell/e-shell-window-actions.c:1542
 msgid "_Find Now"
 msgstr "_Buscar agora"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1573
+#: ../shell/e-shell-window-actions.c:1544
 msgid "Execute the current search parameters"
 msgstr "Executar os parÃmetros de busca actuais"
 
-#: ../shell/e-shell-window-actions.c:1578
+#: ../shell/e-shell-window-actions.c:1549
 msgid "_Save Search..."
 msgstr "_Gardar a buscaâ"
 
-#: ../shell/e-shell-window-actions.c:1580
+#: ../shell/e-shell-window-actions.c:1551
 msgid "Save the current search parameters"
 msgstr "Gardar os parÃmetros de busca actuais"
 
-#: ../shell/e-shell-window-actions.c:1592
+#: ../shell/e-shell-window-actions.c:1563
 msgid "Submit _Bug Report..."
 msgstr "Enviar un _informe de erroâ"
 
-#: ../shell/e-shell-window-actions.c:1594
+#: ../shell/e-shell-window-actions.c:1565
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1599
+#: ../shell/e-shell-window-actions.c:1570
 msgid "_Work Offline"
 msgstr "_Traballar sen conexiÃn"
 
-#: ../shell/e-shell-window-actions.c:1601
+#: ../shell/e-shell-window-actions.c:1572
 msgid "Put Evolution into offline mode"
 msgstr "PoÃer o Evolution en modo sen conexiÃn"
 
-#: ../shell/e-shell-window-actions.c:1606
+#: ../shell/e-shell-window-actions.c:1577
 msgid "_Work Online"
 msgstr "_Traballar conectado"
 
-#: ../shell/e-shell-window-actions.c:1608
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Put Evolution into online mode"
 msgstr "PoÃer o Evolution en modo conectado"
 
-#: ../shell/e-shell-window-actions.c:1636
+#: ../shell/e-shell-window-actions.c:1607
 msgid "Lay_out"
 msgstr "Disp_osiciÃn"
 
-#: ../shell/e-shell-window-actions.c:1643
+#: ../shell/e-shell-window-actions.c:1614
 msgid "_New"
 msgstr "_Novo"
 
-#: ../shell/e-shell-window-actions.c:1650
+#: ../shell/e-shell-window-actions.c:1621
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../shell/e-shell-window-actions.c:1657
+#: ../shell/e-shell-window-actions.c:1628
 msgid "_Switcher Appearance"
 msgstr "Aparencia do _selector"
 
-#: ../shell/e-shell-window-actions.c:1671
+#: ../shell/e-shell-window-actions.c:1642
 msgid "_Window"
 msgstr "_Xanela"
 
-#: ../shell/e-shell-window-actions.c:1700
+#: ../shell/e-shell-window-actions.c:1671
 msgid "Show Side _Bar"
 msgstr "Mostrar a _barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1702
+#: ../shell/e-shell-window-actions.c:1673
 msgid "Show the side bar"
 msgstr "Mostrar a _barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1679
 msgid "Show _Buttons"
 msgstr "Mostrar os botÃns"
 
-#: ../shell/e-shell-window-actions.c:1710
+#: ../shell/e-shell-window-actions.c:1681
 msgid "Show the switcher buttons"
 msgstr "Mostrar os botÃns do selector"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1687
 msgid "Show _Status Bar"
 msgstr "Mostrar a _barra de estado"
 
-#: ../shell/e-shell-window-actions.c:1718
+#: ../shell/e-shell-window-actions.c:1689
 msgid "Show the status bar"
 msgstr "Mostrar a barra de estado"
 
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show _Tool Bar"
 msgstr "Mostrar a barra de ferramen_tas"
 
-#: ../shell/e-shell-window-actions.c:1726
+#: ../shell/e-shell-window-actions.c:1697
 msgid "Show the tool bar"
 msgstr "Mostrar a barra de ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1748
+#: ../shell/e-shell-window-actions.c:1719
 msgid "_Icons Only"
 msgstr "SÃ _iconas"
 
-#: ../shell/e-shell-window-actions.c:1750
+#: ../shell/e-shell-window-actions.c:1721
 msgid "Display window buttons with icons only"
 msgstr "Mostrar os botÃns da xanela sà con iconas"
 
-#: ../shell/e-shell-window-actions.c:1755
+#: ../shell/e-shell-window-actions.c:1726
 msgid "_Text Only"
 msgstr "SÃ _texto"
 
-#: ../shell/e-shell-window-actions.c:1757
+#: ../shell/e-shell-window-actions.c:1728
 msgid "Display window buttons with text only"
 msgstr "Mostrar os botÃns da xanela sà con texto"
 
-#: ../shell/e-shell-window-actions.c:1762
+#: ../shell/e-shell-window-actions.c:1733
 msgid "Icons _and Text"
 msgstr "Icon_as e texto"
 
-#: ../shell/e-shell-window-actions.c:1764
+#: ../shell/e-shell-window-actions.c:1735
 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:1769
+#: ../shell/e-shell-window-actions.c:1740
 msgid "Tool_bar Style"
 msgstr "Estilo da _barra de ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1771
+#: ../shell/e-shell-window-actions.c:1742
 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:1779
+#: ../shell/e-shell-window-actions.c:1750
 msgid "Define Views..."
 msgstr "Definir as vistasâ"
 
-#: ../shell/e-shell-window-actions.c:1781
+#: ../shell/e-shell-window-actions.c:1752
 msgid "Create or edit views"
 msgstr "Crear ou editar vistas"
 
-#: ../shell/e-shell-window-actions.c:1786
+#: ../shell/e-shell-window-actions.c:1757
 msgid "Save Custom View..."
 msgstr "Gardar a vista personalizadaâ"
 
-#: ../shell/e-shell-window-actions.c:1788
+#: ../shell/e-shell-window-actions.c:1759
 msgid "Save current custom view"
 msgstr "Gardar a vista personalizada actual"
 
-#: ../shell/e-shell-window-actions.c:1795
+#: ../shell/e-shell-window-actions.c:1766
 msgid "C_urrent View"
 msgstr "Vista act_ual"
 
-#: ../shell/e-shell-window-actions.c:1805
+#: ../shell/e-shell-window-actions.c:1776
 msgid "Custom View"
 msgstr "Vista personalizada"
 
-#: ../shell/e-shell-window-actions.c:1807
+#: ../shell/e-shell-window-actions.c:1778
 msgid "Current view is a customized view"
 msgstr "A vista actual à unha vista personalizada"
 
-#: ../shell/e-shell-window-actions.c:1817
+#: ../shell/e-shell-window-actions.c:1788
 msgid "Change the page settings for your current printer"
 msgstr "Cambiar os axustes da pÃxina para a impresora actual"
 
-#: ../shell/e-shell-window-actions.c:2207
+#: ../shell/e-shell-window-actions.c:2178
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
-#: ../shell/e-shell-window-actions.c:2328
+#: ../shell/e-shell-window-actions.c:2299
 #, c-format
 msgid "Select view: %s"
 msgstr "Seleccionar vista: %s"
 
-#: ../shell/e-shell-window-actions.c:2429
+#: ../shell/e-shell-window-actions.c:2400
 msgid "Execute these search parameters"
 msgstr "Executar estes parÃmetros de busca"
 
@@ -21151,7 +20767,7 @@ msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:190
+#: ../shell/main.c:188
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -21188,7 +20804,7 @@ msgstr ""
 "Esperamos que lles sexa de proveito o resultado do noso duro traballo, e\n"
 "agardamos con ansias as sÃas colaboraciÃns!\n"
 
-#: ../shell/main.c:214
+#: ../shell/main.c:212
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -21196,13 +20812,13 @@ msgstr ""
 "Grazas\n"
 "O equipo do Evolution\n"
 
-#: ../shell/main.c:221
+#: ../shell/main.c:219
 msgid "Do not tell me again"
 msgstr "Non preguntarme de novo"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:312
+#: ../shell/main.c:310
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -21210,47 +20826,47 @@ msgstr ""
 "Iniciar o Evolution mostrando o compoÃente indicado. As opciÃn dispoÃÃbeis "
 "son 'mail', 'calendar', 'contacts', 'tasks' e 'memos'"
 
-#: ../shell/main.c:316
+#: ../shell/main.c:314
 msgid "Apply the given geometry to the main window"
 msgstr "Aplicar a xeometrÃa indicada à xanela principal"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:318
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:320
 msgid "Ignore network availability"
 msgstr "Ignorar a dispoÃibilidade da rede"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:322
 msgid "Start in \"express\" mode"
 msgstr "Iniciar en modo ÂexpressÂ"
 
-#: ../shell/main.c:327
+#: ../shell/main.c:325
 msgid "Forcibly shut down Evolution"
 msgstr "Forzar o peche do Evolution"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:328
 msgid "Disable loading of any plugins."
 msgstr "Desactivar a carga de todos os engadidos."
 
-#: ../shell/main.c:332
+#: ../shell/main.c:330
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar o panel de vista previa de correo, contactos e tarefas."
 
-#: ../shell/main.c:336
+#: ../shell/main.c:334
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Importar URI ou nomes de ficheiros fornecidos como argumentos."
 
-#: ../shell/main.c:338
+#: ../shell/main.c:336
 msgid "Request a running Evolution process to quit"
 msgstr "Solicitar a saÃda dun proceso de execuciÃn do Evolution"
 
-#: ../shell/main.c:515 ../shell/main.c:523
+#: ../shell/main.c:513 ../shell/main.c:521
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Cliente de correo e XIP Evolution"
 
-#: ../shell/main.c:588
+#: ../shell/main.c:586
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21259,7 +20875,7 @@ msgstr ""
 "%s: --online e --offline non poden usarse à vez.\n"
 "  Use Â%s --help para mÃis informaciÃn.\n"
 
-#: ../shell/main.c:594
+#: ../shell/main.c:592
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -21306,22 +20922,6 @@ msgstr ""
 "PorÃn, como soluciÃn pode intentar actualizar primeiro a Evolution 2 e "
 "despois a Evolution 3."
 
-#: ../shell/shell.error.xml.h:11
-msgid "Are you sure you want to forget all remembered passwords?"
-msgstr "Està seguro de que desexa esquecer todos os contrasinais memorizados?"
-
-#: ../shell/shell.error.xml.h:12
-msgid ""
-"Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed."
-msgstr ""
-"Ao esquecer os seus contrasinais memorizados eliminarà todos os contrasinais "
-"gardados. VolverÃselle preguntar a prÃxima vez que sexan necesarios."
-
-#: ../shell/shell.error.xml.h:13
-msgid "_Forget"
-msgstr "_Esquecer"
-
 #: ../shell/test/e-test-shell-backend.c:52
 msgctxt "New"
 msgid "_Test Item"
@@ -21431,7 +21031,7 @@ msgstr "Expedido à unidade organizativa (OU)"
 #: ../smime/gui/certificate-manager.c:80
 #: ../smime/gui/certificate-manager.c:100
 #: ../smime/gui/certificate-manager.c:118 ../smime/gui/smime-ui.ui.h:12
-#: ../smime/lib/e-cert.c:543
+#: ../smime/lib/e-cert.c:542
 msgid "Serial Number"
 msgstr "NÃmero de serie"
 
@@ -21574,11 +21174,11 @@ msgstr ""
 msgid "Select certificate"
 msgstr "Seleccionar un certificado"
 
-#: ../smime/gui/smime-ui.ui.h:3 ../smime/lib/e-cert.c:803
+#: ../smime/gui/smime-ui.ui.h:3 ../smime/lib/e-cert.c:802
 msgid "SSL Client Certificate"
 msgstr "Certificado de cliente SSL"
 
-#: ../smime/gui/smime-ui.ui.h:4 ../smime/lib/e-cert.c:807
+#: ../smime/gui/smime-ui.ui.h:4 ../smime/lib/e-cert.c:806
 msgid "SSL Server Certificate"
 msgstr "Certificado de servidor SSL"
 
@@ -21642,6 +21242,10 @@ msgstr "Campos do certificado"
 msgid "Field Value"
 msgstr "Valor do campo"
 
+#: ../smime/gui/smime-ui.ui.h:25
+msgid "Details"
+msgstr "InformaciÃn"
+
 #: ../smime/gui/smime-ui.ui.h:26
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Ten certificados destas organizaciÃns que o identifican:"
@@ -21706,7 +21310,7 @@ msgstr ""
 "Antes de confiar nesta EA para calquera propÃsito, deberÃa examinar o seu "
 "certificado e as sÃas directrices e procedementos (se estÃn dispoÃÃbeis)."
 
-#: ../smime/gui/smime-ui.ui.h:44 ../smime/lib/e-cert.c:1072
+#: ../smime/gui/smime-ui.ui.h:44 ../smime/lib/e-cert.c:1071
 msgid "Certificate"
 msgstr "Certificado"
 
@@ -21730,153 +21334,153 @@ msgstr "Non confiar na autenticidade deste certificado"
 msgid "_Edit CA Trust"
 msgstr "_Editar a confianza na EA"
 
-#: ../smime/lib/e-cert.c:202 ../smime/lib/e-cert.c:214
+#: ../smime/lib/e-cert.c:201 ../smime/lib/e-cert.c:213
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:391
+#: ../smime/lib/e-cert.c:390
 msgid "Sign"
 msgstr "Sinatura"
 
-#: ../smime/lib/e-cert.c:392
+#: ../smime/lib/e-cert.c:391
 msgid "Encrypt"
 msgstr "Cifrado"
 
-#: ../smime/lib/e-cert.c:504
+#: ../smime/lib/e-cert.c:503
 msgid "Version"
 msgstr "VersiÃn"
 
-#: ../smime/lib/e-cert.c:519
+#: ../smime/lib/e-cert.c:518
 msgid "Version 1"
 msgstr "VersiÃn 1"
 
-#: ../smime/lib/e-cert.c:522
+#: ../smime/lib/e-cert.c:521
 msgid "Version 2"
 msgstr "VersiÃn 2"
 
-#: ../smime/lib/e-cert.c:525
+#: ../smime/lib/e-cert.c:524
 msgid "Version 3"
 msgstr "VersiÃn 3"
 
-#: ../smime/lib/e-cert.c:608
+#: ../smime/lib/e-cert.c:607
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:611
+#: ../smime/lib/e-cert.c:610
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:614
+#: ../smime/lib/e-cert.c:613
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:617
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "PKCS #1 SHA-256 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "PKCS #1 SHA-384 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "PKCS #1 SHA-512 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 cifrado RSA"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr "Uso da chave de certificado"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
 msgstr "Tipo de certificado Netscape"
 
-#: ../smime/lib/e-cert.c:659
+#: ../smime/lib/e-cert.c:658
 msgid "Certificate Authority Key Identifier"
 msgstr "Identificador da chave da entidade de acreditaciÃn"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identificador do obxecto (%s)"
 
-#: ../smime/lib/e-cert.c:723
+#: ../smime/lib/e-cert.c:722
 msgid "Algorithm Identifier"
 msgstr "Identificador do algoritmo"
 
-#: ../smime/lib/e-cert.c:731
+#: ../smime/lib/e-cert.c:730
 msgid "Algorithm Parameters"
 msgstr "ParÃmetros do algoritmo"
 
-#: ../smime/lib/e-cert.c:753
+#: ../smime/lib/e-cert.c:752
 msgid "Subject Public Key Info"
 msgstr "InformaciÃn da chave pÃblica do titular"
 
-#: ../smime/lib/e-cert.c:758
+#: ../smime/lib/e-cert.c:757
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritmo da chave pÃblica do titular"
 
-#: ../smime/lib/e-cert.c:773
+#: ../smime/lib/e-cert.c:772
 msgid "Subject's Public Key"
 msgstr "Chave pÃblica do titular"
 
-#: ../smime/lib/e-cert.c:794 ../smime/lib/e-cert.c:844
+#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:843
 msgid "Error: Unable to process extension"
 msgstr "Erro: non à posÃbel procesar a extensiÃn"
 
-#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:827
+#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
 msgid "Object Signer"
 msgstr "Asinante do obxecto"
 
-#: ../smime/lib/e-cert.c:819
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Certificate Authority"
 msgstr "Entidade de acreditaciÃn SSL"
 
-#: ../smime/lib/e-cert.c:823
+#: ../smime/lib/e-cert.c:822
 msgid "Email Certificate Authority"
 msgstr "Entidade de acreditaciÃn de correo"
 
-#: ../smime/lib/e-cert.c:852
+#: ../smime/lib/e-cert.c:851
 msgid "Signing"
 msgstr "Sinatura"
 
-#: ../smime/lib/e-cert.c:856
+#: ../smime/lib/e-cert.c:855
 msgid "Non-repudiation"
 msgstr "Non rexeitar"
 
-#: ../smime/lib/e-cert.c:860
+#: ../smime/lib/e-cert.c:859
 msgid "Key Encipherment"
 msgstr "Cifrado da chave"
 
-#: ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:863
 msgid "Data Encipherment"
 msgstr "Cifrado de datos"
 
-#: ../smime/lib/e-cert.c:868
+#: ../smime/lib/e-cert.c:867
 msgid "Key Agreement"
 msgstr "Acordo de chave"
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:871
 msgid "Certificate Signer"
 msgstr "Asinante do certificado"
 
-#: ../smime/lib/e-cert.c:876
+#: ../smime/lib/e-cert.c:875
 msgid "CRL Signer"
 msgstr "Asinante da LRC"
 
-#: ../smime/lib/e-cert.c:925
+#: ../smime/lib/e-cert.c:924
 msgid "Critical"
 msgstr "CrÃtico"
 
-#: ../smime/lib/e-cert.c:927 ../smime/lib/e-cert.c:930
+#: ../smime/lib/e-cert.c:926 ../smime/lib/e-cert.c:929
 msgid "Not Critical"
 msgstr "Non crÃtico"
 
-#: ../smime/lib/e-cert.c:951
+#: ../smime/lib/e-cert.c:950
 msgid "Extensions"
 msgstr "ExtensiÃns"
 
@@ -21888,44 +21492,44 @@ msgstr "ExtensiÃns"
 #. * change this string, unless changing the order of
 #. * name and value.  As a result example:
 #. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-cert.c:1030
+#: ../smime/lib/e-cert.c:1029
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1086 ../smime/lib/e-cert.c:1209
+#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritmo de sinatura do certificado"
 
-#: ../smime/lib/e-cert.c:1095
+#: ../smime/lib/e-cert.c:1094
 msgid "Issuer"
 msgstr "Emisor"
 
-#: ../smime/lib/e-cert.c:1150
+#: ../smime/lib/e-cert.c:1149
 msgid "Issuer Unique ID"
 msgstr "ID Ãnico do emisor"
 
-#: ../smime/lib/e-cert.c:1169
+#: ../smime/lib/e-cert.c:1168
 msgid "Subject Unique ID"
 msgstr "ID Ãnico do titular"
 
-#: ../smime/lib/e-cert.c:1215
+#: ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Value"
 msgstr "Valor da sinatura do certificado"
 
-#: ../smime/lib/e-cert-db.c:859
+#: ../smime/lib/e-cert-db.c:860
 msgid "Certificate already exists"
 msgstr "O certificado xa existe"
 
-#: ../smime/lib/e-pkcs12.c:199
+#: ../smime/lib/e-pkcs12.c:200
 msgid "PKCS12 File Password"
 msgstr "Contrasinal para o ficheiro PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:200
+#: ../smime/lib/e-pkcs12.c:201
 msgid "Enter password for PKCS12 file:"
 msgstr "Introduza un contrasinal para o ficheiro PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:306
+#: ../smime/lib/e-pkcs12.c:307
 msgid "Imported Certificate"
 msgstr "Certificado importado"
 
@@ -22084,17 +21688,17 @@ msgstr "Tipo de vista:"
 msgid "Type of View"
 msgstr "Tipo de vista"
 
-#: ../widgets/misc/ea-calendar-item.c:306
-#: ../widgets/misc/ea-calendar-item.c:315
+#: ../widgets/misc/ea-calendar-item.c:308
+#: ../widgets/misc/ea-calendar-item.c:317
 msgid "%d %B %Y"
 msgstr "%d de %B de %Y"
 
-#: ../widgets/misc/ea-calendar-item.c:318
+#: ../widgets/misc/ea-calendar-item.c:320
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Calendario: desde %s atà %s"
 
-#: ../widgets/misc/ea-calendar-item.c:354
+#: ../widgets/misc/ea-calendar-item.c:356
 msgid "evolution calendar item"
 msgstr "elemento de calendario do Evolution"
 
@@ -22163,6 +21767,11 @@ msgstr "Non foi posÃbel gardar o anexo"
 msgid "Attachment Properties"
 msgstr "Propiedades dos anexos"
 
+#: ../widgets/misc/e-attachment-dialog.c:333
+#: ../widgets/misc/e-import-assistant.c:273
+msgid "F_ilename:"
+msgstr "Nome do f_icheiro:"
+
 #: ../widgets/misc/e-attachment-dialog.c:368
 msgid "MIME Type:"
 msgstr "Tipo MIME:"
@@ -22291,20 +21900,20 @@ msgid "Month Calendar"
 msgstr "Calendario mensual"
 
 #. This is a strftime() format. %B = Month name.
-#: ../widgets/misc/e-calendar-item.c:1284
-#: ../widgets/misc/e-calendar-item.c:2137
+#: ../widgets/misc/e-calendar-item.c:1283
+#: ../widgets/misc/e-calendar-item.c:2136
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1286
+#: ../widgets/misc/e-calendar-item.c:1285
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1323
+#: ../widgets/misc/e-calendar-item.c:1322
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B de %Y"
@@ -22321,7 +21930,7 @@ msgstr "Introduza o conxunto de caracteres que se vai usar"
 msgid "Other..."
 msgstr "Outroâ"
 
-#: ../widgets/misc/e-contact-map-window.c:360
+#: ../widgets/misc/e-contact-map-window.c:356
 msgid "Contacts Map"
 msgstr "Mapa dos contactos"
 
@@ -22462,13 +22071,63 @@ msgstr "Tipo de importador"
 msgid "Select Information to Import"
 msgstr "Seleccionar a informaciÃn para importar"
 
-#: ../widgets/misc/e-import-assistant.c:1345
-msgid "Select a File"
-msgstr "Seleccionar un ficheiro"
+#: ../widgets/misc/e-import-assistant.c:1345
+msgid "Select a File"
+msgstr "Seleccionar un ficheiro"
+
+#: ../widgets/misc/e-import-assistant.c:1362
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "Prema en ÂAplicar para comezar a importar o ficheiro ao Evolution."
+
+#: ../widgets/misc/e-mail-signature-combo-box.c:327
+msgid "Autogenerated"
+msgstr "Xerado automaticamente"
+
+#: ../widgets/misc/e-mail-signature-editor.c:292
+msgid "_Save and Close"
+msgstr "Gardar e _saÃr"
+
+#: ../widgets/misc/e-mail-signature-editor.c:506
+msgid "Edit Signature"
+msgstr "Editar a sinatura"
+
+#: ../widgets/misc/e-mail-signature-editor.c:526
+msgid "_Signature Name:"
+msgstr "Nome da _sinatura:"
+
+#: ../widgets/misc/e-mail-signature-editor.c:572
+msgid "Unnamed"
+msgstr "Sen nome"
+
+#: ../widgets/misc/e-mail-signature-manager.c:337
+msgid "Add _Script"
+msgstr "Engadir un _script"
+
+#: ../widgets/misc/e-mail-signature-manager.c:421
+msgid "Add Signature Script"
+msgstr "Engadir un script de sinatura"
+
+#: ../widgets/misc/e-mail-signature-manager.c:491
+msgid "Edit Signature Script"
+msgstr "Editar o script de sinatura"
+
+#: ../widgets/misc/e-mail-signature-script-dialog.c:395
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only."
+msgstr ""
+"A saÃda deste script usarase como a sÃa\n"
+"sinatura. O nome que indique usarase\n"
+"sà para os efectos de vista."
+
+#: ../widgets/misc/e-mail-signature-script-dialog.c:446
+msgid "S_cript:"
+msgstr "_Script:"
 
-#: ../widgets/misc/e-import-assistant.c:1362
-msgid "Click \"Apply\" to begin importing the file into Evolution."
-msgstr "Prema en ÂAplicar para comezar a importar o ficheiro ao Evolution."
+#: ../widgets/misc/e-mail-signature-script-dialog.c:477
+msgid "Script file must be executable."
+msgstr "O ficheiro do script debe ser executÃbel."
 
 #: ../widgets/misc/e-map.c:886
 msgid "World Map"
@@ -22684,54 +22343,32 @@ msgstr "Devolver notificaciÃn"
 msgid "Sta_tus Tracking"
 msgstr "Seguimento de es_tado"
 
-#: ../widgets/misc/e-signature-editor.c:144
-#: ../widgets/misc/e-signature-editor.c:591
-#: ../widgets/misc/e-signature-manager.c:376
-#: ../widgets/misc/e-signature-script-dialog.c:223
-msgid "Unnamed"
-msgstr "Sen nome"
-
-#: ../widgets/misc/e-signature-editor.c:220
-msgid "_Save and Close"
-msgstr "Gardar e _saÃr"
-
-#: ../widgets/misc/e-signature-editor.c:458
-msgid "Edit Signature"
-msgstr "Editar a sinatura"
-
-#: ../widgets/misc/e-signature-editor.c:473
-msgid "_Signature Name:"
-msgstr "Nome da _sinatura:"
-
-#: ../widgets/misc/e-signature-manager.c:321
-msgid "Add Signature Script"
-msgstr "Engadir un script de sinatura"
-
-#: ../widgets/misc/e-signature-manager.c:388
-msgid "Edit Signature Script"
-msgstr "Editar o script de sinatura"
+#: ../widgets/misc/e-source-config.c:470 ../widgets/misc/e-source-config.c:474
+msgid "Type:"
+msgstr "Tipo:"
 
-#: ../widgets/misc/e-signature-manager.c:607
-msgid "Add _Script"
-msgstr "Engadir un _script"
+#. Translators: This is the first of a sequence of widgets:
+#. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
+#: ../widgets/misc/e-source-config.c:1024
+#, fuzzy
+msgid "Refresh every"
+msgstr "Actualizar o cartafol"
 
-#: ../widgets/misc/e-signature-script-dialog.c:270
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only."
-msgstr ""
-"A saÃda deste script usarase como a sÃa\n"
-"sinatura. O nome que indique usarase\n"
-"sà para os efectos de vista."
+#: ../widgets/misc/e-source-config.c:1054
+#: ../widgets/misc/e-source-config.c:1082
+#, fuzzy
+msgid "Use a secure connection"
+msgstr "Usar conexiÃn _segura"
 
-#: ../widgets/misc/e-signature-script-dialog.c:315
-msgid "S_cript:"
-msgstr "_Script:"
+#: ../widgets/misc/e-source-config.c:1096
+#, fuzzy
+msgid "Ignore invalid SSL certificate"
+msgstr "_Ignorar certificado SSL non vÃlido"
 
-#: ../widgets/misc/e-signature-script-dialog.c:346
-msgid "Script file must be executable."
-msgstr "O ficheiro do script debe ser executÃbel."
+#: ../widgets/misc/e-source-config.c:1133
+#, fuzzy
+msgid "User"
+msgstr "Usuarios"
 
 #. no suggestions. Put something in the menu anyway...
 #: ../widgets/misc/e-spell-entry.c:348
@@ -22761,57 +22398,87 @@ msgstr "SuxestiÃns de ortografÃa"
 msgid "Click here to go to URL"
 msgstr "Prema aquà para ir ao URL"
 
-#: ../widgets/misc/e-web-view.c:279 ../widgets/misc/e-web-view-gtkhtml.c:409
+#: ../widgets/misc/e-web-view.c:279 ../widgets/misc/e-web-view-gtkhtml.c:408
 msgid "_Copy Link Location"
 msgstr "_Copiar a localizaciÃn da ligazÃn"
 
-#: ../widgets/misc/e-web-view.c:281 ../widgets/misc/e-web-view-gtkhtml.c:411
+#: ../widgets/misc/e-web-view.c:281 ../widgets/misc/e-web-view-gtkhtml.c:410
 msgid "Copy the link to the clipboard"
 msgstr "Copiar a ligazÃn no portapapeis"
 
-#: ../widgets/misc/e-web-view.c:289 ../widgets/misc/e-web-view-gtkhtml.c:419
+#: ../widgets/misc/e-web-view.c:289 ../widgets/misc/e-web-view-gtkhtml.c:418
 msgid "_Open Link in Browser"
 msgstr "_Abrir a ligazÃn no navegador"
 
-#: ../widgets/misc/e-web-view.c:291 ../widgets/misc/e-web-view-gtkhtml.c:421
+#: ../widgets/misc/e-web-view.c:291 ../widgets/misc/e-web-view-gtkhtml.c:420
 msgid "Open the link in a web browser"
 msgstr "_Abrir a ligazÃn no navegador web"
 
-#: ../widgets/misc/e-web-view.c:299 ../widgets/misc/e-web-view-gtkhtml.c:429
+#: ../widgets/misc/e-web-view.c:299 ../widgets/misc/e-web-view-gtkhtml.c:428
 msgid "_Copy Email Address"
 msgstr "Copiar o enderezo de _correo"
 
-#: ../widgets/misc/e-web-view.c:316 ../widgets/misc/e-web-view-gtkhtml.c:446
+#: ../widgets/misc/e-web-view.c:316 ../widgets/misc/e-web-view-gtkhtml.c:445
 msgid "_Copy Image"
 msgstr "_Copiar imaxe"
 
-#: ../widgets/misc/e-web-view.c:318 ../widgets/misc/e-web-view-gtkhtml.c:448
+#: ../widgets/misc/e-web-view.c:318 ../widgets/misc/e-web-view-gtkhtml.c:447
 msgid "Copy the image to the clipboard"
 msgstr "Copiar a imaxe ao portapapeis"
 
 #: ../widgets/misc/e-web-view.c:338 ../widgets/misc/e-web-view.c:1419
-#: ../widgets/misc/e-web-view-gtkhtml.c:468
-#: ../widgets/misc/e-web-view-gtkhtml.c:1313
+#: ../widgets/misc/e-web-view-gtkhtml.c:467
+#: ../widgets/misc/e-web-view-gtkhtml.c:1312
 msgid "Select all text and images"
 msgstr "Seleccionar todo o texto e as imaxes"
 
 #: ../widgets/misc/e-web-view.c:1091 ../widgets/misc/e-web-view.c:1093
-#: ../widgets/misc/e-web-view.c:1095 ../widgets/misc/e-web-view-gtkhtml.c:977
-#: ../widgets/misc/e-web-view-gtkhtml.c:979
-#: ../widgets/misc/e-web-view-gtkhtml.c:981
+#: ../widgets/misc/e-web-view.c:1095 ../widgets/misc/e-web-view-gtkhtml.c:976
+#: ../widgets/misc/e-web-view-gtkhtml.c:978
+#: ../widgets/misc/e-web-view-gtkhtml.c:980
 #, c-format
 msgid "Click to call %s"
 msgstr "Prema para chamar a %s"
 
-#: ../widgets/misc/e-web-view.c:1097 ../widgets/misc/e-web-view-gtkhtml.c:983
+#: ../widgets/misc/e-web-view.c:1097 ../widgets/misc/e-web-view-gtkhtml.c:982
 msgid "Click to hide/unhide addresses"
 msgstr "Prema para ocultar/mostrar os enderezos"
 
-#: ../widgets/misc/e-web-view.c:1099 ../widgets/misc/e-web-view-gtkhtml.c:985
+#: ../widgets/misc/e-web-view.c:1099 ../widgets/misc/e-web-view-gtkhtml.c:984
 #, c-format
 msgid "Click to open %s"
 msgstr "Prema para abrir %s"
 
+#: ../widgets/misc/widgets.error.xml.h:1
+msgid "Do you wish to save your changes?"
+msgstr "Desexa gardar as modificaciÃns?"
+
+#: ../widgets/misc/widgets.error.xml.h:2
+msgid "This signature has been changed, but has not been saved."
+msgstr "Modificouse esta sinatura pero non se gardou."
+
+#: ../widgets/misc/widgets.error.xml.h:3
+msgid "_Discard changes"
+msgstr "_Rexeitar as modificaciÃns"
+
+#: ../widgets/misc/widgets.error.xml.h:4
+msgid "Blank Signature"
+msgstr "Sinatura en branco"
+
+#: ../widgets/misc/widgets.error.xml.h:5
+msgid "Please provide an unique name to identify this signature."
+msgstr "Introduza un nome Ãnico para identificar esta sinatura."
+
+#: ../widgets/misc/widgets.error.xml.h:6
+#, fuzzy
+msgid "Could not load signature."
+msgstr "Non foi posÃbel gardar o ficheiro da sinatura."
+
+#: ../widgets/misc/widgets.error.xml.h:7
+#, fuzzy
+msgid "Could not save signature."
+msgstr "Non foi posÃbel gardar o ficheiro da sinatura."
+
 #: ../widgets/table/e-cell-combo.c:187
 msgid "popup list"
 msgstr "lista emerxente"
@@ -23090,6 +22757,504 @@ msgstr "Seleccionar todo"
 msgid "Input Methods"
 msgstr "MÃtodos de entrada"
 
+#~ msgid "Couldn't get list of address books: %s"
+#~ msgstr "Non foi posÃbel obter unha lista das axendas de enderezos: %s"
+
+#~ msgid "_Type:"
+#~ msgstr "_Tipo:"
+
+#~ msgid "Sh_ow reminder notifications"
+#~ msgstr "M_ostrar notificaciÃns de recordatorios"
+
+#~ msgid "You are acting on behalf of %s"
+#~ msgstr "Està actuando no nome de %s"
+
+#~ msgid "On This Computer"
+#~ msgstr "Neste computador"
+
+#~ msgid "List of selected calendars"
+#~ msgstr "Lista dos calendarios seleccionados"
+
+#~ msgid "List of calendars to load"
+#~ msgstr "Lista de calendarios a cargar"
+
+#~ msgid "List of selected memo lists"
+#~ msgstr "Lista dos recordatorios seleccionados"
+
+#~ msgid "List of memo lists to load"
+#~ msgstr "Lista de listados de recordatorios a cargar"
+
+#~ msgid "List of selected task lists"
+#~ msgstr "Lista das listas de tarefas seleccionadas"
+
+#~ msgid "List of task lists to load"
+#~ msgstr "Lista das listas de tarefas a cargar"
+
+#~ msgid "Enter Passphrase for %s"
+#~ msgstr "Introducir a frase de paso para %s"
+
+#~ msgid "Enter Passphrase"
+#~ msgstr "Introducir a frase de paso"
+
+#~ msgid "Enter Password for %s"
+#~ msgstr "Introducir o contrasinal para %s"
+
+#~ msgid "Enter Password"
+#~ msgstr "Introducir o contrasinal"
+
+#~ msgctxt "mail-signature"
+#~ msgid "None"
+#~ msgstr "NingÃn"
+
+#~ msgid "Fil_e:"
+#~ msgstr "Fich_eiro:"
+
+#~ msgid "Mail Configuration"
+#~ msgstr "ConfiguraciÃn do correo"
+
+#~ msgid "Please configure the following account settings."
+#~ msgstr "Configurar os seguintes axustes da conta."
+
+#~ msgid ""
+#~ "Please enter information about the way you will send mail. If you are not "
+#~ "sure, ask your system administrator or Internet Service Provider."
+#~ msgstr ""
+#~ "Introduza a informaciÃn sobre a forma na que enviarà o correo. Se non "
+#~ "està seguro, pregunte ao administrador do sistema ou provedor de acceso a "
+#~ "Internet."
+
+#~ msgid "Check for _new messages every"
+#~ msgstr "Comprobar automaticamente se hai mensaxes _novas cada"
+
+#~ msgid "minu_tes"
+#~ msgstr "minu_tos"
+
+#~ msgid "Checking for New Messages"
+#~ msgstr "Comprobando se hai mensaxes novas"
+
+#~ msgid "Setup Google con_tacts with Evolution"
+#~ msgstr "Configurar os con_tactos de Google con Evolution"
+
+#~ msgid "Setup Google ca_lendar with Evolution"
+#~ msgstr "Configurar o ca_lendario de Google con Evolution"
+
+#~ msgid "Yahoo! account settings:"
+#~ msgstr "ConfiguraciÃn da conta de Yahoo!:"
+
+#~ msgid "Setup _Yahoo! calendar with Evolution"
+#~ msgstr "Configurar o calendario de _Yahoo! con Evolution"
+
+#~ msgid "Setup Yahoo! _tasks with Evolution"
+#~ msgstr "Configurar as tarefas de Yahoo! co Evolution"
+
+#~ msgid ""
+#~ "Yahoo! calendars are named as firstname_lastname. We have tried to form "
+#~ "the calendar name. Please confirm and re-enter the calendar name, if it "
+#~ "is not correct, or change it later in calendar Properties."
+#~ msgstr ""
+#~ "Os calendarios de Yahoo! nomÃanse con nome_apelido. Tentouse formar o "
+#~ "nome do calendario. Confirme e volva a introducir o nome do calendario se "
+#~ "non à correcto, ou cÃmbieo mÃis tarde nas propiedades do calendario."
+
+#~ msgid "Yahoo! Calen_dar name:"
+#~ msgstr "Nome do calen_dario de Yahoo!"
+
+#~ msgid "_Add Signature"
+#~ msgstr "_Engadir unha sinatura"
+
+#~ msgid ""
+#~ "The output of this script will be used as your\n"
+#~ "signature. The name you specify will be used\n"
+#~ "for display purposes only. "
+#~ msgstr ""
+#~ "A saÃda deste script usarase como a sÃa\n"
+#~ "sinatura. O nome que indique usarase\n"
+#~ "sà a efectos de vista. "
+
+#~ msgid "_Script:"
+#~ msgstr "_Script:"
+
+#~ msgid "Drafts _Folder:"
+#~ msgstr "Carta_fol dos borradores:"
+
+#~ msgid "_Trash Folder:"
+#~ msgstr "Cartafo_l do lixo:"
+
+#~ msgid "_Junk Folder:"
+#~ msgstr "Cartafol do coreo _lixo:"
+
+#~ msgid "Signat_ure:"
+#~ msgstr "Sinat_ura:"
+
+#~ msgid "_Make this my default account"
+#~ msgstr "Facer desta a _miÃa conta predeterminada"
+
+#~ msgid "Also encrypt to sel_f when sending encrypted messages"
+#~ msgstr "Ci_frar tamÃn para min mesmo cando envÃe correo cifrado"
+
+#~ msgid "Encrypt out_going messages (by default)"
+#~ msgstr "Cifrar as mensaxes saÃn_tes (predeterminado)"
+
+#~ msgid "Digitally sign o_utgoing messages (by default)"
+#~ msgstr "Asinar dixitalmente as mensaxes saÃnt_es (predeterminado)"
+
+#~ msgid "S_elect..."
+#~ msgstr "S_eleccionarâ"
+
+#~ msgid "Clea_r"
+#~ msgstr "Limpa_r"
+
+#~ msgid "Cle_ar"
+#~ msgstr "Limp_ar"
+
+#~ msgid "description"
+#~ msgstr "descriciÃn"
+
+#~ msgid "Mailbox location"
+#~ msgstr "LocalizaciÃn da caixa de correo"
+
+#~ msgid "_Use secure connection:"
+#~ msgstr "_Usar unha conexiÃn segura:"
+
+#~ msgid "SSL is not supported in this build of Evolution"
+#~ msgstr "SSL non à compatÃbel con esta versiÃn do Evolution"
+
+#~ msgid "_Authentication Type"
+#~ msgstr "Tipo de _autenticaciÃn"
+
+#~ msgid "Re_member password"
+#~ msgstr "Le_mbrar o contrasinal"
+
+#~ msgid "Server Configuration"
+#~ msgstr "ConfiguraciÃn do servidor"
+
+#~ msgid "User _Name:"
+#~ msgstr "_Nome do usuario:"
+
+#~ msgid "Remember _password"
+#~ msgstr "Lembrar o _contrasinal"
+
+#~ msgid "none"
+#~ msgstr "ningunha"
+
+#~ msgid "label"
+#~ msgstr "etiqueta"
+
+#~ msgid "Cannot set signature script \"{0}\"."
+#~ msgstr "Non à posÃbel estabelecer o script de sinatura Â{0}Â."
+
+#~ msgid "The script file must exist and be executable."
+#~ msgstr "O ficheiro do script debe existir e ser executÃbel."
+
+#~ msgid "Signature Already Exists"
+#~ msgstr "A sinatura xa existe"
+
+#~ msgid ""
+#~ "A signature already exists with the name \"{0}\". Please specify a "
+#~ "different name."
+#~ msgstr "Xa existe unha sinatura co nome Â{0}Â. Use un nome diferente."
+
+#~ msgid ""
+#~ "Selecting this option means that Evolution will only connect to your LDAP "
+#~ "server if your LDAP server supports SSL."
+#~ msgstr ""
+#~ "Seleccionar esta opciÃn significa que o Evolution sà conectarà co "
+#~ "servidor LDAP se o servidor LDAP Ã compatÃbel con SSL."
+
+#~ msgid ""
+#~ "Selecting this option means that Evolution will only connect to your LDAP "
+#~ "server if your LDAP server supports TLS."
+#~ msgstr ""
+#~ "Seleccionar esta opciÃn significa que o Evolution sà conectarà co "
+#~ "servidor LDAP se o servidor LDAP Ã compatÃbel co TLS."
+
+#~ 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 vulnerable to security exploits."
+#~ msgstr ""
+#~ "Seleccionar esta opciÃn significa que o servidor non permite nin SSL nin "
+#~ "TLS. Isto significa que a conexiÃn serà insegura e que vostede serà "
+#~ "vulnerÃbel aos fallos de seguranza."
+
+#~ 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 port you should specify."
+#~ msgstr ""
+#~ "Este à o porto do servidor LDAP ao que o Evolution tentarà conectarse. "
+#~ "Proporcionouse unha lista de portos estÃndar. Pregunte ao administrador "
+#~ "do sistema que porto deberÃa indicar."
+
+#~ msgid "On LDAP Servers"
+#~ msgstr "En servidores LDAP"
+
+#~ msgid "Selected Calendars for Reminders"
+#~ msgstr "Calendarios seleccionados para os recordatorios"
+
+#~ msgid "On The Web"
+#~ msgstr "Na Web"
+
+#~ msgid "Weather"
+#~ msgstr "O tempo"
+
+#~ msgid "Birthdays & Anniversaries"
+#~ msgstr "Aniversarios"
+
+#~ msgid "_New Calendar..."
+#~ msgstr "Calendario _novoâ"
+
+#~ msgid "Evolution Setup Assistant"
+#~ msgstr "Asistente de configuraciÃn do Evolution"
+
+#~ msgid "Local Address Books"
+#~ msgstr "Axendas de enderezos locais"
+
+#~ msgid "Ensuring local sources"
+#~ msgstr "Asegurando as fontes locais"
+
+#~ msgid "_Restore Evolution from the backup file"
+#~ msgstr "_Restaurar Evolution desde a copia de seguranza"
+
+#~ msgid "Please select an Evolution Archive to restore:"
+#~ msgstr "Seleccionar o arquivo do Evolution para restabelecer:"
+
+#~ msgid "Back up and Restore"
+#~ msgstr "Facer unha copia de seguranza e restabelecer"
+
+#~ msgid "Back up and restore your Evolution data and settings."
+#~ msgstr ""
+#~ "Facer unha copia de seguranza e restabelecer os datos e os axustes do "
+#~ "Evolution."
+
+#~ msgid "Authentication failed. Server requires correct login."
+#~ msgstr ""
+#~ "Produciuse un fallo na autenticaciÃn. O servidor solicita un inicio de "
+#~ "sesiÃn correcto."
+
+#~ msgid "Given URL cannot be found."
+#~ msgstr "Non à posÃbel atopar o URL fornecido."
+
+#~ msgid ""
+#~ "Server returned unexpected data.\n"
+#~ "%d - %s"
+#~ msgstr ""
+#~ "O servidor devolveu datos non esperados.\n"
+#~ "%d - %s"
+
+#~ msgid "Failed to parse server response."
+#~ msgstr "Produciuse un fallo ao analizar a resposta do servidor:"
+
+#~ msgid "Events"
+#~ msgstr "Actividades"
+
+#~ msgid "User's calendars"
+#~ msgstr "Calendarios do usuario"
+
+#~ msgid "Failed to get server URL."
+#~ msgstr "Produciuse un fallo ao obter o servidor LDAP."
+
+#~ msgid "Searching for user's calendars..."
+#~ msgstr "Buscando os calendarios do usuarioâ"
+
+#~ msgid "Previous attempt failed: %s"
+#~ msgstr "Produciuse un fallo no intento anterior: %s"
+
+#~ msgid "Previous attempt failed with code %d"
+#~ msgstr "Produciuse un fallo no intento anterior co cÃdigo %d"
+
+#~ msgid "Enter password for user %s on server %s"
+#~ msgstr "Introducir o contrasinal para %s no servidor %s"
+
+#~ msgid "Cannot create soup message for URL '%s'"
+#~ msgstr "Non à posÃbel crear a mensaxe Âsoup para o URL Â%sÂ"
+
+#~ msgid "Searching folder content..."
+#~ msgstr "Buscando nos contidos do cartafolâ"
+
+#~ msgid "List of available calendars:"
+#~ msgstr "Lista de calendarios dispoÃÃbeis:"
+
+#~ msgid "Supports"
+#~ msgstr "Admite"
+
+#~ msgid "User e_mail:"
+#~ msgstr "Corro-_e do usuario:"
+
+#~ msgid "Failed to create thread: %s"
+#~ msgstr "Produciuse un fallo ao crear a conversa: %s"
+
+#~ msgid "Server URL '%s' is not a valid URL"
+#~ msgstr "O URL do servidor Â%s non à un URL correcto"
+
+#~ msgid "Browse for a CalDAV calendar"
+#~ msgstr "Buscar un calendario CalDAV"
+
+#~ msgid "_URL:"
+#~ msgstr "_URL:"
+
+#~ msgid "Brows_e server for a calendar"
+#~ msgstr "Busca un cal_endario no servidor"
+
+#~ msgid "Re_fresh:"
+#~ msgstr "Actuali_zar:"
+
+#~ msgid "CalDAV Support"
+#~ msgstr "Compatibilidade de CalDAV"
+
+#~ msgid "Add CalDAV support to Evolution."
+#~ msgstr "Engadir a compatibilidade de CalDAV con Evolution."
+
+#~ msgid "C_ustomize options"
+#~ msgstr "OpciÃns de personali_zaciÃn"
+
+#~ msgid "On open"
+#~ msgstr "Ao abrir"
+
+#~ msgid "On file change"
+#~ msgstr "Ao modificar o ficheiro"
+
+#~ msgid "Periodically"
+#~ msgstr "Periodicamente"
+
+#~ msgid "Force read _only"
+#~ msgstr "Forzar s_Ã lectura"
+
+#~ msgid "Local Calendars"
+#~ msgstr "Calendarios locais"
+
+#~ msgid "Add local calendars to Evolution."
+#~ msgstr "Engadir calendarios locais ao Evolution."
+
+#~ msgid "Userna_me:"
+#~ msgstr "No_me do usuario:"
+
+#~ msgid "Add web calendars to Evolution."
+#~ msgstr "Engadir calendarios web ao Evolution."
+
+#~ msgid "Weather: Fog"
+#~ msgstr "Tempo: nÃboa"
+
+#~ msgid "Weather: Cloudy"
+#~ msgstr "Tempo: anubrado"
+
+#~ msgid "Weather: Cloudy Night"
+#~ msgstr "Tempo: noite anubrada"
+
+#~ msgid "Weather: Overcast"
+#~ msgstr "Tempo: ceo cuberto"
+
+#~ msgid "Weather: Showers"
+#~ msgstr "Tempo: chuvascos"
+
+#~ msgid "Weather: Snow"
+#~ msgstr "Tempo: neve"
+
+#~ msgid "Weather: Sunny"
+#~ msgstr "Tempo: sol"
+
+#~ msgid "Weather: Clear Night"
+#~ msgstr "Tempo: noite despexada"
+
+#~ msgid "Weather: Thunderstorms"
+#~ msgstr "Tempo: treboadas"
+
+#~ msgid "Select a location"
+#~ msgstr "Seleccionar unha localizaciÃn"
+
+#~ msgctxt "weather-cal-location"
+#~ msgid "None"
+#~ msgstr "NingÃn"
+
+#~ msgid "Weather Calendars"
+#~ msgstr "Calendarios meteorolÃxicos"
+
+#~ msgid "Add weather calendars to Evolution."
+#~ msgstr "Engadir calendarios meteorolÃxicos ao Evolution."
+
+#~ msgid "Default Sources"
+#~ msgstr "Fontes predeterminadas"
+
+#~ msgid "Mark your preferred address book and calendar as default."
+#~ msgstr ""
+#~ "Marcar a axenda de enderezos e calendario preferidos como predeterminados."
+
+#~ msgid "Server"
+#~ msgstr "Servidor"
+
+#~ msgid "Enter password for user %s to access list of subscribed calendars."
+#~ msgstr ""
+#~ "Introduza o contrasinal para que o usuario %s acceda à lista de "
+#~ "calendarios subscritos."
+
+#~ msgid ""
+#~ "Cannot read data from Google server.\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non à posÃbel ler os datos desde o servidor do Google.\n"
+#~ "%s"
+
+#~ msgid "Cal_endar:"
+#~ msgstr "Cal_endario:"
+
+#~ msgid "Retrieve _List"
+#~ msgstr "Obter a _lista"
+
+#~ msgid "Google Calendars"
+#~ msgstr "Calendarios de Google"
+
+#~ msgid ""
+#~ "Select your IMAP Header Preferences. \n"
+#~ "The more headers you have the more time it will take to download."
+#~ msgstr ""
+#~ "Seleccione as preferencias da cabeceira IMAP. \n"
+#~ "Cantas mÃis cabeceiras teÃa mÃis tempo levarà descargalas."
+
+#~ msgid ""
+#~ "Give the extra headers that you need to fetch in addition to the above "
+#~ "standard headers. \n"
+#~ "You can ignore this if you choose \"All Headers\"."
+#~ msgstr ""
+#~ "Indique as cabeceiras adicionais que necesita obter ademais das "
+#~ "cabeceiras estÃndar superiores. \n"
+#~ "Pode ignorar isto se selecciona ÂTodas as cabeceirasÂ."
+
+#~ msgid "Fine-tune your IMAP accounts."
+#~ msgstr "Axuste fino das sÃas contas IMAP."
+
+#~ msgid "Cannot get source list. %s"
+#~ msgstr "Non à posÃbel obter a lista fonte. %s"
+
+#~ msgid "WebDAV contacts"
+#~ msgstr "Contactos WebDAV"
+
+#~ msgid "Add WebDAV contacts to Evolution."
+#~ msgstr "Engadir contactos WebDAV ao Evolution."
+
+#~ msgid "WebDAV"
+#~ msgstr "WebDAV"
+
+#~ msgid "_Forget Passwords"
+#~ msgstr "_Esquecer os contrasinais"
+
+#~ msgid "Forget all remembered passwords"
+#~ msgstr "Esquecer todos os contrasinais gardados"
+
+#~ msgid "Are you sure you want to forget all remembered passwords?"
+#~ msgstr ""
+#~ "Està seguro de que desexa esquecer todos os contrasinais memorizados?"
+
+#~ msgid ""
+#~ "Forgetting your passwords will clear all remembered passwords. You will "
+#~ "be reprompted next time they are needed."
+#~ msgstr ""
+#~ "Ao esquecer os seus contrasinais memorizados eliminarà todos os "
+#~ "contrasinais gardados. VolverÃselle preguntar a prÃxima vez que sexan "
+#~ "necesarios."
+
+#~ msgid "_Forget"
+#~ msgstr "_Esquecer"
+
 #~ msgid "Current state of offline mode"
 #~ msgstr "Estado actual do modo desconectado"
 
@@ -23185,9 +23350,6 @@ msgstr "MÃtodos de entrada"
 #~ msgid "cards"
 #~ msgstr "tarxetas"
 
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
 #~ msgctxt "mail-receiving"
 #~ msgid "None"
 #~ msgstr "NingÃn"
@@ -23207,9 +23369,6 @@ msgstr "MÃtodos de entrada"
 #~ msgid "Protocol"
 #~ msgstr "Protocolo"
 
-#~ msgid "GConf error: %s"
-#~ msgstr "Erro do GConf: %s"
-
 #~ msgid "All further errors shown only on terminal."
 #~ msgstr "Todos os erros posteriores mostraranse sà no terminal."
 
@@ -23366,9 +23525,6 @@ msgstr "MÃtodos de entrada"
 #~ msgid "Sharing"
 #~ msgstr "Compartir"
 
-#~ msgid "Users"
-#~ msgstr "Usuarios"
-
 #~ msgid "Proxy Login"
 #~ msgstr "Iniciar sesiÃn no proxy"
 
@@ -23402,15 +23558,9 @@ msgstr "MÃtodos de entrada"
 #~ msgid "_Enable"
 #~ msgstr "_Activar"
 
-#~ msgid "Email:"
-#~ msgstr "Correo electrÃnico:"
-
 #~ msgid "Install the shared folder"
 #~ msgstr "Instalar o cartafol compartido"
 
-#~ msgid "_Secure connection"
-#~ msgstr "ConexiÃn _segura"
-
 #~ msgid "Use _SSL"
 #~ msgstr "Usar _SSL"
 
@@ -23435,9 +23585,6 @@ msgstr "MÃtodos de entrada"
 #~ msgid "Select the calendars for alarm notification"
 #~ msgstr "Seleccione os calendarios para a notificaciÃn de alarma"
 
-#~ msgid "Selected Calendars for Alarms"
-#~ msgstr "Seleccionar calendario para alarmas"
-
 #~ msgid "Alarms"
 #~ msgstr "Alarmas"
 
@@ -23524,9 +23671,6 @@ msgstr "MÃtodos de entrada"
 #~ "mensaxes reais dun dos seus cartafoles locais ou remotos.\n"
 #~ "Està seguro de que quere facer isto?"
 
-#~ msgid "GroupWise Features"
-#~ msgstr "Funcionalidades do Groupwise"
-
 #~ msgid "You have already given proxy permissions to this user."
 #~ msgstr "Xa lle concedeu os permisos de proxy a este usuario."