[evolution] Updated Spanish translation

From: Daniel Mustieles GarcÃa <dmustieles src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution] Updated Spanish translation
Date: Mon, 4 Jun 2012 09:41:12 +0000 (UTC)
commit ea5935b1d9ba28868d69e038aa9b2bc1cc011f12
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Mon Jun 4 11:41:04 2012 +0200

    Updated Spanish translation

 po/es.po | 8303 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 4303 insertions(+), 4000 deletions(-)
---
diff --git a/po/es.po b/po/es.po
index 70c01d7..de35dd1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,14 +12,14 @@
 # Jorge GonzÃlez <jorgegonz svn gnome org>, 2007, 2008, 2009, 2010, 2011.
 # Daniel Mustieles <daniel mustieles gmail com>, 2010, 2011, 2012.
 #
-#: ../shell/main.c:575
+#: ../shell/main.c:573
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2012-05-30 16:48+0000\n"
-"PO-Revision-Date: 2012-05-31 12:09+0200\n"
+"POT-Creation-Date: 2012-06-04 00:00+0000\n"
+"PO-Revision-Date: 2012-06-04 11:35+0200\n"
 "Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
 "Language-Team: EspaÃol <gnome-es-list gnome org>\n"
 "MIME-Version: 1.0\n"
@@ -259,7 +259,7 @@ msgstr ""
 "personales de contactos de GroupWise."
 
 #: ../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 "FallÃ al eliminar el contacto"
 
@@ -283,9 +283,9 @@ msgstr ""
 "vista de 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 "_Quiere recibir el correo como HTML"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:392
+#: ../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-e"
 
@@ -339,7 +339,7 @@ msgid "Instant Messaging"
 msgstr "MensajerÃ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Ãgina personal:"
 
 #: ../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:1531
+#: ../plugins/itip-formatter/itip-view.c:1791
 msgid "_Calendar:"
 msgstr "_Calendario:"
 
@@ -367,6 +367,7 @@ msgid "Home Page:"
 msgstr "PÃgina personal:"
 
 #: ../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 "CumpleaÃos"
 
@@ -492,27 +493,27 @@ msgid "_Address:"
 msgstr "_DirecciÃn:"
 
 #: ../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 "Domicilio"
 
 #: ../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 "Trabajo"
 
 #: ../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 "Otro"
 
@@ -524,79 +525,79 @@ msgstr "DirecciÃn 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 "Error al aÃadir el contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:233
 msgid "Error modifying contact"
 msgstr "Error al modificar el contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:248
 msgid "Error removing contact"
 msgstr "Error al eliminar el 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 "Seleccione una imagen 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 "_Sin imagen"
 
-#: ../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 ""
 "Los datos del contacto no son vÃlidos:\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Â tiene un formato no vÃlido"
 
-#: ../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Â no puede ser una fecha en el 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Â tiene un formato no vÃlido"
 
-#: ../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Ã vacÃo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3800
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3797
 msgid "Invalid contact."
 msgstr "Contacto no vÃlido."
 
-#: ../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 "AÃadir contacto rÃpido"
 
-#: ../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 todo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:497
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:491
 msgid "_Full name"
 msgstr "Nombre co_mpleto"
 
-#: ../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-_e"
 
-#: ../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 la libreta de direcciones"
 
@@ -715,7 +716,7 @@ msgid "_Suffix:"
 msgstr "_Sufijo:"
 
 #: ../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 de listas de contactos"
 
@@ -749,27 +750,26 @@ msgid "Insert email addresses from Address Book"
 msgstr "Insertar una direcciÃn de correo-e desde la libreta de direcciones"
 
 #: ../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 "Miembros de la 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 "_Miembros"
 
-#: ../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 "Error al aÃadir la 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 "Error al modificar la 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 "Error al eliminar la 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:338
+#: ../addressbook/gui/merging/eab-contact-merging.c:342
 msgid "_Merge"
 msgstr "Co_mbinar"
 
@@ -816,27 +816,27 @@ msgstr "Contacto original:"
 msgid "New Contact:"
 msgstr "Contacto nuevo:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:320
+#: ../addressbook/gui/merging/eab-contact-merging.c:324
 msgid "Merge Contact"
 msgstr "Combinar 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 "El nombre contiene"
 
 #: ../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 "El correo-e empieza 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:803
-#: ../modules/calendar/e-task-shell-view-actions.c:1002
+#: ../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 "Cualquier campo contiene"
 
@@ -851,22 +851,22 @@ msgid "Copy _Email Address"
 msgstr "Copiar direcciÃn de _correo-e"
 
 #: ../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 la direcciÃn de correo-e al portapapeles"
 
 #: ../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 un correo nuevo 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 un correo a esta direcciÃn"
 
 #: ../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 "Pulse para enviar correo a %s"
@@ -916,11 +916,9 @@ msgid "Video Chat"
 msgstr "Charla por vÃdeo"
 
 #: ../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Ãvil"
 msgid "Spouse"
 msgstr "CÃnyuge"
 
-#. 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 "Privado"
 
@@ -1003,7 +988,7 @@ msgstr "PÃgina personal"
 msgid "Blog"
 msgstr "Diario web"
 
-#: ../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 ""
 "uso desconectado. Cargue la libreta de direcciones una vez que estÃ en modo "
 "conectado para descargar su contenido"
 
-#: ../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 ""
 "No se puede abrir esta libreta de direcciones. Compruebe que la ruta %s "
 "existe y que tiene permisos para acceder a ella."
 
-#: ../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 ""
 "LDAP en Evolution debe tener instalado un paquete Evolution con LDAP "
 "activado."
 
-#: ../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 ""
 "No se puede abrir esta libreta de direcciones. Esto significa que ha "
 "introducido un URI errÃneo o que el servidor LDAP es inaccesible."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#: ../addressbook/gui/widgets/eab-gui-util.c:173
 msgid "Detailed error message:"
 msgstr "Detalle del mensaje de error:"
 
-#: ../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 ""
 "el lÃmite de resultados en las preferencias del servidor\n"
 "de directorios para esta libreta de direcciones."
 
-#: ../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"
@@ -1070,36 +1055,36 @@ msgstr ""
 "opciones del servidor de directorios para esta libreta de direcciones."
 
 #. 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 ""
 "El backend de esta libreta de direcciones no pudo analizar esta consulta. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c: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 ""
 "El backend para esta libreta de direcciones rehusÃ efectuar esta consulta. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c: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 no se completÃ con Ãxito. %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 "tarjeta.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:321
+#: ../addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Select Address Book"
 msgstr "Seleccione la libreta de direcciones"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:401
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
 msgid "list"
 msgstr "lista"
 
@@ -1119,22 +1104,22 @@ msgstr "Mover contactos a"
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:165
 msgid "No contacts"
 msgstr "Sin 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 "Error al obtener la vista de libro"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:759
+#: ../addressbook/gui/widgets/e-addressbook-model.c:807
 msgid "Search Interrupted"
 msgstr "BÃsqueda interrumpida"
 
@@ -1142,55 +1127,55 @@ msgstr "BÃsqueda interrumpida"
 msgid "Error modifying card"
 msgstr "Error al modificar la tarjeta"
 
-#: ../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 los contactos seleccionados al portapapeles"
 
-#: ../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 los contactos seleccionados al portapapeles"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:652
+#: ../addressbook/gui/widgets/e-addressbook-view.c:657
 msgid "Paste contacts from the clipboard"
 msgstr "Pegar los contactos desde el portapapeles"
 
-#: ../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 los 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 los contactos visibles"
 
-#: ../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 "ÂSeguro que quiere 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 "ÂSeguro que quiere 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 "ÂSeguro que quiere 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 "ÂSeguro que quiere eliminar estos 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 "ÂSeguro que quiere 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 "ÂSeguro que quiere 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"
@@ -1205,11 +1190,11 @@ msgstr[1] ""
 "Abrir %d contactos abrirÃ tambiÃn %d ventanas nuevas.\n"
 "ÂQuiere realmente mostrar todos estos contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1492
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1500
 msgid "_Don't Display"
 msgstr "_No mostrar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1493
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1501
 msgid "Display _All Contacts"
 msgstr "Mostrar t_odos los contactos"
 
@@ -1324,7 +1309,7 @@ msgid "Title"
 msgstr "Tratamiento"
 
 #: ../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 "Papel"
@@ -1376,20 +1361,38 @@ msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "la carpeta de la libreta de direcciones actual %s tiene %d tarjeta"
 msgstr[1] "la carpeta de la libreta de direcciones actual %s tiene %d tarjetas"
 
-#: ../addressbook/gui/widgets/e-minicard.c:98
+#: ../addressbook/gui/widgets/e-book-source-config.c:98
+#, fuzzy
+#| msgid "Mark as _default address book"
+msgid "Mark as default address book"
+msgstr "Marcar como libreta de direcciones pre_determinada"
+
+#: ../addressbook/gui/widgets/e-book-source-config.c:103
+#, fuzzy
+#| msgid "A_utocomplete with this address book"
+msgid "Autocomplete with this address book"
+msgstr "A_utocompletar con esta libreta de direcciones"
+
+#: ../addressbook/gui/widgets/e-book-source-config.c:244
+#, fuzzy
+#| msgid "Copy _book content locally for offline operation"
+msgid "Copy book content locally for offline operation"
+msgstr "Copiar la li_breta localmente para trabajar desconectado"
+
+#: ../addressbook/gui/widgets/e-minicard.c:97
 msgid "Work Email"
 msgstr "Correo-e de trabajo"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:98
 msgid "Home Email"
 msgstr "Correo-e de casa"
 
-#: ../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 "Otro correo-e"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -1399,7 +1402,7 @@ msgstr ""
 "\n"
 "Buscando contactosâ"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:196
+#: ../addressbook/gui/widgets/e-minicard-view.c:194
 msgid ""
 "\n"
 "\n"
@@ -1413,7 +1416,7 @@ msgstr ""
 "\n"
 "o pulse dos veces aquÃ para crear un contacto nuevo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:199
+#: ../addressbook/gui/widgets/e-minicard-view.c:197
 msgid ""
 "\n"
 "\n"
@@ -1427,7 +1430,7 @@ msgstr ""
 "\n"
 "Pulse dos veces aquÃ para crear un contacto nuevo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:203
+#: ../addressbook/gui/widgets/e-minicard-view.c:201
 msgid ""
 "\n"
 "\n"
@@ -1437,7 +1440,7 @@ msgstr ""
 "\n"
 "Buscar contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:205
+#: ../addressbook/gui/widgets/e-minicard-view.c:203
 msgid ""
 "\n"
 "\n"
@@ -1451,87 +1454,87 @@ msgstr ""
 msgid "Card View"
 msgstr "Vista de la tarjeta"
 
-#: ../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 o 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 y 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 o 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 y 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 o 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 y 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 de LDIF de 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 de 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Ãgina %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 "Especifique el archivo de salida en lugar del la salida estÃndar"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid "OUTPUTFILE"
 msgstr "ARCHIVO-DE-SALIDA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:64
+#: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "List local address book folders"
 msgstr "Listar las carpetas de libretas de direcciones locales"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:67
+#: ../addressbook/tools/evolution-addressbook-export.c:68
 msgid "Show cards as vcard or csv file"
 msgstr "Mostrar tarjetas como un archivo vcard o 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."
@@ -1539,68 +1542,51 @@ msgstr ""
 "El nÃmero de tarjetas en un archivo de salida en modo asÃncrono, 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 ""
 "Error en los argumentos de la lÃnea de comandos, use la opciÃn --help para "
 "ver el uso."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Only support csv or vcard format."
 msgstr "SÃlo se soportan los los formatos csv o 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, la salida debe ser un archivo."
 
-#: ../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, no hay necesidad de la opciÃn de tamaÃo."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:201
+#: ../addressbook/tools/evolution-addressbook-export.c:213
 msgid "Unhandled error"
 msgstr "Error no tratado"
 
-#: ../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 "No es posible abrir el archivo"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-#, c-format
-msgid "Couldn't get list of address books: %s"
-msgstr "No se pudo obtener la lista de libretas de direcciones: %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 "Error desconocido"
-
-#: ../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 "FallÃ al abrir el 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"
@@ -1609,14 +1595,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"
 
@@ -1640,27 +1626,26 @@ msgstr "_Posponer durante:"
 #. 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"
 
@@ -1669,10 +1654,11 @@ msgid "location of appointment"
 msgstr "lugar de la 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:1155
-#: ../plugins/itip-formatter/itip-view.c:1255
+#: ../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 "Lugar:"
 
@@ -1680,33 +1666,33 @@ msgstr "Lugar:"
 msgid "Dismiss _All"
 msgstr "Descartar _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 "No hay resumen disponible."
 
-#: ../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 "No hay descripciÃn disponible."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1626
+#: ../calendar/alarm-notify/alarm-queue.c:1622
 msgid "No location information available."
 msgstr "No hay informaciÃn del lugar disponible."
 
-#: ../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] "Tiene un recordatorio"
 msgstr[1] "Tiene %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 "Advertencia"
 
-#: ../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"
@@ -1718,7 +1704,7 @@ msgstr ""
 "configurado para enviar un mensaje de correo-e.  En su lugar\n"
 "Evolution mostrarÃ un diÃlogo de recordatorio 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 "
@@ -1735,17 +1721,17 @@ msgstr ""
 "\n"
 "ÂEstÃ seguro que quiere ejecutar 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 "No preguntar otra vez sobre este programa."
 
-#: ../calendar/alarm-notify/util.c:45
+#: ../calendar/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "hora no vÃlida"
 
 #. 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"
@@ -1753,8 +1739,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"
@@ -1764,8 +1750,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"
@@ -2003,7 +1989,7 @@ msgstr ""
 "pÃrdida de esos adjuntos."
 
 #: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:316
-#: ../plugins/itip-formatter/itip-view.c:2868
+#: ../plugins/itip-formatter/itip-view.c:3026
 msgid "_Save"
 msgstr "_Guardar"
 
@@ -2204,7 +2190,7 @@ msgstr ""
 msgid "Could not perform this operation."
 msgstr "No se pudo realizar 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 trabajando en lÃnea para completar esta operaciÃn."
 
@@ -2228,7 +2214,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 "Resumen"
 
@@ -2269,20 +2255,20 @@ msgstr "es"
 msgid "is not"
 msgstr "no es"
 
-#: ../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"
@@ -2300,9 +2286,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 "Lugar"
 
@@ -2365,22 +2351,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 "Mostrar una alerta emergente"
 
 #: ../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 sonido"
 
 #: ../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 "Ejecutar 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-e"
 
@@ -2434,7 +2420,7 @@ msgstr "_Repetir el recordatorio"
 msgid "extra times every"
 msgstr "veces adicionales 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 "Opciones"
 
@@ -2470,7 +2456,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/Disparador"
 
@@ -2484,93 +2470,6 @@ msgstr "Recordatorios"
 msgid "A_dd"
 msgstr "AÃa_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 "_Nombre:"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:316
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr ""
-"C_opiar el contenido del calendario localmente para trabajar desconectado"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:318
-msgid "Cop_y task list contents locally for offline operation"
-msgstr ""
-"Co_piar el contenido del la lista de tareas localmente para trabajar "
-"desconectado"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:320
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr ""
-"Copia_r el contenido de la lista de notas localmente para trabajar "
-"desconectado"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-msgid "Sh_ow reminder notifications"
-msgstr "M_ostrar notificaciones de recordatorios"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:445
-msgid "Colo_r:"
-msgstr "Colo_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:240
-#: ../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 "General"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:481
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
-msgid "Task List"
-msgstr "Lista de tareas"
-
-#: ../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 del calendario"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:584
-msgid "New Calendar"
-msgstr "Calendario nuevo"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:644
-msgid "Task List Properties"
-msgstr "Propiedades de lista de tareas"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:644
-msgid "New Task List"
-msgstr "Lista de tareas nueva"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:704
-msgid "Memo List Properties"
-msgstr "Propiedades de lista de notas"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:704
-msgid "New Memo List"
-msgstr "Lista de notas nueva"
-
 #: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Se ha borrado este acontecimiento."
@@ -2617,246 +2516,246 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  No ha realizado cambios, Âquiere actualizar el editor?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:281
+#: ../calendar/gui/dialogs/comp-editor.c:278
 msgid "Could not save attachments"
 msgstr "No se pudieron guardar los adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:627
+#: ../calendar/gui/dialogs/comp-editor.c:629
 msgid "Could not update object"
 msgstr "No es posible actualizar el objeto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:755
+#: ../calendar/gui/dialogs/comp-editor.c:763
 msgid "Edit Appointment"
 msgstr "Editar 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 "Tarea asignada: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:772
+#: ../calendar/gui/dialogs/comp-editor.c:780
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea: %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 "Sin resumen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:914
+#: ../calendar/gui/dialogs/comp-editor.c:922
 msgid "Keep original item?"
 msgstr "ÂMantener el elemento original?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1153
 msgid "Close the current window"
 msgstr "Cerrar la ventana actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1152 ../mail/e-mail-browser.c:139
-#: ../shell/e-shell-window-actions.c:1466
+#: ../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 la selecciÃn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1159 ../mail/e-mail-browser.c:146
-#: ../shell/e-shell-window-actions.c:1473
+#: ../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 la selecciÃn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1166
-#: ../shell/e-shell-window-actions.c:1480
+#: ../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 la selecciÃn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1173
+#: ../calendar/gui/dialogs/comp-editor.c:1181
 msgid "View help"
 msgstr "Ver la ayuda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1180 ../mail/e-mail-browser.c:153
-#: ../shell/e-shell-window-actions.c:1508
+#: ../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 "Pega el contenido del porta papeles"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1201
+#: ../calendar/gui/dialogs/comp-editor.c:1209
 msgid "Save current changes"
 msgstr "Guardar los cambios actuales"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1206
+#: ../calendar/gui/dialogs/comp-editor.c:1214
 msgid "Save and Close"
 msgstr "Guardar y cerrar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1208
+#: ../calendar/gui/dialogs/comp-editor.c:1216
 msgid "Save current changes and close editor"
 msgstr "Guardar los cambios actuales y cerrar el editor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1215 ../mail/e-mail-browser.c:160
-#: ../shell/e-shell-window-actions.c:1585
+#: ../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 "Selecciona todo el 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:1613
+#: ../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:1620
-#: ../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 "_Archivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1243
-#: ../shell/e-shell-window-actions.c:1627
+#: ../calendar/gui/dialogs/comp-editor.c:1251
+#: ../shell/e-shell-window-actions.c:1600
 msgid "_Help"
 msgstr "Ay_uda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1250
+#: ../calendar/gui/dialogs/comp-editor.c:1258
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1257
+#: ../calendar/gui/dialogs/comp-editor.c:1265
 #: ../composer/e-composer-actions.c:339
 msgid "_Options"
 msgstr "_Opciones"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1264 ../mail/e-mail-browser.c:181
-#: ../shell/e-shell-window-actions.c:1662 ../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 "_Ver"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1274
+#: ../calendar/gui/dialogs/comp-editor.c:1282
 #: ../composer/e-composer-actions.c:288
 msgid "_Attachment..."
 msgstr "_Adjuntoâ"
 
-#: ../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 "Adjuntar un archivo"
 
-#: ../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 "Conmuta cuando se muestran las categorÃas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292
+#: ../calendar/gui/dialogs/comp-editor.c:1300
 msgid "Time _Zone"
 msgstr "_Zona horaria"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1294
+#: ../calendar/gui/dialogs/comp-editor.c:1302
 msgid "Toggles whether the time zone is displayed"
 msgstr "Conmuta cuando se muestra la ÂZona horariaÂ"
 
-#: ../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 Â_RolÂ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1329
+#: ../calendar/gui/dialogs/comp-editor.c:1337
 msgid "Toggles whether the Role field is displayed"
 msgstr "Conmuta cuando se muestra el campo ÂRolÂ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1335
+#: ../calendar/gui/dialogs/comp-editor.c:1343
 msgid "_RSVP"
 msgstr "_Confirmar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1337
+#: ../calendar/gui/dialogs/comp-editor.c:1345
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Conmuta cuando se muestra el campo ÂConfirmarÂ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1343
+#: ../calendar/gui/dialogs/comp-editor.c:1351
 msgid "_Status Field"
 msgstr "Campo de _estado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1345
+#: ../calendar/gui/dialogs/comp-editor.c:1353
 msgid "Toggles whether the Status field is displayed"
 msgstr "Conmuta cuando se muestra el campo ÂEstadoÂ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1351
+#: ../calendar/gui/dialogs/comp-editor.c:1359
 msgid "_Type Field"
 msgstr "Campo de _tipo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
+#: ../calendar/gui/dialogs/comp-editor.c:1361
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Conmuta indicando si se muestra el campo Â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 "Adjuntar"
 
-#: ../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 ""
 "Los cambios efectuados a este elemento pueden descartarse si llega una "
 "actualizaciÃn por correo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3566
+#: ../calendar/gui/dialogs/comp-editor.c:3581
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "adjunto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3634
+#: ../calendar/gui/dialogs/comp-editor.c:3649
 msgid "Unable to use current version!"
 msgstr "Imposible usar la versiÃn actual."
 
@@ -3015,13 +2914,13 @@ msgstr "_Disponibilidad"
 msgid "Query free / busy information for the attendees"
 msgstr "Consultar informaciÃn de disponibilidad para los 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"
 
@@ -3029,120 +2928,107 @@ msgstr "Participantes"
 msgid "Print this event"
 msgstr "Imprime este acontecimiento"
 
-#: ../calendar/gui/dialogs/event-page.c:567
+#: ../calendar/gui/dialogs/event-page.c:570
 msgid "Event's start time is in the past"
 msgstr "La hora de inicio del acontecimiento estÃ en el pasado"
 
-#: ../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 "El acontecimiento no se puede editar porque es de sÃlo 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 ""
 "El acontecimiento no se puede editar completamente porque no es el "
 "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 "Este acontecimiento tiene 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 "Acontecimiento sin fecha de inicio"
 
-#: ../calendar/gui/dialogs/event-page.c:1289
+#: ../calendar/gui/dialogs/event-page.c:1299
 msgid "Event with no end date"
 msgstr "Acontecimiento sin fecha 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 "La fecha de inicio estÃ equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1472
+#: ../calendar/gui/dialogs/event-page.c:1482
 msgid "End date is wrong"
 msgstr "La fecha de finalizaciÃn estÃ equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1495
+#: ../calendar/gui/dialogs/event-page.c:1505
 msgid "Start time is wrong"
 msgstr "La hora de inicio estÃ equivocada"
 
-#: ../calendar/gui/dialogs/event-page.c:1502
+#: ../calendar/gui/dialogs/event-page.c:1512
 msgid "End time is wrong"
 msgstr "La hora de finalizaciÃn estÃ equivocada"
 
-#: ../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 "Se requiere 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 "Es necesario por lo 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 "No es posible abrir el 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 en nombre 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 de la cita"
 msgstr[1] "%d dÃas antes de la 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 de la cita"
 msgstr[1] "%d horas antes de la 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 de la cita"
 msgstr[1] "%d minutos antes de la 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 "Ninguno"
@@ -3178,7 +3064,6 @@ msgid "1 day before appointment"
 msgstr "1 dÃa antes de la cita"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../plugins/calendar-weather/calendar-weather.c:381
 msgid "_Location:"
 msgstr "_Lugar:"
 
@@ -3273,11 +3158,11 @@ msgid "Select Date"
 msgstr "Seleccionar fecha"
 
 #: ../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 _hoy"
 
-#: ../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"
 
@@ -3285,38 +3170,47 @@ 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 "La hora de inicio de la nota estaÌ en el pasado"
 
-#: ../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 "La nota no se puede editar porque es de sÃlo 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 "La nota no se puede editar completamente porque no es el 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 "No es posible abrir las 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 "Error desconocido"
+
+#: ../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:"
@@ -3372,15 +3266,15 @@ msgstr "Esta instancia y las futuras"
 msgid "All Instances"
 msgstr "Todas las 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 tiene repeticiones que Evolution no puede editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:971
+#: ../calendar/gui/dialogs/recurrence-page.c:969
 msgid "Recurrence date is invalid"
 msgstr "La fecha de repeticiÃn no es vÃlida"
 
-#: ../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 ""
 "La fecha de finalizaciÃn de la repeticiÃn es anterior al inicio del "
@@ -3388,7 +3282,7 @@ msgstr ""
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "on"
 msgstr "en"
 
@@ -3396,7 +3290,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 "primer"
 
@@ -3405,7 +3299,7 @@ msgstr "primer"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1110
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
 msgid "second"
 msgstr "segundo"
 
@@ -3413,7 +3307,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 "tercer"
 
@@ -3421,7 +3315,7 @@ msgstr "tercer"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 msgid "fourth"
 msgstr "cuarto"
 
@@ -3429,7 +3323,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"
 
@@ -3437,13 +3331,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 "Otra fecha"
 
@@ -3451,7 +3345,7 @@ msgstr "Otra fecha"
 #. * 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 "del 1 al 10"
 
@@ -3459,7 +3353,7 @@ msgstr "del 1 al 10"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1166
+#: ../calendar/gui/dialogs/recurrence-page.c:1164
 msgid "11th to 20th"
 msgstr "del 11 al 20"
 
@@ -3467,41 +3361,41 @@ msgstr "del 11 al 20"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1172
+#: ../calendar/gui/dialogs/recurrence-page.c:1170
 msgid "21st to 31st"
 msgstr "del 21 al 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 "lunes"
 
-#: ../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 "miÃrcoles"
 
-#: ../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 "jueves"
 
-#: ../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 "viernes"
 
-#: ../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"
@@ -3509,31 +3403,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 "en el"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1507
+#: ../calendar/gui/dialogs/recurrence-page.c:1505
 msgid "occurrences"
 msgstr "repeticiones"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2223
+#: ../calendar/gui/dialogs/recurrence-page.c:2221
 msgid "Add exception"
 msgstr "AÃadir 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 "No es posible obtener una selecciÃn que modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2270
+#: ../calendar/gui/dialogs/recurrence-page.c:2268
 msgid "Modify exception"
 msgstr "Modificar 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 "No es posible obtener una selecciÃn que eliminar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2453
+#: ../calendar/gui/dialogs/recurrence-page.c:2451
 msgid "Date/Time"
 msgstr "Fecha/Hora"
 
@@ -3591,7 +3485,7 @@ msgstr "Cada"
 msgid "Exceptions"
 msgstr "Excepciones"
 
-#: ../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"
 
@@ -3614,16 +3508,16 @@ msgstr "PÃgina 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"
@@ -3631,60 +3525,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 "Baja"
 
 #. 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 "Sin 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 "Sin comenzar"
 
 #. 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 proceso"
 
 #. 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 "Terminado"
 
 #. 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 "Cancelado"
 
@@ -3692,8 +3586,8 @@ msgstr "Cancelado"
 #. * 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
@@ -3733,36 +3627,36 @@ msgstr "Pulse para cambiar o ver los detalles del estado de la tarea"
 msgid "_Send Options"
 msgstr "Opciones 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 "Tarea"
 
-#: ../calendar/gui/dialogs/task-editor.c:171
+#: ../calendar/gui/dialogs/task-editor.c:307
 msgid "Task Details"
 msgstr "Detalles"
 
-#: ../calendar/gui/dialogs/task-editor.c:368
+#: ../calendar/gui/dialogs/task-editor.c:351
 msgid "Print this task"
 msgstr "Imprimir esta tarea"
 
-#: ../calendar/gui/dialogs/task-page.c:255
+#: ../calendar/gui/dialogs/task-page.c:259
 msgid "Task's start date is in the past"
 msgstr "La hora de inicio de la tarea estaÌ en el pasado"
 
-#: ../calendar/gui/dialogs/task-page.c:256
+#: ../calendar/gui/dialogs/task-page.c:260
 msgid "Task's due date is in the past"
 msgstr "La fecha de vencimiento de la tarea estÃ en el pasado"
 
-#: ../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 "No se puede editar la tarea porque es de sÃlo 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 "No se puede editar completamente la tarea porque no es el 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"
@@ -3770,11 +3664,11 @@ msgstr ""
 "No se puede editar la tarea porque la lista de tareas seleccionada no "
 "soporta asignaciÃn de tareas"
 
-#: ../calendar/gui/dialogs/task-page.c:823
+#: ../calendar/gui/dialogs/task-page.c:834
 msgid "Due date is wrong"
 msgstr "La fecha de vencimiento es errÃnea"
 
-#: ../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 "No se pueden abrir las tareas en Â%sÂ: %s"
@@ -3878,14 +3772,14 @@ msgstr "vista de calendario para uno o mÃs dÃas"
 msgid "a table to view and select the current time range"
 msgstr "una tabla para ver y seleccionar el rango de tiempo 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 de 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, %e de %b de %Y"
 
@@ -3895,30 +3789,30 @@ msgstr "%A, %e 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, %e 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, %e 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 "%e de %B de %Y"
 
@@ -3927,10 +3821,10 @@ msgstr "%e 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 "%e de %b"
 
@@ -3943,7 +3837,7 @@ msgid "Click here, you can find more events."
 msgstr "Pulse aquÃ para buscar mÃs acontecimientos."
 
 #. 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"
@@ -3951,69 +3845,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 "AcciÃn que realizar desconocida"
 
 #. 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 de comenzar la cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:445
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s tras el comienzo de la 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 al comienzo de la cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:464
+#: ../calendar/gui/e-alarm-list.c:463
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s antes del fin de la cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:469
+#: ../calendar/gui/e-alarm-list.c:468
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s tras el fin de la 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 al fin de la cita"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:500
+#: ../calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at %s"
 msgstr "%s a %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:508
+#: ../calendar/gui/e-alarm-list.c:507
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador desconocido"
@@ -4036,45 +3930,47 @@ msgstr "vista de calendario para un mes"
 msgid "calendar view for one or more weeks"
 msgstr "vista de calendario para una o mÃs 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 "Sin 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 "Resumen:"
 
-#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../calendar/gui/e-cal-component-preview.c:253
 msgid "Start Date:"
 msgstr "Fecha de inicio:"
 
-#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "End Date:"
 msgstr "Fecha de finalizaciÃn:"
 
-#: ../calendar/gui/e-cal-component-preview.c:277
+#: ../calendar/gui/e-cal-component-preview.c:275
 msgid "Due Date:"
 msgstr "Fecha de vencimiento:"
 
-#: ../calendar/gui/e-cal-component-preview.c:288
-#: ../plugins/itip-formatter/itip-view.c:1158
-#: ../plugins/itip-formatter/itip-view.c:1264
+#: ../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 "Prioridad:"
 
-#: ../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 "DescripciÃn:"
 
-#: ../calendar/gui/e-cal-component-preview.c:368
+#: ../calendar/gui/e-cal-component-preview.c:366
 msgid "Web Page:"
 msgstr "PÃgina web:"
 
@@ -4087,7 +3983,7 @@ msgid "Start date"
 msgstr "Fecha 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
@@ -4114,14 +4010,14 @@ msgstr "% Terminado"
 
 #: ../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 "Prioridad"
 
 #: ../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"
 
@@ -4147,21 +4043,21 @@ msgstr "Pega los acontecimientos desde el portapapeles"
 msgid "Delete selected events"
 msgstr "Borra los acontecimientos seleccionados"
 
-#: ../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 "Borrando los objetos 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 objetos"
 
 #. 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>"
@@ -4169,20 +4065,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 "Lugar: %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"
@@ -4196,86 +4092,86 @@ msgstr "Fecha de inicio"
 msgid "End Date"
 msgstr "Fecha de terminaciÃ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 "Desconocido"
 
-#: ../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 "Asignado"
 
-#: ../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 "SÃ"
 
-#: ../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 "No"
 
-#: ../calendar/gui/e-cal-model.c:3022
+#: ../calendar/gui/e-cal-model.c:3086
 #, c-format
 msgid "Opening %s"
 msgstr "Abriendo %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 "Rehusado"
 
-#: ../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 una 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 "Ocupada"
 
-#: ../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"
@@ -4286,22 +4182,65 @@ 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 "Ninguna"
 
+#: ../calendar/gui/e-cal-source-config.c:170
+#| msgid "Mark as _default calendar"
+msgid "Mark as default calendar"
+msgstr "Marcar como calendario predeterminado"
+
+#: ../calendar/gui/e-cal-source-config.c:173
+#| msgid "Mark as _default task list"
+msgid "Mark as default task list"
+msgstr "Marcar como lista de tareas predeterminada"
+
+#: ../calendar/gui/e-cal-source-config.c:176
+#| msgid "Mark as _default memo list"
+msgid "Mark as default memo list"
+msgstr "Marcar como lista de notas predeterminada"
+
+#: ../calendar/gui/e-cal-source-config.c:201
+#| msgid "Colo_r:"
+msgid "Color:"
+msgstr "Color:"
+
+#: ../calendar/gui/e-cal-source-config.c:373
+#, fuzzy
+#| msgid "Cop_y calendar contents locally for offline operation"
+msgid "Copy calendar contents locally for offline operation"
+msgstr ""
+"C_opiar el contenido del calendario localmente para trabajar desconectado"
+
+#: ../calendar/gui/e-cal-source-config.c:377
+#, fuzzy
+#| msgid "Cop_y task list contents locally for offline operation"
+msgid "Copy task list contents locally for offline operation"
+msgstr ""
+"Co_piar el contenido del la lista de tareas localmente para trabajar "
+"desconectado"
+
+#: ../calendar/gui/e-cal-source-config.c:381
+#, fuzzy
+#| msgid "Cop_y memo list contents locally for offline operation"
+msgid "Copy memo list contents locally for offline operation"
+msgstr ""
+"Copia_r el contenido de la lista de notas localmente para trabajar "
+"desconectado"
+
 #. 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 %e/%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 %e/%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"
@@ -4311,16 +4250,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"
 
@@ -4330,13 +4269,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 %e 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"
@@ -4347,131 +4286,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 "divisiones 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 "Muestra la segunda zona horaria"
 
 #. 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 "Ninguno"
 
-#: ../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 "Presidencia"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Required Participants"
 msgstr "Participantes requeridos"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Optional Participants"
 msgstr "Participantes opcionales"
 
-#: ../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 requerido"
 
-#: ../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 "No participan"
 
-#: ../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 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 "Confirmar"
 
-#: ../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 proceso"
 
-#: ../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 ""
 "Introduzca la contraseÃa para la informaciÃn de disponibilidad en el "
 "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 del 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 "Introduzca contraseÃa"
@@ -4560,47 +4497,46 @@ msgstr "Nombre 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:238
-#: ../modules/calendar/e-memo-shell-view-actions.c:253
-#: ../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 "* Sin resumen *"
 
 #. 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 "Empieza: "
 
 #. 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 "Vence: "
 
-#: ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-memo-table.c:740
 msgid "Cut selected memos to the clipboard"
 msgstr "Cortar las notas seleccionadas al portapapeles"
 
-#: ../calendar/gui/e-memo-table.c:748
+#: ../calendar/gui/e-memo-table.c:746
 msgid "Copy selected memos to the clipboard"
 msgstr "Copiar las notas seleccionadas al portapapeles"
 
-#: ../calendar/gui/e-memo-table.c:754
+#: ../calendar/gui/e-memo-table.c:752
 msgid "Paste memos from the clipboard"
 msgstr "Pegar las notas desde el portapapeles"
 
-#: ../calendar/gui/e-memo-table.c:760
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../calendar/gui/e-memo-table.c:758
+#: ../modules/calendar/e-memo-shell-view-actions.c:610
 msgid "Delete selected memos"
 msgstr "Borra las notas seleccionadas"
 
-#: ../calendar/gui/e-memo-table.c:766
+#: ../calendar/gui/e-memo-table.c:764
 msgid "Select all visible memos"
 msgstr "Seleccionar todas las notas visibles"
 
@@ -4612,41 +4548,40 @@ msgstr "Pulse aquÃ para aÃadir una 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:261
-#: ../modules/calendar/e-task-shell-view-actions.c:276
-#: ../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 "Tareas"
 
-#: ../calendar/gui/e-task-table.c:1025
+#: ../calendar/gui/e-task-table.c:1023
 msgid "Cut selected tasks to the clipboard"
 msgstr "Cortar las tareas seleccionadas al portapapeles"
 
-#: ../calendar/gui/e-task-table.c:1031
+#: ../calendar/gui/e-task-table.c:1029
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copiar las tareas seleccionadas al portapapeles"
 
-#: ../calendar/gui/e-task-table.c:1037
+#: ../calendar/gui/e-task-table.c:1035
 msgid "Paste tasks from the clipboard"
 msgstr "Pega las tareas del portapapeles"
 
-#: ../calendar/gui/e-task-table.c:1043
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../calendar/gui/e-task-table.c:1041
+#: ../modules/calendar/e-task-shell-view-actions.c:734
 msgid "Delete selected tasks"
 msgstr "Borra las tareas seleccionadas"
 
-#: ../calendar/gui/e-task-table.c:1049
+#: ../calendar/gui/e-task-table.c:1047
 msgid "Select all visible tasks"
 msgstr "Seleccionar todas las tareas visibles"
 
@@ -4657,40 +4592,40 @@ msgstr "Seleccione la zona horaria"
 #. 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 "%e de %B"
 
-#: ../calendar/gui/gnome-cal.c:2253
+#: ../calendar/gui/gnome-cal.c:2303
 msgid "Purging"
 msgstr "Compactando"
 
-#: ../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 especificar un organizador."
 
-#: ../calendar/gui/itip-utils.c:563
+#: ../calendar/gui/itip-utils.c:698
 msgid "At least one attendee is necessary"
 msgstr "Es necesario por lo 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 del acontecimiento"
 
-#: ../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 de la tarea"
 
-#: ../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 de la 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 disponibilidad"
 
-#: ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:918
 msgid "Calendar information"
 msgstr "InformaciÃn de calendario"
 
@@ -4698,7 +4633,7 @@ msgstr "InformaciÃn de 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"
@@ -4707,7 +4642,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"
@@ -4719,7 +4654,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 "Rehusado"
@@ -4728,7 +4663,7 @@ msgstr "Rehusado"
 #. * 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"
@@ -4736,7 +4671,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"
@@ -4744,7 +4679,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"
@@ -4752,7 +4687,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"
@@ -4760,254 +4695,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 "Contra-propuesta"
 
-#: ../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 disponibilidad (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 ""
 "No se pudo reservar un recurso, el nuevo acontecimiento coincide con algÃn "
 "otro."
 
-#: ../calendar/gui/itip-utils.c:991
+#: ../calendar/gui/itip-utils.c:1127
 msgid "Unable to book a resource, error: "
 msgstr "No se pudo reservar un recurso, error: "
 
-#: ../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 en el acontecimiento."
 
-#: ../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 "Mi"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:653
 msgid "Th"
 msgstr "Ju"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:653
 msgid "Fr"
 msgstr "Vi"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:653
 msgid "Sa"
 msgstr "Sa"
 
 #. 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 " a "
 
 #. 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 " (Vence "
 
 #. 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 "Vence "
 
-#: ../calendar/gui/print.c:3354
+#: ../calendar/gui/print.c:3351
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumen: %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 "Prioridad: %s"
 
-#: ../calendar/gui/print.c:3457
+#: ../calendar/gui/print.c:3454
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaje completado: %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: "
 
@@ -5032,33 +4967,33 @@ msgstr "es mayor que"
 msgid "is less than"
 msgstr "es menor que"
 
-#: ../calendar/importers/icalendar-importer.c:84
+#: ../calendar/importers/icalendar-importer.c:83
 msgid "Appointments and Meetings"
 msgstr "Reuniones y citas"
 
-#: ../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 "Apertura del calendario"
 
-#: ../calendar/importers/icalendar-importer.c:604
+#: ../calendar/importers/icalendar-importer.c:616
 msgid "iCalendar files (.ics)"
 msgstr "Archivos iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:605
+#: ../calendar/importers/icalendar-importer.c:617
 msgid "Evolution iCalendar importer"
 msgstr "Importador de iCalendar de Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:695
+#: ../calendar/importers/icalendar-importer.c:707
 msgid "Reminder!"
 msgstr "ÂRecuerde!"
 
-#: ../calendar/importers/icalendar-importer.c:779
+#: ../calendar/importers/icalendar-importer.c:791
 msgid "vCalendar files (.vcs)"
 msgstr "Archivos vCalendar (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/importers/icalendar-importer.c:792
 msgid "Evolution vCalendar importer"
 msgstr "Importador de vCalendar de Evolution"
 
@@ -6772,97 +6707,93 @@ msgstr "El ID del socket en el que empotrarse"
 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 "Introduzca su nombre completo."
 
-#: ../capplet/settings/mail-account-view.c:78
+#: ../capplet/settings/mail-account-view.c:75
 msgid "Please enter your email address."
 msgstr "Introduzca su direcciÃn de correo-e."
 
-#: ../capplet/settings/mail-account-view.c:79
+#: ../capplet/settings/mail-account-view.c:76
 msgid "The email address you have entered is invalid."
 msgstr "La direcciÃn de correo-e que ha introducido no es vÃlida."
 
-#: ../capplet/settings/mail-account-view.c:80
+#: ../capplet/settings/mail-account-view.c:77
 msgid "Please enter your password."
 msgstr "Introduzca su contrasenÌa."
 
-#: ../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 "Siempre (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 "Cuando sea posible (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 "Detalles personales:"
 
-#: ../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 "Nombre:"
 
-#: ../capplet/settings/mail-account-view.c:527 ../mail/mail-config.ui.h:181
+#: ../capplet/settings/mail-account-view.c:485
 msgid "Email address:"
 msgstr "DirecciÃn de correo-e:"
 
-#: ../capplet/settings/mail-account-view.c:537 ../mail/mail-config.ui.h:182
+#: ../capplet/settings/mail-account-view.c:495
 msgid "Details:"
 msgstr "Detalles:"
 
-#: ../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 "RecepciÃn de correo"
 
-#: ../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 "DirecciÃn del 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 "Nombre de 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 "Opciones de envÃo"
 
-#: ../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. "
@@ -6873,7 +6804,7 @@ msgstr ""
 "averiguar los ajustes. Si no se puede hacer automÃticamente necesitarÃ "
 "tambiÃn los detalles del 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 "
@@ -6883,11 +6814,11 @@ msgstr ""
 "IntrdÃzcalos debajo. Se ha intentado hacer una aproximaciÃn inicial con los "
 "detallas que ha introducido pero puede que tenga que cambiarlos."
 
-#: ../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 "Puede especificar mÃs opciones para configurar la cuenta."
 
-#: ../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."
@@ -6895,11 +6826,11 @@ msgstr ""
 "Ahora se necesitan sus ajustes para el envÃo de correo. Se intentaron hacer "
 "algunas averiguaciones pero deberÃa comprobarlas para asegurarse."
 
-#: ../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 "Puede especificar sus ajustes predeterminados para su cuenta."
 
-#: ../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."
@@ -6907,102 +6838,100 @@ msgstr ""
 "Hora de comprobar los ajustes antes de intentar conectar con el servidor y "
 "obtener su correo."
 
-#: ../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 "Identidad"
 
-#: ../capplet/settings/mail-account-view.c:678
+#: ../capplet/settings/mail-account-view.c:639
 msgid "Next - Receiving mail"
 msgstr "Siguiente - RecepciÃn de correo"
 
-#: ../capplet/settings/mail-account-view.c:679
+#: ../capplet/settings/mail-account-view.c:640
 msgid "Receiving mail"
 msgstr "RecepciÃn de 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 "Siguiente - EnvÃo de correo"
 
-#: ../capplet/settings/mail-account-view.c:679
+#: ../capplet/settings/mail-account-view.c:640
 msgid "Back - Identity"
 msgstr "AtrÃs - Identidad"
 
-#: ../capplet/settings/mail-account-view.c:679
+#: ../capplet/settings/mail-account-view.c:640
 msgid "Next - Receiving options"
 msgstr "Siguiente - Opciones de recepciÃn"
 
-#: ../capplet/settings/mail-account-view.c:680
+#: ../capplet/settings/mail-account-view.c:641
 msgid "Receiving options"
 msgstr "Opciones 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 "Siguiente - RecepciÃn de correo"
 
-#: ../capplet/settings/mail-account-view.c:682
+#: ../capplet/settings/mail-account-view.c:643
 msgid "Sending mail"
 msgstr "EnvÃo de 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 "Siguiente - Revisar la cuenta"
 
-#: ../capplet/settings/mail-account-view.c:682
+#: ../capplet/settings/mail-account-view.c:643
 msgid "Next - Defaults"
 msgstr "Siguiente - Predeterminados"
 
-#: ../capplet/settings/mail-account-view.c:682
+#: ../capplet/settings/mail-account-view.c:643
 msgid "Back - Receiving options"
 msgstr "AtrÃs - Opciones 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 "Predeterminados"
 
-#: ../capplet/settings/mail-account-view.c:683
+#: ../capplet/settings/mail-account-view.c:644
 msgid "Back - Sending mail"
 msgstr "AtrÃs - EnvÃo de correo"
 
-#: ../capplet/settings/mail-account-view.c:685
+#: ../capplet/settings/mail-account-view.c:646
 msgid "Review account"
 msgstr "Revisar la cuenta"
 
-#: ../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 "Atras - EnvÃo"
 
-#: ../capplet/settings/mail-account-view.c:855
+#: ../capplet/settings/mail-account-view.c:823
 msgid "Setup Google contacts with Evolution"
 msgstr "Configurar los contactos de Google con Evolution"
 
-#: ../capplet/settings/mail-account-view.c:856
+#: ../capplet/settings/mail-account-view.c:824
 msgid "Setup Google calendar with Evolution"
 msgstr "Configurar el calendario de Google con 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 "Puede que deba activar el 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 "ConfiguraciÃn de la cuenta de Google:"
 
-#: ../capplet/settings/mail-account-view.c:895
+#: ../capplet/settings/mail-account-view.c:863
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "Configurar el calendario de Yahoo con 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 "
@@ -7012,59 +6941,45 @@ msgstr ""
 "el nombre del calendario. Confirme y vuelva a introducir el nombre del "
 "calendario si no es correcto."
 
-#: ../capplet/settings/mail-account-view.c:908
+#: ../capplet/settings/mail-account-view.c:876
 msgid "Yahoo account settings:"
 msgstr "ConfiguraciÃn de la cuenta de Yahoo:"
 
-#: ../capplet/settings/mail-account-view.c:922
+#: ../capplet/settings/mail-account-view.c:890
 msgid "Yahoo Calendar name:"
 msgstr "Nombre del calendario de Yahoo:"
 
-#: ../capplet/settings/mail-account-view.c:1119
+#: ../capplet/settings/mail-account-view.c:1089
 msgid "Password:"
 msgstr "ContraseÃa:"
 
-#: ../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 "Cerrar pestaÃa"
 
-#: ../capplet/settings/mail-account-view.c:1185
+#: ../capplet/settings/mail-account-view.c:1156
 msgid "Account Wizard"
 msgstr "Asistente de cuentas"
 
-#: ../capplet/settings/mail-capplet-shell.c:212
+#: ../capplet/settings/mail-capplet-shell.c:210
 msgid "Evolution account assistant"
 msgstr "Asistente de cuentas de 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 "En este equipo"
-
-#: ../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 "AÃadir una cuenta nueva"
 
-#: ../capplet/settings/mail-settings-view.c:194
+#: ../capplet/settings/mail-settings-view.c:201
 msgid "Account management"
 msgstr "GestiÃn de cuentas"
 
-#: ../capplet/settings/mail-settings-view.c:274
+#: ../capplet/settings/mail-settings-view.c:284
 msgid "Settings"
 msgstr "Ajustes"
 
@@ -7073,7 +6988,7 @@ msgid "Save as..."
 msgstr "Guardar 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 "_Cerrar"
 
@@ -7089,7 +7004,7 @@ msgstr "_Mensaje nuevo"
 msgid "Open New Message window"
 msgstr "Abrir la ventana de mensaje nuevo"
 
-#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1522
+#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1495
 msgid "Configure Evolution"
 msgstr "Configurar Evolution"
 
@@ -7125,7 +7040,7 @@ msgstr "Guardar como _borrador"
 msgid "Save as draft"
 msgstr "Guardar 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"
 
@@ -7233,67 +7148,68 @@ msgstr ""
 "Escriba las direcciones que recibirÃn una copia del mensaje sin aparecer en "
 "la lista de destinatarios del mensaje"
 
-#: ../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 "Cc_o:"
 
-#: ../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 "_Firma:"
 
-#: ../composer/e-composer-name-header.c:145
+#: ../composer/e-composer-name-header.c:215
 msgid "Click here for the address book"
 msgstr "Pulse aquÃ para la libreta de direcciones"
 
-#: ../composer/e-composer-post-header.c:135
+#: ../composer/e-composer-post-header.c:184
 msgid "Click here to select folders to post to"
 msgstr "Pulse aquÃ para seleccionar carpetas en las que publicar"
 
-#: ../composer/e-composer-private.c:228
+#: ../composer/e-composer-private.c:230
 msgid "Undo the last action"
 msgstr "Deshacer la Ãltima acciÃn"
 
-#: ../composer/e-composer-private.c:232
+#: ../composer/e-composer-private.c:234
 msgid "Redo the last undone action"
 msgstr "Rehacer la Ãltima acciÃn deshecha"
 
-#: ../composer/e-composer-private.c:236
+#: ../composer/e-composer-private.c:238
 msgid "Search for text"
 msgstr "Buscar texto"
 
-#: ../composer/e-composer-private.c:240
+#: ../composer/e-composer-private.c:242
 msgid "Search for and replace text"
 msgstr "Buscar y reemplazar texto"
 
-#: ../composer/e-composer-private.c:360
+#: ../composer/e-composer-private.c:362
 msgid "Save draft"
 msgstr "Guardar 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"
@@ -7301,7 +7217,7 @@ msgstr ""
 "No es posible firmar el mensaje saliente: No hay establecido un certificado "
 "de firma para esta cuenta"
 
-#: ../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 "
@@ -7310,17 +7226,17 @@ msgstr ""
 "No es posible cifrar el mensaje saliente: no hay establecido un certificado "
 "de cifrado para esta cuenta"
 
-#: ../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 "Redactar un mensaje"
 
-#: ../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 ""
 "El editor contiene un mensaje cuyo cuerpo no tiene texto, el cual no puede "
 "editarse."
 
-#: ../composer/e-msg-composer.c:4921
+#: ../composer/e-msg-composer.c:4834
 msgid "Untitled Message"
 msgstr "Mensaje sin tÃtulo"
 
@@ -7450,7 +7366,7 @@ msgstr "El error devuelto fue Â{0}Â. Seguramente no se ha guardado el mensaje.
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "OcurriÃ un error al enviar. ÂCÃmo quiere proceder?"
 
-#: ../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 "El error devuelto fue Â{0}Â."
 
@@ -7494,7 +7410,7 @@ msgstr "Notificaciones de acontecimientos del 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 trabajo en grupo"
 
@@ -8160,98 +8076,74 @@ msgstr ""
 "valor predeterminado son 10 aÃos"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
-msgid "List of selected calendars"
-msgstr "Lista de los calendarios seleccionados"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
-msgid "List of calendars to load"
-msgstr "Lista de calendarios disponibles"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
-msgid "List of selected memo lists"
-msgstr "Lista de listas notas seleccionadas"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
-msgid "List of memo lists to load"
-msgstr "El registro de lista de nota"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
-msgid "List of selected task lists"
-msgstr "Lista de listas de tareas seleccionadas"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
-msgid "List of task lists to load"
-msgstr "Lista de listas de tareas para 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 las horas de finalizaciÃn de las citas en las vistas semanales y "
 "mensuales"
 
-#: ../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 si debe mostrar la hora de finalizaciÃn de los acontecimientos en las "
 "vistas semanales y mensuales"
 
-#: ../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 el panel de vista previa de las 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 ""
 "Si es cierto mostrarÃ el panel de vista previa de notas en la ventana "
 "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 el panel de vista previa de las tareas"
 
-#: ../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 ""
 "Si es cierto mostrarÃ el panel de vista previa de tareas en la ventana "
 "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 los nÃmeros de las semanas en la Vistas diaria, Vista de la semana "
 "laboral y el Navegador del calendario"
 
-#: ../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 si debe mostrar los nÃmeros de la semana en varias partes del "
 "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 del 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 "Resaltar tareas que vencen hoy"
 
-#: ../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 si las tareas que vencen hoy se resaltan con un color especial (color "
 "para tareas que vencen hoy)"
 
-#: ../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 "Color para las tareas que vencen hoy"
 
-#: ../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"
@@ -8259,17 +8151,17 @@ msgstr ""
 "Color de fondo para las tareas que vencen hoy, en formato Â#rrggbbÂ. Usado "
 "junto al resaltado de tareas que vencen hoy."
 
-#: ../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 "Vista previa del panel de posiciÃn de las tareas (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 de distribuciÃn de las tareas"
 
-#: ../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 "
@@ -8280,34 +8172,34 @@ msgstr ""
 "vista previa debajo de la lista de tareas. Â1Â (vista vertical) ubica el "
 "panel de vista previa junto a la lista de tareas"
 
-#: ../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 "Vista previa del panel de posiciÃn de las tareas (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 del panel de vista previa de tareas cuando 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 "Resaltar tareas fuera de plazo"
 
-#: ../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 si las tareas fuera de plazo se resaltan con un color especial (color "
 "para tareas fuera de plazo)"
 
-#: ../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 "Color para las tareas fuera de plazo"
 
-#: ../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."
@@ -8315,23 +8207,23 @@ msgstr ""
 "Color de fondo para las tareas que estÃn fuera de plazo, en formato "
 "Â#rrggbbÂ. Usado junto al resaltado de tareas fuera de plazo."
 
-#: ../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 "Divisiones de hora"
 
-#: ../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 ""
 "Los intervalos de tiempo mostrados en las vistas diarias y semanales, 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 "Zona horaria"
 
-#: ../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\""
@@ -8340,64 +8232,64 @@ msgstr ""
 "calendario, como una localizaciÃn sin correspondencia en una base de datos "
 "de zonas horarias Olsen, como en ÂAmÃrica/Nueva 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 veinticuatro 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 si debe mostrar las horas en formato de veinticuatro 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 "Recordatorio de cumpleaÃos y 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 si debe establecer un recordatorio para cumpleaÃos y 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 "Recordatorio predeterminado de citas"
 
-#: ../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 si debe establecer un recordatorio predeterminado para las 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 la hora del 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 la zona horaria del sistema en lugar de la zona horaria seleccionada en "
 "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 "Comienzo de la 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 ""
 "El dÃa en que empieza la semana, desde el domingo (0) hasta el 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 laborables"
 
-#: ../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 en los cuales debe indicarse el inicio y fin de las horas de trabajo"
@@ -9105,7 +8997,6 @@ msgstr ""
 "de carpetas"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
-#| msgid "Enable search folders"
 msgid "Enable Unmatched search folder"
 msgstr "Activar la carpeta de bÃsqueda no coincidente"
 
@@ -10168,7 +10059,7 @@ msgstr ""
 "La carpeta inicial para los diÃlogos GtkFileChooser (selector de archivos)."
 
 #: ../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 desconectado"
 
@@ -10346,45 +10237,45 @@ msgstr "No se puede procesar la parte MIME que no es 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 "Asunto"
 
 #: ../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 "Fecha"
 
-#: ../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 noticias"
 
-#: ../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"
@@ -10395,8 +10286,8 @@ msgid "%s attachment"
 msgstr "%s adjunto"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:312 ../mail/em-format-html.c:2429
-#: ../modules/mail/em-mailer-prefs.c:1046
+#: ../em-format/em-format-quote.c:312 ../mail/em-format-html.c:2432
+#: ../modules/mail/em-mailer-prefs.c:1051
 msgid "Mailer"
 msgstr "Transporte"
 
@@ -10514,14 +10405,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:212
+#: ../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 "Hoy"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:240
+#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:244
 msgid "Tomorrow"
 msgstr "MaÃana"
 
@@ -10611,12 +10502,6 @@ msgstr "Escribiendo Â%sÂ"
 msgid "Writing \"%s\" to %s"
 msgstr "Escribiendo Â%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 "OcurriÃ un error al imprimir"
@@ -10659,11 +10544,11 @@ msgstr "Porque Â{1}Â."
 msgid "Cannot open file \"{0}\"."
 msgstr "No se puede abrir el archivo Â{0}Â."
 
-#: ../e-util/e-util.c:245
+#: ../e-util/e-util.c:243
 msgid "Could not open the link."
 msgstr "No se pudo abrir el enlace."
 
-#: ../e-util/e-util.c:292
+#: ../e-util/e-util.c:290
 msgid "Could not display help for Evolution."
 msgstr "No se pudo mostrar la ayuda de Evolution."
 
@@ -10815,6 +10700,9 @@ msgstr "_Buscar 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 "Ninguna"
 
@@ -10843,11 +10731,11 @@ msgid "A_dd Condition"
 msgstr "AÃadir a_cciÃ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 "Saliente"
 
@@ -10887,7 +10775,7 @@ msgstr "Error en la expresiÃn regular Â{0}Â."
 msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "No es posible compilar la 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 el nombre."
 
@@ -10919,6 +10807,10 @@ msgstr "una fecha relativa al momento 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"
@@ -10972,6 +10864,12 @@ msgstr ""
 "La fecha del mensaje se compararÃ con una\n"
 "fecha relativa al momento del filtrado."
 
+#: ../libemail-engine/e-mail-authenticator.c:182
+#, fuzzy, c-format
+#| msgid "Invalid authentication"
+msgid "Invalid authentication result code (%d)"
+msgstr "AutenticaciÃn no vÃlida"
+
 #: ../libemail-engine/e-mail-folder-utils.c:109
 #, c-format
 msgid "Saving message to folder '%s'"
@@ -11023,90 +10921,74 @@ msgstr[1] "Guardando %d mensajes"
 msgid "Invalid folder URI '%s'"
 msgstr "URI Â %sÂ de la carpeta no vÃlida"
 
-#: ../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 "Bandeja 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 "Bandeja de salida"
 
 #. 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 "Correo enviado"
 
 #. 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:1041 ../plugins/templates/templates.c:1341
-#: ../plugins/templates/templates.c:1351
+#: ../plugins/templates/templates.c:1049 ../plugins/templates/templates.c:1349
+#: ../plugins/templates/templates.c:1359
 msgid "Templates"
 msgstr "Plantillas"
 
-#: ../libemail-engine/e-mail-session.c:697 ../mail/mail-vfolder-ui.c:79
-msgid "Search Folders"
-msgstr "Carpetas de bÃsqueda"
-
-#: ../libemail-engine/e-mail-session.c:987
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Introduzca la contraseÃa para %s"
-
-#: ../libemail-engine/e-mail-session.c:991
-msgid "Enter Passphrase"
-msgstr "Introduzca la contraseÃa"
-
-#: ../libemail-engine/e-mail-session.c:995
-#, c-format
-msgid "Enter Password for %s"
-msgstr "Introduzca su contraseÃa para %s"
-
-#: ../libemail-engine/e-mail-session.c:999
-msgid "Enter Password"
-msgstr "Introduzca contraseÃa"
-
-#: ../libemail-engine/e-mail-session.c:1050
-#, c-format
-msgid "User canceled operation."
+#: ../libemail-engine/e-mail-session.c:1243
+#, fuzzy, c-format
+#| msgid "User canceled operation."
+msgid "User cancelled operation"
 msgstr "El usuario cancelÃ la operaciÃn."
 
-#: ../libemail-engine/e-mail-session.c:1169
-#, c-format
+#: ../libemail-engine/e-mail-session.c:1368
+#, fuzzy, c-format
+#| msgid ""
+#| "No destination address provided, forward of the message has been "
+#| "cancelled."
 msgid ""
-"No destination address provided, forward of the message has been cancelled."
+"No destination address provided, forwarding of the message has been "
+"cancelled."
 msgstr ""
 "No se proporcionÃ ninguna direcciÃn de destino, se cancelÃ el reenvÃo del "
 "mensaje."
 
-#: ../libemail-engine/e-mail-session.c:1178
-#, c-format
-msgid "No account found to use, forward of the message has been cancelled."
+#: ../libemail-engine/e-mail-session.c:1381
+#, fuzzy, c-format
+#| msgid "No account found to use, forward of the message has been cancelled."
+msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr ""
 "No se encontrÃ ninguna cuenta que usar, se cancelÃ el reenvÃo del mensaje."
 
-#: ../libemail-engine/e-mail-session.c:1332
+#: ../libemail-engine/e-mail-session.c:1543
 #, c-format
 msgid "%s authentication failed"
 msgstr "FallÃ en la autenticaciÃn %s"
 
-#: ../libemail-engine/e-mail-session.c:1406
+#: ../libemail-engine/e-mail-session.c:1588
 #, c-format
-msgid "No password was provided"
-msgstr "No se ha proporcionado ninguna contraseÃa"
+msgid "No data source found for UID '%s'"
+msgstr ""
 
 #: ../libemail-engine/e-mail-session-utils.c:420
 #, c-format
@@ -11114,14 +10996,14 @@ msgid "Cannot get transport for account '%s'"
 msgstr "No se puede obtener el servicio de transporte para la cuenta Â%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 "No se pudieron aplicar los filtros al correo saliente: %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"
@@ -11131,17 +11013,17 @@ msgstr ""
 "En su lugar se anexarÃ a la carpeta local ÂCorreo enviadoÂ."
 
 #: ../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 "FallÃ anexar a la carpeta local ÂCorreo enviadoÂ: %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 mensaje"
 
-#: ../libemail-engine/e-mail-session-utils.c:895
+#: ../libemail-engine/e-mail-session-utils.c:897
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "DesuscribiÃndose de la carpeta Â%sÂ"
@@ -11161,20 +11043,20 @@ msgstr "ReconectÃndose con Â%sÂ"
 msgid "Preparing account '%s' for offline"
 msgstr "Preparando la cuenta Â%sÂ para desconexiÃn"
 
-#: ../libemail-engine/mail-folder-cache.c:882
+#: ../libemail-engine/mail-folder-cache.c:887
 #, c-format
 msgid "Pinging %s"
 msgstr "Haciendo ping a %s"
 
-#: ../libemail-engine/mail-ops.c:94
+#: ../libemail-engine/mail-ops.c:93
 msgid "Filtering Selected Messages"
 msgstr "Filtrado de mensajes seleccionados"
 
-#: ../libemail-engine/mail-ops.c:216
+#: ../libemail-engine/mail-ops.c:215
 msgid "Fetching Mail"
 msgstr "Obteniendo mensajes"
 
-#: ../libemail-engine/mail-ops.c:875
+#: ../libemail-engine/mail-ops.c:907
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
@@ -11182,62 +11064,62 @@ msgstr "Enviando mensaje %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] "FalloÌ al enviar un mensaje"
 msgstr[1] "FallÃ al enviar %d de %d mensajes"
 
-#: ../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 "Moviendo mensajes a Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1047
+#: ../libemail-engine/mail-ops.c:1079
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copiando mensajes a Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1164
+#: ../libemail-engine/mail-ops.c:1196
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Guardando carpeta Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1237
+#: ../libemail-engine/mail-ops.c:1269
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Compactando y almacenando cuenta Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1238
+#: ../libemail-engine/mail-ops.c:1270
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Almacenando cuenta Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1300
+#: ../libemail-engine/mail-ops.c:1332
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Actualizando carpeta Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1518
+#: ../libemail-engine/mail-ops.c:1562
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Compactando carpeta Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1611
+#: ../libemail-engine/mail-ops.c:1655
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vaciando papelera en Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1707
+#: ../libemail-engine/mail-ops.c:1751
 #, c-format
 msgid "Disconnecting %s"
 msgstr "Desconectando de Â%sÂ"
@@ -11294,180 +11176,22 @@ msgstr[1] ""
 "Â%sÂ se han modificado para dar cuenta de la carpeta eliminada\n"
 "Â%sÂ."
 
-#: ../libemail-utils/e-signature.c:710
-msgid "Autogenerated"
-msgstr "Autogenerado"
-
-#. 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 "Ninguna"
-
-#: ../mail/em-account-editor.c:1755
-msgid "Always"
-msgstr "Siempre"
-
-#: ../mail/em-account-editor.c:1756
-msgid "Ask for each message"
-msgstr "Preguntar por cada mensaje"
-
-#: ../mail/em-account-editor.c:2936 ../mail/mail-config.ui.h:164
-msgid "_Path:"
-msgstr "R_uta:"
-
-#: ../mail/em-account-editor.c:2939
-msgid "Fil_e:"
-msgstr "_Archivo:"
-
-#: ../mail/em-account-editor.c:2984
-msgid "Mail Configuration"
-msgstr "ConfiguraciÃn del correo"
-
-#: ../mail/em-account-editor.c:2985
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Continue\" to begin."
-msgstr ""
-"Bienvenido al asistente de configuraciÃn de correo de Evolution.\n"
-"\n"
-"Para comenzar, pulse ÂContinuarÂ."
-
-#: ../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 ""
-"Escriba debajo su nombre y direcciÃn de correo-e. Los campos ÂopcionalesÂ no "
-"hace falta que los rellene, a menos que quiera incluir esta informaciÃn en "
-"el correo-e 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 "Configure las siguientes opciones de la cuenta."
-
-#: ../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 ""
-"Escriba debajo la informaciÃn acerca de cÃmo enviarÃ su correo. Si no estÃ "
-"seguro, pregÃntele a su administrador de sistemas o a su Proveedor de "
-"Servicios de Internet."
-
-#: ../mail/em-account-editor.c:2996
-msgid "Account Summary"
-msgstr "Resumen de la cuenta"
-
-#: ../mail/em-account-editor.c:2997
-msgid ""
-"This is a summary of the settings which will be used to access your mail."
-msgstr ""
-"Esto es un resumen de la configuraciÃn que se usarÃ para acceder a su correo."
-
-#: ../mail/em-account-editor.c:3001
-msgid "Done"
-msgstr "Hecho"
-
-#: ../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 ""
-"Enhorabuena, ha terminado de configurar su correo.\n"
-"\n"
-"Ahora estÃ listo para enviar y recibir correo usando Evolution. \n"
-"\n"
-"Pulse ÂAplicarÂ para guardar su configuraciÃn."
-
-#: ../mail/em-account-editor.c:3565
-msgid "Check for _new messages every"
-msgstr "Comprobar si hay mensajes _nuevos cada"
-
-#: ../mail/em-account-editor.c:3573
-msgid "minu_tes"
-msgstr "minuto_s"
-
-#. 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 "Seguridad"
-
-#. 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 "Opciones de recepciÃn"
-
-#: ../mail/em-account-editor.c:4347 ../mail/em-account-editor.c:4449
-msgid "Checking for New Messages"
-msgstr "Comprobando si hay mensajes nuevos"
-
-#: ../mail/em-account-editor.c:4958
-msgid "Setup Google con_tacts with Evolution"
-msgstr "Configurar los con_tactos de Google con Evolution"
-
-#: ../mail/em-account-editor.c:4965
-msgid "Setup Google ca_lendar with Evolution"
-msgstr "Configurar el ca_lendario de Google con Evolution"
-
-#: ../mail/em-account-editor.c:5016
-msgid "Yahoo! account settings:"
-msgstr "ConfiguraciÃn de la cuenta de Yahoo!:"
-
-#: ../mail/em-account-editor.c:5024
-msgid "Setup _Yahoo! calendar with Evolution"
-msgstr "Configurar el calendario de _Yahoo! con Evolution"
-
-#: ../mail/em-account-editor.c:5031
-msgid "Setup Yahoo! _tasks with Evolution"
-msgstr "Configurar las tareas de Yahoo! con 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 ""
-"Los calendarios de Yahoo! se llaman nombre_apellido. Se ha intentado formar "
-"el nombre del calendario. Confirme y vuelva a introducir el nombre del "
-"calendario si no es correcto, o cÃmbielo mÃs tarde en las propiedades del "
-"calendario."
-
-#: ../mail/em-account-editor.c:5057
-msgid "Yahoo! Calen_dar name:"
-msgstr "Nombre del 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 "Puede arrastrar y soltar nombres de cuentas para reordenarlas."
 
-#: ../mail/e-mail-account-manager.c:463
+#: ../mail/e-mail-account-manager.c:504
 msgid "De_fault"
 msgstr "_Predeterminada"
 
 #: ../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"
 
@@ -11475,13 +11199,10 @@ msgstr "Activado"
 msgid "Account Name"
 msgstr "Nombre de la cuenta"
 
-#. 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"
 
@@ -11503,13 +11224,46 @@ msgstr "Vista de icono"
 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 ""
+
+#: ../mail/e-mail-autoconfig.c:208
+#, fuzzy, c-format
+#| msgid "Error removing list"
+msgid "Error resolving '%s'"
+msgstr "Error al eliminar la lista"
+
+#: ../mail/e-mail-autoconfig.c:264
+#, c-format
+msgid "No authoritative name server for '%s'"
+msgstr ""
+
+#: ../mail/e-mail-autoconfig.c:661
+#, fuzzy
+#| msgid "No password was provided"
+msgid "No email address provided"
+msgstr "No se ha proporcionado ninguna contraseÃa"
+
+#: ../mail/e-mail-autoconfig.c:670
+#, fuzzy
+#| msgid "Using email address"
+msgid "Missing domain in email address"
+msgstr "Usando direcciÃn de correo-e"
+
+#: ../mail/e-mail-backend.c:716
 msgid "Unknown background operation"
 msgstr "OperaciÃn en segundo plano desconocida"
 
-#: ../mail/e-mail-browser.c:132 ../shell/e-shell-window-actions.c:1438
-#: ../shell/e-shell-window-actions.c:1445
-#: ../shell/e-shell-window-actions.c:1452
+#: ../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 "Cierra esta ventana"
 
@@ -11517,66 +11271,444 @@ msgstr "Cierra esta ventana"
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: ../mail/e-mail-display.c:112
-msgid "_Add to Address Book..."
-msgstr "_AÃadir a la libreta de direccionesâ"
+#: ../mail/e-mail-config-assistant.c:502
+msgid "Evolution Account Assistant"
+msgstr "Asistente de cuentas de Evolution"
 
-#: ../mail/e-mail-display.c:119
-msgid "_To This Address"
-msgstr "_A esta direcciÃn"
+#: ../mail/e-mail-config-auth-check.c:346
+#, fuzzy
+#| msgid "Ch_eck for Supported Types"
+msgid "Check for Supported Types"
+msgstr "C_omprobar tipos soportados"
 
-#: ../mail/e-mail-display.c:126
-msgid "_From This Address"
-msgstr "_Desde esta direcciÃn"
+#: ../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 ""
+"Enhorabuena, ha terminado de configurar su correo.\n"
+"\n"
+"Ahora estÃ listo para enviar y recibir correo usando Evolution. \n"
+"\n"
+"Pulse ÂAplicarÂ para guardar su configuraciÃn."
 
-#: ../mail/e-mail-display.c:133
-msgid "Send _Reply To..."
-msgstr "Enviar _respuesta aâ"
+#: ../mail/e-mail-config-confirm-page.c:169
+msgid "Done"
+msgstr "Hecho"
 
-#: ../mail/e-mail-display.c:135
-msgid "Send a reply message to this address"
-msgstr "Enviar un mensaje de respuesta a esta direcciÃn"
+#: ../mail/e-mail-config-defaults-page.c:527
+msgid "Special Folders"
+msgstr "Carpetas especiales"
 
-#: ../mail/e-mail-display.c:142
-msgid "Create Search _Folder"
-msgstr "Crear carpeta de _bÃsqueda"
+#: ../mail/e-mail-config-defaults-page.c:536
+#, fuzzy
+#| msgid "Sent _Messages Folder:"
+msgid "Draft Messages _Folder:"
+msgstr "Carpeta de _mensajes enviados:"
 
-#: ../mail/e-mail-display.c:152
-msgid "Save _Image..."
-msgstr "Guardar _imagenâ"
+#: ../mail/e-mail-config-defaults-page.c:546
+#, fuzzy
+#| msgid "Choose folders to post the message to."
+msgid "Choose a folder for saving draft messages."
+msgstr "Elija las carpetas en las que publicar el mensaje."
 
-#: ../mail/e-mail-display.c:154
-msgid "Save the image to a file"
-msgstr "Guardar la imagen en un archivo"
+#: ../mail/e-mail-config-defaults-page.c:560
+msgid "Sent _Messages Folder:"
+msgstr "Carpeta de _mensajes enviados:"
 
-#. 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
+#, fuzzy
+#| msgid "Choose folders to post the message to."
+msgid "Choose a folder for saving sent messages."
+msgstr "Elija las carpetas en las que publicar el mensaje."
 
-#: ../mail/e-mail-label-dialog.c:225
-msgid "_Label name:"
-msgstr "_Nombre de la etiqueta:"
+#: ../mail/e-mail-config-defaults-page.c:584
+#, fuzzy
+#| msgid "_Restore Default"
+msgid "_Restore Defaults"
+msgstr "_Restaurar predeterminada"
 
-#: ../mail/e-mail-label-list-store.c:49
-msgid "I_mportant"
-msgstr "_Importante"
+#: ../mail/e-mail-config-defaults-page.c:598
+msgid "Use a Real Folder for _Trash:"
+msgstr ""
 
-#. red
-#: ../mail/e-mail-label-list-store.c:50
-msgid "_Work"
-msgstr "_Trabajo"
+#: ../mail/e-mail-config-defaults-page.c:599
+#, fuzzy
+#| msgid "Choose folders to post the message to."
+msgid "Choose a folder for deleted messages."
+msgstr "Elija las carpetas en las que publicar el mensaje."
 
-#. orange
-#: ../mail/e-mail-label-list-store.c:51
-msgid "_Personal"
-msgstr "_Privado"
+#: ../mail/e-mail-config-defaults-page.c:608
+msgid "Use a Real Folder for _Junk:"
+msgstr ""
 
-#. green
-#: ../mail/e-mail-label-list-store.c:52
-msgid "_To Do"
-msgstr "Ta_reas pendientes"
+#: ../mail/e-mail-config-defaults-page.c:609
+#, fuzzy
+#| msgid "Choose folders to post the message to."
+msgid "Choose a folder for junk messages."
+msgstr "Elija las carpetas en las que publicar el mensaje."
+
+#: ../mail/e-mail-config-defaults-page.c:626
+msgid "Composing Messages"
+msgstr "Redactar mensajes"
+
+#: ../mail/e-mail-config-defaults-page.c:635
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Siempre enviar _copia de carbÃn (Cc) a:"
+
+#: ../mail/e-mail-config-defaults-page.c:660
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Siempre enviar copia de carbÃn _oculta (Cco) a:"
+
+#: ../mail/e-mail-config-defaults-page.c:695
+msgid "Message Receipts"
+msgstr "Destinatarios del mensaje"
+
+#: ../mail/e-mail-config-defaults-page.c:704
+msgid "S_end message receipts:"
+msgstr "_Enviar confirmaciones de mensajes:"
+
+#: ../mail/e-mail-config-defaults-page.c:735
+msgid "Always"
+msgstr "Siempre"
+
+#: ../mail/e-mail-config-defaults-page.c:741
+msgid "Ask for each message"
+msgstr "Preguntar por cada mensaje"
+
+#: ../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 ""
+"Escriba debajo su nombre y direcciÃn de correo-e. Los campos ÂopcionalesÂ no "
+"hace falta que los rellene, a menos que quiera incluir esta informaciÃn en "
+"el correo-e 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 de la cuenta"
+
+#: ../mail/e-mail-config-identity-page.c:291
+#: ../mail/e-mail-config-summary-page.c:362
+#, fuzzy
+#| msgid ""
+#| "Type the name by which you would like to refer to this account.\n"
+#| "For example: \"Work\" or \"Personal\""
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example, \"Work\" or \"Personal\"."
+msgstr ""
+"Teclee el nombre por el que quiere identificar a esta cuenta.\n"
+"Por ejemplo: ÂTrabajoÂ o ÂPersonalÂ"
+
+#: ../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 "_Nombre:"
+
+#: ../mail/e-mail-config-identity-page.c:336
+msgid "Required Information"
+msgstr "InformaciÃn requerida"
+
+#: ../mail/e-mail-config-identity-page.c:345
+msgid "Full Nam_e:"
+msgstr "Nombre co_mpleto:"
+
+#: ../mail/e-mail-config-identity-page.c:372
+msgid "Email _Address:"
+msgstr "Dir_ecciÃn de correo-e:"
+
+#: ../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 "AÃadir firma _nuevaâ"
+
+#: ../mail/e-mail-config-lookup-page.c:68
+#, fuzzy
+#| msgid "Loading accounts..."
+msgid "Looking up account details..."
+msgstr "Cargando cuentasâ"
+
+#: ../mail/e-mail-config-provider-page.c:712
+msgid "Receiving Options"
+msgstr "Opciones 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 "General"
+
+#: ../mail/e-mail-config-security-page.c:268
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr ""
+"No _firmar las solicitudes de reuniÃn (para compatibilidad con Outlook)"
+
+#: ../mail/e-mail-config-security-page.c:290
+#, fuzzy
+#| msgid "Pretty Good Privacy (PGP/GPG)"
+msgid "Pretty Good Privacy (OpenPGP)"
+msgstr "Pretty Good Privacy (PGP/GPG)"
+
+#: ../mail/e-mail-config-security-page.c:298
+#, fuzzy
+#| msgid "PGP/GPG _Key ID:"
+msgid "OpenPGP _Key ID:"
+msgstr "ID de c_lave GPG/PGP:"
+
+#: ../mail/e-mail-config-security-page.c:320
+msgid "Si_gning algorithm:"
+msgstr "Algoritmo de _firma:"
+
+#: ../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 "_Firmar siempre los mensajes salientes cuando se use esta cuenta"
+
+#: ../mail/e-mail-config-security-page.c:373
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr "Siempre cifrar a _mÃ mismo cuando envÃe correo cifrado"
+
+#: ../mail/e-mail-config-security-page.c:385
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr "Siempre _confiar en las claves de mi almacÃn al 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 _firma:"
+
+#: ../mail/e-mail-config-security-page.c:441
+#: ../mail/e-mail-config-security-page.c:547
+#, fuzzy
+#| msgid "Selected"
+msgid "Select"
+msgstr "Seleccionado"
+
+#: ../mail/e-mail-config-security-page.c:459
+msgid "Signing _algorithm:"
+msgstr "_Algoritmo de firma:"
+
+#: ../mail/e-mail-config-security-page.c:500
+#, fuzzy
+#| msgid "Al_ways sign outgoing messages when using this account"
+msgid "Always sign outgoing messages when using this account"
+msgstr "_Firmar siempre los mensajes salientes cuando se use esta cuenta"
+
+#: ../mail/e-mail-config-security-page.c:523
+#, fuzzy
+#| msgid "Encry_ption certificate:"
+msgid "Encryption certificate:"
+msgstr "Certificado de ci_frado:"
+
+#: ../mail/e-mail-config-security-page.c:565
+#, fuzzy
+#| msgid "Al_ways sign outgoing messages when using this account"
+msgid "Always encrypt outgoing messages when using this account"
+msgstr "_Firmar siempre los mensajes salientes cuando se use esta cuenta"
+
+#: ../mail/e-mail-config-security-page.c:585
+#, fuzzy
+#| msgid "Always encrypt to _myself when sending encrypted messages"
+msgid "Always encrypt to myself when sending encrypted messages"
+msgstr "Siempre cifrar a _mÃ mismo cuando envÃe 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 "Seguridad"
+
+#: ../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 ""
+"Esto es un resumen de la configuraciÃn que se usarÃ para acceder a su correo."
+
+#: ../mail/e-mail-config-summary-page.c:407
+#| msgid "Personal Details:"
+msgid "Personal Details"
+msgstr "Detalles personales"
+
+#: ../mail/e-mail-config-summary-page.c:416
+#| msgid "Full Nam_e:"
+msgid "Full Name:"
+msgstr "Nombre completo:"
+
+#: ../mail/e-mail-config-summary-page.c:430
+#| msgid "Email _Address:"
+msgid "Email Address:"
+msgstr "DirecciÃn de correo-e:"
+
+#: ../mail/e-mail-config-summary-page.c:468
+#| msgid "Server _Type:"
+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:"
+msgid "Server:"
+msgstr "Servidor:"
+
+#: ../mail/e-mail-config-summary-page.c:531
+#| msgctxt "email-custom-header-Security"
+#| msgid "Security:"
+msgid "Security:"
+msgstr "Seguridad:"
+
+#: ../mail/e-mail-config-summary-page.c:835
+msgid "Account Summary"
+msgstr "Resumen de la cuenta"
+
+#: ../mail/e-mail-config-welcome-page.c:157
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+"Bienvenido al asistente de configuraciÃn de correo de Evolution.\n"
+"\n"
+"Para comenzar, pulse ÂContinuarÂ."
+
+#: ../mail/e-mail-config-welcome-page.c:167
+#: ../modules/startup-wizard/e-startup-assistant.c:150
+msgid "Welcome"
+msgstr "Bienvenido"
+
+#: ../mail/e-mail-config-window.c:321
+msgid "Account Editor"
+msgstr "Editor de cuentas"
+
+#: ../mail/e-mail-display.c:112
+msgid "_Add to Address Book..."
+msgstr "_AÃadir a la libreta de direccionesâ"
+
+#: ../mail/e-mail-display.c:119
+msgid "_To This Address"
+msgstr "_A esta direcciÃn"
+
+#: ../mail/e-mail-display.c:126
+msgid "_From This Address"
+msgstr "_Desde esta direcciÃn"
+
+#: ../mail/e-mail-display.c:133
+msgid "Send _Reply To..."
+msgstr "Enviar _respuesta aâ"
+
+#: ../mail/e-mail-display.c:135
+msgid "Send a reply message to this address"
+msgstr "Enviar un mensaje de respuesta a esta direcciÃn"
+
+#: ../mail/e-mail-display.c:142
+msgid "Create Search _Folder"
+msgstr "Crear carpeta de _bÃsqueda"
+
+#: ../mail/e-mail-display.c:152
+msgid "Save _Image..."
+msgstr "Guardar _imagenâ"
+
+#: ../mail/e-mail-display.c:154
+msgid "Save the image to a file"
+msgstr "Guardar la imagen en un archivo"
+
+#. 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 "_Nombre de la etiqueta:"
+
+#: ../mail/e-mail-label-list-store.c:49
+msgid "I_mportant"
+msgstr "_Importante"
+
+#. red
+#: ../mail/e-mail-label-list-store.c:50
+msgid "_Work"
+msgstr "_Trabajo"
+
+#. orange
+#: ../mail/e-mail-label-list-store.c:51
+msgid "_Personal"
+msgstr "_Privado"
+
+#. green
+#: ../mail/e-mail-label-list-store.c:52
+msgid "_To Do"
+msgstr "Ta_reas pendientes"
 
 #. blue
 #: ../mail/e-mail-label-list-store.c:53
@@ -11584,7 +11716,7 @@ msgid "_Later"
 msgstr "_MÃs tarde"
 
 #: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:736
+#: ../modules/mail/e-mail-shell-view-actions.c:745
 msgid "Add Label"
 msgstr "AÃadir etiqueta"
 
@@ -11605,14 +11737,15 @@ msgid "Color"
 msgstr "Color"
 
 #: ../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 "Nombre"
 
-#: ../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 "No se pueden crear las carpetas de correo local en: Â%sÂ: %s"
@@ -11627,8 +11760,8 @@ msgid "Page %d of %d"
 msgstr "PÃgina %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"
 
@@ -11640,647 +11773,647 @@ msgstr "Nombre de la cabecera"
 msgid "Header Value"
 msgstr "Valor de la 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 "Cabeceras"
 
-#: ../mail/e-mail-reader.c:353
+#: ../mail/e-mail-reader.c:352
 msgid "Save Image"
 msgstr "Guardar imagen"
 
-#: ../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 a la carpeta"
 
-#: ../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 a la carpeta"
 
-#: ../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 "_No preguntarme de nuevo."
 
-#: ../mail/e-mail-reader.c:1554
+#: ../mail/e-mail-reader.c:1560
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Ignorar siempre ÂResponder a:Â para las listas de correo."
 
-#: ../mail/e-mail-reader.c:1738
+#: ../mail/e-mail-reader.c:1744
 msgid "Failed to retrieve message:"
 msgstr "FalloÌ al obtener el mensaje:"
 
-#: ../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 "Obteniendo mensaje Â%sÂ"
 
-#: ../mail/e-mail-reader.c:1960
+#: ../mail/e-mail-reader.c:1966
 msgid "A_dd Sender to Address Book"
 msgstr "_AÃadir remitente a la libreta"
 
-#: ../mail/e-mail-reader.c:1962
+#: ../mail/e-mail-reader.c:1968
 msgid "Add sender to address book"
 msgstr "AÃadir el remitente a la libreta de direcciones"
 
-#: ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:1973
 msgid "Check for _Junk"
 msgstr "Detectar _SPAM"
 
-#: ../mail/e-mail-reader.c:1969
+#: ../mail/e-mail-reader.c:1975
 msgid "Filter the selected messages for junk status"
 msgstr "Filtra los mensajes seleccionados por el estado de SPAM"
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:1980
 msgid "_Copy to Folder..."
 msgstr "Copiar a la c_arpetaâ"
 
-#: ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:1982
 msgid "Copy selected messages to another folder"
 msgstr "Copia mensajes seleccionados a otra carpeta"
 
-#: ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:1987
 msgid "_Delete Message"
 msgstr "_Eliminar el mensaje"
 
-#: ../mail/e-mail-reader.c:1983
+#: ../mail/e-mail-reader.c:1989
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar los mensajes seleccionados para eliminar"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:1994
 msgid "Filter on Mailing _List..."
 msgstr "Filtro segÃn la _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 "Crea una regla para filtrar los mensajes de esta lista de correo"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:2001
 msgid "Filter on _Recipients..."
 msgstr "Filtro segÃn los _destinatariosâ"
 
-#: ../mail/e-mail-reader.c:1997
+#: ../mail/e-mail-reader.c:2003
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Crea una regla para filtrar los mensajes de estos destinatarios"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2008
 msgid "Filter on Se_nder..."
 msgstr "Filtro segÃn el _remitenteâ"
 
-#: ../mail/e-mail-reader.c:2004
+#: ../mail/e-mail-reader.c:2010
 msgid "Create a rule to filter messages from this sender"
 msgstr "Crea una regla para filtrar los mensajes de este remitente"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:2015
 msgid "Filter on _Subject..."
 msgstr "Filtro segÃn el _asuntoâ"
 
-#: ../mail/e-mail-reader.c:2011
+#: ../mail/e-mail-reader.c:2017
 msgid "Create a rule to filter messages with this subject"
 msgstr "Crea una regla para filtrar los mensajes con este asunto"
 
 # ColisiÃn en la A
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:2022
 msgid "A_pply Filters"
 msgstr "Aplicar _filtros"
 
-#: ../mail/e-mail-reader.c:2018
+#: ../mail/e-mail-reader.c:2024
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplica filtros a los mensajes seleccionados"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:2029
 msgid "_Find in Message..."
 msgstr "B_uscar en el mensajeâ"
 
-#: ../mail/e-mail-reader.c:2025
+#: ../mail/e-mail-reader.c:2031
 msgid "Search for text in the body of the displayed message"
 msgstr "Busca un texto en el cuerpo del mensaje mostrado"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:2036
 msgid "_Clear Flag"
 msgstr "_Quitar marca"
 
-#: ../mail/e-mail-reader.c:2032
+#: ../mail/e-mail-reader.c:2038
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Quitar la marca de seguimiento de los mensajes seleccionados"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2043
 msgid "_Flag Completed"
 msgstr "Ma_rcar como terminado"
 
-#: ../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 "Establecer la marca de completado en los mensajes seleccionados"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2050
 msgid "Follow _Up..."
 msgstr "Se_guimientoâ"
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:2052
 msgid "Flag the selected messages for follow-up"
 msgstr "Marcar los mensajes seleccionados para seguimiento"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:2057
 msgid "_Attached"
 msgstr "_Adjunto"
 
-#: ../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 "ReenvÃa a alguien el mensaje seleccionado como un adjunto"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2064
 msgid "Forward As _Attached"
 msgstr "Reenviar como _adjunto"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2071
 msgid "_Inline"
 msgstr "_Incluido en lÃnea"
 
-#: ../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 "ReenvÃa el mensaje seleccionado en el cuerpo de un mensaje nuevo"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2078
 msgid "Forward As _Inline"
 msgstr "Reenviar en _lÃnea"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2085
 msgid "_Quoted"
 msgstr "_Citado"
 
-#: ../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 "ReenvÃa el mensaje seleccionado citado como una respuesta"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:2092
 msgid "Forward As _Quoted"
 msgstr "Reenviar como ci_tado"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2099
 msgid "_Load Images"
 msgstr "Cargar _imÃgenes"
 
-#: ../mail/e-mail-reader.c:2095
+#: ../mail/e-mail-reader.c:2101
 msgid "Force images in HTML mail to be loaded"
 msgstr "Fuerza la carga de imÃgenes en el 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 los mensajes seleccionados como importantes"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2113
 msgid "_Junk"
 msgstr "_SPAM"
 
-#: ../mail/e-mail-reader.c:2109
+#: ../mail/e-mail-reader.c:2115
 msgid "Mark the selected messages as junk"
 msgstr "Marcar los mensajes seleccionados como SPAM"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2120
 msgid "_Not Junk"
 msgstr "No es SPA_M"
 
-#: ../mail/e-mail-reader.c:2116
+#: ../mail/e-mail-reader.c:2122
 msgid "Mark the selected messages as not being junk"
 msgstr "Marcar los mensajes seleccionados como no SPAM"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2127
 msgid "_Read"
 msgstr "_LeÃdo"
 
-#: ../mail/e-mail-reader.c:2123
+#: ../mail/e-mail-reader.c:2129
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar los mensajes seleccionados como leÃdos"
 
-#: ../mail/e-mail-reader.c:2128
+#: ../mail/e-mail-reader.c:2134
 msgid "Uni_mportant"
 msgstr "N_o importante"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../mail/e-mail-reader.c:2136
 msgid "Mark the selected messages as unimportant"
 msgstr "Marcar los mensajes seleccionados como no importantes"
 
-#: ../mail/e-mail-reader.c:2135
+#: ../mail/e-mail-reader.c:2141
 msgid "_Unread"
 msgstr "_No leÃdo"
 
-#: ../mail/e-mail-reader.c:2137
+#: ../mail/e-mail-reader.c:2143
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar los mensajes seleccionados como no leÃdos"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2148
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevoâ"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2150
 msgid "Open the selected messages in the composer for editing"
 msgstr "Abre los mensajes seleccionados en el editor para editarlo"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2155
 msgid "Compose _New Message"
 msgstr "Redactar un mensaje _nuevo"
 
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2157
 msgid "Open a window for composing a mail message"
 msgstr "Abre una ventana para escribir un mensaje de correo"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2162
 msgid "_Open in New Window"
 msgstr "_Abrir en una ventana nueva"
 
-#: ../mail/e-mail-reader.c:2158
+#: ../mail/e-mail-reader.c:2164
 msgid "Open the selected messages in a new window"
 msgstr "Abre los mensajes seleccionados en una ventana nueva"
 
-#: ../mail/e-mail-reader.c:2163
+#: ../mail/e-mail-reader.c:2169
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpetaâ"
 
-#: ../mail/e-mail-reader.c:2165
+#: ../mail/e-mail-reader.c:2171
 msgid "Move selected messages to another folder"
 msgstr "Mueve los mensajes seleccionados a otra carpeta"
 
-#: ../mail/e-mail-reader.c:2170
+#: ../mail/e-mail-reader.c:2176
 msgid "_Switch to Folder"
 msgstr "_Cambiar a la carpeta"
 
-#: ../mail/e-mail-reader.c:2172
+#: ../mail/e-mail-reader.c:2178
 msgid "Display the parent folder"
 msgstr "Mostrar la carpeta padre"
 
-#: ../mail/e-mail-reader.c:2177
+#: ../mail/e-mail-reader.c:2183
 msgid "Switch to _next tab"
 msgstr "Cambiar a la _siguiente pestaÃa"
 
-#: ../mail/e-mail-reader.c:2179
+#: ../mail/e-mail-reader.c:2185
 msgid "Switch to the next tab"
 msgstr "Cambiar a la siguiente pestaÃa"
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2190
 msgid "Switch to _previous tab"
 msgstr "Cambiar a la pestaÃa _anterior"
 
-#: ../mail/e-mail-reader.c:2186
+#: ../mail/e-mail-reader.c:2192
 msgid "Switch to the previous tab"
 msgstr "Cambiar a la pestaÃa anterior"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2197
 msgid "Cl_ose current tab"
 msgstr "C_errar la pestaÃa actual"
 
-#: ../mail/e-mail-reader.c:2193
+#: ../mail/e-mail-reader.c:2199
 msgid "Close current tab"
 msgstr "Cerrar la pestaÃa actual"
 
-#: ../mail/e-mail-reader.c:2198
+#: ../mail/e-mail-reader.c:2204
 msgid "_Next Message"
 msgstr "Mensaje _siguiente"
 
-#: ../mail/e-mail-reader.c:2200
+#: ../mail/e-mail-reader.c:2206
 msgid "Display the next message"
 msgstr "Mostrar el mensaje siguiente"
 
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2211
 msgid "Next _Important Message"
 msgstr "Mensaje siguiente _importante"
 
-#: ../mail/e-mail-reader.c:2207
+#: ../mail/e-mail-reader.c:2213
 msgid "Display the next important message"
 msgstr "Mostrar el mensaje siguiente importante"
 
-#: ../mail/e-mail-reader.c:2212
+#: ../mail/e-mail-reader.c:2218
 msgid "Next _Thread"
 msgstr "_ConversaciÃn siguiente"
 
-#: ../mail/e-mail-reader.c:2214
+#: ../mail/e-mail-reader.c:2220
 msgid "Display the next thread"
 msgstr "Mostrar la siguiente conversaciÃn"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2225
 msgid "Next _Unread Message"
 msgstr "Mensaje siguiente _no leÃdo"
 
-#: ../mail/e-mail-reader.c:2221
+#: ../mail/e-mail-reader.c:2227
 msgid "Display the next unread message"
 msgstr "Mostrar el siguiente mensaje no leÃdo"
 
-#: ../mail/e-mail-reader.c:2226
+#: ../mail/e-mail-reader.c:2232
 msgid "_Previous Message"
 msgstr "Mensaje _anterior"
 
-#: ../mail/e-mail-reader.c:2228
+#: ../mail/e-mail-reader.c:2234
 msgid "Display the previous message"
 msgstr "Mostrar el mensaje anterior"
 
-#: ../mail/e-mail-reader.c:2233
+#: ../mail/e-mail-reader.c:2239
 msgid "Pr_evious Important Message"
 msgstr "Mensaje anterior i_mportante"
 
-#: ../mail/e-mail-reader.c:2235
+#: ../mail/e-mail-reader.c:2241
 msgid "Display the previous important message"
 msgstr "Mostrar el anterior mensaje importante"
 
-#: ../mail/e-mail-reader.c:2240
+#: ../mail/e-mail-reader.c:2246
 msgid "Previous T_hread"
 msgstr "Con_versaciÃn anterior"
 
-#: ../mail/e-mail-reader.c:2242
+#: ../mail/e-mail-reader.c:2248
 msgid "Display the previous thread"
 msgstr "Mostrar la conversaciÃn anterior"
 
-#: ../mail/e-mail-reader.c:2247
+#: ../mail/e-mail-reader.c:2253
 msgid "P_revious Unread Message"
 msgstr "Mensaje anterior n_o leÃdo"
 
-#: ../mail/e-mail-reader.c:2249
+#: ../mail/e-mail-reader.c:2255
 msgid "Display the previous unread message"
 msgstr "Mostrar el anterior mensaje no leÃdo"
 
-#: ../mail/e-mail-reader.c:2256
+#: ../mail/e-mail-reader.c:2262
 msgid "Print this message"
 msgstr "Imprime este mensaje"
 
-#: ../mail/e-mail-reader.c:2263
+#: ../mail/e-mail-reader.c:2269
 msgid "Preview the message to be printed"
 msgstr "Vista previa del mensaje que va a imprimirse"
 
-#: ../mail/e-mail-reader.c:2268
+#: ../mail/e-mail-reader.c:2274
 msgid "Re_direct"
 msgstr "Re_dirigir"
 
-#: ../mail/e-mail-reader.c:2270
+#: ../mail/e-mail-reader.c:2276
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirige (rebotar) el mensaje seleccionado a alguien"
 
-#: ../mail/e-mail-reader.c:2275
+#: ../mail/e-mail-reader.c:2281
 msgid "Remo_ve Attachments"
 msgstr "Q_uitar adjuntos"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../mail/e-mail-reader.c:2283
 msgid "Remove attachments"
 msgstr "Quitar adjuntos"
 
-#: ../mail/e-mail-reader.c:2282
+#: ../mail/e-mail-reader.c:2288
 msgid "Remove Du_plicate Messages"
 msgstr "Quitar correos _duplicados"
 
-#: ../mail/e-mail-reader.c:2284
+#: ../mail/e-mail-reader.c:2290
 msgid "Checks selected messages for duplicates"
 msgstr "Comprobar los mensajes seleccionados para buscar duplicados"
 
-#: ../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 _todos"
 
-#: ../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 "Responder a todos los destinatarios del mensaje seleccionado"
 
-#: ../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 a la _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 "Responde a la lista de correo remitente del mensaje seleccionado"
 
-#: ../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 al _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 "Responde al remitente del mensaje seleccionado"
 
-#: ../mail/e-mail-reader.c:2310
+#: ../mail/e-mail-reader.c:2316
 msgid "_Save as mbox..."
 msgstr "_Guardar como mboxâ"
 
-#: ../mail/e-mail-reader.c:2312
+#: ../mail/e-mail-reader.c:2318
 msgid "Save selected messages as an mbox file"
 msgstr "Guarda los mensajes como un archivo mbox"
 
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2323
 msgid "_Message Source"
 msgstr "Me_nsaje en bruto"
 
-#: ../mail/e-mail-reader.c:2319
+#: ../mail/e-mail-reader.c:2325
 msgid "Show the raw email source of the message"
 msgstr "Mostrar mensaje de correo-e en bruto"
 
-#: ../mail/e-mail-reader.c:2331
+#: ../mail/e-mail-reader.c:2337
 msgid "_Undelete Message"
 msgstr "_Recuperar mensaje"
 
-#: ../mail/e-mail-reader.c:2333
+#: ../mail/e-mail-reader.c:2339
 msgid "Undelete the selected messages"
 msgstr "Recupera los mensajes seleccionados"
 
-#: ../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 "Restablecer el texto a su tamaÃo original"
 
-#: ../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 "Incrementar el tamaÃo del 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 "Reduce el tamaÃo del texto"
 
-#: ../mail/e-mail-reader.c:2361
+#: ../mail/e-mail-reader.c:2367
 msgid "Create R_ule"
 msgstr "Crear _regla"
 
-#: ../mail/e-mail-reader.c:2368
+#: ../mail/e-mail-reader.c:2374
 msgid "Ch_aracter Encoding"
 msgstr "C_odificaciÃn de caracteres"
 
-#: ../mail/e-mail-reader.c:2375
+#: ../mail/e-mail-reader.c:2381
 msgid "F_orward As"
 msgstr "Reenviar _como"
 
-#: ../mail/e-mail-reader.c:2382
+#: ../mail/e-mail-reader.c:2388
 msgid "_Group Reply"
 msgstr "_Responder al 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 "_Mensaje"
 
-#: ../mail/e-mail-reader.c:2410
+#: ../mail/e-mail-reader.c:2416
 msgid "_Zoom"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:2420
+#: ../mail/e-mail-reader.c:2426
 msgid "Search Folder from Mailing _List..."
 msgstr "Carpeta de bÃsqueda segÃn la l_ista 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 una carpeta de bÃsqueda para esta lista de correo"
 
-#: ../mail/e-mail-reader.c:2427
+#: ../mail/e-mail-reader.c:2433
 msgid "Search Folder from Recipien_ts..."
 msgstr "Carpeta de bÃsqueda segÃn los des_tinatariosâ"
 
-#: ../mail/e-mail-reader.c:2429
+#: ../mail/e-mail-reader.c:2435
 msgid "Create a search folder for these recipients"
 msgstr "Crear una carpeta de bÃsqueda para estos destinatarios"
 
-#: ../mail/e-mail-reader.c:2434
+#: ../mail/e-mail-reader.c:2440
 msgid "Search Folder from Sen_der..."
 msgstr "Carpeta de bÃsqueda segÃn el r_emitenteâ"
 
-#: ../mail/e-mail-reader.c:2436
+#: ../mail/e-mail-reader.c:2442
 msgid "Create a search folder for this sender"
 msgstr "Crear una carpeta de bÃsqueda para este remitente"
 
-#: ../mail/e-mail-reader.c:2441
+#: ../mail/e-mail-reader.c:2447
 msgid "Search Folder from S_ubject..."
 msgstr "Carpeta de bÃsqueda segÃn el a_suntoâ"
 
-#: ../mail/e-mail-reader.c:2443
+#: ../mail/e-mail-reader.c:2449
 msgid "Create a search folder for this subject"
 msgstr "Crear una carpeta de bÃsqueda para este asunto"
 
-#: ../mail/e-mail-reader.c:2466
+#: ../mail/e-mail-reader.c:2472
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para se_guimientoâ"
 
-#: ../mail/e-mail-reader.c:2474
+#: ../mail/e-mail-reader.c:2480
 msgid "Mark as _Important"
 msgstr "Marcar como imp_ortante"
 
-#: ../mail/e-mail-reader.c:2478
+#: ../mail/e-mail-reader.c:2484
 msgid "Mark as _Junk"
 msgstr "Marcar como _SPAM"
 
-#: ../mail/e-mail-reader.c:2482
+#: ../mail/e-mail-reader.c:2488
 msgid "Mark as _Not Junk"
 msgstr "Marcar como no _SPAM"
 
-#: ../mail/e-mail-reader.c:2486
+#: ../mail/e-mail-reader.c:2492
 msgid "Mar_k as Read"
 msgstr "Marcar como _leÃdo"
 
-#: ../mail/e-mail-reader.c:2490
+#: ../mail/e-mail-reader.c:2496
 msgid "Mark as Uni_mportant"
 msgstr "Marcar como no imp_ortante"
 
-#: ../mail/e-mail-reader.c:2494
+#: ../mail/e-mail-reader.c:2500
 msgid "Mark as _Unread"
 msgstr "Marcar como no _leÃdo"
 
-#: ../mail/e-mail-reader.c:2538
+#: ../mail/e-mail-reader.c:2544
 msgid "_Caret Mode"
 msgstr "Activar cu_rsor"
 
-#: ../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 parpadeante en el cuerpo de los mensajes mostrados"
 
-#: ../mail/e-mail-reader.c:2546
+#: ../mail/e-mail-reader.c:2552
 msgid "All Message _Headers"
 msgstr "_Todas las cabeceras del mensaje"
 
-#: ../mail/e-mail-reader.c:2548
+#: ../mail/e-mail-reader.c:2554
 msgid "Show messages with all email headers"
 msgstr "Mostrar los mensajes con todas las cabeceras de correo-e"
 
-#: ../mail/e-mail-reader.c:2879
+#: ../mail/e-mail-reader.c:2885
 msgid "Retrieving message"
 msgstr "Descargando mensaje"
 
-#: ../mail/e-mail-reader.c:3196
+#: ../mail/e-mail-reader.c:3205
 msgid "Parsing message"
 msgstr "Analizando mensaje"
 
-#: ../mail/e-mail-reader.c:3901
+#: ../mail/e-mail-reader.c:3910
 #: ../modules/mail/e-mail-attachment-handler.c:175
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: ../mail/e-mail-reader.c:3902
+#: ../mail/e-mail-reader.c:3911
 msgid "Forward the selected message to someone"
 msgstr "ReenvÃa a alguien el mensaje seleccionado"
 
-#: ../mail/e-mail-reader.c:3921
+#: ../mail/e-mail-reader.c:3930
 msgid "Group Reply"
 msgstr "Responder al 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 a la lista de correo o a todos los 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 "Siguiente"
 
-#: ../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 "Carpeta Â%sÂ"
 
-#: ../mail/e-mail-reader-utils.c:147
+#: ../mail/e-mail-reader-utils.c:148
 msgid "Do not warn me again"
 msgstr "No advertirme de nuevo"
 
-#: ../mail/e-mail-reader-utils.c:521
+#: ../mail/e-mail-reader-utils.c:527
 msgid "Printing"
 msgstr "Imprimiendo"
 
 #. 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 "
@@ -12295,7 +12428,7 @@ msgstr[1] ""
 "La carpeta Â%sÂ contiene %u correos duplicados. ÂEstÃ seguro de que quiere "
 "eliminarlos?"
 
-#: ../mail/e-mail-reader-utils.c:1033
+#: ../mail/e-mail-reader-utils.c:1039
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Guardar mensaje"
@@ -12306,7 +12439,7 @@ msgstr[1] "Guardar mensajes"
 #. * 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] "Mensaje"
@@ -12325,7 +12458,7 @@ msgstr "Marcar para seguimiento"
 #. * 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:"
@@ -12333,23 +12466,23 @@ msgstr ""
 "El ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} a las ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribiÃ:"
 
-#: ../mail/em-composer-utils.c:1261
+#: ../mail/em-composer-utils.c:1295
 msgid "-------- Forwarded Message --------"
 msgstr "--------- Mensaje reenviado --------"
 
-#: ../mail/em-composer-utils.c:1266
+#: ../mail/em-composer-utils.c:1300
 msgid "-----Original Message-----"
 msgstr "-----Mensaje original-----"
 
-#: ../mail/em-composer-utils.c:2500
+#: ../mail/em-composer-utils.c:2580
 msgid "an unknown sender"
 msgstr "un remitente desconocido"
 
-#: ../mail/em-composer-utils.c:2905
+#: ../mail/em-composer-utils.c:2998
 msgid "Posting destination"
 msgstr "Destino de publicaciÃn"
 
-#: ../mail/em-composer-utils.c:2906
+#: ../mail/em-composer-utils.c:2999
 msgid "Choose folders to post the message to."
 msgstr "Elija las carpetas en las que publicar el mensaje."
 
@@ -12478,7 +12611,7 @@ msgstr "no estÃ configurado"
 msgid "is set"
 msgstr "estÃ configurado"
 
-#: ../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 "SPAM"
 
@@ -12698,11 +12831,11 @@ msgid "Cannot drop message(s) into toplevel store"
 msgstr "No se puede dejar el(los) mensaje(s) en el almacÃn de 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 "NO COINCIDENTE"
 
-#: ../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â"
 
@@ -12722,57 +12855,57 @@ msgstr "Crear carpeta"
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
 
-#: ../mail/em-format-html.c:385
+#: ../mail/em-format-html.c:383
 msgid "Malformed external-body part"
 msgstr "Parte externa al cuerpo del mensaje mal formada"
 
-#: ../mail/em-format-html.c:417
+#: ../mail/em-format-html.c:415
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a 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 "Puntero a archivo local (%s) vÃlido en el sitio Â%sÂ"
 
-#: ../mail/em-format-html.c:430
+#: ../mail/em-format-html.c:428
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: ../mail/em-format-html.c:449
+#: ../mail/em-format-html.c:447
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntero a 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 "Puntero a datos externos desconocidos (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 "(sin 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 "%s enviÃ este mensaje en nombre de %s"
 
-#: ../mail/em-format-html-display.c:91
+#: ../mail/em-format-html-display.c:89
 msgid "Unsigned"
 msgstr "No firmado"
 
-#: ../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."
@@ -12780,11 +12913,11 @@ msgstr ""
 "Este mensaje no estÃ firmado. No hay garantÃa de que el mensaje sea "
 "autÃntico."
 
-#: ../mail/em-format-html-display.c:92
+#: ../mail/em-format-html-display.c:90
 msgid "Valid signature"
 msgstr "Firma vÃlida"
 
-#: ../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."
@@ -12792,11 +12925,11 @@ msgstr ""
 "Este mensaje estÃ firmado y es vÃlido, lo que significa que es muy probable "
 "que el mensaje sea autÃntico."
 
-#: ../mail/em-format-html-display.c:93
+#: ../mail/em-format-html-display.c:91
 msgid "Invalid signature"
 msgstr "Firma no vÃlida"
 
-#: ../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."
@@ -12804,11 +12937,11 @@ msgstr ""
 "La firma de este mensaje no se puede verificar, pudo haber sido alterada en "
 "trÃnsito."
 
-#: ../mail/em-format-html-display.c:94
+#: ../mail/em-format-html-display.c:92
 msgid "Valid signature, but cannot verify sender"
 msgstr "Firma vÃlida, pero no se puede verificar el 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."
@@ -12816,11 +12949,11 @@ msgstr ""
 "Este mensaje estÃ firmado con una firma vÃlida, pero el remitente del "
 "mensaje no se pudo verificar."
 
-#: ../mail/em-format-html-display.c:95
+#: ../mail/em-format-html-display.c:93
 msgid "Signature exists, but need public key"
 msgstr "La firma existe pero se necesita la clave 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."
@@ -12828,11 +12961,11 @@ msgstr ""
 "Este mensaje estÃ firmado con una firma pero no existe una clave pÃblica "
 "correspondiente."
 
-#: ../mail/em-format-html-display.c:102
+#: ../mail/em-format-html-display.c:100
 msgid "Unencrypted"
 msgstr "Descifrado"
 
-#: ../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."
@@ -12840,11 +12973,11 @@ msgstr ""
 "Este mensaje no estÃ cifrado. Su contenido puede verse en 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 "Cifrado, 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 "
@@ -12854,11 +12987,11 @@ msgstr ""
 "ser difÃcil, pero no imposible para un espÃa ver el contenido de este "
 "mensaje empleando algo de tiempo."
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:102
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: ../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."
@@ -12866,11 +12999,11 @@ msgstr ""
 "Este mensaje estÃ cifrado. SerÃa difÃcil para un espÃa ver el contenido de "
 "este mensaje."
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:103
 msgid "Encrypted, strong"
 msgstr "Cifrado, fuerte"
 
-#: ../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 "
@@ -12880,23 +13013,23 @@ msgstr ""
 "difÃcil que un espÃa vea el contenido de este mensaje en empleando un tiempo "
 "razonable."
 
-#: ../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 "_Ver certificado"
 
-#: ../mail/em-format-html-display.c:288
+#: ../mail/em-format-html-display.c:286
 msgid "This certificate is not viewable"
 msgstr "Certificado no es visible"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:947
 msgid "Completed on"
 msgstr "Completado en"
 
-#: ../mail/em-format-html-display.c:961
+#: ../mail/em-format-html-display.c:959
 msgid "Overdue:"
 msgstr "Atrasado:"
 
-#: ../mail/em-format-html-display.c:969
+#: ../mail/em-format-html-display.c:967
 msgid "by"
 msgstr "por"
 
@@ -12921,81 +13054,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 "_Suscribirse"
 
-#: ../mail/em-subscription-editor.c:879
+#: ../mail/em-subscription-editor.c:878
 msgid "Su_bscribe To Shown"
 msgstr "_Suscribirse a los mostrados"
 
-#: ../mail/em-subscription-editor.c:887
+#: ../mail/em-subscription-editor.c:886
 msgid "Subscribe To _All"
 msgstr "S_uscribirse a todo"
 
-#: ../mail/em-subscription-editor.c:987 ../mail/em-subscription-editor.c:1840
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../mail/em-subscription-editor.c:986 ../mail/em-subscription-editor.c:1844
+#: ../modules/mail/e-mail-shell-view-actions.c:1363
 msgid "_Unsubscribe"
 msgstr "Des_uscribir"
 
-#: ../mail/em-subscription-editor.c:996
+#: ../mail/em-subscription-editor.c:995
 msgid "Unsu_bscribe From Hidden"
 msgstr "_Desuscribirse de los ocultos"
 
-#: ../mail/em-subscription-editor.c:1004
+#: ../mail/em-subscription-editor.c:1003
 msgid "Unsubscribe From _All"
 msgstr "Desuscribirse de _todo"
 
-#: ../mail/em-subscription-editor.c:1675
+#: ../mail/em-subscription-editor.c:1679
 msgid "Folder Subscriptions"
 msgstr "Suscripciones de carpetas"
 
-#: ../mail/em-subscription-editor.c:1715
+#: ../mail/em-subscription-editor.c:1719
 msgid "_Account:"
 msgstr "_Cuenta:"
 
-#: ../mail/em-subscription-editor.c:1730
+#: ../mail/em-subscription-editor.c:1734
 msgid "Clear Search"
 msgstr "Limpiar bÃsqueda"
 
-#: ../mail/em-subscription-editor.c:1748
+#: ../mail/em-subscription-editor.c:1752
 msgid "Sho_w items that contain:"
 msgstr "SÃlo _mostrar elementos que contengan:"
 
-#: ../mail/em-subscription-editor.c:1793
+#: ../mail/em-subscription-editor.c:1797
 msgid "Subscribe to the selected folder"
 msgstr "Suscribirse a la carpeta seleccionada"
 
-#: ../mail/em-subscription-editor.c:1794
+#: ../mail/em-subscription-editor.c:1798
 msgid "Su_bscribe"
 msgstr "_Suscribirse"
 
-#: ../mail/em-subscription-editor.c:1839
-#: ../modules/mail/e-mail-shell-view-actions.c:1322
+#: ../mail/em-subscription-editor.c:1843
+#: ../modules/mail/e-mail-shell-view-actions.c:1365
 msgid "Unsubscribe from the selected folder"
 msgstr "Desuscribirse de la carpeta seleccionada"
 
-#: ../mail/em-subscription-editor.c:1879
+#: ../mail/em-subscription-editor.c:1883
 msgid "Collapse all folders"
 msgstr "Contraer todas las carpetas"
 
-#: ../mail/em-subscription-editor.c:1880
+#: ../mail/em-subscription-editor.c:1884
 msgid "C_ollapse All"
 msgstr "Contraer t_odas"
 
-#: ../mail/em-subscription-editor.c:1890
+#: ../mail/em-subscription-editor.c:1894
 msgid "Expand all folders"
 msgstr "Expandir todas las carpetas"
 
-#: ../mail/em-subscription-editor.c:1891
+#: ../mail/em-subscription-editor.c:1895
 msgid "E_xpand All"
 msgstr "E_xpandir todas"
 
-#: ../mail/em-subscription-editor.c:1901
+#: ../mail/em-subscription-editor.c:1905
 msgid "Refresh the folder list"
 msgstr "Actualizar la lista de carpetas"
 
-#: ../mail/em-subscription-editor.c:1913
+#: ../mail/em-subscription-editor.c:1917
 msgid "Stop the current operation"
 msgstr "Detener la operaciÃn de correo"
 
@@ -13003,23 +13136,23 @@ msgstr "Detener la operaciÃn de correo"
 #. * 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 quiere abrir %d mensaje a la vez?"
 msgstr[1] "ÂEstÃ seguro de que quiere abrir %d mensajes a la 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 "_No mostrar otra vez este mensaje."
 
-#: ../mail/em-utils.c:320
+#: ../mail/em-utils.c:313
 msgid "Message Filters"
 msgstr "Filtros de mensajes"
 
-#: ../mail/em-utils.c:1004
+#: ../mail/em-utils.c:997
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensajes de %s"
@@ -13434,8 +13567,8 @@ msgstr ""
 msgid "Importing Elm data"
 msgstr "Importando datos de 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"
@@ -13449,19 +13582,19 @@ msgid "Import mail from Elm."
 msgstr "Importar correo de 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 "Carpeta 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 carpeta"
 
 #: ../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 "Seleccione la carpeta en la que importar"
 
@@ -13490,8 +13623,8 @@ msgstr "Importando buzÃn 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Â"
@@ -13501,20 +13634,19 @@ msgstr "Importando Â%sÂ"
 msgid "Scanning %s"
 msgstr "Analizando %s"
 
-#: ../mail/importers/pine-importer.c:262
+#: ../mail/importers/pine-importer.c:253
 msgid "Importing Pine data"
 msgstr "Importando datos de Pine"
 
-#: ../mail/importers/pine-importer.c:467
-#: ../modules/addressbook/addressbook-config.c:1115
+#: ../mail/importers/pine-importer.c:458
 msgid "Address Book"
 msgstr "Libreta de direcciones"
 
-#: ../mail/importers/pine-importer.c:515
+#: ../mail/importers/pine-importer.c:506
 msgid "Evolution Pine importer"
 msgstr "Importador de Pine de Evolution"
 
-#: ../mail/importers/pine-importer.c:516
+#: ../mail/importers/pine-importer.c:507
 msgid "Import mail from Pine."
 msgstr "Importar correo de Pine."
 
@@ -13585,94 +13717,76 @@ msgid "Header content"
 msgstr "Contenido de la cabecera"
 
 #: ../mail/mail-config.ui.h:5
-msgid "_Add Signature"
-msgstr "_AÃadir firma"
-
-#: ../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 ""
-"La salida de este script se usarÃ como su firma. \n"
-"El nombre que especifique se usarÃ Ãnicamente \n"
-"para mostrarlo por pantalla. "
-
-#: ../mail/mail-config.ui.h:10
-msgid "_Script:"
-msgstr "_Script:"
-
-#: ../mail/mail-config.ui.h:11
 msgid "Default Behavior"
 msgstr "Comportamiento predeterminado"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:6
 msgid "For_mat messages in HTML"
 msgstr "Formatear _mensajes en HTML"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:7
 msgid "Automatically insert _emoticon images"
 msgstr "Insertar imÃgenes de _emoticonos automÃticamente"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:8
 msgid "Always request rea_d receipt"
 msgstr "Siempre _solicitar confirmaciÃn de lectura"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:9
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Codificar nombres de archivo de la forma _Outlook/GMail"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:10
 msgid "Ch_aracter encoding:"
 msgstr "C_odificacioÌn de caracteres:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:11
 msgid "Replies and Forwards"
 msgstr "Respuestas y reenvÃos"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:12
 msgid "_Reply style:"
 msgstr "Estilo de _respuesta:"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:13
 msgid "_Forward style:"
 msgstr "_Estilo de reenvÃo:"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:14
 msgid "Start _typing at the bottom on replying"
 msgstr "Comenzar a _escribir en la parte final al responder"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:15
 msgid "_Keep signature above the original message on replying"
 msgstr "_Mantener la firma por encima del mensaje original al responder"
 
-#: ../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 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 "Responder al gr_upo sÃlo envÃa a la lista de correo, si es posible"
 
-#: ../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 mensajes digitalmente cuando el mensaje original esteÌ firmado (PGP o "
 "S/MIME)"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:20
 msgid "Sig_natures"
 msgstr "_Firmas"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:21
 msgid "Signatures"
 msgstr "Firmas"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:22
 msgid "_Languages"
 msgstr "_Idiomas"
 
-#: ../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."
@@ -13680,28 +13794,28 @@ msgstr ""
 "La lista de idiomas de aquÃ refleja Ãnicamente los idiomas para los cuÃles "
 "hay instalado un diccionario."
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:24
 msgid "Languages Table"
 msgstr "Tabla de idiomas"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:26
 msgid "Check spelling while I _type"
 msgstr "Comprobar orto_grafÃa mientras se escribe"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:27
 msgid "Color for _misspelled words:"
 msgstr "Color para las palabras _mal escritas:"
 
-#: ../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 "Elija un color"
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:29
 msgid "Spell Checking"
 msgstr "OrtografÃa"
 
-#: ../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:"
@@ -13710,621 +13824,356 @@ msgstr ""
 "confirmaciÃn antes de realizar las siguientes acciones 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 "Enviando un correo con una lÃnea de asunto _vacÃa"
 
 #. 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 "Enviando la respuesta sÃlo a los destinatarios definidos en _Cco"
 
 #. 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 "Enviando una respuesta priva_da a una 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 "Enviando la respuesta a un gran _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 ""
 "Permitir a una li_sta de correo redireccionar una respuesta privada a la "
 "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 ""
 "Enviando un mensaje con destinata_rios no introducidos como direcciones de "
 "correo"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:43
 msgid "Confirmations"
 msgstr "Confirmaciones"
 
-#: ../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 "am"
 
-#: ../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 "por"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:51
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Adjunto"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:52
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "En liÌnea (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 "No entrecomillar"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:55
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "En lÃnea"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:56
 msgid "Proxy Settings"
 msgstr "Ajustes del proxy"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:57
 msgid "_Use system defaults"
 msgstr "_Usar los valores predeterminados del 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 del 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 _seguro:"
 
-#: ../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 "Sin _proxy 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 "Puerto:"
 
-#: ../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 "_Usuario:"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:67
 msgid "Pass_word:"
 msgstr "_ContraseÃa:"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:68
 msgid "Start up"
 msgstr "Inicio"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:69
 msgid "Check for new _messages on start"
 msgstr "Comprobar si hay mensajes _nuevos al inicio"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:70
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Comprobar si hay _mensajes nuevos en todas las cuentas activas"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:71
 msgid "Message Display"
 msgstr "Mostrado de mensajes"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:72
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar las mismas tipografÃas que en otras aplicaciones"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:73
 msgid "S_tandard Font:"
 msgstr "TipografÃa _estÃndar:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:74
 msgid "Select HTML fixed width font"
 msgstr "Selecciona letra de anchura fija para HTML"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:75
 msgid "Select HTML variable width font"
 msgstr "Selecciona letra de anchura variable en HTML"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:76
 msgid "Fix_ed Width Font:"
 msgstr "TipografÃa de anchura _fija:"
 
 # Esta cadena debe permanecer asÃ
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:77
 msgid "Highlight _quotations with"
 msgstr "Resaltar texto _citado con este color:"
 
 # Esta traducciÃn debe mantenerse asÃ
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:78
 msgid "color"
 msgstr "color"
 
-#: ../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 los mismos ajustes de _vista a todas las carpetas"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:81
 msgid "F_all back to threading messages by subject"
 msgstr "Agrupar los mensajes por _asunto"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:82
 msgid "Delete Mail"
 msgstr "Eliminar correo-e"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:83
 msgid "Empty trash folders on e_xit"
 msgstr "Vaciar _papelera al salir"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:84
 msgid "Confirm _when expunging a folder"
 msgstr "_Confirmar antes de purgar una carpeta"
 
 #. 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 "_Mostrar las imÃgenes 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 "_Preguntar al enviar mensajes en HTML a contactos que no los quieren"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:88
 msgid "Loading Images"
 msgstr "Cargando imÃgenes"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:89
 msgid "_Never load images from the Internet"
 msgstr "_Nunca cargar imÃgenes desde Internet"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:90
 msgid "_Load images only in messages from contacts"
 msgstr "Cargar i_mÃgenes en los mensajes de mis contactos"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:91
 msgid "_Always load images from the Internet"
 msgstr "_Siempre cargar las imÃgenes desde Internet"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:92
 msgid "HTML Messages"
 msgstr "Mensajes 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 "Foto del 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 la foto del remitente en la vista previa del mensaje"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:96
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Bu_scar la foto del remitente sÃlo en libretas de direcciones locales"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:97
 msgid "Displayed Message Headers"
 msgstr "Cabeceras mostradas del mensaje"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:98
 msgid "Mail Headers Table"
 msgstr "Tabla de cabeceras de correo"
 
-#: ../mail/mail-config.ui.h:106
-#: ../modules/addressbook/autocompletion-config.c:188
+#: ../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 de la fecha y hora"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:101
 msgid "Check incoming _messages for junk"
 msgstr "Comprobar si los _mensajes entrantes son basura"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:102
 msgid "Delete junk messages on e_xit"
 msgstr "Eliminar los mensajes SPAM al _salir"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:103
 msgid "Check cu_stom headers for junk"
 msgstr "Compro_bar las cabeceras personalizadas contra SPAM"
 
-#: ../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 ""
 "_No marcar los mensajes como basura si el remitente estÃ en mi libreta de "
 "direcciones"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:105
 msgid "_Lookup in local address book only"
 msgstr "_Buscar sÃlo en la libreta de direcciones local"
 
-#: ../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 ""
 "Esta opciÃn se omitirÃ si se encuentra alguna coincidencia para una cabecera "
 "de SPAM personalizada."
 
-#: ../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 "Sin 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 "Carpetas especiales"
-
-#: ../mail/mail-config.ui.h:119
-msgid "Drafts _Folder:"
-msgstr "Carpeta de _borradores:"
-
-#: ../mail/mail-config.ui.h:120
-msgid "Sent _Messages Folder:"
-msgstr "Carpeta de _mensajes enviados:"
-
-#: ../mail/mail-config.ui.h:121
-msgid "_Trash Folder:"
-msgstr "Carpeta de p_apelera:"
-
-#: ../mail/mail-config.ui.h:122
-msgid "_Junk Folder:"
-msgstr "Carpeta de _SPAM:"
-
-#: ../mail/mail-config.ui.h:123
-msgid "Composing Messages"
-msgstr "Redactar mensajes"
-
-#: ../mail/mail-config.ui.h:124
-msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "Siempre enviar copia de carbÃn _oculta (Cco) a:"
+#: ../mail/mail-dialogs.ui.h:1
+msgid "Search Folder Sources"
+msgstr "OrÃgenes de las carpetas de bÃsqueda"
 
-#: ../mail/mail-config.ui.h:125
-msgid "Alway_s carbon-copy (cc) to:"
-msgstr "Siempre enviar _copia de carbÃn (Cc) a:"
+#: ../mail/mail-dialogs.ui.h:2
+msgid "All local folders"
+msgstr "Todas las carpetas locales"
 
-#: ../mail/mail-config.ui.h:126
-msgid "Message Receipts"
-msgstr "Destinatarios del mensaje"
+#: ../mail/mail-dialogs.ui.h:3
+msgid "All active remote folders"
+msgstr "Todas las carpetas remotas activas"
 
-#: ../mail/mail-config.ui.h:127
-msgid "S_end message receipts:"
-msgstr "_Enviar confirmaciones de mensajes:"
+#: ../mail/mail-dialogs.ui.h:4
+msgid "All local and active remote folders"
+msgstr "Todas las carpetas locales y remotas activas"
 
-#: ../mail/mail-config.ui.h:128
-msgid "Account Information"
-msgstr "InformaciÃn de la cuenta"
+#: ../mail/mail-dialogs.ui.h:5
+msgid "Specific folders"
+msgstr "Carpetas especÃficas"
 
-#: ../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 ""
-"Teclee el nombre por el que quiere identificar a esta cuenta.\n"
-"Por ejemplo: ÂTrabajoÂ o ÂPersonalÂ"
+"Los mensajes que ha seleccionado para seguir se listan abajo.\n"
+"Seleccione una acciÃn de seguimiento desde el menÃ ÂMarcarÂ."
 
-#: ../mail/mail-config.ui.h:131
-msgid "Required Information"
-msgstr "InformaciÃn requerida"
+#: ../mail/mail-dialogs.ui.h:8
+msgid "_Flag:"
+msgstr "_Marca:"
 
-#: ../mail/mail-config.ui.h:132
-msgid "Email _Address:"
-msgstr "Dir_ecciÃn de correo-e:"
+#: ../mail/mail-dialogs.ui.h:9
+msgid "_Due By:"
+msgstr "_Vence el:"
 
-#: ../mail/mail-config.ui.h:133
-msgid "Full Nam_e:"
-msgstr "Nombre co_mpleto:"
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:11
+msgid "Co_mpleted"
+msgstr "_Terminado"
 
-#: ../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 "Llamar"
 
-#: ../mail/mail-config.ui.h:135
-msgid "Signat_ure:"
-msgstr "_Firma:"
+#: ../mail/mail-dialogs.ui.h:13
+msgid "Do Not Forward"
+msgstr "No reenviar"
 
-#: ../mail/mail-config.ui.h:136
-msgid "Add Ne_w Signature..."
-msgstr "AÃadir firma _nuevaâ"
+#: ../mail/mail-dialogs.ui.h:14
+msgid "Follow-Up"
+msgstr "Seguimiento"
 
-#: ../mail/mail-config.ui.h:137
-msgid "Or_ganization:"
-msgstr "Organi_zaciÃn:"
+#: ../mail/mail-dialogs.ui.h:15
+msgid "For Your Information"
+msgstr "Para su informaciÃ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 "_Hacer que Ãsta sea mi cuenta predeterminada"
-
-#: ../mail/mail-config.ui.h:140
-msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr ""
-"No _firmar las solicitudes de reuniÃn (para compatibilidad con 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 de c_lave GPG/PGP:"
-
-#: ../mail/mail-config.ui.h:143
-msgid "Si_gning algorithm:"
-msgstr "Algoritmo de _firma:"
-
-#: ../mail/mail-config.ui.h:144
-msgid "Al_ways sign outgoing messages when using this account"
-msgstr "_Firmar siempre los mensajes salientes cuando se use esta cuenta"
-
-#: ../mail/mail-config.ui.h:145
-msgid "Always encrypt to _myself when sending encrypted messages"
-msgstr "Siempre cifrar a _mÃ mismo cuando envÃe correo cifrado"
-
-#: ../mail/mail-config.ui.h:146
-msgid "Always _trust keys in my keyring when encrypting"
-msgstr "Siempre _confiar en las claves de mi almacÃn al 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 "TambiÃn cifrar a _mÃ mismo cuando envÃe correo cifrado"
-
-#: ../mail/mail-config.ui.h:149
-msgid "Encrypt out_going messages (by default)"
-msgstr "Cifrar mensajes _salientes (por omisiÃn)"
-
-#: ../mail/mail-config.ui.h:150
-msgid "Digitally sign o_utgoing messages (by default)"
-msgstr "Firmar digitalmente los mensajes s_alientes (por omisiÃn)"
-
-#: ../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 _firma:"
-
-#: ../mail/mail-config.ui.h:153
-msgid "S_elect..."
-msgstr "S_eleccionarâ"
-
-#: ../mail/mail-config.ui.h:154
-msgid "Clea_r"
-msgstr "Vacia_r"
-
-#: ../mail/mail-config.ui.h:155
-msgid "Signing _algorithm:"
-msgstr "_Algoritmo de firma:"
-
-#: ../mail/mail-config.ui.h:157
-msgid "Cle_ar"
-msgstr "_Vaciar"
-
-#: ../mail/mail-config.ui.h:158
-msgid "Server _Type:"
-msgstr "_Tipo de servidor:"
-
-#: ../mail/mail-config.ui.h:160
-msgid "description"
-msgstr "descripciÃ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 "_Usuario:"
-
-#: ../mail/mail-config.ui.h:165
-msgid "Mailbox location"
-msgstr "DirecciÃn del buzÃn"
-
-#: ../mail/mail-config.ui.h:167
-msgid "_Use secure connection:"
-msgstr "Usar _conexiÃn segura:"
-
-#: ../mail/mail-config.ui.h:168
-msgid "SSL is not supported in this build of Evolution"
-msgstr "Esta compilaciÃn de Evolution no soporta SSL"
-
-#: ../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 "C_omprobar tipos soportados"
-
-#: ../mail/mail-config.ui.h:171
-msgid "Re_member password"
-msgstr "_Recordar contraseÃa"
-
-#: ../mail/mail-config.ui.h:172
-msgid "Server Configuration"
-msgstr "ConfiguraciÃn del servidor"
-
-#: ../mail/mail-config.ui.h:173 ../modules/addressbook/ldap-config.ui.h:13
-msgid "_Port:"
-msgstr "_Puerto:"
-
-#: ../mail/mail-config.ui.h:174
-msgid "Ser_ver requires authentication"
-msgstr "El ser_vidor requiere 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 "_Nombre de usuario:"
-
-#: ../mail/mail-config.ui.h:178
-msgid "Remember _password"
-msgstr "Recordar contrase_Ãa"
-
-#: ../mail/mail-config.ui.h:179
-msgid "Personal Details:"
-msgstr "Detalles personales:"
-
-#: ../mail/mail-config.ui.h:188
-msgid "Encryption:"
-msgstr "Cifrado:"
-
-#: ../mail/mail-config.ui.h:189
-msgid "none"
-msgstr "ninguna"
-
-#: ../mail/mail-config.ui.h:190
-msgid "label"
-msgstr "etiqueta"
-
-#: ../mail/mail-dialogs.ui.h:1
-msgid "Search Folder Sources"
-msgstr "OrÃgenes de las carpetas de bÃsqueda"
-
-#: ../mail/mail-dialogs.ui.h:2
-msgid "All local folders"
-msgstr "Todas las carpetas locales"
-
-#: ../mail/mail-dialogs.ui.h:3
-msgid "All active remote folders"
-msgstr "Todas las carpetas remotas activas"
-
-#: ../mail/mail-dialogs.ui.h:4
-msgid "All local and active remote folders"
-msgstr "Todas las carpetas locales y remotas activas"
-
-#: ../mail/mail-dialogs.ui.h:5
-msgid "Specific folders"
-msgstr "Carpetas especÃficas"
-
-#: ../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 ""
-"Los mensajes que ha seleccionado para seguir se listan abajo.\n"
-"Seleccione una acciÃn de seguimiento desde el menÃ ÂMarcarÂ."
-
-#: ../mail/mail-dialogs.ui.h:8
-msgid "_Flag:"
-msgstr "_Marca:"
-
-#: ../mail/mail-dialogs.ui.h:9
-msgid "_Due By:"
-msgstr "_Vence el:"
-
-#. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:11
-msgid "Co_mpleted"
-msgstr "_Terminado"
-
-#: ../mail/mail-dialogs.ui.h:12
-msgid "Call"
-msgstr "Llamar"
-
-#: ../mail/mail-dialogs.ui.h:13
-msgid "Do Not Forward"
-msgstr "No reenviar"
-
-#: ../mail/mail-dialogs.ui.h:14
-msgid "Follow-Up"
-msgstr "Seguimiento"
-
-#: ../mail/mail-dialogs.ui.h:15
-msgid "For Your Information"
-msgstr "Para su informaciÃn"
-
-#: ../mail/mail-dialogs.ui.h:16
-msgid "Forward"
-msgstr "Reenviar"
+#: ../mail/mail-dialogs.ui.h:16
+msgid "Forward"
+msgstr "Reenviar"
 
 #: ../mail/mail-dialogs.ui.h:17
 msgid "No Response Necessary"
@@ -14566,7 +14415,7 @@ msgstr ""
 "todas las carpetas?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
+#: ../modules/mail/e-mail-shell-view-actions.c:1258
 msgid "_Empty Trash"
 msgstr "_Vaciar papelera"
 
@@ -14768,39 +14617,15 @@ msgid "Do _Not Disable"
 msgstr "_No 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 "No es posible guardar el archivo de firma."
-
-#: ../mail/mail.error.xml.h:89
-msgid "Cannot set signature script \"{0}\"."
-msgstr "No se puede establecer el script de firma Â{0}Â."
-
-#: ../mail/mail.error.xml.h:90
-msgid "The script file must exist and be executable."
-msgstr "El archivo de script debe existir y ser ejecutable."
-
-#: ../mail/mail.error.xml.h:91
-msgid "Do you wish to save your changes?"
-msgstr "ÂDesea guardar los cambios?"
-
-#: ../mail/mail.error.xml.h:92
-msgid "This signature has been changed, but has not been saved."
-msgstr "Esta firma ha cambiado, pero no ha sido guardada."
-
-#: ../mail/mail.error.xml.h:93
-msgid "_Discard changes"
-msgstr "_Descartar los cambios"
-
-#: ../mail/mail.error.xml.h:94
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "No se puede editar la carpeta de bÃsqueda Â{0}Â ya que no 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."
@@ -14809,39 +14634,39 @@ msgstr ""
 "vaya al editor de carpetas de bÃsqueda para aÃadirla explÃcitamente, si es "
 "necesario."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:91
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "No se puede aÃadir la carpeta de bÃsqueda Â{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 "Ya existe una carpeta llamada Â{0}Â. Use un nombre diferente."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:93
 msgid "Search Folders automatically updated."
 msgstr "Carpetas de bÃsqueda autoactualizadas."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:94
 msgid "Mail filters automatically updated."
 msgstr "Filtros de correo actualizados automÃticamente."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:95
 msgid "Missing folder."
 msgstr "Falta la carpeta."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:96
 msgid "You must specify a folder."
 msgstr "Debe especificar una carpeta."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:98
 msgid "You must name this Search Folder."
 msgstr "Debe dar un nombre a esta carpeta de bÃsqueda."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:99
 msgid "No sources selected."
 msgstr "No se ha seleccionado ningÃn origen."
 
-#: ../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 "
@@ -14851,11 +14676,11 @@ msgstr ""
 "HÃgalo seleccionando las carpetas individualmente, y/o seleccionando todas "
 "las carpetas locales, todas las carpetas remotas, o ambas."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:102
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problema al migrar la carpeta antigua de correo Â{0}Â."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:103
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -14867,23 +14692,23 @@ msgstr ""
 "Puede elegir ignorar esta carpeta, sobreescribirla o aÃadir su contenido, o "
 "salir."
 
-#: ../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 "_Sobreescribir"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:108
 msgid "_Append"
 msgstr "_Agregar"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:109
 msgid "Evolution's local mail format has changed."
 msgstr "El formato de correo local de Evolution ha cambiado"
 
-#: ../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 "
@@ -14901,19 +14726,19 @@ msgstr ""
 "eliminarla despuÃs de asegurarse que sus datos se han migrado correctamente. "
 "AsegÃrese de que existe espacio suficiente si elige migrar."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:113
 msgid "_Exit Evolution"
 msgstr "_Salir de Evolution"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:114
 msgid "_Migrate Now"
 msgstr "_Migrar ahora"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:115
 msgid "Unable to read license file."
 msgstr "No es posible leer el archivo de licencia."
 
-#: ../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."
@@ -14922,60 +14747,60 @@ msgstr ""
 "instalaciÃn. No podrÃ usar este proveedor hasta que pueda aceptar esta "
 "licencia."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:117
 msgid "Please wait."
 msgstr "Por favor espere."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:118
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Se estÃ consultando al servidor por una lista de mecanismos de autenticaciÃn "
 "soportados."
 
-#: ../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 ""
 "FallÃ al consultar al servidor para la lista de mecanismos de autenticaciÃn "
 "soportados."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:120
 msgid "Unable to connect to the GroupWise server."
 msgstr "No es posible conectarse con el servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:121
 msgid "Please check your account settings and try again."
 msgstr "Compruebe su configuraciÃn de la cuenta e intÃntelo otra vez."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:122
 msgid "Synchronize folders locally for offline usage?"
 msgstr "ÂSincronizar las carpetas localmente para usarse sin 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?"
 msgstr ""
 "ÂQuiere sincronizar localmente las carpetas marcadas para uso en desconexiÃn?"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:124
 msgid "Do _Not Synchronize"
 msgstr "_No 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 "ÂQuiere marcar todos los mensajes como leÃdos?"
 
-#: ../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 ""
 "Esto marcarÃ todos los mensajes como leÃdos en la carpeta seleccionada."
 
-#: ../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."
@@ -14983,66 +14808,47 @@ msgstr ""
 "Esto marcarÃ todos los mensajes como leÃdos en la carpeta seleccionada y sus "
 "subcarpetas."
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:129
 msgid "Close message window."
 msgstr "Cerrar la ventana de mensaje."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:130
 msgid "Would you like to close the message window?"
 msgstr "ÂQuiere seleccionar la ventana de mensaje?"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:131
 msgid "_Yes"
 msgstr "_SÃ"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:132
 msgid "_No"
 msgstr "_No"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:133
 msgid "_Always"
 msgstr "_Siempre"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:134
 msgid "N_ever"
 msgstr "_Nunca"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:135
 msgid "Copy folder in folder tree."
 msgstr "Copiar carpeta en el Ãrbol de carpetas."
 
-#: ../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 "ÂEstÃ seguro de que quiere copiar la carpeta Â{0}Â a Â{1}Â?"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:137
 msgid "Move folder in folder tree."
 msgstr "Mover carpeta en el Ãrbol de carpetas."
 
-#: ../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 quiere mover la carpeta Â{0}Â a Â{1}Â?"
 
-#: ../mail/mail.error.xml.h:145
-msgid "Signature Already Exists"
-msgstr "La firma ya existe"
-
-#: ../mail/mail.error.xml.h:146
-msgid ""
-"A signature already exists with the name \"{0}\". Please specify a different "
-"name."
-msgstr ""
-"Ya existe una firma con el nombre Â{0}Â. Especifique un nombre diferente."
-
-#: ../mail/mail.error.xml.h:147
-msgid "Blank Signature"
-msgstr "Firma en blanco"
-
-#: ../mail/mail.error.xml.h:148
-msgid "Please provide an unique name to identify this signature."
-msgstr "Introduzca un nombre Ãnico para identificar esta firma."
-
-#: ../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"
@@ -15050,84 +14856,84 @@ msgstr ""
 "El mensaje no puede enviarse porque la cuenta con la que eligiÃ enviar no "
 "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 la cuenta o envÃe usando otra cuenta."
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:141
 msgid "Mail Deletion Failed"
 msgstr "Ha fallado el borrado del 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 "No tiene suficientes permisos para eliminar este correo."
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:143
 msgid "\"Check Junk\" Failed"
 msgstr "FallÃ la comprobaciÃn de SPAM"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:144
 msgid "\"Report Junk\" Failed"
 msgstr "FallÃ al informar de que es SPAM"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:145
 msgid "\"Report Not Junk\" Failed"
 msgstr "FallÃ al informar de que no es SPAM"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:146
 msgid "Remove duplicate messages?"
 msgstr "ÂQuitar mensajes duplicados?"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:147
 msgid "No duplicate messages found."
 msgstr "No se encontrÃ ningÃn correo duplicado."
 
 #. 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 "La carpeta Â{0}Â no contiene ningÃn correo duplicado."
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:150
 msgid "Failed to unsubscribe from folder."
 msgstr "FallÃ al desuscribirse de la carpeta."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:152
 msgid "Unable to retrieve message."
 msgstr "No se pudo obtener el mensaje."
 
-#: ../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 "FallÃ al abrir la carpeta."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:155
 msgid "Failed to find duplicate messages."
 msgstr "FallÃ al buscar mensajes duplicados."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:156
 msgid "Failed to retrieve messages."
 msgstr "FalloÌ al obtener los mensajes."
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:157
 msgid "Failed to remove attachments from messages."
 msgstr "FallÃ al quitar los adjuntos de los mensajes."
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:158
 msgid "Failed to download messages for offline viewing."
 msgstr "FallÃ al descargar los mensajes para trabajar sin conexiÃn"
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:159
 msgid "Failed to save messages to disk."
 msgstr "FalloÌ al guardar los mensajes al disco."
 
-#: ../mail/mail.error.xml.h:170
+#: ../mail/mail.error.xml.h:160
 msgid "Hidden file is attached."
 msgstr "Existe un archivo oculto adjunto."
 
-#: ../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."
@@ -15135,43 +14941,47 @@ msgstr ""
 "El adjunto de nombre {0} es un archivo oculto y puede contener datos "
 "sensibles. RevÃselo antes de enviarlo."
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:162
 msgid "Printing failed."
 msgstr "FallÃ al imprimir."
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:163
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "La impresora respondiÃ &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:174
+#: ../mail/mail.error.xml.h:164
 msgid "Could not perform this operation on {0}."
 msgstr "No se puede 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 y recibir correo"
 
-#: ../mail/mail-send-recv.c:552
+#: ../mail/mail-send-recv.c:537
 msgid "Cancel _All"
 msgstr "Cancelar _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 "Esperandoâ"
 
-#: ../mail/mail-send-recv.c:1001
+#: ../mail/mail-send-recv.c:986
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprobando correo nuevo"
 
+#: ../mail/mail-vfolder-ui.c:79
+msgid "Search Folders"
+msgstr "Carpetas de bÃsqueda"
+
 #: ../mail/mail-vfolder-ui.c:159
 msgid "Edit Search Folder"
 msgstr "Editar carpeta de bÃsqueda"
@@ -15226,7 +15036,7 @@ msgstr "?"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:226
+#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:230
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
@@ -15313,122 +15123,30 @@ msgid "Subject or Addresses contains"
 msgstr "El asunto o las direcciones contienen"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1687
+#: ../modules/mail/e-mail-shell-view-actions.c:1730
 msgid "Recipients contain"
 msgstr "El destinatario contiene"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1680
+#: ../modules/mail/e-mail-shell-view-actions.c:1723
 msgid "Message contains"
 msgstr "El mensaje contiene"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1701
+#: ../modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Subject contains"
 msgstr "El asunto contiene"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1694
+#: ../modules/mail/e-mail-shell-view-actions.c:1737
 msgid "Sender contains"
 msgstr "El remitente contiene"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1673
+#: ../modules/mail/e-mail-shell-view-actions.c:1716
 msgid "Body contains"
 msgstr "El cuerpo contiene"
 
-#: ../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 Evolution sÃlo conectarÃ con su "
-"servidor LDAP si su servidor LDAP soporta 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 Evolution sÃlo conectarÃ con su "
-"servidor LDAP si su servidor LDAP soporta 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 su servidor no soporta ni SSL ni TLS. "
-"Esto significa que su conexiÃn serÃ insegura, y que usted serÃ vulnerable a "
-"fallos de seguridad."
-
-#: ../modules/addressbook/addressbook-config.c:649
-msgid "U_se in Birthday & Anniversaries calendar"
-msgstr "U_sar en el calendario CumpleaÃos y aniversarios"
-
-#: ../modules/addressbook/addressbook-config.c:693
-msgid "Copy _book content locally for offline operation"
-msgstr "Copiar la li_breta localmente para trabajar desconectado"
-
-#: ../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 es el puerto del servidor LDAP al que Evolution intentarÃ conectarse. "
-"Se ha proporcionado una lista de puertos estÃndar. Pregunte a su "
-"administrador del sistema quÃ puerto deberÃa especificar."
-
-#: ../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 es el mÃtodo que usarÃ Evolution para autenticarle a usted.  Note que "
-"establecer esto a ÂDirecciÃn de correo-eÂ requiere acceso anÃnimo a su "
-"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 ""
-"El Ãmbito de bÃsqueda define hasta quÃ profundidad desea que la bÃsqueda se "
-"extienda a lo largo de un Ãrbol de carpetas. Un Ãmbito de bÃsqueda de ÂsubÂ "
-"incluirÃ todas las entradas por debajo de su base de bÃsqueda. Un Ãmbito de "
-"ÂunoÂ sÃlo incluirÃ las entradas un nivel bajo su base."
-
-#: ../modules/addressbook/addressbook-config.c:1120
-msgid "Server Information"
-msgstr "InformaciÃn del servidor"
-
-#: ../modules/addressbook/addressbook-config.c:1125
-#: ../smime/gui/smime-ui.ui.h:25
-msgid "Details"
-msgstr "Detalles"
-
-#: ../modules/addressbook/addressbook-config.c:1126
-#: ../modules/mail/e-mail-shell-view.c:58
-msgid "Searching"
-msgstr "BÃsqueda"
-
-#: ../modules/addressbook/addressbook-config.c:1128
-msgid "Downloading"
-msgstr "Descargando"
-
-#: ../modules/addressbook/addressbook-config.c:1346
-msgid "Address Book Properties"
-msgstr "Propiedades de la libreta de direcciones"
-
-#: ../modules/addressbook/addressbook-config.c:1348
-msgid "New Address Book"
-msgstr "Libreta de direcciones nueva"
-
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
 msgid "EFolderList XML for the list of completion URIs"
 msgstr "XML EFolderList para la lista de URI de completado"
@@ -15458,362 +15176,361 @@ 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:194
-#: ../modules/mail/em-mailer-prefs.c:1067
+#: ../modules/addressbook/autocompletion-config.c:96
+#: ../modules/mail/em-mailer-prefs.c:1072
 msgid "_Table column:"
 msgstr "Columna de _tabla:"
 
-#: ../modules/addressbook/autocompletion-config.c:197
+#: ../modules/addressbook/autocompletion-config.c:99
 msgid "Address formatting"
 msgstr "Formateado de direcciones"
 
-#: ../modules/addressbook/autocompletion-config.c:200
+#: ../modules/addressbook/autocompletion-config.c:102
 msgid "_Format address according to standard of its destination country"
 msgstr "_Formatear direcciones segÃn el estÃndar del paÃs de destino"
 
-#: ../modules/addressbook/autocompletion-config.c:209
+#: ../modules/addressbook/autocompletion-config.c:111
 msgid "Autocompletion"
 msgstr "Autocompletado"
 
-#: ../modules/addressbook/autocompletion-config.c:212
+#: ../modules/addressbook/autocompletion-config.c:114
 msgid "Always _show address of the autocompleted contact"
 msgstr "_Siempre mostrar la direcciÃn del contacto autocompletado"
 
-#: ../modules/addressbook/eab-composer-util.c:149
+#: ../modules/addressbook/eab-composer-util.c:148
 msgid "Multiple vCards"
 msgstr "vCards mÃltiples"
 
-#: ../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 de 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 de contacto de %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 "Libreta de direcciones nueva"
 
-#: ../modules/addressbook/e-book-shell-backend.c:309
+#: ../modules/addressbook/e-book-shell-backend.c:238
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: ../modules/addressbook/e-book-shell-backend.c:311
-#: ../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 "Crea un contacto nuevo"
 
-#: ../modules/addressbook/e-book-shell-backend.c:316
+#: ../modules/addressbook/e-book-shell-backend.c:245
 msgctxt "New"
 msgid "Contact _List"
 msgstr "_Lista de contactos"
 
-#: ../modules/addressbook/e-book-shell-backend.c:318
-#: ../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 "Crea una lista de contactos nueva"
 
-#: ../modules/addressbook/e-book-shell-backend.c:326
+#: ../modules/addressbook/e-book-shell-backend.c:255
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Libreta de _direcciones"
 
-#: ../modules/addressbook/e-book-shell-backend.c:328
-#: ../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 "Crea una libreta de direcciones nueva"
 
-#. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:345
-#: ../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:356
+#: ../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 de la libreta de direcciones"
+
 #. 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 "Guardar 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 los 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 el contenido de la libreta de direcciones seleccionada a otra"
 
-#: ../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 la libreta de direcciones"
 
-#: ../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 la libreta de direcciones 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 los 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 los contactos de la libreta de direcciones seleccionada a otra"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:848
+#: ../modules/addressbook/e-book-shell-view-actions.c:820
 msgid "_New Address Book"
 msgstr "Libreta de direcciones _nueva"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:855
+#: ../modules/addressbook/e-book-shell-view-actions.c:827
 msgid "Address _Book Properties"
 msgstr "Propiedades de la _libreta de direcciones"
 
-#: ../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 las propiedades de la libreta de direcciones 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 de la libreta de direcciones"
 
-#: ../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 el mapa con todos los contactos de la libreta de direcciones "
 "seleccionada"
 
-#: ../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:655
-#: ../modules/calendar/e-task-shell-view-actions.c:779
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../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 "_Renombrarâ"
 
-#: ../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 "Renombrar la libreta de direcciones seleccionada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:878
+#: ../modules/addressbook/e-book-shell-view-actions.c:850
 msgid "Stop loading"
 msgstr "Parar la 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 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 los contactos seleccionados a otra libreta de direcciones"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:890
+#: ../modules/addressbook/e-book-shell-view-actions.c:862
 msgid "_Delete Contact"
 msgstr "_Eliminar 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 en el 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 el texto en el contacto mostrado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/addressbook/e-book-shell-view-actions.c:876
 msgid "_Forward Contact..."
 msgstr "_Reenviar 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 los contactos seleccionados a otra persona"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:911
+#: ../modules/addressbook/e-book-shell-view-actions.c:883
 msgid "_Move Contact To..."
 msgstr "_Mover 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 los contactos seleccionados a otra libreta de direcciones"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:918
+#: ../modules/addressbook/e-book-shell-view-actions.c:890
 msgid "_New Contact..."
 msgstr "Contacto _nuevoâ"
 
-#: ../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 nuevaâ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:932
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
 msgid "_Open Contact"
 msgstr "_Abrir 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 el 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 _mensaje al 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 un mensaje a los 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:837
+#: ../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 "A_cciones"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:955
-#: ../modules/calendar/e-memo-shell-view-actions.c:692
-#: ../modules/calendar/e-task-shell-view-actions.c:844
-#: ../modules/mail/e-mail-shell-view-actions.c:1457
+#: ../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:705
-#: ../modules/calendar/e-task-shell-view-actions.c:857
+#: ../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 "_Eliminar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:968
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#: ../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 de la libreta de direcciones"
 
-#: ../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 una ventana 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 en la ventana de vista previa de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1033
-#: ../modules/calendar/e-memo-shell-view-actions.c:762
-#: ../modules/calendar/e-task-shell-view-actions.c:926
-#: ../modules/mail/e-mail-shell-view-actions.c:1583
+#: ../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 la vista previa del contacto bajo la lista de mensajes"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1040
-#: ../modules/calendar/e-memo-shell-view-actions.c:769
-#: ../modules/calendar/e-task-shell-view-actions.c:933
-#: ../modules/mail/e-mail-shell-view-actions.c:1590
+#: ../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 la vista previa del contacto junto a la 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:779
-#: ../modules/calendar/e-task-shell-view-actions.c:950
+#: ../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 "Cualquier 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:786
-#: ../modules/calendar/e-task-shell-view-actions.c:985
+#: ../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 "No coincidente"
 
-#: ../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:796
-#: ../modules/calendar/e-task-shell-view-actions.c:995
-#: ../modules/mail/e-mail-shell-view-actions.c:1666
+#: ../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 "BÃsqueda 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 todos los 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 los contactos que 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 los 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_uardar la libreta de direcciones 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 ""
 "Guardar los contactos de la libreta de direcciones seleccionada como 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 "G_uardar 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 "Guardar los contactos seleccionados como VCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:346
+#: ../modules/addressbook/e-book-shell-view.c:290
 msgid "_Forward Contacts"
 msgstr "_Reenviar contactos"
 
-#: ../modules/addressbook/e-book-shell-view.c:348
+#: ../modules/addressbook/e-book-shell-view.c:292
 msgid "_Forward Contact"
 msgstr "_Reenviar contacto"
 
-#: ../modules/addressbook/e-book-shell-view.c:379
+#: ../modules/addressbook/e-book-shell-view.c:323
 msgid "_Send Message to Contacts"
 msgstr "_Enviar un correo a los contactos"
 
-#: ../modules/addressbook/e-book-shell-view.c:381
+#: ../modules/addressbook/e-book-shell-view.c:325
 msgid "_Send Message to List"
 msgstr "_Enviar un correo a la lista"
 
-#: ../modules/addressbook/e-book-shell-view.c:383
+#: ../modules/addressbook/e-book-shell-view.c:327
 msgid "_Send Message to Contact"
 msgstr "_Enviar un correo al contacto"
 
@@ -15822,10 +15539,12 @@ msgid "Anonymously"
 msgstr "AnÃnimamente"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
 msgid "Using email address"
 msgstr "Usando direcciÃn de correo-e"
 
 #: ../modules/addressbook/ldap-config.ui.h:6
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
 msgid "Using distinguished name (DN)"
 msgstr "Usando Nombre distintivo (DN)"
 
@@ -15843,6 +15562,12 @@ msgstr "Sub"
 msgid "Supported Search Bases"
 msgstr "Bases de bÃsqueda soportadas"
 
+#: ../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 "_Puerto:"
+
 #: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Ser_ver:"
 msgstr "_Servidor:"
@@ -15899,6 +15624,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"
 
@@ -15915,95 +15641,637 @@ msgstr "LÃmite de _descarga:"
 msgid "B_rowse this book until limit reached"
 msgstr "_Examinar esta libreta hasta llegar al final"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:145
-#, c-format
-msgid "Failed to spawn Bogofilter (%s): "
-msgstr "FallÃ al iniciar Bogofilter (%s): "
+#: ../modules/backup-restore/e-mail-config-restore-page.c:167
+#, fuzzy
+#| 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."
+msgid ""
+"You can restore Evolution from a backup file.\n"
+"\n"
+"This will restore all your personal data, settings mail filters, etc."
+msgstr ""
+"Puede restaurar Evolution desde su archivo de respaldo. Puede restaurar "
+"todos los correos, calendarios, tareas, notas, libreta de direcciones. "
+"TambiÃn restaura su configuraciÃn personal, filtros de correo, etc."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:163
-msgid "Failed to stream mail message content to Bogofilter: "
-msgstr "FallÃ al enviar el flujo del contenido de los correos a Bogofilter: "
+#: ../modules/backup-restore/e-mail-config-restore-page.c:182
+#, fuzzy
+#| msgid "Restore from backup"
+msgid "_Restore from a backup file:"
+msgstr "Restaurar desde un respaldo"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:212
-msgid "Bogofilter either crashed or failed to process a mail message"
-msgstr "Bogofilter se colgÃ o fallÃ al procesar un mensaje de correo"
+#: ../modules/backup-restore/e-mail-config-restore-page.c:193
+#, fuzzy
+#| msgid "Choose a file to restore"
+msgid "Choose a backup file to restore"
+msgstr "Elija un archivador para restaurar"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:311
-msgid "Bogofilter Options"
-msgstr "Opciones de Bogofilter"
+#. 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"
+msgid "Restore from Backup"
+msgstr "Restaurar desde un respaldo"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:320
-msgid "Convert message text to _Unicode"
-msgstr "Convertir el texto del correo a _Unicode"
+#: ../modules/backup-restore/evolution-backup-restore.c:217
+msgid "Select name of the Evolution backup file"
+msgstr "Seleccione el nombre de archivo de respaldo Evolution"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:476
-msgid "Bogofilter"
-msgstr "Bogofilter"
+#: ../modules/backup-restore/evolution-backup-restore.c:250
+msgid "_Restart Evolution after backup"
+msgstr "_Reiniciar Evolution despuÃs del respaldo"
 
-#: ../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."
+#: ../modules/backup-restore/evolution-backup-restore.c:277
+msgid "Select name of the Evolution backup file to restore"
 msgstr ""
-"El UID del calendario seleccionado (o ÂprimarioÂ) en la barra lateral de la "
-"vista de ÂCalendarioÂ."
+"Seleccione el nombre del archivo de respaldo de Evolution que restaurar"
 
-#: ../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 ""
-"La zona horaria predeterminada que se usarÃ en las fechas y horas en el "
-"calendario, como una localizaciÃn sin correspondencia en una base de datos "
-"de franjas horarias Olsen, como en \"AmÃrica/Nueva York\"."
+#: ../modules/backup-restore/evolution-backup-restore.c:290
+msgid "_Restart Evolution after restore"
+msgstr "_Reiniciar Evolution despuÃs de la restauraciÃn"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
-msgid "Use the system timezone instead of the timezone selected in Evolution."
-msgstr ""
-"Usar la zona horaria del sistema en lugar de la zona horaria seleccionada en "
-"Evolution."
+#: ../modules/backup-restore/evolution-backup-restore.c:308
+msgid "_Back up Evolution Data..."
+msgstr "Re_spaldar datos de 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 ""
-"Muestra la segunda zona horaria en la Vista diaria, si estÃ establecido. El "
-"valor es similar al usado en la clave ÂtimezoneÂ."
+#: ../modules/backup-restore/evolution-backup-restore.c:310
+msgid "Back up Evolution data and settings to an archive file"
+msgstr "Respaldar los datos y configuraciÃn de Evolution a un archivador"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
-msgid "List of recently used second time zones in a Day View."
-msgstr ""
-"Lista de zonas horarias secundarias recientemente usadas en una Vista diaria."
+#: ../modules/backup-restore/evolution-backup-restore.c:315
+msgid "R_estore Evolution Data..."
+msgstr "R_estaurar datos de Evolutionâ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
-msgid "Maximum number of recently used timezones to remember."
-msgstr "MÃximo nÃmero de zonas horarias usadas recientemente para recordar."
+#: ../modules/backup-restore/evolution-backup-restore.c:317
+msgid "Restore Evolution data and settings from an archive file"
+msgstr "Respaldar y restaurar los datos y la configuraciÃn desde un archivador"
 
-#: ../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 ""
-"MÃximo nÃmero de zonas horarias usadas recientemente para recordar en la "
-"lista Âday_second_zonesÂ."
+#: ../modules/backup-restore/evolution-backup-tool.c:75
+msgid "Back up Evolution directory"
+msgstr "Respaldar la carpeta de Evolution"
 
-#: ../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 si debe mostrar las horas en formato de veinticuatro horas en vez de "
-"usar am/pm."
+#: ../modules/backup-restore/evolution-backup-tool.c:77
+msgid "Restore Evolution directory"
+msgstr "Restaurar la carpeta de Evolution"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr ""
-"El dÃa en que empieza la semana, desde el domingo (0) hasta el sÃbado (6)."
+#: ../modules/backup-restore/evolution-backup-tool.c:79
+msgid "Check Evolution Back up"
+msgstr "Comprobar el respaldo de 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 en la que acaba la jornada laboral, en formato de veinticuatro horas, "
+#: ../modules/backup-restore/evolution-backup-tool.c:81
+msgid "Restart Evolution"
+msgstr "Reiniciar Evolution"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:83
+msgid "With Graphical User Interface"
+msgstr "Con interfaz 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 "Cerrando Evolution"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:315
+msgid "Backing Evolution accounts and settings"
+msgstr "Respaldar las cuentas y la configuraciÃn de Evolution"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:327
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr ""
+"Respaldar los datos de Evolution (correos, contactos, calendario, tareas, "
+"notas)"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:343
+msgid "Back up complete"
+msgstr "Respaldo completado"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:350
+#: ../modules/backup-restore/evolution-backup-tool.c:579
+msgid "Restarting Evolution"
+msgstr "Reiniciando Evolution"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:436
+msgid "Back up current Evolution data"
+msgstr "Respaldar los datos actuales de Evolution"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:444
+msgid "Extracting files from back up"
+msgstr "Extrayendo archivos del respaldo"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:513
+msgid "Loading Evolution settings"
+msgstr "Carga la configuraciÃn de Evolution"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:549
+msgid "Removing temporary back up files"
+msgstr "Eliminando archivos temporales de respaldo"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:561
+msgid "Reloading registry service"
+msgstr ""
+
+#: ../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 "Respaldando a la carpeta %s"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:781
+msgid "Evolution Restore"
+msgstr "Restaurador de Evolution"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:782
+#, c-format
+msgid "Restoring from the folder %s"
+msgstr "Restaurando desde la carpeta %s"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:850
+msgid "Backing up Evolution Data"
+msgstr "Respaldando los datos de Evolution"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:851
+msgid "Please wait while Evolution is backing up your data."
+msgstr "Espere mientras Evolution respalda sus datos."
+
+#: ../modules/backup-restore/evolution-backup-tool.c:853
+msgid "Restoring Evolution Data"
+msgstr "Restaurando los datos de Evolution"
+
+#: ../modules/backup-restore/evolution-backup-tool.c:854
+msgid "Please wait while Evolution is restoring your data."
+msgstr "Espere mientras Evolution restaura sus 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 ""
+"Esto puede llevar un tiempo dependiendo de la cantidad de datos en su cuenta."
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:1
+msgid "Invalid Evolution backup file"
+msgstr "Archivo de respaldo de Evolution no 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 archivo 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 "ÂSeguro que quiere cerrar 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 respaldar sus datos y ajustes, primero debe cerrar Evolution. AsegÃrese "
+"de que guarda todo dato sin guardar antes de proceder."
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Close and Back up Evolution"
+msgstr "Cerrar y respaldar 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 ""
+"ÂEstÃ seguro de que quiere restaurar Evolution desde el archivo 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 sus datos y su configuraciÃn, primero debe cerrar Evolution. "
+"AsegÃrese de que guarda todos los datos que no haya guardado antes de "
+"proceder. Esto eliminarÃ todos sus datos y configuraciÃn actual de Evolution "
+"y los restaurarÃ desde su respaldo."
+
+#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
+msgid "Close and Restore Evolution"
+msgstr "Cerrar y restaurar 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 "No se puede escribir en la carpeta seleccionada."
+
+#: ../modules/bogofilter/evolution-bogofilter.c:145
+#, c-format
+msgid "Failed to spawn Bogofilter (%s): "
+msgstr "FallÃ al iniciar Bogofilter (%s): "
+
+#: ../modules/bogofilter/evolution-bogofilter.c:163
+msgid "Failed to stream mail message content to Bogofilter: "
+msgstr "FallÃ al enviar el flujo del contenido de los correos a Bogofilter: "
+
+#: ../modules/bogofilter/evolution-bogofilter.c:212
+msgid "Bogofilter either crashed or failed to process a mail message"
+msgstr "Bogofilter se colgÃ o fallÃ al procesar un mensaje de correo"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:311
+msgid "Bogofilter Options"
+msgstr "Opciones de Bogofilter"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:320
+msgid "Convert message text to _Unicode"
+msgstr "Convertir el texto del correo a _Unicode"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:476
+msgid "Bogofilter"
+msgstr "Bogofilter"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:442
+#, fuzzy
+#| msgid "S_tandard Font:"
+msgid "Standard LDAP Port"
+msgstr "TipografÃa _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 ""
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:454
+msgid "Microsoft Global Catalog"
+msgstr ""
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:460
+msgid "Microsoft Global Catalog over SSL"
+msgstr ""
+
+#. Page 1
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
+#, fuzzy
+#| msgid "Reconnecting to '%s'"
+msgid "Connecting to LDAP"
+msgstr "ReconectÃndose con Â%sÂ"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
+msgid "Server Information"
+msgstr "InformaciÃn del servidor"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
+#, fuzzy
+#| msgid "(Not Recommended)"
+msgid "StartTLS (recommended)"
+msgstr "(No 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
+#, fuzzy
+#| msgid "Anonymously"
+msgid "Anonymous"
+msgstr "AnÃnimamente"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+#| msgid "Input Methods"
+msgid "Method:"
+msgstr "MÃtodos:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+#, fuzzy
+#| 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."
+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 es el mÃtodo que usarÃ Evolution para autenticarle a usted.  Note que "
+"establecer esto a ÂDirecciÃn de correo-eÂ requiere acceso anÃnimo a su "
+"servidor ldap."
+
+#. Page 2
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
+msgid "Using LDAP"
+msgstr ""
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../modules/mail/e-mail-shell-view.c:58
+msgid "Searching"
+msgstr "BÃsqueda"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
+#, fuzzy
+#| msgid "Search _base:"
+msgid "Search Base:"
+msgstr "_Base de bÃsqueda:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
+msgid "Find Possible Search Bases"
+msgstr "Buscar bases de bÃsqueda posibles"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
+#| msgid "Log Level"
+msgid "One Level"
+msgstr "Un nivel"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:770
+#| msgid "Source"
+msgid "Subtree"
+msgstr "SubaÌrbol"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
+#, fuzzy
+#| msgid "_Search scope:"
+msgid "Search Scope:"
+msgstr "Ã_mbito de bÃsqueda:"
+
+#: ../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 \"sub\" will include all "
+#| "entries below your search base. A search scope of \"one\" will only "
+#| "include the entries one level beneath your base."
+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 ""
+"El Ãmbito de bÃsqueda define hasta quÃ profundidad desea que la bÃsqueda se "
+"extienda a lo largo de un Ãrbol de carpetas. Un Ãmbito de bÃsqueda de ÂsubÂ "
+"incluirÃ todas las entradas por debajo de su base de bÃsqueda. Un Ãmbito de "
+"ÂunoÂ sÃlo incluirÃ las entradas un nivel bajo su base."
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:786
+#, fuzzy
+#| msgid "Search Filter"
+msgid "Search Filter:"
+msgstr "Filtro de bÃsqueda"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:798
+msgid "Downloading"
+msgstr "Descargando"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:819
+#, fuzzy
+#| msgid "_List:"
+msgid "Limit:"
+msgstr "_Lista:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:835
+#, fuzzy
+#| msgid "B_rowse this book until limit reached"
+msgid "Browse until limit is reached"
+msgstr "_Examinar esta libreta hasta llegar al 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
+#, fuzzy
+#| msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
+msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
+msgstr "_Evitar IfMatch (necesario en Apache < 2.2.8)"
+
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:264
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:200
+#, fuzzy
+#| msgid "Choose calendar file"
+msgid "Choose a Calendar"
+msgstr "Elegir un archivo de calendario"
+
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:267
+#, fuzzy
+#| msgid "New Memo List"
+msgid "Choose a Memo List"
+msgstr "Lista de notas nueva"
+
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:270
+#, fuzzy
+#| msgid "Select a Task List"
+msgid "Choose a Task List"
+msgstr "Seleccionar una lista de tareas"
+
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:398
+#, fuzzy, c-format
+#| msgid "GConf error: %s"
+msgid "HTTP Error: %s"
+msgstr "Error de GConf: %s"
+
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:428
+#, fuzzy
+#| msgid "Could not parse PGP message: "
+msgid "Could not parse response"
+msgstr "No se pudo analizar el mensaje PGP: "
+
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:437
+#, fuzzy
+#| msgid "Empty message"
+msgid "Empty response"
+msgstr "Mensaje vacÃo"
+
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:445
+#, fuzzy
+#| msgid "Send reply to sender"
+msgid "Unexpected reply from server"
+msgstr "Responder al remitente"
+
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1032
+#, fuzzy
+#| msgid "Could not find any user calendar."
+msgid "Could not locate user's calendars"
+msgstr "No se pudo encontrar ningÃn calendario del usuario."
+
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1256
+#| msgid "_Path:"
+msgid "Path"
+msgstr "Ruta"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:259
+#, fuzzy
+#| msgid "_Calendars"
+msgid "Find Calendars"
+msgstr "_Calendarios"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:262
+#, fuzzy
+#| msgid "Memo List"
+msgid "Find Memo Lists"
+msgstr "Lista de notas"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:265
+#, fuzzy
+#| msgid "Task List"
+msgid "Find Task Lists"
+msgstr "Lista de tareas"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:283
+#| msgid "_Path:"
+msgid "Path:"
+msgstr "Ruta:"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:289
+msgid "Email:"
+msgstr "Correo-e:"
+
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:294
+#, fuzzy
+#| msgid "Server _handles meeting invitations"
+msgid "Server handles meeting invitations"
+msgstr "El servidor gesti_ona las invitaciones a reuniones"
+
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:73
+#, fuzzy
+#| msgid "Look up in address books"
+msgid "Choose which address books to use."
+msgstr "Buscar en las libretas de direcciones"
+
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
+#, fuzzy
+#| msgid "U_se in Birthday & Anniversaries calendar"
+msgid "Use in Birthdays & Anniversaries calendar"
+msgstr "U_sar en el calendario CumpleaÃos y aniversarios"
+
+#: ../modules/cal-config-google/e-google-chooser-button.c:127
+#, fuzzy
+#| msgid "D_elete Calendar"
+msgid "Default User Calendar"
+msgstr "_Eliminar calendario"
+
+#: ../modules/cal-config-google/e-google-chooser.c:508
+#, fuzzy, c-format
+#| msgid "Enter the password for '%s'"
+msgid "Enter Google password for user '%s'."
+msgstr "Introducir la contraseÃa para Â%sÂ"
+
+#: ../modules/cal-config-google/e-google-chooser.c:525
+msgid "User declined to provide a password"
+msgstr ""
+
+#: ../modules/cal-config-local/evolution-cal-config-local.c:161
+msgid "Use an existing iCalendar (ics) file"
+msgstr ""
+
+#: ../modules/cal-config-local/evolution-cal-config-local.c:186
+#, fuzzy
+#| msgid "iCalendar (.ics)"
+msgid "iCalendar File"
+msgstr "iCalendar (.ics)"
+
+#: ../modules/cal-config-local/evolution-cal-config-local.c:198
+#, fuzzy
+#| msgid "Choose calendar file"
+msgid "Choose an iCalendar file"
+msgstr "Elegir un archivo de calendario"
+
+#: ../modules/cal-config-local/evolution-cal-config-local.c:201
+#, fuzzy
+#| msgid "Fil_e:"
+msgid "File:"
+msgstr "_Archivo:"
+
+#: ../modules/cal-config-local/evolution-cal-config-local.c:216
+#, fuzzy
+#| msgid "Allows Evolution to display text part of limited size"
+msgid "Allow Evolution to update the file"
+msgstr "Permite a Evolution mostrar la parte de texto de tamaÃo limitado"
+
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:224
+msgid "Metric (Celsius, cm, etc)"
+msgstr "MÃtrica (Celsius, cm, etc)"
+
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:227
+msgid "Imperial (Fahrenheit, inches, etc)"
+msgstr "Imperial (Fahrenheit, pulgadas, etc)"
+
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:229
+#| msgid "_Units:"
+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 ""
+"El UID del calendario seleccionado (o ÂprimarioÂ) en la barra lateral de la "
+"vista de ÂCalendarioÂ."
+
+#: ../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 ""
+"La zona horaria predeterminada que se usarÃ en las fechas y horas en el "
+"calendario, como una localizaciÃn sin correspondencia en una base de datos "
+"de franjas horarias Olsen, como en \"AmÃrica/Nueva York\"."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr ""
+"Usar la zona horaria del sistema en lugar de la zona horaria seleccionada en "
+"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 ""
+"Muestra la segunda zona horaria en la Vista diaria, si estÃ establecido. El "
+"valor es similar al usado en la clave ÂtimezoneÂ."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+msgid "List of recently used second time zones in a Day View."
+msgstr ""
+"Lista de zonas horarias secundarias recientemente usadas en una Vista diaria."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+msgid "Maximum number of recently used timezones to remember."
+msgstr "MÃximo nÃmero de zonas horarias usadas recientemente para 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 ""
+"MÃximo nÃmero de zonas horarias usadas recientemente para recordar en la "
+"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 si debe mostrar las horas en formato de veinticuatro 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 ""
+"El dÃa en que empieza la semana, desde el domingo (0) hasta el 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 en la que acaba la jornada laboral, en formato de veinticuatro horas, "
 "de 0 a 23."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
@@ -16290,36 +16558,38 @@ msgstr ""
 "Esto puede tener tres valores posibles. Â0Â para errores. Â1Â para avisos. Â2Â "
 "para mensajes 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:405
+#: ../modules/calendar/e-cal-attachment-handler.c:409
 msgid "Select a Calendar"
 msgstr "Seleccionar un calendario"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:432
+#: ../modules/calendar/e-cal-attachment-handler.c:436
 msgid "Select a Task List"
 msgstr "Seleccionar una lista de tareas"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:442
+#: ../modules/calendar/e-cal-attachment-handler.c:446
 msgid "I_mport to Calendar"
 msgstr "I_mportar al calendario"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:449
+#: ../modules/calendar/e-cal-attachment-handler.c:453
 msgid "I_mport to Tasks"
 msgstr "I_mportar a las tareas"
 
-#: ../modules/calendar/e-calendar-preferences.c:467
-msgid "Selected Calendars for Reminders"
+#: ../modules/calendar/e-calendar-preferences.c:406
+#, fuzzy
+#| msgid "Selected Calendars for Reminders"
+msgid "Selected Calendars for Alarms"
 msgstr "Calendarios seleccionados para recordatorios"
 
-#: ../modules/calendar/e-calendar-preferences.c:891
+#: ../modules/calendar/e-calendar-preferences.c:828
 msgid "Ti_me and date:"
 msgstr "Fecha y _hora:"
 
-#: ../modules/calendar/e-calendar-preferences.c:892
+#: ../modules/calendar/e-calendar-preferences.c:829
 msgid "_Date only:"
 msgstr "SÃlo _fecha:"
 
@@ -16385,7 +16655,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"
 
@@ -16480,6 +16750,10 @@ msgstr "Desplazar la vista mens_ual una semana"
 msgid "Display"
 msgstr "Mostrar"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
+msgid "Task List"
+msgstr "Lista de tareas"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Highlight t_asks due today"
 msgstr "Resaltar _tareas que vencen hoy"
@@ -16539,87 +16813,72 @@ 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 "En la web"
-
-#: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../plugins/calendar-weather/calendar-weather.c:127
-msgid "Weather"
-msgstr "MeteorologÃa"
-
-#: ../modules/calendar/e-cal-shell-backend.c:212
-#: ../modules/calendar/e-cal-shell-migrate.c:66
-msgid "Birthdays & Anniversaries"
-msgstr "CumpleaÃos y aniversarios"
-
-#: ../modules/calendar/e-cal-shell-backend.c:451
+#: ../modules/calendar/e-cal-shell-backend.c:278
+#: ../modules/calendar/e-cal-shell-view-actions.c:191
+msgid "New Calendar"
+msgstr "Calendario nuevo"
+
+#: ../modules/calendar/e-cal-shell-backend.c:287
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Cita"
 
-#: ../modules/calendar/e-cal-shell-backend.c:453
-#: ../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 "Crea una cita nueva"
 
-#: ../modules/calendar/e-cal-shell-backend.c:458
+#: ../modules/calendar/e-cal-shell-backend.c:294
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Cita para todo el _dÃa"
 
-#: ../modules/calendar/e-cal-shell-backend.c:460
+#: ../modules/calendar/e-cal-shell-backend.c:296
 msgid "Create a new all-day appointment"
 msgstr "Crea una cita nueva para todo el dÃa"
 
-#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-backend.c:301
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_ReuniÃn"
 
-#: ../modules/calendar/e-cal-shell-backend.c:467
+#: ../modules/calendar/e-cal-shell-backend.c:303
 msgid "Create a new meeting request"
 msgstr "Crea una solicitud de reuniÃn nueva"
 
-#: ../modules/calendar/e-cal-shell-backend.c:475
+#: ../modules/calendar/e-cal-shell-backend.c:311
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
-#: ../modules/calendar/e-cal-shell-backend.c:477
-#: ../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 "Crea un calendario nuevo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:800
+#: ../modules/calendar/e-cal-shell-backend.c:593
 msgid "Calendar and Tasks"
 msgstr "Calendario y tareas"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:190
+#: ../modules/calendar/e-cal-shell-sidebar.c:209
 msgid "Loading calendars"
 msgstr "Cargando calendarios"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:765
-msgid "_New Calendar..."
-msgstr "Calendario _nuevoâ"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:782
+#: ../modules/calendar/e-cal-shell-sidebar.c:715
 msgid "Calendar Selector"
 msgstr "Selector de calendarios"
 
-#. 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 at %s"
+msgid "Opening calendar '%s'"
 msgstr "Abriendo el 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 del 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 "
@@ -16631,11 +16890,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 acontecimientos 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 elementos"
 
@@ -16645,349 +16904,349 @@ msgstr "Moviendo 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 "acontecimiento"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1213
-#: ../modules/calendar/e-cal-shell-view-memopad.c:219
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:286
-#: ../modules/calendar/e-memo-shell-view-actions.c:539
-#: ../modules/calendar/e-task-shell-view-actions.c:656
+#: ../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 "Guardar como iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1371
-#: ../modules/calendar/e-memo-shell-view-actions.c:620
+#: ../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 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 el calendario seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "Go Back"
 msgstr "Retroceder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "Go Forward"
 msgstr "Avanzar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1401
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "Select today"
 msgstr "Selecciona hoy"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1406
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
 msgid "Select _Date"
 msgstr "Seleccionar _fecha"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1414
 msgid "Select a specific date"
 msgstr "Selecciona una fecha especÃfica"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1413
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "_New Calendar"
 msgstr "Calendario _nuevo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1427
-#: ../modules/calendar/e-task-shell-view-actions.c:828
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-task-shell-view-actions.c:837
 msgid "Purg_e"
 msgstr "Purg_ar"
 
-#: ../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 reuniones y acontecimientos antiguos"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
-#: ../modules/calendar/e-memo-shell-view-actions.c:648
-#: ../modules/calendar/e-task-shell-view-actions.c:772
+#: ../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 "Actuali_zar"
 
-#: ../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 el 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 "Renombrar el 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 siguie_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 la siguiente coincidencia de la frase de bÃsqueda 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 la coincidencia anterior de la frase de bÃsqueda actual"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-cal-shell-view-actions.c:1468
 msgid "Stop _running search"
 msgstr "Detene_r la bÃsqueda en ejecuciÃ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 "Detener la bÃsqueda actual en ejecuciÃ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 "Mostrar _sÃlo 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 al calendarioâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1483
+#: ../modules/calendar/e-cal-shell-view-actions.c:1489
 msgid "_Delegate Meeting..."
 msgstr "_Delegar 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 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 las 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 _repeticiÃ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 repeticiÃ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 tod_as las repeticiones"
 
-#: ../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 las repeticiones"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
 msgid "New All Day _Event..."
 msgstr "Acont_ecimiento nuevo para todo el dÃa"
 
-#: ../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 un acontecimiento nuevo para todo el dÃa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1518
-#: ../modules/calendar/e-cal-shell-view-memopad.c:253
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-memo-shell-view-actions.c:613
-#: ../modules/calendar/e-task-shell-view-actions.c:737
+#: ../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 "Reenviar como i_Calendarâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+#: ../modules/calendar/e-cal-shell-view-actions.c:1531
 msgid "New _Meeting..."
 msgstr "_ReuniÃn nuevaâ"
 
-#: ../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 una reuniÃn nueva"
 
-#: ../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 al calendarioâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1539
+#: ../modules/calendar/e-cal-shell-view-actions.c:1545
 msgid "New _Appointment..."
 msgstr "_Cita nuevaâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1546
+#: ../modules/calendar/e-cal-shell-view-actions.c:1552
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta repeticiÃn _movible"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1553
+#: ../modules/calendar/e-cal-shell-view-actions.c:1559
 msgid "_Open Appointment"
 msgstr "_Abrir 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 la 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 "_Concertar una 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 "Convierte una cita en una 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 "Con_vertir en una 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 "Convierte una reuniÃn en una cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1594
 msgid "Quit"
 msgstr "Salir"
 
-#: ../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 una 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 una 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 una semana de trabajo"
 
-#: ../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 de los prÃximos 7 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 "Sucede menos de 5 veces"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1798
-#: ../modules/calendar/e-memo-shell-view-actions.c:810
-#: ../modules/calendar/e-task-shell-view-actions.c:1009
+#: ../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 "La descripciÃn contiene"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1805
-#: ../modules/calendar/e-memo-shell-view-actions.c:817
-#: ../modules/calendar/e-task-shell-view-actions.c:1016
+#: ../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 "El resumen contiene"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1817
+#: ../modules/calendar/e-cal-shell-view-actions.c:1823
 msgid "Print this calendar"
 msgstr "Imprime 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 el calendario que imprimir"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1846
-#: ../modules/calendar/e-cal-shell-view-memopad.c:294
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:381
-#: ../modules/calendar/e-memo-shell-view-actions.c:858
-#: ../modules/calendar/e-task-shell-view-actions.c:1057
+#: ../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 "G_uardar 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:217
-#: ../modules/calendar/e-memo-shell-view-actions.c:537
+#: ../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:260
-#: ../modules/calendar/e-memo-shell-view-actions.c:669
+#: ../modules/calendar/e-cal-shell-view-memopad.c:272
+#: ../modules/calendar/e-memo-shell-view-actions.c:678
 msgid "New _Memo"
 msgstr "_Nota nueva"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:262
-#: ../modules/calendar/e-memo-shell-backend.c:310
-#: ../modules/calendar/e-memo-shell-view-actions.c:671
+#: ../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 "Crea una nota nueva"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:267
-#: ../modules/calendar/e-memo-shell-view-actions.c:676
+#: ../modules/calendar/e-cal-shell-view-memopad.c:279
+#: ../modules/calendar/e-memo-shell-view-actions.c:685
 msgid "_Open Memo"
 msgstr "_Abrir nota"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:269
-#: ../modules/calendar/e-memo-shell-view-actions.c:678
+#: ../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 la nota seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-memo-shell-view-actions.c:683
-#: ../modules/calendar/e-task-shell-view-actions.c:821
+#: ../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 pÃgina _web"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:286
-#: ../modules/calendar/e-memo-shell-view-actions.c:843
+#: ../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 la 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 el siguiente 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 el 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] "No se puede encontrar un evento coincidente dentro de %d anÌo"
 msgstr[1] "No se puede encontrar un evento coincidente dentro de %d anÌos"
 
-#: ../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] "No se puede encontrar un evento coincidente hace %d aÃo"
 msgstr[1] "No se puede encontrar un evento coincidente hace %d aÃos"
 
-#: ../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 "No se puede buscar sin un calendario activo"
 
@@ -16995,229 +17254,247 @@ msgstr "No se puede buscar sin 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:284
-#: ../modules/calendar/e-task-shell-view-actions.c:654
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:296
+#: ../modules/calendar/e-task-shell-view-actions.c:663
 msgid "task"
 msgstr "tarea"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
-#: ../modules/calendar/e-task-shell-view-actions.c:716
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "_Assign Task"
 msgstr "_Asignar tarea"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:793
+#: ../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 terminado"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:335
-#: ../modules/calendar/e-task-shell-view-actions.c:795
+#: ../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 tareas seleccionadas como terminadas"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
 msgid "_Mark as Incomplete"
 msgstr "_Marcar como incompleta"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:342
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../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 las tareas seleccionadas como incompletas"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:807
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
+#: ../modules/calendar/e-task-shell-view-actions.c:816
 msgid "New _Task"
 msgstr "_Tarea nueva"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:349
-#: ../modules/calendar/e-task-shell-backend.c:305
-#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../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 "Crea una tarea nueva"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
-#: ../modules/calendar/e-task-shell-view-actions.c:814
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:366
+#: ../modules/calendar/e-task-shell-view-actions.c:823
 msgid "_Open Task"
 msgstr "_Abrir tarea"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
-#: ../modules/calendar/e-task-shell-view-actions.c:816
+#: ../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 la tarea seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
-#: ../modules/calendar/e-task-shell-view-actions.c:1042
+#: ../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 la tarea seleccionada"
 
-#: ../modules/calendar/e-memo-shell-backend.c:308
+#: ../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 nueva"
+
+#: ../modules/calendar/e-memo-shell-backend.c:202
 msgctxt "New"
 msgid "Mem_o"
 msgstr "_Nota"
 
-#: ../modules/calendar/e-memo-shell-backend.c:315
+#: ../modules/calendar/e-memo-shell-backend.c:209
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "Nota _compartida"
 
-#: ../modules/calendar/e-memo-shell-backend.c:317
+#: ../modules/calendar/e-memo-shell-backend.c:211
 msgid "Create a new shared memo"
 msgstr "Crea una nota compartida nueva"
 
-#: ../modules/calendar/e-memo-shell-backend.c:325
+#: ../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:327
-#: ../modules/calendar/e-memo-shell-view-actions.c:636
+#: ../modules/calendar/e-memo-shell-backend.c:221
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
 msgid "Create a new memo list"
 msgstr "Crea una lista de notas nueva"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:186
+#: ../modules/calendar/e-memo-shell-sidebar.c:204
 msgid "Loading memos"
 msgstr "Cargando 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 memos at %s"
+msgid "Opening memo list '%s'"
 msgstr "Abriendo notas en %s"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:238
-#: ../modules/calendar/e-memo-shell-view-actions.c:253
+#: ../modules/calendar/e-memo-shell-view-actions.c:232
+#: ../modules/calendar/e-memo-shell-view-actions.c:247
 msgid "Print Memos"
 msgstr "Imprimir notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-memo-shell-view-actions.c:288
+msgid "Memo List Properties"
+msgstr "Propiedades de lista de notas"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "_Delete Memo"
 msgstr "_Eliminar nota"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:606
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "_Find in Memo..."
 msgstr "_Buscar en la notaâ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
 msgid "Search for text in the displayed memo"
 msgstr "Buscar el texto en la nota mostrada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:627
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "D_elete Memo List"
 msgstr "Eli_minar la lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:629
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
 msgid "Delete the selected memo list"
 msgstr "Eliminar la lista de notas seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:634
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "_New Memo List"
 msgstr "Lista de notas _nueva"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:650
+#: ../modules/calendar/e-memo-shell-view-actions.c:659
 msgid "Refresh the selected memo list"
 msgstr "Actualizar la lista de notas seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-memo-shell-view-actions.c:666
 msgid "Rename the selected memo list"
 msgstr "Renombrar la lista de notas seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:662
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
 msgid "Show _Only This Memo List"
 msgstr "Mostrar _sÃlo esta lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
 msgid "Memo _Preview"
 msgstr "Vista pre_via de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:743
+#: ../modules/calendar/e-memo-shell-view-actions.c:752
 msgid "Show memo preview pane"
 msgstr "Mostrar el panel de vista previa de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:764
+#: ../modules/calendar/e-memo-shell-view-actions.c:773
 msgid "Show memo preview below the memo list"
 msgstr "Mostrar la vista previa de la nota bajo la lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-memo-shell-view-actions.c:780
 msgid "Show memo preview alongside the memo list"
 msgstr "Mostrar la vista previa de la nota junto a la lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:829
+#: ../modules/calendar/e-memo-shell-view-actions.c:838
 msgid "Print the list of memos"
 msgstr "Imprime la lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:836
+#: ../modules/calendar/e-memo-shell-view-actions.c:845
 msgid "Preview the list of memos to be printed"
 msgstr "Vista previa de la 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 notas"
 
-#: ../modules/calendar/e-memo-shell-view.c:229
+#: ../modules/calendar/e-memo-shell-view.c:232
 msgid "Delete Memo"
 msgstr "Eliminar 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:303
+#: ../modules/calendar/e-task-shell-backend.c:190
+#: ../modules/calendar/e-task-shell-view-actions.c:239
+msgid "New Task List"
+msgstr "Lista de tareas nueva"
+
+#: ../modules/calendar/e-task-shell-backend.c:199
 msgctxt "New"
 msgid "_Task"
 msgstr "_Tarea"
 
-#: ../modules/calendar/e-task-shell-backend.c:310
+#: ../modules/calendar/e-task-shell-backend.c:206
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Tarea _asignada"
 
-#: ../modules/calendar/e-task-shell-backend.c:312
+#: ../modules/calendar/e-task-shell-backend.c:208
 msgid "Create a new assigned task"
 msgstr "Crea una tarea nueva asignada"
 
-#: ../modules/calendar/e-task-shell-backend.c:320
+#: ../modules/calendar/e-task-shell-backend.c:216
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Lista de _tareas"
 
-#: ../modules/calendar/e-task-shell-backend.c:322
-#: ../modules/calendar/e-task-shell-view-actions.c:760
+#: ../modules/calendar/e-task-shell-backend.c:218
+#: ../modules/calendar/e-task-shell-view-actions.c:769
 msgid "Create a new task list"
 msgstr "Crea una lista de tareas nueva"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:186
+#: ../modules/calendar/e-task-shell-sidebar.c:204
 msgid "Loading tasks"
 msgstr "Cargando tareas"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:707
+#: ../modules/calendar/e-task-shell-sidebar.c:647
 msgid "Task List Selector"
 msgstr "Selector de listas de tareas"
 
-#. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:1010
-#, c-format
-msgid "Opening tasks at %s"
+#: ../modules/calendar/e-task-shell-sidebar.c:939
+#, fuzzy, c-format
+#| msgid "Opening tasks at %s"
+msgid "Opening task list '%s'"
 msgstr "Abriendo tareas en %s"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:261
-#: ../modules/calendar/e-task-shell-view-actions.c:276
+#: ../modules/calendar/e-task-shell-view-actions.c:255
+#: ../modules/calendar/e-task-shell-view-actions.c:270
 msgid "Print Tasks"
 msgstr "Imprimir tareas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:598
+#: ../modules/calendar/e-task-shell-view-actions.c:311
+msgid "Task List Properties"
+msgstr "Propiedades de lista de tareas"
+
+#: ../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"
@@ -17229,121 +17506,168 @@ msgstr ""
 "\n"
 "ÂEliminar realmente esas tareas?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:605
+#: ../modules/calendar/e-task-shell-view-actions.c:614
 msgid "Do not ask me again"
 msgstr "No preguntarme de nuevo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:723
+#: ../modules/calendar/e-task-shell-view-actions.c:732
 msgid "_Delete Task"
 msgstr "_Eliminar tarea"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:730
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "_Find in Task..."
 msgstr "_Buscar en la tareaâ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:732
+#: ../modules/calendar/e-task-shell-view-actions.c:741
 msgid "Search for text in the displayed task"
 msgstr "Buscar el texto en la tarea mostrada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/calendar/e-task-shell-view-actions.c:753
 msgid "Copy..."
 msgstr "_Copiarâ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "D_elete Task List"
 msgstr "_Eliminar lista de tareas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:753
+#: ../modules/calendar/e-task-shell-view-actions.c:762
 msgid "Delete the selected task list"
 msgstr "Eliminar la lista de tareas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:758
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "_New Task List"
 msgstr "Lista de tareas _nueva"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "Refresh the selected task list"
 msgstr "Actualizar la lista de tareas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-task-shell-view-actions.c:790
 msgid "Rename the selected task list"
 msgstr "Renombrar la lista de tareas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:786
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Show _Only This Task List"
 msgstr "Mostrar _sÃlo esta lista de tareas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:800
+#: ../modules/calendar/e-task-shell-view-actions.c:809
 msgid "Mar_k as Incomplete"
 msgstr "_Marcar como incompleto"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:830
+#: ../modules/calendar/e-task-shell-view-actions.c:839
 msgid "Delete completed tasks"
 msgstr "Eliminar tareas completadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/calendar/e-task-shell-view-actions.c:914
 msgid "Task _Preview"
 msgstr "_Vista previa de tarea"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:907
+#: ../modules/calendar/e-task-shell-view-actions.c:916
 msgid "Show task preview pane"
 msgstr "Mostrar el panel de vista previa"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:928
+#: ../modules/calendar/e-task-shell-view-actions.c:937
 msgid "Show task preview below the task list"
 msgstr "Mostrar la vista previa de tareas bajo la lista de tareas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:935
+#: ../modules/calendar/e-task-shell-view-actions.c:944
 msgid "Show task preview alongside the task list"
 msgstr "Mostrar la vista previa de tareas junto a la lista de tareas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:943
+#: ../modules/calendar/e-task-shell-view-actions.c:952
 msgid "Active Tasks"
 msgstr "Tareas activas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Completed Tasks"
 msgstr "Tareas completadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Next 7 Days' Tasks"
 msgstr "Tareas de los prÃximos 7 dÃas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-task-shell-view-actions.c:980
 msgid "Overdue Tasks"
 msgstr "Tareas fuera de plazo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:978
+#: ../modules/calendar/e-task-shell-view-actions.c:987
 msgid "Tasks with Attachments"
 msgstr "Tareas con adjuntos"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1028
+#: ../modules/calendar/e-task-shell-view-actions.c:1037
 msgid "Print the list of tasks"
 msgstr "Imprime la lista de tareas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1035
+#: ../modules/calendar/e-task-shell-view-actions.c:1044
 msgid "Preview the list of tasks to be printed"
 msgstr "Vista previa de la lista de tareas para imprimir"
 
-#: ../modules/calendar/e-task-shell-view.c:362
+#: ../modules/calendar/e-task-shell-view.c:365
 msgid "Delete Tasks"
 msgstr "Eliminar tareas"
 
-#: ../modules/calendar/e-task-shell-view.c:364
+#: ../modules/calendar/e-task-shell-view.c:367
 msgid "Delete Task"
 msgstr "Eliminar tarea"
 
-#: ../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 tarea"
 msgstr[1] "%d tareas"
 
+#: ../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 "Cabeceras 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 ""
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:243
+msgid "_Fetch All Headers"
+msgstr "Obtener _todas las cabeceras"
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:257
+#, fuzzy
+#| msgid "Mail Headers Table"
+msgid "_Basic Headers (fastest)"
+msgstr "Tabla de cabeceras de correo"
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:271
+#, fuzzy
+#| msgid ""
+#| "_Basic Headers (Fastest) \n"
+#| "Use this if you do not have filters based on mailing lists"
+msgid "Use this if you are not filtering any mailing lists."
+msgstr ""
+"Cabeceras _bÃsicas - (rÃpido) \n"
+"Use esto si no tiene filtros basados en listas de correo"
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:281
+#, fuzzy
+#| msgid "Basic and _Mailing List Headers (Default)"
+msgid "Basic and _Mailing List Headers (default)"
+msgstr "Cabeceras bÃsicas y de _listas de correo predeterminadas"
+
+#: ../modules/imap-features/e-mail-config-imap-headers-page.c:330
+msgid "Custom Headers"
+msgstr "Cabeceras 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 ""
+
 #: ../modules/mail/e-mail-attachment-handler.c:390
 #, c-format
 msgid "%d attached message"
@@ -17351,505 +17675,629 @@ msgid_plural "%d attached messages"
 msgstr[0] "%d mensaje adjunto"
 msgstr[1] "%d mensajes adjuntos"
 
-#: ../modules/mail/e-mail-shell-backend.c:233
+#: ../modules/mail/e-mail-shell-backend.c:246
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mensaje 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 "Redacta un mensaje de correo nuevo"
 
-#: ../modules/mail/e-mail-shell-backend.c:243
+#: ../modules/mail/e-mail-shell-backend.c:256
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "C_uenta 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 "Crea una cuenta de correo nueva"
 
-#: ../modules/mail/e-mail-shell-backend.c:250
+#: ../modules/mail/e-mail-shell-backend.c:263
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Carpeta 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 "Crea una carpeta de correo nueva"
 
-#: ../modules/mail/e-mail-shell-backend.c:475
+#: ../modules/mail/e-mail-shell-backend.c:484
 msgid "Mail Accounts"
 msgstr "Cuentas de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:484
+#: ../modules/mail/e-mail-shell-backend.c:493
 msgid "Mail Preferences"
 msgstr "Opciones de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:493
+#: ../modules/mail/e-mail-shell-backend.c:502
 msgid "Composer Preferences"
 msgstr "Preferencias del editor"
 
-#: ../modules/mail/e-mail-shell-backend.c:502
+#: ../modules/mail/e-mail-shell-backend.c:511
 msgid "Network Preferences"
 msgstr "Preferencias de red"
 
-#: ../modules/mail/e-mail-shell-backend.c:752
-msgid "Evolution Account Assistant"
-msgstr "Asistente de cuentas de Evolution"
-
-#: ../modules/mail/e-mail-shell-backend.c:796
-msgid "Account Editor"
-msgstr "Editor de cuentas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1208
-#: ../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 cuenta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1210
+#: ../modules/mail/e-mail-shell-view-actions.c:1253
 msgid "Disable this account"
 msgstr "Desactivar esta cuenta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1217
+#: ../modules/mail/e-mail-shell-view-actions.c:1260
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr ""
 "Eliminar permanentemente todos los correos borrados de todas las carpetas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../modules/mail/e-mail-shell-view-actions.c:1267
 msgid "Edit properties of this account"
 msgstr "Editar las propiedades de esta cuenta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1272
 msgid "_Download Messages for Offline Usage"
 msgstr "_Descargar correos para trabajar sin conexiÃn"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1231
+#: ../modules/mail/e-mail-shell-view-actions.c:1274
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Descargar correos para las cuentas y carpetas marcadas para usar sin conexiÃn"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1236
+#: ../modules/mail/e-mail-shell-view-actions.c:1279
 msgid "Fl_ush Outbox"
 msgstr "Enviar correos pe_ndientes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1243
+#: ../modules/mail/e-mail-shell-view-actions.c:1286
 msgid "_Copy Folder To..."
 msgstr "_Copiar carpeta aâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1245
+#: ../modules/mail/e-mail-shell-view-actions.c:1288
 msgid "Copy the selected folder into another folder"
 msgstr "Copia la carpeta seleccionada en otra carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1252
+#: ../modules/mail/e-mail-shell-view-actions.c:1295
 msgid "Permanently remove this folder"
 msgstr "Elimina permanentemente esta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1257
+#: ../modules/mail/e-mail-shell-view-actions.c:1300
 msgid "E_xpunge"
 msgstr "_Purgar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1302
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Elimina permanentemente todos los mensajes borrados de esta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1307
 msgid "Mar_k All Messages as Read"
 msgstr "Marcar todos los mensajes como _leÃdos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1309
 msgid "Mark all messages in the folder as read"
 msgstr "Marcar todos los mensajes en la carpeta como leÃdos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../modules/mail/e-mail-shell-view-actions.c:1314
 msgid "_Move Folder To..."
 msgstr "_Mover carpeta aâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
+#: ../modules/mail/e-mail-shell-view-actions.c:1316
 msgid "Move the selected folder into another folder"
 msgstr "Mueve la carpeta seleccionada a otra carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1321
 msgid "_New..."
 msgstr "_Nuevaâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1323
 msgid "Create a new folder for storing mail"
 msgstr "Crea una carpeta nueva para almacenar correo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1287
+#: ../modules/mail/e-mail-shell-view-actions.c:1330
 msgid "Change the properties of this folder"
 msgstr "Cambia las propiedades de esta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1294
+#: ../modules/mail/e-mail-shell-view-actions.c:1337
 msgid "Refresh the folder"
 msgstr "Actualizar la carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1301
+#: ../modules/mail/e-mail-shell-view-actions.c:1344
 msgid "Change the name of this folder"
 msgstr "Cambia el nombre de esta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1349
 msgid "Select Message _Thread"
 msgstr "Seleccionar con_versaciÃn del mensaje"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1308
+#: ../modules/mail/e-mail-shell-view-actions.c:1351
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 "Selecciona todos los correos en la misma conversaciÃn que el correo "
 "seleccionado"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1313
+#: ../modules/mail/e-mail-shell-view-actions.c:1356
 msgid "Select Message S_ubthread"
 msgstr "Seleccionar s_ubconversaciÃn del mensaje"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1315
+#: ../modules/mail/e-mail-shell-view-actions.c:1358
 msgid "Select all replies to the currently selected message"
 msgstr "Seleccionar todas las respuestas al mensaje actualmente seleccionado"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1370
 msgid "Empty _Trash"
 msgstr "_Vaciar papelera"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
+#: ../modules/mail/e-mail-shell-view-actions.c:1372
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr ""
 "Eliminar permanentemente todos los correos borrados de todas las cuentas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1377
 msgid "_New Label"
 msgstr "Etiqueta n_ueva"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1343
+#: ../modules/mail/e-mail-shell-view-actions.c:1386
 msgid "N_one"
 msgstr "Ning_uno"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1357
+#: ../modules/mail/e-mail-shell-view-actions.c:1400
 msgid "_Manage Subscriptions"
 msgstr "Gestionar _suscripciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1359
-#: ../modules/mail/e-mail-shell-view-actions.c:1436
+#: ../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 "Suscribirse o desuscribirse de carpetas alojadas en servidores remotos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1364
-#: ../modules/mail/e-mail-shell-view-actions.c:1385
+#: ../modules/mail/e-mail-shell-view-actions.c:1407
+#: ../modules/mail/e-mail-shell-view-actions.c:1428
 msgid "Send / _Receive"
 msgstr "Enviar / Reci_bir"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1366
+#: ../modules/mail/e-mail-shell-view-actions.c:1409
 msgid "Send queued items and retrieve new items"
 msgstr "EnvÃa el correo en la cola y obtiene el nuevo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1371
+#: ../modules/mail/e-mail-shell-view-actions.c:1414
 msgid "R_eceive All"
 msgstr "R_ecibir todo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1373
+#: ../modules/mail/e-mail-shell-view-actions.c:1416
 msgid "Receive new items from all accounts"
 msgstr "Recibir correo nuevo para todas las cuentas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1378
+#: ../modules/mail/e-mail-shell-view-actions.c:1421
 msgid "_Send All"
 msgstr "_Enviar todo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1380
+#: ../modules/mail/e-mail-shell-view-actions.c:1423
 msgid "Send queued items in all accounts"
 msgstr "Enviar todos los elementos en la cola de todas las cuentas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1406
+#: ../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:1408
+#: ../modules/mail/e-mail-shell-view-actions.c:1451
 msgid "Cancel the current mail operation"
 msgstr "Cancela la operaciÃn de correo actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1413
+#: ../modules/mail/e-mail-shell-view-actions.c:1456
 msgid "Collapse All _Threads"
 msgstr "_Contraer todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1415
+#: ../modules/mail/e-mail-shell-view-actions.c:1458
 msgid "Collapse all message threads"
 msgstr "Contrae todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1420
+#: ../modules/mail/e-mail-shell-view-actions.c:1463
 msgid "E_xpand All Threads"
 msgstr "E_xpandir todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1422
+#: ../modules/mail/e-mail-shell-view-actions.c:1465
 msgid "Expand all message threads"
 msgstr "Expandir todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1427
+#: ../modules/mail/e-mail-shell-view-actions.c:1470
 msgid "_Message Filters"
 msgstr "_Filtros de correos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1429
+#: ../modules/mail/e-mail-shell-view-actions.c:1472
 msgid "Create or edit rules for filtering new mail"
 msgstr "Crear o editar reglas para el filtrado de correos nuevos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1434
+#: ../modules/mail/e-mail-shell-view-actions.c:1477
 msgid "_Subscriptions..."
 msgstr "_Suscripcionesâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1443
+#: ../modules/mail/e-mail-shell-view-actions.c:1486
 msgid "F_older"
 msgstr "_Carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1450
+#: ../modules/mail/e-mail-shell-view-actions.c:1493
 msgid "_Label"
 msgstr "Etiq_ueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1467
+#: ../modules/mail/e-mail-shell-view-actions.c:1510
 msgid "C_reate Search Folder From Search..."
 msgstr "_Crear una carpeta de bÃsqueda desde la bÃsquedaâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1474
+#: ../modules/mail/e-mail-shell-view-actions.c:1517
 msgid "Search F_olders"
 msgstr "Carpetas de bÃsque_da"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1476
+#: ../modules/mail/e-mail-shell-view-actions.c:1519
 msgid "Create or edit search folder definitions"
 msgstr "Crear o edita definiciones para carpetas de bÃsqueda"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1511
+#: ../modules/mail/e-mail-shell-view-actions.c:1554
 msgid "_New Folder..."
 msgstr "Carpeta _nuevaâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1539
+#: ../modules/mail/e-mail-shell-view-actions.c:1582
 msgid "Show Message _Preview"
 msgstr "Mostrar vista _previa del correo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1541
+#: ../modules/mail/e-mail-shell-view-actions.c:1584
 msgid "Show message preview pane"
 msgstr "Mostrar el correo en el panel de vista previa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1547
+#: ../modules/mail/e-mail-shell-view-actions.c:1590
 msgid "Show _Deleted Messages"
 msgstr "Mostrar los mensajes _eliminados"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1549
+#: ../modules/mail/e-mail-shell-view-actions.c:1592
 msgid "Show deleted messages with a line through them"
 msgstr "Mostrar los mensajes eliminados tachÃndolos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1555
+#: ../modules/mail/e-mail-shell-view-actions.c:1598
 msgid "_Group By Threads"
 msgstr "A_grupar por conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1557
+#: ../modules/mail/e-mail-shell-view-actions.c:1600
 msgid "Threaded message list"
 msgstr "Lista de correos por conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1563
+#: ../modules/mail/e-mail-shell-view-actions.c:1606
 msgid "_Unmatched Folder Enabled"
 msgstr "Carpeta no _coincidente activada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1565
-#| msgid "Toggles whether the From chooser is displayed"
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Conmutador que indica si la carpeta no coincidente estÃ activada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1585
+#: ../modules/mail/e-mail-shell-view-actions.c:1628
 msgid "Show message preview below the message list"
 msgstr "Mostrar la vista previa del correo bajo la lista de mensajes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1592
+#: ../modules/mail/e-mail-shell-view-actions.c:1635
 msgid "Show message preview alongside the message list"
 msgstr "Mostrar la vista previa del correo junto a la lista de mensajes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1600
+#: ../modules/mail/e-mail-shell-view-actions.c:1643
 msgid "All Messages"
 msgstr "Todos los correos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1607
+#: ../modules/mail/e-mail-shell-view-actions.c:1650
 msgid "Important Messages"
 msgstr "Mensajes importantes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1614
+#: ../modules/mail/e-mail-shell-view-actions.c:1657
 msgid "Last 5 Days' Messages"
 msgstr "Mensajes de los Ãltimos 5 dÃas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:1664
 msgid "Messages Not Junk"
 msgstr "Mensajes que no son SPAM"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1628
+#: ../modules/mail/e-mail-shell-view-actions.c:1671
 msgid "Messages with Attachments"
 msgstr "Mensajes con adjuntos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1635
+#: ../modules/mail/e-mail-shell-view-actions.c:1678
 msgid "No Label"
 msgstr "Sin etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1642
+#: ../modules/mail/e-mail-shell-view-actions.c:1685
 msgid "Read Messages"
 msgstr "Mensajes leÃdos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1649
+#: ../modules/mail/e-mail-shell-view-actions.c:1692
 msgid "Recent Messages"
 msgstr "Mensajes recientes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1656
+#: ../modules/mail/e-mail-shell-view-actions.c:1699
 msgid "Unread Messages"
 msgstr "Mensajes no leÃdos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1708
+#: ../modules/mail/e-mail-shell-view-actions.c:1751
 msgid "Subject or Addresses contain"
 msgstr "El asunto o las direcciones contienen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1718
+#: ../modules/mail/e-mail-shell-view-actions.c:1761
 msgid "All Accounts"
 msgstr "Todas las cuentas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1725
+#: ../modules/mail/e-mail-shell-view-actions.c:1768
 msgid "Current Account"
 msgstr "Cuenta actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1732
+#: ../modules/mail/e-mail-shell-view-actions.c:1775
 msgid "Current Folder"
 msgstr "Carpeta actual"
 
-#: ../modules/mail/e-mail-shell-view.c:560
+#: ../modules/mail/e-mail-shell-view.c:562
 msgid "All Account Search"
 msgstr "BÃsqueda en todas las cuentas"
 
-#: ../modules/mail/e-mail-shell-view.c:721
+#: ../modules/mail/e-mail-shell-view.c:723
 msgid "Account Search"
 msgstr "BÃsqueda en la cuenta"
 
-#: ../modules/mail/e-mail-shell-view.c:948
+#: ../modules/mail/e-mail-shell-view.c:967
 msgid "Proxy _Logout"
 msgstr "_Cerrar 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 seleccionado, "
 msgstr[1] "%d seleccionados, "
 
-#: ../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 borrado"
 msgstr[1] "%d borrados"
 
-#: ../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 SPAM"
 msgstr[1] "%d SPAM"
 
-#: ../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 sin enviar"
 msgstr[1] "%d sin 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 no leÃdo, "
 msgstr[1] "%d no leÃdos, "
 
-#: ../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 "Papelera"
 
-#: ../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 "Una vez por dÃa"
 
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:89
 msgid "Once per week"
 msgstr "Una vez por semana"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:90
 msgid "Once per month"
 msgstr "Una vez por mes"
 
-#: ../modules/mail/em-mailer-prefs.c:293
+#: ../modules/mail/em-mailer-prefs.c:291
 msgid "Header"
 msgstr "Cabecera"
 
-#: ../modules/mail/em-mailer-prefs.c:297
+#: ../modules/mail/em-mailer-prefs.c:295
 msgid "Contains Value"
 msgstr "Contiene el 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:1069
+#: ../modules/mail/em-mailer-prefs.c:1074
 msgid "_Date header:"
 msgstr "Cabecera de _fecha:"
 
-#: ../modules/mail/em-mailer-prefs.c:1070
+#: ../modules/mail/em-mailer-prefs.c:1075
 msgid "Show _original header value"
 msgstr "Mostrar el valor _original de la cabecera"
 
+#: ../modules/mail-config/e-mail-config-google-summary.c:247
+#, fuzzy
+#| msgid "Google sources"
+msgid "Google Features"
+msgstr "Recursos de Google"
+
+#: ../modules/mail-config/e-mail-config-google-summary.c:256
+#, fuzzy
+#| msgid "Add Google Calendars to Evolution."
+msgid "Add Google Ca_lendar to this account"
+msgstr "AÃadir un calendario de Google a Evolution."
+
+#: ../modules/mail-config/e-mail-config-google-summary.c:264
+#, fuzzy
+#| msgid "Add Google Calendars to Evolution."
+msgid "Add Google Con_tacts to this account"
+msgstr "AÃadir un calendario de Google a Evolution."
+
+#: ../modules/mail-config/e-mail-config-google-summary.c:272
+#, fuzzy
+#| msgid "You may need to enable IMAP access."
+msgid "You may need to enable IMAP access"
+msgstr "Puede que deba activar el acceso IMAP."
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:246
+#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+#, fuzzy
+#| msgid "Module Directory"
+msgid "Mail _Directory:"
+msgstr "Directorio de mÃdulos"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:247
+#, fuzzy
+#| msgid "Choose a file to restore"
+msgid "Choose a MH mail directory"
+msgstr "Elija un archivador para restaurar"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+msgid "Local Delivery _File:"
+msgstr ""
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+#, fuzzy
+#| msgid "Choose calendar file"
+msgid "Choose a local delivery file"
+msgstr "Elegir un archivo de calendario"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:293
+#, fuzzy
+#| msgid "Choose a file to restore"
+msgid "Choose a Maildir mail directory"
+msgstr "Elija un archivador para restaurar"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+#, fuzzy
+#| msgid "_File:"
+msgid "Spool _File:"
+msgstr "_Archivo:"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:316
+#, fuzzy
+#| msgid "Choose a File"
+msgid "Choose a mbox spool file"
+msgstr "Elegir un archivo"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+#, fuzzy
+#| msgid "Module Directory"
+msgid "Spool _Directory:"
+msgstr "Directorio de mÃdulos"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:339
+#, fuzzy
+#| msgid "Choose a file to restore"
+msgid "Choose a mbox spool directory"
+msgstr "Elija un archivador para restaurar"
+
+#: ../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 "_Usuario:"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:226
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:149
+#, fuzzy
+#| msgid "Encryption:"
+msgid "Encryption _method:"
+msgstr "Cifrado:"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:241
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:164
+#, fuzzy
+#| msgid "_Secure connection"
+msgid "STARTTLS after connecting"
+msgstr "_Securizar conexiÃn"
+
+#: ../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 en un puerto dedicado"
+
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:124
+msgid "Ser_ver requires authentication"
+msgstr "El ser_vidor requiere 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
+#, fuzzy
+#| msgid "IMAP Features"
+msgid "Yahoo! Features"
+msgstr "CaracterÃsticas IMAP"
+
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:251
+#, fuzzy
+#| msgid "Add Google Calendars to Evolution."
+msgid "Add Yahoo! Ca_lendar and Tasks to this account"
+msgstr "AÃadir un calendario de Google a Evolution."
+
 #: ../modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "Do you want to make Evolution your default email client?"
 msgstr "ÂQuiere que Evolution sea su cliente de correo predeterminado?"
 
 #. 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 "Su mensaje para %s acerca de Â%sÂ se ha leÃdo el Â%sÂ"
 
 #. 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 entrega 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 confirmaciÃn de lectura a Â%sÂ"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:504
+#: ../modules/mdn/evolution-mdn.c:545
 msgid "_Notify Sender"
 msgstr "_Emisor de notificaciones"
 
@@ -17883,7 +18331,7 @@ msgstr ""
 "Evolution volverÃ al modo conectado una vez que se establezca la conexiÃn de "
 "red."
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:388
+#: ../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."
@@ -17891,11 +18339,11 @@ msgstr ""
 "No se puede encontrar la correspondiente cuenta en el servicio org.gnome."
 "OnlineAccounts de la que obtener un ÂtokenÂ de autenticaciÃn."
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:475
+#: ../modules/online-accounts/camel-sasl-xoauth.c:504
 msgid "OAuth"
 msgstr "OAuth"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:477
+#: ../modules/online-accounts/camel-sasl-xoauth.c:506
 msgid ""
 "This option will connect to the server by way of the GNOME Online Accounts "
 "service"
@@ -17986,48 +18434,49 @@ msgstr "Esto harÃ que SpamAssasin sea mÃs exacto, pero mÃs lento."
 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 ""
-"Bienvenido a Evolution. Las siguientes pantallas permitirÃn a Evolution "
-"conectarse a sus cuentas de correo e importar archivos desde otras "
-"aplicaciones."
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:299
+#: ../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 la informaciÃn que quiera 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 archivos"
 
-#: ../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 completada."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:510
-msgid "Evolution Setup Assistant"
-msgstr "Asistente de configuraciÃn de Evolution"
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:516
-msgid "Welcome"
-msgstr "Bienvenido"
+#: ../modules/startup-wizard/e-startup-assistant.c:154
+#, fuzzy
+#| msgid ""
+#| "Welcome to Evolution. The next few screens will allow Evolution to "
+#| "connect to your email accounts, and to import files from other "
+#| "applications."
+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 ""
+"Bienvenido a Evolution. Las siguientes pantallas permitirÃn a Evolution "
+"conectarse a sus cuentas de correo e importar archivos desde otras "
+"aplicaciones."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:633
+#: ../modules/startup-wizard/evolution-startup-wizard.c:259
 msgid "Loading accounts..."
 msgstr "Cargando cuentasâ"
 
@@ -18043,20 +18492,12 @@ msgstr "Inspeccionar el contenido 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 "Libretas locales de direcciones"
-
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Add local address books to Evolution."
-msgstr "AÃadir las libretas de direcciones locales a Evolution."
-
 #: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "_No mostrar otra vez este mensaje."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:588
-#: ../plugins/templates/templates.c:462
+#: ../plugins/attachment-reminder/attachment-reminder.c:590
+#: ../plugins/templates/templates.c:470
 msgid "Keywords"
 msgstr "Palabras clave"
 
@@ -18098,551 +18539,62 @@ msgid "Play audio attachments directly in mail messages."
 msgstr ""
 "Reproducir los adjuntos de sonido directamente en los mensajes de correo."
 
-#: ../plugins/backup-restore/backup.c:77
-msgid "Back up Evolution directory"
-msgstr "Respaldar la carpeta de Evolution"
-
-#: ../plugins/backup-restore/backup.c:79
-msgid "Restore Evolution directory"
-msgstr "Restaurar la carpeta de Evolution"
-
-#: ../plugins/backup-restore/backup.c:81
-msgid "Check Evolution Back up"
-msgstr "Comprobar el respaldo de Evolution"
-
-#: ../plugins/backup-restore/backup.c:83
-msgid "Restart Evolution"
-msgstr "Reiniciar Evolution"
-
-#: ../plugins/backup-restore/backup.c:85
-msgid "With Graphical User Interface"
-msgstr "Con interfaz 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 "Cerrando Evolution"
-
-#: ../plugins/backup-restore/backup.c:317
-msgid "Backing Evolution accounts and settings"
-msgstr "Respaldar las cuentas y la configuraciÃn de Evolution"
-
-#: ../plugins/backup-restore/backup.c:329
-msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr ""
-"Respaldar los datos de Evolution (correos, contactos, calendario, tareas, "
-"notas)"
-
-#: ../plugins/backup-restore/backup.c:345
-msgid "Back up complete"
-msgstr "Respaldo completado"
-
-#: ../plugins/backup-restore/backup.c:352
-#: ../plugins/backup-restore/backup.c:570
-msgid "Restarting Evolution"
-msgstr "Reiniciando Evolution"
-
-#: ../plugins/backup-restore/backup.c:438
-msgid "Back up current Evolution data"
-msgstr "Respaldar los datos actuales de Evolution"
-
-#: ../plugins/backup-restore/backup.c:446
-msgid "Extracting files from back up"
-msgstr "Extrayendo archivos del respaldo"
-
-#: ../plugins/backup-restore/backup.c:515
-msgid "Loading Evolution settings"
-msgstr "Carga la configuraciÃn de Evolution"
-
-#: ../plugins/backup-restore/backup.c:551
-msgid "Removing temporary back up files"
-msgstr "Eliminando archivos temporales de respaldo"
-
-#: ../plugins/backup-restore/backup.c:563
-msgid "Ensuring local sources"
-msgstr "Asegurando fuentes locales"
-
-#: ../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 "Respaldando a la carpeta %s"
-
-#: ../plugins/backup-restore/backup.c:772
-msgid "Evolution Restore"
-msgstr "Restaurador de Evolution"
-
-#: ../plugins/backup-restore/backup.c:773
-#, c-format
-msgid "Restoring from the folder %s"
-msgstr "Restaurando desde la carpeta %s"
-
-#: ../plugins/backup-restore/backup.c:841
-msgid "Backing up Evolution Data"
-msgstr "Respaldando los datos de Evolution"
-
-#: ../plugins/backup-restore/backup.c:842
-msgid "Please wait while Evolution is backing up your data."
-msgstr "Espere mientras Evolution respalda sus datos."
-
-#: ../plugins/backup-restore/backup.c:844
-msgid "Restoring Evolution Data"
-msgstr "Restaurando los datos de Evolution"
-
-#: ../plugins/backup-restore/backup.c:845
-msgid "Please wait while Evolution is restoring your data."
-msgstr "Espere mientras Evolution restaura sus datos."
-
-#: ../plugins/backup-restore/backup.c:863
-msgid "This may take a while depending on the amount of data in your account."
-msgstr ""
-"Esto puede llevar un tiempo dependiendo de la cantidad de datos en su cuenta."
-
-#: ../plugins/backup-restore/backup-restore.c:225
-msgid "Select name of the Evolution backup file"
-msgstr "Seleccione el nombre de archivo de respaldo Evolution"
-
-#: ../plugins/backup-restore/backup-restore.c:258
-msgid "_Restart Evolution after backup"
-msgstr "_Reiniciar Evolution despuÃs del respaldo"
-
-#: ../plugins/backup-restore/backup-restore.c:285
-msgid "Select name of the Evolution backup file to restore"
-msgstr ""
-"Seleccione el nombre del archivo de respaldo de Evolution que restaurar"
-
-#: ../plugins/backup-restore/backup-restore.c:298
-msgid "_Restart Evolution after restore"
-msgstr "_Reiniciar Evolution despuÃs de la restauraciÃn"
-
-#: ../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 ""
-"Puede restaurar Evolution desde su archivo de respaldo. Puede restaurar "
-"todos los correos, calendarios, tareas, notas, libreta de direcciones. "
-"TambiÃn restaura su configuraciÃn personal, filtros de correo, etc."
-
-#: ../plugins/backup-restore/backup-restore.c:395
-msgid "_Restore Evolution from the backup file"
-msgstr "_Restaurar Evolution desde el archivo de respaldo"
-
-#: ../plugins/backup-restore/backup-restore.c:405
-msgid "Please select an Evolution Archive to restore:"
-msgstr "Seleccione un archivador de Evolution para restaurar:"
-
-#: ../plugins/backup-restore/backup-restore.c:409
-msgid "Choose a file to restore"
-msgstr "Elija un archivador para restaurar"
-
-#: ../plugins/backup-restore/backup-restore.c:423
-msgid "Restore from backup"
-msgstr "Restaurar desde un respaldo"
-
-#: ../plugins/backup-restore/backup-restore.c:470
-msgid "_Back up Evolution Data..."
-msgstr "Re_spaldar datos de Evolutionâ"
-
-#: ../plugins/backup-restore/backup-restore.c:472
-msgid "Back up Evolution data and settings to an archive file"
-msgstr "Respaldar los datos y configuraciÃn de Evolution a un archivador"
-
-#: ../plugins/backup-restore/backup-restore.c:477
-msgid "R_estore Evolution Data..."
-msgstr "R_estaurar datos de Evolutionâ"
-
-#: ../plugins/backup-restore/backup-restore.c:479
-msgid "Restore Evolution data and settings from an archive file"
-msgstr "Respaldar y restaurar los datos y la configuraciÃn desde un archivador"
-
-#. the path to the shared library
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-msgid "Back up and Restore"
-msgstr "Respaldar y restaurar"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Back up and restore your Evolution data and settings."
-msgstr "Respaldar y restaurar los datos y la configuraciÃn de Evolution"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
-msgid "Invalid Evolution backup file"
-msgstr "Archivo de respaldo de Evolution no 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 archivo 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 "ÂSeguro que quiere cerrar 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 respaldar sus datos y ajustes, primero debe cerrar Evolution. AsegÃrese "
-"de que guarda todo dato sin guardar antes de proceder."
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Close and Back up Evolution"
-msgstr "Cerrar y respaldar 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 ""
-"ÂEstÃ seguro de que quiere restaurar Evolution desde el archivo 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 sus datos y su configuraciÃn, primero debe cerrar Evolution. "
-"AsegÃrese de que guarda todos los datos que no haya guardado antes de "
-"proceder. Esto eliminarÃ todos sus datos y configuraciÃn actual de Evolution "
-"y los restaurarÃ desde su respaldo."
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "Close and Restore Evolution"
-msgstr "Cerrar y restaurar 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 "No se puede escribir en la carpeta seleccionada."
-
-#: ../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
+#: ../plugins/bbdb/bbdb.c:674
 msgid "Create _address book entries when sending mails"
 msgstr ""
 "Crear entradas _automÃticamente en la libreta de direcciones al enviar "
 "correos"
 
-#: ../plugins/bbdb/bbdb.c:722
+#: ../plugins/bbdb/bbdb.c:682
 msgid "Select Address book for Automatic Contacts"
 msgstr "Seleccione la libreta para contactos automÃticos"
 
-#: ../plugins/bbdb/bbdb.c:739
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Instant Messaging Contacts"
 msgstr "Contactos de mensajerÃa instantÃnea"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:754
-msgid "_Synchronize contact info and images from Pidgin buddy list"
-msgstr ""
-"_Sincronizar informaciÃn e imÃgenes de contactos desde la lista de contactos "
-"de Pidgin"
-
-#: ../plugins/bbdb/bbdb.c:762
-msgid "Select Address book for Pidgin buddy list"
-msgstr ""
-"Seleccione la libreta de direcciones para la lista de contactos de Pidgin"
-
-#. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:775
-msgid "Synchronize with _buddy list now"
-msgstr "Sincronizar con la lista de _contactos de MI ahora"
-
-#: ../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 ""
-"Se encarga del trabajo de gestionar su libreta de direcciones.\n"
-"\n"
-"Rellena automÃticamente su libreta de contactos con los nombres y "
-"direcciones de correo-e cuando contesta a los correos. TambiÃn rellena la "
-"informaciÃn de contacto de MI de su lista de amigos."
-
-#: ../plugins/caldav/caldav-browse-server.c:215
-msgid "Authentication failed. Server requires correct login."
-msgstr ""
-"FallÃ la autenticaciÃn. El servidor requiere un inicio de sesiÃn correcto."
-
-#: ../plugins/caldav/caldav-browse-server.c:217
-msgid "Given URL cannot be found."
-msgstr "No se puede encontrar el URL proporcionado."
-
-#: ../plugins/caldav/caldav-browse-server.c:221
-#, c-format
-msgid ""
-"Server returned unexpected data.\n"
-"%d - %s"
-msgstr ""
-"El servidor devolviÃ datos inesperados.\n"
-"%d - %s"
-
-#: ../plugins/caldav/caldav-browse-server.c:361
-#: ../plugins/caldav/caldav-browse-server.c:695
-msgid "Failed to parse server response."
-msgstr "FallÃ al analizar la respuesta del servidor."
-
-#: ../plugins/caldav/caldav-browse-server.c:455
-msgid "Events"
-msgstr "Acontecimientos"
-
-#: ../plugins/caldav/caldav-browse-server.c:477
-msgid "User's calendars"
-msgstr "Calendarios del usuario"
-
-#: ../plugins/caldav/caldav-browse-server.c:589
-#: ../plugins/caldav/caldav-browse-server.c:764
-msgid "Failed to get server URL."
-msgstr "FallÃ al obtener el URL del servidor."
-
-#: ../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 los calendarios del usuarioâ"
-
-#: ../plugins/caldav/caldav-browse-server.c:801
-msgid "Could not find any user calendar."
-msgstr "No se pudo encontrar ningÃn calendario del usuario."
-
-#: ../plugins/caldav/caldav-browse-server.c:939
-#, c-format
-msgid "Previous attempt failed: %s"
-msgstr "FallÃ el intento anterior: %s"
-
-#: ../plugins/caldav/caldav-browse-server.c:941
-#, c-format
-msgid "Previous attempt failed with code %d"
-msgstr "El intento anterior fallÃ con el cÃdigo %d"
-
-#: ../plugins/caldav/caldav-browse-server.c:946
-#, c-format
-msgid "Enter password for user %s on server %s"
-msgstr "Introduzca la contraseÃa para el usuario %s en el servidor %s"
-
-#: ../plugins/caldav/caldav-browse-server.c:1009
-#, c-format
-msgid "Cannot create soup message for URL '%s'"
-msgstr "No se puede crear el mensaje ÂsoupÂ para el URL Â%sÂ"
-
-#. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1267
-msgid "Searching folder content..."
-msgstr "Buscando el contenido de la carpetaâ"
-
-#: ../plugins/caldav/caldav-browse-server.c:1327
-#: ../plugins/caldav/caldav-source.c:272
-msgid "Server _handles meeting invitations"
-msgstr "El servidor gesti_ona las invitaciones a reuniones"
-
-#: ../plugins/caldav/caldav-browse-server.c:1334
-msgid "List of available calendars:"
-msgstr "Lista de calendarios disponibles:"
-
-#: ../plugins/caldav/caldav-browse-server.c:1372
-msgid "Supports"
-msgstr "Soporta"
-
-#: ../plugins/caldav/caldav-browse-server.c:1403
-#: ../plugins/caldav/caldav-source.c:270
-msgid "User e_mail:"
-msgstr "Correo-_e del usuario:"
-
-#: ../plugins/caldav/caldav-browse-server.c:1482
-#, c-format
-msgid "Failed to create thread: %s"
-msgstr "FallÃ al crear la conversaciÃn: %s"
-
-#: ../plugins/caldav/caldav-browse-server.c:1604
-#, c-format
-msgid "Server URL '%s' is not a valid URL"
-msgstr "El URL del servidor Â%sÂ no es un URL vÃlido"
-
-#: ../plugins/caldav/caldav-browse-server.c:1614
-msgid "Browse for a CalDAV calendar"
-msgstr "Examinar para calendarios 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 no vÃlido"
-
-#: ../plugins/caldav/caldav-source.c:275
-msgid "Brows_e server for a calendar"
-msgstr "_Examinar el servidor para un calendario"
-
-#: ../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 "A_ctualizar:"
-
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Support"
-msgstr "Soporte CalDAV"
-
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "Add CalDAV support to Evolution."
-msgstr "AÃadir soporte CalDAV a Evolution."
-
-#: ../plugins/calendar-file/calendar-file.c:136
-msgid "C_ustomize options"
-msgstr "Opciones de personali_zaciÃn"
-
-#: ../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 "Nombre del _archivo:"
-
-#: ../plugins/calendar-file/calendar-file.c:160
-msgid "Choose calendar file"
-msgstr "Elegir un archivo 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 "Al 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 "Al cambiar un archivo"
-
-#. 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Ãlo lectura"
-
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "Calendarios locales"
-
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Add local calendars to Evolution."
-msgstr "AÃadir calendarios locales a Evolution."
-
-#: ../plugins/calendar-http/calendar-http.c:236
-msgid "Userna_me:"
-msgstr "Nombre de _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 "AÃadir calendarios web a Evolution."
-
-#: ../plugins/calendar-weather/calendar-weather.c:65
-msgid "Weather: Fog"
-msgstr "MeteorologÃa: Niebla"
-
-#: ../plugins/calendar-weather/calendar-weather.c:66
-msgid "Weather: Cloudy"
-msgstr "MeteorologÃa: Nuboso"
-
-#: ../plugins/calendar-weather/calendar-weather.c:67
-msgid "Weather: Cloudy Night"
-msgstr "MeteorologÃa: Noche nubosa"
-
-#: ../plugins/calendar-weather/calendar-weather.c:68
-msgid "Weather: Overcast"
-msgstr "MeteorologÃa: Cubierto"
-
-#: ../plugins/calendar-weather/calendar-weather.c:69
-msgid "Weather: Showers"
-msgstr "MeteorologÃa: Chubascos"
-
-#: ../plugins/calendar-weather/calendar-weather.c:70
-msgid "Weather: Snow"
-msgstr "MeteorologÃa: Nieve"
-
-#: ../plugins/calendar-weather/calendar-weather.c:71
-msgid "Weather: Sunny"
-msgstr "MeteorologÃa: Soleado"
-
-#: ../plugins/calendar-weather/calendar-weather.c:72
-msgid "Weather: Clear Night"
-msgstr "MeteorologÃa: Noche despejada"
-
-#: ../plugins/calendar-weather/calendar-weather.c:73
-msgid "Weather: Thunderstorms"
-msgstr "MeteorologÃa: Tormenta"
-
-#: ../plugins/calendar-weather/calendar-weather.c:239
-msgid "Select a location"
-msgstr "Seleccione un lugar"
-
-#. 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 "Ninguna"
-
-#: ../plugins/calendar-weather/calendar-weather.c:477
-msgid "_Units:"
-msgstr "_Unidades:"
+#: ../plugins/bbdb/bbdb.c:714
+msgid "_Synchronize contact info and images from Pidgin buddy list"
+msgstr ""
+"_Sincronizar informaciÃn e imÃgenes de contactos desde la lista de contactos "
+"de Pidgin"
 
-#: ../plugins/calendar-weather/calendar-weather.c:486
-msgid "Metric (Celsius, cm, etc)"
-msgstr "MÃtrica (Celsius, cm, etc)"
+#: ../plugins/bbdb/bbdb.c:722
+msgid "Select Address book for Pidgin buddy list"
+msgstr ""
+"Seleccione la libreta de direcciones para la lista de contactos de Pidgin"
 
-#: ../plugins/calendar-weather/calendar-weather.c:489
-msgid "Imperial (Fahrenheit, inches, etc)"
-msgstr "Imperial (Fahrenheit, pulgadas, etc)"
+#. Synchronize now button.
+#: ../plugins/bbdb/bbdb.c:735
+msgid "Synchronize with _buddy list now"
+msgstr "Sincronizar con la lista de _contactos de MI ahora"
 
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Weather Calendars"
-msgstr "Calendario meteorolÃgico"
+#: ../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 "AÃadir calendarios meteorolÃgicos a 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 ""
+"Se encarga del trabajo de gestionar su libreta de direcciones.\n"
+"\n"
+"Rellena automÃticamente su libreta de contactos con los nombres y "
+"direcciones de correo-e cuando contesta a los correos. TambiÃn rellena la "
+"informaciÃn de contacto de MI de su lista de amigos."
 
-#: ../plugins/dbx-import/dbx-importer.c:292
+#: ../plugins/dbx-import/dbx-importer.c:287
 msgid "Importing Outlook Express data"
 msgstr "Importando datos de Outlook Express"
 
@@ -18658,82 +18610,52 @@ msgstr "Carpetas personales de Outlook Express 5/6 (.dbx)"
 msgid "Import Outlook Express messages from DBX file"
 msgstr "Importar mensajes de Outlook Express desde un archivo DBX"
 
-#: ../plugins/default-source/default-source.c:169
-msgid "Mark as _default address book"
-msgstr "Marcar como libreta de direcciones pre_determinada"
-
-#: ../plugins/default-source/default-source.c:183
-msgid "A_utocomplete with this address book"
-msgstr "A_utocompletar con esta libreta de direcciones"
-
-#: ../plugins/default-source/default-source.c:192
-msgid "Mark as _default calendar"
-msgstr "Marcar como calendario pre_determinado"
-
-#: ../plugins/default-source/default-source.c:193
-msgid "Mark as _default task list"
-msgstr "Marcar como lista de tareas pre_determinada"
-
-#: ../plugins/default-source/default-source.c:194
-msgid "Mark as _default memo list"
-msgstr "Marcar como lista de notas pre_determinada"
-
-#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
-msgid "Default Sources"
-msgstr "Fuentes predeterminadas"
-
-#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid "Mark your preferred address book and calendar as default."
-msgstr ""
-"Marque como predeterminados su libreta de direcciones y calendario "
-"preferidos."
-
-#: ../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 "Seguridad:"
 
-#: ../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 "Privado"
 
-#: ../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 "Sin 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 "Protegido"
 
-#: ../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 "Ninguna"
 
-#: ../plugins/email-custom-header/email-custom-header.c:540
+#: ../plugins/email-custom-header/email-custom-header.c:539
 msgid "_Custom Header"
 msgstr "_Cabeceras personalizadas"
 
 #. 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 \";\"."
@@ -18742,12 +18664,12 @@ msgstr ""
 "es:\n"
 "Valores clave del nombre de la cabecera personalizada separados por Â;Â."
 
-#: ../plugins/email-custom-header/email-custom-header.c:857
+#: ../plugins/email-custom-header/email-custom-header.c:856
 msgid "Key"
 msgstr "Clave"
 
-#: ../plugins/email-custom-header/email-custom-header.c:873
-#: ../plugins/templates/templates.c:470
+#: ../plugins/email-custom-header/email-custom-header.c:872
+#: ../plugins/templates/templates.c:478
 msgid "Values"
 msgstr "Valores"
 
@@ -18879,49 +18801,6 @@ msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr ""
 "El archivo que ha seleccionado no parece una imagen .png vÃlida. Error: {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 ""
-"Introduzca la contraseÃa para que el usuario %s acceda a la lista de "
-"calendarios suscritos."
-
-#: ../plugins/google-account-setup/google-source.c:564
-#, c-format
-msgid ""
-"Cannot read data from Google server.\n"
-"%s"
-msgstr ""
-"No se pueden leer los datos del servidor de 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 "Error desconocido."
-
-#: ../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 "Obtener _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 "AÃadir un calendario de Google a Evolution."
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "Imagen en lÃnea"
@@ -18930,213 +18809,161 @@ msgstr "Imagen en lÃnea"
 msgid "View image attachments directly in mail messages."
 msgstr "Ver los adjuntos directamente en los mensajes de correo."
 
-#: ../plugins/imap-features/imap-headers.c:334
-#: ../plugins/imap-features/imap-headers.ui.h:10
-msgid "Custom Headers"
-msgstr "Cabeceras personalizadas"
-
-#: ../plugins/imap-features/imap-headers.c:356
-#: ../plugins/imap-features/imap-headers.ui.h:7
-msgid "IMAP Headers"
-msgstr "Cabeceras 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 sus preferencias para las cabeceras IMAP. \n"
-"Cuantas mÃs cabeceras tenga mÃs tiempo se tardarÃ en descargar."
-
-#: ../plugins/imap-features/imap-headers.ui.h:3
-msgid "_Fetch All Headers"
-msgstr "Obtener _todas las cabeceras"
-
-#: ../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 ""
-"Cabeceras _bÃsicas - (rÃpido) \n"
-"Use esto si no tiene filtros basados en listas de correo"
-
-#: ../plugins/imap-features/imap-headers.ui.h:6
-msgid "Basic and _Mailing List Headers (Default)"
-msgstr "Cabeceras bÃsicas y de _listas de correo predeterminadas"
-
-#: ../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 ""
-"Proporcione las cabeceras extra que necesite obtener ademÃs de las cabeceras "
-"estÃndar anteriores.\n"
-"Puede ignorar esto si elige ÂTodas las cabecerasÂ"
-
-#: ../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 "Configurar sus cuentas 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 "FallÃ al cargar el 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 "Una cita en el calendario Â%sÂ entra en conflicto 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 "Se encontrÃ la cita en el calendario Â%sÂ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:805
 msgid "Unable to find any calendars"
 msgstr "No se puede encontrar 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 "No se puede encontrar 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 "No se puede encontrar esta tarea en ninguna lista de tareas"
 
-#: ../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 "No se puede encontrar esta nota en ninguna lista de notas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1126
+#: ../plugins/itip-formatter/itip-formatter.c:1162
 msgid "Opening the calendar. Please wait..."
 msgstr "Abriendo el calendario. Espereâ"
 
-#: ../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 una versiÃn existente de esta 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 "No es posible enviar el elemento al 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 al 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 al calendario Â%sÂ como tentativa"
 
-#: ../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 al calendario Â%sÂ como rehusado"
 
-#: ../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 al 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 "Guardando cambios en el calendario. Espereâ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1641
+#: ../plugins/itip-formatter/itip-formatter.c:1690
 msgid "Unable to parse item"
 msgstr "No es posible interpretar el 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 "El organizador ha quitado al 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 "Enviar una notificaciÃn de cancelaciÃn al 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 "No es posible enviar una notificaciÃn de cancelaciÃn al delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1893
+#: ../plugins/itip-formatter/itip-formatter.c:1947
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "No es posible actualizar la asistencia. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1900
+#: ../plugins/itip-formatter/itip-formatter.c:1954
 msgid "Attendee status updated"
 msgstr "Estado de asistencia actualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1923
+#: ../plugins/itip-formatter/itip-formatter.c:1977
 msgid "The meeting is invalid and cannot be updated"
 msgstr "La cita no es vÃlida y no se puede actualizar"
 
-#: ../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 ""
 "El estado de asistencia no pudo actualizarse debido a que el estado no es "
 "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 ""
 "El estado del participante no pudo actualizarse porque ya no existe el "
 "elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2155
+#: ../plugins/itip-formatter/itip-formatter.c:2224
 msgid "Meeting information sent"
 msgstr "InformaciÃn de reuniÃn enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2160
+#: ../plugins/itip-formatter/itip-formatter.c:2229
 msgid "Task information sent"
 msgstr "InformaciÃn de la tarea enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2165
+#: ../plugins/itip-formatter/itip-formatter.c:2234
 msgid "Memo information sent"
 msgstr "InformaciÃn de la nota enviada"
 
-#: ../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 "No se puede enviar la informaciÃn de la reuniÃn, la reuniÃn no 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 "No se puede enviar la informaciÃn de la tarea, la tarea no 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 "No se puede enviar la informaciÃn de la nota, la nota no 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 "calendario.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2256
+#: ../plugins/itip-formatter/itip-formatter.c:2325
 msgid "Save Calendar"
 msgstr "Guardar 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 "El calendario adjunto no es 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."
@@ -19144,15 +18971,15 @@ msgstr ""
 "El mensaje dice contener un calendario, pero el calendario no es un "
 "iCalendar vÃlido."
 
-#: ../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 "El elemento en el calendario no es 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"
@@ -19160,11 +18987,11 @@ msgstr ""
 "El mensaje contiene un calendario, pero el calendario no contiene ningÃn "
 "acontecimiento, tarea o informaciÃn de disponibilidad"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2406
+#: ../plugins/itip-formatter/itip-formatter.c:2475
 msgid "The calendar attached contains multiple items"
 msgstr "El calendario adjunto contiene elementos mÃltiples"
 
-#: ../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"
@@ -19172,235 +18999,235 @@ msgstr ""
 "Para procesar todos estos elementos, el archivo deberÃa guardarse y el "
 "calendario importarse"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2922
+#: ../plugins/itip-formatter/itip-formatter.c:3000
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ninguno"
 
-#: ../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 reuniÃn se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3084
+#: ../plugins/itip-formatter/itip-formatter.c:3162
 msgid "This task recurs"
 msgstr "Esta tarea se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3087
+#: ../plugins/itip-formatter/itip-formatter.c:3165
 msgid "This memo recurs"
 msgstr "Esta nota se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3392
+#: ../plugins/itip-formatter/itip-formatter.c:3429
 msgid "Meeting Invitations"
 msgstr "Invitaciones a reuniones"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3418
+#: ../plugins/itip-formatter/itip-formatter.c:3455
 msgid "_Delete message after acting"
 msgstr "_Eliminar el mensaje despuÃs de actuar"
 
-#: ../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 "BÃsqueda de conflictos"
 
 #. 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 "Seleccione los calendario en los que buscar conflictos entre reuniones"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:221
 msgid "Today %H:%M"
 msgstr "Hoy a las %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:221
+#: ../plugins/itip-formatter/itip-view.c:225
 msgid "Today %H:%M:%S"
 msgstr "Hoy a las %H:%M %S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:230
+#: ../plugins/itip-formatter/itip-view.c:234
 msgid "Today %l:%M:%S %p"
 msgstr "Hoy a las %l:%M:%S %p"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:245
+#: ../plugins/itip-formatter/itip-view.c:249
 msgid "Tomorrow %H:%M"
 msgstr "MaÃana a las %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:249
+#: ../plugins/itip-formatter/itip-view.c:253
 msgid "Tomorrow %H:%M:%S"
 msgstr "MaÃana a las %H:%M %S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:258
 msgid "Tomorrow %l:%M %p"
 msgstr "MaÃana a las %l:%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:258
+#: ../plugins/itip-formatter/itip-view.c:262
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "MaÃana a las %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:277
+#: ../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:282
+#: ../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:286
+#: ../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:291
+#: ../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:295
+#: ../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:304
+#: ../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:310
+#: ../plugins/itip-formatter/itip-view.c:314
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e de %B a las %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:314
+#: ../plugins/itip-formatter/itip-view.c:318
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e de %B a las %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:319
+#: ../plugins/itip-formatter/itip-view.c:323
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e de %B a las %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:323
+#: ../plugins/itip-formatter/itip-view.c:327
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e de %B a las %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:329
+#: ../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:334
+#: ../plugins/itip-formatter/itip-view.c:338
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e de %B de %Y a las %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:338
+#: ../plugins/itip-formatter/itip-view.c:342
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e de %B de %Y, a las %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:343
+#: ../plugins/itip-formatter/itip-view.c:347
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e de %B de %Y, a las %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:351
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y a las %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:385
-#: ../plugins/itip-formatter/itip-view.c:386
-#: ../plugins/itip-formatter/itip-view.c:471
-#: ../plugins/itip-formatter/itip-view.c:472
-#: ../plugins/itip-formatter/itip-view.c:557
-msgid "An unknown person"
-msgstr "Una persona desconocida"
-
+#: ../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 "Una persona desconocida"
+
+#: ../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 en nombre de %s"
 
-#: ../plugins/itip-formatter/itip-view.c:392
-#: ../plugins/itip-formatter/itip-view.c:478
-#: ../plugins/itip-formatter/itip-view.c:563
+#: ../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 en nombre de %s"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:401
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s ha publicado informaciÃn de reuniÃn a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:399
+#: ../plugins/itip-formatter/itip-view.c:403
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s ha publicado la siguiente informaciÃn de reuniÃn:"
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s ha delegado la reuniÃn siguiente en usted:"
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:411
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s solicita su presencia en la siguiente reuniÃn a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:413
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s solicita su presencia en la siguiente reuniÃn:"
 
-#: ../plugins/itip-formatter/itip-view.c:415
+#: ../plugins/itip-formatter/itip-view.c:419
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s desea apuntarse a una reuniÃn existente a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:417
+#: ../plugins/itip-formatter/itip-view.c:421
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s desea apuntarse a una reuniÃn existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:421
+#: ../plugins/itip-formatter/itip-view.c:425
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -19409,87 +19236,87 @@ msgstr ""
 "%s desea recibir la Ãltima informaciÃn de la siguiente reuniÃn a travÃs de %"
 "s:"
 
-#: ../plugins/itip-formatter/itip-view.c:423
+#: ../plugins/itip-formatter/itip-view.c:427
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s desea recibir la Ãltima informaciÃn para la siguiente reuniÃn:"
 
-#: ../plugins/itip-formatter/itip-view.c:427
+#: ../plugins/itip-formatter/itip-view.c:431
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s ha devuelto la siguiente respuesta a la reuniÃn a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:429
+#: ../plugins/itip-formatter/itip-view.c:433
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s ha devuelto la siguiente respuesta a la reuniÃn:"
 
-#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:437
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s ha cancelado la siguiente reuniÃn a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:439
 #, c-format
 msgid "%s has canceled the following meeting:"
 msgstr "%s ha cancelado la siguiente reuniÃn:"
 
-#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:443
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s ha propuesto los siguientes cambios para la reuniÃn a travÃs de %s."
 
-#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:445
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s ha propuesto los siguientes cambios para la reuniÃn:"
 
-#: ../plugins/itip-formatter/itip-view.c:445
+#: ../plugins/itip-formatter/itip-view.c:449
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s ha rehusado los siguientes cambios para la reuniÃn a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s ha rehusado los siguientes cambios para la reuniÃn:"
 
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:487
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s ha publicado la siguiente tarea a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:489
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s ha publicado la siguiente tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:490
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s solicita la asignaciÃn de %s para la siguiente tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:493
+#: ../plugins/itip-formatter/itip-view.c:497
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s le ha asignado una tarea a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:495
+#: ../plugins/itip-formatter/itip-view.c:499
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s le ha asignado a usted una tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:501
+#: ../plugins/itip-formatter/itip-view.c:505
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s desea aÃadirse a una tarea existente a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:503
+#: ../plugins/itip-formatter/itip-view.c:507
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s desea aÃadirse a una tarea existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:507
+#: ../plugins/itip-formatter/itip-view.c:511
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -19498,186 +19325,186 @@ msgstr ""
 "%s desea recibir la Ãltima informaciÃn para la siguiente tarea asignada a "
 "travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:509
+#: ../plugins/itip-formatter/itip-view.c:513
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr ""
 "%s quiere recibir la Ãltima informaciÃn para la siguiente tarea asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:513
+#: ../plugins/itip-formatter/itip-view.c:517
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr ""
 "%s ha devuelto la siguiente respuesta a la tarea asignada a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:515
+#: ../plugins/itip-formatter/itip-view.c:519
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s ha devuelto la siguiente respuesta a la tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:519
+#: ../plugins/itip-formatter/itip-view.c:523
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s ha cancelado la siguiente asignaciÃn de tarea a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:521
+#: ../plugins/itip-formatter/itip-view.c:525
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s ha cancelado la siguiente tarea asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:529
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr ""
 "%s ha propuesto los siguientes cambios en la asignaciÃn de tareas a travÃs "
 "de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:531
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s ha propuesto los siguientes cambios en la asignaciÃn de tareas:"
 
-#: ../plugins/itip-formatter/itip-view.c:531
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s ha rehusado la siguiente tarea asignada a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:533
+#: ../plugins/itip-formatter/itip-view.c:537
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s ha rehusado la siguiente tarea asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:568
+#: ../plugins/itip-formatter/itip-view.c:572
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s ha publicado la siguiente nota a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:570
+#: ../plugins/itip-formatter/itip-view.c:574
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s ha publicado la siguiente nota:"
 
-#: ../plugins/itip-formatter/itip-view.c:575
+#: ../plugins/itip-formatter/itip-view.c:579
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s desea aÃadir algo a una nota existente a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:577
+#: ../plugins/itip-formatter/itip-view.c:581
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s desea aÃadir algo a una nota existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:581
+#: ../plugins/itip-formatter/itip-view.c:585
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s ha cancelado la siguiente nota compartida a travÃs de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:583
+#: ../plugins/itip-formatter/itip-view.c:587
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s ha cancelado la siguiente nota compartida:"
 
-#: ../plugins/itip-formatter/itip-view.c:653
+#: ../plugins/itip-formatter/itip-view.c:657
 msgid "All day:"
 msgstr "Todo el dÃa:"
 
-#: ../plugins/itip-formatter/itip-view.c:659
+#: ../plugins/itip-formatter/itip-view.c:663
 msgid "Start day:"
 msgstr "DÃa de inicio:"
 
-#: ../plugins/itip-formatter/itip-view.c:659
-#: ../plugins/itip-formatter/itip-view.c:1156
+#: ../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:668
+#: ../plugins/itip-formatter/itip-view.c:672
 msgid "End day:"
 msgstr "DÃa de fin:"
 
-#: ../plugins/itip-formatter/itip-view.c:668
-#: ../plugins/itip-formatter/itip-view.c:1157
+#: ../plugins/itip-formatter/itip-view.c:672
+#: ../plugins/itip-formatter/itip-view.c:1400
 msgid "End time:"
 msgstr "Hora de fin:"
 
-#: ../plugins/itip-formatter/itip-view.c:1091
+#: ../plugins/itip-formatter/itip-view.c:1018
 msgid "_Open Calendar"
 msgstr "_Abrir calendario"
 
-#: ../plugins/itip-formatter/itip-view.c:1094
+#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "_Decline all"
 msgstr "_Rechazar todo"
 
-#: ../plugins/itip-formatter/itip-view.c:1097
+#: ../plugins/itip-formatter/itip-view.c:1024
 msgid "_Decline"
 msgstr "_Rechazar"
 
-#: ../plugins/itip-formatter/itip-view.c:1100
+#: ../plugins/itip-formatter/itip-view.c:1027
 msgid "_Tentative all"
 msgstr "_Provisional todo"
 
-#: ../plugins/itip-formatter/itip-view.c:1103
+#: ../plugins/itip-formatter/itip-view.c:1030
 msgid "_Tentative"
 msgstr "_Provisional"
 
-#: ../plugins/itip-formatter/itip-view.c:1106
+#: ../plugins/itip-formatter/itip-view.c:1033
 msgid "A_ccept all"
 msgstr "A_ceptar todo"
 
-#: ../plugins/itip-formatter/itip-view.c:1109
+#: ../plugins/itip-formatter/itip-view.c:1036
 msgid "A_ccept"
 msgstr "A_ceptar"
 
-#: ../plugins/itip-formatter/itip-view.c:1112
+#: ../plugins/itip-formatter/itip-view.c:1039
 msgid "_Send Information"
 msgstr "_Enviar informacioÌn"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1042
 msgid "_Update Attendee Status"
 msgstr "_Actualizar el estado del participante"
 
-#: ../plugins/itip-formatter/itip-view.c:1118
+#: ../plugins/itip-formatter/itip-view.c:1045
 msgid "_Update"
 msgstr "_Actualizar"
 
-#: ../plugins/itip-formatter/itip-view.c:1159
-#: ../plugins/itip-formatter/itip-view.c:1201
-#: ../plugins/itip-formatter/itip-view.c:1267
+#: ../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:1190
+#: ../plugins/itip-formatter/itip-view.c:1433
 msgid "Send reply to sender"
 msgstr "Responder al remitente"
 
 #. Updates
-#: ../plugins/itip-formatter/itip-view.c:1204
+#: ../plugins/itip-formatter/itip-view.c:1447
 msgid "Send _updates to attendees"
 msgstr "Enviar _actualizaciones a los participantes"
 
 #. The recurrence check button
-#: ../plugins/itip-formatter/itip-view.c:1207
+#: ../plugins/itip-formatter/itip-view.c:1450
 msgid "_Apply to all instances"
 msgstr "_Aplicar a todas las instancias"
 
-#: ../plugins/itip-formatter/itip-view.c:1208
+#: ../plugins/itip-formatter/itip-view.c:1451
 msgid "Show time as _free"
 msgstr "Mostrar hora como _libre"
 
-#: ../plugins/itip-formatter/itip-view.c:1209
+#: ../plugins/itip-formatter/itip-view.c:1452
 msgid "_Preserve my reminder"
 msgstr "Conser_var mi recordatorio"
 
-#: ../plugins/itip-formatter/itip-view.c:1210
+#: ../plugins/itip-formatter/itip-view.c:1453
 msgid "_Inherit reminder"
 msgstr "_Heredar recordatorio"
 
-#: ../plugins/itip-formatter/itip-view.c:1534
+#: ../plugins/itip-formatter/itip-view.c:1794
 msgid "_Tasks:"
 msgstr "_Tareas:"
 
-#: ../plugins/itip-formatter/itip-view.c:1537
+#: ../plugins/itip-formatter/itip-view.c:1797
 msgid "_Memos:"
 msgstr "_Notas:"
 
@@ -19702,59 +19529,59 @@ msgstr "Esta reuniÃn se ha delegado"
 msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr "Â{0}Â ha delegado la reuniÃn. ÂQuiere aÃadir al 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 "Obtener _archivador de la 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 "Obtener un archivador de la lista a la que pertenece este mensaje"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:357
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
 msgid "Get List _Usage Information"
 msgstr "Obtener informaciÃn de _uso de la 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 ""
 "Obtiene informaciÃn sobre el uso de la lista a la que pertenece este mensaje"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:364
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
 msgid "Contact List _Owner"
 msgstr "_Responsable de la 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 con el responsable de la lista de correo a la que pertenece este "
 "mensaje"
 
-#: ../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 un mensaje a la 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 un mensaje en la lista de correo a la que pertenece este mensaje"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:378
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
 msgid "_Subscribe to List"
 msgstr "_Suscribirse a la 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 "Suscribirse a la lista de correo a la que pertenece este mensaje"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:385
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
 msgid "_Unsubscribe from List"
 msgstr "_Desuscribirse de la 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 "Desuscribirse de la lista de correo a la que pertenece este correo"
 
-#: ../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"
 
@@ -19954,12 +19781,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Le notifica cuando llega un mensaje de correo nuevo."
 
 #. 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 de %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 "
@@ -19968,7 +19795,7 @@ msgstr ""
 "El calendario seleccionado ya contiene el acontecimiento Â%sÂ. ÂQuiere editar "
 "el acontecimiento antiguo?"
 
-#: ../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 "
@@ -19977,7 +19804,7 @@ msgstr ""
 "La lista de tareas seleccionada ya contiene la tarea Â%sÂ. ÂQuiere editar la "
 "tarea antigua?"
 
-#: ../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 "
@@ -19987,7 +19814,7 @@ msgstr ""
 "nota antigua?"
 
 #. 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 "
@@ -20003,7 +19830,7 @@ msgstr[1] ""
 "aÃadirlos 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 "
@@ -20019,7 +19846,7 @@ msgstr[1] ""
 "aÃadirlos 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 "
@@ -20034,29 +19861,33 @@ msgstr[1] ""
 "Ha seleccionado %d correos para convertirlos en notas. ÂRealmente quiere "
 "aÃadirlos 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 "ÂQuiere continuar convirtiendo los correos restantes?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:750
+#: ../plugins/mail-to-task/mail-to-task.c:756
 msgid "[No Summary]"
 msgstr "[Sin resumen]"
 
-#: ../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 "Un servidor devolviÃ un objeto no 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 "OcurriÃ un error al procesar: %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 "No se puede abrir el calendario. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:846
+#: ../plugins/mail-to-task/mail-to-task.c:845
+msgid "Unknown error."
+msgstr "Error desconocido."
+
+#: ../plugins/mail-to-task/mail-to-task.c:852
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -20064,7 +19895,7 @@ msgstr ""
 "El origen seleccionado es de sÃlo lectura, por ello no se puede crear un "
 "acontecimiento en Ãl. Seleccione otro origen."
 
-#: ../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."
@@ -20072,7 +19903,7 @@ msgstr ""
 "El origen seleccionado es de sÃlo lectura, por ello no se puede crear una "
 "tarea en Ãl. Seleccione otro origen."
 
-#: ../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."
@@ -20080,44 +19911,39 @@ msgstr ""
 "El origen seleccionado es de sÃlo lectura, por ello no se puede crear una "
 "nota en Ãl. Seleccione otro origen."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1100
-#, c-format
-msgid "Cannot get source list. %s"
-msgstr "No se pudo obtener la lista de origen. %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 "No hay ningÃn calendario escribible disponible."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1255
+#: ../plugins/mail-to-task/mail-to-task.c:1272
 msgid "Create an _Event"
 msgstr "Crear un _acontecimiento"
 
-#: ../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 un acontecimiento nuevo del mensaje seleccionado"
 
-#: ../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 una _nota"
 
-#: ../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 una nota nueva del mensaje seleccionado"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1269
+#: ../plugins/mail-to-task/mail-to-task.c:1286
 msgid "Create a _Task"
 msgstr "Crear una _tarea"
 
-#: ../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 una tarea nueva del mensaje seleccionado"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1279
+#: ../plugins/mail-to-task/mail-to-task.c:1296
 msgid "Create a _Meeting"
 msgstr "Crear una _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 una reuniÃn nueva del mensaje seleccionado"
 
@@ -20222,38 +20048,38 @@ msgstr "Carpetas personales de Outlook (.pst)"
 msgid "Import Outlook messages from PST file"
 msgstr "Importar mensajes de Outlook desde un archivo PST"
 
-#: ../plugins/pst-import/pst-importer.c:543
+#: ../plugins/pst-import/pst-importer.c:555
 msgid "_Mail"
 msgstr "Co_rreo"
 
-#: ../plugins/pst-import/pst-importer.c:571
+#: ../plugins/pst-import/pst-importer.c:584
 msgid "Destination folder:"
 msgstr "Carpeta de destino:"
 
-#: ../plugins/pst-import/pst-importer.c:581
+#: ../plugins/pst-import/pst-importer.c:594
 msgid "_Address Book"
 msgstr "Libreta de _direcciones"
 
-#: ../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 "_Tareas"
 
-#: ../plugins/pst-import/pst-importer.c:596
+#: ../plugins/pst-import/pst-importer.c:609
 msgid "_Journal entries"
 msgstr "Entradas del dia_rio"
 
-#: ../plugins/pst-import/pst-importer.c:709
+#: ../plugins/pst-import/pst-importer.c:721
 msgid "Importing Outlook data"
 msgstr "_Importando datos de 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"
 
@@ -20265,49 +20091,49 @@ msgstr "Lugares"
 msgid "Publish calendars to the web."
 msgstr "Publicar calendarios en la 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 "No se pudo 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 "No se ha podido abrir Â%sÂ: Error desconocido"
 
-#: ../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 "Hubo un error al 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 "La publicaciÃn en %s finalizÃ correctamente"
 
-#: ../plugins/publish-calendar/publish-calendar.c:286
+#: ../plugins/publish-calendar/publish-calendar.c:285
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "FallÃ al 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 "_Activar"
 
-#: ../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 "ÂSeguro que quiere eliminar este lugar?"
 
 #. 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 "No se pudo publicar el hilo de publicaciÃn."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1107
+#: ../plugins/publish-calendar/publish-calendar.c:1106
 msgid "_Publish Calendar Information"
 msgstr "_Publicar informaciÃn del calendario"
 
@@ -20399,101 +20225,101 @@ msgstr "_Recordar contraseÃa"
 msgid "Publishing Location"
 msgstr "Lugar de 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 ""
 "No se pudo publicar el calendario: El ÂbackendÂ del calendario ya no existe."
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:521
+#: ../plugins/publish-calendar/url-editor-dialog.c:526
 msgid "New Location"
 msgstr "UbicaciÃn nueva"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:523
+#: ../plugins/publish-calendar/url-editor-dialog.c:528
 msgid "Edit Location"
 msgstr "Editar ubicaciÃ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 descripciÃn"
 
-#: ../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 "Empieza"
 
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:380
 msgid "End"
 msgstr "Termina"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Due"
 msgstr "Vence"
 
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "percent Done"
 msgstr "porcentaje terminado"
 
-#: ../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 "Opciones avan_zadas para el formato CSV"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:570
 msgid "Prepend a _header"
 msgstr "Anteponer una ca_becera"
 
-#: ../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 _registro:"
 
-#: ../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)"
 
@@ -20510,31 +20336,31 @@ msgstr "Guardar un calendario o una lista de tareas al 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 "Seleccione el archivo de destino"
 
-#: ../plugins/save-calendar/save-calendar.c:344
+#: ../plugins/save-calendar/save-calendar.c:340
 msgid "Save the selected calendar to disk"
 msgstr "Guardar el calendario seleccionado al disco"
 
-#: ../plugins/save-calendar/save-calendar.c:375
+#: ../plugins/save-calendar/save-calendar.c:371
 msgid "Save the selected memo list to disk"
 msgstr "Guardar la lista de notas seleccionada al disco"
 
-#: ../plugins/save-calendar/save-calendar.c:406
+#: ../plugins/save-calendar/save-calendar.c:402
 msgid "Save the selected task list to disk"
 msgstr "Guardar la lista de tareas seleccionada al disco"
 
@@ -20548,15 +20374,15 @@ msgstr ""
 "$ORIG[subject], $ORIG[from], $ORIG[to] or $ORIG[body], que se reemplazarÃn "
 "con valores del correo-e al que estÃ respondiendo."
 
-#: ../plugins/templates/templates.c:1105
+#: ../plugins/templates/templates.c:1113
 msgid "No Title"
 msgstr "Sin tÃtulo"
 
-#: ../plugins/templates/templates.c:1217
+#: ../plugins/templates/templates.c:1225
 msgid "Save as _Template"
 msgstr "Guardar como plan_tilla"
 
-#: ../plugins/templates/templates.c:1219
+#: ../plugins/templates/templates.c:1227
 msgid "Save as Template"
 msgstr "Guardar como plantilla"
 
@@ -20577,47 +20403,31 @@ msgstr "vCards en lÃnea"
 msgid "Show vCards directly in mail messages."
 msgstr "Mostrar vCards directamente en los mensajes 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 "Guardar en la libreta de direcciones"
 
-#: ../plugins/vcard-inline/vcard-inline.c:386
+#: ../plugins/vcard-inline/vcard-inline.c:395
 msgid "There is one other contact."
 msgstr "Hay otro contacto mÃs."
 
-#: ../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] "Hay %d contacto mÃs."
 msgstr[1] "Hay otros %d contactos."
 
-#: ../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 "AÃadir contactos WebDAV a 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 "_Evitar IfMatch (necesario en 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"
@@ -20808,15 +20618,15 @@ msgstr "URL para la configuraciÃn automÃtica del proxy"
 msgid "URL that provides proxy configuration values."
 msgstr "URL que proporciona las variables de configuraciÃn del proxy."
 
-#: ../shell/e-shell.c:312
+#: ../shell/e-shell.c:313
 msgid "Preparing to go offline..."
 msgstr "PreparÃndose para desconectarseâ"
 
-#: ../shell/e-shell.c:365
+#: ../shell/e-shell.c:366
 msgid "Preparing to go online..."
 msgstr "PreparÃndose para conectarseâ"
 
-#: ../shell/e-shell.c:436
+#: ../shell/e-shell.c:437
 msgid "Preparing to quit..."
 msgstr "PreparÃndose para salirâ"
 
@@ -20857,14 +20667,14 @@ msgstr "vCard (.vcf)"
 msgid "All Files (*)"
 msgstr "Todos los archivos (*)"
 
-#: ../shell/e-shell-view.c:303
+#: ../shell/e-shell-view.c:304
 msgid "Saving user interface state"
 msgstr "Guardando el estado de la interfaz de 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 ""
 "Jorge GonzÃlez <jorgegonz svn gnome org>, 2007-2010\n"
@@ -20875,278 +20685,270 @@ msgstr ""
 "Eneko Lacunza <enlar iname com>, 2001-2002\n"
 "Carlos PerellÃ MarÃn <carlos gnome-db org>, 2000-2001"
 
-#: ../shell/e-shell-window-actions.c:654
+#: ../shell/e-shell-window-actions.c:653
 msgid "Evolution Website"
 msgstr "PÃgina web de 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:1248
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy no estÃ instalado."
 
-#: ../shell/e-shell-window-actions.c:1250
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Bug Buddy could not be run."
 msgstr "No se pudo ejecutar Bug Buddy."
 
-#: ../shell/e-shell-window-actions.c:1431
+#: ../shell/e-shell-window-actions.c:1411
 msgid "Show information about Evolution"
 msgstr "Mostrar informaciÃn acerca de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1436
-#: ../shell/e-shell-window-actions.c:1450
+#: ../shell/e-shell-window-actions.c:1416
+#: ../shell/e-shell-window-actions.c:1430
 msgid "_Close Window"
 msgstr "_Cerrar ventana"
 
-#: ../shell/e-shell-window-actions.c:1457
+#: ../shell/e-shell-window-actions.c:1437
 msgid "_Contents"
 msgstr "Ãnd_ice"
 
-#: ../shell/e-shell-window-actions.c:1459
+#: ../shell/e-shell-window-actions.c:1439
 msgid "Open the Evolution User Guide"
 msgstr "Abrir la GuÃa de usuario de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1485
-msgid "_Forget Passwords"
-msgstr "_Olvidar contraseÃas"
-
-#: ../shell/e-shell-window-actions.c:1487
-msgid "Forget all remembered passwords"
-msgstr "Olvidar todas las contraseÃas recordadas"
-
-#: ../shell/e-shell-window-actions.c:1492
+#: ../shell/e-shell-window-actions.c:1465
 msgid "I_mport..."
 msgstr "I_mportarâ"
 
-#: ../shell/e-shell-window-actions.c:1494
+#: ../shell/e-shell-window-actions.c:1467
 msgid "Import data from other programs"
 msgstr "Importa datos de otros programas"
 
-#: ../shell/e-shell-window-actions.c:1499
+#: ../shell/e-shell-window-actions.c:1472
 msgid "New _Window"
 msgstr "_Ventana nueva"
 
-#: ../shell/e-shell-window-actions.c:1501
+#: ../shell/e-shell-window-actions.c:1474
 msgid "Create a new window displaying this view"
 msgstr "Crear una ventana nueva mostrando esta vista"
 
-#: ../shell/e-shell-window-actions.c:1513
+#: ../shell/e-shell-window-actions.c:1486
 msgid "Available Cate_gories"
 msgstr "CategorÃas _disponibles:"
 
-#: ../shell/e-shell-window-actions.c:1515
+#: ../shell/e-shell-window-actions.c:1488
 msgid "Manage available categories"
 msgstr "Gestionar las categorÃas disponibles"
 
-#: ../shell/e-shell-window-actions.c:1527
+#: ../shell/e-shell-window-actions.c:1500
 msgid "_Quick Reference"
 msgstr "_Referencia rÃpida"
 
-#: ../shell/e-shell-window-actions.c:1529
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Show Evolution's shortcut keys"
 msgstr "Mostrar los atajos de teclas de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1536
+#: ../shell/e-shell-window-actions.c:1509
 msgid "Exit the program"
 msgstr "Sale del programa"
 
-#: ../shell/e-shell-window-actions.c:1541
+#: ../shell/e-shell-window-actions.c:1514
 msgid "_Advanced Search..."
 msgstr "BÃsqueda _avanzadaâ"
 
-#: ../shell/e-shell-window-actions.c:1543
+#: ../shell/e-shell-window-actions.c:1516
 msgid "Construct a more advanced search"
 msgstr "Construir una bÃsqueda mÃs avanzada"
 
-#: ../shell/e-shell-window-actions.c:1550
+#: ../shell/e-shell-window-actions.c:1523
 msgid "Clear the current search parameters"
 msgstr "Limpiar los parÃmetros de bÃsqueda actuales"
 
-#: ../shell/e-shell-window-actions.c:1555
+#: ../shell/e-shell-window-actions.c:1528
 msgid "_Edit Saved Searches..."
 msgstr "_Editar bÃsquedas guardadasâ"
 
-#: ../shell/e-shell-window-actions.c:1557
+#: ../shell/e-shell-window-actions.c:1530
 msgid "Manage your saved searches"
 msgstr "Gestionar sus bÃsquedas guardadas"
 
-#: ../shell/e-shell-window-actions.c:1564
+#: ../shell/e-shell-window-actions.c:1537
 msgid "Click here to change the search type"
 msgstr "Pulse aquÃ para cambiar el tipo de bÃsqueda"
 
 # En conflicto con _Buscar del menu principal
-#: ../shell/e-shell-window-actions.c:1569
+#: ../shell/e-shell-window-actions.c:1542
 msgid "_Find Now"
 msgstr "B_uscar ahora"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1571
+#: ../shell/e-shell-window-actions.c:1544
 msgid "Execute the current search parameters"
 msgstr "Ejecutar los parÃmetros de bÃsqueda actuales"
 
-#: ../shell/e-shell-window-actions.c:1576
+#: ../shell/e-shell-window-actions.c:1549
 msgid "_Save Search..."
 msgstr "_Guardar bÃsquedaâ"
 
-#: ../shell/e-shell-window-actions.c:1578
+#: ../shell/e-shell-window-actions.c:1551
 msgid "Save the current search parameters"
 msgstr "Guardar los parÃmetros de bÃsqueda actuales"
 
-#: ../shell/e-shell-window-actions.c:1590
+#: ../shell/e-shell-window-actions.c:1563
 msgid "Submit _Bug Report..."
 msgstr "Enviar informe de _falloâ"
 
-#: ../shell/e-shell-window-actions.c:1592
+#: ../shell/e-shell-window-actions.c:1565
 msgid "Submit a bug report using Bug Buddy"
 msgstr "EnvÃa un informe de fallos usando Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1597
+#: ../shell/e-shell-window-actions.c:1570
 msgid "_Work Offline"
 msgstr "_Trabajar desconectado"
 
-#: ../shell/e-shell-window-actions.c:1599
+#: ../shell/e-shell-window-actions.c:1572
 msgid "Put Evolution into offline mode"
 msgstr "Poner Evolution en modo desconectado"
 
-#: ../shell/e-shell-window-actions.c:1604
+#: ../shell/e-shell-window-actions.c:1577
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: ../shell/e-shell-window-actions.c:1606
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Put Evolution into online mode"
 msgstr "Poner Evolution en modo conectado"
 
-#: ../shell/e-shell-window-actions.c:1634
+#: ../shell/e-shell-window-actions.c:1607
 msgid "Lay_out"
 msgstr "_DistribuciÃn"
 
-#: ../shell/e-shell-window-actions.c:1641
+#: ../shell/e-shell-window-actions.c:1614
 msgid "_New"
 msgstr "_Nuevo"
 
-#: ../shell/e-shell-window-actions.c:1648
+#: ../shell/e-shell-window-actions.c:1621
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../shell/e-shell-window-actions.c:1655
+#: ../shell/e-shell-window-actions.c:1628
 msgid "_Switcher Appearance"
 msgstr "Apariencia del _selector"
 
-#: ../shell/e-shell-window-actions.c:1669
+#: ../shell/e-shell-window-actions.c:1642
 msgid "_Window"
 msgstr "_Ventana"
 
-#: ../shell/e-shell-window-actions.c:1698
+#: ../shell/e-shell-window-actions.c:1671
 msgid "Show Side _Bar"
 msgstr "Mostrar barra _lateral"
 
-#: ../shell/e-shell-window-actions.c:1700
+#: ../shell/e-shell-window-actions.c:1673
 msgid "Show the side bar"
 msgstr "Mostrar la barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1679
 msgid "Show _Buttons"
 msgstr "Mostrar _botones"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1681
 msgid "Show the switcher buttons"
 msgstr "Mostrar los botones del selector"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1687
 msgid "Show _Status Bar"
 msgstr "Mostrar barra de _estado"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1689
 msgid "Show the status bar"
 msgstr "Mostrar la barra de estado"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show _Tool Bar"
 msgstr "Mostrar barra de _herramientas"
 
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1697
 msgid "Show the tool bar"
 msgstr "Mostrar la barra de herramientas"
 
-#: ../shell/e-shell-window-actions.c:1746
+#: ../shell/e-shell-window-actions.c:1719
 msgid "_Icons Only"
 msgstr "SÃlo _iconos"
 
-#: ../shell/e-shell-window-actions.c:1748
+#: ../shell/e-shell-window-actions.c:1721
 msgid "Display window buttons with icons only"
 msgstr "Mostrar los botones de la ventana sÃlo con iconos"
 
-#: ../shell/e-shell-window-actions.c:1753
+#: ../shell/e-shell-window-actions.c:1726
 msgid "_Text Only"
 msgstr "SÃlo _texto"
 
-#: ../shell/e-shell-window-actions.c:1755
+#: ../shell/e-shell-window-actions.c:1728
 msgid "Display window buttons with text only"
 msgstr "Mostrar los botones de la ventana sÃlo con texto"
 
-#: ../shell/e-shell-window-actions.c:1760
+#: ../shell/e-shell-window-actions.c:1733
 msgid "Icons _and Text"
 msgstr "Iconos _y texto"
 
-#: ../shell/e-shell-window-actions.c:1762
+#: ../shell/e-shell-window-actions.c:1735
 msgid "Display window buttons with icons and text"
 msgstr "Mostrar los botones de la ventana con iconos y texto"
 
-#: ../shell/e-shell-window-actions.c:1767
+#: ../shell/e-shell-window-actions.c:1740
 msgid "Tool_bar Style"
 msgstr "Estilo de la _barra de herramientas"
 
-#: ../shell/e-shell-window-actions.c:1769
+#: ../shell/e-shell-window-actions.c:1742
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Mostrar los botones de la ventana usando la configuraciÃn de la barra de "
 "herramientas del escritorio"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1750
 msgid "Define Views..."
 msgstr "Definir vistasâ"
 
-#: ../shell/e-shell-window-actions.c:1779
+#: ../shell/e-shell-window-actions.c:1752
 msgid "Create or edit views"
 msgstr "Crear o editar vistas"
 
-#: ../shell/e-shell-window-actions.c:1784
+#: ../shell/e-shell-window-actions.c:1757
 msgid "Save Custom View..."
 msgstr "Guardar vista personalizadaâ"
 
-#: ../shell/e-shell-window-actions.c:1786
+#: ../shell/e-shell-window-actions.c:1759
 msgid "Save current custom view"
 msgstr "Guardar la vista actual personalizada"
 
-#: ../shell/e-shell-window-actions.c:1793
+#: ../shell/e-shell-window-actions.c:1766
 msgid "C_urrent View"
 msgstr "Vista act_ual"
 
-#: ../shell/e-shell-window-actions.c:1803
+#: ../shell/e-shell-window-actions.c:1776
 msgid "Custom View"
 msgstr "Vista personalizada"
 
-#: ../shell/e-shell-window-actions.c:1805
+#: ../shell/e-shell-window-actions.c:1778
 msgid "Current view is a customized view"
 msgstr "La vista actual es una vista personalizada"
 
-#: ../shell/e-shell-window-actions.c:1815
+#: ../shell/e-shell-window-actions.c:1788
 msgid "Change the page settings for your current printer"
 msgstr "Cambiar la configuraciÃn de pÃgina para la impresora actual"
 
-#: ../shell/e-shell-window-actions.c:2205
+#: ../shell/e-shell-window-actions.c:2178
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
-#: ../shell/e-shell-window-actions.c:2326
+#: ../shell/e-shell-window-actions.c:2299
 #, c-format
 msgid "Select view: %s"
 msgstr "Seleccionar vista: %s"
 
-#: ../shell/e-shell-window-actions.c:2427
+#: ../shell/e-shell-window-actions.c:2400
 msgid "Execute these search parameters"
 msgstr "Ejecutar estos parÃmetros de bÃsqueda"
 
@@ -21161,7 +20963,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"
@@ -21197,7 +20999,7 @@ msgstr ""
 "Esperamos que disfrute del resultado de nuestro duro trabajo y \n"
 "esperamos su contribuciÃn.\n"
 
-#: ../shell/main.c:214
+#: ../shell/main.c:212
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -21205,13 +21007,13 @@ msgstr ""
 "Gracias\n"
 "El equipo de Evolution\n"
 
-#: ../shell/main.c:221
+#: ../shell/main.c:219
 msgid "Do not tell me again"
 msgstr "No preguntarme mÃs veces"
 
 #. 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'"
@@ -21219,47 +21021,47 @@ msgstr ""
 "Iniciar Evolution mostrando el componente especificado. Las opciones "
 "disponibles son ÂmailÂ, ÂcalendarÂ, ÂcontactsÂ, ÂtasksÂ y ÂmemosÂ."
 
-#: ../shell/main.c:316
+#: ../shell/main.c:314
 msgid "Apply the given geometry to the main window"
 msgstr "Aplicar la geometrÃa proporcionada a la ventana 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 la disponibilidad de la red"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:322
 msgid "Start in \"express\" mode"
 msgstr "Iniciar en modo ÂexprÃsÂ"
 
-#: ../shell/main.c:327
+#: ../shell/main.c:325
 msgid "Forcibly shut down Evolution"
 msgstr "Forzar el cierre de Evolution"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:328
 msgid "Disable loading of any plugins."
 msgstr "Desactivar la carga de cualquier complemento."
 
-#: ../shell/main.c:332
+#: ../shell/main.c:330
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar la vista previa del correo, contactos y tareas."
 
-#: ../shell/main.c:336
+#: ../shell/main.c:334
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Importar URI o nombres de archivos proporcionados como argumentos."
 
-#: ../shell/main.c:338
+#: ../shell/main.c:336
 msgid "Request a running Evolution process to quit"
 msgstr "Solicitar que el proceso de ejecuciÃn de Evolution finalice"
 
-#: ../shell/main.c:515 ../shell/main.c:523
+#: ../shell/main.c:513 ../shell/main.c:521
 msgid "- The Evolution PIM and Email Client"
 msgstr "El cliente de correo-e y GIP Evolution"
 
-#: ../shell/main.c:588
+#: ../shell/main.c:586
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21268,7 +21070,7 @@ msgstr ""
 "%s: --online y --offline no se pueden usar a la vez.\n"
 "  Ejecute Â%s --helpÂ para obtener mÃs informaciÃn\n"
 
-#: ../shell/main.c:594
+#: ../shell/main.c:592
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -21314,22 +21116,6 @@ msgstr ""
 "obstante, como soluciÃn puede intentar actualizar primero a Evolution 2 y "
 "despuÃs a Evolution 3."
 
-#: ../shell/shell.error.xml.h:11
-msgid "Are you sure you want to forget all remembered passwords?"
-msgstr "ÂSeguro que quiere olvidar todas las contraseÃas almacenadas?"
-
-#: ../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 ""
-"Olvidar sus contraseÃas eliminarÃ todas las contraseÃas recordadas. Se le "
-"volverÃ a preguntar la prÃxima vez que se necesiten."
-
-#: ../shell/shell.error.xml.h:13
-msgid "_Forget"
-msgstr "_Olvidar"
-
 #: ../shell/test/e-test-shell-backend.c:52
 msgctxt "New"
 msgid "_Test Item"
@@ -21439,7 +21225,7 @@ msgstr "Expedido a la unidad 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"
 
@@ -21496,27 +21282,27 @@ msgstr "Huella MD5"
 msgid "Email Address"
 msgstr "DirecciÃn de correo-e"
 
-#: ../smime/gui/certificate-manager.c:584
+#: ../smime/gui/certificate-manager.c:589
 msgid "Select a certificate to import..."
 msgstr "Seleccione un certificado para importarâ"
 
-#: ../smime/gui/certificate-manager.c:597
+#: ../smime/gui/certificate-manager.c:602
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: ../smime/gui/certificate-manager.c:632
+#: ../smime/gui/certificate-manager.c:637
 msgid "Failed to import certificate"
 msgstr "FallÃ al importar el certificado"
 
-#: ../smime/gui/certificate-manager.c:1006
+#: ../smime/gui/certificate-manager.c:1013
 msgid "All PKCS12 files"
 msgstr "Todos los archivos PKCS12"
 
-#: ../smime/gui/certificate-manager.c:1023
+#: ../smime/gui/certificate-manager.c:1030
 msgid "All email certificate files"
 msgstr "Todos los archivos de certificado de correos-e"
 
-#: ../smime/gui/certificate-manager.c:1040
+#: ../smime/gui/certificate-manager.c:1047
 msgid "All CA certificate files"
 msgstr "Todos los archivos de certificados AC"
 
@@ -21582,11 +21368,11 @@ msgstr ""
 msgid "Select certificate"
 msgstr "Seleccione el 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"
 
@@ -21650,6 +21436,10 @@ msgstr "Campos del certificado"
 msgid "Field Value"
 msgstr "Valor del campo"
 
+#: ../smime/gui/smime-ui.ui.h:25
+msgid "Details"
+msgstr "Detalles"
+
 #: ../smime/gui/smime-ui.ui.h:26
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Tiene certificados de estas organizaciones que le identifican:"
@@ -21714,7 +21504,7 @@ msgstr ""
 "Antes de confiar en esta AC para cualquier propÃsito, deberÃa examinar su "
 "certificado y su directiva y procedimientos (si estÃn disponibles)."
 
-#: ../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"
 
@@ -21738,153 +21528,153 @@ msgstr "No confiar en la autenticidad de este certificado"
 msgid "_Edit CA Trust"
 msgstr "_Editar confianza en la AC"
 
-#: ../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 "%e/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:391
+#: ../smime/lib/e-cert.c:390
 msgid "Sign"
 msgstr "Firma"
 
-#: ../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 de la clave del 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 de la clave de la autoridad del certificado"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identificador del objeto (%s)"
 
-#: ../smime/lib/e-cert.c:723
+#: ../smime/lib/e-cert.c:722
 msgid "Algorithm Identifier"
 msgstr "Identificador del algoritmo"
 
-#: ../smime/lib/e-cert.c:731
+#: ../smime/lib/e-cert.c:730
 msgid "Algorithm Parameters"
 msgstr "ParÃmetros del algoritmo"
 
-#: ../smime/lib/e-cert.c:753
+#: ../smime/lib/e-cert.c:752
 msgid "Subject Public Key Info"
 msgstr "InformaciÃn del propÃsito de la clave pÃblica"
 
-#: ../smime/lib/e-cert.c:758
+#: ../smime/lib/e-cert.c:757
 msgid "Subject Public Key Algorithm"
 msgstr "PropÃsito del algoritmo de clave pÃblica"
 
-#: ../smime/lib/e-cert.c:773
+#: ../smime/lib/e-cert.c:772
 msgid "Subject's Public Key"
 msgstr "Clave pÃblica del propÃsito"
 
-#: ../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: No es posible procesar la 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 "Firmante del objeto"
 
-#: ../smime/lib/e-cert.c:819
+#: ../smime/lib/e-cert.c:818
 msgid "SSL Certificate Authority"
 msgstr "Autoridad certificadora SSL"
 
-#: ../smime/lib/e-cert.c:823
+#: ../smime/lib/e-cert.c:822
 msgid "Email Certificate Authority"
 msgstr "Autoridad certificadora de correo"
 
-#: ../smime/lib/e-cert.c:852
+#: ../smime/lib/e-cert.c:851
 msgid "Signing"
 msgstr "Firma"
 
-#: ../smime/lib/e-cert.c:856
+#: ../smime/lib/e-cert.c:855
 msgid "Non-repudiation"
 msgstr "No repudio"
 
-#: ../smime/lib/e-cert.c:860
+#: ../smime/lib/e-cert.c:859
 msgid "Key Encipherment"
 msgstr "Cifrado de la clave"
 
-#: ../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 "Acuerdo de claves"
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:871
 msgid "Certificate Signer"
 msgstr "Firmante del certificado"
 
-#: ../smime/lib/e-cert.c:876
+#: ../smime/lib/e-cert.c:875
 msgid "CRL Signer"
 msgstr "Firmante de la 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 "No crÃtico"
 
-#: ../smime/lib/e-cert.c:951
+#: ../smime/lib/e-cert.c:950
 msgid "Extensions"
 msgstr "Extensiones"
 
@@ -21896,44 +21686,44 @@ msgstr "Extensiones"
 #. * 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 firma del 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 del emisor"
 
-#: ../smime/lib/e-cert.c:1169
+#: ../smime/lib/e-cert.c:1168
 msgid "Subject Unique ID"
 msgstr "ID Ãnico del propÃsito"
 
-#: ../smime/lib/e-cert.c:1215
+#: ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Value"
 msgstr "Valor de la firma del certificado"
 
-#: ../smime/lib/e-cert-db.c:859
+#: ../smime/lib/e-cert-db.c:860
 msgid "Certificate already exists"
 msgstr "El certificado ya existe"
 
-#: ../smime/lib/e-pkcs12.c:199
+#: ../smime/lib/e-pkcs12.c:200
 msgid "PKCS12 File Password"
 msgstr "ContraseÃa del archivo PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:200
+#: ../smime/lib/e-pkcs12.c:201
 msgid "Enter password for PKCS12 file:"
 msgstr "Introduzca la contraseÃa para el archivo PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:306
+#: ../smime/lib/e-pkcs12.c:307
 msgid "Imported Certificate"
 msgstr "Certificado importado"
 
@@ -22092,17 +21882,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 "%e 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 a %s"
 
-#: ../widgets/misc/ea-calendar-item.c:354
+#: ../widgets/misc/ea-calendar-item.c:356
 msgid "evolution calendar item"
 msgstr "elemento de calendario de Evolution"
 
@@ -22170,6 +21960,11 @@ msgstr "No se pudo guardar el adjunto"
 msgid "Attachment Properties"
 msgstr "Propiedades de adjuntos"
 
+#: ../widgets/misc/e-attachment-dialog.c:333
+#: ../widgets/misc/e-import-assistant.c:273
+msgid "F_ilename:"
+msgstr "Nombre del _archivo:"
+
 #: ../widgets/misc/e-attachment-dialog.c:368
 msgid "MIME Type:"
 msgstr "Tipo MIME:"
@@ -22298,20 +22093,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 %Y"
@@ -22328,7 +22123,7 @@ msgstr "Introduzca el conjunto de caracteres a usar"
 msgid "Other..."
 msgstr "Otroâ"
 
-#: ../widgets/misc/e-contact-map-window.c:359
+#: ../widgets/misc/e-contact-map-window.c:356
 msgid "Contacts Map"
 msgstr "Mapa de los contactos"
 
@@ -22475,9 +22270,59 @@ msgstr "Seleccione la imformaciÃn para importar"
 msgid "Select a File"
 msgstr "Seleccione un archivo"
 
-#: ../widgets/misc/e-import-assistant.c:1362
-msgid "Click \"Apply\" to begin importing the file into Evolution."
-msgstr "Pulse ÂAplicarÂ para comenzar a importar el archivo en Evolution."
+#: ../widgets/misc/e-import-assistant.c:1362
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "Pulse ÂAplicarÂ para comenzar a importar el archivo en Evolution."
+
+#: ../widgets/misc/e-mail-signature-combo-box.c:327
+msgid "Autogenerated"
+msgstr "Autogenerado"
+
+#: ../widgets/misc/e-mail-signature-editor.c:292
+msgid "_Save and Close"
+msgstr "_Guardar y cerrar"
+
+#: ../widgets/misc/e-mail-signature-editor.c:506
+msgid "Edit Signature"
+msgstr "Editar firma"
+
+#: ../widgets/misc/e-mail-signature-editor.c:526
+msgid "_Signature Name:"
+msgstr "Nombre de la _firma"
+
+#: ../widgets/misc/e-mail-signature-editor.c:572
+msgid "Unnamed"
+msgstr "Sin nombre"
+
+#: ../widgets/misc/e-mail-signature-manager.c:337
+msgid "Add _Script"
+msgstr "AÃadir _script"
+
+#: ../widgets/misc/e-mail-signature-manager.c:421
+msgid "Add Signature Script"
+msgstr "AÃadir un script de firma"
+
+#: ../widgets/misc/e-mail-signature-manager.c:491
+msgid "Edit Signature Script"
+msgstr "Editar script de firma"
+
+#: ../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 ""
+"La salida de este script se usarÃ como su firma.\n"
+"El nombre que especifique se usarÃ Ãnicamente\n"
+"para mostrarlo por pantalla. "
+
+#: ../widgets/misc/e-mail-signature-script-dialog.c:446
+msgid "S_cript:"
+msgstr "S_cript:"
+
+#: ../widgets/misc/e-mail-signature-script-dialog.c:477
+msgid "Script file must be executable."
+msgstr "El script debe ser ejecutable."
 
 #: ../widgets/misc/e-map.c:886
 msgid "World Map"
@@ -22693,54 +22538,34 @@ msgstr "Devolver notificaciÃn"
 msgid "Sta_tus Tracking"
 msgstr "Seguimiento 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 "Sin nombre"
-
-#: ../widgets/misc/e-signature-editor.c:220
-msgid "_Save and Close"
-msgstr "_Guardar y cerrar"
-
-#: ../widgets/misc/e-signature-editor.c:458
-msgid "Edit Signature"
-msgstr "Editar firma"
-
-#: ../widgets/misc/e-signature-editor.c:473
-msgid "_Signature Name:"
-msgstr "Nombre de la _firma"
-
-#: ../widgets/misc/e-signature-manager.c:321
-msgid "Add Signature Script"
-msgstr "AÃadir un script de firma"
-
-#: ../widgets/misc/e-signature-manager.c:388
-msgid "Edit Signature Script"
-msgstr "Editar script de firma"
+#: ../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 "AÃadir _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 the folder"
+msgid "Refresh every"
+msgstr "Actualizar la carpeta"
 
-#: ../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 ""
-"La salida de este script se usarÃ como su firma.\n"
-"El nombre que especifique se usarÃ Ãnicamente\n"
-"para mostrarlo por pantalla. "
+#: ../widgets/misc/e-source-config.c:1054
+#: ../widgets/misc/e-source-config.c:1082
+#, fuzzy
+#| msgid "Use _secure connection"
+msgid "Use a secure connection"
+msgstr "Usar _conexiÃn segura"
 
-#: ../widgets/misc/e-signature-script-dialog.c:315
-msgid "S_cript:"
-msgstr "S_cript:"
+#: ../widgets/misc/e-source-config.c:1096
+#, fuzzy
+#| msgid "_Ignore invalid SSL certificate"
+msgid "Ignore invalid SSL certificate"
+msgstr "_Ignorar certificado SSL no vÃlido"
 
-#: ../widgets/misc/e-signature-script-dialog.c:346
-msgid "Script file must be executable."
-msgstr "El script debe ser ejecutable."
+#: ../widgets/misc/e-source-config.c:1133
+msgid "User"
+msgstr "_Usuario"
 
 #. no suggestions. Put something in the menu anyway...
 #: ../widgets/misc/e-spell-entry.c:348
@@ -22770,57 +22595,87 @@ msgstr "Sugerencias de ortografiÌa"
 msgid "Click here to go to URL"
 msgstr "Pulse aquÃ para ir a la 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 direcciÃn del enlace"
 
-#: ../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 el enlace al portapapeles"
 
-#: ../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 enlace en el 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 enlace en el navegador"
 
-#: ../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 direcciÃn de correo-e"
 
-#: ../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 imagen"
 
-#: ../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 la imagen al portapapeles"
 
 #: ../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 el texto y las imÃgenes"
 
 #: ../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 "Pulse para llamar 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 "Pulse para ocultar/mostrar las direcciones"
 
-#: ../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 "Pulse para abrir %s"
 
+#: ../widgets/misc/widgets.error.xml.h:1
+msgid "Do you wish to save your changes?"
+msgstr "ÂDesea guardar los cambios?"
+
+#: ../widgets/misc/widgets.error.xml.h:2
+msgid "This signature has been changed, but has not been saved."
+msgstr "Esta firma ha cambiado, pero no ha sido guardada."
+
+#: ../widgets/misc/widgets.error.xml.h:3
+msgid "_Discard changes"
+msgstr "_Descartar los cambios"
+
+#: ../widgets/misc/widgets.error.xml.h:4
+msgid "Blank Signature"
+msgstr "Firma en blanco"
+
+#: ../widgets/misc/widgets.error.xml.h:5
+msgid "Please provide an unique name to identify this signature."
+msgstr "Introduzca un nombre Ãnico para identificar esta firma."
+
+#: ../widgets/misc/widgets.error.xml.h:6
+#| msgid "Could not save signature file."
+msgid "Could not load signature."
+msgstr "No se pudo cargar la firma."
+
+#: ../widgets/misc/widgets.error.xml.h:7
+#| msgid "Could not save signature file."
+msgid "Could not save signature."
+msgstr "No se pudo guardar la firma."
+
 #: ../widgets/table/e-cell-combo.c:187
 msgid "popup list"
 msgstr "lista emergente"
@@ -23098,6 +22953,502 @@ msgstr "Seleccionar todo"
 msgid "Input Methods"
 msgstr "MÃtodos de entrada"
 
+#~ msgid "Couldn't get list of address books: %s"
+#~ msgstr "No se pudo obtener la lista de libretas de direcciones: %s"
+
+#~ msgid "_Type:"
+#~ msgstr "_Tipo:"
+
+#~ msgid "Sh_ow reminder notifications"
+#~ msgstr "M_ostrar notificaciones de recordatorios"
+
+#~ msgid "You are acting on behalf of %s"
+#~ msgstr "EstÃ actuando en nombre de %s"
+
+#~ msgid "On This Computer"
+#~ msgstr "En este equipo"
+
+#~ msgid "List of selected calendars"
+#~ msgstr "Lista de los calendarios seleccionados"
+
+#~ msgid "List of calendars to load"
+#~ msgstr "Lista de calendarios disponibles"
+
+#~ msgid "List of selected memo lists"
+#~ msgstr "Lista de listas notas seleccionadas"
+
+#~ msgid "List of memo lists to load"
+#~ msgstr "El registro de lista de nota"
+
+#~ msgid "List of selected task lists"
+#~ msgstr "Lista de listas de tareas seleccionadas"
+
+#~ msgid "List of task lists to load"
+#~ msgstr "Lista de listas de tareas para cargar"
+
+#~ msgid "Enter Passphrase for %s"
+#~ msgstr "Introduzca la contraseÃa para %s"
+
+#~ msgid "Enter Passphrase"
+#~ msgstr "Introduzca la contraseÃa"
+
+#~ msgid "Enter Password for %s"
+#~ msgstr "Introduzca su contraseÃa para %s"
+
+#~ msgid "Enter Password"
+#~ msgstr "Introduzca contraseÃa"
+
+#~ msgctxt "mail-signature"
+#~ msgid "None"
+#~ msgstr "Ninguna"
+
+#~ msgid "Mail Configuration"
+#~ msgstr "ConfiguraciÃn del correo"
+
+#~ msgid "Please configure the following account settings."
+#~ msgstr "Configure las siguientes opciones de la cuenta."
+
+#~ 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 ""
+#~ "Escriba debajo la informaciÃn acerca de cÃmo enviarÃ su correo. Si no "
+#~ "estÃ seguro, pregÃntele a su administrador de sistemas o a su Proveedor "
+#~ "de Servicios de Internet."
+
+#~ msgid "Check for _new messages every"
+#~ msgstr "Comprobar si hay mensajes _nuevos cada"
+
+#~ msgid "minu_tes"
+#~ msgstr "minuto_s"
+
+#~ msgid "Checking for New Messages"
+#~ msgstr "Comprobando si hay mensajes nuevos"
+
+#~ msgid "Setup Google con_tacts with Evolution"
+#~ msgstr "Configurar los con_tactos de Google con Evolution"
+
+#~ msgid "Setup Google ca_lendar with Evolution"
+#~ msgstr "Configurar el ca_lendario de Google con Evolution"
+
+#~ msgid "Yahoo! account settings:"
+#~ msgstr "ConfiguraciÃn de la cuenta de Yahoo!:"
+
+#~ msgid "Setup _Yahoo! calendar with Evolution"
+#~ msgstr "Configurar el calendario de _Yahoo! con Evolution"
+
+#~ msgid "Setup Yahoo! _tasks with Evolution"
+#~ msgstr "Configurar las tareas de Yahoo! con 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 ""
+#~ "Los calendarios de Yahoo! se llaman nombre_apellido. Se ha intentado "
+#~ "formar el nombre del calendario. Confirme y vuelva a introducir el nombre "
+#~ "del calendario si no es correcto, o cÃmbielo mÃs tarde en las propiedades "
+#~ "del calendario."
+
+#~ msgid "Yahoo! Calen_dar name:"
+#~ msgstr "Nombre del calen_dario de Yahoo!:"
+
+#~ msgid "_Add Signature"
+#~ msgstr "_AÃadir firma"
+
+#~ 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 ""
+#~ "La salida de este script se usarÃ como su firma. \n"
+#~ "El nombre que especifique se usarÃ Ãnicamente \n"
+#~ "para mostrarlo por pantalla. "
+
+#~ msgid "_Script:"
+#~ msgstr "_Script:"
+
+#~ msgid "Drafts _Folder:"
+#~ msgstr "Carpeta de _borradores:"
+
+#~ msgid "_Trash Folder:"
+#~ msgstr "Carpeta de p_apelera:"
+
+#~ msgid "_Junk Folder:"
+#~ msgstr "Carpeta de _SPAM:"
+
+#~ msgid "Signat_ure:"
+#~ msgstr "_Firma:"
+
+#~ msgid "_Make this my default account"
+#~ msgstr "_Hacer que Ãsta sea mi cuenta predeterminada"
+
+#~ msgid "Also encrypt to sel_f when sending encrypted messages"
+#~ msgstr "TambiÃn cifrar a _mÃ mismo cuando envÃe correo cifrado"
+
+#~ msgid "Encrypt out_going messages (by default)"
+#~ msgstr "Cifrar mensajes _salientes (por omisiÃn)"
+
+#~ msgid "Digitally sign o_utgoing messages (by default)"
+#~ msgstr "Firmar digitalmente los mensajes s_alientes (por omisiÃn)"
+
+#~ msgid "S_elect..."
+#~ msgstr "S_eleccionarâ"
+
+#~ msgid "Clea_r"
+#~ msgstr "Vacia_r"
+
+#~ msgid "Cle_ar"
+#~ msgstr "_Vaciar"
+
+#~ msgid "description"
+#~ msgstr "descripciÃn"
+
+#~ msgid "Mailbox location"
+#~ msgstr "DirecciÃn del buzÃn"
+
+#~ msgid "_Use secure connection:"
+#~ msgstr "Usar _conexiÃn segura:"
+
+#~ msgid "SSL is not supported in this build of Evolution"
+#~ msgstr "Esta compilaciÃn de Evolution no soporta SSL"
+
+#~ msgid "_Authentication Type"
+#~ msgstr "Tipo de _autenticaciÃn"
+
+#~ msgid "Re_member password"
+#~ msgstr "_Recordar contraseÃa"
+
+#~ msgid "Server Configuration"
+#~ msgstr "ConfiguraciÃn del servidor"
+
+#~ msgid "User _Name:"
+#~ msgstr "_Nombre de usuario:"
+
+#~ msgid "Remember _password"
+#~ msgstr "Recordar contrase_Ãa"
+
+#~ msgid "none"
+#~ msgstr "ninguna"
+
+#~ msgid "label"
+#~ msgstr "etiqueta"
+
+#~ msgid "Cannot set signature script \"{0}\"."
+#~ msgstr "No se puede establecer el script de firma Â{0}Â."
+
+#~ msgid "The script file must exist and be executable."
+#~ msgstr "El archivo de script debe existir y ser ejecutable."
+
+#~ msgid "Signature Already Exists"
+#~ msgstr "La firma ya existe"
+
+#~ msgid ""
+#~ "A signature already exists with the name \"{0}\". Please specify a "
+#~ "different name."
+#~ msgstr ""
+#~ "Ya existe una firma con el nombre Â{0}Â. Especifique un nombre 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 Evolution sÃlo conectarÃ con su "
+#~ "servidor LDAP si su servidor LDAP soporta 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 Evolution sÃlo conectarÃ con su "
+#~ "servidor LDAP si su servidor LDAP soporta 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 su servidor no soporta ni SSL ni "
+#~ "TLS. Esto significa que su conexiÃn serÃ insegura, y que usted serÃ "
+#~ "vulnerable a fallos de seguridad."
+
+#~ 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 es el puerto del servidor LDAP al que Evolution intentarÃ "
+#~ "conectarse. Se ha proporcionado una lista de puertos estÃndar. Pregunte a "
+#~ "su administrador del sistema quÃ puerto deberÃa especificar."
+
+#~ msgid "On LDAP Servers"
+#~ msgstr "En servidores LDAP"
+
+#~ msgid "On The Web"
+#~ msgstr "En la web"
+
+#~ msgid "Weather"
+#~ msgstr "MeteorologÃa"
+
+#~ msgid "Birthdays & Anniversaries"
+#~ msgstr "CumpleaÃos y aniversarios"
+
+#~ msgid "_New Calendar..."
+#~ msgstr "Calendario _nuevoâ"
+
+#~ msgid "Evolution Setup Assistant"
+#~ msgstr "Asistente de configuraciÃn de Evolution"
+
+#~ msgid "Local Address Books"
+#~ msgstr "Libretas locales de direcciones"
+
+#~ msgid "Add local address books to Evolution."
+#~ msgstr "AÃadir las libretas de direcciones locales a Evolution."
+
+#~ msgid "Ensuring local sources"
+#~ msgstr "Asegurando fuentes locales"
+
+#~ msgid "_Restore Evolution from the backup file"
+#~ msgstr "_Restaurar Evolution desde el archivo de respaldo"
+
+#~ msgid "Please select an Evolution Archive to restore:"
+#~ msgstr "Seleccione un archivador de Evolution para restaurar:"
+
+#~ msgid "Back up and Restore"
+#~ msgstr "Respaldar y restaurar"
+
+#~ msgid "Back up and restore your Evolution data and settings."
+#~ msgstr "Respaldar y restaurar los datos y la configuraciÃn de Evolution"
+
+#~ msgid "Authentication failed. Server requires correct login."
+#~ msgstr ""
+#~ "FallÃ la autenticaciÃn. El servidor requiere un inicio de sesiÃn correcto."
+
+#~ msgid "Given URL cannot be found."
+#~ msgstr "No se puede encontrar el URL proporcionado."
+
+#~ msgid ""
+#~ "Server returned unexpected data.\n"
+#~ "%d - %s"
+#~ msgstr ""
+#~ "El servidor devolviÃ datos inesperados.\n"
+#~ "%d - %s"
+
+#~ msgid "Failed to parse server response."
+#~ msgstr "FallÃ al analizar la respuesta del servidor."
+
+#~ msgid "Events"
+#~ msgstr "Acontecimientos"
+
+#~ msgid "User's calendars"
+#~ msgstr "Calendarios del usuario"
+
+#~ msgid "Failed to get server URL."
+#~ msgstr "FallÃ al obtener el URL del servidor."
+
+#~ msgid "Searching for user's calendars..."
+#~ msgstr "Buscando los calendarios del usuarioâ"
+
+#~ msgid "Previous attempt failed: %s"
+#~ msgstr "FallÃ el intento anterior: %s"
+
+#~ msgid "Previous attempt failed with code %d"
+#~ msgstr "El intento anterior fallÃ con el cÃdigo %d"
+
+#~ msgid "Enter password for user %s on server %s"
+#~ msgstr "Introduzca la contraseÃa para el usuario %s en el servidor %s"
+
+#~ msgid "Cannot create soup message for URL '%s'"
+#~ msgstr "No se puede crear el mensaje ÂsoupÂ para el URL Â%sÂ"
+
+#~ msgid "Searching folder content..."
+#~ msgstr "Buscando el contenido de la carpetaâ"
+
+#~ msgid "List of available calendars:"
+#~ msgstr "Lista de calendarios disponibles:"
+
+#~ msgid "Supports"
+#~ msgstr "Soporta"
+
+#~ msgid "User e_mail:"
+#~ msgstr "Correo-_e del usuario:"
+
+#~ msgid "Failed to create thread: %s"
+#~ msgstr "FallÃ al crear la conversaciÃn: %s"
+
+#~ msgid "Server URL '%s' is not a valid URL"
+#~ msgstr "El URL del servidor Â%sÂ no es un URL vÃlido"
+
+#~ msgid "Browse for a CalDAV calendar"
+#~ msgstr "Examinar para calendarios CalDAV"
+
+#~ msgid "_URL:"
+#~ msgstr "_URL:"
+
+#~ msgid "Brows_e server for a calendar"
+#~ msgstr "_Examinar el servidor para un calendario"
+
+#~ msgid "Re_fresh:"
+#~ msgstr "A_ctualizar:"
+
+#~ msgid "CalDAV Support"
+#~ msgstr "Soporte CalDAV"
+
+#~ msgid "Add CalDAV support to Evolution."
+#~ msgstr "AÃadir soporte CalDAV a Evolution."
+
+#~ msgid "C_ustomize options"
+#~ msgstr "Opciones de personali_zaciÃn"
+
+#~ msgid "On open"
+#~ msgstr "Al abrir"
+
+#~ msgid "On file change"
+#~ msgstr "Al cambiar un archivo"
+
+#~ msgid "Periodically"
+#~ msgstr "Periodicamente"
+
+#~ msgid "Force read _only"
+#~ msgstr "Forzar _sÃlo lectura"
+
+#~ msgid "Local Calendars"
+#~ msgstr "Calendarios locales"
+
+#~ msgid "Add local calendars to Evolution."
+#~ msgstr "AÃadir calendarios locales a Evolution."
+
+#~ msgid "Userna_me:"
+#~ msgstr "Nombre de _usuario:"
+
+#~ msgid "Web Calendars"
+#~ msgstr "Calendarios web"
+
+#~ msgid "Add web calendars to Evolution."
+#~ msgstr "AÃadir calendarios web a Evolution."
+
+#~ msgid "Weather: Fog"
+#~ msgstr "MeteorologÃa: Niebla"
+
+#~ msgid "Weather: Cloudy"
+#~ msgstr "MeteorologÃa: Nuboso"
+
+#~ msgid "Weather: Cloudy Night"
+#~ msgstr "MeteorologÃa: Noche nubosa"
+
+#~ msgid "Weather: Overcast"
+#~ msgstr "MeteorologÃa: Cubierto"
+
+#~ msgid "Weather: Showers"
+#~ msgstr "MeteorologÃa: Chubascos"
+
+#~ msgid "Weather: Snow"
+#~ msgstr "MeteorologÃa: Nieve"
+
+#~ msgid "Weather: Sunny"
+#~ msgstr "MeteorologÃa: Soleado"
+
+#~ msgid "Weather: Clear Night"
+#~ msgstr "MeteorologÃa: Noche despejada"
+
+#~ msgid "Weather: Thunderstorms"
+#~ msgstr "MeteorologÃa: Tormenta"
+
+#~ msgid "Select a location"
+#~ msgstr "Seleccione un lugar"
+
+#~ msgctxt "weather-cal-location"
+#~ msgid "None"
+#~ msgstr "Ninguna"
+
+#~ msgid "Weather Calendars"
+#~ msgstr "Calendario meteorolÃgico"
+
+#~ msgid "Add weather calendars to Evolution."
+#~ msgstr "AÃadir calendarios meteorolÃgicos a Evolution."
+
+#~ msgid "Default Sources"
+#~ msgstr "Fuentes predeterminadas"
+
+#~ msgid "Mark your preferred address book and calendar as default."
+#~ msgstr ""
+#~ "Marque como predeterminados su libreta de direcciones y calendario "
+#~ "preferidos."
+
+#~ msgid "Server"
+#~ msgstr "Servidor"
+
+#~ msgid "Enter password for user %s to access list of subscribed calendars."
+#~ msgstr ""
+#~ "Introduzca la contraseÃa para que el usuario %s acceda a la lista de "
+#~ "calendarios suscritos."
+
+#~ msgid ""
+#~ "Cannot read data from Google server.\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No se pueden leer los datos del servidor de Google.\n"
+#~ "%s"
+
+#~ msgid "Cal_endar:"
+#~ msgstr "Cal_endario:"
+
+#~ msgid "Retrieve _List"
+#~ msgstr "Obtener _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 sus preferencias para las cabeceras IMAP. \n"
+#~ "Cuantas mÃs cabeceras tenga mÃs tiempo se tardarÃ en descargar."
+
+#~ 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 ""
+#~ "Proporcione las cabeceras extra que necesite obtener ademÃs de las "
+#~ "cabeceras estÃndar anteriores.\n"
+#~ "Puede ignorar esto si elige ÂTodas las cabecerasÂ"
+
+#~ msgid "Fine-tune your IMAP accounts."
+#~ msgstr "Configurar sus cuentas IMAP."
+
+#~ msgid "Cannot get source list. %s"
+#~ msgstr "No se pudo obtener la lista de origen. %s"
+
+#~ msgid "WebDAV contacts"
+#~ msgstr "Contactos WebDAV"
+
+#~ msgid "Add WebDAV contacts to Evolution."
+#~ msgstr "AÃadir contactos WebDAV a Evolution."
+
+#~ msgid "WebDAV"
+#~ msgstr "WebDAV"
+
+#~ msgid "_Forget Passwords"
+#~ msgstr "_Olvidar contraseÃas"
+
+#~ msgid "Forget all remembered passwords"
+#~ msgstr "Olvidar todas las contraseÃas recordadas"
+
+#~ msgid "Are you sure you want to forget all remembered passwords?"
+#~ msgstr "ÂSeguro que quiere olvidar todas las contraseÃas almacenadas?"
+
+#~ msgid ""
+#~ "Forgetting your passwords will clear all remembered passwords. You will "
+#~ "be reprompted next time they are needed."
+#~ msgstr ""
+#~ "Olvidar sus contraseÃas eliminarÃ todas las contraseÃas recordadas. Se le "
+#~ "volverÃ a preguntar la prÃxima vez que se necesiten."
+
+#~ msgid "_Forget"
+#~ msgstr "_Olvidar"
+
 #~| msgid "Start in offline mode"
 #~ msgid "Current state of offline mode"
 #~ msgstr "Estado actual del modo desconectado"
@@ -23203,9 +23554,6 @@ msgstr "MÃtodos de entrada"
 #~ msgid "cards"
 #~ msgstr "tarjetas"
 
-#~ msgid "URL:"
-#~ msgstr "URL:"
-
 #~ msgid "Send the debugging output of all components to a file."
 #~ msgstr ""
 #~ "EnvÃa la salida de depuraciÃn de todos los componentes a un archivo."
@@ -23227,9 +23575,6 @@ msgstr "MÃtodos de entrada"
 #~ msgid "Protocol"
 #~ msgstr "Protocolo"
 
-#~ msgid "GConf error: %s"
-#~ msgstr "Error de GConf: %s"
-
 #~ msgid "All further errors shown only on terminal."
 #~ msgstr "En adelante todos los errores sÃlo se mostrarÃn en el terminal."
 
@@ -23367,9 +23712,6 @@ msgstr "MÃtodos de entrada"
 #~ msgid "Use _SSL"
 #~ msgstr "Usar _SSL"
 
-#~ msgid "_Secure connection"
-#~ msgstr "_Securizar conexiÃn"
-
 #~ msgid "iCalendar format (.ics)"
 #~ msgstr "Formato iCalendar (.ics)"
 
@@ -23629,9 +23971,6 @@ msgstr "MÃtodos de entrada"
 #~ msgid "Junk Mail Settings"
 #~ msgstr "ConfiguraciÃn de SPAM"
 
-#~ msgid "Email:"
-#~ msgstr "Correo-e:"
-
 #~ msgid "Junk List:"
 #~ msgstr "Lista de SPAM:"
 
@@ -24272,9 +24611,6 @@ msgstr "MÃtodos de entrada"
 #~ msgid "Log Messages:"
 #~ msgstr "Mensajes de sucesos:"
 
-#~ msgid "Log Level"
-#~ msgstr "Nivel de sucesos"
-
 #~ msgid "Error"
 #~ msgstr "Error"
 
@@ -24357,9 +24693,6 @@ msgstr "MÃtodos de entrada"
 #~ msgid "Subscribe dialog default width"
 #~ msgstr "Anchura predeterminada del diÃlogo de suscripciÃn"
 
-#~ msgid "(Not Recommended)"
-#~ msgstr "(No recomendado)"
-
 #~ msgid "(Note: Requires restart of the application)"
 #~ msgstr "(Nota: Requiere reiniciar la aplicaciÃn)"
 
@@ -24805,9 +25138,6 @@ msgstr "MÃtodos de entrada"
 #~ msgid "Shell View"
 #~ msgstr "Vista de ÂshellÂ"
 
-#~ msgid "Source"
-#~ msgstr "Fuente"
-
 #~ msgid "Width"
 #~ msgstr "Anchura"
 
@@ -24835,9 +25165,6 @@ msgstr "MÃtodos de entrada"
 #~ msgid "Adapter"
 #~ msgstr "Adaptador"
 
-#~ msgid "Selected"
-#~ msgstr "Seleccionado"
-
 #~ msgid "Has Cursor"
 #~ msgstr "Tiene el cursor"
 
@@ -24977,9 +25304,6 @@ msgstr "MÃtodos de entrada"
 #~ "No es posible leer la configuraciÃn de la instalaciÃn anterior de "
 #~ "Evolution, Âevolution/config.xmldbÂ no existe o estÃ corrompido."
 
-#~ msgid "Allows Evolution to display text part of limited size"
-#~ msgstr "Permite a Evolution mostrar la parte de texto de tamaÃo limitado"
-
 #~ msgid "Enable to render message text part of limited size."
 #~ msgstr ""
 #~ "Activar para mostrar la parte de texto del mensaje de tamaÃo limitado."
@@ -25353,9 +25677,6 @@ msgstr "MÃtodos de entrada"
 #~ msgid "The shell window's GtkUIManager"
 #~ msgstr "El GtkUIManager de la ventana ÂshellÂ"
 
-#~ msgid "Module Directory"
-#~ msgstr "Directorio de mÃdulos"
-
 #~ msgid "The directory from which to load EModules"
 #~ msgstr "El directorio del cuÃl cargar los mÃdulos de evolution"
 
@@ -26464,9 +26785,6 @@ msgstr "MÃtodos de entrada"
 #~ "PosiciÃn del panel vertical, entre las vistas de tarjeta y la vista de "
 #~ "lista y el panel de vista previa, en pÃxeles."
 
-#~ msgid "Look up in address books"
-#~ msgstr "Buscar en las libretas de direcciones"
-
 #~ msgid "Name begins with"
 #~ msgstr "El nombre empieza por"
 
@@ -26518,9 +26836,6 @@ msgstr "MÃtodos de entrada"
 #~ msgid "Memo_s"
 #~ msgstr "_Notas"
 
-#~ msgid "_Calendars"
-#~ msgstr "_Calendarios"
-
 #~ msgid "Evolution Calendar alarm notification service"
 #~ msgstr "Servicio de notificaciÃn por alerta del Calendario de Evolution"
 
@@ -27129,9 +27444,6 @@ msgstr "MÃtodos de entrada"
 #~ msgid "Folder Size"
 #~ msgstr "TamaÃo de la carpeta"
 
-#~ msgid "User"
-#~ msgstr "_Usuario"
-
 #~ msgid "Subscribe to Other User's Folder"
 #~ msgstr "Subscribirse a la carpeta de otro usuario"
 
@@ -27915,9 +28227,6 @@ msgstr "MÃtodos de entrada"
 #~ msgid "Choose Image"
 #~ msgstr "Elija una imagen"
 
-#~ msgid "Empty message"
-#~ msgstr "Mensaje vacÃo"
-
 #~ msgid "Reflow model"
 #~ msgstr "Modelo de reflujo"
 
@@ -28062,9 +28371,6 @@ msgstr "MÃtodos de entrada"
 #~ msgstr ""
 #~ "Un complemento para configurar el calendario y los contactos de Google."
 
-#~ msgid "Google sources"
-#~ msgstr "Recursos de Google"
-
 #~ msgid "A plugin to setup GroupWise calendar and contacts sources."
 #~ msgstr ""
 #~ "Un complemento para configurar fuentes de calendarios y contactos para "
@@ -29250,9 +29556,6 @@ msgstr "MÃtodos de entrada"
 #~ msgid "Basic"
 #~ msgstr "BÃsico"
 
-#~ msgid "Find Possible Search Bases"
-#~ msgstr "Buscar bases de bÃsqueda posibles"
-
 #~ msgid "_Add Address Book"
 #~ msgstr "_AÃadir libreta de direcciones"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]